updated iOS UI issues:

* fixed status bar issue on iOS7, where status bar information was invisible on iOS7 devices * fixed some font issues on the Shop screens to make them more legible for iOS users. ( changed font size for Interactive Buttons and card list) * added new gesture for opening up the menu screen for iOS. Since there are no external buttons on iOS devices, we need either on-screen buttons or gestures to compensate. Using the pinch or zoom gesture will simulate pressing the "MENU" button on the PSP on all screens now. Not ideal, but something for now until we can work in a new button or way to open up the menu.
2013-11-27 22:25:22 -08:00
163 changed files with 2441 additions and 8340 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,68 +1,17 @@
 language: cpp
-env:
-  global:
-    secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8="
-  matrix:
-    - BUILD_TYPE=PSP
-    - BUILD_TYPE=Android
-    - BUILD_TYPE=Qt
-
-branches:
-  except:
-    - latest-master
-
 before_install:
-  - sudo apt-get update -qq
-# Building for PSP here
-  - if [ "$BUILD_TYPE" == "PSP" ]; then
-      export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
-      export PSPSDK="$PSPDEV/psp/sdk" &&
-      export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" &&
-      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;
-    fi
-# Building for Android here
-  - if [ "$BUILD_TYPE" == "Android" ]; then
-      export ANDROID="android-sdk-linux/tools/android" &&
-      if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi &&
-      wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
-      wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv;
-    fi
-# Building for Qt here
-  - if [ "$BUILD_TYPE" == "Qt" ]; then
-      sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa &&
-      sudo apt-get update -qq &&
-      sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
-      export QMAKE="qmake -qt=qt5";
-    fi
-
+  - 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:
-# Building for PSP here
-  - if [ "$BUILD_TYPE" == "PSP" ]; then
-      tar -x --xz -f sdk.lzma;
-    fi
-  - if [ "$BUILD_TYPE" == "Android" ]; then
-      tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
-      tar -zxf android-sdk_r23.0.2-linux.tgz &&
-      $ANDROID list sdk --extended -a &&
-      echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,android-10 --no-ui --force --no-https;
-    fi
-  - sudo pip install pyjavaproperties
-  - sudo pip install github3.py
-script: ./travis-script.sh
-
-matrix:
-  fast_finish: true
-
-deploy:
-  provider: releases
-  api-key:
-    secure: "gzfDEihpfTmoO6CSjTNpHSlLTPtQUZUqTlmD91CQby6+znDsOy4xsqj10MNXe+l/3KYny1DtM48nxNKeVjsyeYg66TTzKsrgMVzt6Ah5CBhSXO99/TiaMJmSXmMO7GGfKDct190Dqej1gbR7AMd38DOYe2vpR0LX+Lf3gzDVLoU="
-  file:
-    - ${TRAVIS_BUILD_DIR}/core.zip
-    - ${TRAVIS_BUILD_DIR}/projects/mtg/Android/bin/Wagic-debug.apk
-    - ${TRAVIS_BUILD_DIR}/projects/mtg/psprelease.zip
-  skip_cleanup: true
-  on:
-    repo: WagicProject/wagic
-    tags: false
-    branch: auto_releases
+  - 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"
--- a/JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb
+++ b/JGE/Dependencies/lib/libjpeg-static-mt-debug.pdb
--- a/JGE/Dependencies/lib/libjpeg-static-mt.pdb
+++ b/JGE/Dependencies/lib/libjpeg-static-mt.pdb
--- a/JGE/JGE.vcxproj
+++ b/JGE/JGE.vcxproj
@@ -73,7 +73,7 @@
      <Optimization>MaxSpeed</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SDL_CONFIG;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -101,7 +101,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SDL_CONFIG;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
@@ -129,7 +129,7 @@
      <Optimization>Full</Optimization>
      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SDL_CONFIG;WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
--- a/JGE/Makefile
+++ b/JGE/Makefile
@@ -31,7 +31,6 @@ HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \


 CXXFLAGS = -W -Wall -Werror -Wno-unused
-CXXFLAGS += -DTIXML_USE_STL

 ifdef DEBUG
 CXXFLAGS += -ggdb3
--- a/JGE/include/DebugRoutines.h
+++ b/JGE/include/DebugRoutines.h
@@ -61,7 +61,7 @@ std::string ToHex(T* pointer)
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-  OutputDebugStringA(stream.str().c_str());  \
+  OutputDebugString(stream.str().c_str());  \
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux
--- a/JGE/include/Downloader.h
+++ b/JGE/include/Downloader.h
@@ -1,128 +0,0 @@
-#ifndef DOWNLOADER_H
-#define DOWNLOADER_H
-
-//-------------------------------------------------------------------------------------
-//
-// This class handles download of remote resources (any kind of file)
-// All the resources are stored locally in the userPath
-// For every resources, the downloader verifies if the resource was modifed
-// on the server before downloading the update. The Downloader maintains a catalogue
-// of resource downloaded to be able to check if they need to be updated.
-//
-// The interface can be used completly synchronously by the application and some
-// context or message loop is needed in the implementation of this interface
-//
-// Note that the Downloader could in theory by implemented on top of JNetwork.
-//
-//-------------------------------------------------------------------------------------
-#include <string>
-#include <ostream>
-#include <istream>
-#include <fstream>
-#include <map>
-#include "Threading.h"
-#ifdef QT_CONFIG
-#include <QObject>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkAccessManager>
-#endif
-
-using namespace std;
-
-class DownloadRequest
-        #ifdef QT_CONFIG
-        : public QObject
-        #endif
-{
-#ifdef QT_CONFIG
-    Q_OBJECT
-
-private slots:
-#endif
-    void fileDownloaded();
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-
-#ifdef QT_CONFIG
-signals:
-    void percentChanged(int percent);
-    void statusChanged(int);
-#endif
-
-public:
-    typedef enum {
-        NOT_PRESENT,
-        DOWNLOADING,
-        DOWNLOADED,
-        DOWNLOAD_ERROR
-    } DownloadStatus;
-
-protected:
-    string mLocalPath;
-    string mRemoteResourceURL;
-    // previous one is the original, next one can change after redirection
-    string mRequestedRemoteResourceURL;
-    string mETag;
-    DownloadStatus mDownloadStatus;
-    bool mUpgradeAvailable;
-    size_t mTotalSize;
-    size_t mCurrentSize;
-    ofstream mFile;
-#ifdef QT_CONFIG
-    QNetworkReply* mNetworkReply;
-    static QNetworkAccessManager networkAccessManager;
-#endif
-
-
-public:
-    DownloadRequest(string localPath="",
-                    string remoteResourceURL="",
-                    string ETag = "",
-                    DownloadStatus downloadStatus=NOT_PRESENT,
-                    size_t totalSize = 0,
-                    size_t currentSize = 0);
-    ~DownloadRequest();
-    static bool NetworkIsAccessible();
-
-    string getTempLocalPath() const { return (mLocalPath+".tmp"); };
-    string getLocalPath() const { return mLocalPath; };
-    string getRemoteResource() const { return mRemoteResourceURL; };
-    string getETag() const { return mETag; };
-    void startGet();
-    void startHead();
-    DownloadStatus getDownloadStatus() const { return mDownloadStatus; };
-    bool upgradeAvailable() const { return mUpgradeAvailable; };
-    void getSizes(size_t& totalSize, size_t&currentSize) {
-        totalSize = mTotalSize;
-        currentSize = mCurrentSize;
-    };
-
-    friend ostream& operator<<(ostream& out, const DownloadRequest& d);
-    friend istream& operator>>(istream&, DownloadRequest&);
-    friend class Downloader;
-};
-
-
-class Downloader
-{
-protected:
-    Downloader(string globalRemoteURL="", string localCacheRecords="");
-    virtual ~Downloader();
-    static Downloader* mInstance;
-    string mGlobalRemoteURL;
-    string mLocalCacheRecords;
-    boost::mutex mMutex;
-    map<string, DownloadRequest*> mRequestMap;
-
-public:
-    static Downloader* GetInstance();
-    static void Release();
-
-    void Update();
-    DownloadRequest* Get(string localPath, string remoteResourceURL="");
-
-    friend ostream& operator<<(ostream& out, const Downloader& d);
-    friend istream& operator>>(istream&, Downloader&);
-};
-
-#endif // DOWNLOADER_H
--- a/JGE/include/JAnimator.h
+++ b/JGE/include/JAnimator.h
@@ -297,6 +297,7 @@ public:
 private:
 	float mTimer;
 	float mFrameTime;
+	JAnimator* mAnimator;
 	vector<JAnimatorObject *> mObjects;

 };
--- a/JGE/include/JDistortionMesh.h
+++ b/JGE/include/JDistortionMesh.h
@@ -37,6 +37,7 @@ private:
 	float mTexY;
 	float mTexWidth;
 	float mTexHeight;
+	JTexture* mTexture;
 	JQuad* mQuad;
 	
 	
--- a/JGE/include/JFileSystem.h
+++ b/JGE/include/JFileSystem.h
@@ -128,7 +128,6 @@ public:
    bool readIntoString(const string & FilePath, string & target);
    bool openForWrite(ofstream & File, const string & FilePath, ios_base::openmode mode = ios_base::out );
    bool Rename(string from, string to);
-    bool Remove(string aFile);

    //Returns true if strFilename exists somewhere in the fileSystem
    bool FileExists(const string& strFilename);
@@ -164,4 +163,4 @@ protected:



-#endif
+#endif
--- a/JGE/include/JSoundSystem.h
+++ b/JGE/include/JSoundSystem.h
@@ -23,32 +23,28 @@
 #include "SLES/OpenSLES_Android.h"

 #elif defined USE_PHONON
-#include <phonon/AudioOutput>
-#include <phonon/MediaObject>
-#elif (defined QT_CONFIG)
-#include "QMediaPlayer"
-#include "QMediaPlaylist"
-#include "QSoundEffect"
+    #include <phonon/AudioOutput>
+    #include <phonon/MediaObject>
 #elif defined WIN32
-#include <windows.h>
+    #include <windows.h>
 #define WITH_FMOD
 #elif defined (PSP)
-#include <pspgu.h>
-#include <pspkernel.h>
-#include <pspdisplay.h>
-#include <pspdebug.h>
-#include <pspctrl.h>
-#include <time.h>
-#include <string.h>
-#include <pspaudiolib.h>
-#include <psprtc.h>
+    #include <pspgu.h>
+    #include <pspkernel.h>
+    #include <pspdisplay.h>
+    #include <pspdebug.h>
+    #include <pspctrl.h>
+    #include <time.h>
+    #include <string.h>
+    #include <pspaudiolib.h>
+    #include <psprtc.h>

-#include "JAudio.h"
-#include "JMP3.h"
+    #include "JAudio.h"
+    #include "JMP3.h"
 #endif

 #ifdef WITH_FMOD
-#include "../Dependencies/include/fmod.h"
+    #include "../Dependencies/include/fmod.h"
 #endif

 //------------------------------------------------------------------------------------------------
@@ -71,7 +67,7 @@ public:
 #ifdef USE_PHONON
    Phonon::AudioOutput* mOutput;
    Phonon::MediaObject* mMediaObject;
-public slots:
+    public slots:
    void seekAtTheBegining();
 #elif defined (PSP)
    JMP3* mTrack;
@@ -86,10 +82,6 @@ public slots:
    SLPlayItf playInterface;
    SLSeekItf seekInterface;
    SLVolumeItf musicVolumeInterface;
-#elif (defined QT_CONFIG)
-    QMediaPlaylist* playlist;
-    QMediaPlayer* player;
-    string fullpath;
 #else
    void* mTrack;
 #endif  //WITH_FMOD
@@ -100,15 +92,13 @@ public slots:
 //------------------------------------------------------------------------------------------------    
 class JSample
 {
-public:
+ public:
    JSample();
    ~JSample();

    unsigned long fileSize();
-#if (defined QT_CONFIG) && (!defined USE_PHONON)
-    QMediaPlayer* effect;
-    void* mSample;
-#elif defined (PSP)
+
+#if defined (PSP)
    WAVDATA *mSample;
 #elif defined (IOS)
    std::string filename;
@@ -143,128 +133,126 @@ class JSoundSystem

 public:

-    //////////////////////////////////////////////////////////////////////////
-    /// Get the singleton instance
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    static JSoundSystem* GetInstance();
+	//////////////////////////////////////////////////////////////////////////
+	/// Get the singleton instance
+	///
+	//////////////////////////////////////////////////////////////////////////
+	static JSoundSystem* GetInstance();

-    static void Destroy();
+	static void Destroy();



-    //////////////////////////////////////////////////////////////////////////
-    /// Load music.
-    ///
-    /// @note MP3 is the only supported format for the moment.
-    ///
-    /// @param filename - Name of the music file.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    JMusic *LoadMusic(const char *fileName);
+	//////////////////////////////////////////////////////////////////////////
+	/// Load music.
+	///
+	/// @note MP3 is the only supported format for the moment.
+	///
+	/// @param filename - Name of the music file.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	JMusic *LoadMusic(const char *fileName);

-    //////////////////////////////////////////////////////////////////////////
-    /// Delete music from memory.
-    ///
-    /// @param music - Music to be deleted.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    //void FreeMusic(JMusic *music);
+	//////////////////////////////////////////////////////////////////////////
+	/// Delete music from memory.
+	///
+	/// @param music - Music to be deleted.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	//void FreeMusic(JMusic *music);

-    //////////////////////////////////////////////////////////////////////////
-    /// Play music.
-    ///
-    /// @param music - Music to be played.
-    /// @param looping - Play the music in a loop.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void PlayMusic(JMusic *music, bool looping = false);
+	//////////////////////////////////////////////////////////////////////////
+	/// Play music.
+	///
+	/// @param music - Music to be played.
+	/// @param looping - Play the music in a loop.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	void PlayMusic(JMusic *music, bool looping = false);

-    //////////////////////////////////////////////////////////////////////////
-    /// Stop playing.
-    ///
-    /// @param music - Music to be stopped.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void StopMusic(JMusic *music);
+	//////////////////////////////////////////////////////////////////////////
+	/// Stop playing.
+	///
+	/// @param music - Music to be stopped.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	void StopMusic(JMusic *music);

    
-    //////////////////////////////////////////////////////////////////////////
-    /// Resume playing.
-    ///
-    /// @param music - Music to be resumed.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void ResumeMusic(JMusic *music);
+	//////////////////////////////////////////////////////////////////////////
+	/// Resume playing.
+	///
+	/// @param music - Music to be resumed.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	void ResumeMusic(JMusic *music);
    
-    //////////////////////////////////////////////////////////////////////////
-    /// Pause playing.
-    ///
-    /// @param music - Music to be paused.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void PauseMusic(JMusic *music);
+	//////////////////////////////////////////////////////////////////////////
+	/// Pause playing.
+	///
+	/// @param music - Music to be paused.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	void PauseMusic(JMusic *music);

-    //////////////////////////////////////////////////////////////////////////
-    /// Load sound effect.
-    ///
-    /// @note WAV sound effect only.
-    ///
-    /// @param fileName - Sound effect for loading.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    JSample *LoadSample(const char *fileName);
+	//////////////////////////////////////////////////////////////////////////
+	/// Load sound effect.
+	///
+	/// @note WAV sound effect only.
+	///
+	/// @param fileName - Sound effect for loading.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	JSample *LoadSample(const char *fileName);

-    //////////////////////////////////////////////////////////////////////////
-    /// Delete sound effect from memory.
-    ///
-    /// @param sample - Sound to be deleted.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    //void FreeSample(JSample *sample);
+	//////////////////////////////////////////////////////////////////////////
+	/// Delete sound effect from memory.
+	///
+	/// @param sample - Sound to be deleted.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	//void FreeSample(JSample *sample);

-    //////////////////////////////////////////////////////////////////////////
-    /// Play sound effect.
-    ///
-    /// @param sample - Sound for playing.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void PlaySample(JSample *sample);
+	//////////////////////////////////////////////////////////////////////////
+	/// Play sound effect.
+	///
+	/// @param sample - Sound for playing.
+	///
+	//////////////////////////////////////////////////////////////////////////
+	void PlaySample(JSample *sample);

-    //////////////////////////////////////////////////////////////////////////
-    /// Set volume for audio playback.
-    ///
-    /// @param volume - New volume.
-    ///
-    //////////////////////////////////////////////////////////////////////////
-    void SetVolume(int volume);
+	//////////////////////////////////////////////////////////////////////////
+	/// Set volume for audio playback.
+	///
+	/// @param volume - New volume.
+	///
+	//////////////////////////////////////////////////////////////////////////
+  void SetVolume(int volume);

-    void SetMusicVolume(int volume);
+	void SetMusicVolume(int volume);

-    void SetSfxVolume(int volume);
+  void SetSfxVolume(int volume);

-    int mChannel;
+  	int mChannel;
 protected:
-    JSoundSystem();
-    ~JSoundSystem();
+	JSoundSystem();
+	~JSoundSystem();

-    void InitSoundSystem();
-    void DestroySoundSystem();
+	void InitSoundSystem();
+	void DestroySoundSystem();

 private:
-#if (defined PSP || defined ANDROID)
-    JMusic *mCurrentMusic;
+
+	JMusic *mCurrentMusic;
    JSample *mCurrentSample;
-#endif

-    int mVolume;
-    int mMusicVolume;
-    int mSampleVolume;
+	int mVolume;
+  int mMusicVolume;
+  int mSampleVolume;


-    static JSoundSystem* mInstance;
+	static JSoundSystem* mInstance;

 };

 #endif
-
--- a/JGE/include/Threading.h
+++ b/JGE/include/Threading.h
@@ -1,7 +1,7 @@
 #ifndef THREADING_H
 #define THREADING_H

-#if !defined(PSP) && !defined(QT_CONFIG) && !(__cplusplus > 199711L)
+#if !defined(PSP) && !defined(QT_CONFIG)
 #include <boost/date_time.hpp>

 #ifdef WIN32
@@ -14,7 +14,7 @@
 #endif

 #include <boost/thread/mutex.hpp>
-#elif defined(PSP)
+#elif !defined(QT_CONFIG)
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>

@@ -26,7 +26,7 @@
 namespace boost
 {
    /**
-    ** PSP specific variant of a boost mutex & scoped_lock
+    ** PSP specific variant of a boost mutex & scoped_lock 
    */

    template <class Mutex>
@@ -60,7 +60,7 @@ namespace boost
        {
            sceKernelDeleteSema(mID);
        }
-
+        
        void lock()
        {
            int result = sceKernelWaitSema(mID, 1, 0);
@@ -142,7 +142,7 @@ namespace boost
            }

        }
-
+        
        int mID;
        int mThreadID;
        volatile int mRecursionCount;
@@ -164,7 +164,7 @@ namespace boost


    /**
-    ** Emulating boost::thread configuration glue, with some shortcuts
+    ** Emulating boost::thread configuration glue, with some shortcuts 
    ** This detail namespace is a distillation of boost's thread.hpp, thread_data.hpp.
    */
    namespace detail
@@ -212,13 +212,13 @@ namespace boost
    **
    ** The intent of its usage is this form only:
    ** mWorkerThread = boost::thread(ThreadProc, this);
-    ** where ThreadProc is a static member function of the 'this' class,eg:
-    ** static void FOO::ThreadProc(void* inParam)
-    ** {
-    **		FOO* instance = reinterpret_cast<FOO*>(inParam);
-    **		// now you have class instance data available...
-    ** }
-    **
+	** where ThreadProc is a static member function of the 'this' class,eg:
+	** static void FOO::ThreadProc(void* inParam)
+	** {
+	**		FOO* instance = reinterpret_cast<FOO*>(inParam);
+	**		// now you have class instance data available...
+	** }
+	** 
    ** Any other variant of a thread proc with more than one param is unimplemented.
    */
    class thread
@@ -227,7 +227,7 @@ namespace boost
        ** Helper class for sceKernelStartThread, which passes args by value, not by reference
        ** We use this struct to wrap any pointers that we want to pass to the worker thread.
        */
-        struct CallbackData
+        struct CallbackData 
        {
            CallbackData(detail::thread_data_ptr inThreadInfo)
                : mThreadInfo(inThreadInfo)
@@ -307,7 +307,7 @@ namespace boost
    }
 }

-#elif defined(QT_CONFIG) && (__cplusplus <= 199711L)
+#elif defined(QT_CONFIG)

 #include <QMutex>
 #include <QThread>
@@ -537,80 +537,6 @@ namespace boost
    }
 }

-#elif (__cplusplus > 199711L)
-
-#include <thread>
-#include <mutex>
-
-namespace boost
-{
-    typedef std::thread thread;
-
-    template <class Mutex>
-    struct unique_lock
-    {
-        unique_lock(Mutex& inMutex) : mMutex(&inMutex)
-        {
-            mMutex->lock();
-        }
-
-        ~unique_lock()
-        {
-            mMutex->unlock();
-        }
-
-        Mutex* mMutex;
-    };
-
-    class mutex
-    {
-    public:
-
-        typedef unique_lock<mutex> scoped_lock;
-
-        mutex()
-          : mQMutex()
-        {
-        }
-
-        ~mutex()
-        {
-        }
-
-        void lock()
-        {
-            mQMutex.lock();
-        }
-
-        void unlock()
-        {
-            mQMutex.unlock();
-        }
-
-        std::mutex mQMutex;
-
-    private:
-        mutex(mutex const&);
-        mutex& operator=(mutex const&);
-    };
-
-    namespace posix_time
-    {
-        typedef unsigned int milliseconds;
-    }
-
-    /**
-    ** boost's platform neutral sleep call.
-    */
-    namespace this_thread
-    {
-        inline void sleep(boost::posix_time::milliseconds const& time)
-        {
-            std::this_thread::sleep_for(std::chrono::milliseconds(time));
-        }
-    }
-}
-
 #endif

 #endif // THREADING_H
--- a/JGE/include/qt/corewrapper.h
+++ b/JGE/include/qt/corewrapper.h
@@ -136,20 +136,6 @@ signals:
 private slots:

 private:
