Merge branch 'master' into develop

.travis.yml

@@ -1,2 +1,17 @@
 language: cpp
-script: "qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug && make -j 8 && ./wagic"
+before_install:
+  - export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk"
+  - export PSPSDK="$PSPDEV/psp/sdk"
+  - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin"
+  - export ANDROID="android-sdk-linux/tools/android"
+install:
+  - sudo apt-get update -qq
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
+  - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download
+  - tar -x --xz -f sdk.lzma
+  - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv
+  - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv
+  - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2
+  - tar -zxf android-sdk_r22-linux.tgz
+  - echo yes | $ANDROID update sdk --filter 1,2,3,8 --no-ui --force > log.txt
+script: "./travis-script.sh"

JGE/include/DebugRoutines.h

@@ -4,6 +4,8 @@
 // dirty, but I get OS header includes this way
 #include "JGE.h"
 
+#include "OutputCapturer.h"
+
 #include <ostream>
 #include <iostream>
 #include <iomanip>
@@ -29,12 +31,23 @@ std::string ToHex(T* pointer)
 #if defined (WIN32) || defined (LINUX)
 
 #ifdef QT_CONFIG
+
+#ifdef CAPTURE_STDERR
 #define DebugTrace(inString)								\
 {															\
   std::ostringstream stream;								\
   stream << inString;					    \
-  qDebug("%s", stream.str().c_str());	                        \
+  OutputCapturer::add(stream.str()); \
 }
+#else // CAPTURE_STDERR
+#define DebugTrace(inString)								\
+{															\
+  std::ostringstream stream;								\
+  stream << inString;					    \
+  qDebug("%s", stream.str().c_str()); \
+}
+#endif // CAPTURE_STDERR
+
 #elif defined (ANDROID)
 #include <android/log.h>
 #define DebugTrace(inString)								\

JGE/include/JGE.h

@@ -44,6 +44,17 @@ typedef WPARAM LocalKeySym;
 #include <X11/keysym.h>
 typedef KeySym LocalKeySym;
 #define LOCAL_KEY_NONE XK_VoidSymbol
+#undef Status
+#undef Bool
+#undef None
+#undef CursorShape
+#undef KeyPress
+#undef KeyRelease
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
+#undef Unsorted
+#undef GrayScale
 
 #elif defined(ANDROID) // This is temporary until we understand how to send real key events from Java
 typedef long unsigned int LocalKeySym;

JGE/include/JRenderer.h

@@ -578,7 +578,7 @@ private:
 #if (!defined PSP)
 	
 	GLuint mCurrentTex;
-#if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) || (defined WIN32)
+#if ((defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) || (defined WIN32)) && (!defined CONSOLE_CONFIG)
   // MVP matrix
   ESMatrix  theMvpMatrix;
 

JGE/include/JSoundSystem.h

@@ -25,8 +25,7 @@
 #elif defined USE_PHONON
     #include <phonon/AudioOutput>
     #include <phonon/MediaObject>
-#else
+#elif defined WIN32
-#ifdef WIN32
     #include <windows.h>
 #define WITH_FMOD
 #elif defined (PSP)
@@ -43,10 +42,10 @@
     #include "JAudio.h"
     #include "JMP3.h"
 #endif
+
 #ifdef WITH_FMOD
     #include "../Dependencies/include/fmod.h"
 #endif
-#endif
 
 //------------------------------------------------------------------------------------------------
 using namespace std;

JGE/include/JTypes.h

@@ -75,16 +75,7 @@ enum {
 #define SCREEN_HEIGHT_F			272.0f
 
 
-#ifdef WIN32
+#ifdef CONSOLE_CONFIG
-//	#define DEFAULT_BLEND		BLEND_DEFAULT
-//	#define BLEND_OPTION_ADD	BLEND_COLORADD
-//	#define BLEND_OPTION_BLEND	(BLEND_COLORADD | BLEND_ALPHABLEND | BLEND_NOZWRITE)
-#else
-#ifndef CONSOLE_CONFIG
-#define DEFAULT_BLEND		GU_TFX_MODULATE
-#define BLEND_OPTION_ADD	GU_TFX_ADD
-#define BLEND_OPTION_BLEND	GU_TFX_BLEND
-#else
 #define DEFAULT_BLEND		0
 #define BLEND_OPTION_ADD	0
 #define BLEND_OPTION_BLEND	0
@@ -100,9 +91,17 @@ enum {
 #define BLEND_ONE_MINUS_DST_COLOR	0
 #define BLEND_SRC_ALPHA_SATURATE	0
 #define GU_PSM_5551                 0
-
+#else
-#endif // CONSOLE_CONFIG
+#ifdef WIN32
+//	#define DEFAULT_BLEND		BLEND_DEFAULT
+//	#define BLEND_OPTION_ADD	BLEND_COLORADD
+//	#define BLEND_OPTION_BLEND	(BLEND_COLORADD | BLEND_ALPHABLEND | BLEND_NOZWRITE)
+#else
+#define DEFAULT_BLEND		GU_TFX_MODULATE
+#define BLEND_OPTION_ADD	GU_TFX_ADD
+#define BLEND_OPTION_BLEND	GU_TFX_BLEND
 #endif
+#endif // CONSOLE_CONFIG
 
 #if (defined WIN32) && (!defined LINUX)
 	#include <windows.h>
@@ -111,6 +110,10 @@ enum {
 typedef uint8_t byte;
 typedef uint32_t DWORD;
 typedef uint8_t BYTE;
+#ifndef IOS
+typedef bool BOOL;
+#endif
+#endif
 
 typedef int8_t s8;
 typedef int16_t s16;
@@ -121,12 +124,9 @@ typedef uint32_t u32;
 #define PIXEL_TYPE DWORD
 #define ARGB(a, r, g, b)		((PIXEL_TYPE)((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
 #define RGBA(r, g, b, a)		((PIXEL_TYPE)((a) << 24) | ((b) << 16) | ((g) << 8) | (r))
+#ifndef PSP
 #define TEXTURE_FORMAT			0
-#ifndef IOS
+#endif  //PSP
-typedef bool BOOL;
-#endif
-#endif
-
 
 
 #ifndef CONSOLE_CONFIG
@@ -144,7 +144,7 @@ typedef bool BOOL;
 #include <GL/glu.h>
 #endif
 #else
-# include <QtOpenGL>
+#include <QtOpenGL>
 #endif
 
 #if (defined FORCE_GLES)
@@ -158,14 +158,12 @@ typedef bool BOOL;
 #endif
 
 #if defined (PSP)
-
 #ifndef ABGR8888
 #define ABGR8888
 #endif
 
 
 #if defined (ABGR8888)
-#define PIXEL_TYPE				u32
 #ifndef ARGB
 #define ARGB(a, r, g, b)		(PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r)	// macro to assemble pixels in correct format
 #endif
@@ -267,6 +265,7 @@ typedef struct
 #endif
 #else
 typedef uint32_t GLuint;
+typedef float GLfloat;
 #endif //CONSOLE_CONFIG
 
 //------------------------------------------------------------------------------------------------

JGE/include/OutputCapturer.h

@@ -0,0 +1,23 @@
+#ifndef OUTPUTCAPTURER_H
+#define OUTPUTCAPTURER_H
+
+#if defined(QT_CONFIG)
+#include <Qt>
+#include <string>
+#include <sstream>
+#include "Threading.h"
+
+class OutputCapturer
+{
+private:
+    static std::ostringstream stream;
+    static boost::mutex mMutex;
+
+public:
+    static void add(const std::string& s);
+    static void debugAndClear();
+    static void clear();
+};
+#endif
+
+#endif // OUTPUTCAPTURER_H

JGE/include/Threading.h

@@ -315,7 +315,6 @@ namespace boost
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "../include/DebugRoutines.h"
 #include "../include/JLogger.h"
 
 namespace boost

JGE/include/Vector3D.h

@@ -3,15 +3,6 @@
 
 #include <math.h>
 
-
-/*************************** Macros and constants ***************************/
-// returns a number ranging from -1.0 to 1.0
-#define FRAND   (((float)rand()-(float)rand())/RAND_MAX)
-#define Clamp(x, min, max)  x = (x<min  ? min : x<max ? x : max);
-
-#define SQUARE(x)  (x)*(x)
-
-
 struct Vector3D
 {
   Vector3D(float x, float y, float z) : x(x), y(y), z(z) {}
@@ -63,7 +54,7 @@ struct Vector3D
 
   float Length()
   {
-    float length = (float)sqrt(SQUARE(x) + SQUARE(y) + SQUARE(z));
+    float length = sqrt(x*x + y*y + z*z);
     return (length != 0.0f) ? length : 1.0f;
   }
 

JGE/src/JFileSystem.cpp

@@ -16,7 +16,9 @@ User folder is the only one that is really needed to guarantee both read and wri
 The content that users should not be touching.
 */
 
+#ifndef PSP
 #include "PrecompiledHeader.h"
+#endif //PSP
 
 #ifdef WIN32
 #pragma warning(disable : 4786)

JGE/src/OutputCapturer.cpp

@@ -0,0 +1,22 @@
+#include "../include/OutputCapturer.h"
+
+std::ostringstream OutputCapturer::stream;
+boost::mutex OutputCapturer::mMutex;
+
+void OutputCapturer::add(const std::string& s)
+{
+    boost::mutex::scoped_lock lock(mMutex);
+    stream << s << "\n";
+}
+
+void OutputCapturer::debugAndClear()
+{
+    stream.flush();
+    qDebug("%s", stream.str().c_str());
+    stream.str("");
+}
+
+void OutputCapturer::clear()
+{
+    stream.str("");
+}

JGE/src/Qtconsole.cpp

@@ -9,9 +9,8 @@
 #include "GameOptions.h"
 #include "MTGDeck.h"
 #include "DebugRoutines.h"
-
-#include <sys/time.h>
 #include <QCoreApplication>
+#include <QElapsedTimer>
 
 class WagicWrapper
 {
@@ -19,17 +18,21 @@ public:
     WagicWrapper();
     virtual ~WagicWrapper();
 
+public:
+    // used mainly to mesure the delta between 2 updates
+    static QElapsedTimer g_startTimer;
+
 private:
     JGE* m_engine;
     JApp* m_app;
     JGameLauncher* m_launcher;
 };
 
+QElapsedTimer WagicWrapper::g_startTimer;
+
 int JGEGetTime()
 {
-  struct timeval tv;
+    return (int)WagicWrapper::g_startTimer.elapsed();
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }
 
 bool JGEToggleFullscreen()
@@ -57,6 +60,7 @@ WagicWrapper::WagicWrapper()
     m_app->Create();
     m_engine->SetApp(m_app);
     JRenderer::GetInstance()->Enable2D();
+    g_startTimer.restart();
 }
 
 WagicWrapper::~WagicWrapper()
@@ -92,7 +96,11 @@ int main(int argc, char* argv[])
     options.reloadProfile();
     TestSuite testSuite("test/_tests.txt");
     result = testSuite.run();
+    int totalTests = testSuite.nbTests + testSuite.nbAITests;
     delete wagicCore;
-    DebugTrace("TestSuite done: failed test: " << result);
+    DebugTrace("TestSuite done: failed test: " << result << " out of " << totalTests << " total");
+#ifdef CAPTURE_STDERR
+    OutputCapturer::debugAndClear();
+#endif
     return result;
 }

JGE/src/pc/JGfx.cpp

@@ -823,7 +823,7 @@ void JRenderer::BeginScene()
     esMatrixLoadIdentity(&theMvpMatrix);
     esOrtho(&theMvpMatrix, 0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f,-1.0f, 1.0f);
 #endif //(!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
-#if (defined WIN32) || ((defined GL_VERSION_ES_CM_1_1) && (!defined IOS))
+#if (defined WIN32 && !defined GL_ES_VERSION_2_0) || ((defined GL_VERSION_ES_CM_1_1) && (!defined IOS))
     float scaleH = mActualHeight/SCREEN_HEIGHT_F;
     float scaleW = mActualWidth/SCREEN_WIDTH_F;
     if (scaleH != 1.0f || scaleW != 1.0f)

projects/mtg/Android/.gitignore

@@ -1,2 +1,3 @@
 /gen
+/bin
 

projects/mtg/Android/AndroidManifest.xml

@@ -14,5 +14,5 @@
         
         <activity android:configChanges="keyboard|keyboardHidden|orientation" android:name="com.google.ads.AdActivity" android:screenOrientation="sensorLandscape"/>
     </application>
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="9"/>
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
 </manifest>

projects/mtg/Android/gen/R.java.d

@@ -1,10 +0,0 @@
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/gen/net/wagic/app/R.java \
- : /Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/res/drawable-hdpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/res/drawable-ldpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/res/drawable-mdpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/res/layout/main.xml \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/res/values/strings.xml \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/bin/res/drawable-hdpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/bin/res/drawable-ldpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/bin/res/drawable-mdpi/icon.png \
-/Volumes/data/home/mnguyen/Projects/eclipse-workspace/wagic/projects/mtg/Android/bin/AndroidManifest.xml \

projects/mtg/Android/gen/net/wagic/app/BuildConfig.java

@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package net.wagic.app;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}

projects/mtg/Android/gen/net/wagic/app/R.java

@@ -1,27 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package net.wagic.app;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int mainLayout=0x7f050000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int app_version=0x7f040001;
-        public static final int info_text=0x7f040002;
-    }
-}

projects/mtg/Android/jni/Android.mk

@@ -41,7 +41,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
         $(MTG_PATH)/src/AllAbilities.cpp \
         $(MTG_PATH)/src/CardDescriptor.cpp \
         $(MTG_PATH)/src/CardDisplay.cpp \
-        $(MTG_PATH)/src/CardEffect.cpp \
         $(MTG_PATH)/src/CardGui.cpp \
         $(MTG_PATH)/src/CardPrimitive.cpp \
         $(MTG_PATH)/src/CardSelector.cpp \

projects/mtg/Android/src/org/libsdl/app/SDLActivity.java

@@ -54,10 +54,6 @@ import android.view.View.OnKeyListener;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
 
