Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #628 from kevlahnota/master

Browse Source 
Reverted Random, Disable Indicators on Gametype that is not Classic
This commit is contained in:
Anthony Calosa
2015-09-20 22:48:46 +08:00
parent a432f5cc3a 725a285e7f
commit c3fb08da59
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/src/CardGui.cpp
View File

@@ -310,7 +310,7 @@ void CardGui::Render()
if(!card->isToken && card->isACopier) if(!card->isToken && card->isACopier)
buff = "C"; buff = "C";
if(!alternate && buff != "") if(!alternate && buff != "" && game->gameType() == GAME_TYPE_CLASSIC)//it seems that other game modes makes cards as tokens!!! hmmm...
{ {
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
char buffer[200]; char buffer[200];

5
projects/mtg/src/DeckMenu.cpp
View File

@@ -215,10 +215,7 @@ void DeckMenu::selectRandomDeck(bool isAi)
{ {
DeckManager *deckManager = DeckManager::GetInstance(); DeckManager *deckManager = DeckManager::GetInstance();
vector<DeckMetaData *> *deckList = isAi ? deckManager->getAIDeckOrderList() : deckManager->getPlayerDeckOrderList(); vector<DeckMetaData *> *deckList = isAi ? deckManager->getAIDeckOrderList() : deckManager->getPlayerDeckOrderList();
//int random = (WRand() * 1000) % deckList->size(); int random = rand() % (int)deckList->size();
int lowest=0, highest = deckList->size();
int range=(highest-lowest);
int random = lowest+int(range*rand()/(RAND_MAX + 1.0));
selectDeck( random, isAi ); selectDeck( random, isAi );
} }

4
projects/mtg/src/GameStateDuel.cpp
View File

@@ -1857,9 +1857,7 @@ int Tournament::getRandomDeck(bool noEasyDecks)
while(isDouble && decks.size()>0) while(isDouble && decks.size()>0)
{ {
isDouble=false; isDouble=false;
int lowest=0, highest = (int)decks.size(); k = rand() % (int)decks.size();
int range=(highest-lowest);
k = lowest+int(range*rand()/(RAND_MAX + 1.0));
random = decks.at(k); random = decks.at(k);
deckNumber = deckList->at(random)->getDeckId(); deckNumber = deckList->at(random)->getDeckId();