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

Fixed a crash on undo on windows, and another one when you tried it before any action was done. Undo is still present in the menu even if there is nothing to undo.

Browse Source
This commit is contained in:
Xawotihs
2011-10-13 20:58:32 +00:00
parent 0b6044551a
commit cd4c7ae085
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
projects/mtg/src/GameObserver.cpp
View File

@@ -1288,7 +1288,7 @@ bool GameObserver::load(const string& ss, bool undo)
}
else
{
if(!players[0])
if(players.size() == 0 || !players[0])
players.push_back(new HumanPlayer(this, deckFile, deckFileSmall));
players[0]->parseLine(s);
}
@@ -1300,7 +1300,7 @@ bool GameObserver::load(const string& ss, bool undo)
}
else
{
if(!players[1]) {
if(players.size() == 1 || !players[1]) {
AIPlayerFactory playerCreator;
players.push_back(playerCreator.createAIPlayer(this, MTGCollection(), players[0]));
}
@@ -1345,7 +1345,7 @@ bool GameObserver::processActions(bool undo)
float counter = 0.0f;
// To handle undo, we'll remove the last P1 action and all P2 actions after.
if(undo) {
if(undo && copyList.size()) {
while(copyList.back().find("p2") != string::npos)
copyList.pop_back();
copyList.pop_back();