Remove some dead code
This commit is contained in:
@@ -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_
|
|
||||||
@@ -20,7 +20,6 @@
|
|||||||
#include "MTGCard.h"
|
#include "MTGCard.h"
|
||||||
#include "MTGGameZones.h"
|
#include "MTGGameZones.h"
|
||||||
|
|
||||||
#include "CardEffect.h"
|
|
||||||
#ifdef NETWORK_SUPPORT
|
#ifdef NETWORK_SUPPORT
|
||||||
#include "JNetwork.h"
|
#include "JNetwork.h"
|
||||||
#endif //NETWORK_SUPPORT
|
#endif //NETWORK_SUPPORT
|
||||||
@@ -49,7 +48,6 @@ public:
|
|||||||
|
|
||||||
GameType gameType;
|
GameType gameType;
|
||||||
Rules * rules;
|
Rules * rules;
|
||||||
CardEffect *effect;
|
|
||||||
#ifdef NETWORK_SUPPORT
|
#ifdef NETWORK_SUPPORT
|
||||||
string mServerAddress;
|
string mServerAddress;
|
||||||
JNetwork* mpNetwork;
|
JNetwork* mpNetwork;
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -23,22 +23,6 @@
|
|||||||
#include "AIPlayer.h"
|
#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) :
|
GameStateDeckViewer::GameStateDeckViewer(GameApp* parent) :
|
||||||
GameState(parent, "deckeditor")
|
GameState(parent, "deckeditor")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -455,7 +455,6 @@
|
|||||||
<ClInclude Include="include\CacheEngine.h" />
|
<ClInclude Include="include\CacheEngine.h" />
|
||||||
<ClInclude Include="include\CardDescriptor.h" />
|
<ClInclude Include="include\CardDescriptor.h" />
|
||||||
<ClInclude Include="include\CardDisplay.h" />
|
<ClInclude Include="include\CardDisplay.h" />
|
||||||
<ClInclude Include="include\CardEffect.h" />
|
|
||||||
<ClInclude Include="include\CardGui.h" />
|
<ClInclude Include="include\CardGui.h" />
|
||||||
<ClInclude Include="include\CardPrimitive.h" />
|
<ClInclude Include="include\CardPrimitive.h" />
|
||||||
<ClInclude Include="include\CardSelector.h" />
|
<ClInclude Include="include\CardSelector.h" />
|
||||||
@@ -517,7 +516,6 @@
|
|||||||
<ClInclude Include="include\NetworkPlayer.h" />
|
<ClInclude Include="include\NetworkPlayer.h" />
|
||||||
<ClInclude Include="include\ObjectAnalytics.h" />
|
<ClInclude Include="include\ObjectAnalytics.h" />
|
||||||
<ClInclude Include="include\OptionItem.h" />
|
<ClInclude Include="include\OptionItem.h" />
|
||||||
<ClInclude Include="include\OSD.h" />
|
|
||||||
<ClInclude Include="include\PhaseRing.h" />
|
<ClInclude Include="include\PhaseRing.h" />
|
||||||
<ClInclude Include="include\Player.h" />
|
<ClInclude Include="include\Player.h" />
|
||||||
<ClInclude Include="include\PlayerData.h" />
|
<ClInclude Include="include\PlayerData.h" />
|
||||||
|
|||||||
@@ -363,9 +363,6 @@
|
|||||||
<ClInclude Include="include\CardDisplay.h">
|
<ClInclude Include="include\CardDisplay.h">
|
||||||
<Filter>inc</Filter>
|
<Filter>inc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="include\CardEffect.h">
|
|
||||||
<Filter>inc</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="include\CardGui.h">
|
<ClInclude Include="include\CardGui.h">
|
||||||
<Filter>inc</Filter>
|
<Filter>inc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@@ -528,9 +525,6 @@
|
|||||||
<ClInclude Include="include\OptionItem.h">
|
<ClInclude Include="include\OptionItem.h">
|
||||||
<Filter>inc</Filter>
|
<Filter>inc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="include\OSD.h">
|
|
||||||
<Filter>inc</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="include\PhaseRing.h">
|
<ClInclude Include="include\PhaseRing.h">
|
||||||
<Filter>inc</Filter>
|
<Filter>inc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
|||||||
@@ -89,7 +89,6 @@ SOURCES += \
|
|||||||
src/AllAbilities.cpp\
|
src/AllAbilities.cpp\
|
||||||
src/CardDescriptor.cpp\
|
src/CardDescriptor.cpp\
|
||||||
src/CardDisplay.cpp\
|
src/CardDisplay.cpp\
|
||||||
src/CardEffect.cpp\
|
|
||||||
src/CardGui.cpp\
|
src/CardGui.cpp\
|
||||||
src/CardPrimitive.cpp\
|
src/CardPrimitive.cpp\
|
||||||
src/CardSelector.cpp\
|
src/CardSelector.cpp\
|
||||||
@@ -243,7 +242,6 @@ HEADERS += \
|
|||||||
include/GameStateShop.h\
|
include/GameStateShop.h\
|
||||||
include/MTGPack.h\
|
include/MTGPack.h\
|
||||||
include/TextScroller.h\
|
include/TextScroller.h\
|
||||||
include/CardEffect.h\
|
|
||||||
include/GameStateStory.h\
|
include/GameStateStory.h\
|
||||||
include/MTGRules.h\
|
include/MTGRules.h\
|
||||||
include/ThisDescriptor.h\
|
include/ThisDescriptor.h\
|
||||||
@@ -254,7 +252,6 @@ HEADERS += \
|
|||||||
include/Token.h\
|
include/Token.h\
|
||||||
include/CardPrimitive.h\
|
include/CardPrimitive.h\
|
||||||
include/GuiAvatars.h\
|
include/GuiAvatars.h\
|
||||||
include/OSD.h\
|
|
||||||
include/Translate.h\
|
include/Translate.h\
|
||||||
include/CardSelector.h\
|
include/CardSelector.h\
|
||||||
include/GuiBackground.h\
|
include/GuiBackground.h\
|
||||||
|
|||||||
Reference in New Issue
Block a user