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

Fix players vector (had a couple of 4 players game with the new code), added more cleanup

Browse Source
This commit is contained in:
Xawotihs
2011-10-01 23:49:37 +00:00
parent 76a8f406ec
commit 483c767492
8 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/include/GameObserver.h
View File

@@ -27,7 +27,6 @@ class GameObserver{
MTGCardInstance * cardWaitingForTargets;
queue<WEvent *> eventsQueue;
int nbPlayers;
int untap(MTGCardInstance * card);
bool WaitForExtraPayment(MTGCardInstance* card);
void initialize();
@@ -63,14 +62,14 @@ class GameObserver{
void nextGamePhase();
void cleanupPhase();
void nextPlayer();
void setPlayers(vector<Player *> _players, int _nbplayers);
void setPlayers(vector<Player *> _players);
Player * currentPlayer;
Player * currentActionPlayer;
Player * isInterrupting;
Player * opponent();
Player * currentlyActing();
GameObserver();
GameObserver(vector<Player *> _players, int _nbplayers);
GameObserver(vector<Player *> _players);
~GameObserver();
void gameStateBasedEffects();
void enchantmentStatus();
@@ -87,7 +86,7 @@ class GameObserver{
void Update(float dt);
void Render();
void ButtonPressed(PlayGuiObject*);
int getPlayersNumber() {return nbPlayers;};
int getPlayersNumber() {return players.size();};
int receiveEvent(WEvent * event);
bool connectRule;