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

Fix Segmentation Fault & Formatting

Browse Source
This commit is contained in:
Anthony Calosa
2015-11-10 11:58:36 +08:00
parent 406f68ac5b
commit cd1b629191
71 changed files with 769 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/SimpleButton.h
+2 -2
View File
@@ -18,8 +18,8 @@ using std::string;
#define SCALE_SELECTED 1.2f #define SCALE_SELECTED 1.2f
#define SCALE_NORMAL 1.0f #define SCALE_NORMAL 1.0f
#define SCALE_SHRINK 0.75f #define SCALE_SHRINK 0.75f
#define SCALE_SELECTED_LARGE 1.7F #define SCALE_SELECTED_LARGE 1.7f
#define SCALE_LARGE_NORMAL 1.5F #define SCALE_LARGE_NORMAL 1.5f
class SimpleButton: public JGuiObject class SimpleButton: public JGuiObject
{ {
projects/mtg/src/MTGDefinitions.cpp
+3 -3
View File
@@ -14,9 +14,9 @@ const string Constants::kManaRed = "red";
const string Constants::kManaBlack = "black"; const string Constants::kManaBlack = "black";
const string Constants::kManaWhite = "white"; const string Constants::kManaWhite = "white";
int Constants::_r[7] = {75, 20, 20, 200,50,255,128}; int Constants::_r[7] = {75,20,20,200,50,255,128};
int Constants::_g[7] = {30, 140, 30, 15, 50,255,128}; int Constants::_g[7] = {30,140,30,15,50,255,128};
int Constants::_b[7] = {20, 0, 140,15, 50,255,128}; int Constants::_b[7] = {20,0,140,15,50,255,128};
const string Constants::kAlternativeKeyword = "alternative"; const string Constants::kAlternativeKeyword = "alternative";
projects/mtg/src/MTGRules.cpp
+4 -4
View File
@@ -627,13 +627,13 @@ PermanentAbility(observer, _id)
int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
{ {
if (card->alias == 110000)
return 0;//overload has its own rule
ManaCost * alternateCost = card->getManaCost()->getAlternative(); ManaCost * alternateCost = card->getManaCost()->getAlternative();
if (!game->currentlyActing()->game->hand->hasCard(card) && !game->currentlyActing()->game->graveyard->hasCard(card) && !game->currentlyActing()->game->exile->hasCard(card)) if (!game->currentlyActing()->game->hand->hasCard(card) && !game->currentlyActing()->game->graveyard->hasCard(card) && !game->currentlyActing()->game->exile->hasCard(card))
return 0; return 0;
if ((game->currentlyActing()->game->graveyard->hasCard(card) && !card->has(Constants::CANPLAYFROMGRAVEYARD)) || (game->currentlyActing()->game->exile->hasCard(card) && !card->has(Constants::CANPLAYFROMEXILE))) if ((game->currentlyActing()->game->graveyard->hasCard(card) && !card->has(Constants::CANPLAYFROMGRAVEYARD)) || (game->currentlyActing()->game->exile->hasCard(card) && !card->has(Constants::CANPLAYFROMEXILE)))
return 0; return 0;
if (card->alias == 110000)
return 0;//overload has its own rule
return isReactingToClick( card, mana, alternateCost ); return isReactingToClick( card, mana, alternateCost );
} }
@@ -1225,6 +1225,8 @@ MTGAlternativeCostRule(observer, _id)
int MTGOverloadRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana) int MTGOverloadRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
{ {
if (card->alias != 110000)
return 0;
Player * player = game->currentlyActing(); Player * player = game->currentlyActing();
ManaCost * cost = NEW ManaCost(card->model->data->getManaCost()->getAlternative()); ManaCost * cost = NEW ManaCost(card->model->data->getManaCost()->getAlternative());
if(card->getIncreasedManaCost()->getConvertedCost()) if(card->getIncreasedManaCost()->getConvertedCost())
@@ -1234,8 +1236,6 @@ int MTGOverloadRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
if (card->isLand()) if (card->isLand())
return 0; return 0;
if (card->alias != 110000)
return 0;
if (!player->game->graveyard->hasCard(card) && !player->game->exile->hasCard(card) && !player->game->hand->hasCard(card)) if (!player->game->graveyard->hasCard(card) && !player->game->exile->hasCard(card) && !player->game->hand->hasCard(card))
return 0; return 0;
if ((!card->has(Constants::CANPLAYFROMGRAVEYARD) && player->game->graveyard->hasCard(card))||(!card->has(Constants::CANPLAYFROMEXILE) && player->game->exile->hasCard(card))) if ((!card->has(Constants::CANPLAYFROMGRAVEYARD) && player->game->graveyard->hasCard(card))||(!card->has(Constants::CANPLAYFROMEXILE) && player->game->exile->hasCard(card)))