From 4b70061dae28edd8107c53eeee8ad359f8e61c91 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Tue, 31 Jan 2012 20:11:03 +0000 Subject: [PATCH] made flip( menutext better, also readded menuobject coloring for normal menus, somewhere along the lines it was changed to not work with normal menus, which eliminated the whole point...if the red is too harsh of a color please suggest a different one. --- projects/mtg/src/ActionLayer.cpp | 2 +- projects/mtg/src/AllAbilities.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index 02ee4e6eb..b8250b642 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -377,7 +377,7 @@ void ActionLayer::setMenuObject(Targetable * object, bool must) abilitiesMenu = NEW SimpleMenu(observer->getInput(), 10, this, Fonts::MAIN_FONT, 100, 100, object->getDisplayName().c_str()); abilitiesTriggered = NEW SimpleMenu(observer->getInput(), 10, this, Fonts::MAIN_FONT, 100, 100, object->getDisplayName().c_str()); - currentActionCard = NULL; + currentActionCard = (MTGCardInstance*)object; for (size_t i = 0; i < mObjects.size(); i++) { ActionElement * currentAction = (ActionElement *) mObjects[i]; diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index da0d94608..c116bd639 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -1148,7 +1148,9 @@ int AAFlip::testDestroy() const char * AAFlip::getMenuText() { - return "Flip"; + string s = flipStats; + sprintf(menuText, "Transform into %s", s.c_str()); + return menuText; } AAFlip * AAFlip::clone() const