diff --git a/projects/mtg/include/CardGui.h b/projects/mtg/include/CardGui.h index 48cd64bdb..cea1cf5e5 100644 --- a/projects/mtg/include/CardGui.h +++ b/projects/mtg/include/CardGui.h @@ -55,8 +55,8 @@ public: virtual void Render(); virtual void Update(float dt); - void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = true, bool gdv = false); - static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = true, bool gdv = false); + void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = false, bool gdv = false); + static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false, bool noborder = false, bool gdv = false); static JQuadPtr AlternateThumbQuad(MTGCard * card); virtual ostream& toString(ostream&) const; diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index 61122eff7..3dba984b5 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -44,6 +44,7 @@ public: CHEATMODE, OPTIMIZE_HAND, CHEATMODEAIDECK, + SHOWBORDER, BLKBORDER, SHOWTOKENS, GDVLARGEIMAGE, diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 5ed6bf1df..416c8ea37 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -1293,7 +1293,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder } }*///disabled this for universal border across game, deck editor, etc... //universal border - if(!noborder) + if(options[Options::SHOWBORDER].number) { if((cardsetname == "2ED"||cardsetname == "RV"||cardsetname == "4ED"||cardsetname == "5ED"||cardsetname == "6ED"||cardsetname == "7ED"||cardsetname == "8ED"||cardsetname == "9ED"||cardsetname == "CHR"||cardsetname == "DM") && !options[Options::BLKBORDER].number) diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp index 18044e5b7..d1a60f875 100644 --- a/projects/mtg/src/GameOptions.cpp +++ b/projects/mtg/src/GameOptions.cpp @@ -18,8 +18,9 @@ const string Options::optionNames[] = { "sfxVolume", "difficulty", "cheatmode", - "optimizedhand", - "cheatmodedecks", + "optimizedhand", + "cheatmodedecks", + "ShowBorder", "BlackBorder", "ShowTokens", "GDVLargeImages", diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 9db93c402..91b55add0 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -56,6 +56,7 @@ void GameStateOptions::Start() optionsList = NEW WGuiList("Misc"); optionsList->Add(NEW WGuiHeader("Card Display Options")); + optionsList->Add(NEW OptionInteger(Options::SHOWBORDER, "Show Borders")); //black border optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border")); //show tokens in editor