From bbc310dec7fe66adf2ad16fe7e452e1b1a0daeb0 Mon Sep 17 00:00:00 2001
From: Tobias Loose <TobiasLoose@gmx.de>
Date: Sun, 17 Nov 2013 21:55:16 +0100
Subject: [PATCH] Remove some dead code

---
 projects/mtg/include/CardEffect.h        | 21 ---------------------
 projects/mtg/include/GameApp.h           |  2 --
 projects/mtg/include/OSD.h               | 11 -----------
 projects/mtg/src/CardEffect.cpp          | 20 --------------------
 projects/mtg/src/GameStateDeckViewer.cpp | 16 ----------------
 projects/mtg/template.vcxproj            |  2 --
 projects/mtg/template.vcxproj.filters    |  6 ------
 projects/mtg/wagic-qt.pro                |  3 ---
 8 files changed, 81 deletions(-)
 delete mode 100644 projects/mtg/include/CardEffect.h
 delete mode 100644 projects/mtg/include/OSD.h
 delete mode 100644 projects/mtg/src/CardEffect.cpp

diff --git a/projects/mtg/include/CardEffect.h b/projects/mtg/include/CardEffect.h
deleted file mode 100644
index ef2ea3b09..000000000
--- a/projects/mtg/include/CardEffect.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _CARDEFFECT_H_
-#define _CARDEFFECT_H_
-
-#include <JGE.h>
-#include "Effects.h"
-
-struct CardGui;
-
-class CardEffect: public Effect
-{
-public:
-    CardEffect(CardGui* target);
-    ~CardEffect();
-private:
-    CardGui* target;
-
-public:
-    virtual void Render();
-};
-
-#endif // _CARDEFFECT_H_
diff --git a/projects/mtg/include/GameApp.h b/projects/mtg/include/GameApp.h
index 7c0c996d7..eeb1c8141 100644
--- a/projects/mtg/include/GameApp.h
+++ b/projects/mtg/include/GameApp.h
@@ -20,7 +20,6 @@
 #include "MTGCard.h"
 #include "MTGGameZones.h"
 
-#include "CardEffect.h"
 #ifdef NETWORK_SUPPORT
 #include "JNetwork.h"
 #endif //NETWORK_SUPPORT
@@ -49,7 +48,6 @@ public:
 
     GameType gameType;
     Rules * rules;
-    CardEffect *effect;
 #ifdef NETWORK_SUPPORT
     string mServerAddress;
     JNetwork* mpNetwork;
diff --git a/projects/mtg/include/OSD.h b/projects/mtg/include/OSD.h
deleted file mode 100644
index f6733ebd3..000000000
--- a/projects/mtg/include/OSD.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _OSD_H_
-#define _OSD_H_
-
-class OSDLayer: public PlayGuiObjectController
-{
-    virtual void Update(float dt);
-    virtual bool CheckUserInput(JButton key);
-    virtual void Render();
-};
-
-#endif
diff --git a/projects/mtg/src/CardEffect.cpp b/projects/mtg/src/CardEffect.cpp
deleted file mode 100644
index 12afd8bb2..000000000
--- a/projects/mtg/src/CardEffect.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "../include/GameApp.h"
-#include "../include/MTGCard.h"
-#include "../include/GameOptions.h"
-#include "../include/CardEffect.h"
-
-CardEffect::CardEffect(CardGui* target) :
-    target(target)
-{
-
-}
-
-CardEffect::~CardEffect()
-{
-
-}
-
-void CardEffect::Render()
-{
-    //  std::cout << "Rendering effect" << std::endl;
-}
diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index 41a8a2f37..24e51f910 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -23,22 +23,6 @@
 #include "AIPlayer.h"
 
 
-
-//!! helper function; this is probably handled somewhere in the code already.
-// If not, should be placed in general library
-void StringExplode(string str, string separator, vector<string>* results)
-{
-    size_t found;
-    found = str.find_first_of(separator);
-    while (found != string::npos)
-    {
-        if (found > 0) results->push_back(str.substr(0, found));
-        str = str.substr(found + 1);
-        found = str.find_first_of(separator);
-    }
-    if (str.length() > 0) results->push_back(str);
-}
-
 GameStateDeckViewer::GameStateDeckViewer(GameApp* parent) :
     GameState(parent, "deckeditor")
 {
diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj
index 7109ebd09..96f355a51 100644
--- a/projects/mtg/template.vcxproj
+++ b/projects/mtg/template.vcxproj
@@ -455,7 +455,6 @@
     <ClInclude Include="include\CacheEngine.h" />
     <ClInclude Include="include\CardDescriptor.h" />
     <ClInclude Include="include\CardDisplay.h" />
-    <ClInclude Include="include\CardEffect.h" />
     <ClInclude Include="include\CardGui.h" />
     <ClInclude Include="include\CardPrimitive.h" />
     <ClInclude Include="include\CardSelector.h" />
@@ -517,7 +516,6 @@
     <ClInclude Include="include\NetworkPlayer.h" />
     <ClInclude Include="include\ObjectAnalytics.h" />
     <ClInclude Include="include\OptionItem.h" />
-    <ClInclude Include="include\OSD.h" />
     <ClInclude Include="include\PhaseRing.h" />
     <ClInclude Include="include\Player.h" />
     <ClInclude Include="include\PlayerData.h" />
diff --git a/projects/mtg/template.vcxproj.filters b/projects/mtg/template.vcxproj.filters
index 32cd0ca8b..0d874bf5b 100644
--- a/projects/mtg/template.vcxproj.filters
+++ b/projects/mtg/template.vcxproj.filters
@@ -363,9 +363,6 @@
     <ClInclude Include="include\CardDisplay.h">
       <Filter>inc</Filter>
     </ClInclude>
-    <ClInclude Include="include\CardEffect.h">
-      <Filter>inc</Filter>
-    </ClInclude>
     <ClInclude Include="include\CardGui.h">
       <Filter>inc</Filter>
     </ClInclude>
@@ -528,9 +525,6 @@
     <ClInclude Include="include\OptionItem.h">
       <Filter>inc</Filter>
     </ClInclude>
-    <ClInclude Include="include\OSD.h">
-      <Filter>inc</Filter>
-    </ClInclude>
     <ClInclude Include="include\PhaseRing.h">
       <Filter>inc</Filter>
     </ClInclude>
diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro
index 715823a8a..d9b1171fe 100644
--- a/projects/mtg/wagic-qt.pro
+++ b/projects/mtg/wagic-qt.pro
@@ -89,7 +89,6 @@ SOURCES += \
         src/AllAbilities.cpp\
         src/CardDescriptor.cpp\
         src/CardDisplay.cpp\
-        src/CardEffect.cpp\
         src/CardGui.cpp\
         src/CardPrimitive.cpp\
         src/CardSelector.cpp\
@@ -243,7 +242,6 @@ HEADERS  += \
         include/GameStateShop.h\
         include/MTGPack.h\
         include/TextScroller.h\
-        include/CardEffect.h\
         include/GameStateStory.h\
         include/MTGRules.h\
         include/ThisDescriptor.h\
@@ -254,7 +252,6 @@ HEADERS  += \
         include/Token.h\
         include/CardPrimitive.h\
         include/GuiAvatars.h\
-        include/OSD.h\
         include/Translate.h\
         include/CardSelector.h\
         include/GuiBackground.h\