Added new option to show/hide card borders.

This commit is contained in:
valfieri
2019-10-25 00:23:46 +02:00
parent ca7c8f5cf9
commit 601a4432dc
5 changed files with 8 additions and 5 deletions
+2 -2
View File
@@ -55,8 +55,8 @@ public:
virtual void Render(); virtual void Render();
virtual void Update(float dt); virtual void Update(float dt);
void DrawCard(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 = true, 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); static JQuadPtr AlternateThumbQuad(MTGCard * card);
virtual ostream& toString(ostream&) const; virtual ostream& toString(ostream&) const;
+1
View File
@@ -44,6 +44,7 @@ public:
CHEATMODE, CHEATMODE,
OPTIMIZE_HAND, OPTIMIZE_HAND,
CHEATMODEAIDECK, CHEATMODEAIDECK,
SHOWBORDER,
BLKBORDER, BLKBORDER,
SHOWTOKENS, SHOWTOKENS,
GDVLARGEIMAGE, GDVLARGEIMAGE,
+1 -1
View File
@@ -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... }*///disabled this for universal border across game, deck editor, etc...
//universal border //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") 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) && !options[Options::BLKBORDER].number)
+3 -2
View File
@@ -18,8 +18,9 @@ const string Options::optionNames[] = {
"sfxVolume", "sfxVolume",
"difficulty", "difficulty",
"cheatmode", "cheatmode",
"optimizedhand", "optimizedhand",
"cheatmodedecks", "cheatmodedecks",
"ShowBorder",
"BlackBorder", "BlackBorder",
"ShowTokens", "ShowTokens",
"GDVLargeImages", "GDVLargeImages",
+1
View File
@@ -56,6 +56,7 @@ void GameStateOptions::Start()
optionsList = NEW WGuiList("Misc"); optionsList = NEW WGuiList("Misc");
optionsList->Add(NEW WGuiHeader("Card Display Options")); optionsList->Add(NEW WGuiHeader("Card Display Options"));
optionsList->Add(NEW OptionInteger(Options::SHOWBORDER, "Show Borders"));
//black border //black border
optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border")); optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border"));
//show tokens in editor //show tokens in editor