-    int lastPosx(){
-#if QT_VERSION >= 0x050100
-        return m_lastPos.x()*devicePixelRatio();
-#else
-        return m_lastPos.x();
-#endif
-    }
-    int lastPosy(){
-#if QT_VERSION >= 0x050100
-        return m_lastPos.y()*devicePixelRatio();
-#else
-        return m_lastPos.y();
-#endif
-    }
    void timerEvent( QTimerEvent* );
    void doAndEnqueue(JButton action) {
        m_engine->HoldKey_NoRepeat(action);
@@ -168,7 +154,6 @@ private:
    int m_timerId;
    bool m_active;
    QRect m_viewPort;
-    QPoint m_lastPos;
 #ifdef QT_WIDGET
 #if (defined Q_WS_MAEMO_5) || (defined MEEGO_EDITION_HARMATTAN) || (defined Q_WS_ANDROID)
  int mMouseDownX;
--- a/JGE/src/Downloader.cpp
+++ b/JGE/src/Downloader.cpp
@@ -1,298 +0,0 @@
-#include "DebugRoutines.h"
-#include "JFileSystem.h"
-#include "Downloader.h"
-
-#define RECORDS_DEFAULT_FILE "cache/records.txt"
-
-#ifdef QT_CONFIG
-QNetworkAccessManager DownloadRequest::networkAccessManager;
-#endif
-
-DownloadRequest::DownloadRequest(string localPath,
-                    string remoteResourceURL,
-                    string ETag,
-                    DownloadStatus downloadStatus,
-                    size_t totalSize,
-                    size_t currentSize):
-    mLocalPath(localPath),
-    mRemoteResourceURL(remoteResourceURL),
-    mRequestedRemoteResourceURL(remoteResourceURL),
-    mETag(ETag),
-    mDownloadStatus(downloadStatus),
-    mUpgradeAvailable(false),
-    mTotalSize(totalSize),
-    mCurrentSize(currentSize)
-{
-}
-
-DownloadRequest::~DownloadRequest()
-{
-}
-
-void DownloadRequest::startHead()
-{
-#ifdef QT_CONFIG
-    QNetworkRequest request(QUrl(QString(mRequestedRemoteResourceURL.c_str())));
-    request.setRawHeader("If-None-Match", mETag.c_str());
-    mNetworkReply = networkAccessManager.head(request);
-    connect(mNetworkReply, SIGNAL(finished()), SLOT(fileDownloaded()));
-#endif
-}
-
-void DownloadRequest::startGet()
-{
-#ifdef QT_CONFIG
-    mNetworkReply = networkAccessManager.get(QNetworkRequest(QUrl(QString(mRequestedRemoteResourceURL.c_str()))));
-#endif
-    mFile.close();
-    JFileSystem::GetInstance()->Remove(getTempLocalPath());
-    JFileSystem::GetInstance()->openForWrite(mFile, getTempLocalPath());
-#ifdef QT_CONFIG
-    connect(mNetworkReply, SIGNAL(downloadProgress(qint64, qint64)),
-                SLOT(downloadProgress(qint64, qint64)));
-    connect(mNetworkReply, SIGNAL(finished()), SLOT(fileDownloaded()));
-#endif
-}
-
-void DownloadRequest::fileDownloaded()
-{
-    do {
-        QByteArray eTagByteArray = mNetworkReply->rawHeader("ETag");
-        if(!eTagByteArray.isEmpty()) {
-            string oldETag = mETag;
-            mETag = QString(eTagByteArray).toStdString();
-            if(oldETag!="" && oldETag != mETag)
-                mUpgradeAvailable = true;
-        }
-
-        // let's check some error
-        if(mNetworkReply->error() != QNetworkReply::NoError) {
-            DebugTrace(mNetworkReply->errorString().toStdString());
-            mDownloadStatus = DownloadRequest::DOWNLOAD_ERROR;
-            mFile.close();
-            JFileSystem::GetInstance()->Remove(getTempLocalPath());
-            break;
-        }
-
-        // check if we're getting redirected
-        QVariant redirectionTarget = mNetworkReply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (!redirectionTarget.isNull()) {
-            QUrl newUrl = QUrl(mRequestedRemoteResourceURL.c_str()).resolved(redirectionTarget.toUrl());
-            DebugTrace(string("Redirect to ")+ newUrl.toString().toStdString());
-
-            mRequestedRemoteResourceURL = newUrl.toString().toStdString();
-            mNetworkReply->deleteLater();
-            if(mFile.is_open())
-                startGet();
-            else
-                startHead();
-            return;
-        }
-
-        if(mFile.is_open())
-        {
-            QByteArray byteArray = mNetworkReply->readAll();
-            mFile.write(byteArray.constData(), byteArray.size());
-            mFile.close();
-            if(!JFileSystem::GetInstance()->Rename(getTempLocalPath(), mLocalPath)) {
-                mDownloadStatus = DownloadRequest::DOWNLOAD_ERROR;
-                break;
-            }
-        }
-        mDownloadStatus = DownloadRequest::DOWNLOADED;
-    } while(0);
-
-    Downloader::GetInstance()->Update();
-    mNetworkReply->deleteLater();
-
-    emit statusChanged((int)mDownloadStatus);
-}
-
-void DownloadRequest::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
-{
-    QByteArray byteArray = mNetworkReply->readAll();
-    mFile.write(byteArray.constData(), byteArray.size());
-    mCurrentSize = bytesReceived;
-    mTotalSize = bytesTotal;
-    int percent = 0;
-    if(bytesTotal)
-        percent = (bytesReceived/bytesTotal)*100;
-    emit percentChanged(percent);
-}
-
-Downloader* Downloader::mInstance = 0;
-
-Downloader::Downloader(string globalRemoteURL, string localcacheRecords):
-    mGlobalRemoteURL(globalRemoteURL),
-    mLocalCacheRecords(localcacheRecords)
-{
-    JFileSystem::GetInstance()->MakeDir("cache");
-
-    izfstream downloadRecords;
-    if(mLocalCacheRecords.empty())
-        mLocalCacheRecords = RECORDS_DEFAULT_FILE;
-    if(JFileSystem::GetInstance()->openForRead(downloadRecords, mLocalCacheRecords))
-    {// File exists, let's read it.
-        downloadRecords >> (*this);
-    }
-    JFileSystem::GetInstance()->CloseFile();
-}
-
-Downloader::~Downloader()
-{
-    map<string, DownloadRequest*>::iterator ite;
-    for(ite = mRequestMap.begin(); ite != mRequestMap.end(); ite++)
-    {
-        delete (*ite).second;
-    }
-    mRequestMap.erase(mRequestMap.begin(), mRequestMap.end());
-}
-
-Downloader* Downloader::GetInstance()
-{
-    if(!mInstance)
-    {
-        mInstance = new Downloader();
-    }
-    return mInstance;
-}
-
-void Downloader::Release()
-{
-    if(mInstance)
-    {
-        delete mInstance;
-        mInstance = 0;
-    }
-}
-
-bool DownloadRequest::NetworkIsAccessible()
-{
-    bool result = false;
-
-#ifdef QT_CONFIG
-    networkAccessManager.setNetworkAccessible(QNetworkAccessManager::Accessible);
-    result = networkAccessManager.networkAccessible();
-#endif
-
-    return result;
-}
-
-DownloadRequest* Downloader::Get(string localPath, string remoteResourceURL)
-{
-    map<string, DownloadRequest*>::iterator ite = mRequestMap.find(localPath);
-    if(ite == mRequestMap.end())
-    { // request does not exist, let's create it
-        DownloadRequest* request = new DownloadRequest(localPath, remoteResourceURL);
-        std::pair<std::map<string,DownloadRequest*>::iterator,bool> ret;
-        ret = mRequestMap.insert ( std::pair<string,DownloadRequest*>(localPath, request) );
-        if (ret.second==false) {
-            DebugTrace("Downloader::Get Error inserting request in Map");
-            return 0;
-        }
-        ite = ret.first;
-    }
-
-    // Now, we can check the server
-    if((*ite).second->getDownloadStatus() == DownloadRequest::NOT_PRESENT ||
-            (*ite).second->upgradeAvailable())
-    {   // File is not here or an update is available, let's get it
-        (*ite).second->startGet();
-        (*ite).second->mDownloadStatus = DownloadRequest::DOWNLOADING;
-    }
-    else if ((*ite).second->getDownloadStatus() == DownloadRequest::DOWNLOADED)
-    {   // File is here, let's check if there is some update without blocking the playback
-        (*ite).second->startHead();
-    }
-
-    return (*ite).second;
-}
-
-void Downloader::Update()
-{
-    ofstream downloadRecords;
-    if(JFileSystem::GetInstance()->openForWrite(downloadRecords, mLocalCacheRecords))
-    {
-        downloadRecords << (*this);
-    }
-    downloadRecords.close();
-}
-
-ostream& operator<<(ostream& out, const DownloadRequest& d)
-{
-//    HEAD request fails, so this line erase cache record after upgrade check :(
-//    if(d.getDownloadStatus() == DownloadRequest::DOWNLOADED)
-    {
-        out << "localPath=" << d.mLocalPath << endl;
-        out << "remoteResource=" << d.mRemoteResourceURL << endl;
-        out << "ETag=" << d.mETag << endl;
-        out << "upgradeAvailable=" << d.mUpgradeAvailable <<endl;
-    }
-
-    return out;
-}
-
-istream& operator>>(istream& in, DownloadRequest& d)
-{
-    string s;
-
-    while(std::getline(in, s))
-    {
-        size_t limiter = s.find("=");
-        string areaS;
-        if (limiter != string::npos)
-        {
-            areaS = s.substr(0, limiter);
-            if (areaS.compare("localPath") == 0)
-            {
-                d.mLocalPath = s.substr(limiter + 1);
-            }
-            else if (areaS.compare("remoteResource") == 0)
-            {
-                d.mRemoteResourceURL = s.substr(limiter + 1);
-                d.mRequestedRemoteResourceURL = d.mRemoteResourceURL;
-            }
-            else if (areaS.compare("ETag") == 0)
-            {
-                d.mETag = s.substr(limiter + 1);
-                d.mDownloadStatus = DownloadRequest::DOWNLOADED;
-            }
-            else if (areaS.compare("upgradeAvailable") == 0)
-            {
-                d.mUpgradeAvailable = (bool)atoi(s.substr(limiter + 1).c_str());
-                break;
-            }
-        }
-    }
-
-    return in;
-}
-
-ostream& operator<<(ostream& out, const Downloader& d)
-{
-    map<string, DownloadRequest*>::const_iterator ite;
-    for(ite = d.mRequestMap.begin(); ite != d.mRequestMap.end(); ite++)
-    {
-        out << (*(*ite).second) << endl;
-    }
-    return out;
-}
-
-istream& operator>>(istream& in, Downloader& d)
-{
-    while(!in.eof())
-    {
-        DownloadRequest* downloadRequest = new DownloadRequest();
-        in >> (*downloadRequest);
-
-        if(!downloadRequest->getLocalPath().empty() &&
-           !downloadRequest->getRemoteResource().empty() &&
-           !downloadRequest->getETag().empty()) {
-            d.mRequestMap[downloadRequest->getLocalPath()] = downloadRequest;
-        } else {
-            delete downloadRequest;
-        }
-    }
-    return in;
-}
-
--- a/JGE/src/JAnimator.cpp
+++ b/JGE/src/JAnimator.cpp
@@ -67,7 +67,7 @@ bool JAnimator::Load(const char* scriptFile)
 		element = script->ToElement();
 		printf("---- Loading %s:%s\n", element->Value(), element->Attribute("name"));

-		string type[] =
+		const char *type[] =
 		{
 			"ANIMATION_TYPE_LOOPING",
 			"ANIMATION_TYPE_ONCE_AND_STAY",
@@ -78,7 +78,7 @@ bool JAnimator::Load(const char* scriptFile)

 		const char* aniType = element->Attribute("type");
 		for (int i=0;i<5;i++)
-			if (type[i] == aniType)
+			if (strcmp(type[i], aniType)==0)
 			{
 				SetAnimationType(i);
 				break;
@@ -108,7 +108,7 @@ bool JAnimator::Load(const char* scriptFile)
 					element = param->ToElement();
 					if (element != NULL)
 					{
-						if (element->ValueStr() == "settings")
+						if (strcmp(element->Value(), "settings")==0)
 						{
 							const char* quadName = element->Attribute("quad");
 							JQuad* quad = mResource->GetQuad(quadName);
--- a/JGE/src/JFileSystem.cpp
+++ b/JGE/src/JFileSystem.cpp
@@ -126,7 +126,7 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
 	DebugTrace("User path " << userPath);
 #elif defined (QT_CONFIG)

-    QDir sysDir(RESDIR);
+    QDir sysDir("projects/mtg/bin/Res");
    QDir dir(QDir::homePath());
    dir.mkdir(USERDIR);
    dir.cd(USERDIR);
@@ -313,15 +313,11 @@ bool JFileSystem::readIntoString(const string & FilePath, string & target)

    int fileSize = GetFileSize(file);

-#ifndef __MINGW32__
    try {
-#endif
        target.resize((std::string::size_type) fileSize);
-#ifndef __MINGW32__
    } catch (bad_alloc&) {
        return false;
    }
-#endif


    if (fileSize)
@@ -557,13 +553,7 @@ bool JFileSystem::Rename(string _from, string _to)
    string from = mUserFSPath + _from;
    string to = mUserFSPath + _to;
    std::remove(to.c_str());
-    return (rename(from.c_str(), to.c_str()) == 0);
-}
-
-bool JFileSystem::Remove(string aFile)
-{
-    string toRemove = mUserFSPath + aFile;
-    return (std::remove(toRemove.c_str()) == 0);
+    return rename(from.c_str(), to.c_str()) ? true: false;
 }

 int JFileSystem::GetFileSize(izfstream & file)
--- a/JGE/src/JGfx-fake.cpp
+++ b/JGE/src/JGfx-fake.cpp
@@ -65,7 +65,7 @@ void JQuad::SetHotSpot(float x, float y)

 //////////////////////////////////////////////////////////////////////////

-JTexture::JTexture() : mWidth(0), mHeight(0), mBuffer(NULL)
+JTexture::JTexture() : mBuffer(NULL)
 {
    mTexId = -1;
 }
@@ -305,12 +305,14 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
 JTexture* JRenderer::CreateTexture(int width, int height, int mode __attribute__((unused)))
 {
    JTexture *tex = new JTexture();
+
    return tex;
 }

 JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureFormat)
 {
    JTexture *tex = new JTexture();
+
    return tex;
 }

--- a/JGE/src/JOBJModel.cpp
+++ b/JGE/src/JOBJModel.cpp
@@ -75,10 +75,10 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 	
 	int count;

-	while (filePtr < size)
-	{
+    while (filePtr < size)
+    {
 		filePtr = ReadLine(tmpLine, buffer, filePtr, size);
-		{
+        {

 			if ((tmpLine[0] == '#') || (strlen(tmpLine)  < 3))
 			{
@@ -89,19 +89,19 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)

 				if (count == 4)
 				{
-					if (string("vn") == s1)
+					if (strcmp(s1, "vn") == 0)
 						normalList.push_back(vert);
-					else if (string("vt") == s1)
+					else if (strcmp(s1, "vt") == 0)
 						texList.push_back(vert);
-					else if (string("v") == s1)
+					else if (strcmp(s1, "v") == 0)
 						vertList.push_back(vert);
 				}
 				else if (count == 3)
 				{
-					if (string("vt") == s1)
+					if (strcmp(s1, "vt") == 0)
 						texList.push_back(vert);
 				}
-				 
+	             
 			}
 			else if (tmpLine[0] == 'f')
 			{
@@ -211,7 +211,7 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 	if (textureName != NULL)
 		mTexture = JRenderer::GetInstance()->LoadTexture(textureName);

-	return true;
+    return true;

 }

--- a/JGE/src/JParticleEffect.cpp
+++ b/JGE/src/JParticleEffect.cpp
@@ -90,7 +90,7 @@ bool JParticleEffect::Load(const char* filename)
 // 		FIELD_COUNT
 // 	};

-	const string lifeValues[] =
+	const char* lifeValues[] =
 	{
 		"speed",
 		"size",
@@ -104,7 +104,7 @@ bool JParticleEffect::Load(const char* filename)
 		"gravity"
 	};

-	const string typeNames[] =
+	const char* typeNames[] =
 	{
 		"POINT",
 		"AREA",
@@ -113,7 +113,7 @@ bool JParticleEffect::Load(const char* filename)
 		"CIRCLE"
 	};

-	const string modeNames[] =
+	const char* modeNames[] =
 	{
 		"REPEAT",
 		"ONCE",
@@ -149,32 +149,32 @@ bool JParticleEffect::Load(const char* filename)
 			{
 				element = param->ToElement();
 				
-				if (string("settings") == element->Attribute("name"))
+				if (strcmp(element->Attribute("name"), "settings")==0)
 				{
 					
-					if (string("NORMAL") == element->Attribute("blend"))
+					if (strcmp(element->Attribute("blend"), "NORMAL")==0)
 						mParticleEmitters[mEmitterCount]->SetBlending(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
-					else if (string("ADDITIVE") == element->Attribute("blend"))
+					else if (strcmp(element->Attribute("blend"), "ADDITIVE")==0)
 						mParticleEmitters[mEmitterCount]->SetBlending(BLEND_SRC_ALPHA, BLEND_ONE);
 					
 					for (unsigned int i=0;i<sizeof(modeNames)/sizeof(char*);i++)
 					{
-						if (modeNames[i] == element->Attribute("mode"))
+						if (strcmp(element->Attribute("mode"), modeNames[i])==0)
 						{
 							mParticleEmitters[mEmitterCount]->mEmitterMode = i;
 							#if defined (_DEBUG)
-								printf("emitter mode:%s\n", modeNames[i].c_str());
+								printf("emitter mode:%s\n", modeNames[i]);
 							#endif
 							break;
 						}
 					}
 					for (unsigned i=0;i<sizeof(typeNames)/sizeof(char*);i++)
 					{
-						if (typeNames[i] == element->Attribute("type"))
+						if (strcmp(element->Attribute("type"), typeNames[i])==0)
 						{
 							mParticleEmitters[mEmitterCount]->mType = i;
 							#if defined (_DEBUG)
-								printf("emitter type:%s\n", typeNames[i].c_str());
+								printf("emitter type:%s\n", typeNames[i]);
 							#endif
 							break;
 						}
@@ -213,7 +213,7 @@ bool JParticleEffect::Load(const char* filename)

 					}
 				}
-				else if (string("quantity") == element->Attribute("name"))
+				else if (strcmp(element->Attribute("name"), "quantity")==0)
 				{
 					for (key = param->FirstChild(); key; key = key->NextSibling())
 					{
@@ -227,7 +227,7 @@ bool JParticleEffect::Load(const char* filename)
 						
 					}
 				}
-				else if (string("lifex") == element->Attribute("name"))
+				else if (strcmp(element->Attribute("name"), "lifex")==0)
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -236,7 +236,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mLifeMax= value;	
 					}
 				}
-				else if (string("anglex") == element->Attribute("name"))
+				else if (strcmp(element->Attribute("name"), "anglex")==0)
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -245,7 +245,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mAngleMax= value*DEG2RAD;	
 					}
 				}
-				else if (string("speedx") == element->Attribute("name"))
+				else if (strcmp(element->Attribute("name"), "speedx")==0)
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -254,7 +254,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mSpeedMax= value;	
 					}
 				}
-				else if (string("sizex") == element->Attribute("name"))
+				else if (strcmp(element->Attribute("name"), "sizex")==0)
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -267,7 +267,7 @@ bool JParticleEffect::Load(const char* filename)
 				{
 					for (int i=0;i<FIELD_COUNT;i++)
 					{
-						if (lifeValues[i] == element->Attribute("name"))
+						if (strcmp(element->Attribute("name"), lifeValues[i])==0)
 						{
 							for (key = param->FirstChild(); key; key = key->NextSibling())
 							{
--- a/JGE/src/JResourceManager.cpp
+++ b/JGE/src/JResourceManager.cpp
@@ -119,11 +119,11 @@ bool JResourceManager::LoadResource(const string& resourceName)
 			element = node->ToElement();
 			if (element != NULL)
 			{
-				if (element->ValueStr() == "texture")
+				if (strcmp(element->Value(), "texture")==0)
 				{
 					CreateTexture(element->Attribute("name"));
 				}
-				else if (element->ValueStr() == "quad")
+				else if (strcmp(element->Value(), "quad")==0)
 				{
 					string quadName = element->Attribute("name");
 					string textureName = element->Attribute("texture");
@@ -170,7 +170,7 @@ bool JResourceManager::LoadResource(const string& resourceName)
 						GetQuad(id)->SetHotSpot(hotspotX, hotspotY);
 					}
 				}
-				else if (element->ValueStr() == "font")
+				else if (strcmp(element->Value(), "font")==0)
 				{
 				}

--- a/JGE/src/Qtconsole.cpp
+++ b/JGE/src/Qtconsole.cpp
@@ -96,8 +96,9 @@ 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 << " out of " << testSuite.nbTests + testSuite.nbAITests << " total");
+    DebugTrace("TestSuite done: failed test: " << result << " out of " << totalTests << " total");
 #ifdef CAPTURE_STDERR
    OutputCapturer::debugAndClear();
 #endif
--- a/JGE/src/Qtmain.cpp
+++ b/JGE/src/Qtmain.cpp
@@ -9,11 +9,11 @@
 #include <QtDeclarative>
 #include "qmlapplicationviewer.h"
 #endif //QT_WIDGET
-#include "Downloader.h"
+#include "filedownloader.h"
 #include "GameApp.h"
 #include "corewrapper.h"

-WagicCore* g_glwidget = NULL;
+QWidget* g_glwidget = NULL;

 static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[] =
 {
@@ -69,25 +69,18 @@ int main(int argc, char* argv[])

 #endif //QT_WIDGET

+    if(argc >= 2 && strcmp(argv[1], "testsuite")==0)
+    {
+        int result = 0;
+        result += WagicCore::runTestSuite();
+        return result;
+    }
+
    app->setApplicationName(WagicCore::getApplicationName());
-    DownloadRequest* downloadRequest = NULL;
-#ifdef WAGIC_RESOURCE_URL
-    Downloader*downloader = Downloader::GetInstance();
-    downloadRequest = downloader->Get(
-                "core.zip",
-                WAGIC_RESOURCE_URL
-                );
-#endif
+    FileDownloader fileDownloader(USERDIR, WAGIC_RESOURCE_NAME);
 #ifdef QT_WIDGET
    g_glwidget = new WagicCore();
-    if(!downloadRequest || downloadRequest->getDownloadStatus() == DownloadRequest::DOWNLOADED)
-    {
-        g_glwidget->start(0);
-    }
-    else
-    {
-        g_glwidget->connect(downloadRequest, SIGNAL(statusChanged(int)), SLOT(start(int)));
-    }
+    g_glwidget->connect(&fileDownloader, SIGNAL(finished(int)), SLOT(start(int)));
 #else
    qmlRegisterType<WagicCore>("CustomComponents", 1, 0, "WagicCore");

--- a/JGE/src/SDLmain.cpp
+++ b/JGE/src/SDLmain.cpp
@@ -78,20 +78,7 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativeResume(
 {    
 	if (!g_engine)
 		return;
-    g_engine->Resume();
-}
-
-#include "Wagic_Version.h"
-extern "C" jstring Java_org_libsdl_app_SDLActivity_getResourceName(
-                                       JNIEnv* env, jclass cls)
-{
-    return env->NewStringUTF (WAGIC_RESOURCE_NAME);
-}
-
-extern "C" jstring Java_org_libsdl_app_SDLActivity_getResourceUrl(
-                                       JNIEnv* env, jclass cls)
-{
-    return env->NewStringUTF (WAGIC_RESOURCE_URL);
+	g_engine->Resume();
 }
 #endif

--- a/JGE/src/iOS/EAGLView.m
+++ b/JGE/src/iOS/EAGLView.m
@@ -166,11 +166,12 @@ void DestroyGame(void)
    [menuKeyRecognizer requireGestureRecognizerToFail: selectKeyRecognizer];
    [self addGestureRecognizer:menuKeyRecognizer];
    
-    /*
+    // initialize the scaling factor
+    lastScale = 1.f;
    UIPinchGestureRecognizer *pinchZoomRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinchZoom:)];
    [self addGestureRecognizer:pinchZoomRecognizer];
    [pinchZoomRecognizer release];
-    */
+

    /*
     Create a single tap recognizer to select the nearest object.
@@ -391,8 +392,6 @@ void DestroyGame(void)
 }


-
-
 - (BOOL) gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
    return YES;
@@ -425,6 +424,21 @@ void DestroyGame(void)
 }

 #pragma mark Gesture Recognizer callbacks
+- (void)handlePinchZoom: (UIPinchGestureRecognizer *) pinchGesture {
+    [[[pinchGesture view] layer] removeAllAnimations];
+    CGFloat currentScaleFactor = [pinchGesture scale];
+
+    if (pinchGesture.state == UIGestureRecognizerStateEnded) {
+        if (lastScale < 1.3f) {
+            lastScale *= currentScaleFactor;
+        }
+        else {
+            lastScale = 1;
+            [self displayGameMenu];
+        }
+        pinchGesture.scale = 1.f;
+    }
+}

 - (void)handlePanMotion: (UIPanGestureRecognizer *) panGesture
 {
--- a/JGE/src/iOS/EAGLViewController.m
+++ b/JGE/src/iOS/EAGLViewController.m
@@ -47,7 +47,6 @@

 - (void)viewDidLoad {
 	NSLog(@"EAGL ViewController - view Did Load");
-
 	[super viewDidLoad];
 }

@@ -56,7 +55,6 @@
    [self.view resumeGame];
 }

-
 - (void)viewWillDisappear:(BOOL)animated
 {
    [self.view pauseGame];
@@ -77,6 +75,10 @@
    [self.view endGame];
 }

+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 - (void)viewDidAppear:(BOOL)animated {

 	NSLog(@"EAGL ViewController - view Did Appear");
--- a/JGE/src/iOS/ES2Renderer.m
+++ b/JGE/src/iOS/ES2Renderer.m
@@ -7,6 +7,7 @@
 #include "JFileSystem.h"
 #include "JRenderer.h"
 #include "JGameLauncher.h"
+#include "UIScreen+Util.h"

 #define ACTUAL_SCREEN_WIDTH (SCREEN_WIDTH)
 #define ACTUAL_SCREEN_HEIGHT (SCREEN_HEIGHT)
@@ -61,7 +62,7 @@ bool checkFramebufferStatus();
    // for retina devices.  because of the 568 px, the ratio between height-width skews the
    // frame a bit

-    if ( backingHeight == 568 || backingWidth == 568) {
+    if ( [UIScreen isRetinaDisplay]) {
 		viewPort.left = 0;
 		viewPort.top = -((backingWidth/ACTUAL_RATIO)-backingHeight)/2  + 22; // account for status bar
 		viewPort.right = backingWidth;
--- a/JGE/src/pc/JGfx.cpp
+++ b/JGE/src/pc/JGfx.cpp
@@ -343,7 +343,7 @@ void JQuad::SetHotSpot(float x, float y)

 //////////////////////////////////////////////////////////////////////////

-JTexture::JTexture() : mWidth(0), mHeight(0), mBuffer(NULL)
+JTexture::JTexture() : mBuffer(NULL)
 {
    mTexId = -1;
 }
@@ -2486,7 +2486,7 @@ void JRenderer::Enable2D()
 #if (defined GL_VERSION_ES_CM_1_1) || (defined GL_OES_VERSION_1_1)
    glOrthof(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f, -1.0f, 1.0f);
 #else
-    glOrtho(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f, -1.0f, 1.0f);
+    gluOrtho2D(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f);
 #endif

    glMatrixMode (GL_MODELVIEW);										// Select The Modelview Matrix
--- a/JGE/src/pc/JSfx.cpp
+++ b/JGE/src/pc/JSfx.cpp
@@ -22,8 +22,6 @@
 JMusic::JMusic()
 #ifdef USE_PHONON
  : mOutput(0), mMediaObject(0)
-#elif defined QT_CONFIG
-    : playlist(0), player(0)
 #endif
 {
 }
@@ -42,16 +40,11 @@ int JMusic::getPlayTime(){

 JMusic::~JMusic()
 {
-#if defined USE_PHONON
+#ifdef USE_PHONON
  if(mOutput)
    delete mOutput;
  if(mMediaObject)
    delete mMediaObject;
-#elif defined QT_CONFIG
-    if(player)
-        delete player;
-    if(playlist)
-        delete playlist;
 #elif defined WITH_FMOD
  JSoundSystem::GetInstance()->StopMusic(this);
  if (mTrack) FSOUND_Sample_Free(mTrack);
@@ -76,10 +69,7 @@ JSample::JSample()

 JSample::~JSample()
 {
-#if (defined QT_CONFIG) && (!defined USE_PHONON)
-    if(effect)
-        delete effect;
-#elif USE_PHONON
+#ifdef USE_PHONON
  if(mOutput)
    delete mOutput;
  if(mMediaObject)
@@ -154,84 +144,65 @@ void JSoundSystem::DestroySoundSystem()

 JMusic *JSoundSystem::LoadMusic(const char *fileName)
 {
-    JMusic* music = NULL;
-#if (defined QT_CONFIG)  && (!defined USE_PHONON)
-    music = new JMusic();
-    if (music)
-    {
-        music->player = new QMediaPlayer;
-        music->player->setVolume(100);
-        music->playlist = new QMediaPlaylist;
-        music->fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-        music->playlist->addMedia(QUrl::fromLocalFile(music->fullpath.c_str()));
-        music->playlist->setCurrentIndex(0);
-    }
-#elif defined USE_PHONON
-    music = new JMusic();
-    if (music)
-    {
-        music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
-        music->mMediaObject = new Phonon::MediaObject(0);
-        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-        music->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
-        Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput);
-        Q_ASSERT(mediapath.isValid());
-    }
+#ifdef USE_PHONON
+  JMusic* music = new JMusic();
+  if (music)
+  {
+    music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
+    music->mMediaObject = new Phonon::MediaObject(0);
+    string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+    music->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
+    Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput);
+    Q_ASSERT(mediapath.isValid());
+  }
+  return music;
 #elif (defined WITH_FMOD)
-    music = new JMusic();
-    if (music)
+  JMusic* music = new JMusic();
+  if (music)
    {
-        JFileSystem* fileSystem = JFileSystem::GetInstance();
-        if (fileSystem->OpenFile(fileName))
-        {
-            int size = fileSystem->GetFileSize();
-            char *buffer = new char[size];
-            fileSystem->ReadFile(buffer, size);
-            music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
+      JFileSystem* fileSystem = JFileSystem::GetInstance();
+      if (fileSystem->OpenFile(fileName))
+	{
+	  int size = fileSystem->GetFileSize();
+	  char *buffer = new char[size];
+	  fileSystem->ReadFile(buffer, size);
+	  music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);

-            delete[] buffer;
-            fileSystem->CloseFile();
-        }
+	  delete[] buffer;
+	  fileSystem->CloseFile();
+	}
    }
+  return music;
 #else
    cerr << fileName << endl;
+  return NULL;
 #endif
-    return music;
 }


 void JSoundSystem::PlayMusic(JMusic *music, bool looping)
 {
-#if (defined QT_CONFIG)  && (!defined USE_PHONON)
-    if(music && music->player && music->playlist)
+#ifdef USE_PHONON
+  if (music && music->mMediaObject && music->mOutput)
+  {
+    if(looping)
    {
-        if(looping)
-            music->playlist->setPlaybackMode(QMediaPlaylist::Loop);
-
-        music->player->setPlaylist(music->playlist);
-        music->player->play();
+      music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining()));
    }
-#elif USE_PHONON
-    if (music && music->mMediaObject && music->mOutput)
-    {
-        if(looping)
-        {
-            music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining()));
-        }
-        music->mOutput->setVolume((qreal)mVolume*0.01);
-        music->mMediaObject->play();
+    music->mOutput->setVolume((qreal)mVolume*0.01);
+    music->mMediaObject->play();

-    }
+  }
 #elif (defined WITH_FMOD)
-    if (music && music->mTrack)
+  if (music && music->mTrack)
    {
-        mChannel = FSOUND_PlaySound(mChannel, music->mTrack);
-        SetMusicVolume(mVolume);
+      mChannel = FSOUND_PlaySound(mChannel, music->mTrack);
+      SetMusicVolume(mVolume);

-        if (looping)
-            FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL);
-        else
-            FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF);
+      if (looping)
+	FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL);
+      else
+	FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF);
    }
 #else
    music = 0;
@@ -242,12 +213,7 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping)

 void JSoundSystem::StopMusic(JMusic *music)
 {
-#if (defined QT_CONFIG) && (!defined USE_PHONON)
-    if (music && music->player && music->playlist)
-    {
-        music->player->stop();
-    }
-#elif defined USE_PHONON
+#ifdef USE_PHONON
  if (music && music->mMediaObject && music->mOutput)
  {
    music->mMediaObject->stop();
@@ -298,61 +264,47 @@ void JSoundSystem::SetSfxVolume(int volume){

 JSample *JSoundSystem::LoadSample(const char *fileName)
 {
-    JSample* sample = NULL;
-#if (defined QT_CONFIG) && (!defined USE_PHONON)
-    sample = new JSample();
-    if (sample)
-    {
-        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-        sample->effect = new QMediaPlayer;
-        sample->effect->setMedia(QUrl::fromLocalFile(fullpath.c_str()));
-        sample->effect->setVolume(100);
-        sample->mSample = &(sample->effect);
-    }
-#elif (defined USE_PHONON)
-    sample = new JSample();
-    if (sample)
-    {
-        sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
-        sample->mMediaObject = new Phonon::MediaObject(0);
-        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-        sample->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
-        Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput);
-        Q_ASSERT(mediapath.isValid());
-    }
+#if (defined USE_PHONON)
+  JSample* sample = new JSample();
+  if (sample)
+  {
+    sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
+    sample->mMediaObject = new Phonon::MediaObject(0);
+    string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+    sample->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
+    Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput);
+    Q_ASSERT(mediapath.isValid());
+  }
+  return sample;
 #elif (defined WITH_FMOD)
-    sample = new JSample();
-    if (sample)
+  JSample* sample = new JSample();
+  if (sample)
    {
-        JFileSystem* fileSystem = JFileSystem::GetInstance();
-        if (fileSystem->OpenFile(fileName))
-        {
-            int size = fileSystem->GetFileSize();
-            char *buffer = new char[size];
-            fileSystem->ReadFile(buffer, size);
-            sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
+      JFileSystem* fileSystem = JFileSystem::GetInstance();
+      if (fileSystem->OpenFile(fileName))
+	{
+	  int size = fileSystem->GetFileSize();
+	  char *buffer = new char[size];
+	  fileSystem->ReadFile(buffer, size);
+	  sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);

-            delete[] buffer;
-            fileSystem->CloseFile();
-        }else
-            sample->mSample = NULL;
+	  delete[] buffer;
+	  fileSystem->CloseFile();
+	}else
+	sample->mSample = NULL;

    }
+  return sample;
 #else
    cerr << fileName << endl;
+  return NULL;
 #endif
-    return sample;
 }


 void JSoundSystem::PlaySample(JSample *sample)
 {
-#if (defined QT_CONFIG) && (!defined USE_PHONON)
-    if(sample)
-    {
-        sample->effect->play();
-    }
-#elif defined USE_PHONON
+#ifdef USE_PHONON
  if (sample && sample->mMediaObject && sample->mOutput)
  {
    sample->mOutput->setVolume((qreal)mSampleVolume*0.01);
--- a/JGE/src/qt/corewrapper.cpp
+++ b/JGE/src/qt/corewrapper.cpp
@@ -335,7 +335,7 @@ void WagicCore::resizeGL(int width, int height)
 #if (defined GL_VERSION_ES_CM_1_1 || defined GL_OES_VERSION_1_1)
    glOrthof(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f, -1.0f, 1.0f);
 #else
-    glOrtho(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f, -1.0f, 1.0f);
+    gluOrtho2D(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f);
 #endif

    glMatrixMode (GL_MODELVIEW);										// Select The Modelview Matrix
@@ -418,29 +418,29 @@ void WagicCore::mousePressEvent(QMouseEvent *event)
 {
  if(event->button() == Qt::LeftButton)
  {
-    m_lastPos = event->pos();
+    QPoint lastPos = event->pos();
    // this is intended to convert window coordinate into game coordinate.
    // this is correct only if the game and window have the same aspect ratio, otherwise, it's just wrong
    int actualWidth = (int) JRenderer::GetInstance()->GetActualWidth();
    int actualHeight = (int) JRenderer::GetInstance()->GetActualHeight();

-    if (lastPosy() >= m_viewPort.top() &&
-      lastPosy() <= m_viewPort.bottom() &&
-      lastPosx() <= m_viewPort.right() &&
-      lastPosx() >= m_viewPort.left()) {
+    if (lastPos.y() >= m_viewPort.top() &&
+      lastPos.y() <= m_viewPort.bottom() &&
+      lastPos.x() <= m_viewPort.right() &&
+      lastPos.x() >= m_viewPort.left()) {
      m_engine->LeftClicked(
-                  ((lastPosx()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
-                  ((lastPosy()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
+                  ((lastPos.x()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
+                  ((lastPos.y()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
 #if (!defined Q_WS_MAEMO_5) && (!defined MEEGO_EDITION_HARMATTAN) && (!defined Q_WS_ANDROID)
      m_engine->HoldKey_NoRepeat(JGE_BTN_OK);
 #else
-      mMouseDownX = lastPosx();
-      mMouseDownY = lastPosy();
+      mMouseDownX = lastPos.x();
+      mMouseDownY = lastPos.y();
      mLastFingerDownTime = g_startTimer.elapsed();
 #endif
-    } else if(lastPosy()<m_viewPort.top()) {
+    } else if(lastPos.y()<m_viewPort.top()) {
      m_engine->HoldKey_NoRepeat(JGE_BTN_MENU);
-    } else if(lastPosy()>m_viewPort.bottom()) {
+    } else if(lastPos.y()>m_viewPort.bottom()) {
      m_engine->HoldKey_NoRepeat(JGE_BTN_NEXT);
    }
    event->accept();
@@ -465,33 +465,33 @@ void WagicCore::mouseReleaseEvent(QMouseEvent *event)
 {
  if(event->button() == Qt::LeftButton)
  {
-    m_lastPos = event->pos();
+    QPoint lastPos = event->pos();

-    if (lastPosy() >= m_viewPort.top() &&
-      lastPosy() <= m_viewPort.bottom() &&
-      lastPosx() <= m_viewPort.right() &&
-      lastPosx() >= m_viewPort.left()) {
+    if (lastPos.y() >= m_viewPort.top() &&
+      lastPos.y() <= m_viewPort.bottom() &&
+      lastPos.x() <= m_viewPort.right() &&
+      lastPos.x() >= m_viewPort.left()) {
 #if (defined Q_WS_MAEMO_5) || (defined MEEGO_EDITION_HARMATTAN) || (defined Q_WS_ANDROID)
      if(g_startTimer.elapsed() - mLastFingerDownTime <= kTapEventTimeout )
      {
-        if(abs(mMouseDownX - lastPosx()) < kHitzonePliancy &&
-           abs(mMouseDownY - lastPosy()) < kHitzonePliancy)
+        if(abs(mMouseDownX - lastPos.x()) < kHitzonePliancy &&
+           abs(mMouseDownY - lastPos.y()) < kHitzonePliancy)
        {
          m_engine->HoldKey_NoRepeat(JGE_BTN_OK);
        }
      }
      else if (g_startTimer.elapsed() - mLastFingerDownTime >= kSwipeEventMinDuration)
      { // Let's swipe
-        m_engine->Scroll(lastPosx()-mMouseDownX, lastPosy()-mMouseDownY);
+        m_engine->Scroll(lastPos.x()-mMouseDownX, lastPos.y()-mMouseDownY);
      }
 #else
 //#if (!defined Q_WS_MAEMO_5) && (!defined MEEGO_EDITION_HARMATTAN)
      m_engine->ReleaseKey(JGE_BTN_OK);
 #endif
      m_engine->ReleaseKey(JGE_BTN_MENU);
-    } else if(lastPosy() < m_viewPort.top()) {
+    } else if(lastPos.y() < m_viewPort.top()) {
      m_engine->ReleaseKey(JGE_BTN_MENU);
-    } else if(lastPosy() > m_viewPort.bottom()) {
+    } else if(lastPos.y() > m_viewPort.bottom()) {
      m_engine->ReleaseKey(JGE_BTN_NEXT);
    }
    event->accept();
@@ -517,15 +517,15 @@ void WagicCore::mouseMoveEvent(QMouseEvent *event)
  int actualWidth = (int) JRenderer::GetInstance()->GetActualWidth();
  int actualHeight = (int) JRenderer::GetInstance()->GetActualHeight();

-  m_lastPos = event->pos();
+  QPoint lastPos = event->pos();

-  if (lastPosy() >= m_viewPort.top() &&
-    lastPosy() <= m_viewPort.bottom() &&
-    lastPosx() <= m_viewPort.right() &&
-    lastPosx() >= m_viewPort.left()) {
+  if (lastPos.y() >= m_viewPort.top() &&
+    lastPos.y() <= m_viewPort.bottom() &&
+    lastPos.x() <= m_viewPort.right() &&
+    lastPos.x() >= m_viewPort.left()) {
    m_engine->LeftClicked(
-                ((lastPosx()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
-                ((lastPosy()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
+                ((lastPos.x()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
+                ((lastPos.y()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
    event->accept();
  } else {
    super::mouseMoveEvent(event);
--- a/JGE/src/zipFS/zstream.h
+++ b/JGE/src/zipFS/zstream.h
@@ -106,7 +106,6 @@ public:
 	virtual int overflow(int c = EOF);
 	virtual int underflow();
 	virtual int	sync();
-    using std::streambuf::setbuf;
 	virtual std::streambuf * setbuf(char * pr, int nLength);
 	virtual std::streampos seekoff(std::streamoff, std::ios::seekdir, std::ios::openmode);

@@ -132,7 +131,6 @@ public:
 	virtual int overflow(int c = EOF);
 	virtual int underflow();
 	virtual int sync();
-    using std::streambuf::setbuf;
 	virtual std::streambuf * setbuf(char * pr, int nLength);
 	virtual std::streampos seekoff(std::streamoff, std::ios::seekdir, std::ios::openmode);

--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@


 [![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic)
-[![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master)
-

 ## Description

@@ -18,11 +16,6 @@ Wagic, the Homebrew, is a C++ game engine that allows to play card games against
 It is highly customizable and allows the player to tweak the rules / create their own cards, their own themes, etc... 


-Info, downloads, discussions and more at http://wololo.net/forum/index.php
+Info, Downloads, and more at http://wololo.net

 -![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")
-
-
-
-### Sample round play-through video
-[![IMAGE ALT TEXT HERE](http://img.youtube.com/vi/WUFSAPZuDIk/0.jpg)](http://www.youtube.com/watch?v=WUFSAPZuDIk)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,68 +0,0 @@
-# Notes:
-#   - Minimal appveyor.yml file is an empty file. All sections are optional.
-#   - Indent each level of configuration with 2 spaces. Do not use tabs!
-#   - All section names are case-sensitive.
-#   - Section names should be unique on each level.
-
-#---------------------------------#
-#    environment configuration    #
-#---------------------------------#
-
-environment:
-  GH_TOKEN:
-    secure: dYnBDQkiY5oVjIlswzBX9BJigNtBGXgGlp1tK3XbHzrDEDrs2vaKD5m+Oz5OSz1C
-
-# scripts that run after cloning repository
-install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
-  - "C:/Python27/python.exe C:/get-pip.py"
-  - "C:/Python27/Scripts/pip.exe install pyjavaproperties"
-  - "C:/Python27/Scripts/pip.exe install github3.py"
-
-#---------------------------------#
-#       build configuration       #
-#---------------------------------#
-
-# build Configuration, i.e. Debug, Release, etc.
-configuration: Release
-
-build:
-  project: projects/mtg/mtg_vs2010.sln      # path to Visual Studio solution or project
-
-#---------------------------------#
-#       tests configuration       #
-#---------------------------------#
-
-# to disable automatic tests
-test: off
-
-
-#---------------------------------#
-#      artifacts configuration    #
-#---------------------------------#
-
-artifacts:
-  # pushing windows package
-  - path: projects\mtg\bin\Wagic-windows*.zip
-
-
-#---------------------------------#
-#     deployment configuration    #
-#---------------------------------#
-
-# scripts to run before deployment
-before_deploy:
-  - cd projects/mtg/bin
-  - "C:/Python27/python.exe createWindowsZip.py"
-  - cd ../../..
-
-# scripts to run after deployment
-after_deploy:
-
-# to run your custom scripts instead of provider deployments
-deploy_script:
-  - "C:/Python27/python.exe upload-binaries.py -t %GH_TOKEN% -s %APPVEYOR_REPO_COMMIT% -l projects/mtg/bin/Wagic-windows.zip -r Wagic-windows.zip -b %APPVEYOR_REPO_BRANCH%"
-
-# to disable deployment
-#deploy: off
-
--- a/projects/mtg/Android/jni/Android.mk
+++ b/projects/mtg/Android/jni/Android.mk
@@ -14,7 +14,7 @@ PNG_PATH := $(JGE_PATH)/Dependencies/libpng
 DEBUG ?= DEBUG

 LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG)
-LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL
+LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC
 LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS
 LOCAL_STATIC_LIBRARIES := libpng libjpeg
 LOCAL_SHARED_LIBRARIES := SDL
@@ -57,6 +57,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
        $(MTG_PATH)/src/DeckMetaData.cpp \
        $(MTG_PATH)/src/DeckStats.cpp \
        $(MTG_PATH)/src/DuelLayers.cpp \
+        $(MTG_PATH)/src/Effects.cpp \
        $(MTG_PATH)/src/ExtraCost.cpp \
        $(MTG_PATH)/src/GameApp.cpp \
        $(MTG_PATH)/src/GameLauncher.cpp \
@@ -135,9 +136,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
        $(MTG_PATH)/src/WFont.cpp \
        $(MTG_PATH)/src/WGui.cpp \
        $(MTG_PATH)/src/WResourceManager.cpp \
-        $(MTG_PATH)/src/DeckView.cpp \
-        $(MTG_PATH)/src/CarouselDeckView.cpp \
-        $(MTG_PATH)/src/GridDeckView.cpp \
        $(JGE_PATH)/src/SDLmain.cpp \
        $(JGE_PATH)/src/Encoding.cpp \
        $(JGE_PATH)/src/JAnimator.cpp \
--- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
+++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
@@ -80,6 +80,7 @@ public class SDLActivity extends Activity implements OnKeyListener
    public Boolean             mErrorHappened                        = false;
    public final static String RES_FOLDER                            = Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res/";
    public static String       RES_FILENAME                          = "core_0184.zip";
+    public static final String RES_URL                               = "http://wagic.googlecode.com/files/";

    public String              systemFolder                          = Environment.getExternalStorageDirectory().getPath() + "/Wagic/Res/";
    private String             userFolder;
@@ -306,7 +307,7 @@ public class SDLActivity extends Activity implements OnKeyListener

    private void startDownload()
    {
-        String url = getResourceUrl();
+        String url = RES_URL + RES_FILENAME;
        if (!checkStorageState())
        {
            Log.e(TAG, "Error in initializing storage space.");
@@ -436,7 +437,7 @@ public class SDLActivity extends Activity implements OnKeyListener
        mContext = this.getApplicationContext();
        // get the current version of the app to set the core filename
        String versionCodeString = getApplicationCode();
-        RES_FILENAME = getResourceName();
+        RES_FILENAME = "core_" + versionCodeString + ".zip";

        StorageOptions.determineStorageOptions();
        checkStorageLocationPreference();
@@ -524,9 +525,6 @@ public class SDLActivity extends Activity implements OnKeyListener
    }

    // C functions we call
-    public static native String getResourceUrl();
-    public static native String getResourceName();
-
    public static native void nativeInit();

    public static native void nativeQuit();
--- a/projects/mtg/Makefile
+++ b/projects/mtg/Makefile
@@ -6,7 +6,7 @@ OBJS	= objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.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/ExtraCost.o objs/GameApp.o objs/GameLauncher.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\
@@ -27,7 +27,7 @@ OBJS	= objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.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/CarouselDeckView.o objs/GridDeckView.o objs/DeckView.o
+	objs/WFont.o
 DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))

 RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)
@@ -73,7 +73,7 @@ PSP_EBOOT_UNKPNG = pic0.png
 PSP_EBOOT_PIC1 = pic1.png
 INCDIR = ../../JGE/include ../../JGE/src/zipFS ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include ../../Boost
 LIBDIR = ../../JGE/lib/psp
-CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP -DTIXML_USE_STL
+CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP
 else
 OBJS += objs/TestSuiteAI.o
 INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS
@@ -128,7 +128,7 @@ clean:
 endif

 define compile
-$(CXX) -c $(CXXFLAGS) $< -o $@
+$(CXX) -c $(CXXFLAGS) $< -o $@  
 endef

 PrecompiledHeader.h.gch: ../../projects/mtg/include/PrecompiledHeader.h
--- a/projects/mtg/bin/Res/createResourceZip.py
+++ b/projects/mtg/bin/Res/createResourceZip.py
@@ -7,13 +7,10 @@ from optparse import OptionParser
 def createResZipFile(filename): 

        utilities = ZipUtilities()
-        rename = False
        if not os.path.isfile('settings/options.txt'):
            os.rename('settings/options.orig.txt', 'settings/options.txt')
-            remame = True
        if not os.path.isfile('player/options.txt'):
            os.rename('player/options.orig.txt', 'player/options.txt')
-            rename = True

        zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED)
        utilities.addFolderToZip(zip_file, 'themes')
@@ -28,10 +25,6 @@ def createResZipFile(filename):
        utilities.addFolderToZip(zip_file, 'campaigns')
        utilities.addFolderToZip(zip_file, 'ai')
        zip_file.close()
-        
-        if rename:
-            os.rename('settings/options.txt', 'settings/options.orig.txt')
-            os.rename('player/options.txt', 'player/options.orig.txt')

 def getFilename():
    p = Properties();
@@ -44,18 +37,16 @@ def getFilename():



-def createStandardResFile(filename):
-    print('Creating Standard Resource File')
-    if not filename:
-        filename = getFilename() + '.zip'
+def createStandardResFile():
+    print "Creating Standard Resource File"
+    filename = getFilename() + '.zip'
    createResZipFile( filename )
    print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename)

-def createIosResFile(filename):
-    print('Preparing Resource Package for iOS')
+def createIosResFile():
+    print 'Preparing Resource Package for iOS'
    utilities = ZipUtilities()
-    if not filename:
-        filename = getFilename() + '_iOS.zip'
+    filename = getFilename() + '_iOS.zip'
    #createResZipFile( filename )
    zip_file = zipfile.ZipFile(filename, 'a', zipfile.ZIP_STORED)
    zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED)
@@ -80,10 +71,10 @@ class ZipUtilities:
            if file != '.svn':
                full_path = os.path.join(folder, file)
                if os.path.isfile(full_path):
-                        print('File added: ' + str(full_path))
+                        print 'File added: ' + str(full_path)
                        zip_file.write(full_path)
                elif os.path.isdir(full_path):
-                        print('Entering folder: ' + str(full_path))
+                        print 'Entering folder: ' + str(full_path)
                        self.addFolderToZip(zip_file, full_path)


@@ -92,17 +83,16 @@ def main():

    parser = OptionParser()
    parser.add_option("-p", "--platform", help="PLATFORM: specify custom build. (eg ios, android, etc)", metavar="PLATFORM", dest="platform")
-    parser.add_option("-n", "--name", help="NAME: specify resource file name", metavar="NAME", dest="name")

    (options, args) = parser.parse_args()
 	
    if (options.platform):
-        if (options.platform == "ios"):
-            createIosResFile(options.name)
-        else:
-            createStandardResFile(options.name)
+		if (options.platform == "ios"): 
+				createIosResFile()
+		else:
+				createStandardResFile()
    else:
-        createStandardResFile(options.name)
+		createStandardResFile()

 if __name__ == "__main__":
 	main()
--- a/projects/mtg/bin/Res/rules/mtg.txt
+++ b/projects/mtg/bin/Res/rules/mtg.txt
@@ -16,7 +16,6 @@ auto=flashbackrule
 auto=retracerule
 auto=suspendrule
 auto=morphrule
-auto=playfromgraveyardrule
 auto=attackrule
 auto=blockrule
 auto=combattriggerrule
--- a/projects/mtg/bin/Res/sets/BNG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/BNG/_cards.dat
@@ -1,846 +0,0 @@
-[meta]
-author=Wagic Team
-name=Born of the Gods
-year=2014
-block=Theros
-[/meta]
-[card]
-primitive=Acolyte's Reward
-id=378373
-rarity=U
-[/card]
-[card]
-primitive=Aerie Worshippers
-id=378402
-rarity=U
-[/card]
-[card]
-primitive=Akroan Conscriptor
-id=378459
-rarity=U
-[/card]
-[card]
-primitive=Akroan Phalanx
-id=378374
-rarity=U
-[/card]
-[card]
-primitive=Akroan Skyguard
-id=378375
-rarity=C
-[/card]
-[card]
-primitive=Arbiter of the Ideal
-id=378403
-rarity=R
-[/card]
-[card]
-primitive=Archetype of Aggression
-id=378460
-rarity=U
-[/card]
-[card]
-primitive=Archetype of Courage
-id=378376
-rarity=U
-[/card]
-[card]
-primitive=Archetype of Endurance
-id=378488
-rarity=U
-[/card]
-[card]
-primitive=Archetype of Finality
-id=378430
-rarity=U
-[/card]
-[card]
-primitive=Archetype of Imagination
-id=378404
-rarity=U
-[/card]
-[card]
-primitive=Ashiok's Adept
-id=378431
-rarity=U
-[/card]
-[card]
-primitive=Aspect of Hydra
-id=378489
-rarity=C
-[/card]
-[card]
-primitive=Asphyxiate
-id=378432
-rarity=C
-[/card]
-[card]
-primitive=Astral Cornucopia
-id=378529
-rarity=R
-[/card]
-[card]
-primitive=Bile Blight
-id=378433
-rarity=U
-[/card]
-[card]
-primitive=Black Oak of Odunos
-id=378434
-rarity=U
-[/card]
-[card]
-primitive=Bolt of Keranos
-id=378461
-rarity=C
-[/card]
-[card]
-primitive=Brimaz, King of Oreskos
-id=378377
-rarity=M
-[/card]
-[card]
-primitive=Champion of Stray Souls
-id=378435
-rarity=M
-[/card]
-[card]
-primitive=Charging Badger
-id=378490
-rarity=C
-[/card]
-[card]
-primitive=Chorus of the Tides
-id=378405
-rarity=C
-[/card]
-[card]
-primitive=Chromanticore
-id=378516
-rarity=M
-[/card]
-[card]
-primitive=Claim of Erebos
-id=378436
-rarity=C
-[/card]
-[card]
-primitive=Courser of Kruphix
-id=378491
-rarity=R
-[/card]
-[card]
-primitive=Crypsis
-id=378406
-rarity=C
-[/card]
-[card]
-primitive=Culling Mark
-id=378492
-rarity=C
-[/card]
-[card]
-primitive=Cyclops of One-Eyed Pass
-id=378462
-rarity=C
-[/card]
-[card]
-primitive=Dawn to Dusk
-id=378378
-rarity=U
-[/card]
-[card]
-primitive=Deepwater Hypnotist
-id=378407
-rarity=C
-[/card]
-[card]
-primitive=Divination
-id=378408
-rarity=C
-[/card]
-[card]
-primitive=Drown in Sorrow
-id=378437
-rarity=U
-[/card]
-[card]
-primitive=Eater of Hope
-id=378438
-rarity=R
-[/card]
-[card]
-primitive=Eidolon of Countless Battles
-id=378379
-rarity=R
-[/card]
-[card]
-primitive=Elite Skirmisher
-id=378380
-rarity=C
-[/card]
-[card]
-primitive=Ephara, God of the Polis
-id=378517
-rarity=M
-[/card]
-[card]
-primitive=Ephara's Enlightenment
-id=378518
-rarity=U
-[/card]
-[card]
-primitive=Ephara's Radiance
-id=378381
-rarity=C
-[/card]
-[card]
-primitive=Epiphany Storm
-id=378463
-rarity=C
-[/card]
-[card]
-primitive=Eternity Snare
-id=378409
-rarity=U
-[/card]
-[card]
-primitive=Evanescent Intellect
-id=378410
-rarity=C
-[/card]
-[card]
-primitive=Everflame Eidolon
-id=378464
-rarity=U
-[/card]
-[card]
-primitive=Excoriate
-id=378382
-rarity=C
-[/card]
-[card]
-primitive=Eye Gouge
-id=378439
-rarity=C
-[/card]
-[card]
-primitive=Fall of the Hammer
-id=378465
-rarity=C
-[/card]
-[card]
-primitive=Fanatic of Xenagos
-id=378519
-rarity=U
-[/card]
-[card]
-primitive=Fate Unraveler
-id=378440
-rarity=R
-[/card]
-[card]
-primitive=Fated Conflagration
-id=378466
-rarity=R
-[/card]
-[card]
-primitive=Fated Infatuation
-id=378411
-rarity=R
-[/card]
-[card]
-primitive=Fated Intervention
-id=378493
-rarity=R
-[/card]
-[card]
-primitive=Fated Retribution
-id=378383
-rarity=R
-[/card]
-[card]
-primitive=Fated Return
-id=378441
-rarity=R
-[/card]
-[card]
-primitive=Fearsome Temper
-id=378467
-rarity=C
-[/card]
-[card]
-primitive=Felhide Brawler
-id=378442
-rarity=C
-[/card]
-[card]
-primitive=Felhide Spiritbinder
-id=378468
-rarity=R
-[/card]
-[card]
-primitive=Flame-Wreathed Phoenix
-id=378469
-rarity=M
-[/card]
-[card]
-primitive=Flitterstep Eidolon
-id=378412
-rarity=U
-[/card]
-[card]
-primitive=Floodtide Serpent
-id=378413
-rarity=C
-[/card]
-[card]
-primitive=Forgestoker Dragon
-id=378470
-rarity=R
-[/card]
-[card]
-primitive=Forlorn Pseudamma
-id=378443
-rarity=U
-[/card]
-[card]
-primitive=Forsaken Drifters
-id=378444
-rarity=U
-[/card]
-[card]
-primitive=Ghostblade Eidolon
-id=378384
-rarity=U
-[/card]
-[card]
-primitive=Gild
-id=378445
-rarity=R
-[/card]
-[card]
-primitive=Gold
-id=-378445
-rarity=T
-[/card]
-[card]
-primitive=Glimpse the Sun God
-id=378385
-rarity=U
-[/card]
-[card]
-primitive=God-Favored General
-id=378386
-rarity=U
-[/card]
-[card]
-primitive=Gorgon's Head
-id=378530
-rarity=U
-[/card]
-[card]
-primitive=Graverobber Spider
-id=378494
-rarity=U
-[/card]
-[card]
-primitive=Great Hart
-id=378387
-rarity=C
-[/card]
-[card]
-primitive=Griffin Dreamfinder
-id=378388
-rarity=C
-[/card]
-[card]
-primitive=Grisly Transformation
-id=378446
-rarity=C
-[/card]
-[card]
-primitive=Herald of Torment
-id=378447
-rarity=R
-[/card]
-[card]
-primitive=Hero of Iroas
-id=378389
-rarity=R
-[/card]
-[card]
-primitive=Hero of Leina Tower
-id=378495
-rarity=R
-[/card]
-[card]
-primitive=Heroes' Podium
-id=378531
-rarity=R
-[/card]
-[card]
-primitive=Hold at Bay
-id=378390
-rarity=C
-[/card]
-[card]
-primitive=Hunter's Prowess
-id=378496
-rarity=R
-[/card]
-[card]
-primitive=Impetuous Sunchaser
-id=378471
-rarity=C
-[/card]
-[card]
-primitive=Karametra, God of Harvests
-id=378520
-rarity=M
-[/card]
-[card]
-primitive=Karametra's Favor
-id=378497
-rarity=C
-[/card]
-[card]
-primitive=Kiora, the Crashing Wave
-id=378521
-rarity=M
-[/card]
-[card]
-primitive=Kiora's Prevention
-id=37852101
-rarity=T
-[/card]
-[card]
-primitive=Kiora's Kraken
-id=-378521
-rarity=T
-[/card]
-[card]
-primitive=Kiora's Follower
-id=378522
-rarity=U
-[/card]
-[card]
-primitive=Kragma Butcher
-id=378472
-rarity=C
-[/card]
-[card]
-primitive=Kraken of the Straits
-id=378414
-rarity=U
-[/card]
-[card]
-primitive=Lightning Volley
-id=378473
-rarity=U
-[/card]
-[card]
-primitive=Loyal Pegasus
-id=378391
-rarity=C
-[/card]
-[card]
-primitive=Marshmist Titan
-id=378448
-rarity=C
-[/card]
-[card]
-primitive=Meletis Astronomer
-id=378415
-rarity=U
-[/card]
-[card]
-primitive=Mindreaver
-id=378416
-rarity=R
-[/card]
-[card]
-primitive=Mischief and Mayhem
-id=378498
-rarity=U
-[/card]
-[card]
-primitive=Mogis, God of Slaughter
-id=378523
-rarity=M
-[/card]
-[card]
-primitive=Mortal's Ardor
-id=378392
-rarity=C
-[/card]
-[card]
-primitive=Mortal's Resolve
-id=378499
-rarity=C
-[/card]
-[card]
-primitive=Necrobite
-id=378449
-rarity=C
-[/card]
-[card]
-primitive=Nessian Demolok
-id=378500
-rarity=U
-[/card]
-[card]
-primitive=Nessian Wilds Ravager
-id=378501
-rarity=R
-[/card]
-[card]
-primitive=Noble Quarry
-id=378502
-rarity=U
-[/card]
-[card]
-primitive=Nullify
-id=378417
-rarity=C
-[/card]
-[card]
-primitive=Nyxborn Eidolon
-id=378450
-rarity=C
-[/card]
-[card]
-primitive=Nyxborn Rollicker
-id=378474
-rarity=C
-[/card]
-[card]
-primitive=Nyxborn Shieldmate
-id=378393
-rarity=C
-[/card]
-[card]
-primitive=Nyxborn Triton
-id=378418
-rarity=C
-[/card]
-[card]
-primitive=Nyxborn Wolf
-id=378503
-rarity=C
-[/card]
-[card]
-primitive=Odunos River Trawler
-id=378451
-rarity=U
-[/card]
-[card]
-primitive=Oracle of Bones
-id=378475
-rarity=R
-[/card]
-[card]
-primitive=Oracle's Insight
-id=378419
-rarity=U
-[/card]
-[card]
-primitive=Oreskos Sun Guide
-id=378394
-rarity=C
-[/card]
-[card]
-primitive=Ornitharch
-id=378395
-rarity=U
-[/card]
-[card]
-primitive=Pain Seer
-id=378452
-rarity=R
-[/card]
-[card]
-primitive=Peregrination
-id=378504
-rarity=U
-[/card]
-[card]
-primitive=Perplexing Chimera
-id=378420
-rarity=R
-[/card]
-[card]
-primitive=Pharagax Giant
-id=378476
-rarity=C
-[/card]
-[card]
-primitive=Phenax, God of Deception
-id=378524
-rarity=M
-[/card]
-[card]
-primitive=Pheres-Band Raiders
-id=378505
-rarity=U
-[/card]
-[card]
-primitive=Pheres-Band Tromper
-id=378506
-rarity=C
-[/card]
-[card]
-primitive=Pillar of War
-id=378532
-rarity=U
-[/card]
-[card]
-primitive=Pinnacle of Rage
-id=378477
-rarity=U
-[/card]
-[card]
-primitive=Plea for Guidance
-id=378396
-rarity=R
-[/card]
-[card]
-primitive=Ragemonger
-id=378525
-rarity=U
-[/card]
-[card]
-primitive=Raised by Wolves
-id=378507
-rarity=U
-[/card]
-[card]
-primitive=Reap what is Sown
-id=378526
-rarity=U
-[/card]
-[card]
-primitive=Reckless Reveler
-id=378478
-rarity=C
-[/card]
-[card]
-primitive=Retraction Helix
-id=378421
-rarity=C
-[/card]
-[card]
-primitive=Revoke Existence
-id=378397
-rarity=C
-[/card]
-[card]
-primitive=Rise to the Challenge
-id=378479
-rarity=C
-[/card]
-[card]
-primitive=Sanguimancy
-id=378453
-rarity=U
-[/card]
-[card]
-primitive=Satyr Firedancer
-id=378480
-rarity=R
-[/card]
-[card]
-primitive=Satyr Nyx-Smith
-id=378481
-rarity=U
-[/card]
-[card]
-primitive=Satyr Wayfinder
-id=378508
-rarity=C
-[/card]
-[card]
-primitive=Scourge of Skola Vale
-id=378509
-rarity=R
-[/card]
-[card]
-primitive=Scouring Sands
-id=378482
-rarity=C
-[/card]
-[card]
-primitive=Searing Blood
-id=378483
-rarity=U
-[/card]
-[card]
-primitive=Servant of Tymaret
-id=378454
-rarity=C
-[/card]
-[card]
-primitive=Setessan Oathsworn
-id=378510
-rarity=C
-[/card]
-[card]
-primitive=Setessan Starbreaker
-id=378511
-rarity=C
-[/card]
-[card]
-primitive=Shrike Harpy
-id=378455
-rarity=U
-[/card]
-[card]
-primitive=Silent Sentinel
-id=378398
-rarity=R
-[/card]
-[card]
-primitive=Siren of the Fanged Coast
-id=378422
-rarity=U
-[/card]
-[card]
-primitive=Siren of the Silent Song
-id=378527
-rarity=U
-[/card]
-[card]
-primitive=Siren Song Lyre
-id=378533
-rarity=U
-[/card]
-[card]
-primitive=Skyreaping
-id=378512
-rarity=U
-[/card]
-[card]
-primitive=Snake of the Golden Grove
-id=378513
-rarity=C
-[/card]
-[card]
-primitive=Sphinx's Disciple
-id=378423
-rarity=C
-[/card]
-[card]
-primitive=Spirit of the Labyrinth
-id=378399
-rarity=R
-[/card]
-[card]
-primitive=Spiteful Returned
-id=378456
-rarity=U
-[/card]
-[card]
-primitive=Springleaf Drum
-id=378534
-rarity=U
-[/card]
-[card]
-primitive=Stormcaller of Keranos
-id=378484
-rarity=U
-[/card]
-[card]
-primitive=Stratus Walk
-id=378424
-rarity=C
-[/card]
-[card]
-primitive=Sudden Storm
-id=378425
-rarity=C
-[/card]
-[card]
-primitive=Sunbond
-id=378400
-rarity=U
-[/card]
-[card]
-primitive=Swordwise Centaur
-id=378514
-rarity=C
-[/card]
-[card]
-primitive=Temple of Enlightenment
-id=378535
-rarity=R
-[/card]
-[card]
-primitive=Temple of Malice
-id=378536
-rarity=R
-[/card]
-[card]
-primitive=Temple of Plenty
-id=378537
-rarity=R
-[/card]
-[card]
-primitive=Thassa's Rebuff
-id=378426
-rarity=U
-[/card]
-[card]
-primitive=Thunder Brute
-id=378485
-rarity=U
-[/card]
-[card]
-primitive=Thunderous Might
-id=378486
-rarity=U
-[/card]
-[card]
-primitive=Tromokratis
-id=378427
-rarity=R
-[/card]
-[card]
-primitive=Unravel the AEther
-id=378515
-rarity=U
-[/card]
-[card]
-primitive=Vanguard of Brimaz
-id=378401
-rarity=U
-[/card]
-[card]
-primitive=Vortex Elemental
-id=378428
-rarity=U
-[/card]
-[card]
-primitive=Warchanter of Mogis
-id=378457
-rarity=C
-[/card]
-[card]
-primitive=Weight of the Underworld
-id=378458
-rarity=C
-[/card]
-[card]
-primitive=Whelming Wave
-id=378429
-rarity=R
-[/card]
-[card]
-primitive=Whims of the Fates
-id=378487
-rarity=R
-[/card]
-[card]
-primitive=Xenagos, God of Revels
-id=378528
-rarity=M
-[/card]
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -1513,8 +1513,3 @@ primitive=Zephyr Net
 id=142357
 rarity=C
 [/card]
-[card]
-primitive=Avatar Token
-id=-140233
-rarity=T
-[/card]
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -1248,8 +1248,3 @@ primitive=Zombie Goliath
 id=190545
 rarity=C
 [/card]
-[card]
-primitive=Avatar Token
-id=-191239
-rarity=T
-[/card]
--- a/projects/mtg/bin/Res/sets/M11/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M11/_cards.dat
@@ -1257,9 +1257,4 @@ rarity=U
 primitive=Yavimaya Wurm
 id=205221
 rarity=C
-[/card]
-[card]
-primitive=Avatar Token
-id=-205957
-rarity=T
-[/card]
+[/card]
--- a/projects/mtg/bin/Res/sets/M14/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M14/_cards.dat
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -3187,6 +3187,19 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+name=Crucible of Worlds
+auto={0}:may moveTo(myBattlefield) target(land|mygraveyard) limit:1 myTurnOnly
+# Above line does not work: "May moveto" from graveyards does
+# not work due to interface issues. The "limit:1" doesn't work
+# here either. Even if both worked, then the card would allow
+# you to play lands *in addition* to the 1 land you can play per
+# turn. Instead it should just give you the option to play this
+# 1 land from your hand or your graveyard.
+text=You may play land cards from your graveyard.
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Cruel Deceiver
 text={1}: Look at the top card of your library. -- {2}: Reveal the top card of your library. If it's a land card, Cruel Deceiver gains "Whenever Cruel Deceiver deals damage to a creature, destroy that creature" until end of turn. Activate this ability only once each turn.
 mana={1}{B}
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -204,7 +204,6 @@ brass_man.txt
 brass_man_i161.txt
 briarhorn.txt
 bringer_of_the_red_dawn.txt
-buyback.txt
 cage_of_hands.txt
 Call_to_Heel_1.txt
 Call_to_Heel_2.txt
@@ -250,7 +249,6 @@ curiosity2_i217.txt
 crimson_kobolds.txt
 crosis_s_catacombs_1.txt
 crosis_s_catacombs_2.txt
-crucible_of_worlds.txt
 crumble.txt
 crystal_rod_i172.txt
 cursed_land1_i188.txt
@@ -309,9 +307,6 @@ evil_presence3.txt
 evil_presence_i647.txt
 evil_presence_i647_2.txt
 exaltedsourcekilled.txt
-executioners_swing.txt
-executioners_swing2.txt
-executioners_swing3.txt
 explore.txt
 Faceless_Butcher.txt
 fading.txt
--- a/projects/mtg/bin/Res/test/buyback.txt
+++ b/projects/mtg/bin/Res/test/buyback.txt
@@ -1,30 +0,0 @@
-# Cast card once with buyback and second time without.
-# The card must be in the graveyard, not in the hand
-[INIT]
-FIRSTMAIN
-
-[PLAYER1]
-hand:Capsize
-manapool:{5}{U}{U}{U}{U}
-
-[PLAYER2]
-inplay:Swamp,Island
-
-[DO]
-Capsize
-# pay buyback
-choice 1
-Swamp
-Capsize
-Island
-
-[ASSERT]
-FIRSTMAIN
-
-[PLAYER1]
-graveyard:Capsize
-
-[PLAYER2]
-hand:Swamp,Island
-
-[END]
--- a/projects/mtg/bin/Res/test/crucible_of_worlds.txt
+++ b/projects/mtg/bin/Res/test/crucible_of_worlds.txt
@@ -1,26 +0,0 @@
-# Testing crucible of worlds (keyword: CANPLAYFROMGRAVEYARD)
-
-# name=Crucible of Worlds
-# text=You may play land cards from your graveyard.
-
-[INIT]
-FIRSTMAIN
-[PLAYER1]
-hand:island,plains
-inplay:crucible of worlds
-graveyard:forest,mountain
-[PLAYER2]
-[DO]
-forest
-# all next lands shouldn't be played
-island
-mountain
-plains
-[ASSERT]
-FIRSTMAIN
-[PLAYER1]
-inplay:crucible of worlds,forest
-hand:island,plains
-graveyard:mountain
-[PLAYER2]
-[END]
--- a/projects/mtg/bin/Res/test/executioners_swing.txt
+++ b/projects/mtg/bin/Res/test/executioners_swing.txt
@@ -1,42 +0,0 @@
-#NAME: Executioner's Swing
-#DESC: Checks targetability
-#DESC: Test that can target creature that damaged creature this turn
-
-[INIT]
-combatattackers
-
-[PLAYER1]
-inplay:Grizzly Bears
-
-[PLAYER2]
-inplay:Flying Men,Swamp,Plains
-hand:Executioner's Swing
-
-[DO]
-Grizzly Bears
-next
-Flying Men
-next
-next
-next
-
-# second main
-# kill bear
-yes
-Swamp
-Plains
-Executioner's Swing
-Grizzly Bears
-endinterruption
-
-[ASSERT]
-secondmain
-
-[PLAYER1]
-graveyard:Grizzly Bears
-
-[PLAYER2]
-graveyard:Executioner's Swing,Flying Men
-inplay:Plains,Swamp
-
-[END]
--- a/projects/mtg/bin/Res/test/executioners_swing2.txt
+++ b/projects/mtg/bin/Res/test/executioners_swing2.txt
@@ -1,42 +0,0 @@
-#NAME: Executioner's Swing
-#DESC: Checks targetability
-#DESC: Test that can target creature that damaged player
-
-[INIT]
-combatattackers
-
-[PLAYER1]
-inplay:Grizzly Bears
-
-[PLAYER2]
-inplay:Swamp,Plains
-hand:Executioner's Swing
-
-[DO]
-Grizzly Bears
-next
-next
-next
-next
-
-# second main
-# kill bear
-yes
-Swamp
-Plains
-Executioner's Swing
-Grizzly Bears
-endinterruption
-
-[ASSERT]
-secondmain
-
-[PLAYER1]
-graveyard:Grizzly Bears
-
-[PLAYER2]
-graveyard:Executioner's Swing
-inplay:Plains,Swamp
-life:18
-
-[END]
--- a/projects/mtg/bin/Res/test/executioners_swing3.txt
+++ b/projects/mtg/bin/Res/test/executioners_swing3.txt
@@ -1,34 +0,0 @@
-#NAME: Executioner's Swing
-#DESC: Checks targetability
-#DESC: Prove that can't target passive creature
-
-[INIT]
-secondmain
-
-[PLAYER1]
-inplay:Grizzly Bears
-
-[PLAYER2]
-manapool:{B}{W}
-hand:Executioner's Swing
-
-[DO]
-# attempt to kill bear
-yes
-Swamp
-Plains
-Executioner's Swing
-Grizzly Bears
-endinterruption
-
-[ASSERT]
-secondmain
-
-[PLAYER1]
-inplay:Grizzly Bears
-
-[PLAYER2]
-hand:Executioner's Swing
-manapool:{W}{B}
-
-[END]
--- a/projects/mtg/bin/Res/test/griselbrand.txt
+++ b/projects/mtg/bin/Res/test/griselbrand.txt
@@ -1,24 +0,0 @@
-#Testing Griselbrand with the new specific life cost {L:7}
-#Player has 8 life and you cannot use the ability the second time if you cannot pay life.
-#Must change griselbrand code to {L:7}:draw:7 instead of {L}{L}{L}{L}{L}{L}{L}:draw:7
-[INIT]
-FIRSTMAIN
-[PLAYER1]
-inplay:Griselbrand
-life:8
-library:forest,forest,forest,forest,forest,forest,forest,plains,mountain,mountain,mountain,mountain,mountain,mountain,island
-[PLAYER2]
-life:20
-[DO]
-Griselbrand
-Griselbrand
-[ASSERT]
-FIRSTMAIN
-[PLAYER1]
-inplay:Griselbrand
-life:1
-hand:mountain,mountain,mountain,mountain,mountain,mountain,island
-library:forest,forest,forest,forest,forest,forest,forest,plains
-[PLAYER2]
-life:20
-[END]
--- a/projects/mtg/bin/Res/test/guild_keyword.txt
+++ b/projects/mtg/bin/Res/test/guild_keyword.txt
@@ -1,38 +0,0 @@
-#Testing guild keyword gruul for Xenagos, God of Revels. You must have Born of the gods set (BNG)
-#[card]
-#name=Xenagos, God of Revels
-#abilities=indestructible
-#auto=@each my combatbegins:name(haste and +x/+x) target(other creature|mybattlefield) transforms((,newability[haste],newability[power/power])) ueot
-#auto=this(variable{gruul}>6) transforms((Creature))
-#text=Indestructible -- As long as your devotion to red and green is less than seven, Xenagos isn't a creature. -- At the beginning of combat on your turn, another target creature you control gains haste and gets +X/+X until end of turn, where X is that creature's power.
-#mana={3}{R}{G}
-#type=Legendary Enchantment
-#subtype=God
-#power=6
-#toughness=5
-#[/card]
-[INIT]
-FIRSTMAIN
-[PLAYER1]
-inplay:378528
-hand:19869
-life:20
-manapool:{G}{G}{G}{G}{G}
-[PLAYER2]
-life:20
-[DO]
-19869
-next
-choice 0
-19869
-next
-19869
-eot
-[ASSERT]
-UNTAP
-[PLAYER1]
-inplay:378528,19869
-life:20
-[PLAYER2]
-life:12
-[END]
--- a/projects/mtg/bin/createWindowsZip.py
+++ b/projects/mtg/bin/createWindowsZip.py
@@ -1,73 +0,0 @@
-import sys
-import os
-import zipfile
-from pyjavaproperties import Properties
-from optparse import OptionParser
-
-def createWindowsZipFile(filename):
-    utilities = ZipUtilities()
-    zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED)
-    zip_file.write('../../../LICENSE')
-    zip_file.write('libpng13.dll')
-    zip_file.write('SDL.dll')
-    zip_file.write('fmod.dll')
-    zip_file.write('zlib1.dll')
-    zip_file.write('Wagic.exe')
-    zip_file.write('Res/' + getFilename('core') + '.zip')
-    zip_file.close()
-
-def getFilename(filename):
-    p = Properties();
-    p.load(open('../build.number.properties'));
-    minor = p['build.minor'];
-    major = p['build.major'];
-    point = p['build.point'];
-    filename = filename + '-' + major + minor + point
-    return filename
-
-def createStandardResFile():
-    print "Creating Resource File"
-    cmd = 'python createResourceZip.py -n ' + getFilename('core') + '.zip'
-    os.chdir("Res")
-    os.system(cmd)
-    os.chdir("..")
-    print "Creating Windows Package File"
-    filename = 'Wagic-windows.zip'
-    createWindowsZipFile( filename )
-    print >> sys.stderr, 'Created Windows Package: {0}'.format( filename)
-
-class ZipUtilities:
-
-    def toZip(self, file, filename):
-        zip_file = zipfile.ZipFile(filename, 'w')
-        if os.path.isfile(file):
-                        zip_file.write(file)
-        else:
-                        self.addFolderToZip(zip_file, file)
-        zip_file.close()
-
-    def addFolderToZip(self, zip_file, folder): 
-        zip_file.writestr(folder + '/', '')
-        for file in os.listdir(folder):
-            if file != '.svn':
-                full_path = os.path.join(folder, file)
-                if os.path.isfile(full_path):
-                        print 'File added: ' + str(full_path)
-                        zip_file.write(full_path)
-                elif os.path.isdir(full_path):
-                        print 'Entering folder: ' + str(full_path)
-                        self.addFolderToZip(zip_file, full_path)
-
-
-def main():
-## using optparse instead of argParse for now since python 2.7 may not be installed.
-
-    parser = OptionParser()
-    parser.add_option("-p", "--platform", help="PLATFORM: specify custom build. (eg ios, android, etc)", metavar="PLATFORM", dest="platform")
-
-    (options, args) = parser.parse_args()
-	
-    createStandardResFile()
-
-if __name__ == "__main__":
-	main()
--- a/projects/mtg/build.xml
+++ b/projects/mtg/build.xml
@@ -2,8 +2,7 @@
 	<!-- build.properties should contain the values for major, minor and point -->
 	<property file="build.properties" />
 	<property file="build.number.properties" />
-	<property environment="env"/>
-    
+
 	<path id="groovy.class.path" >
 		<fileset dir="${groovy.dir}" />
 	</path>
@@ -77,22 +76,19 @@ Author: Michael Nguyen
 #define WAGIC_VERSION_MAJOR     ${build.major}
 #define WAGIC_VERSION_MEDIUM    ${build.minor}
 #define WAGIC_VERSION_MINOR     ${build.point}
-#define WAGIC_VERSION_REVISION  ${env.TRAVIS_BUILD_NUMBER}

-#define VERSION_DOT(a, b, c, d) a ##.## b ##.## c ##.## d
+#define VERSION_DOT(a, b, c) a ##.## b ##.## c
 #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c
-#define VERSION_GAME(a, b, c, d) VERSION_DOT(a, b, c, d)
+#define VERSION_GAME(a, b, c) VERSION_DOT(a, b, c)
 #define VERSION_FILE(a, b, c) VERSION_WITHOUT_DOT(a, b, c)
 #define VERSION_TOSTRING(a) #a
 #define VERSION_STRINGIFY(a) VERSION_TOSTRING(a)

-#define WAGIC_VERSION           VERSION_GAME(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM, WAGIC_VERSION_MINOR, WAGIC_VERSION_REVISION)
+#define WAGIC_VERSION           VERSION_GAME(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM, WAGIC_VERSION_MINOR)
 #define WAGIC_RESOURCE_VERSION  VERSION_FILE(WAGIC_VERSION_MAJOR, WAGIC_VERSION_MEDIUM, WAGIC_VERSION_MINOR)
 #define WAGIC_VERSION_STRING    VERSION_STRINGIFY(WAGIC_VERSION)
 #define WAGIC_CORE_VERSION_STRING "core_" VERSION_STRINGIFY(WAGIC_RESOURCE_VERSION)
-#define WAGIC_RESOURCE_NAME     "Wagic-core.zip"
-#define WAGIC_RELEASE_NAME      "${env.RELEASE_NAME}"
-#define WAGIC_RESOURCE_URL      "https://github.com/WagicProject/wagic/releases/download/" WAGIC_RELEASE_NAME "/" WAGIC_RESOURCE_NAME
+#define WAGIC_RESOURCE_NAME     WAGIC_CORE_VERSION_STRING ".zip"

 #endif

--- a/projects/mtg/iOS/UI/UIScreen+Util.h
+++ b/projects/mtg/iOS/UI/UIScreen+Util.h
@@ -0,0 +1,14 @@
+//
+//  UIScreen+Util.h
+//  wagic
+//
+//  Created by Michael Nguyen on 11/27/13.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIScreen (Util)
+
+(BOOL)isRetinaDisplay;
+@end
--- a/projects/mtg/iOS/UI/UIScreen+Util.m
+++ b/projects/mtg/iOS/UI/UIScreen+Util.m
@@ -0,0 +1,23 @@
+//
+//  UIScreen+Util.m
+//  wagic
+//
+//  Created by Michael Nguyen on 11/27/13.
+//
+//
+#include "UIScreen+Util.h"
+
+static BOOL isRetinaScreen = NO;
+static BOOL didRetinaCheck = NO;
+
+@implementation UIScreen (Util)
+ (BOOL)isRetinaDisplay
+{
+    if (!didRetinaCheck) {
+        isRetinaScreen = ([[self mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)] &&
+                          ([self mainScreen].scale == 2.0));
+        didRetinaCheck = YES;
+    }
+    return isRetinaScreen;
+}
+@end
--- a/projects/mtg/include/ActionElement.h
+++ b/projects/mtg/include/ActionElement.h
@@ -72,7 +72,7 @@ public:
    {
        return 0;
    }
-    virtual const string getMenuText()
+    virtual const char * getMenuText()
    {
        return "Ability";
    }
--- a/projects/mtg/include/ActionStack.h
+++ b/projects/mtg/include/ActionStack.h
@@ -72,7 +72,7 @@ public:
    }
    
    Interruptible(GameObserver* observer, int inID = 0, bool hasFocus = false)
-        : PlayGuiObject(40, 0.0f, 0.0f, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL)
+        : PlayGuiObject(40, x, y, inID, hasFocus), Targetable(observer), state(NOT_RESOLVED), display(0), source(NULL)
    {
    }
    
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -172,206 +172,6 @@ private:
        {
            intValue = target->getManaCost()->getConvertedCost();
        }
-        else if (s == "azorius")//devotion blue white
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 2);
-                        intValue += zone->countTotalManaSymbols(dtc, 5);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "boros")//devotion red white
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 3);
-                        intValue += zone->countTotalManaSymbols(dtc, 5);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "dimir")//devotion blue black
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 2);
-                        intValue += zone->countTotalManaSymbols(dtc, 4);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "golgari")//devotion to green black
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 1);
-                        intValue += zone->countTotalManaSymbols(dtc, 4);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "gruul")//devotion to green red
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 1);
-                        intValue += zone->countTotalManaSymbols(dtc, 3);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "izzet")//devotion to red blue
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 2);
-                        intValue += zone->countTotalManaSymbols(dtc, 3);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "orzhov")//devotion to white black
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 4);
-                        intValue += zone->countTotalManaSymbols(dtc, 5);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "rakdos")//devotion to red black
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 3);
-                        intValue += zone->countTotalManaSymbols(dtc, 4);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "selesnya")//devotion to green white
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 1);
-                        intValue += zone->countTotalManaSymbols(dtc, 5);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
-        else if (s == "simic")//devotion to green blue
-        {
-            TargetChooserFactory dtf(card->getObserver());
-            TargetChooser * dtc = dtf.createTargetChooser("*",NULL);
-            for (int i = 0; i < 2; i++)
-            {
-                Player * dp = card->getObserver()->players[i];
-                MTGGameZone * dzones[] = { dp->game->inPlay, dp->game->graveyard, dp->game->hand, dp->game->library };
-                for (int k = 0; k < 4; k++)
-                {
-                    MTGGameZone * zone = dzones[k];
-                    if (dtc->targetsZone(zone, card))
-                    {
-                        intValue += zone->countTotalManaSymbols(dtc, 1);
-                        intValue += zone->countTotalManaSymbols(dtc, 2);
-                    }
-                }
-            }
-            SAFE_DELETE(dtc);
-        }
        else if (s.find("type:") != string::npos)
        {
            size_t begins = s.find("type:");
@@ -1281,7 +1081,7 @@ public:
            ManaCost * cost = NULL);

    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AACounter * clone() const;
 };

@@ -1300,7 +1100,7 @@ public:
            bool all,ManaCost * cost = NULL);

    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AARemoveAllCounter * clone() const;
 };

@@ -1310,7 +1110,7 @@ class AAResetDamage: public ActivatedAbility
 public:
    AAResetDamage(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AAResetDamage * clone() const;
 };

@@ -1320,7 +1120,7 @@ public:
    string named;
    AAFakeAbility(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target,string _newName, ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AAFakeAbility * clone() const;
 };

@@ -1331,7 +1131,7 @@ public:

    AAFizzler(GameObserver* observer, int _id, MTGCardInstance * card, Spell * _target, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAFizzler* clone() const;
 };

@@ -1360,7 +1160,7 @@ public:
    string Cond;
    IfThenAbility(GameObserver* observer, int _id,MTGAbility * delayedAbility = NULL,MTGAbility * delayedElseAbility = NULL, MTGCardInstance * _source=NULL, Targetable * target = NULL, int type = 1,string Cond = "");
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    IfThenAbility * clone() const;
    ~IfThenAbility();
 };
@@ -1379,7 +1179,7 @@ public:

    void Update(float dt);

-    const string getMenuText();
+    const char * getMenuText();
    int testDestroy();

    int isReactingToTargetClick(Targetable * card);
@@ -1409,7 +1209,7 @@ public:
    bool CheckUserInput(JButton key);
    void Update(float dt);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    int testDestroy();
    int isReactingToTargetClick(Targetable * card);
    int reactToTargetClick(Targetable * object);
@@ -1425,7 +1225,7 @@ class AAProliferate: public ActivatedAbility
 public:
    AAProliferate(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AAProliferate * clone() const;
    ~AAProliferate();
 };
@@ -1443,7 +1243,7 @@ public:
    int resolve();
    int addToGame();
    int destroy();
-    const string getMenuText();
+    const char * getMenuText();
    MultiAbility * clone() const;
    ~MultiAbility();
 };
@@ -1458,9 +1258,8 @@ public:

    GenericActivatedAbility(GameObserver* observer, string newName,string castRestriction,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "",
            int restrictions = 0, MTGGameZone * dest = NULL);
-    GenericActivatedAbility(const GenericActivatedAbility& other);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
    void Update(float dt);
    int testDestroy();
@@ -1475,7 +1274,7 @@ class AALibraryBottom: public ActivatedAbility
 public:
    AALibraryBottom(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AALibraryBottom * clone() const;
 };

@@ -1485,7 +1284,7 @@ class AACopier: public ActivatedAbility
 public:
    AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AACopier * clone() const;
 };
 //imprint
@@ -1494,7 +1293,7 @@ class AAPhaseOut: public ActivatedAbility
 public:
    AAPhaseOut(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAPhaseOut * clone() const;
 };
 //cloning...this makes a token thats a copy of the target.
@@ -1511,7 +1310,7 @@ public:
    AACloner(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL, int who = 0,
            string abilitiesStringList = "",string typeslist = "");
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    virtual ostream& toString(ostream& out) const;
    AACloner * clone() const;
    ~AACloner();
@@ -1527,7 +1326,7 @@ public:
    AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string dest,string _name, ManaCost * _cost = NULL);
    MTGGameZone * destinationZone(Targetable * target = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    const char * getMenuText(TargetChooser * fromTc);
    AAMover * clone() const;
    ~AAMover();
@@ -1543,7 +1342,7 @@ public:
    AARandomMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string tcs, string from, string to);
    MTGGameZone * destinationZone(Targetable * target = NULL,string zone = "");
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AARandomMover * clone() const;
    ~AARandomMover();
 };
@@ -1557,7 +1356,7 @@ public:
    string menu;
    AABuryCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AABuryCard * clone() const;
    ~AABuryCard();
 };
@@ -1568,7 +1367,7 @@ public:
    MTGAbility * andAbility;
    AADestroyCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AADestroyCard * clone() const;
    ~AADestroyCard();
 };
@@ -1579,7 +1378,7 @@ public:
    MTGAbility * andAbility;
    AASacrificeCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AASacrificeCard * clone() const;
    ~AASacrificeCard();
 };
@@ -1590,7 +1389,7 @@ public:
    MTGAbility * andAbility;
    AADiscardCard(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AADiscardCard * clone() const;
    ~AADiscardCard();
 };
@@ -1610,7 +1409,7 @@ public:
    string tcString;

    GenericTargetAbility(GameObserver* observer, string newName, string castRestriction, int _id, MTGCardInstance * _source, TargetChooser * _tc, MTGAbility * a, ManaCost * _cost = NULL, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "", int restrictions = 0, MTGGameZone * dest = NULL,string tcString ="");
-    const string getMenuText();
+    const char * getMenuText();
    ~GenericTargetAbility();
    GenericTargetAbility * clone() const;
    int resolve();
@@ -1648,7 +1447,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Ninjutsu";
    }
@@ -1680,7 +1479,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Remove From Combat";
    }
@@ -1702,7 +1501,7 @@ public:
    AADrawer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost,string nbcardsStr, int who =
            TargetChooser::UNSET,bool noReplace = false);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AADrawer * clone() const;
    int getNumCards();
 };
@@ -1722,7 +1521,7 @@ public:
    ACastRestriction(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET);
    int addToGame();
    int destroy();
-    const string getMenuText();
+    const char * getMenuText();
    ACastRestriction * clone() const;
    ~ACastRestriction();

@@ -1737,7 +1536,7 @@ public:

    AInstantCastRestrictionUEOT(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, TargetChooser * _restrictionsScope, WParsedInt * _value, bool _modifyExisting, int _zoneId, int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AInstantCastRestrictionUEOT * clone() const;
    ~AInstantCastRestrictionUEOT();
 };
@@ -1750,7 +1549,7 @@ public:
    AALifer(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string life_s, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AALifer * clone() const;
    int getLife();

@@ -1763,7 +1562,7 @@ public:
    AAWinGame(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who =
            TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAWinGame * clone() const;
 };

@@ -1804,7 +1603,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return Constants::MTGBasicAbilities[ability];
    }
@@ -1846,7 +1645,7 @@ public:
            return InstantAbility::addToGame();
        }

-        const string getMenuText()
+        const char * getMenuText()
        {
            return Constants::MTGBasicAbilities[ability];
        }
@@ -1907,7 +1706,7 @@ public:
        return ActivatedAbility::addToGame();
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return ability->getMenuText();
    }
@@ -2063,7 +1862,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        sprintf(menuText,"Protection from %s",tcstr.c_str());
        return menuText;
@@ -2255,7 +2054,7 @@ public:
        ((MTGCardInstance *) target)->addToToughness(-wppt->toughness.getValue());
        return 1;
    }
-    const string getMenuText()
+    const char * getMenuText()
    {                
        if(PT.size())
        {
@@ -2348,7 +2147,7 @@ public:
          return 1;
      }

-      const string getMenuText()
+      const char * getMenuText()
      {
          return ability->getMenuText();
      }
@@ -2390,7 +2189,7 @@ public:
          return toAdd->addToGame();
      }

-      const string getMenuText()
+      const char * getMenuText()
      {
          return ability->getMenuText();
      }
@@ -2488,7 +2287,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Regenerate";
    }
@@ -2695,7 +2494,7 @@ public:
        SAFE_DELETE(ability);
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        if(ability)
        {
@@ -2724,13 +2523,13 @@ public:

    ALord(GameObserver* observer, int _id, MTGCardInstance * card, TargetChooser * _tc, int _includeSelf, MTGAbility * a) :
        ListMaintainerAbility(observer, _id, card), NestedAbility(a)
-    {
-        tc = _tc;
-        tc->targetter = NULL;
-        includeSelf = _includeSelf;
-        if(ability->aType == MTGAbility::STANDARD_PREVENT)
-            aType = MTGAbility::STANDARD_PREVENT;
-    }
+        {
+            tc = _tc;
+            tc->targetter = NULL;
+            includeSelf = _includeSelf;
+            if(ability->aType == MTGAbility::STANDARD_PREVENT)
+                aType = MTGAbility::STANDARD_PREVENT;
+        }
     
    //returns true if it is me who created ability a attached to Damageable d
    bool isParentOf(Damageable * d, MTGAbility * a)
@@ -2808,8 +2607,7 @@ public:

    int removed(MTGCardInstance * card)
    {
-        if (abilities.find(card) != abilities.end()
-            && !(forceDestroy == -1 && forcedAlive == 1)) //only embelms have forcedestroy = -1 and forcedalive = 1
+        if (abilities.find(card) != abilities.end() && !(forceDestroy == -1 && forcedAlive == 1))//only embelms have forcedestroy = -1 and forcedalive = 1
        { 
            game->removeObserver(abilities[card]);
            abilities.erase(card);
@@ -2822,7 +2620,7 @@ public:
        SAFE_DELETE(ability);
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        //Special case for move
        if (AAMover * move = dynamic_cast<AAMover *>(ability))
@@ -3008,7 +2806,7 @@ public:
    int equip(MTGCardInstance * equipped);

    int resolve();
-    const string getMenuText();
+    const char * getMenuText();

    int testDestroy();
    int destroy();
@@ -3236,7 +3034,7 @@ public:
        card->setAttacker(1);
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        sprintf(menuText, "Create %s", name.c_str());
        return menuText;
@@ -3337,7 +3135,7 @@ public:
        }
    }
    
-    const string getMenuText()
+    const char * getMenuText()
    {
        if(name.size())
            return name.c_str();
@@ -3510,7 +3308,7 @@ public:
        return 0;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return ability->getMenuText();
    }
@@ -3722,7 +3520,7 @@ public:
        }
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return ability->getMenuText();
    }
@@ -3745,7 +3543,7 @@ public:
    AASetHand(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int hand, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AASetHand * clone() const;

 };
@@ -3759,7 +3557,7 @@ public:
    AALifeSet(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, WParsedInt * life, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AALifeSet * clone() const;
    ~AALifeSet();

@@ -3776,7 +3574,7 @@ public:
    AADamager(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, string d, ManaCost * _cost = NULL,
             int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    int getDamage();
    AADamager * clone() const;

@@ -3790,7 +3588,7 @@ public:

    AADamagePrevent(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int preventing, ManaCost * _cost = NULL, int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AADamagePrevent * clone() const;
    ~AADamagePrevent();
 };
@@ -3804,7 +3602,7 @@ public:
    AAAlterPoison(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, int poison, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAAlterPoison * clone() const;
    ~AAAlterPoison();
 };
@@ -3832,7 +3630,7 @@ class AATapper: public ActivatedAbility
 public:
    AATapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AATapper * clone() const;
 };

@@ -3842,7 +3640,7 @@ class AAUntapper: public ActivatedAbility
 public:
    AAUntapper(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAUntapper * clone() const;
 };

@@ -3863,7 +3661,7 @@ class AAFrozen: public ActivatedAbility
 public:
    AAFrozen(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAFrozen * clone() const;
 };
 /* ghetto new target*/
@@ -3873,7 +3671,7 @@ public:
 bool retarget;
    AANewTarget(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,bool retarget = false, ManaCost * _cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AANewTarget * clone() const;
 };
 /* morph*/
@@ -3884,7 +3682,7 @@ public:
    AAMorph(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, ManaCost * _cost = NULL);
    int resolve();
    int testDestroy();
-    const string getMenuText();
+    const char * getMenuText();
    AAMorph * clone() const;
 };
 /* flip*/
@@ -3896,7 +3694,7 @@ public:
    AAFlip(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,string flipStats);
    int resolve();
    int testDestroy();
-    const string getMenuText();
+    const char * getMenuText();
    AAFlip * clone() const;
 };
 /* dynamic ability build*/
@@ -3961,7 +3759,7 @@ string menu;
    int resolve();
    int activateMainAbility(MTGAbility * toActivate,MTGCardInstance * source , Damageable * target);
    int activateStored();
-    const string getMenuText();
+    const char * getMenuText();
    AADynamic * clone() const;
    ~AADynamic();
 };
@@ -4014,7 +3812,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Swap power and toughness";
    }
@@ -4030,7 +3828,7 @@ public:
    AAExchangeLife(GameObserver* observer, int _id, MTGCardInstance * _source, Targetable * _target, ManaCost * _cost = NULL,
             int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAExchangeLife * clone() const;

 };
@@ -4266,7 +4064,7 @@ public:
    int reapplyCountersBonus(MTGCardInstance * rtarget= NULL,bool powerapplied=false,bool toughnessapplied=false);
    int testDestroy();
    int destroy();
-    const string getMenuText();
+    const char * getMenuText();
    ATransformer * clone() const;
    ~ATransformer();
 };
@@ -4289,7 +4087,7 @@ public:

    ATransformerInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, string types = "", string abilities = "",string newpower = "",bool newpowerfound = false,string newtoughness = "",bool newtoughnessfound = false,vector<string>newAbilitiesList = vector<string>(),bool newAbilityFound = false,bool aForever = false, bool UYNT = false,string menutext = "");
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    ATransformerInstant * clone() const;
    ~ATransformerInstant();
 };
@@ -4305,7 +4103,7 @@ public:
    WParsedPT * newWppt;
    PTInstant(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, WParsedPT * wppt,string s = "",bool nonstatic = false);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    PTInstant * clone() const;
    ~PTInstant();
 };