-import com.google.ads.AdRequest;
-import com.google.ads.AdSize;
-import com.google.ads.AdView;
-
 /**
  * SDL Activity
  */
@@ -68,7 +64,6 @@ public class SDLActivity extends Activity implements OnKeyListener
     public static String       TAG                                   = Activity.class.getCanonicalName();
 
     // Main components
-    private static AdView      mAdView;
     private static SDLActivity mSingleton;
     private static SDLSurface  mSurface;
 
@@ -422,25 +417,12 @@ public class SDLActivity extends Activity implements OnKeyListener
         SurfaceHolder holder = mSurface.getHolder();
         holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 
-        // Create the adView
-        mAdView = new AdView(this, AdSize.BANNER, "a14e9009f88864f"); // "a14dc0ab7b27413" <-- for the alpha);
-
         _videoLayout.addView(mSurface, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
-        _videoLayout.addView(mAdView, new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM + Gravity.CENTER_HORIZONTAL));
         // mGLView.setFocusableInTouchMode(true);
         // mGLView.setFocusable(true);
         // adView.requestFreshAd();
         setContentView(_videoLayout, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
         mSurface.requestFocus();
-
-        AdRequest request = new AdRequest();
-
-        request.addTestDevice(AdRequest.TEST_EMULATOR);
-        request.addTestDevice("1DA1E070BC7D4ABE8BA77EB73C2CB0AA"); // wololo's phone
-        request.addTestDevice("C386F3830A9789C649098A817BF54C04"); // xawotihs's tablet
-
-        // Initiate a generic request to load it with an ad
-        mAdView.loadAd(request);
     }
 
     // Setup
@@ -512,14 +494,6 @@ public class SDLActivity extends Activity implements OnKeyListener
         {
             return;
         }
-
-        if ((command.compareTo("entergamestate:menu") == 0) || (command.compareTo("enterduelphase:end") == 0))
-        {
-            mAdView.setVisibility(View.VISIBLE);
-        } else if (command.compareTo("leavegamestate:menu") == 0)
-        {
-            mAdView.setVisibility(View.INVISIBLE);
-        }
     }
 
     // Messages from the SDLMain thread

projects/mtg/Makefile

@@ -1,4 +1,33 @@
-OBJS = objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIHints.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIPlayerBaka.o objs/AIStats.o objs/AllAbilities.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardPrimitive.o objs/CardSelector.o objs/CardSelectorSingleton.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DeckDataWrapper.o objs/DeckEditorMenu.o objs/DeckMenu.o objs/DeckMenuItem.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o  objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/IconButton.o objs/ManaCost.o objs/ManaCostHybrid.o  objs/MenuItem.o objs/ModRules.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGPack.o objs/MTGRules.o objs/Navigator.o objs/ObjectAnalytics.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o  objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/PlayRestrictions.o objs/Pos.o objs/PrecompiledHeader.o objs/PriceList.o objs/ReplacementEffects.o objs/Rules.o objs/SimpleMenu.o objs/SimpleButton.o objs/SimpleMenuItem.o objs/SimplePad.o objs/SimplePopup.o objs/StoryFlow.o objs/StyleManager.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o objs/WFont.o
+OBJS	= objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.o\
+	objs/ActionLayer.o objs/ActionStack.o objs/AIHints.o objs/AIMomirPlayer.o\
+	objs/AIPlayer.o objs/AIPlayerBaka.o objs/AIStats.o objs/AllAbilities.o\
+	objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o\
+	objs/CardPrimitive.o objs/CardSelector.o objs/CardSelectorSingleton.o\
+	objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o\
+	objs/DeckDataWrapper.o objs/DeckEditorMenu.o objs/DeckMenu.o\
+	objs/DeckMenuItem.o objs/DeckMetaData.o objs/DeckStats.o objs/DuelLayers.o\
+	objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o\
+	objs/GameObserver.o objs/GameOptions.o objs/GameState.o\
+	objs/GameStateAwards.o objs/GameStateDeckViewer.o objs/GameStateDuel.o\
+	objs/DeckManager.o objs/GameStateMenu.o objs/GameStateOptions.o\
+	objs/GameStateShop.o objs/GameStateStory.o objs/GameStateTransitions.o\
+	objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o\
+	objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o\
+	objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o\
+	objs/IconButton.o objs/ManaCost.o objs/ManaCostHybrid.o  objs/MenuItem.o\
+	objs/ModRules.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o\
+	objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o\
+	objs/MTGPack.o objs/MTGRules.o objs/Navigator.o objs/ObjectAnalytics.o\
+	objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o\
+	objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/PlayRestrictions.o\
+	objs/Pos.o objs/PrecompiledHeader.o objs/PriceList.o objs/ReplacementEffects.o\
+	objs/Rules.o objs/SimpleMenu.o objs/SimpleButton.o objs/SimpleMenuItem.o\
+	objs/SimplePad.o objs/SimplePopup.o objs/StoryFlow.o objs/StyleManager.o\
+	objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o\
+	objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o\
+	objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o\
+	objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o\
+	objs/WFont.o
 DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))
 
 RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)

projects/mtg/bin/Res/sets/V13/_cards.dat

@@ -0,0 +1,106 @@
+[meta]
+author=Wagic Team
+name=From the Vault: Twenty
+block=Vault
+year=2013
+[/meta]
+[card]
+primitive=Akroma's Vengeance
+id=373328
+rarity=M
+[/card]
+[card]
+primitive=Chainer's Edict
+id=373317
+rarity=M
+[/card]
+[card]
+primitive=Chameleon Colossus
+id=373321
+rarity=M
+[/card]
+[card]
+primitive=Char
+id=373332
+rarity=M
+[/card]
+[card]
+primitive=Cruel Ultimatum
+id=373318
+rarity=M
+[/card]
+[card]
+primitive=Dark Ritual
+id=373329
+rarity=M
+[/card]
+[card]
+primitive=Fact or Fiction
+id=373325
+rarity=M
+[/card]
+[card]
+primitive=Fyndhorn Elves
+id=373320
+rarity=M
+[/card]
+[card]
+primitive=Gilded Lotus
+id=373335
+rarity=M
+[/card]
+[card]
+primitive=Green Sun's Zenith
+id=373333
+rarity=M
+[/card]
+[card]
+primitive=Hymn to Tourach
+id=373324
+rarity=M
+[/card]
+[card]
+primitive=Impulse
+id=373330
+rarity=M
+[/card]
+[card]
+primitive=Ink-Eyes, Servant of Oni
+id=373327
+rarity=M
+[/card]
+[card]
+primitive=Jace, the Mind Sculptor
+id=373316
+rarity=M
+[/card]
+[card]
+primitive=Kessig Wolf Run
+id=373323
+rarity=M
+[/card]
+[card]
+primitive=Swords to Plowshares
+id=373334
+rarity=M
+[/card]
+[card]
+primitive=Tangle Wire
+id=373322
+rarity=M
+[/card]
+[card]
+primitive=Thran Dynamo
+id=373331
+rarity=M
+[/card]
+[card]
+primitive=Venser, Shaper Savant
+id=373326
+rarity=M
+[/card]
+[card]
+primitive=Wall of Blossoms
+id=373319
+rarity=M
+[/card]

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -17432,7 +17432,7 @@ toughness=4
 [card]
 name=Cranial Plating
 auto=foreach(artifact|mybattlefield) 1/0
-auto={B}{B}:attach
+auto={B}{B}:name(attach) retarget target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature gets +1/+0 for each artifact you control. -- {B}{B}: Attach Cranial Plating to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -23286,7 +23286,7 @@ type=Sorcery
 [/card]
 [card]
 name=Dragon Hatchling
-auto={1}{R}:1/0
+auto={R}:1/0
 abilities=flying
 text=Flying -- {R}: Dragon Hatchling gets +1/+0 until end of turn.
 mana={1}{R}
@@ -39826,7 +39826,7 @@ name=Healer's Headdress
 auto={1}:equip
 auto=0/2
 auto=teach(creature) {T}:prevent:1 target(creature,player)
-auto={W}{W}:attach
+auto={W}{W}:name(attach) retarget target(creature|mybattlefield)
 text=Equipped creature gets +0/+2 and has "{T}: Prevent the next 1 damage that would be dealt to target creature or player this turn." -- {W}{W}: Attach Healer's Headdress to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
 type=Artifact
@@ -41596,7 +41596,7 @@ toughness=2
 name=Horned Helm
 auto=1/1
 auto=trample
-auto={G}{G}:attach
+auto={G}{G}:name(attach) retarget target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature gets +1/+1 and has trample. -- {G}{G}: Attach Horned Helm to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -54155,6 +54155,18 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Master of Waves
+abilities=protection from red
+auto=lord(Elemental|mybattlefield) 1/1
+auto=token(Elemental,Creature Elemental,1/0)*type:manaU
+text=Protection from red. -- Elemental creatures you control get +1/+1. -- When Master of Waves enters the battlefield, put a number of 1/0 blue Elemental creature tokens onto the battlefield equal to your devotion to blue. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.)
+mana={3}{U}
+type=Creature
+subtype=Merfolk Wizard
+power=2
+toughness=1
+[/card]
+[card]
 name=Master Splicer
 auto=token(Golem,Artifact Creature Golem,3/3)
 auto=lord(golem|mybattlefield) 1/1
@@ -59971,7 +59983,7 @@ toughness=2
 [card]
 name=Neurok Stealthsuit
 auto=teach(creature) shroud
