From dd2a541c2bf0bf4c7471ef310f062fed353d3613 Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Thu, 3 Sep 2009 17:23:03 +0000 Subject: [PATCH] J : * Fix the acting player. * This should make most things work. * I still witness some segfaults. --- projects/mtg/src/GameObserver.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 30cc36820..22578d8cc 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -250,7 +250,9 @@ GameObserver::~GameObserver(){ } void GameObserver::Update(float dt){ - Player * player = currentPlayer; + Player * player = currentPlayer; + if (Constants::MTG_PHASE_COMBATBLOCKERS == currentGamePhase && BLOCKERS == combatStep) + player = player->opponent(); currentActionPlayer = player; if (isInterrupting) player = isInterrupting; mLayers->Update(dt,player);