@@ -4364,7 +4162,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Exalted";
    }
@@ -4382,7 +4180,7 @@ public:
    ASwapPT * ability;
    ASwapPTUEOT(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    ASwapPTUEOT * clone() const;
    ~ASwapPTUEOT();
 };
@@ -4459,7 +4257,7 @@ public:
    APreventDamageTypesUEOT(GameObserver* observer, int id, MTGCardInstance * source, string to, string from, int type = 0);
    int resolve();
    int destroy();
-    const string getMenuText();
+    const char * getMenuText();
    APreventDamageTypesUEOT * clone() const;
    ~APreventDamageTypesUEOT();
 };
@@ -4476,7 +4274,7 @@ public:
    AVanishing(GameObserver* observer, int _id, MTGCardInstance * card, ManaCost * _cost, int restrictions = 0,int amount = 0,string counterName = "");
    void Update(float dt);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AVanishing * clone() const;
    ~AVanishing();
 };
@@ -4498,7 +4296,7 @@ public:
    void Update(float dt);
    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    virtual ostream& toString(ostream& out) const;
    AUpkeep * clone() const;
    ~AUpkeep();
@@ -4524,7 +4322,7 @@ public:
        MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = true,bool opponentturn = true,bool once = false);
    void Update(float dt);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    APhaseAction * clone() const;
    ~APhaseAction();
 };
