From a1af7d9b9fc43115ef3b7abe877ab44d42e2ed46 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 23 Feb 2017 08:38:15 +0800
Subject: [PATCH] add black border option

if enabled, all cards will have black border
---
 projects/mtg/include/GameOptions.h    | 1 +
 projects/mtg/src/CardGui.cpp          | 3 ++-
 projects/mtg/src/GameOptions.cpp      | 1 +
 projects/mtg/src/GameStateOptions.cpp | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h
index e0b9e215a..df873da68 100644
--- a/projects/mtg/include/GameOptions.h
+++ b/projects/mtg/include/GameOptions.h
@@ -45,6 +45,7 @@ public:
         OPTIMIZE_HAND,
         CHEATMODEAIDECK,
         OSD,
+        BLKBORDER,
         CLOSEDHAND,
         HANDDIRECTION,
         MANADISPLAY,
diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp
index 1348d4afb..fc92feb0a 100644
--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -1240,7 +1240,8 @@ 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(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)
         {//white border
             renderer->FillRoundRect(pos.actX - (scale * quad->mWidth / 2)-6.f,pos.actY - (scale * quad->mHeight / 2)-5.8f, (scale * quad->mWidth)-0.02f, (scale * quad->mHeight)-0.02f, 5.8f,ARGB(255,248,248,255));
             renderer->DrawRoundRect(pos.actX - (scale * quad->mWidth / 2)-6.f,pos.actY - (scale * quad->mHeight / 2)-5.8f, (scale * quad->mWidth)-0.02f, (scale * quad->mHeight)-0.02f, 5.8f,ARGB(150,20,20,20));
diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp
index c10bf2435..aa9d7219b 100644
--- a/projects/mtg/src/GameOptions.cpp
+++ b/projects/mtg/src/GameOptions.cpp
@@ -21,6 +21,7 @@ const string Options::optionNames[] = {
     "optimizedhand",
     "cheatmodedecks",
   "displayOSD",
+  "BlackBorder",
   "closed_hand",
   "hand_direction",
   "mana_display",
diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp
index 6a8ab3937..4a7d2d401 100644
--- a/projects/mtg/src/GameStateOptions.cpp
+++ b/projects/mtg/src/GameStateOptions.cpp
@@ -56,6 +56,7 @@ void GameStateOptions::Start()
 
     optionsList = NEW WGuiList("Game");
     optionsList->Add(NEW WGuiHeader("Interface Options"));
+    optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border"));
     optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::CLOSEDHAND, "Closed hand", 1, 1, 0)));
     optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::HANDDIRECTION, "Hand direction", 1, 1, 0)));
     optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MANADISPLAY, "Mana display", 3, 1, 0)));