- Added new code for serialization/deserializaiton of full games including initial game and all the player actions.

- Added an undo menu using this code (beware, it's still very very alpha).
- Removed various warning
- Cleaned up avatar loading
- Added full random lists load/save including the deck shuffling (not sure if I could not replace that with seed load/save)
- Moved momir and Co rules configuration out of GameStateDuel
- Create a GameType type to avoid mixing int everywhere
This commit is contained in:
Xawotihs
2011-10-13 19:43:51 +00:00
parent 663058cdab
commit 0b6044551a
28 changed files with 595 additions and 156 deletions
+3
View File
@@ -589,6 +589,7 @@ int ActionStack::setIsInterrupting(Player * player)
int playerId = (player == observer->players[1]) ? 1 : 0;
interruptDecision[playerId] = -1;
observer->isInterrupting = player;
observer->logAction(player, "yes");
return 1;
}
@@ -960,6 +961,7 @@ void ActionStack::cancelInterruptOffer(int cancelMode)
askIfWishesToInterrupt = NULL;
observer->isInterrupting = NULL;
timer = -1;
observer->logAction(playerId, "no");
}
void ActionStack::endOfInterruption()
@@ -967,6 +969,7 @@ void ActionStack::endOfInterruption()
int playerId = (observer->isInterrupting == observer->players[1]) ? 1 : 0;
interruptDecision[playerId] = 0;
observer->isInterrupting = NULL;
observer->logAction(playerId, "endinterruption");
}
bool ActionStack::CheckUserInput(JButton key)