@@ -4538,7 +4336,7 @@ public:
    APhaseActionGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * target, string sAbility, int restrictions = 0, int _phase =
            MTG_PHASE_UPKEEP,bool forcedestroy = false,bool next = true,bool myturn = false,bool opponentturn = false,bool once = false);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    APhaseActionGeneric * clone() const;
    ~APhaseActionGeneric();

@@ -4558,7 +4356,7 @@ public:
    void Update(float dt);
    void resolveBlink();
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    ABlink * clone() const;
    ~ABlink();
 private:
@@ -4576,7 +4374,7 @@ public:
    MTGAbility * stored;
    ABlinkGeneric(GameObserver* observer, int _id, MTGCardInstance * card, MTGCardInstance * _target,bool blinkueot=false,bool blinkForSource = false,bool blinkhand = false,MTGAbility * stored = NULL);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    ABlinkGeneric * clone() const;
    ~ABlinkGeneric();

@@ -5482,7 +5280,7 @@ public:
        return 1;
    }

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "phase alter";
    }
@@ -5501,7 +5299,7 @@ public:
    AADepleter(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AADepleter * clone() const;
 };

@@ -5514,7 +5312,7 @@ public:
    AAModTurn(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbTurnStr, ManaCost * _cost = NULL,
            int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAModTurn * clone() const;
 };

