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

Erwan

Browse Source 
- Minor cleanup
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-09-19 10:51:45 +00:00
parent f1670f2394
commit e0f5a81dad
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/GameObserver.h
-3
View File
@@ -6,7 +6,6 @@
#include "DuelLayers.h" #include "DuelLayers.h"
#include "MTGCardInstance.h" #include "MTGCardInstance.h"
#include "PlayGuiObject.h" #include "PlayGuiObject.h"
#include "DuelLayers.h"
#include "TargetChooser.h" #include "TargetChooser.h"
#include "PhaseRing.h" #include "PhaseRing.h"
#include "ReplacementEffects.h" #include "ReplacementEffects.h"
@@ -30,7 +29,6 @@ class GameObserver{
int nbPlayers; int nbPlayers;
int currentPlayerId; int currentPlayerId;
int currentRound;
public: public:
CombatStep combatStep; CombatStep combatStep;
@@ -53,7 +51,6 @@ class GameObserver{
void stackObjectClicked(Interruptible * action); void stackObjectClicked(Interruptible * action);
void cardClick(MTGCardInstance * card,Targetable * _object = NULL ); void cardClick(MTGCardInstance * card,Targetable * _object = NULL );
int enteringPhase(int phase);
int getCurrentGamePhase(); int getCurrentGamePhase();
void nextCombatStep(); void nextCombatStep();
void userRequestNextGamePhase(); void userRequestNextGamePhase();
projects/mtg/src/GameObserver.cpp
-6
View File
@@ -1,6 +1,5 @@
#include "../include/config.h" #include "../include/config.h"
#include "../include/GameObserver.h" #include "../include/GameObserver.h"
#include "../include/GameOptions.h" #include "../include/GameOptions.h"
#include "../include/ConstraintResolver.h" #include "../include/ConstraintResolver.h"
#include "../include/CardGui.h" #include "../include/CardGui.h"
@@ -42,7 +41,6 @@ GameObserver::GameObserver(Player * _players[], int _nb_players){
isInterrupting = NULL; isInterrupting = NULL;
currentPlayerId = 0; currentPlayerId = 0;
nbPlayers = _nb_players; nbPlayers = _nb_players;
currentRound = 1;
currentGamePhase = -1; currentGamePhase = -1;
targetChooser = NULL; targetChooser = NULL;
cardWaitingForTargets = NULL; cardWaitingForTargets = NULL;
@@ -68,10 +66,6 @@ Player * GameObserver::opponent(){
return players[index]; return players[index];
} }
int GameObserver::enteringPhase(int phase){
//TODO
return 0;
}
void GameObserver::nextPlayer(){ void GameObserver::nextPlayer(){
turn++; turn++;