From f988ff04cba8fac9383bbd1372fb95978c23c28c Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Sat, 22 Aug 2009 23:57:14 +0000 Subject: [PATCH] Erwan - Test suite "fixed". Tests involving combat (almost all of them) fail. Also 4 tests generate segfaults --- projects/mtg/src/GameStateOptions.cpp | 8 ++++++-- projects/mtg/src/TestSuiteAI.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 4331c030b..0e52cffcd 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -74,16 +74,20 @@ void GameStateOptions::Render() JRenderer::GetInstance()->ClearScreen(ARGB(0,0,0,0)); const char * const CreditsText[] = { - "Wagic, The Homebrew?! by WilLoW", + "Wagic, The Homebrew?! by wololo", "", "updates, new cards, and more on http://wololo.net/wagic", "Many thanks to the devs and card creators who help this project", "", "Developped with the JGE++ Library (http://jge.khors.com)", + "", + "==Design & Art==", + "Shop, phase icons: Jhotun, http://www.jhotun.com/", + "Card back: Jeck", + "UI and some art by J", "Player's avatar from http://mathieuchoinet.blogspot.com, under CC License", "Background picture and some art from the KDE project, www.kde.org", "SFX From www.soundsnap.com", - "", "Music by Celestial Aeon Project, http://www.jamendo.com", "", "", diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp index c8c0ed808..c478fa04a 100644 --- a/projects/mtg/src/TestSuiteAI.cpp +++ b/projects/mtg/src/TestSuiteAI.cpp @@ -98,9 +98,9 @@ int TestSuiteAI::Act(float dt){ OutputDebugString("End of combat damage!\n"); drl->nextPlayer(); g->userRequestNextGamePhase(); - }else{ + }else{ */ g->userRequestNextGamePhase(); - } + /*} */ }else if (action.compare("yes")==0){ g->mLayers->stackLayer()->setIsInterrupting(this); @@ -149,9 +149,9 @@ int TestSuiteAI::Act(float dt){ OutputDebugString(" Damaging Card\n"); drl->clickDamage(card); } - }else{ + }else{*/ g->cardClick(card,card); - } + /* } */ } }