@@ -5525,7 +5323,7 @@ public:
    AAShuffle(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, ManaCost * _cost = NULL, int who =
            TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AAShuffle * clone() const;
 };

@@ -5538,7 +5336,7 @@ public:

    AARemoveMana(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target, string ManaDesc, int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AARemoveMana * clone() const;
    ~AARemoveMana();

@@ -5553,7 +5351,7 @@ public:
    AARandomDiscarder(GameObserver* observer, int _id, MTGCardInstance * card, Targetable * _target,string nbcardsStr, ManaCost * _cost = NULL,
             int who = TargetChooser::UNSET);
    int resolve();
-    const string getMenuText();
+    const char * getMenuText();
    AARandomDiscarder * clone() const;
 };

@@ -5725,7 +5523,7 @@ public:

    int testDestroy(){return 0;};
    void Update(float dt);
-    const string getMenuText();
+    const char * getMenuText();
    int isReactingToTargetClick(Targetable * card);
    int reactToTargetClick(Targetable * object);
    MTGCardInstance * makeCard();
@@ -5842,7 +5640,7 @@ public:
    MTGAbility * abilityAltered;
    AASetColorChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _color = 0 ,string toAdd = "");
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AASetColorChosen * clone() const;
    ~AASetColorChosen();
 };
