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

readjusted the carddisplays for libarary and graveyard for both players to move them off the top of the avatars. you can now click thier respective button to close them when in a targetchooser action.

Browse Source 
also readded a piece of code i commented out, it does nothing but the compiler saids it expected something there.
This commit is contained in:
omegablast2002@yahoo.com
2013-03-30 17:09:50 +00:00
parent c9360eb005
commit 80e36c2b92
2 changed files with 111 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDuel.cpp
+8 -8
View File
@@ -909,14 +909,14 @@ void GameStateDuel::Update(float dt)
} }
} }
#endif #endif
// if (mParent->players[0] == PLAYER_TYPE_CPU && mParent->players[1] == PLAYER_TYPE_CPU) if (mParent->players[0] == PLAYER_TYPE_CPU && mParent->players[1] == PLAYER_TYPE_CPU)
// { {
/////// Tournament Mod /////////// ///// Tournament Mod ///////////
// End(); // End();
// Start(); // Start();
/////// END Tournament Mod /////////// ///// END Tournament Mod ///////////
// } }
//this is handled elsewhere. // this is handled elsewhere.
} }
if (mEngine->GetButtonClick(JGE_BTN_MENU)) if (mEngine->GetButtonClick(JGE_BTN_MENU))
{ {
projects/mtg/src/GuiStatic.cpp
+2 -1
View File
@@ -222,7 +222,8 @@ void GuiGameZone::Update(float dt)
GuiGameZone::GuiGameZone(float x, float y, bool hasFocus, MTGGameZone* zone, GuiAvatars* parent) : GuiGameZone::GuiGameZone(float x, float y, bool hasFocus, MTGGameZone* zone, GuiAvatars* parent) :
GuiStatic(static_cast<float> (GuiGameZone::Height), x, y, hasFocus, parent), zone(zone) GuiStatic(static_cast<float> (GuiGameZone::Height), x, y, hasFocus, parent), zone(zone)
{ {
cd = NEW CardDisplay(0, zone->owner->getObserver(), static_cast<int> (x), static_cast<int> (y), this);
cd = NEW CardDisplay(0, zone->owner->getObserver(),y > 150 ? static_cast<int> (x)-235:static_cast<int> (x)+23, static_cast<int> (y), this);
cd->zone = zone; cd->zone = zone;
showCards = 0; showCards = 0;
} }