Included some testsuite into qtmain and updated travis file to try to use it.

2013-10-27 23:06:29 +01:00
parent 7a7bc70773
commit 224c94e890
25 changed files with 185 additions and 76 deletions
@@ -184,7 +184,7 @@ void GameStateAwards::Update(float dt)
            case JGE_BTN_MENU:
                showMenu = true;
                SAFE_DELETE(menu);
-                menu = NEW SimpleMenu(JGE::GetInstance(), EXIT_AWARDS_MENU, this, Fonts::MENU_FONT, 50, 170);
+                menu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), EXIT_AWARDS_MENU, this, Fonts::MENU_FONT, 50, 170);
                if (mState == STATE_DETAILS)
                    menu->Add(kBackToTrophiesID, "Back to Trophies");
                menu->Add(kBackToMainMenuID, "Back to Main Menu");