@@ -5855,7 +5653,7 @@ public:
    MTGAbility * abilityAltered;
    AASetTypeChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _type = 0,string menu = "error" ,string toAdd = "");
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AASetTypeChosen * clone() const;
    ~AASetTypeChosen();
 };
@@ -5869,7 +5667,7 @@ public:
    bool ANonWall;
    GenericChooseTypeColor(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "",bool chooseColor = false,bool nonwall = false, ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    GenericChooseTypeColor * clone() const;
    ~GenericChooseTypeColor();

@@ -5886,7 +5684,7 @@ public:
    MTGAbility * abilityAltered;
    AASetCoin(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int side = -1,string toAdd = "");
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AASetCoin * clone() const;
    ~AASetCoin();
 };
@@ -5897,7 +5695,7 @@ public:
    AASetCoin * setCoin;
    GenericFlipACoin(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string toAdd = "", ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    GenericFlipACoin * clone() const;
    ~GenericFlipACoin();

@@ -5916,7 +5714,7 @@ public:

    GenericPaidAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target,string _newName,string _castRestriction,string _mayCost, string toAdd, ManaCost * cost = NULL);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    GenericPaidAbility * clone() const;
    ~GenericPaidAbility();

--- a/projects/mtg/include/CardDescriptor.h
+++ b/projects/mtg/include/CardDescriptor.h
@@ -64,7 +64,6 @@ class CardDescriptor: public MTGCardInstance
  string compareName;
  int CDopponentDamaged;
  int CDcontrollerDamaged;
-  int CDdamager;
 };

 #endif
--- a/projects/mtg/include/CardGui.h
+++ b/projects/mtg/include/CardGui.h
@@ -33,7 +33,7 @@ protected:
    /*
    ** Tries to render the Big version of a card picture, backups to text version in case of failure
    */
-    static void RenderBig(MTGCard * card, const Pos& pos, bool thumb = false);
+    static void RenderBig(MTGCard * card, const Pos& pos);

    static void RenderCountersBig(MTGCard * card, const Pos& pos, int drawMode = DrawMode::kNormal);
    static void AlternateRender(MTGCard * card, const Pos& pos);
@@ -55,8 +55,8 @@ public:
    virtual void Render();
    virtual void Update(float dt);

-    void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false);
-    static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal, bool thumb = false);
+    void DrawCard(const Pos& inPosition, int inMode = DrawMode::kNormal);
+    static void DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode = DrawMode::kNormal);

    static JQuadPtr AlternateThumbQuad(MTGCard * card);
    virtual ostream& toString(ostream&) const;
--- a/projects/mtg/include/CardPrimitive.h
+++ b/projects/mtg/include/CardPrimitive.h
@@ -101,9 +101,10 @@ public:
    int removeType(string value, int removeAll = 0);
    int removeType(int value, int removeAll = 0);
    bool hasSubtype(int _subtype);
+    bool hasSubtype(const char * _subtype);
    bool hasSubtype(const string& _subtype);
    bool hasType(int _type);
-    bool hasType(const string& type);
+    bool hasType(const char * type);

    void setManaCost(const string& value);
    ManaCost * getManaCost();
--- a/projects/mtg/include/CarouselDeckView.h
+++ b/projects/mtg/include/CarouselDeckView.h
@@ -1,45 +0,0 @@
-#ifndef _CAROUSEL_DECK_VIEW_H_
-#define _CAROUSEL_DECK_VIEW_H_
-
-#include "DeckView.h"
-#include "Easing.h"
-
-class CarouselDeckView : public DeckView
-{
-private:
-    static const float max_scale;
-    static const float x_center;
-    static const float right_border;
-    static const float slide_animation_duration;
-    static const float scroll_animation_duration;
-
-public:
-    CarouselDeckView();
-    virtual ~CarouselDeckView();
-    void Reset();
-
-    void UpdateViewState(float dt);
-    void UpdateCardPosition(int index);
-    void renderCard(int index)
-    {
-        int alpha = (int) (255 * (mCards[index].scale + 1.0 - max_scale));
-        DeckView::renderCard(index, alpha);
-    }
-
-    void Render();
-
-    bool ButtonPressed(Buttons button);
-    MTGCard * Click(int x, int y);
-    MTGCard * Click();
-
-    void changePositionAnimated(int offset);
-    void changeFilterAnimated(int offset);
-
-    MTGCard *getActiveCard();
-private:
-    float mScrollOffset, mSlideOffset;
-    InOutQuadEasing mScrollEasing;
-    InOutQuadEasing mSlideEasing;
-};
-
-#endif //_CAROUSEL_DECK_VIEW_H_
--- a/projects/mtg/include/DeckEditorMenu.h
+++ b/projects/mtg/include/DeckEditorMenu.h
@@ -17,7 +17,7 @@ private:
    StatsWrapper *stw;

 public:
-    DeckEditorMenu(int id, JGuiListener* listener = NULL, int fontId = 1, const string& _title = "", DeckDataWrapper *selectedDeck = NULL, StatsWrapper *stats = NULL);
+    DeckEditorMenu(int id, JGuiListener* listener = NULL, int fontId = 1, const char * _title = "", DeckDataWrapper *selectedDeck = NULL, StatsWrapper *stats = NULL);
    void Render();
    virtual ~DeckEditorMenu();
 };
--- a/projects/mtg/include/DeckMenu.h
+++ b/projects/mtg/include/DeckMenu.h
@@ -79,7 +79,7 @@ public:
    virtual void Render();
    virtual void Update(float dt);
    using JGuiController::Add;
-    virtual void Add(int id, const string& Text, const string& desc = "", bool forceFocus = false, DeckMetaData *deckMetaData = NULL);
+    virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false, DeckMetaData *deckMetaData = NULL);
    virtual void Close();
    void updateScroller();
    void RenderBackground();
--- a/projects/mtg/include/DeckMenuItem.h
+++ b/projects/mtg/include/DeckMenuItem.h
@@ -77,7 +77,9 @@ public:
 	}

 	// Setters
-    void setDescription( const string& description ) { mDescription = description; }
+	void setDescription( const string description ) { mDescription = description; };
+
+    ;
 };

 #endif
--- a/projects/mtg/include/DeckStats.h
+++ b/projects/mtg/include/DeckStats.h
@@ -98,7 +98,7 @@ public:
    string getManaColorIndex();
    void updateStats(string filename, MTGAllCards * collection);
    void updateStats(DeckDataWrapper *mtgDeck);
-    int countCardsByType(const string& _type, DeckDataWrapper * myDeck);
+    int countCardsByType(const char * _type, DeckDataWrapper * myDeck);
    float noLuck(int n, int a, int x);

    vector<string> aiDeckNames;
