From 561054ba34a4e36f3567d21644efd21f9e541542 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Wed, 20 Apr 2011 21:21:12 +0000 Subject: [PATCH] added a true method to recycle our 100 avatar images, and made sure they stay in line with the menu image if theyre over 100. --- projects/mtg/src/AIPlayer.cpp | 9 ++++++++- projects/mtg/src/DeckMenu.cpp | 1 - projects/mtg/src/DeckMetaData.cpp | 13 +++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 39c6790a0..760099678 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -1251,7 +1251,14 @@ AIPlayer * AIPlayerFactory::createAIPlayer(MTGAllCards * collection, Player * op deckid = 1 + WRand() % (nbdecks); } sprintf(deckFile, JGE_GET_RES("ai/baka/deck%i.txt").c_str(), deckid); - sprintf(avatarFile, "avatar%i.jpg", deckid); + int tempDeckId = deckid; + int avatarId = 0; + while(tempDeckId > 100) + { + tempDeckId -= 100; + avatarId = tempDeckId; + } + sprintf(avatarFile, "avatar%i.jpg", avatarId); sprintf(deckFileSmall, "ai_baka_deck%i", deckid); } diff --git a/projects/mtg/src/DeckMenu.cpp b/projects/mtg/src/DeckMenu.cpp index 80829c2b8..c48928106 100644 --- a/projects/mtg/src/DeckMenu.cpp +++ b/projects/mtg/src/DeckMenu.cpp @@ -253,7 +253,6 @@ void DeckMenu::Render() { JQuad * evil = quad.get(); evil->SetHFlip(true); - evil->SetColor(kRedColor); renderer->RenderQuad(quad.get(), avatarX, avatarY); evil = NULL; } diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp index d61c9e839..de8a4cb8b 100644 --- a/projects/mtg/src/DeckMetaData.cpp +++ b/projects/mtg/src/DeckMetaData.cpp @@ -72,12 +72,13 @@ int DeckMetaData::getAvatarId() { if ( mDeckId < 101 ) return mDeckId; - - int avatarId = mDeckId % 100; - - if (avatarId == 0) - return 100; - + int tempDeckId = mDeckId; + int avatarId = 0; + while(tempDeckId > 100) + { + tempDeckId -= 100; + avatarId = tempDeckId; + } return avatarId; }