From a62e0179773b0c7c80ca347f4dc5f20cd56b3d61 Mon Sep 17 00:00:00 2001 From: Nicolas Gramlich Date: Tue, 22 May 2012 13:26:20 -0700 Subject: [PATCH] Made MenuTest use a differently names labelatlas to avoid collision with fps_images.fnt/png. --- tests/tests/MenuTest/MenuTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/MenuTest/MenuTest.cpp b/tests/tests/MenuTest/MenuTest.cpp index 717a268af7..250b1d696e 100644 --- a/tests/tests/MenuTest/MenuTest.cpp +++ b/tests/tests/MenuTest/MenuTest.cpp @@ -44,7 +44,7 @@ MenuLayerMainMenu::MenuLayerMainMenu() CCMenuItem* item2 = CCMenuItemImage::itemWithNormalImage(s_SendScore, s_PressSendScore, this, menu_selector(MenuLayerMainMenu::menuCallback2) ); // Label Item (LabelAtlas) - CCLabelAtlas* labelAtlas = CCLabelAtlas::labelWithString("0123456789", "fonts/fps_images.png", 16, 24, '.'); + CCLabelAtlas* labelAtlas = CCLabelAtlas::labelWithString("0123456789", "fonts/labelatlas.png", 16, 24, '.'); CCMenuItemLabel* item3 = CCMenuItemLabel::itemWithLabel(labelAtlas, this, menu_selector(MenuLayerMainMenu::menuCallbackDisabled) ); item3->setDisabledColor( ccc3(32,32,64) ); item3->setColor( ccc3(200,200,255) );