--- a/projects/mtg/include/DeckView.h
+++ b/projects/mtg/include/DeckView.h
@@ -1,241 +0,0 @@
-#ifndef _DECK_VIEW_H_
-#define _DECK_VIEW_H_
-
-#include <vector>
-
-#include "MTGCard.h"
-#include "DeckDataWrapper.h"
-#include "WFont.h"
-#include "WResourceManager.h"
-#include "Pos.h"
-
-/*! \brief A abstract base class for deck views
- *
- * The deck editor uses a deck view to present the cards
- * e.g. in a circular "Carousel" layout or in a flat grid
- * layout. Both layouts inherit this base class to ensure
- * a common interface which the deck editor can rely on.
- */
-class DeckView
-{
-protected:
-    /*! \brief defines the delay until additional card informations get shown
-     *
-     * \note I am not entirely sure about that
-     */
-    static const float no_user_activity_show_card_delay;
-
-    /*! \brief Represents a card for internal use in the deck view
-     *
-     * It stores positional information and a pointer to the actual card structure.
-     */
-    struct CardRep{
-        float x;
-        float y;
-        float scale;
-        MTGCard * card;
-    };
-public:
-    /*! \brief Defines if the filter needs an update
-     *
-     * The owner of the deck that is shown is responsible for updating the filters.
-     */
-    bool dirtyFilters;
-
-    /*! \brief Defines if the card positions need an update
-     *
-     * If the card positions are dirty, UpdateCardPosition will get called on
-     * all cards during Update(float dt);
-     *
-     * \see Update
-     * \see UpdateCardPosition
-     */
-    bool dirtyCardPos;
-
-    /*! \brief Constructs the view and initializes datamembers
-     *
-     * It sets the dirty states to true, the currently shown deck to NULL and selects filter 0.
-     *
-     * \param numberOfCards the number of cards the view handles (this includes hidden cards for caching)
-     */
-    DeckView(int numberOfCards);
-
-    /*! \brief Does nothing but is needed to ensure proper deletion of derived classes.
-     */
-    virtual ~DeckView();
-
-    /*! \brief Resets nearly all datamembers to their initial values
-     *
-     * Does not reset mCards.
-     */
-    virtual void Reset();
-
-    /*! \brief Advances the view by dt time units
-     *
-     * This method calls UpdateViewState unconditionally and UpdateCardPosition on every card
-     * if dirtyCardPos is set. It then resets dirtyCardPos.
-     *
-     * \param dt the number of time units to advance
-     * \see UpdateViewState
-     * \see UpdateCardPosition
-     */
-    void Update(float dt);
-
-    /*! \brief Sets the deck that this view shows
-     *
-     * This method replaces the currently shown deck with toShow, sets all dirty states and
-     * reloads the mtg cards. No ownership changes.
-     *
-     * \param toShow the deck to show
-     * \see reloadIndexes
-     */
-    void SetDeck(DeckDataWrapper *toShow);
-
-    /*! \brief Returns a pointer to the current deck.
-     */
-    DeckDataWrapper *deck();
-
-    /*! \brief Performs an immediate switch of the filter without animations
-     *
-     * This method rotates the currently selected filter by delta and sets dirtyFilters.
-     *
-     * \param delta the filter to select relatively to the currently selected filter
-     * \see dirtyFilters
-     */
-    void changeFilter(int delta);
-
-    /*! \brief Performs an immediate switch of the position without animations
-     *
-     * If the i-th card stored in mCards points to the j-th card in the deck, it will point
-     * to the (j+delta)-th card after this method is called. No dirty states are set.
-     *
-     * \param delta the number of cards to advances
-     * \see mCards
-     */
-    void changePosition(int delta);
-
-    /*! \brief Returns the number of the currently selected filter
-     *
-     * \return the currently selected filter
-     */
-    int filter();
-
-    /*! \brief Reloads the mtg card pointers of mCards from the deck
-     *
-     * This is called when: We change the position in the deck or the deck structure changes
-     * (due to filtering or addition or removal of cards).
-     */
-    void reloadIndexes();
-
-    /*! \brief Returns the current position in the deck
-     */
-    int getPosition();
-
-    /*! \brief Renders the view
-     */
-    virtual void Render() = 0;
-
-    /*! \brief Reacts to selections by a pointer device (e. g. mouse, touch)
-     *
-     * If the selection in view internal i. e. a card got selected, there is
-     * no outside action performed and this method will return NULL. If a action got
-     * triggered i. e. a selected card was activated, it returns that card
-     * for further handling by the caller.
-     *
-     * \param x the x coordinate of the pointer during the action
-     * \param y the y coordinate of the pointer during the action
-     * \returns the card the action corresponds to
-     */
-    virtual MTGCard * Click(int x, int y) = 0;
-
-    /*! \brief Reacts to selections by pointerless devices (e. g. buttons)
-     *
-     * \see Click(int x, int y)
-     * \returns the card the actions corresponds to
-     */
-    virtual MTGCard * Click() = 0;
-
-    /*! \brief Handles ordinary button presses
-     *
-     * \param the pressed JButton
-     * \returns true if the view reacted to the button and false otherwise
-     */
-    virtual bool ButtonPressed(Buttons button) = 0;
-
-    /*! \brief Returns the currently active card
-     */
-    virtual MTGCard *getActiveCard() = 0;
-
-    /*! \brief Changes the position by a given offset
-     *
-     * Advances the view by offset cards and animates the change.
-     *
-     * \param offset the number of positions to advance
-     */
-    virtual void changePositionAnimated(int offset) = 0;
-
-    /*! \brief Changes the filter by a given offset
-     *
-     * Rotates the selected filter by the given offset and animates the change.
-     */
-    virtual void changeFilterAnimated(int offset) = 0;
-protected:
-
-    /*! \brief The number of time units since an user activity occurred
-     */
-    float last_user_activity;
-
-    /*! \brief The currently selected filter
-     */
-    int mFilter;
-
-    /*! \brief The currently selected deck
-     *
-     * This class does not take ownership of the deck
-     */
-    DeckDataWrapper *mCurrentDeck;
-
-    /*! \brief The card positions and pointers
-     */
-    vector<CardRep> mCards;
-
-    /*! \brief Renders a card with given alpha value
-     *
-     * \param index of the card in mCards to render
-     * \param alpha the alpha value of the card
-     * \param asThumbnail renders the thumbnail image of the card if set to true
-     *
-     * \see mCards
-     */
-    void renderCard(int index, int alpha, bool asThumbnail = false);
-
-    /*! \brief Returns the index in mCards of the card that is nearest to the given point
-     *
-     * \note This method uses the euclidian distance to the center of the card
-     *
-     * \param x the reference points x coordinate
-     * \param y the reference points y coordinate
-     * \returns the index of the nearest card to the reference point and -1 of mCards is empty
-     */
-    int getCardIndexNextTo(int x, int y);
-private:
-
-    /*! \brief Updates the state of the view e. g. view transitions
-     *
-     * \param dt the passes time since the last update
-     */
-    virtual void UpdateViewState(float dt) = 0;
-
-    /*! \brief Updates the given card reps positional members
-     *
-     * This method is called from Update when dirtyCardPos is set
-     *
-     * \param index the index in mCards of the card to update
-     *
-     * \see Update
-     * \see mCards
-     */
-    virtual void UpdateCardPosition(int index) = 0;
-};
-
-#endif // _DECK_VIEW_H_
--- a/projects/mtg/include/Easing.h
+++ b/projects/mtg/include/Easing.h
@@ -1,245 +0,0 @@
-#ifndef _EASING_H_
-#define _EASING_H_
-
-/*! \brief A class for eased floats for use in animations
- *
- * Animations often defines values a floating point variable
- * should have at given times and interpolates between them to
- * calculate the value of that variable at any given intermediate
- * time step.
- *
- * The simplest case would be linear interpolation:
- * Suppose a float "position" should be a at time = 0 and
- * b at time = x. If the current time is y, the value of
- * "position" is then a + (b-a)*y/x.
- *
- * This class defines the interface needed to implement different
- * kind of interpolations with a common interface. See
- * http://www.gizma.com/easing/ for more information for a few
- * examples.
- */
-class Easing
-{
-public:
-    /*! \brief The value at the start of an animation.
-     *
-     * start_value is undefined if no animation is running.
-     */
-    float start_value;
-
-    /*! \brief The amount the value should change during the animation.
-     *
-     * delta_value is undefined if no animation is running.
-     */
-    float delta_value;
-
-    /*! \brief The current value.
-     *
-     * Use this member to read the value or to write the value without
-     * to animate intermediate values and. Make sure that the easing
-     * is not used once value is deleted.
-     */
-    float& value;
-
-    /*! \brief The duration the animation should take
-     *
-     * It is not relevant which unit is used. This value is undefined
-     * if no animation is running.
-     */
-    float duration;
-
-    /*! \brief The accumulated time the animation did run until now.
-     *
-     * It is not relevant which unit is used. This values is undefined
-     * if no animation is running.
-     */
-    float time_acc;
-
-    /*! \brief Sets Easing::float to val and sets the animation as not running.
-     *
-     * Make sure that the easing is not used once value is deleted.
-     *
-     * \param val The value to ease
-     */
-    Easing(float& val): start_value(val), delta_value(0), value(val), duration(0), time_acc(0)
-    {
-    }
-
-    /*! \brief Resets the animation to its initial value
-     *
-     * This method does set the value to the start value and sets the passed time to 0.
-     * If there is no animation animation running, the resulting value is undefined.
-     */
-    void reset()
-    {
-        value = start_value;
-        time_acc = 0;
-    }
-
-    /*! \brief Finishes the animation immediately
-     *
-     * Sets the value to the animations target value and the passed time to the
-     * animations duration. If there is no animation running, the behaviour is undefined.
-     */
-    void finish()
-    {
-        value = start_value + delta_value;
-        time_acc = duration;
-    }
-
-    /*! \brief Lets dt time pass
-     *
-     * Advances the animation by dt time units and updates the value accordingly.
-     *
-     * \val dt The amount of time to jump forward
-     */
-    void update(float dt)
-    {
-        if(time_acc < duration)
-        {
-            time_acc += dt;
-
-            if(time_acc > duration)
-            {
-                time_acc = duration;
-                value = start_value + delta_value;
-            }
-            else
-            {
-                updateValue();
-            }
-        }
-    }
-
-    /*! \brief Calculates the value from all other members.
-     *
-     * This method gets implemented by all specific easing classes.
-     */
-    virtual void updateValue() = 0;
-
-    /*! \brief Starts the animation.
-     *
-     * Starts the interpolation from the current value (now) to
-     * targetValue (in now + _duration).
-     *
-     * If the animation is currently running, it gets replaced.
-     *
-     * \param targetValue The value to interpolate to
-     * \param _duration   The duration the interpolation should take
-     */
-    void start(float targetValue, float _duration)
-    {
-        start_value = value;
-        delta_value = targetValue - start_value;
-        time_acc = 0;
-        duration = _duration;
-    }
-
-    /*! \brief Translates the current value and the target value by delta_value
-     *
-     * This method is mainly used for trickery. Suppose there is one object in the
-     * middle of the screen that should move to the top until it is outside of the
-     * screen and gets replaced by a second one entering the screen from the lower
-     * side once the first one disappeared. This method can be used to simulate this
-     * effect with one animation by translating (i.e. moving) the animation from the
-     * top to the bottom:
-     *
-     * Object1 and object2 are the same object: object1 whose y position is bound to value
-     * To start the transition, use start(SCREEN_HEIGHT, desired time); Once the first
-     * object left the screen (i.e. object.y < 0), change objects appearance to object2
-     * and translate the easing by (SCREEN_HEIGHT).
-     *
-     * \param delta_value The change in start_value and value
-     */
-    void translate(float delta_value)
-    {
-        start_value += delta_value;
-        value += delta_value;
-    }
-
-    /*! \brief Returns if the passed time exceeds duration.
-     *
-     * If ther is no animation running, it is ensured that this is true.
-     */
-    bool finished()
-    {
-        return time_acc >= duration;
-    }
-};
-
-/*! \brief This class defines an easing with quadratic acceleration
- */
-class InQuadEasing : public Easing
-{
-public:
-    /*! \brief Calls Easing::Easing(val).
-     *
-     * \see Easing::Easing(float& val)
-     */
-    InQuadEasing(float& val): Easing(val) {}
-
-    /*! \brief Implements the value calculation.
-     *
-     * \see Easing::updateValue()
-     */
-    void updateValue()
-    {
-        float time_tmp = time_acc / duration;
-        value = delta_value * time_tmp * time_tmp + start_value;
-    }
-};
-
-/*! \brief This class defines an easing with quadratic decceleration
- */
-class OutQuadEasing : public Easing
-{
-public:
-    /*! \brief Calls Easing::Easing(val).
-     *
-     * \see Easing::Easing(float& val)
-     */
-    OutQuadEasing(float& val): Easing(val) {}
-
-    /*! \brief Implements the value calculation.
-     *
-     * \see Easing::updateValue()
-     */
-    void updateValue()
-    {
-        float time_tmp = time_acc / duration;
-        value = (-delta_value) * time_tmp * (time_tmp - 2.0f) + start_value;
-    }
-};
-
-/*! \brief This class defines an easing with quadratic acceleration and decceleration.
- */
-class InOutQuadEasing : public Easing
-{
-public:
-    /*! \brief Calls Easing::Easing(val).
-     *
-     * \see Easing::Easing(float& val)
-     */
-    InOutQuadEasing(float& val): Easing(val) {}
-
-    /*! \brief Implements the value calculation.
-     *
-     * \see Easing::updateValue()
-     */
-    void updateValue()
-    {
-        float time_tmp = (time_acc * 2) / duration;
-        if (time_tmp < 1)
-        {
-            value = (float)(delta_value * 0.5 * time_tmp * time_tmp + start_value);
-        }
-        else
-        {
-            time_tmp -= 1;
-            value = (float)(- delta_value * 0.5 * (time_tmp * (time_tmp - 2) - 1) + start_value);
-        }
-    }
-};
-
-
-#endif //_EASING_H_
--- a/projects/mtg/include/Effects.h
+++ b/projects/mtg/include/Effects.h
@@ -0,0 +1,13 @@
+#ifndef _EFFECTS_H_
+#define _EFFECTS_H_
+
+#include <JGui.h>
+
+class Effect: public JGuiObject
+{
+    static int id_counter;
+public:
+    Effect() : JGuiObject(++id_counter) {};
+};
+
+#endif // _EFFECTS_H_
--- a/projects/mtg/include/ExtraCost.h
+++ b/projects/mtg/include/ExtraCost.h
@@ -90,19 +90,6 @@ public:
  virtual LifeCost * clone() const;
 };

-//Specific life cost 
-class SpecificLifeCost : public ExtraCost
-{
-private:
-    int slc;
-
-public:
-  SpecificLifeCost(TargetChooser *_tc = NULL, int slc = 0);
-  virtual int canPay();
-  virtual int doPay();
-  virtual SpecificLifeCost * clone() const;
-};
-
 //phyrexian mana
 class LifeorManaCost : public ExtraCost
 {
--- a/projects/mtg/include/GameObserver.h
+++ b/projects/mtg/include/GameObserver.h
@@ -98,8 +98,8 @@ class GameObserver{
  int cardClick(MTGCardInstance * card,Targetable * _object = NULL, bool log = true);
  GamePhase getCurrentGamePhase();
  void setCurrentGamePhase(GamePhase phase) { mCurrentGamePhase = phase; };
-  const string& getCurrentGamePhaseName();
-  const string& getNextGamePhaseName();
+  const char * getCurrentGamePhaseName();
+  const char * getNextGamePhaseName();
  void nextCombatStep();
  void userRequestNextGamePhase(bool allowInterrupt = true, bool log = true);
  void cleanupPhase();
--- a/projects/mtg/include/GameStateAwards.h
+++ b/projects/mtg/include/GameStateAwards.h
@@ -17,6 +17,7 @@ private:
    WSrcCards * setSrc;
    SimpleMenu * menu;
    bool showMenu;
+    bool showAlt;
    bool saveMe;
    int mState;
    int mDetailItem;
--- a/projects/mtg/include/GameStateDeckViewer.h
+++ b/projects/mtg/include/GameStateDeckViewer.h
@@ -19,7 +19,22 @@
 #include "WGui.h"
 #include "InteractiveButton.h"

-class DeckView;
+#define NO_USER_ACTIVITY_HELP_DELAY 10
+#define NO_USER_ACTIVITY_SHOWCARD_DELAY 0.1
+
+enum
+{
+    STAGE_TRANSITION_RIGHT = 0,
+    STAGE_TRANSITION_LEFT = 1,
+    STAGE_WAITING = 2,
+    STAGE_TRANSITION_UP = 3,
+    STAGE_TRANSITION_DOWN = 4,
+    STAGE_ONSCREEN_MENU = 5,
+    STAGE_WELCOME = 6,
+    STAGE_MENU = 7,
+    STAGE_FILTERS = 8,
+    STAGE_TRANSITION_SELECTED = 9
+};

 // TODO: need a better name for MENU_FIRST_MENU, this is reused for the 1st submenu of
 // available options in the duel menu
@@ -29,7 +44,7 @@ enum
    MENU_DECK_SELECTION = 10,
    MENU_DECK_BUILDER = 11,
    MENU_FIRST_DUEL_SUBMENU = 102,
-    MENU_LANGUAGE_SELECTION = 103
+    MENU_LANGUAGE_SELECTION = 103,
 };

 // enums for menu options
@@ -49,69 +64,79 @@ enum DECK_VIEWER_MENU_ITEMS
    MENU_ITEM_NO = 21,
    MENU_ITEM_FILTER_BY = 22,
    MENUITEM_MORE_INFO = kInfoMenuID
+
 };

