Cleaned up my phasebar code and merged it into the overall item selection code

This commit is contained in:
Xawotihs
2011-08-04 05:57:10 +00:00
parent 46dfe03099
commit eac5a35b43
6 changed files with 61 additions and 49 deletions

View File

@@ -8,6 +8,8 @@
#include "Subtypes.h"
#include <JLogger.h>
#include <JRenderer.h>
#include "MTGGamePhase.h"
#include "GuiPhaseBar.h"
GameObserver * GameObserver::mInstance = NULL;
@@ -816,6 +818,10 @@ void GameObserver::ButtonPressed(PlayGuiObject * target)
{
cardClick(NULL, avatar->player);
}
else if (GuiPhaseBar* phaseBar = dynamic_cast<GuiPhaseBar*>(target))
{
MTGGamePhase::GetInstance()->NextGamePhase();
}
}
void GameObserver::stackObjectClicked(Interruptible * action)