-auto={U}{U}:attach
+auto={U}{U}:name(attach) retarget target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature has shroud. (It can't be the target of spells or abilities.) -- {U}{U}: Attach Neurok Stealthsuit to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}
@@ -83425,7 +83437,7 @@ toughness=3
 [card]
 name=Sparring Collar
 auto=first strike
-auto={R}{R}:attach
+auto={R}{R}:name(attach) retarget target(creature|mybattlefield)
 auto={1}:equip
 text=Equipped creature has first strike. -- {R}{R}: Attach Sparring Collar to target creature you control. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
 mana={2}

projects/mtg/bin/Res/test/_tests.txt

@@ -226,6 +226,7 @@ colossus_of_sardia1.txt
 colossus_of_sardia2.txt
 composite_golem.txt
 conservator.txt
+consign_to_dream.txt
 Contagion_Clasp.txt
 control_magic.txt
 control_magic2.txt

projects/mtg/bin/Res/test/consign_to_dream.txt

@@ -0,0 +1,25 @@
+# Test TargetChooser based on negation of two colors
+# Grizzly bear should be put on top of library
+
+# name=Consign to Dream
+# Return target permanent to its owner's hand. 
+# If that permanent is red or green, put it on top of its owner's library 
+
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Consign to Dream
+manapool:{2}{U}
+inplay:grizzly bears
+[PLAYER2]
+[DO]
+Consign to Dream
+grizzly bears
+endinterruption
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Consign to Dream
+library:grizzly bears
+[PLAYER2]
+[END]

projects/mtg/include/ActionElement.h

@@ -9,10 +9,6 @@
 #include <JGui.h>
 #include "MTGDefinitions.h"
 
-#define INACTIVE 0
-#define ACTION_REQUESTED 1
-#define ACTIVE 2
-
 class MTGCardInstance;
 class ManaCost;
 class Targetable;
@@ -22,31 +18,33 @@ class WEvent;
 class ActionElement: public JGuiObject
 {
 protected:
-    int activeState;
+    enum Activity{
+        Inactive,
+        ActionRequested,
+        Active
+    };
+
+    Activity activity;
     TargetChooser * tc;
 public:
     GamePhase currentPhase;
     GamePhase newPhase;
     int modal;
     int waitingForAnswer;
-    int getActivity();
+    virtual void Update(float){}
-    virtual void Update(float){};
+    virtual void Render(){}
-    virtual void Render(){};
     virtual int testDestroy()
     {
         return 0;
     }
-    ;
     virtual int destroy()
     {
         return 0;
     }
-    ;
     virtual bool CheckUserInput(JButton)
     {
         return false;
     }
-    ;
     ActionElement(int id);
     ActionElement(const ActionElement& copyFromMe);
     TargetChooser * getActionTc(){return tc;}
@@ -62,27 +60,22 @@ public:
     {
         return 0;
     }
-    ;
     virtual int stillInUse(MTGCardInstance *)
     {
         return 0;
     }
-    ;
     virtual int receiveEvent(WEvent *)
     {
         return 0;
     }
-    ;
     virtual int reactToClick(MTGCardInstance *)
     {
         return 0;
     }
-    ;
     virtual const char * getMenuText()
     {
         return "Ability";
     }
-    ;
     virtual ActionElement * clone() const = 0;
 
 };

projects/mtg/include/ActionStack.h

@@ -41,16 +41,9 @@ class DamageStack;
 class ManaCost;
 class TargetChooser;
 
-
-#define ACTIONSTACK_STANDARD 0
-#define ACTIONSTACK_TARGET 1
-
 class Interruptible: public PlayGuiObject, public Targetable
 {
 public:
-    //TODO : remove these when they are back in PlayGuiObject
-    float x, y;
-
     int state, display;
     MTGCardInstance * source;
     virtual void Entering()
@@ -186,6 +179,11 @@ public:
 class ActionStack :public GuiLayer
 {
 public:
+    enum ActionStackMode{
+        ACTIONSTACK_STANDARD = 0,
+        ACTIONSTACK_TARGET = 1
+    };
+
     typedef enum
     {
         NOT_DECIDED = 0,
@@ -207,7 +205,7 @@ protected:
     InterruptDecision interruptDecision[2];
     float timer;
     int currentState;
-    int mode;
+    ActionStackMode mode;
     int checked;
     ATutorialMessage* currentTutorial;
     int interruptBtnXOffset, noBtnXOffset, noToAllBtnXOffset, interruptDialogWidth;

projects/mtg/include/AllAbilities.h

@@ -873,8 +873,8 @@ public:
             return 0;
         if (!tc->canTarget(e->damage->target)) return 0;
         if (fromTc && !fromTc->canTarget(e->damage->source)) return 0;
-        if (type == 1 && e->damage->typeOfDamage != DAMAGE_COMBAT) return 0;
+        if (type == 1 && e->damage->typeOfDamage != Damage::DAMAGE_COMBAT) return 0;
-        if (type == 2 && e->damage->typeOfDamage == DAMAGE_COMBAT) return 0;
+        if (type == 2 && e->damage->typeOfDamage == Damage::DAMAGE_COMBAT) return 0;
         e->damage->target->thatmuch = e->damage->damage;
         e->damage->source->thatmuch = e->damage->damage;
         this->source->thatmuch = e->damage->damage;
@@ -2577,7 +2577,7 @@ public:
         }
         else
         {
-            if (d->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+            if (d->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             {
                 a->source = (MTGCardInstance *) d;
             }
@@ -2725,7 +2725,7 @@ public:
         }
         else
         {
-            if (d->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+            if (d->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             {
                 a->source = (MTGCardInstance *) d;
             }
@@ -2794,113 +2794,24 @@ public:
 //equipment
 class AEquip: public TargetAbility
 {
-public:
+private:
+    bool isAttach;
     vector<MTGAbility *> currentAbilities;
-    AEquip(GameObserver* observer, int _id, MTGCardInstance * _source, ManaCost * _cost = NULL, int restrictions =
+
-            ActivatedAbility::AS_SORCERY) :
+public:
-        TargetAbility(observer, _id, _source, NULL, _cost, restrictions)
+    AEquip(GameObserver* observer, int _id, MTGCardInstance * _source, ManaCost * _cost = NULL,
-    {
+        int restrictions = ActivatedAbility::AS_SORCERY);
-        aType = MTGAbility::STANDARD_EQUIP;
-    }
     
-    int unequip()
+    int unequip();
-    {
+    int equip(MTGCardInstance * equipped);
-        if (source->target)
-        {
-            source->target->equipment -= 1;
-            source->parentCards.clear();
-            for(unsigned int w = 0;w < source->target->childrenCards.size();w++)
-            {
-                MTGCardInstance * child = source->target->childrenCards[w];
-                if(child == source)
-                    source->target->childrenCards.erase(source->target->childrenCards.begin() + w);
-            }
-        }
-        source->target = NULL;
-        for (size_t i = 0; i < currentAbilities.size(); ++i)
-        {
-            MTGAbility * a = currentAbilities[i];
-            if (dynamic_cast<AEquip *> (a) || dynamic_cast<ATeach *> (a) || dynamic_cast<AAConnect *> (a) || (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot))
-            {
-                SAFE_DELETE(a);
-                continue;
-            }
-            game->removeObserver(currentAbilities[i]);
-        }
-        currentAbilities.clear();
-        return 1;
-    }
 
-    int equip(MTGCardInstance * equipped)
+    int resolve();
-    {
+    const char * getMenuText();
-        source->target = equipped;
-        source->target->equipment += 1;
-        source->parentCards.push_back(equipped);
-        source->target->childrenCards.push_back((MTGCardInstance*)source);
-        AbilityFactory af(game);
-        af.getAbilities(&currentAbilities, NULL, source);
-        for (size_t i = 0; i < currentAbilities.size(); ++i)
-        {
-            MTGAbility * a = currentAbilities[i];
-            if (dynamic_cast<AEquip *> (a)) continue;
-            if (dynamic_cast<ATeach *> (a)) continue;
-            if (dynamic_cast<AAConnect *> (a)) continue;
-            if (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot)
-            {
-            a->forceDestroy = 1;
-            continue;
-            }
-            if (dynamic_cast<AACopier *> (af.getCoreAbility(a)))
-            {
-                a->forceDestroy = 1;
-                continue;
-            }
-            //we generally dont want to pass oneShot tokencreators to the cards
-            //we equip...
-            a->addToGame();
-        }
-        return 1;
 
-    }
+    int testDestroy();
-
+    int destroy();
-    int resolve()
-    {
-        MTGCardInstance * mTarget = tc->getNextCardTarget();
-        if (!mTarget) return 0;
-        if (mTarget == source) return 0;
-        unequip();
-        equip(mTarget);
-        return 1;
-    }
-
-    const char * getMenuText()
-    {
-        return "Equip";
-    }
-
-    int testDestroy()
-    {
-        if (source->target && !game->isInPlay(source->target)) 
-        unequip();
-        if(!game->connectRule)
-        {
-        if (source->target && TargetAbility::tc && !TargetAbility::tc->canTarget((Targetable *)source->target,true)) 
-        unequip();
-        }
-        return TargetAbility::testDestroy();
-    }
-
-    int destroy()
-    {
-        unequip();
-        return TargetAbility::destroy();
-    }
-
-    AEquip * clone() const
-    {
-        return NEW AEquip(*this);
-    }
 
+    AEquip * clone() const;
 };
 
 class ATokenCreator: public ActivatedAbility
@@ -5638,7 +5549,7 @@ public:
         {
             WEventDamage * e = (WEventDamage *) event;
             Damage * d = e->damage;
-            if (combatonly && e->damage->typeOfDamage != DAMAGE_COMBAT) 
+            if (combatonly && e->damage->typeOfDamage != Damage::DAMAGE_COMBAT)
                 return 0;
             MTGCardInstance * card = d->source;
             if (d->damage > 0 && card && (card == source || card == source->target))

projects/mtg/include/CacheEngine.h

@@ -1,3 +1,6 @@
+#ifndef _CACHE_ENGINE_H_
+#define _CACHE_ENGINE_H_
+
 #include "PrecompiledHeader.h"
 
 #include "Threading.h"
@@ -208,3 +211,5 @@ public:
 
 CardRetrieverBase* CacheEngine::sInstance = NULL;
 bool CacheEngine::sIsThreaded = false;
+
+#endif //_CACHE_ENGINE_H_

projects/mtg/include/CardDescriptor.h

@@ -9,9 +9,6 @@
 #include "MTGGameZones.h"
 #include "Counters.h"
 
-#define CD_OR 1
-#define CD_AND 2
-
 enum ENUM_COMPARISON_MODES
   {
     COMPARISON_NONE = 0,  // Needs to remain 0 for quick if(comparison_mode) checks
@@ -31,7 +28,12 @@ class CardDescriptor: public MTGCardInstance
     MTGCardInstance * match_not(MTGCardInstance * card);
   bool valueInRange(int comparisonMode, int value, int criterion);
  public:
-  int mode;
+  enum Operator{
+      CD_OR = 1,
+      CD_AND = 2
+  };
+
+  Operator mode;
   int powerComparisonMode;
   int toughnessComparisonMode;
   int manacostComparisonMode;

projects/mtg/include/CardEffect.h

@@ -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_

projects/mtg/include/Damage.h

@@ -11,17 +11,15 @@ class JGuiObject;
 class MTGCardInstance;
 class GameObserver;
 
-#define DAMAGEABLE_MTGCARDINSTANCE 0
-#define DAMAGEABLE_PLAYER 1
-
-#define DAMAGE_ALL_TYPES 0
-#define DAMAGE_COMBAT 1
-#define DAMAGE_OTHER 2
-
 class Damageable:public Targetable
 {
 protected:
 public:
+    enum DamageableType{
+        DAMAGEABLE_MTGCARDINSTANCE = 0,
+        DAMAGEABLE_PLAYER
+    };
+
     int life;
     int handsize;
     int poisonCount;
@@ -29,12 +27,14 @@ public:
     int preventable;
     int thatmuch;
     int lifeLostThisTurn;
-    int type_as_damageable;
+    DamageableType type_as_damageable;
     Damageable(GameObserver* observer, int _life)
-        : Targetable(observer)
+        : Targetable(observer), life(_life), handsize(0),
-        {life=_life;lifeLostThisTurn = 0;};
+          poisonCount(0), damageCount(0), preventable(0), thatmuch(0),
-    int getLife(){return life;};
+          lifeLostThisTurn(0), type_as_damageable(DAMAGEABLE_MTGCARDINSTANCE)
-    virtual int dealDamage(int damage){life-=damage;return life;};
+        {}
+    int getLife(){return life;}
+    virtual int dealDamage(int damage){life-=damage;return life;}
     virtual int afterDamage(){return 0;}
     virtual int poisoned(){return 0;}
     virtual int prevented(){return 0;}
@@ -47,17 +47,23 @@ public:
 
 class Damage: public Interruptible
 {
- protected:
-  void init(MTGCardInstance * source, Damageable * target, int damage, int typeOfDamage);
  public:
+  enum DamageType{
+      DAMAGE_ALL_TYPES = 0,
+      DAMAGE_COMBAT,
+      DAMAGE_OTHER
+  };
+
   Damageable * target;
-  int typeOfDamage;
+  DamageType typeOfDamage;
   int damage;
   void Render();
   Damage(GameObserver* observer, MTGCardInstance* source, Damageable * target);
-  Damage(GameObserver* observer, MTGCardInstance* source, Damageable * target, int damage, int typeOfDamage = DAMAGE_OTHER);
+  Damage(GameObserver* observer, MTGCardInstance* source, Damageable * target, int damage, DamageType typeOfDamage = DAMAGE_OTHER);
   int resolve();
   virtual ostream& toString(ostream& out) const;
+ protected:
+  void init(MTGCardInstance * source, Damageable * target, int damage, DamageType typeOfDamage);
 };
 
 class DamageStack : public GuiLayer, public Interruptible

projects/mtg/include/DeckEditorMenu.h

@@ -1,3 +1,5 @@
+#ifndef _DECK_EDITOR_MENU_H
+#define _DECK_EDITOR_MENU_H
 #pragma once
 #include "DeckMenu.h"
 #include "DeckDataWrapper.h"
@@ -19,3 +21,4 @@ public:
     void Render();
     virtual ~DeckEditorMenu();
 };
+#endif //_DECK_EDITOR_MENU_H

projects/mtg/include/DeckManager.h

@@ -1,3 +1,6 @@
+#ifndef _DECK_MANAGER_H
+#define _DECK_MANAGER_H
+
 #include <string>
 #include <vector>
 
@@ -43,3 +46,5 @@ public:
     ~DeckManager();
 
 };
+
+#endif //_DECK_MANAGER_H

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;

projects/mtg/include/GuiMana.h

@@ -1,3 +1,6 @@
+#ifndef _GUI_MANA_H
+#define _GUI_MANA_H
+
 #include "string.h"
 #include <vector>
 #include <hge/hgeparticle.h>
@@ -51,3 +54,5 @@ public:
     virtual int receiveEventPlus(WEvent * e);
     virtual int receiveEventMinus(WEvent * e);
 };
+
+#endif //_GUI_MANA_H

projects/mtg/include/MTGPack.h

@@ -1,4 +1,4 @@
-#ifndef _MTGPACCK_H_
+#ifndef _MTGPACK_H_
 #define _MTGPACK_H_
 
 class ShopBooster;

projects/mtg/include/OSD.h

@@ -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

projects/mtg/include/ReplacementEffects.h

@@ -29,9 +29,10 @@ protected:
     TargetChooser * tcTarget;
     int damage;
     bool oneShot;
-    int typeOfDamage;
+    Damage::DamageType typeOfDamage;
 public:
-    REDamagePrevention(MTGAbility * _source, TargetChooser *_tcSource = NULL, TargetChooser *_tcTarget = NULL, int _damage = -1, bool _oneShot = true, int typeOfDamage = DAMAGE_ALL_TYPES);
+    REDamagePrevention(MTGAbility * _source, TargetChooser *_tcSource = NULL, TargetChooser *_tcTarget = NULL,
+                       int _damage = -1, bool _oneShot = true, Damage::DamageType typeOfDamage = Damage::DAMAGE_ALL_TYPES);
     WEvent * replace(WEvent *e);
     ~REDamagePrevention();
 };

projects/mtg/include/StyleManager.h

@@ -1,3 +1,6 @@
+#ifndef _STYLE_MANAGER_H_
+#define _STYLE_MANAGER_H_
+
 class WStyle
 {
 public:
@@ -34,3 +37,5 @@ protected:
     string activeStyle;
     map<string, WStyle*> styles;
 };
+
+#endif //_STYLE_MANAGER_H_

projects/mtg/include/config.h

@@ -1,7 +1,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_
 
-#if ((defined WIN32) || (defined WP8)) && (!defined QT_CONFIG)
+#if ((defined WIN32) || (defined WP8))
 #define snprintf sprintf_s
 #endif 
 

projects/mtg/src/AIHints.cpp

@@ -74,8 +74,7 @@ AIHint::AIHint(string _line)
 
     if(action.find( "combo ") != string::npos)
     {
-        string Combo = "";
+        string Combo = action.c_str() + 6;
-        Combo = action.c_str() + 6;
         combos.push_back(Combo);
     }
     
@@ -307,14 +306,13 @@ bool AIHints::canWeCombo(GameObserver* observer,MTGCardInstance * card,AIPlayerB
     TargetChooserFactory tfc(observer);
     TargetChooser * hintTc = NULL;
     bool gotCombo = false;
-    int comboPartsHold = 0;
+
-    int comboPartsUntil = 0;
-    int comboPartsRestriction = 0;
     for(unsigned int i = 0; i < hints.size();i++)
     {
-        comboPartsHold = 0;
+        int comboPartsHold = 0;
-        comboPartsUntil = 0;
+        int comboPartsUntil = 0;
-        comboPartsRestriction = 0;
+        int comboPartsRestriction = 0;
+
         if(gotCombo)
             return gotCombo;//because more then one might be possible at any time.
         if (hints[i]->hold.size())

projects/mtg/src/AIMomirPlayer.cpp

@@ -90,13 +90,12 @@ int AIMomirPlayer::computeActions()
     }
     else if (p == this && observer->mLayers->stackLayer()->count(0, NOT_RESOLVED) == 0)
     { //standard actions
-        CardDescriptor cd;
-        MTGCardInstance * card = NULL;
 
         switch (currentGamePhase)
         {
         case MTG_PHASE_FIRSTMAIN:
         {
+            CardDescriptor cd;
             ManaCost * potentialMana = getPotentialMana();
             int converted = potentialMana->getConvertedCost();
             SAFE_DELETE(potentialMana);
@@ -106,7 +105,7 @@ int AIMomirPlayer::computeActions()
                 //Attempt to put land into play
                 cd.init();
                 cd.setColor(Constants::MTG_COLOR_LAND);
-                card = cd.match(game->hand);
+                MTGCardInstance *card = cd.match(game->hand);
                 int canPutLandsIntoPlay = game->playRestrictions->canPutIntoZone(card, game->inPlay);
                 if (card && (canPutLandsIntoPlay == PlayRestriction::CAN_PLAY))
                 {
@@ -118,15 +117,12 @@ int AIMomirPlayer::computeActions()
             }
             momir();
             return 1;
-            break;
         }
         case MTG_PHASE_SECONDMAIN:
             selectAbility();
             return 1;
-            break;
         default:
             return AIPlayerBaka::computeActions();
-            break;
         }
     }
     return AIPlayerBaka::computeActions();

projects/mtg/src/AIPlayer.cpp

@@ -97,7 +97,7 @@ int AIAction::clickMultiAct(vector<Targetable*>& actionTargets)
             ite = actionTargets.erase(ite);
             continue;
         }
-        ite++;
+        ++ite;
     }
 
     //shuffle to make it less predictable, otherwise ai will always seem to target from right to left. making it very obvious.
@@ -167,7 +167,7 @@ int AIPlayer::clickMultiTarget(TargetChooser * tc, vector<Targetable*>& potentia
             ite = potentialTargets.erase(ite);
             continue;
         }
-        ite++;
+        ++ite;
     }
 
     randomGenerator.random_shuffle(potentialTargets.begin(), potentialTargets.end());

projects/mtg/src/AIPlayerBaka.cpp

@@ -134,10 +134,9 @@ int OrderedAIAction::getEfficiency()
             if (!target)
                 break;
 
-            bool NeedPreventing;
-            NeedPreventing = false;
             if (currentPhase == MTG_PHASE_COMBATBLOCKERS)
             {
+                bool NeedPreventing = false;
                 MTGCardInstance * nextOpponent = target->getNextOpponent();
                 if(!nextOpponent)
                     break;
@@ -152,12 +151,10 @@ int OrderedAIAction::getEfficiency()
                     //small bonus added for the poor 1/1s, if we can save them, we will unless something else took precidence.
                     //note is the target is being blocked or blocking a creature with wither or deathtouch, it is not even considered for preventing as it is a waste.
                     //if its combat blockers, it is being blocked or blocking, and has less prevents the the amount of damage it will be taking, the effeincy is increased slightly and totalled by the danger rank multiplier for final result.
-                    int calculateAfterDamage = 0;
-                    int damages = 0;
                     if((target->defenser || target->blockers.size()) && target->controller() == p)
                     {
-                        damages = nextOpponent->power;
+                        int damages = nextOpponent->power;
-                        calculateAfterDamage = int(target->toughness - damages);
+                        int calculateAfterDamage = target->toughness - damages;
                         if((calculateAfterDamage + target->preventable) > 0)
                         {
                             efficiency = 0;
@@ -588,8 +585,7 @@ int OrderedAIAction::getEfficiency()
         efficiency = 80;
         if(atc->name.length() && atc->sabilities.length() && atc->types.size() && p->game->inPlay->findByName(atc->name))
         {
-            list<int>::iterator it;
+            for (list<int>::const_iterator it = atc->types.begin(); it != atc->types.end(); ++it)
-            for (it = atc->types.begin(); it != atc->types.end(); it++)
             {
                 if(*it == Subtypes::TYPE_LEGENDARY)//ai please stop killing voja!!! :P
                     efficiency = 0;
@@ -978,11 +974,10 @@ vector<MTGAbility*> AIPlayerBaka::canPayMana(MTGCardInstance * target,ManaCost *
         }
     }
     ManaCostHybrid * hybridCost;
-    int hyb;
-    hyb = 0;
     hybridCost = cost->getHybridCost(0);
     if(hybridCost)
     {
+        int hyb = 0;
         while ((hybridCost = cost->getHybridCost(hyb)) != NULL)
         {
             //here we try to find one of the colors in the hybrid cost, it is done 1 at a time unfortunately
@@ -1046,7 +1041,6 @@ vector<MTGAbility*> AIPlayerBaka::canPayMana(MTGCardInstance * target,ManaCost *
         {
 
             ManaCost * withKickerCost= NEW ManaCost(cost->getKicker());
-            int canKick = 0;
             vector<MTGAbility*>kickerPayment;
             bool keepLooking = true;
             while(keepLooking)
@@ -1061,7 +1055,6 @@ vector<MTGAbility*> AIPlayerBaka::canPayMana(MTGCardInstance * target,ManaCost *
                             payments.push_back(kickerPayment[w]);
                         }
                     }
-                    canKick += 1;
                     keepLooking = cost->getKicker()->isMulti;
                 }
                 else
@@ -1297,12 +1290,10 @@ int AIPlayerBaka::createAbilityTargets(MTGAbility * a, MTGCardInstance * c, Rank
 
 TargetChooser * AIPlayerBaka::GetComboTc( GameObserver * observer,TargetChooser * tc)
 {
-    TargetChooser * gathertc = NULL;
     TargetChooserFactory tcf(observer);
-    map<string, string>::iterator it = comboHint->cardTargets.begin();
+    for(map<string, string>::iterator it = comboHint->cardTargets.begin();it != comboHint->cardTargets.end();++it)
-    for(map<string, string>::iterator it = comboHint->cardTargets.begin();it != comboHint->cardTargets.end();it++)
     {
-        gathertc = tcf.createTargetChooser(it->first.c_str(),tc->source);
+        TargetChooser *gathertc = tcf.createTargetChooser(it->first.c_str(),tc->source);
         gathertc->setAllZones();
         if(gathertc->canTarget(tc->source))
         {
@@ -1402,7 +1393,6 @@ int AIPlayerBaka::selectAbility()
             MTGCardInstance * card = game->inPlay->cards[j];
             if(a->getCost() && !a->isReactingToClick(card, totalPotentialMana))//for performance reason only look for specific mana if the payment couldnt be made with potential.
             {
-                abilityPayment = vector<MTGAbility*>();
                 abilityPayment = canPayMana(card,a->getCost());
             }
             if (a->isReactingToClick(card, totalPotentialMana) || abilityPayment.size())
@@ -1410,10 +1400,9 @@ int AIPlayerBaka::selectAbility()
                 if(a->getCost() && a->getCost()->hasX() && totalPotentialMana->getConvertedCost() < a->getCost()->getConvertedCost()+1)
                     continue;
                 //don't even bother to play an ability with {x} if you can't even afford x=1.
-                ManaCost * fullPayment = NULL;
                 if (abilityPayment.size())
                 {
-                    fullPayment = NEW ManaCost();
+                    ManaCost *fullPayment = NEW ManaCost();
                     for(int ch = 0; ch < int(abilityPayment.size());ch++)
                     {
                         AManaProducer * ampp = dynamic_cast<AManaProducer*> (abilityPayment[ch]);
@@ -1525,7 +1514,7 @@ int AIPlayerBaka::chooseTarget(TargetChooser * _tc, Player * forceTarget,MTGCard
     }
     //Make sure we own the decision to choose the targets
     assert(tc->Owner == observer->currentlyActing());
-    if (tc && tc->Owner != observer->currentlyActing())
+    if (tc->Owner != observer->currentlyActing())
     {
         observer->currentActionPlayer = tc->Owner;
 		//this is a hack, but if we hit this condition we are locked in a infinate loop
@@ -1905,12 +1894,11 @@ MTGCardInstance * AIPlayerBaka::activateCombo()
 {
     if(!comboHint)
         return NULL;
-    TargetChooser * hintTc = NULL;
     TargetChooserFactory tfc(observer);
     ManaCost * totalCost = ManaCost::parseManaCost(comboHint->manaNeeded);
     for(unsigned int k = 0;k < comboHint->casting.size(); k++)
     {
-        hintTc = tfc.createTargetChooser(comboHint->casting[k],nextCardToPlay);
+        TargetChooser *hintTc = tfc.createTargetChooser(comboHint->casting[k],nextCardToPlay);
         int combohand = game->hand->cards.size();
         for(int j = 0; j < combohand;j++)
         {

projects/mtg/src/AIStats.cpp

@@ -24,7 +24,7 @@ AIStats::AIStats(Player * _player, char * _filename)
 AIStats::~AIStats()
 {
     list<AIStat *>::iterator it;
-    for (it = stats.begin(); it != stats.end(); it++)
+    for (it = stats.begin(); it != stats.end(); ++it)
     {
         AIStat * stat = *it;
         delete stat;
@@ -47,7 +47,7 @@ void AIStats::updateStatsCard(MTGCardInstance * cardInstance, Damage * damage, f
     {
         stat->value += static_cast<int>(multiplier * STATS_PLAYER_MULTIPLIER * damage->damage);
     }
-    else if (damage->target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+    else if (damage->target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
     {
         MTGCardInstance * target = (MTGCardInstance *) damage->target;
         if (target->controller() == player && !target->isInPlay(player->getObserver()))
@@ -115,7 +115,7 @@ bool AIStats::isInTop(MTGCardInstance * card, unsigned int max, bool tooSmallCou
     MTGCard * source = card->model;
     int id = source->getMTGId();
     list<AIStat *>::iterator it;
-    for (it = stats.begin(); it != stats.end(); it++)
+    for (it = stats.begin(); it != stats.end(); ++it)
     {
         if (n >= max)
             return false;
@@ -135,7 +135,7 @@ AIStat * AIStats::find(MTGCard * source)
 {
     int id = source->getMTGId();
     list<AIStat *>::iterator it;
-    for (it = stats.begin(); it != stats.end(); it++)
+    for (it = stats.begin(); it != stats.end(); ++it)
     {
         AIStat * stat = *it;
         if (stat->source == id)
@@ -174,7 +174,7 @@ void AIStats::save()
     {
         char writer[128];
         list<AIStat *>::iterator it;
-        for (it = stats.begin(); it != stats.end(); it++)
+        for (it = stats.begin(); it != stats.end(); ++it)
         {
             AIStat * stat = *it;
             if (stat->value > 0)

projects/mtg/src/ActionElement.cpp

@@ -8,7 +8,7 @@
 ActionElement::ActionElement(int id) :
     JGuiObject(id)
 {
-    activeState = INACTIVE;
+    activity = Inactive;
     modal = 0;
     waitingForAnswer = 0;
     currentPhase = MTG_PHASE_INVALID;
@@ -18,7 +18,7 @@ ActionElement::ActionElement(int id) :
 
 ActionElement::ActionElement(const ActionElement& a): JGuiObject(a)
 {
-    activeState = a.activeState;
+    activity = a.activity;
     tc = a.tc ? a.tc->clone() : NULL;
     currentPhase = a.currentPhase;
     newPhase = a.newPhase;
@@ -31,12 +31,6 @@ ActionElement::~ActionElement()
     SAFE_DELETE(tc);
 }
 
-int ActionElement::getActivity()
-{
-
-    return activeState;
-}
-
 int ActionElement::isReactingToTargetClick(Targetable * object)
 {
     if (MTGCardInstance * cObject = dynamic_cast<MTGCardInstance *>(object))

projects/mtg/src/ActionLayer.cpp

@@ -165,8 +165,6 @@ void ActionLayer::Update(float dt)
     if (cantCancel)
     {
         ActionElement * ae = isWaitingForAnswer();
-        int countTargets = 0;
-        int maxTargets = 0;
         if(ae && ae->getActionTc())
         {
             if (!ae->getActionTc()->validTargetsExist())
@@ -175,8 +173,8 @@ void ActionLayer::Update(float dt)
                 cancelCurrentAction();
                 return;
             }
-            countTargets = ae->getActionTc()->countValidTargets();
+            int countTargets = ae->getActionTc()->countValidTargets();
-            maxTargets = ae->getActionTc()->maxtargets;
+            int maxTargets = ae->getActionTc()->maxtargets;
             if (countTargets < maxTargets)
             {
                 /*
@@ -266,7 +264,7 @@ int ActionLayer::receiveEventPlus(WEvent * event)
         ActionElement * currentAction = (ActionElement *) mObjects[i];
         result += currentAction->receiveEvent(event);
     }
-    return 0;
+    return result;
 }
 
 int ActionLayer::isReactingToTargetClick(Targetable * card)
@@ -440,10 +438,9 @@ void ActionLayer::setCustomMenuObject(Targetable * object, bool must,vector<MTGA
     if(abilities.size())
     {
         abilitiesMenu->isMultipleChoice = true;
-        ActionElement * currentAction = NULL;
         for(int w = 0; w < int(abilities.size());w++)
         {
-            currentAction = (ActionElement*)abilities[w];
+            ActionElement* currentAction = (ActionElement*)abilities[w];
             currentActionCard = (MTGCardInstance*)abilities[0]->target;
             abilitiesMenu->Add(mObjects.size()-1, currentAction->getMenuText(),"",false);
         }

projects/mtg/src/ActionStack.cpp

@@ -161,7 +161,7 @@ void StackAbility::Render()
     if (target)
     {
         quad = target->getIcon();
-        if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
         {
             alt2 = ((MTGCardInstance *) target)->name;
         }
@@ -400,7 +400,7 @@ void Spell::Render()
     if (target)
     {
         quad = target->getIcon();
-        if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
         {
             alt2 = ((MTGCardInstance *) target)->name;
         }

projects/mtg/src/AllAbilities.cpp

@@ -2351,7 +2351,7 @@ int AALifer::resolve()
         return 0;
 
     WParsedInt life(life_s, NULL, source);
-    if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+    if (_target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
     {
         _target = ((MTGCardInstance *) _target)->controller();
     }
@@ -4380,7 +4380,7 @@ int AAExchangeLife::resolve()
         int oldlife = player->getLife();
         int targetOldLife = _target->getLife();
         int modifier = oldlife > targetOldLife? oldlife - targetOldLife:targetOldLife - oldlife;
-        if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        if (_target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
         {
             int increaser = 0;
             MTGCardInstance * card = ((MTGCardInstance*)_target);
@@ -4597,15 +4597,15 @@ int APreventDamageTypes::addToGame()
         fromTc->targetter = NULL;
     if (type != 1 && type != 2)
     {//not adding this creates a memory leak.
-        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, DAMAGE_COMBAT);
+        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, Damage::DAMAGE_COMBAT);
     }
     else if (type == 1)
     {
-        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, DAMAGE_ALL_TYPES);
+        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, Damage::DAMAGE_ALL_TYPES);
     }
     else if (type == 2)
     {
-        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, DAMAGE_OTHER);
+        re = NEW REDamagePrevention(this, fromTc, toTc, -1, false, Damage::DAMAGE_OTHER);
     }
     game->replacementEffects->add(re);
     return MTGAbility::addToGame();
@@ -5291,6 +5291,115 @@ AAConnect * AAConnect::clone() const
     return NEW AAConnect(*this);
 }
 
+AEquip::AEquip(GameObserver* observer, int _id, MTGCardInstance * _source, ManaCost * _cost, int restrictions) :
+    TargetAbility(observer, _id, _source, NULL, _cost, restrictions)
+{
+    aType = MTGAbility::STANDARD_EQUIP;
+    isAttach = restrictions != ActivatedAbility::AS_SORCERY;
+}
+
+int AEquip::unequip()
+{
+    if (source->target)
+    {
+        source->target->equipment -= 1;
+        source->parentCards.clear();
+        for (unsigned int w = 0; w < source->target->childrenCards.size(); w++)
+        {
+            MTGCardInstance * child = source->target->childrenCards[w];
+            if (child == source)
+                source->target->childrenCards.erase(source->target->childrenCards.begin() + w);
+        }
+    }
+    source->target = NULL;
+    for (size_t i = 0; i < currentAbilities.size(); ++i)
+    {
+        MTGAbility * a = currentAbilities[i];
+        if (dynamic_cast<AEquip *> (a) || dynamic_cast<ATeach *> (a) || dynamic_cast<AAConnect *> (a)
+            || (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot))
+        {
+            SAFE_DELETE(a);
+            continue;
+        }
+        game->removeObserver(currentAbilities[i]);
+    }
+    currentAbilities.clear();
+    return 1;
+}
+
+int AEquip::equip(MTGCardInstance * equipped)
+{
+    source->target = equipped;
+    source->target->equipment += 1;
+    source->parentCards.push_back(equipped);
+    source->target->childrenCards.push_back((MTGCardInstance*)source);
+    AbilityFactory af(game);
+    af.getAbilities(&currentAbilities, NULL, source);
+    for (size_t i = 0; i < currentAbilities.size(); ++i)
+    {
+        MTGAbility * a = currentAbilities[i];
+        if (dynamic_cast<AEquip *> (a)) continue;
+        if (dynamic_cast<ATeach *> (a)) continue;
+        if (dynamic_cast<AAConnect *> (a)) continue;
+        if (dynamic_cast<AANewTarget *> (af.getCoreAbility(a))) continue;
+        if (a->aType == MTGAbility::STANDARD_TOKENCREATOR && a->oneShot)
+        {
+            a->forceDestroy = 1;
+            continue;
+        }
+        if (dynamic_cast<AACopier *> (af.getCoreAbility(a)))
+        {
+            a->forceDestroy = 1;
+            continue;
+        }
+        //we generally dont want to pass oneShot tokencreators to the cards
+        //we equip...
+        a->addToGame();
+    }
+    return 1;
+}
+
+int AEquip::resolve()
+{
+    MTGCardInstance * mTarget = tc->getNextCardTarget();
+    if (!mTarget) return 0;
+    if (mTarget == source) return 0;
+    unequip();
+    equip(mTarget);
+    return 1;
+}
+
+const char * AEquip::getMenuText()
+{
+    if (isAttach)
+        return "Attach";
+    else
+        return "Equip";
+}
+
+int AEquip::testDestroy()
+{
+    if (source->target && !game->isInPlay(source->target))
+        unequip();
+    if (!game->connectRule)
+    {
+        if (source->target && TargetAbility::tc && !TargetAbility::tc->canTarget((Targetable *)source->target,true))
+            unequip();
+    }
+    return TargetAbility::testDestroy();
+}
+
+int AEquip::destroy()
+{
+    unequip();
+    return TargetAbility::destroy();
+}
+
+AEquip * AEquip::clone() const
+{
+    return NEW AEquip(*this);
+}
+
 // casting a card for free, or casting a copy of a card.
 AACastCard::AACastCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target,bool _restricted,bool _copied,bool asNormal,string _namedCard,string _name,bool _noEvent) :
    MTGAbility(observer, _id, _source),restricted(_restricted),asCopy(_copied),normal(asNormal),cardNamed(_namedCard),nameThis(_name),noEvent(_noEvent)

projects/mtg/src/CardDescriptor.cpp

@@ -160,7 +160,8 @@ MTGCardInstance * CardDescriptor::match_and(MTGCardInstance * card)
 
     if (mColorExclusions)
     {
-        if ((mColorExclusions & card->colors) == mColorExclusions)
+        // if any of forbidden colors intersect with card colors
+        if ((mColorExclusions & card->colors) != 0)
             match = NULL;
     }
 

projects/mtg/src/CardEffect.cpp

@@ -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;
-}

projects/mtg/src/CardGui.cpp

@@ -1013,7 +1013,7 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
     CardDescriptor  cd;
     MTGCardInstance * card = (MTGCardInstance*) _card->data;
     cd.init();
-    cd.mode = CD_OR;
+    cd.mode = CardDescriptor::CD_OR;
     while (filter.size())
     {
         
@@ -1033,13 +1033,13 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                 string attribute;
                 if (found2 != string::npos)
                 {
-                    cd.mode = CD_OR;
+                    cd.mode = CardDescriptor::CD_OR;
                     attribute = attributes.substr(0, found2);
                     attributes = attributes.substr(found2 + 1);
                 }
                 else if (foundAnd != string::npos)
                 {
-                    cd.mode = CD_AND;
+                    cd.mode = CardDescriptor::CD_AND;
                     attribute = attributes.substr(0, foundAnd);
                     attributes = attributes.substr(foundAnd + 1);
                 }
@@ -1302,7 +1302,7 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                 }
             }
             if (nbminuses)
-                cd.mode = CD_AND;
+                cd.mode = CardDescriptor::CD_AND;
             filter = filter.substr(0, found);
         }
         else
@@ -1312,7 +1312,7 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
             
             if (found != string::npos)
             {
-                cd.mode = CD_OR;
+                cd.mode = CardDescriptor::CD_OR;
                 typeName = filter.substr(0, found);
                 filter = filter.substr(found + 1);
             }

projects/mtg/src/CardSelector.cpp

@@ -7,42 +7,42 @@
 #include "Closest.cpp"
 #include "GameObserver.h"
 
-struct Left: public Exp
+struct CardSelectorLeft: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
         return ref->x - test->x > fabs(ref->y - test->y);
     }
 };
-struct Right: public Exp
+struct CardSelectorRight: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
         return test->x - ref->x > fabs(ref->y - test->y);
     }
 };
-struct Up: public Exp
+struct CardSelectorUp: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
         return ref->y - test->y > fabs(ref->x - test->x);
     }
 };
-struct Down: public Exp
+struct CardSelectorDown: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
         return test->y - ref->y > fabs(ref->x - test->x);
     }
 };
-struct Diff: public Exp
+struct CardSelectorDiff: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
         return ref != test;
     }
 };
-struct True: public Exp
+struct CardSelectorTrue: public Exp
 {
     static inline bool test(CardSelector::Target*, CardSelector::Target*)
     {
@@ -94,7 +94,7 @@ void CardSelector::Remove(CardSelector::Target* card)
                 CardView* c = dynamic_cast<CardView*> (active);
                 if (c)
                     c->zoom = 1.0f;
-                active = closest<Diff> (cards, limitor, active);
+                active = closest<CardSelectorDiff> (cards, limitor, active);
                 c = dynamic_cast<CardView*> (active);
                 if (c)
                     c->zoom = 1.4f;
@@ -120,7 +120,7 @@ CardSelector::Target* CardSelector::fetchMemory(SelectorMemory& memory)
         }
     // We come here if the card is not in the selector any more, or if
     // it is there but it is now refused by the limitor.
-    return closest<True> (cards, limitor, memory.x, memory.y);
+    return closest<CardSelectorTrue> (cards, limitor, memory.x, memory.y);
 }
 
 void CardSelector::Push()
@@ -182,7 +182,7 @@ bool CardSelector::CheckUserInput(JButton key)
     if(!jge) return false;
     if(jge->GetLeftClickCoordinates(x, y))
     {
-        active = closest<True> (cards, limitor, static_cast<float> (x), static_cast<float> (y));
+        active = closest<CardSelectorTrue> (cards, limitor, static_cast<float> (x), static_cast<float> (y));
     }
 
     switch (key)
@@ -196,16 +196,16 @@ bool CardSelector::CheckUserInput(JButton key)
         goto switch_active;
         break;
     case JGE_BTN_LEFT:
-        active = closest<Left> (cards, limitor, active);
+        active = closest<CardSelectorLeft> (cards, limitor, active);
         break;
     case JGE_BTN_RIGHT:
-        active = closest<Right> (cards, limitor, active);
+        active = closest<CardSelectorRight> (cards, limitor, active);
         break;
     case JGE_BTN_UP:
-        active = closest<Up> (cards, limitor, active);
+        active = closest<CardSelectorUp> (cards, limitor, active);
         break;
     case JGE_BTN_DOWN:
-        active = closest<Down> (cards, limitor, active);
+        active = closest<CardSelectorDown> (cards, limitor, active);
         break;
     case JGE_BTN_CANCEL:
         mDrawMode = (mDrawMode + 1) % DrawMode::kNumDrawModes;

projects/mtg/src/Damage.cpp

@@ -14,13 +14,13 @@ Damage::Damage(GameObserver* observer, MTGCardInstance * source, Damageable * ta
     init(source, target, source->getPower(), DAMAGE_OTHER);
 }
 
-Damage::Damage(GameObserver* observer, MTGCardInstance * source, Damageable * target, int damage, int _typeOfDamage)
+Damage::Damage(GameObserver* observer, MTGCardInstance * source, Damageable * target, int damage, DamageType _typeOfDamage)
     : Interruptible(observer)
 {
     init(source, target, damage, _typeOfDamage);
 }
 
-void Damage::init(MTGCardInstance * _source, Damageable * _target, int _damage, int _typeOfDamage)
+void Damage::init(MTGCardInstance * _source, Damageable * _target, int _damage, DamageType _typeOfDamage)
 {
     typeOfDamage = _typeOfDamage;
     target = _target;
@@ -59,29 +59,19 @@ int Damage::resolve()
     //reserved for culmulitive absorb ability coding
 
     //prevent next damage-----------------------------
-    if ((target)->preventable >= 1)
+    if (target->preventable > 0)
     {
-        int preventing = (target)->preventable;
+        int preventing = MIN(target->preventable, damage);
-        for (int k = preventing; k > 0; k--)
+        damage -= preventing;
-        {
+        target->preventable -= preventing;
-            //the following keeps preventable from ADDING toughness/life if damage was less then preventable amount.
-            for (int i = damage; i >= 1; i--)
-            {
-                (target)->preventable -= 1;
-                damage -= 1;
-                break;//does the redux of damage 1 time, breaks the loop to deincrement preventing and start the loop over.
-            }
-        }
     }
-
+    else
-    //set prevent next damage back to 0 if it is equal to less then 0
-    if ((target)->preventable < 0)
     {
-        (target)->preventable = 0;
+        target->preventable = 0;
     }
 
     //-------------------------------------------------
-    if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+    if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
     {
         MTGCardInstance * _target = (MTGCardInstance *) target;
         if ((_target)->protectedAgainst(source))
@@ -134,7 +124,7 @@ int Damage::resolve()
 
     int a = damage;
 
-    if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE && (source->has(Constants::WITHER) || source->has(
+    if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE && (source->has(Constants::WITHER) || source->has(
                     Constants::INFECT)))
     {
         // Damage for WITHER or poison on creatures. This should probably go in replacement effects
@@ -146,7 +136,7 @@ int Damage::resolve()
         if(_target->toughness <= 0 && _target->has(Constants::INDESTRUCTIBLE))
             _target->controller()->game->putInGraveyard(_target);
     }
-    else if (target->type_as_damageable == DAMAGEABLE_PLAYER && (source->has(Constants::INFECT)||source->has(Constants::POISONDAMAGER)))
+    else if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER && (source->has(Constants::INFECT)||source->has(Constants::POISONDAMAGER)))
     {
         // Poison on player
         Player * _target = (Player *) target;
@@ -163,7 +153,7 @@ int Damage::resolve()
             }
         }
     }
-    else if (target->type_as_damageable == DAMAGEABLE_PLAYER && (source->has(Constants::POISONTOXIC) ||
+    else if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER && (source->has(Constants::POISONTOXIC) ||
                     source->has(Constants::POISONTWOTOXIC) || source->has(Constants::POISONTHREETOXIC)))
     {
         //Damage + 1, 2, or 3 poison counters on player
@@ -202,9 +192,9 @@ int Damage::resolve()
         //return the left over amount after effects have been applied to them.
         a = target->dealDamage(damage);
         target->damageCount += damage;//the amount must be the actual damage so i changed this from 1 to damage, this fixes pdcount and odcount
-        if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             ((MTGCardInstance*)target)->wasDealtDamage = true;
-        if (target->type_as_damageable == DAMAGEABLE_PLAYER)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
         {
             if(target == source->controller())
             {
@@ -260,7 +250,7 @@ void Damage::Render()
     }
     else
     {
-        if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             mFont->DrawString(_(((MTGCardInstance *) target)->getName()).c_str(), x + 120, y);
     }
 

projects/mtg/src/DamagerDamaged.cpp

@@ -43,7 +43,7 @@ void DamagerDamaged::addDamage(int damage, DamagerDamaged* source)
             return;
         }
     if (0 < damage)
-        damages.push_back(Damage(card->getObserver(), source->card, card, damage, DAMAGE_COMBAT));
+        damages.push_back(Damage(card->getObserver(), source->card, card, damage, Damage::DAMAGE_COMBAT));
     return;
 }
 

projects/mtg/src/DeckMenu.cpp

@@ -13,16 +13,16 @@
 
 #include <iomanip>
 
-namespace
+namespace DeckMenuConst
 {
     const float kVerticalMargin = 16;
     const float kHorizontalMargin = 20;
     const float kLineHeight = 25;
-	const float kDescriptionVerticalBoxPadding = -5;
+    const float kDescriptionVerticalBoxPadding = -5;
     const float kDescriptionHorizontalBoxPadding = 5;
 	
     const float kDefaultFontScale = 1.0f;
-	const float kVerticalScrollSpeed = 7.0f;
+    const float kVerticalScrollSpeed = 7.0f;
 
     const int DETAILED_INFO_THRESHOLD = 20;
     const int kDetailedInfoButtonId = 10000;
@@ -52,8 +52,8 @@ JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsSc
     titleY = 15;
     titleWidth = 180; // width of inner box of title
 
-    descX = 260 + kDescriptionHorizontalBoxPadding;
+    descX = 260 + DeckMenuConst::kDescriptionHorizontalBoxPadding;
-    descY = 100 + kDescriptionVerticalBoxPadding;
+    descY = 100 + DeckMenuConst::kDescriptionVerticalBoxPadding;
     descHeight = 145;
     descWidth = 195;
 
@@ -73,11 +73,11 @@ JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsSc
 
     float scrollerWidth = 200.0f;
 	float scrollerHeight = 28.0f;
-    mScroller = NEW VerticalTextScroller(Fonts::MAIN_FONT, 14, 235, scrollerWidth, scrollerHeight, kVerticalScrollSpeed);
+    mScroller = NEW VerticalTextScroller(Fonts::MAIN_FONT, 14, 235, scrollerWidth, scrollerHeight, DeckMenuConst::kVerticalScrollSpeed);
 
     mAutoTranslate = true;
     maxItems = 6;
-    mHeight = 2 * kVerticalMargin + (maxItems * kLineHeight);
+    mHeight = 2 * DeckMenuConst::kVerticalMargin + (maxItems * DeckMenuConst::kLineHeight);
 
     // we want to cap the deck titles to 15 characters to avoid overflowing deck names
     title = _(_title);
@@ -94,7 +94,7 @@ JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsSc
     else
         titleFontScale = SCALE_NORMAL;
 
-    mSelectionTargetY = selectionY = kVerticalMargin;
+    mSelectionTargetY = selectionY = DeckMenuConst::kVerticalMargin;
 
     if (NULL == stars)
 		stars = NEW hgeParticleSystem(WResourceManager::Instance()->RetrievePSI("stars.psi", WResourceManager::Instance()->GetQuad("stars").get()));
@@ -106,7 +106,7 @@ JGuiController(JGE::GetInstance(), id, listener), fontId(fontId), mShowDetailsSc
     float stringWidth = descriptionFont->GetStringWidth(detailedInfoString.c_str());
     float boxStartX = detailedInfoBoxX - stringWidth / 2 + 20;
 
-    dismissButton = NEW InteractiveButton( this, kDetailedInfoButtonId, Fonts::MAIN_FONT, detailedInfoString, boxStartX, detailedInfoBoxY, JGE_BTN_CANCEL);
+    dismissButton = NEW InteractiveButton( this, DeckMenuConst::kDetailedInfoButtonId, Fonts::MAIN_FONT, detailedInfoString, boxStartX, detailedInfoBoxY, JGE_BTN_CANCEL);
     JGuiController::Add(dismissButton, true);
 
     updateScroller();
@@ -181,7 +181,7 @@ bool DeckMenu::showDetailsScreen()
     if (currentMenuItem)
     {
         if (mAlwaysShowDetailsButton) return true;
-        if (mShowDetailsScreen && currentMenuItem->getVictories() > DETAILED_INFO_THRESHOLD) return true;
+        if (mShowDetailsScreen && currentMenuItem->getVictories() > DeckMenuConst::DETAILED_INFO_THRESHOLD) return true;
     }
 
     return false;
@@ -189,10 +189,10 @@ bool DeckMenu::showDetailsScreen()
 
 void DeckMenu::initMenuItems()
 {
-    float sY = mY + kVerticalMargin;
+    float sY = mY + DeckMenuConst::kVerticalMargin;
     for (int i = startId; i < mCount; ++i)
     {
-        float y = mY + kVerticalMargin + i * kLineHeight;
+        float y = mY + DeckMenuConst::kVerticalMargin + i * DeckMenuConst::kLineHeight;
         DeckMenuItem * currentMenuItem = static_cast<DeckMenuItem*> (mObjects[i]);
         currentMenuItem->Relocate(mX, y);
         if (currentMenuItem->hasFocus()) sY = y;
@@ -248,7 +248,7 @@ void DeckMenu::Render()
     {
         if (i > mCount - 1) break;        
         DeckMenuItem *currentMenuItem = static_cast<DeckMenuItem*> (mObjects[i]);
-        if (currentMenuItem->getY() - kLineHeight * startId < mY + height - kLineHeight + 7)
+        if (currentMenuItem->getY() - DeckMenuConst::kLineHeight * startId < mY + height - DeckMenuConst::kLineHeight + 7)
         {
             // only load stats for visible items in the list
 			DeckMetaData* metaData = currentMenuItem->getMetaData();
@@ -293,6 +293,7 @@ void DeckMenu::Render()
                 
                 // fill in the description part of the screen
 				string text = wordWrap(_(currentMenuItem->getDescription()), descWidth, descriptionFont->mFontID );
+                descriptionFont->SetColor(ARGB(255,255,255,255));
                 descriptionFont->DrawString(text.c_str(), descX, descY);
                 
                 // fill in the statistical portion
@@ -301,6 +302,7 @@ void DeckMenu::Render()
                     ostringstream oss;
                     oss << _("Deck: ") << currentMenuItem->getDeckName() << endl;
                     oss << currentMenuItem->getDeckStatsSummary();
+                    descriptionFont->SetColor(ARGB(255,255,255,255));
                     descriptionFont->DrawString(oss.str(), statsX, statsY);
                 }
                 
@@ -309,7 +311,7 @@ void DeckMenu::Render()
             }
             else // reset the font color to be slightly muted
                 mFont->SetColor(ARGB(150,255,255,255));
-            currentMenuItem->RenderWithOffset(-kLineHeight * startId);
+            currentMenuItem->RenderWithOffset(-DeckMenuConst::kLineHeight * startId);
         }
     }
     
@@ -342,8 +344,8 @@ void DeckMenu::Update(float dt)
     selectionT += 3 * dt;
     selectionY += (mSelectionTargetY - selectionY) * 8 * dt;
 
-    float starsX = starsOffsetX + ((mWidth - 2 * kHorizontalMargin) * (1 + cos(selectionT)) / 2);
+    float starsX = starsOffsetX + ((mWidth - 2 * DeckMenuConst::kHorizontalMargin) * (1 + cos(selectionT)) / 2);
-    float starsY = selectionY + 5 * cos(selectionT * 2.35f) + kLineHeight / 2 - kLineHeight * startId;
+    float starsY = selectionY + 5 * cos(selectionT * 2.35f) + DeckMenuConst::kLineHeight / 2 - DeckMenuConst::kLineHeight * startId;
     stars->MoveTo(starsX, starsY);
     
     // 
@@ -371,7 +373,7 @@ void DeckMenu::Update(float dt)
 void DeckMenu::Add(int id, const char * text, string desc, bool forceFocus, DeckMetaData * deckMetaData)
 {
     DeckMenuItem * menuItem = NEW DeckMenuItem(this, id, fontId, text, 0, 
-            mY + kVerticalMargin + mCount * kLineHeight, (mCount == 0), mAutoTranslate, deckMetaData);
+            mY + DeckMenuConst::kVerticalMargin + mCount * DeckMenuConst::kLineHeight, (mCount == 0), mAutoTranslate, deckMetaData);
     Translator * t = Translator::GetInstance();
     map<string, string>::iterator it = t->deckValues.find(text);
     string deckDescription = "";
@@ -384,7 +386,7 @@ void DeckMenu::Add(int id, const char * text, string desc, bool forceFocus, Deck
     menuItem->setDescription(deckDescription);
 
     JGuiController::Add(menuItem);
-    if (mCount <= maxItems) mHeight += kLineHeight;
+    if (mCount <= maxItems) mHeight += DeckMenuConst::kLineHeight;
 
     if (forceFocus)
     {

projects/mtg/src/DeckStats.cpp

@@ -271,22 +271,6 @@ void DeckStats::EndInstance()
 
 
 // StatsWrapper
-
-    float noLandsProbInTurn[Constants::STATS_FOR_TURNS] = {0.0f};
-    float noCreaturesProbInTurn[Constants::STATS_FOR_TURNS] = {0.0f};
-
-    int countCardsPerCostAndColor[Constants::STATS_MAX_MANA_COST + 1][Constants::MTG_NB_COLORS + 1] = {{0,0}};
-    int countCreaturesPerCostAndColor[Constants::STATS_MAX_MANA_COST + 1][Constants::MTG_NB_COLORS + 1] = {{0,0}};
-    int countSpellsPerCostAndColor[Constants::STATS_MAX_MANA_COST + 1][Constants::MTG_NB_COLORS + 1] = {{0,0}};
-
-    int countCardsPerCost[Constants::STATS_MAX_MANA_COST + 1] = {0};
-    int countCreaturesPerCost[Constants::STATS_MAX_MANA_COST + 1] = {0};
-    int countSpellsPerCost[Constants::STATS_MAX_MANA_COST + 1] = {0};
-    int countLandsPerColor[Constants::MTG_NB_COLORS + 1] = {0};
-    int countBasicLandsPerColor[Constants::MTG_NB_COLORS + 1] = {0};
-    int countNonLandProducersPerColor[Constants::MTG_NB_COLORS + 1] = {0};
-    int totalCostPerColor[Constants::MTG_NB_COLORS + 1] = {0};
-
 void StatsWrapper::initValues()
 {
     // initilize all member values to 0
@@ -301,7 +285,24 @@ void StatsWrapper::initValues()
     avgManaCost = avgCreatureCost = avgSpellCost = 0.0f;
 
     countCreatures = countSpells = countInstants = countEnchantments = countSorceries = countArtifacts = 0;
-    
+
+    //this works only with 0.0f on floats
+    memset(noLandsProbInTurn, 0.0f, sizeof(float) * Constants::STATS_FOR_TURNS);
+    memset(noCreaturesProbInTurn, 0.0f, sizeof(float) * Constants::STATS_FOR_TURNS);
+
+    memset(countCardsPerCost, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1));
+    memset(countCreaturesPerCost, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1));
+    memset(countSpellsPerCost, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1));
+
+    memset(countCardsPerCostAndColor, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1)*(Constants::MTG_NB_COLORS + 1));
+    memset(countCreaturesPerCostAndColor, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1)*(Constants::MTG_NB_COLORS + 1));
+    memset(countSpellsPerCostAndColor, 0, sizeof(int) * (Constants::STATS_MAX_MANA_COST + 1)*(Constants::MTG_NB_COLORS + 1));
+
+    memset(countLandsPerColor, 0, sizeof(int) * (Constants::MTG_NB_COLORS + 1));
+    memset(countBasicLandsPerColor, 0, sizeof(int) * (Constants::MTG_NB_COLORS + 1));
+    memset(countNonLandProducersPerColor, 0, sizeof(int) * (Constants::MTG_NB_COLORS + 1));
+    memset(totalCostPerColor, 0, sizeof(int) * (Constants::MTG_NB_COLORS + 1));
+
 }
 
 StatsWrapper::StatsWrapper(int deckId)

projects/mtg/src/GameOptions.cpp

@@ -1188,10 +1188,11 @@ bool GameOptionKeyBindings::read(string input)
         iss.get(*(s.rdbuf()), ',');
         iss.get();
 
-        LocalKeySym local;
+        LocalKeySym local = 0;
-        char sep;
+        char sep = 0;
-        u32 button;
+        u32 button = 0;
         s >> local >> sep >> button;
+
         if (':' != sep)
             return false;
         assoc.push_back(make_pair(local, u32_to_button(button)));

projects/mtg/src/GameStateAwards.cpp

@@ -21,7 +21,7 @@ enum ENUM_AWARDS_STATE
     
 };
 
-namespace
+namespace GameStateAwardsConst
 {
     const int kBackToTrophiesID = 2;
     const int kBackToMainMenuID = 1;
@@ -186,8 +186,8 @@ void GameStateAwards::Update(float dt)
                 SAFE_DELETE(menu);
                 menu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), EXIT_AWARDS_MENU, this, Fonts::MENU_FONT, 50, 170);
                 if (mState == STATE_DETAILS)
-                    menu->Add(kBackToTrophiesID, "Back to Trophies");
+                    menu->Add(GameStateAwardsConst::kBackToTrophiesID, "Back to Trophies");
-                menu->Add(kBackToMainMenuID, "Back to Main Menu");
+                menu->Add(GameStateAwardsConst::kBackToMainMenuID, "Back to Main Menu");
                 menu->Add(kCancelMenuID, "Cancel");
                 break;
             case JGE_BTN_PREV:
@@ -359,11 +359,11 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId)
     if (controllerId == EXIT_AWARDS_MENU)
         switch (controlId)
         {
-        case kBackToMainMenuID:
+        case GameStateAwardsConst::kBackToMainMenuID:
             mParent->DoTransition(TRANSITION_FADE, GAME_STATE_MENU);
             showMenu = false;
             break;
-        case kBackToTrophiesID:
+        case GameStateAwardsConst::kBackToTrophiesID:
             mState = STATE_LISTVIEW;
             SAFE_DELETE(detailview);
             showMenu = false;

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")
 {

projects/mtg/src/GameStateMenu.cpp

@@ -65,6 +65,7 @@ GameStateMenu::GameStateMenu(GameApp* parent) :
     scroller = NULL;
     langChoices = false;
     primitivesLoadCounter = -1;
+    bgTexture = NULL;
 }
 
 GameStateMenu::~GameStateMenu()

projects/mtg/src/GameStateOptions.cpp

@@ -7,13 +7,12 @@
 #include "SimplePad.h"
 #include "Translate.h"
 
-namespace
+namespace GameStateOptionsConst
 {
     const int kSaveAndBackToMainMenuID = 1;
     const int kBackToMainMenuID = 2;
     const int kNewProfileID = 4;
     const int kReloadID = 5;
-
 }
 
 GameStateOptions::GameStateOptions(GameApp* parent) :
@@ -78,7 +77,7 @@ void GameStateOptions::Start()
 
     optionsList->Add(NEW WGuiSplit(cPrf, cThm));
     optionsList->Add(cStyle);
-    optionsList->Add(NEW WGuiButton(NEW WGuiHeader("New Profile"), -102, kNewProfileID, this));
+    optionsList->Add(NEW WGuiButton(NEW WGuiHeader("New Profile"), -102, GameStateOptionsConst::kNewProfileID, this));
 
     optionsList->Add(NEW WDecoCheat(NEW OptionInteger(Options::CHEATMODE, "Enable Cheat Mode")));
 		optionsList->Add(NEW WDecoCheat(NEW OptionInteger(Options::OPTIMIZE_HAND, "Optimize Starting Hand")));
@@ -118,8 +117,8 @@ void GameStateOptions::Start()
     optionsTabs->Add(optionsList);
 
     optionsMenu = NEW SimpleMenu(JGE::GetInstance(), WResourceManager::Instance(), -102, this, Fonts::MAIN_FONT, 50, 170);
-    optionsMenu->Add(kBackToMainMenuID, "Back to Main Menu");
+    optionsMenu->Add(GameStateOptionsConst::kBackToMainMenuID, "Back to Main Menu");
-    optionsMenu->Add(kSaveAndBackToMainMenuID, "Save And Exit");
+    optionsMenu->Add(GameStateOptionsConst::kSaveAndBackToMainMenuID, "Save And Exit");
     optionsMenu->Add(kCancelMenuID, "Cancel");
 
     optionsTabs->Entering(JGE_BTN_NONE);
@@ -285,21 +284,21 @@ void GameStateOptions::ButtonPressed(int controllerId, int controlId)
     if (controllerId == -102)
         switch (controlId)
         {
-        case kSaveAndBackToMainMenuID:
+        case GameStateOptionsConst::kSaveAndBackToMainMenuID:
             mState = SAVE;
             break;
             //Set Audio volume
-        case kBackToMainMenuID:
+        case GameStateOptionsConst::kBackToMainMenuID:
             mParent->DoTransition(TRANSITION_FADE, GAME_STATE_MENU);
             break;
         case kCancelMenuID:
             mState = SHOW_OPTIONS;
             break;
-        case kNewProfileID:
+        case GameStateOptionsConst::kNewProfileID:
             options.keypadStart("", &newProfile);
             options.keypadTitle("New Profile");
             break;
-        case kReloadID:
+        case GameStateOptionsConst::kReloadID:
             mReload = true;
             break;
         }

projects/mtg/src/GuiCombat.cpp

@@ -16,21 +16,21 @@ const float kZoom_level1 = 1.4f;
 const float kZoom_level2 = 2.2f;
 const float kZoom_level3 = 2.7f;
 
-struct True: public Exp
+struct GuiCombatTrue: public Exp
 {
     static inline bool test(DamagerDamaged*, DamagerDamaged*)
     {
         return true;
     }
 };
-struct Left: public Exp
+struct GuiCombatLeft: public Exp
 {
     static inline bool test(DamagerDamaged* ref, DamagerDamaged* test)
     {
         return ref->y == test->y && ref->x > test->x && test->show;
     }
 };
-struct Right: public Exp
+struct GuiCombatRight: public Exp
 {
     static inline bool test(DamagerDamaged* ref, DamagerDamaged* test)
     {
@@ -217,7 +217,7 @@ void GuiCombat::shiftLeft()
         case ATK:
         {
             DamagerDamaged* old = active;
-            active = closest<Left> (attackers, NULL, static_cast<AttackerDamaged*> (active));
+            active = closest<GuiCombatLeft> (attackers, NULL, static_cast<AttackerDamaged*> (active));
             activeAtk = static_cast<AttackerDamaged*> (active);
             if (old != active)
             {
@@ -231,7 +231,7 @@ void GuiCombat::shiftLeft()
         case BLK:
         {
             DamagerDamaged* old = active;
-            active = closest<Left> (activeAtk->blockers, NULL, static_cast<DefenserDamaged*> (active));
+            active = closest<GuiCombatLeft> (activeAtk->blockers, NULL, static_cast<DefenserDamaged*> (active));
             if (old != active)
             {
                 if (old)
@@ -255,7 +255,7 @@ void GuiCombat::shiftRight( DamagerDamaged* oldActive )
         case BLK:
         {
             DamagerDamaged* old = active;
-            active = closest<Right> (activeAtk->blockers, NULL, static_cast<DefenserDamaged*> (active));
+            active = closest<GuiCombatRight> (activeAtk->blockers, NULL, static_cast<DefenserDamaged*> (active));
             if (old != active)
             {
                 if (old)
@@ -268,7 +268,7 @@ void GuiCombat::shiftRight( DamagerDamaged* oldActive )
         case ATK:
         {
             DamagerDamaged* old = active;
-            active = closest<Right> (attackers, NULL, static_cast<AttackerDamaged*> (active));
+            active = closest<GuiCombatRight> (attackers, NULL, static_cast<AttackerDamaged*> (active));
             if (active == oldActive)
             {
                 active = activeAtk = NULL;
@@ -321,7 +321,7 @@ bool GuiCombat::CheckUserInput(JButton key)
         // position selected card
         if (BLK == cursor_pos)
         {
-            DamagerDamaged* selectedCard = closest<True> (activeAtk->blockers, NULL, static_cast<float> (x), static_cast<float> (y));
+            DamagerDamaged* selectedCard = closest<GuiCombatTrue> (activeAtk->blockers, NULL, static_cast<float> (x), static_cast<float> (y));
             // find the index into the vector where the current selected card is.
             int c1 = 0, c2 = 0;
             int i = 0;
@@ -526,7 +526,7 @@ int GuiCombat::resolve() // Returns the number of damage objects dealt this turn
         }
 
         if (dmg > 0 && ((!attacker->isBlocked()) || attacker->has(Constants::TRAMPLE)))
-            stack->Add(NEW Damage(observer, (*it)->card, (Damageable*)attacker->isAttacking?(Damageable*)attacker->isAttacking:observer->opponent(), dmg, DAMAGE_COMBAT));
+            stack->Add(NEW Damage(observer, (*it)->card, (Damageable*)attacker->isAttacking?(Damageable*)attacker->isAttacking:observer->opponent(), dmg, Damage::DAMAGE_COMBAT));
 
         for (vector<Damage>::iterator d = (*it)->damages.begin(); d != (*it)->damages.end(); ++d)
             stack->Add(NEW Damage(*d));

projects/mtg/src/GuiMessageBox.cpp

@@ -1,56 +0,0 @@
-#include "GuiMessageBox.h"
-
-bool GuiMessageBox::CheckUserInput(JButton key)
-{
-    if (mActionButton == key)
-    {
-        if (mObjects[mCurr] != NULL && mObjects[mCurr]->ButtonPressed())
-        {
-            if (mListener != NULL)
-            {
-                mListener->ButtonPressed(mId, mObjects[mCurr]->GetId());
-                return true;
-            }
-        }
-    }
-
-    if ((PSP_CTRL_LEFT == key) || (PSP_CTRL_UP == key)) // || mEngine->GetAnalogY()<64)
-    {
-        int n = mCurr;
-        n--;
-        if (n < 0)
-        {
-            if ((mStyle & JGUI_STYLE_WRAPPING))
-                n = mCount - 1;
-            else
-                n = 0;
-        }
-
-        if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_UP))
-        {
-            mCurr = n;
-            mObjects[mCurr]->Entering();
-        }
-        return true;
-    }
-    else if ((PSP_CTRL_RIGHT == key) || (PSP_CTRL_DOWN == key)) // || mEngine->GetAnalogY()>192)
-    {
-        int n = mCurr;
-        n++;
-        if (n > mCount - 1)
-        {
-            if ((mStyle & JGUI_STYLE_WRAPPING))
-                n = 0;
-            else
-                n = mCount - 1;
-        }
-
-        if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_DOWN))
-        {
-            mCurr = n;
-            mObjects[mCurr]->Entering();
-        }
-        return true;
-    }
-    return false;
-}

projects/mtg/src/MTGAbility.cpp

@@ -2163,6 +2163,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         return NEW AEquip(observer, id, card);
     }
     
+    // TODO: deprecate this ability in favor of retarget
     //Equipment (attach)
     found = s.find("attach");
     if (found != string::npos)
@@ -4476,7 +4477,7 @@ Player * MTGAbility::getPlayerFromDamageable(Damageable * target)
     if (!target)
         return NULL;
 
-    if (target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
+    if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
         return ((MTGCardInstance *) target)->controller();
 
     return (Player *) target;

projects/mtg/src/MTGGamePhase.cpp

@@ -17,7 +17,7 @@ void MTGGamePhase::Update(float)
     int newState = observer->getCurrentGamePhase();
     if (newState != currentState)
     {
-        activeState = ACTIVE;
+        activity = Active;
         animation = 4;
         currentState = newState;
     }
@@ -28,18 +28,18 @@ void MTGGamePhase::Update(float)
     }
     else
     {
-        activeState = INACTIVE;
+        activity = Inactive;
         animation = 0;
     }
 }
 
 bool MTGGamePhase::NextGamePhase()
 {
-    if (activeState == INACTIVE)
+    if (activity == Inactive)
     {
         if (observer->currentActionPlayer == observer->currentlyActing())
         {
-            activeState = ACTIVE;
+            activity = Active;
             observer->userRequestNextGamePhase();
             return true;
         }

projects/mtg/src/MTGRules.cpp

@@ -2700,7 +2700,7 @@ int MTGDeathtouchRule::receiveEvent(WEvent * event)
         if (!card)
             return 0;
 
-        if (d->target->type_as_damageable != DAMAGEABLE_MTGCARDINSTANCE)
+        if (d->target->type_as_damageable != Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             return 0;
         MTGCardInstance * _target = (MTGCardInstance *) (d->target);
 

projects/mtg/src/MTGSpellStack.cpp

@@ -1,22 +0,0 @@
-#include "MTGSpellStack.h"
-
-MTGSpellStack::MTGSpellStack()
-{
-    cursor = -1;
-}
-
-void MTGSpellStack::addSpell(Ability * ability)
-{
-    cursor++;
-    spellStack[cursor] ability;
-}
-
-int MTGSpellStack::resolve()
-{
-    if (cursor < 0)
-        return 0;
-    int result = cursor;
-    cursor--;
-    (spellStack[cursor + 1])->resolve();
-    return (result + 1);
-}

projects/mtg/src/ReplacementEffects.cpp

@@ -6,7 +6,7 @@
 #include "AllAbilities.h"
 
 REDamagePrevention::REDamagePrevention(MTGAbility * source, TargetChooser *tcSource, TargetChooser *tcTarget, int damage,
-                bool oneShot, int typeOfDamage) :
+                bool oneShot, Damage::DamageType typeOfDamage) :
     source(source), tcSource(tcSource), tcTarget(tcTarget), damage(damage), oneShot(oneShot), typeOfDamage(typeOfDamage)
 {
 }
@@ -18,7 +18,7 @@ WEvent * REDamagePrevention::replace(WEvent *event)
     WEventDamage * e = dynamic_cast<WEventDamage*> (event);
     if (!e) return event;
     Damage *d = e->damage;
-    if (d->typeOfDamage != typeOfDamage && typeOfDamage != DAMAGE_ALL_TYPES) return event;
+    if (d->typeOfDamage != typeOfDamage && typeOfDamage != Damage::DAMAGE_ALL_TYPES) return event;
     if ((!tcSource || tcSource->canTarget(d->source)) && (!tcTarget || tcTarget->canTarget(d->target)))
     {
         if (damage == -1)

projects/mtg/src/SimpleMenu.cpp

@@ -6,7 +6,7 @@
 #include "GameApp.h"
 #include "Translate.h"
 
-namespace
+namespace SimpleMenuConst
 {
     const float kPoleWidth = 7;
     const float kVerticalMargin = 20;
@@ -38,7 +38,7 @@ SimpleMenu::SimpleMenu(JGE* jge, WResourceManager* resourceManager, int id, JGui
 {
     autoTranslate = true;
     isMultipleChoice = false;
-    mHeight = 2 * kVerticalMargin;
+    mHeight = 2 * SimpleMenuConst::kVerticalMargin;
     mWidth = 0;
     mX = x;
     mY = y;
@@ -48,7 +48,7 @@ SimpleMenu::SimpleMenu(JGE* jge, WResourceManager* resourceManager, int id, JGui
     selectionT = 0;
     timeOpen = 0;
     mClosed = false;
-    selectionTargetY = selectionY = y + kVerticalMargin;
+    selectionTargetY = selectionY = y + SimpleMenuConst::kVerticalMargin;
 
     if(resourceManager)
     {
@@ -61,7 +61,7 @@ SimpleMenu::SimpleMenu(JGE* jge, WResourceManager* resourceManager, int id, JGui
         spadeL = resourceManager->RetrieveQuad("spade_ul.png", 0, 0, 0, 0, "spade_ul", RETRIEVE_MANAGE);
         spadeR = resourceManager->RetrieveQuad("spade_ur.png", 0, 0, 0, 0, "spade_ur", RETRIEVE_MANAGE);
         jewel.reset(NEW JQuad(jewelTex, 1, 1, 3, 3));
-        side = resourceManager->RetrieveQuad("menuside.png", 1, 1, 1, kPoleWidth, "menuside", RETRIEVE_MANAGE);
+        side = resourceManager->RetrieveQuad("menuside.png", 1, 1, 1, SimpleMenuConst::kPoleWidth, "menuside", RETRIEVE_MANAGE);
 
         stars = NEW hgeParticleSystem(resourceManager->RetrievePSI("stars.psi", resourceManager->GetQuad("stars").get()));
 
@@ -78,16 +78,16 @@ void SimpleMenu::drawHorzPole(float x, float y, float width)
 {
     JRenderer* renderer = JRenderer::GetInstance();
 
-    float leftXOffset = (spadeR->mWidth - kPoleWidth) / 2;
+    float leftXOffset = (spadeR->mWidth - SimpleMenuConst::kPoleWidth) / 2;
     float rightXOffset = leftXOffset;
     float yOffset = leftXOffset;
     if (spadeR->mWidth != spadeR->mHeight) 
     {
         //We have a weird case to deal with in the "Classic" theme, the spades graphics need to be aligned specifically,
         // While the ones in the "Final Saga" theme need to be centered
-        leftXOffset =  kSpadeWidthOffset;
+        leftXOffset =  SimpleMenuConst::kSpadeWidthOffset;
-        yOffset = kSpadeHeightOffset;
+        yOffset = SimpleMenuConst::kSpadeHeightOffset;
-        rightXOffset = kSpadeRightBottomOffset;
+        rightXOffset = SimpleMenuConst::kSpadeRightBottomOffset;
     }
 
     renderer->RenderQuad(side.get(), x, y, 0, width);
@@ -104,23 +104,23 @@ void SimpleMenu::drawVertPole(float x, float y, float height)
 {
     JRenderer* renderer = JRenderer::GetInstance();
 
-    float xOffset = (spadeR->mWidth - kPoleWidth) / 2;
+    float xOffset = (spadeR->mWidth - SimpleMenuConst::kPoleWidth) / 2;
     float topYOffset = xOffset;
     float bottomYOffset = xOffset;
     if (spadeR->mWidth != spadeR->mHeight) 
     {
         //We have a weird case to deal with in the "Classic" theme, the spades graphics need to be aligned specifically,
         // While the ones in the "Final Saga" theme need to be centered
-        xOffset = kSpadeHeightOffset;
+        xOffset = SimpleMenuConst::kSpadeHeightOffset;
-        topYOffset = kSpadeWidthOffset;
+        topYOffset = SimpleMenuConst::kSpadeWidthOffset;
-        bottomYOffset = kSpadeRightBottomOffset;
+        bottomYOffset = SimpleMenuConst::kSpadeRightBottomOffset;
     }
 
-    renderer->RenderQuad(side.get(), x + kPoleWidth, y, M_PI / 2, height);
+    renderer->RenderQuad(side.get(), x + SimpleMenuConst::kPoleWidth, y, M_PI / 2, height);
     spadeR->SetHFlip(true);
     spadeL->SetHFlip(false);
-    renderer->RenderQuad(spadeR.get(), x + kPoleWidth + xOffset, y - topYOffset, M_PI / 2);
+    renderer->RenderQuad(spadeR.get(), x + SimpleMenuConst::kPoleWidth + xOffset, y - topYOffset, M_PI / 2);
-    renderer->RenderQuad(spadeL.get(), x + kPoleWidth + xOffset, y + height - bottomYOffset, M_PI / 2);
+    renderer->RenderQuad(spadeL.get(), x + SimpleMenuConst::kPoleWidth + xOffset, y + height - bottomYOffset, M_PI / 2);
 
     renderer->RenderQuad(jewel.get(), x - 1, y - 1);
     renderer->RenderQuad(jewel.get(), x - 1, y + height - 1);
@@ -133,7 +133,7 @@ void SimpleMenu::Render()
     WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
     if (0 == mWidth)
     {
-        float sY = mY + kVerticalMargin;
+        float sY = mY + SimpleMenuConst::kVerticalMargin;
 
         for (int i = 0; i < mCount; ++i)
         {
@@ -146,7 +146,7 @@ void SimpleMenu::Render()
         if ((!title.empty()) && (mWidth < titleFont->GetStringWidth(title.c_str()))) 
 			mWidth = titleFont->GetStringWidth(title.c_str());
          titleFont->SetScale(scaleFactor);
-        mWidth += 2 * kHorizontalMargin;
+        mWidth += 2 * SimpleMenuConst::kHorizontalMargin;
 
         if (mCenterHorizontal)
             mX = (SCREEN_WIDTH_F - mWidth) / 2;
@@ -156,7 +156,7 @@ void SimpleMenu::Render()
 
         for (int i = 0; i < mCount; ++i)
         {
-            float y = mY + kVerticalMargin + i * kLineHeight;
+            float y = mY + SimpleMenuConst::kVerticalMargin + i * SimpleMenuConst::kLineHeight;
             SimpleMenuItem * smi = static_cast<SimpleMenuItem*> (mObjects[i]);
             smi->Relocate(mX + mWidth / 2, y);
             if (smi->hasFocus()) sY = y;
@@ -171,7 +171,7 @@ void SimpleMenu::Render()
     float height = mHeight;
     if (timeOpen < 1) height *= timeOpen > 0 ? timeOpen : -timeOpen;
 
-    float heightPadding = kLineHeight/2; // this to reduce the bottom padding of the menu
+    float heightPadding = SimpleMenuConst::kLineHeight/2; // this to reduce the bottom padding of the menu
     renderer->FillRect(mX, mY, mWidth, height - heightPadding, ARGB(180,0,0,0));
 
     renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
@@ -200,8 +200,8 @@ void SimpleMenu::Render()
     {
         if (i > mCount - 1) break;
         SimpleMenuItem *currentMenuItem = static_cast<SimpleMenuItem*>(mObjects[i]);
-        float currentY = currentMenuItem->getY() - kLineHeight * startId;
+        float currentY = currentMenuItem->getY() - SimpleMenuConst::kLineHeight * startId;
-        float menuBottomEdge = mY + height - kLineHeight + 7;
+        float menuBottomEdge = mY + height - SimpleMenuConst::kLineHeight + 7;
         if (currentY < menuBottomEdge)
         {
             if (currentMenuItem->hasFocus())
@@ -214,7 +214,7 @@ void SimpleMenu::Render()
             {
                 mFont->SetColor(ARGB(150,255,255,255));
             }
-            (static_cast<SimpleMenuItem*> (mObjects[i]))->RenderWithOffset(-kLineHeight * startId);
+            (static_cast<SimpleMenuItem*> (mObjects[i]))->RenderWithOffset(-SimpleMenuConst::kLineHeight * startId);
         }
         mFont->SetScale(SCALE_NORMAL);
     }
@@ -244,8 +244,8 @@ bool SimpleMenu::CheckUserInput(JButton key)
         if (mObjects.size())
         {
             float top, left;
-            float menuTopEdge =  mY + kLineHeight;
+            float menuTopEdge =  mY + SimpleMenuConst::kLineHeight;
-            float menuBottomEdge = mY + mHeight - (kLineHeight/2);
+            float menuBottomEdge = mY + mHeight - (SimpleMenuConst::kLineHeight/2);
             
             if (y < menuTopEdge)
                 n = (mCurr - 1) > 0 ? mCurr -1 : 0;
@@ -257,7 +257,7 @@ bool SimpleMenu::CheckUserInput(JButton key)
                 {
                     if (mObjects[i]->getTopLeft(top, left))
                     {
-                        if ( (y > top) && (y <= (top + kLineHeight)) )
+                        if ( (y > top) && (y <= (top + SimpleMenuConst::kLineHeight)) )
                             n = i;
                     }   
                 }
@@ -308,8 +308,8 @@ void SimpleMenu::Update(float dt)
     selectionT += 3 * dt;
     selectionY += (selectionTargetY - selectionY) * 8 * dt;
     if(stars)
-        stars->MoveTo(mX + kHorizontalMargin + ((mWidth - 2 * kHorizontalMargin) * (1 + cos(selectionT)) / 2), selectionY + 5 * cos(
+        stars->MoveTo(mX + SimpleMenuConst::kHorizontalMargin + ((mWidth - 2 * SimpleMenuConst::kHorizontalMargin) * (1 + cos(selectionT)) / 2), selectionY + 5 * cos(
-                    selectionT * 2.35f) + kLineHeight / 2 - kLineHeight * startId);
+                    selectionT * 2.35f) + SimpleMenuConst::kLineHeight / 2 - SimpleMenuConst::kLineHeight * startId);
     if (timeOpen < 0)
     {
         timeOpen += dt * 10;
@@ -330,12 +330,12 @@ void SimpleMenu::Update(float dt)
 
 void SimpleMenu::Add(int id, const char * text, string desc, bool forceFocus)
 {
-    SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + kVerticalMargin + mCount * kLineHeight,
+    SimpleMenuItem * smi = NEW SimpleMenuItem(this, id, fontId, text, 0, mY + SimpleMenuConst::kVerticalMargin + mCount * SimpleMenuConst::kLineHeight,
                     (mCount == 0), autoTranslate);
 
     smi->setDescription(desc);
     JGuiController::Add(smi);
-    if (mCount <= maxItems) mHeight += kLineHeight;
+    if (mCount <= maxItems) mHeight += SimpleMenuConst::kLineHeight;
     if (forceFocus)
     {
         mObjects[mCurr]->Leaving(JGE_BTN_DOWN);

projects/mtg/src/TargetChooser.cpp

@@ -294,13 +294,13 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 string attribute;
                 if (found2 != string::npos)
                 {
-                    cd->mode = CD_OR;
+                    cd->mode = CardDescriptor::CD_OR;
                     attribute = attributes.substr(0, found2);
                     attributes = attributes.substr(found2 + 1);
                 }
                 else if (foundAnd != string::npos)
                 {
-                    cd->mode = CD_AND;
+                    cd->mode = CardDescriptor::CD_AND;
                     attribute = attributes.substr(0, foundAnd);
                     attributes = attributes.substr(foundAnd + 1);
                 }
@@ -550,7 +550,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         else
                             cd->colors = card->colors;
                        
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
                     else if( CDtype.find("types") != string::npos )
                     {
@@ -572,7 +572,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         cd->removeType("creature");
                         cd->removeType("planeswalker");
                         cd->removeType("tribal");
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
                 }
                 else if (attribute.find("counter") != string::npos)
@@ -629,7 +629,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         { 
                             cd->SetExclusionColor(cid);
                         }
-                        cd->mode = CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;
                     }
 
                     if (attribute.find("chosencolor") != string::npos)
@@ -685,7 +685,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                 }
             }
             if (nbminuses)
-                cd->mode = CD_AND;
+                cd->mode = CardDescriptor::CD_AND;
             typeName = typeName.substr(0, found);
         }
         if (cd)

projects/mtg/src/TestSuiteAI.cpp

@@ -433,6 +433,15 @@ void TestSuiteGame::assertGame()
         Log("<span class=\"success\">==Test Succesful !==</span>");
     else
         Log("<span class=\"error\">==Test Failed !==</span>");
+#ifdef CAPTURE_STDERR
+    if (error)
+    {
+        OutputCapturer::debugAndClear();
+    } else
+    {
+        OutputCapturer::clear();
+    }
+#endif
     mMutex.unlock();
 }
 
@@ -585,6 +594,9 @@ void TestSuite::ThreadProc(void* inParam)
 {
     LOG("Entering TestSuite::ThreadProc");
     TestSuite* instance = reinterpret_cast<TestSuite*>(inParam);
+#ifdef CAPTURE_STDERR
+    OutputCapturer::debugAndClear();
+#endif
     if (instance)
     {
         string filename;

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" />

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>

projects/mtg/wagic-qt.pro

@@ -68,6 +68,8 @@ INCLUDEPATH += include
 #!symbian:DESTDIR = bin
 
 unix:!symbian:LIBS += -lz
+win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib
+win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib
 PRECOMPILED_HEADER = include/PrecompiledHeader.h
 
 #DEFINES += TRACK_OBJECT_USAGE
@@ -87,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\
@@ -241,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\
@@ -252,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\
@@ -325,6 +324,7 @@ SOURCES += \
         ../../JGE/src/pc/JSocket.cpp\
         ../../JGE/src/pc/JSfx.cpp\
         ../../JGE/src/JSprite.cpp\
+        ../../JGE/src/OutputCapturer.cpp\
         ../../JGE/src/Vector2D.cpp\
         ../../JGE/src/tinyxml/tinystr.cpp\
         ../../JGE/src/tinyxml/tinyxml.cpp\
@@ -391,6 +391,7 @@ HEADERS += \
         ../../JGE/include/JSpline.h\
         ../../JGE/include/JSprite.h\
         ../../JGE/include/JTypes.h\
+        ../../JGE/include/OutputCapturer.h\
         ../../JGE/include/Vector2D.h\
         ../../JGE/include/Vector3D.h\
         ../../JGE/include/vram.h\

travis-script.sh

@@ -0,0 +1,23 @@
+#!/bin/sh -ex
+
+# we're building a PSP binary here
+cd JGE
+make -j 8
+cd ..
+cd projects/mtg
+mkdir objs
+make -j 8
+cd ../..
+
+# we're building an Android binary here
+android-ndk-r9/ndk-build -C projects/mtg/Android -j8
+$ANDROID list targets
+$ANDROID update project -t 1 -p projects/mtg/Android
+ant debug -f projects/mtg/Android/build.xml
+
+# let's try an Intel linux binary
+qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
+make -j 8
+
+# and finish by running the testsuite
+./wagic