+#define ALL_COLORS -1
+
+#define ROTATE_LEFT 1;
+#define ROTATE_RIGHT 0;
+
+#define HIGH_SPEED 15.0
+#define MED_SPEED 5.0f
+#define LOW_SPEED 1.5
+
+#define MAX_SAVED_FILTERS Constants::NB_Colors + 1
+#define CARDS_DISPLAYED 10
+
 class GameStateDeckViewer: public GameState, public JGuiListener
 {
 private:
-    enum DeckViewerStages
-    {
-        STAGE_WAITING = 0,
-        STAGE_ONSCREEN_MENU,
-        STAGE_WELCOME,
-        STAGE_MENU,
-        STAGE_FILTERS
-    };
-
    vector<JQuadPtr> mIcons;
    JQuadPtr pspIcons[8];
    JTexture * pspIconsTexture;
    float last_user_activity;
    float onScreenTransition;
-    DeckViewerStages mStage;
+    float mRotation;
+    float mSlide;
+    int mAlpha;
+    int mStage;
+    int useFilter;
    JMusic * bgMusic;
+    int lastPos;
+    int lastTotal;
+    int mSelected;
    
-    InteractiveButton *toggleDeckButton, *sellCardButton, *statsPrevButton, *filterButton, *toggleViewButton;
+    InteractiveButton *toggleDeckButton, *sellCardButton, *statsPrevButton, *filterButton;

    WGuiFilters * filterMenu;
    WSrcDeckViewer * source;

    DeckEditorMenu * welcome_menu;
    SimpleMenu * subMenu;
-    DeckEditorMenu * deckMenu;
+    DeckEditorMenu * menu;
    PriceList* pricelist;
    PlayerData * playerdata;
+    int price;
+    DeckDataWrapper * displayed_deck;
    DeckDataWrapper * myDeck;
    DeckDataWrapper * myCollection;
-    StatsWrapper * mStatsWrapper;
+    MTGCard * cardIndex[CARDS_DISPLAYED];
+    StatsWrapper *stw;

    int hudAlpha;
    string newDeckname;
    bool isAIDeckSave;
    bool mSwitching;
-
-    enum AvailableView{
-        CAROUSEL_VIEW,
-        GRID_VIEW
-    };
-    DeckView* mView;
-    AvailableView mCurrentView;
-
    void saveDeck(); //Saves the deck and additional necessary information
    void saveAsAIDeck(string deckName); // saves deck as an AI Deck
+    int getCurrentPos();
    void sellCard();
    void setButtonState(bool state);
    bool userPressedButton();
    void RenderButtons();
-    void setupView(AvailableView view, DeckDataWrapper *deck);
-    void toggleView();
+    
+    pair<float, float> cardsCoordinates[CARDS_DISPLAYED];
+
 public:
    GameStateDeckViewer(GameApp* parent);
    virtual ~GameStateDeckViewer();
    void updateDecks();
+    void rotateCards(int direction);
+    void loadIndexes();
    void updateFilters();
    void rebuildFilters();
-    void toggleCollection();
+    void switchDisplay();
    void Start();
    virtual void End();
    void addRemove(MTGCard * card);
@@ -120,8 +145,11 @@ public:
    void renderSlideBar();
    void renderDeckBackground();
    void renderOnScreenMenu();
+    virtual void renderCard(int id, float rotation);
+    virtual void renderCard(int id);
    virtual void Render();
    int loadDeck(int deckid);
+    void LoadDeckStatistics(int deckId);

    void OnScroll(int inXVelocity, int inYVelocity);

--- a/projects/mtg/include/GameStateShop.h
+++ b/projects/mtg/include/GameStateShop.h
@@ -65,6 +65,7 @@ private:
    JQuadPtr pspIcons[8];
    WSrcCards * srcCards;
    TaskList * taskList;
+    float mElapsed;
    WGuiMenu * shopMenu;
    WGuiFilters * filterMenu; //Filter menu slides in sideways from right, or up from bottom.
    WGuiCardImage * bigDisplay;
--- a/projects/mtg/include/GridDeckView.h
+++ b/projects/mtg/include/GridDeckView.h
@@ -1,154 +0,0 @@
-#ifndef _GRID_DECK_VIEW_H
-#define _GRID_DECK_VIEW_H
-
-#include "DeckView.h"
-#include "Easing.h"
-
-/*! \brief Implements a grid view
- *
- * This view displays 12 cards in two rows as thumbnails. The currently
- * selected card is dislayed bigger than the rest and uses the fullsize
- * image. Scrolling the view horizontally and toggeling filters is
- * animated and uses quadratic easing.
- *
- * It also implements a button mode for pointerless devices.
- */
-class GridDeckView : public DeckView
-{
-private:
-    static const float scroll_animation_duration;
-    static const float slide_animation_duration;
-    static const float card_scale_small;
-    static const float card_scale_big;
-public:
-    /*! \brief Constructs a grid view with no decks set
-     */
-    GridDeckView();
-
-    /*! \brief Does nothing but is needed to ensure proper deletion of derived classes.
-     */
-    virtual ~GridDeckView();
-
-    /*! \brief Resets almost all member variables but mRows and mCols
-     */
-    void Reset();
-
-    /*! \brief Advances scrolling and sliding animations
-     *
-     * \param dt the time since the last update
-     *
-     * \see DeckView::UpdateViewState()
-     */
-    void UpdateViewState(float dt);
-
-    /*! \brief Updates the cards position
-     *
-     * \see DeckView::UpdateCardPosition()
-     */
-    void UpdateCardPosition(int index);
-
-    /*! \brief Renders the view
-     *
-     * This method prefetches all rendered cards as thumbnails except the
-     * selected card to reduce cache pressure.
-     */
-    void Render();
-
-    /*! \brief Handles button presses
-     *
-     * The mapping is as follows:
-     *  JGE_BTN_LEFT        moves the position to the left if not in button mode
-     *                      moves the selection otherwise
-     *  JGE_BTN_RIGHT       move the position to the right if not in button mode
-     *                      moves the selection otherwise
-     *  JGE_BTN_UP          select the previous filter if not in button mode
-     *                      moves the selection otherwise
-     *  JGE_BTN_DOWN        select the next filter if not in button mode
-     *                      moves the selection otherwise
-     *  JGE_BTN_CTRL        deactivate button mode
-     *
-     * \param button the pressed button
-     * \returns if the view handled the button
-     */
-    bool ButtonPressed(Buttons button);
-
-    /*! \brief Handles clicks and triggers scrolling and the selection of cards
-     *
-     * This method deactivates the button mode and searches for the nearest
-     * card to the given position. If this card is in column 0 or 1 it scrolls
-     * left. If it is in column (mCols-1) or (mCols-2) it scrolls to the right.
-     * In any other case, it selects the card.
-     *
-     * \param x the clicks x coordinate
-     * \param y the clicks y coordinate
-     *
-     * \return selected card c if c was already selected and no animation is running, NULL otherwise
-     */
-    MTGCard * Click(int x, int y);
-
-    /*! \brief Handles pointerless clicks (JGE_BTN_OK)
-     *
-     * If no card is selected, this method activates button mode and selects a card.
-     *
-     * \returns selected card, NULL otherwise
-     */
-    MTGCard * Click();
-
-    /*! \brief Scrolls the view horizontally
-     *
-     * \param offset the number of columns to scroll
-     */
-    void changePositionAnimated(int offset);
-
-    /*! \brief Rotates the selected filter and slides vertically
-     *
-     * \param the number of filters to rotate
-     */
-    void changeFilterAnimated(int offset);
-
-    /*! \brief Returns the currently selected card
-     *
-     * \returns card c if c is selected and in column 4 to 6 and NULL otherwise*/
-    MTGCard *getActiveCard();
-private:
-    /*! \brief The amount of columns (visible and hidden)
-     */
-    const int mCols;
-
-    /*! \brief The amount of rows
-     */
-    const int mRows;
-
-    /*! \brief The current scrolling offset
-     */
-    float mScrollOffset;
-
-    /*! \brief The current sliding offset
-     */
-    float mSlideOffset;
-
-    /*! \brief The easing functor that gets applied while scrolling
-     */
-    InOutQuadEasing mScrollEasing;
-
-    /*! \brief The easing functor that gets applied while sliding
-     */
-    InOutQuadEasing mSlideEasing;
-
-    /*! \brief The current selected card index
-     */
-    int mCurrentSelection;
-
-    /*! \brief Stores if we are in button mode.
-     */
-    bool mButtonMode;
-
-    /*! \brief Moves the card selection by an offset.
-     *
-     * \param offset the offset to move the selection
-     * \param alignIfOutOfBounds the view will scroll if the selection moves out of bound if set to true
-     */
-    void moveSelection(int offset, bool alignIfOutOfBounds);
-};
-
-#endif //_GRID_DECK_VIEW_H
--- a/projects/mtg/include/GuiMana.h
+++ b/projects/mtg/include/GuiMana.h
@@ -6,9 +6,8 @@
 #include <hge/hgeparticle.h>
 #include "JGE.h"
 #include "MTGDefinitions.h"
-#include "Pos.h"
+#include "GameApp.h"
 #include "GuiLayers.h"
-#include "WResource_Fwd.h"

 class ManaIcon : public Pos
 {
--- a/projects/mtg/include/GuiPhaseBar.h
+++ b/projects/mtg/include/GuiPhaseBar.h
@@ -4,25 +4,15 @@
 #include "GuiLayers.h"
 #include "PhaseRing.h"
 #include "WEvent.h"
-#include "PlayGuiObject.h"
-
-#include "Easing.h"

 class GuiPhaseBar: public GuiLayer, public PlayGuiObject
 {
-private:
-    static const float zoom_big;
-    static const float zoom_small;
-    static const float step;
-
-    int displayedPhaseId;
+protected:
+    Phase* phase;
    float angle;
    float zoomFactor;
-    OutQuadEasing angleEasing;
-    InOutQuadEasing zoomFactorEasing;
-    DuelLayers* mpDuelLayers;
+	DuelLayers* mpDuelLayers;

-    void DrawGlyph(JQuad *inQuad, int phaseId, float x, float y, float scale);
 public:
    GuiPhaseBar(DuelLayers* duelLayers);
    ~GuiPhaseBar();
--- a/projects/mtg/include/GuiPlay.h
+++ b/projects/mtg/include/GuiPlay.h
@@ -47,6 +47,7 @@ protected:
    {
        static const float HEIGHT;
        unsigned attackers;
+        unsigned blockers;
        unsigned currentAttacker;
        float height;

--- a/projects/mtg/include/InteractiveButton.h
+++ b/projects/mtg/include/InteractiveButton.h
@@ -28,7 +28,6 @@ const int kNextStatsButtonId     = 10005;
 const int kPrevStatsButtonId     = 10006;
 const int kCycleCardsButtonId    = 10007;
 const int kShowCardListButtonId  = 10008;
-const int kSwitchViewButton      = 10009;

 class InteractiveButton: public SimpleButton
 {
--- a/projects/mtg/include/MTGAbility.h
+++ b/projects/mtg/include/MTGAbility.h
@@ -317,7 +317,7 @@ public:
    virtual TargetAbility* clone() const = 0;
    virtual void Render();
    virtual int resolve();
-    virtual const string getMenuText();
+    virtual const char * getMenuText();
    virtual ostream& toString(ostream& out) const;
 };

@@ -436,7 +436,7 @@ public:

    void Update(float dt);
    virtual GenericTriggeredAbility* clone() const;
-    const string getMenuText();
+    const char * getMenuText();
    ~GenericTriggeredAbility();
 };

@@ -525,7 +525,7 @@ public:
    int isReactingToClick(MTGCardInstance *  _card, ManaCost * mana = NULL);
    int resolve();
    int reactToClick(MTGCardInstance* _card);
-    const string getMenuText();
+    const char * getMenuText();
    ~AManaProducer();
    virtual AManaProducer * clone() const;
 };
--- a/projects/mtg/include/MTGCardInstance.h
+++ b/projects/mtg/include/MTGCardInstance.h
@@ -65,7 +65,6 @@ public:
    bool wasDealtDamage;
    bool damageToOpponent;
    bool damageToController;
-    bool damageToCreature;
    bool mPropertiesChangedSinceLastUpdate;
    int reduxamount;
    int flanked;
@@ -130,11 +129,11 @@ public:


    //types
-    void addType(const string& type_text);
+    void addType(char * type_text);
    virtual void addType(int id);
-    void setType(const string& type_text);
-    void setSubtype(const string &value);
-    int removeType(const string &value, int removeAll = 0);
+    void setType(const char * type_text);
+    void setSubtype( string value);
+    int removeType(string value, int removeAll = 0);
    int removeType(int value, int removeAll = 0);

    //dangerranking is a hint to Ai which creatures are the ones it should be targetting for effects.
--- a/projects/mtg/include/MTGDeck.h
+++ b/projects/mtg/include/MTGDeck.h
@@ -4,6 +4,7 @@
 #define MTG_ERROR -1

 #include "MTGDefinitions.h"
+#include "GameApp.h"
 #include "WResourceManager.h"
 #include <dirent.h>
 #include <Threading.h>
@@ -18,7 +19,7 @@ class MTGPack;
 class MTGSetInfo
 {
 public:
-    MTGSetInfo(const string& _id);
+    MTGSetInfo(string _id);
    ~MTGSetInfo();
    string id; //Short name: 10E, RAV, etc. Automatic from folder.
    string author; //Author of set, for crediting mod makers, etc.
@@ -69,7 +70,7 @@ public:
    MTGSets();
    ~MTGSets();

-    int Add(const string& subtype);
+    int Add(const char * subtype);
    int findSet(string value);
    int findBlock(string s);
    int size();
@@ -126,10 +127,8 @@ public:
    MTGCard * getCardByName(string name);
    void loadFolder(const string& folder, const string& filename="" );

-    int load(const string& config_file);
-    int load(const string& config_file, const string& setName);
-    int load(const string& config_file, int set_id);
-    int countByType(const string& _type);
+    int load(const char * config_file, const char * setName = NULL, int autoload = 1);
+    int countByType(const char * _type);
    int countByColor(int color);
    int countBySet(int setId);
    int totalCards();
@@ -137,7 +136,7 @@ public:

    static int findType(string subtype, bool forceAdd = true) {
        boost::mutex::scoped_lock lock(instance->mMutex);
-        int result = instance->subtypesList.find(subtype, forceAdd);
+		int result = instance->subtypesList.find(subtype, forceAdd);
        return result;
    };
    static int add(string value, unsigned int parentType) {
@@ -219,8 +218,8 @@ public:
    int totalCards();
    int totalPrice();
    MTGDeck(MTGAllCards * _allcards);
-    MTGDeck(const string& config_file, MTGAllCards * _allcards, int meta_only = 0,int difficultySetting = 0);
-    int addRandomCards(int howmany, int * setIds = NULL, int nbSets = 0, int rarity = -1, const string& subtype = "",
+    MTGDeck(const char * config_file, MTGAllCards * _allcards, int meta_only = 0,int difficultySetting = 0);
+    int addRandomCards(int howmany, int * setIds = NULL, int nbSets = 0, int rarity = -1, const char * subtype = NULL,
            int * colors = NULL, int nbcolors = 0);
    int add(int cardid);
    int add(MTGDeck * deck); // adds the contents of "deck" into myself
--- a/projects/mtg/include/MTGDefinitions.h
+++ b/projects/mtg/include/MTGDefinitions.h
@@ -218,8 +218,7 @@ class Constants
      soulbond = 100,
      LURE = 101,
      NOLEGEND = 102,
-      CANPLAYFROMGRAVEYARD = 103,
-      NB_BASIC_ABILITIES = 104,
+      NB_BASIC_ABILITIES = 103,


    RARITY_S = 'S',   //Special Rarity
@@ -294,7 +293,7 @@ class Constants

  static map<string,int> MTGBasicAbilitiesMap;
  static const char* MTGBasicAbilities[];
-  static const string MTGPhaseNames[];
+  static const char* MTGPhaseNames[];
  static const char* MTGPhaseCodeNames[];

  static int GetBasicAbilityIndex(string mtgAbility);
--- a/projects/mtg/include/MTGGameZones.h
+++ b/projects/mtg/include/MTGGameZones.h
@@ -95,7 +95,7 @@ class MTGGameZone {
   void cleanupPhase();
   void beforeBeginPhase();

-   unsigned int countByType(const string &value);
+   unsigned int countByType(const char * value);
   unsigned int countByCanTarget(TargetChooser * tc);
   unsigned int countTotalManaSymbols(TargetChooser * tc, int color);
   MTGCardInstance * findByName(string name);
--- a/projects/mtg/include/MTGRules.h
+++ b/projects/mtg/include/MTGRules.h
@@ -66,7 +66,6 @@ public:
    MTGEventBonus(GameObserver* observer, int _id);
    virtual MTGEventBonus * clone() const;
 };
-
 class MTGPutInPlayRule: public PermanentAbility
 {
 public:
@@ -74,7 +73,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGPutInPlayRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "cast card normally";
    }
@@ -88,7 +87,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGKickerRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "pay kicker";
    }
@@ -106,7 +105,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGAlternativeCostRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        if(alternativeName.size())
            return alternativeName.c_str();
@@ -122,7 +121,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGBuyBackRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "cast and buy back";
    }
@@ -137,7 +136,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGFlashBackRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "flash back";
    }
@@ -151,7 +150,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGRetraceRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "retrace";
    }
@@ -166,28 +165,13 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGMorphCostRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "play morphed";
    }
    virtual MTGMorphCostRule * clone() const;
 };

-class MTGPlayFromGraveyardRule: public MTGAlternativeCostRule
-{
-public:
-    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
-    int reactToClick(MTGCardInstance * card);
-    virtual ostream& toString(ostream& out) const;
-    MTGPlayFromGraveyardRule(GameObserver* observer, int _id);
-    const string getMenuText()
-    {
-        return "cast card from graveyard";
-    }
-    virtual MTGPlayFromGraveyardRule * clone() const;
-};
-
-
 class MTGSuspendRule: public MTGAlternativeCostRule
 {
 public:
@@ -197,7 +181,7 @@ public:
    string suspendmenu;
    virtual ostream& toString(ostream& out) const;
    MTGSuspendRule(GameObserver* observer, int _id);
-    const string getMenuText();
+    const char * getMenuText();
    virtual MTGSuspendRule * clone() const;
 };

@@ -211,7 +195,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGAttackRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Attacker";
    }
@@ -229,7 +213,7 @@ public:
    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
    int reactToClick(MTGCardInstance * card);
    MTGPlaneswalkerAttackRule(GameObserver* observer, int _id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Attack Planeswalker";
    }
@@ -242,7 +226,7 @@ public:
    MTGCardInstance* attacker;
    AAPlaneswalkerAttacked(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target);
    int resolve();
-    const string getMenuText();
+    const char* getMenuText();
    AAPlaneswalkerAttacked * clone() const;
    ~AAPlaneswalkerAttacked();
 };
@@ -268,7 +252,7 @@ public:
    int reactToClick(MTGCardInstance * card);
    virtual ostream& toString(ostream& out) const;
    MTGBlockRule(GameObserver* observer, int _id);
-    const string getMenuText();
+    const char * getMenuText();
    virtual MTGBlockRule * clone() const;
    ~MTGBlockRule();
 };
@@ -402,7 +386,7 @@ public:
    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);
    int reactToClick(MTGCardInstance * card);
    int reactToClick(MTGCardInstance * card, int id);
-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Momir";
    }
@@ -422,7 +406,7 @@ public:
 	MTGCardInstance * genEquip(int id);
    MTGStoneHewerRule(GameObserver* observer, int _id, MTGAllCards * _collection);
 	int receiveEvent(WEvent * event);
-	const string getMenuText()
+	const char * getMenuText()
 	{
 		return "Stone Hewer";
 	}
@@ -435,7 +419,7 @@ class MTGHermitRule: public PermanentAbility
 public:
    MTGHermitRule(GameObserver* observer, int _id);
 	int receiveEvent(WEvent * event);
-	const string getMenuText()
+	const char * getMenuText()
 	{
 		return "Hermit";
 	}
@@ -463,7 +447,7 @@ public:

    int receiveEvent(WEvent * event);

-    const string getMenuText()
+    const char * getMenuText()
    {
        return "Deathtouch";
    }
--- a/projects/mtg/include/ObjectAnalytics.h
+++ b/projects/mtg/include/ObjectAnalytics.h
@@ -1,8 +1,6 @@
 #ifndef OBJECTANALYTICS_H
 #define OBJECTANALYTICS_H

-#include <boost/cstdint.hpp>
-
 #ifdef _DEBUG
 #define TRACK_OBJECT_USAGE
 #endif
--- a/projects/mtg/include/OptionItem.h
+++ b/projects/mtg/include/OptionItem.h
@@ -7,6 +7,7 @@
 #include <JGui.h>
 #include <vector>
 #include <string>
+#include "GameApp.h"
 #include "GameStateOptions.h"
 #include "WFilter.h"
 #include "WDataSrc.h"
--- a/projects/mtg/include/PhaseRing.h
+++ b/projects/mtg/include/PhaseRing.h
@@ -62,7 +62,7 @@ public:
    int addCombatAfter(Player* player, int after_id, bool withMain = false);
    int addPhaseAfter(GamePhase id, Player* player, int after_id);
    int removePhase(int id);
-    const string& phaseName(int id);
+    const char * phaseName(int id);
    static GamePhase phaseStrToInt(string s);
    static string phaseIntToStr(int id);

--- a/projects/mtg/include/PlayGuiObject.h
+++ b/projects/mtg/include/PlayGuiObject.h
@@ -12,6 +12,7 @@
 #define GUI_OPPONENTHAND 5

 #include <JGui.h>
+#include "Effects.h"
 #include "WEvent.h"
 #include "Pos.h"

@@ -64,6 +65,7 @@ public:
    }
    ;
    virtual ~PlayGuiObject() {};
+    vector<Effect*> effects;
 };

 #endif
--- a/projects/mtg/include/PriceList.h
+++ b/projects/mtg/include/PriceList.h
@@ -20,18 +20,16 @@ public:
    ~PriceList();
    int save();
    int getSellPrice(int cardid);
-    int getSellPrice(MTGCard* card);
    int getPurchasePrice(int cardid);
-    int getPrice(MTGCard *card);
    int getPrice(int cardId);
    int setPrice(int cardId, int price);
-    int setPrice(MTGCard *card, int price);
    int getOtherPrice(int amt);
    static float difficultyScalar(float price, int cardid = 0);
    static void updateKey()
    {
        randomKey = rand();
    }
+    ;
 };

 #endif
--- a/projects/mtg/include/SimpleMenu.h
+++ b/projects/mtg/include/SimpleMenu.h
@@ -43,7 +43,7 @@ public:
    virtual bool CheckUserInput(JButton key);
    virtual void Update(float dt);
    using JGuiController::Add;
-    virtual void Add(int id, const string &Text, string desc = "", bool forceFocus = false);
+    virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false);
    int getmCurr(){return mCurr;}
    float getWidth(){return mWidth; }
    virtual void Close();
--- a/projects/mtg/include/SimplePopup.h
+++ b/projects/mtg/include/SimplePopup.h
@@ -20,6 +20,7 @@ class SimplePopup: public JGuiController
 private:
    float mWidth, mX, mY;
    int mMaxLines;
+    int mFontId;
    DeckMetaData * mDeckInformation;
    string mTitle;
    WFont *mTextFont;
--- a/projects/mtg/include/Tasks.h
+++ b/projects/mtg/include/Tasks.h
@@ -2,15 +2,6 @@
 #define TASK_H

 #include <vector>
-#include <string>
-
-#include "Easing.h"
-
-using namespace std;
-
-class GameObserver;
-class JQuad;
-class JTexture;

 // Task type constant

@@ -79,11 +70,8 @@ class TaskList
 {
 protected:
    string fileName;
-
    float vPos;
-    OutQuadEasing vPosInEasing;
-    InQuadEasing vPosOutEasing;
-
+    float mElapsed;
    int mState;
    JQuad * mBg[9];
    JTexture * mBgTex;
@@ -107,6 +95,7 @@ public:
    {
        return mState;
    }
+    ;
    void addTask(string params, bool rand = false);
    void addTask(Task *task);
    void addRandomTask(int diff = 100);
--- a/projects/mtg/include/WFilter.h
+++ b/projects/mtg/include/WFilter.h
@@ -1,5 +1,3 @@
-#include "MTGDeck.h"
-
 #ifndef _WFILTER_H_
 #define _WFILTER_H_
 /**
--- a/projects/mtg/include/WGui.h
+++ b/projects/mtg/include/WGui.h
@@ -8,7 +8,6 @@

 class hgeDistortionMesh;
 class GameStateOptions;
-class SimpleMenu;

 /**
  @defgroup WGui Basic Gui
--- a/projects/mtg/include/WResource_Fwd.h
+++ b/projects/mtg/include/WResource_Fwd.h
@@ -1,12 +1,12 @@
 #ifndef WRESOURCE_FWD_H
 #define WRESOURCE_FWD_H

-#if (__cplusplus > 199711L)
-#include <memory>
-typedef std::shared_ptr<JQuad> JQuadPtr;
-#else
+#ifndef WP8
 #include <boost/shared_ptr.hpp>
 typedef boost::shared_ptr<JQuad> JQuadPtr;
+#else
+#include <memory>
+typedef std::shared_ptr<JQuad> JQuadPtr;
 #endif

 #endif 
--- a/projects/mtg/include/config.h
+++ b/projects/mtg/include/config.h
@@ -1,7 +1,7 @@
 #ifndef _DEBUG_H_
 #define _DEBUG_H_

-#if ((defined WIN32) || (defined WP8)) && !defined(__MINGW32__)
+#if ((defined WIN32) || (defined WP8))
 #define snprintf sprintf_s
 #endif 

--- a/projects/mtg/include/utils.h
+++ b/projects/mtg/include/utils.h
@@ -26,7 +26,6 @@
 #include <iostream>
 #include <algorithm>
 #include <stdlib.h>
-#include <list>

 #include "DebugRoutines.h"

@@ -141,20 +140,4 @@ template <class T> istream& operator>>(istream& in, T& p)
 /* replace_all ... replacement to avoid depending on boost for that */
 void ReplaceString(std::string& subject, const std::string& search, const std::string& replace);

-/*! \brief Returns true if base starts with start, otherwise false
- *
- * Compares the first strlen(start) characters of base with start and
- * returns true if both match.
- */
-bool StartsWith(const std::string& base, const char *start);
-
-/*! \brief Returns true if base starts with start, otherwise false
- * 
- * This version is slightly more efficient as strlen does not need to
- * get called. Otherwise, it behaves exactly like 
- * StartsWith(const std::string& base, const char *start)
- *
- * \see StartsWith(const std::string& base, const char *start)
- */
-bool StartsWith(const std::string& base, const std::string& start);
 #endif
--- a/projects/mtg/src/AIHints.cpp
+++ b/projects/mtg/src/AIHints.cpp
@@ -314,7 +314,7 @@ bool AIHints::canWeCombo(GameObserver* observer,MTGCardInstance * card,AIPlayerB
        int comboPartsRestriction = 0;

        if(gotCombo)
-            return gotCombo;//because more than one might be possible at any time.
+            return gotCombo;//because more then one might be possible at any time.
        if (hints[i]->hold.size())
        {
            for(unsigned int hPart = 0; hPart < hints[i]->hold.size(); hPart++)
--- a/Show More
+++ b/Show More