Linked mingw32 rcc

.travis.yml

@@ -1,68 +1,31 @@
 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
+- sudo add-apt-repository ppa:tobydox/mingw -y
+- 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 jq mingw32-x-gcc mingw32-x-qt; fi
+- sudo ln -s /opt/mingw32/bin/moc /opt/mingw32/bin/i686-w64-mingw32-moc
+- sudo ln -s /opt/mingw32/bin/rcc /opt/mingw32/bin/i686-w64-mingw32-rcc
+- 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
+- $ANDROID list sdk -a
+- echo yes | $ANDROID update sdk -a --filter 1,2,5,19 --no-ui --force > log.txt
+- sudo pip install pyjavaproperties
 script: ./travis-script.sh
+env:
+  global:
+    secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8="
 
-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
+script: "./travis-script.sh"
+after_success: ./upload-binaries.sh

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

JGE/include/JFileSystem.h

@@ -1,6 +1,10 @@
 #ifndef _J_FILE_SYSTEM_H_
 #define _J_FILE_SYSTEM_H_
 
+#ifdef QT_CONFIG
+#include <QFile>
+#endif
+
 #include "zfsystem.h"
 #include <string>
 using zip_file_system::filesystem;
@@ -18,13 +22,38 @@ using namespace std;
 /// archive file.
 ///
 //////////////////////////////////////////////////////////////////////////
+class JFile {
+    friend class JFileSystem;
+    filesystem::limited_file_info * mCurrentFileInZip;
+    izfstream mFile;
+#ifdef QT_CONFIG
+    QFile *mpqFile;
+#endif
+public:
+    JFile() : mCurrentFileInZip(0)
+#ifdef QT_CONFIG
+        , mpqFile(0)
+#endif
+    {
+    };
+    ~JFile() {
+#ifdef QT_CONFIG
+        if(mpqFile) {
+            mpqFile->close();
+            delete mpqFile;
+        }
+#endif
+        if (mFile)
+            mFile.close();
+    };
+};
+
 
 class JZipCache {
 public:
   JZipCache();
   ~JZipCache();
   map<string, filesystem::limited_file_info> dir;
-  
 };
 
 class JFileSystem {
@@ -32,23 +61,21 @@ private:
     string mSystemFSPath, mUserFSPath;
     filesystem * mSystemFS, * mUserFS;
 	static JFileSystem* mInstance;
-    izfstream mFile;
 
 	map<string,JZipCache *>mZipCache;
     unsigned int mZipCachedElementsCount;
 	string mZipFileName;
-    int mFileSize;
 	char *mPassword;
 	bool mZipAvailable;
   	void preloadZip(const string& filename);
 	izfstream mZipFile;
-    filesystem::limited_file_info * mCurrentFileInZip;
 
     std::vector<std::string>& scanRealFolder(const std::string& folderName, std::vector<std::string>& results);
+    bool openForRead(izfstream & File, const string & FilePath);
+    int GetFileSize(izfstream & file);
 
 public:
 
-
 	//////////////////////////////////////////////////////////////////////////
 	/// Attach ZIP archive to the file system.
 	///
@@ -83,7 +110,7 @@ public:
 	/// Open file for reading.
 	///
 	//////////////////////////////////////////////////////////////////////////
-	bool OpenFile(const string &filename);
+    JFile* OpenFile(const string &filename);
 
     //Fills the vector results with a list of children of the given folder
     std::vector<std::string>& scanfolder(const std::string& folderName, std::vector<std::string>& results);
@@ -97,20 +124,19 @@ public:
 	/// @return Number of bytes read.
 	///
 	//////////////////////////////////////////////////////////////////////////
-	int ReadFile(void *buffer, int size);
+	int ReadFile(JFile*, void *buffer, int size);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get size of file.
 	///
 	//////////////////////////////////////////////////////////////////////////
-	int GetFileSize();
-    int GetFileSize(izfstream & file);
+	int GetFileSize(JFile*);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Close file.
 	///
 	//////////////////////////////////////////////////////////////////////////
-	void CloseFile();
+    void CloseFile(JFile*);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Set root for all the following file operations
@@ -124,11 +150,10 @@ public:
 	void SetUSerRoot(const string& resourceRoot);
     string GetUserRoot() { return mUserFSPath; };
 
-    bool openForRead(izfstream & File, const string & FilePath);
     bool readIntoString(const string & FilePath, string & target);
+    bool ReadFileLine(JFile*, string&);
     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);

JGE/include/JLBFont.h

@@ -178,7 +178,6 @@ private:
 	float       mSpacing;
 
 	PIXEL_TYPE		mColor;
-	int			mBlend;
 
 	int			mBase;
 

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
-

JGE/include/qt/corewrapper.h

@@ -137,14 +137,14 @@ private slots:
 
 private:
     int lastPosx(){
-#if QT_VERSION >= 0x050100
+#if QT_VERSION >= 0x050000
         return m_lastPos.x()*devicePixelRatio();
 #else
         return m_lastPos.x();
 #endif
     }
     int lastPosy(){
-#if QT_VERSION >= 0x050100
+#if QT_VERSION >= 0x050000
         return m_lastPos.y()*devicePixelRatio();
 #else
         return m_lastPos.y();

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

JGE/src/JAnimator.cpp

@@ -44,11 +44,12 @@ bool JAnimator::Load(const char* scriptFile)
 	JFileSystem *fileSystem = JFileSystem::GetInstance();
 	if (fileSystem == NULL) return false;
 
-	if (!fileSystem->OpenFile(scriptFile)) return false;
+    JFile* jFile = fileSystem->OpenFile(scriptFile);
+	if (!jFile) return false;
 
-	int size = fileSystem->GetFileSize();
+	int size = fileSystem->GetFileSize(jFile);
 	char *xmlBuffer = new char[size];
-	fileSystem->ReadFile(xmlBuffer, size);
+	fileSystem->ReadFile(jFile, xmlBuffer, size);
 
 	TiXmlDocument doc;
 	doc.Parse(xmlBuffer);
@@ -173,7 +174,7 @@ bool JAnimator::Load(const char* scriptFile)
 
 	}
 
-	fileSystem->CloseFile();
+	fileSystem->CloseFile(jFile);
 	delete[] xmlBuffer;
 
 	return true;

JGE/src/JAudio.cpp

@@ -49,7 +49,8 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 {
 
 	JFileSystem* fileSystem = JFileSystem::GetInstance();
-	if (!fileSystem->OpenFile(fileName))
+    JFile* jFile = fileSystem->OpenFile(fileName);
+    if (!jFile)
 		return 0;
 
 	memset(p_wav, 0, sizeof(WAVDATA));
@@ -57,14 +58,14 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 	char head[256];
 	memset(head, 0, 256);
 	//sceIoRead(fd, head, 20);
-	fileSystem->ReadFile(head, 20);
+    fileSystem->ReadFile(jFile, head, 20);
 	char string[8];
 	memset(string, 0, 8);
 	memcpy(string, head, 4);
 	if (0!=strcmp(string, "RIFF"))
 	{
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 		return 0;
 	}
 	memset(string, 0, 8);
@@ -72,7 +73,7 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 	if (0!=strcmp(string, "WAVE"))
 	{
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 		return 0;
 	}
 	memset(string, 0, 8);
@@ -80,42 +81,42 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 	if (0!=strcmp(string, "fmt"))
 	{
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 		return 0;
 	}
 	int fmtSize = 0;
 	memcpy(&fmtSize, head+16, 4);
 	//sceIoRead(fd, head+20, fmtSize);
-	fileSystem->ReadFile(head+20,fmtSize );
+    fileSystem->ReadFile(jFile, head+20,fmtSize );
 	p_wav->headSize = 20+fmtSize;
 	while (1)
 	{
 		//sceIoRead(fd, head+p_wav->headSize, 4);
-		fileSystem->ReadFile(head+p_wav->headSize, 4);
+        fileSystem->ReadFile(jFile, head+p_wav->headSize, 4);
 		memset(string, 0, 8);
 		memcpy(string, head+p_wav->headSize, 4);
 		p_wav->headSize += 4;
 		if (0!=strcmp(string, "data"))
 		{
 			//sceIoRead(fd, head+p_wav->headSize, 4);
-			fileSystem->ReadFile(head+p_wav->headSize, 4);
+            fileSystem->ReadFile(jFile, head+p_wav->headSize, 4);
 			memcpy(&fmtSize, head+p_wav->headSize, 4);
 			p_wav->headSize += 4;
 			//sceIoRead(fd, head+p_wav->headSize, fmtSize);
-			fileSystem->ReadFile(head+p_wav->headSize, fmtSize);
+            fileSystem->ReadFile(jFile, head+p_wav->headSize, fmtSize);
 			p_wav->headSize += fmtSize;
 		}
 		else
 		{
 			//sceIoRead(fd, head+p_wav->headSize, 4);
-			fileSystem->ReadFile(head+p_wav->headSize, 4);
+            fileSystem->ReadFile(jFile, head+p_wav->headSize, 4);
 			p_wav->headSize += 4;
 			break;
 		}
 		if (p_wav->headSize>191)
 		{
 			//sceIoClose(fd);
-			fileSystem->CloseFile();
+            fileSystem->CloseFile(jFile);
 			return 0;
 		}
 	}
@@ -126,7 +127,7 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 	if (p_wav->channelCount!=1 && p_wav->channelCount!=2)
 	{
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 		return 0;
 	}
 	memcpy(&p_wav->samplePerSecond, head+24, 4);
@@ -136,7 +137,7 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 	if (p_wav->bytePerSample!=1 && p_wav->bytePerSample!=2)
 	{
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 		return 0;
 	}
 	p_wav->nSample = 44100 / p_wav->samplePerSecond;
@@ -147,17 +148,17 @@ char loadWaveData(WAVDATA* p_wav, char* fileName, char memLoad)  // WAVE加载,
 		if (p_wav->soundSize>4096000)
 		{
 			//sceIoClose(fd);
-			fileSystem->CloseFile();
+            fileSystem->CloseFile(jFile);
 			return 0;
 		}
 		p_wav->buffer = (char*)malloc(p_wav->soundSize);
 		memset(p_wav->buffer, 0, p_wav->soundSize);
 		//sceIoRead(fd, p_wav->buffer, p_wav->soundSize);
-		fileSystem->ReadFile(p_wav->buffer, p_wav->soundSize);
+        fileSystem->ReadFile(jFile, p_wav->buffer, p_wav->soundSize);
 		p_wav->bytePosition = 0;
 		p_wav->fd = -1;
 		//sceIoClose(fd);
-		fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 	}
 	else
 	{

JGE/src/JFileSystem.cpp

@@ -107,7 +107,6 @@ JFileSystem* JFileSystem::GetInstance()
 // Tries to set the system and user paths.
 // On some OSes, the parameters get overriden by hardcoded values
 JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
-
 {
     string systemPath = _systemPath;
     string userPath = _userPath;
@@ -131,8 +130,8 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     dir.mkdir(USERDIR);
     dir.cd(USERDIR);
 
-    userPath = QDir::toNativeSeparators(dir.absolutePath()).toStdString();
     systemPath = QDir::toNativeSeparators(sysDir.absolutePath()).toStdString();
+    userPath = QDir::toNativeSeparators(dir.absolutePath()).toStdString();
 
     DebugTrace("User path " << userPath);
     DebugTrace("System path " << systemPath);
@@ -192,9 +191,6 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     mZipAvailable = false;
     mZipCachedElementsCount = 0;
     mPassword = NULL;
-    mFileSize = 0;
-    mCurrentFileInZip = NULL;
-
 };
 
 void JFileSystem::Destroy()
@@ -208,14 +204,26 @@ void JFileSystem::Destroy()
 
 bool JFileSystem::DirExists(const string& strDirname)
 { 
-    return (mSystemFS && mSystemFS->DirExists(strDirname)) || mUserFS->DirExists(strDirname);
+    return (
+            (mSystemFS && mSystemFS->DirExists(strDirname))
+            || mUserFS->DirExists(strDirname)
+#ifdef QT_CONFIG
+            || QDir(QString(":/") + strDirname.c_str()).exists()
+#endif
+            );
 }
 
 bool JFileSystem::FileExists(const string& strFilename)
 { 
     if (strFilename.length() < 1 ) return false;
     
-    return (mSystemFS && mSystemFS->FileExists(strFilename)) || mUserFS->FileExists(strFilename);
+    return (
+            (mSystemFS && mSystemFS->FileExists(strFilename))
+            || mUserFS->FileExists(strFilename)
+#ifdef QT_CONFIG
+            || QFile(QString(":/") + strFilename.c_str()).exists()
+#endif
+            );
 }
 
 bool JFileSystem::MakeDir(const string & dir)
@@ -275,7 +283,6 @@ bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL
     }
     mZipAvailable = true;
     return true;
-
 }
 
 
@@ -285,7 +292,6 @@ void JFileSystem::DetachZipFile()
     {
         mZipFile.close();
     }
-    mCurrentFileInZip = NULL;
     mZipAvailable = false;
 }
 
@@ -307,28 +313,58 @@ bool JFileSystem::openForRead(izfstream & File, const string & FilePath) {
 
 bool JFileSystem::readIntoString(const string & FilePath, string & target)
 {
-    izfstream file;
-    if (!openForRead(file, FilePath))
-        return false;
-
-    int fileSize = GetFileSize(file);
-
+    bool result = false;
+    
+    // Trying first with a izfstream
+    do {
+        izfstream file;
+        if (!openForRead(file, FilePath))
+            break;
+        
+        int fileSize = GetFileSize(file);
+        
 #ifndef __MINGW32__
-    try {
+        try {
 #endif
-        target.resize((std::string::size_type) fileSize);
+            target.resize((std::string::size_type) fileSize);
 #ifndef __MINGW32__
-    } catch (bad_alloc&) {
-        return false;
-    }
+        } catch (bad_alloc&) {
+            break;
+        }
 #endif
-
-
-    if (fileSize)
-        file.read(&target[0], fileSize);
-
-    file.close();
-    return true;
+        if (fileSize)
+            file.read(&target[0], fileSize);
+        
+        file.close();
+        result = true;
+    } while (0);
+#ifdef QT_CONFIG
+    // Now we try with qrc if we haven't finc anything yet
+    if (!result) do {
+        string path = string(":/") + FilePath.c_str();
+        QFile qfile(path.c_str());
+        qfile.open(QIODevice::ReadOnly);
+        if(!qfile.isReadable())
+            break;
+        int fileSize = qfile.size();
+#ifndef __MINGW32__
+        try {
+#endif
+            target.resize((std::string::size_type) fileSize);
+#ifndef __MINGW32__
+        } catch (bad_alloc&) {
+            break;
+        }
+#endif
+        if (fileSize)
+            qfile.read(&target[0], fileSize);
+        
+        qfile.close();
+        result = true;
+    } while (0);
+#endif //QT_CONFIG
+    
+    return result;
 }
 
 bool JFileSystem::openForWrite(ofstream & File, const string & FilePath, ios_base::openmode mode)
@@ -374,57 +410,72 @@ bool JFileSystem::openForWrite(ofstream & File, const string & FilePath, ios_bas
     return false;
 }
 
-bool JFileSystem::OpenFile(const string &filename)
+JFile* JFileSystem::OpenFile(const string &filename)
 {
-    mCurrentFileInZip = NULL;
+    bool result;
+    JFile* jFile = new JFile();
+    jFile->mCurrentFileInZip = NULL;
 
-    if (!mZipAvailable || !mZipFile)
-        return openForRead(mFile, filename);
+    do {
+        if (!mZipAvailable || !mZipFile) {
+            result = openForRead(jFile->mFile, filename);
+            if(!result) {
+#ifdef QT_CONFIG
+                string path = string(":/") + filename.c_str();
+                jFile->mpqFile = new QFile(path.c_str());
+                jFile->mpqFile->open(QIODevice::ReadOnly);
+                result = jFile->mpqFile->isReadable();
+#endif
+            }
+            break;
+        }
 
-    preloadZip(mZipFileName);
-    map<string,JZipCache *>::iterator it = mZipCache.find(mZipFileName);
-    if (it == mZipCache.end())
-    {
-        //DetachZipFile();
-        //return OpenFile(filename); 
-        return openForRead(mFile, filename);
-    }
-    JZipCache * zc = it->second;
-    map<string,  filesystem::limited_file_info>::iterator it2 = zc->dir.find(filename);
-    if (it2 == zc->dir.end())
-    {
-        /*DetachZipFile();
+        preloadZip(mZipFileName);
+        map<string,JZipCache *>::iterator it = mZipCache.find(mZipFileName);
+        if (it == mZipCache.end())
+        {
+            //DetachZipFile();
+            //return OpenFile(filename);
+            result = openForRead(jFile->mFile, filename);
+            break;
+        }
+        JZipCache * zc = it->second;
+        map<string,  filesystem::limited_file_info>::iterator it2 = zc->dir.find(filename);
+        if (it2 == zc->dir.end())
+        {
+            /*DetachZipFile();
         return OpenFile(filename); */
-        return openForRead(mFile, filename);
+            result = openForRead(jFile->mFile, filename);
+            break;
+        }
+
+        jFile->mCurrentFileInZip = &(it2->second);
+        result = true;
+    } while(0);
+
+    if(result)
+        return jFile;
+    else {
+        delete jFile;
+        return 0;
     }
-
-    mCurrentFileInZip = &(it2->second);
-    mFileSize = it2->second.m_Size;
-    return true;
-
 }
 
 
-void JFileSystem::CloseFile()
+void JFileSystem::CloseFile(JFile* jFile)
 {
-    if (mZipAvailable && mZipFile)
-    {
-        mCurrentFileInZip = NULL;
-    }
-
-    if (mFile)
-        mFile.close();
+    delete jFile;
 }
 
 //returns 0 if less than "size" bits were read
-int JFileSystem::ReadFile(void *buffer, int size)
+int JFileSystem::ReadFile(JFile* jFile, void *buffer, int size)
 {
-    if (mCurrentFileInZip)
+    if (jFile->mCurrentFileInZip)
     {
         assert(mZipFile);
-        if((size_t)size > mCurrentFileInZip->m_Size) //only support "store" method for zip inside zips
+        if((size_t)size > jFile->mCurrentFileInZip->m_Size) //only support "store" method for zip inside zips
             return 0;
-        std::streamoff offset = filesystem::SkipLFHdr(mZipFile, mCurrentFileInZip->m_Offset);
+        std::streamoff offset = filesystem::SkipLFHdr(mZipFile, jFile->mCurrentFileInZip->m_Offset);
         if (!mZipFile.seekg(offset))
             return 0;
         mZipFile.read((char *) buffer, size);
@@ -432,16 +483,43 @@ int JFileSystem::ReadFile(void *buffer, int size)
         return size;
     }
 
-    if (!mFile)
+#ifdef QT_CONFIG
+    if(jFile->mpqFile) {
+        return jFile->mpqFile->read((char*)buffer, size);
+    }
+#endif
+    
+    if (!jFile->mFile)
         return 0;
 
-    assert(!mFile.Zipped() || (size_t)size <= mFile.getUncompSize());
-	mFile.read((char *)buffer, size);
-    if (mFile.eof())
+    assert(!jFile->mFile.Zipped() || (size_t)size <= jFile->mFile.getUncompSize());
+	jFile->mFile.read((char *)buffer, size);
+    if (jFile->mFile.eof())
         return 0;
     return size;
 }
 
+bool JFileSystem::ReadFileLine(JFile* jFile, string& s)
+{
+    if(!jFile) return false;
+#ifdef QT_CONFIG
+    if(jFile->mpqFile) {
+        QString qs = jFile->mpqFile->readLine();
+        if(qs.isEmpty())
+            return false;
+        else {
+            s = qs.toStdString();
+            return true;
+        }
+    }
+#endif
+    if(!jFile->mFile)
+        return 0;
+    
+    assert(!jFile->mFile.Zipped());
+    return std::getline(jFile->mFile, s);
+}
+
 std::vector<std::string>& JFileSystem::scanRealFolder(const std::string& folderName, std::vector<std::string>& results)
 {
     DIR *dip = opendir(folderName.c_str());
@@ -529,8 +607,17 @@ std::vector<std::string>& JFileSystem::scanfolder(const std::string& _folderName
                 seen[systemReal[i]] = true;
         }
     }
+#ifdef QT_CONFIG
+    string path = string(":/") + folderName;
+    QDir dir(path.c_str());
+    QStringList list = dir.entryList();
+    for(int i = 0; i < list.size(); i++)
+    {
+        seen[list.at(i).toStdString()] = true;
+    }
+#endif
 
-    for(map<string,bool>::iterator it = seen.begin(); it != seen.end(); ++it) 
+    for(map<string,bool>::iterator it = seen.begin(); it != seen.end(); ++it)
     {
       results.push_back(it->first);
     }
@@ -544,12 +631,18 @@ std::vector<std::string> JFileSystem::scanfolder(const std::string& folderName)
     return scanfolder(folderName, result);
 }
 
-int JFileSystem::GetFileSize()
+int JFileSystem::GetFileSize(JFile* jFile)
 {
-    if (mCurrentFileInZip)
-        return mFileSize;
+    if (jFile->mCurrentFileInZip)
+        return jFile->mCurrentFileInZip->m_Size;
 
-    return GetFileSize(mFile);
+#ifdef QT_CONFIG
+    if(jFile->mpqFile) {
+        return jFile->mpqFile->size();
+    }
+#endif
+    
+    return GetFileSize(jFile->mFile);
 }
 
 bool JFileSystem::Rename(string _from, string _to)
@@ -557,13 +650,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)

JGE/src/JGBKFont.cpp

@@ -116,25 +116,26 @@ bool JGBKFont::Init(const char* engFileName, const char* chnFileName, int fontsi
 	int size;
 
 	JFileSystem *fileSys = JFileSystem::GetInstance();
-	if (!fileSys->OpenFile(engFileName))
+    JFile* jFile = fileSys->OpenFile(engFileName);
+    if (!jFile)
 		return false;
 
-	size = fileSys->GetFileSize();
+    size = fileSys->GetFileSize(jFile);
 	mEngFont = new BYTE[size];
 
-	fileSys->ReadFile(mEngFont, size);
-	fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mEngFont, size);
+    fileSys->CloseFile(jFile);
 
-
-	if (!fileSys->OpenFile(chnFileName))
+    jFile = fileSys->OpenFile(chnFileName);
+    if (!jFile)
 		return false;
 
-	size = fileSys->GetFileSize();
+    size = fileSys->GetFileSize(jFile);
 
 	mChnFont = new BYTE[size];
 
-	fileSys->ReadFile(mChnFont, size);
-	fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mChnFont, size);
+    fileSys->CloseFile(jFile);
 
 	return true;
 }

JGE/src/JGfx.cpp

@@ -892,9 +892,10 @@ static void PNGCustomReadDataFn(png_structp png_ptr, png_bytep data, png_size_t
 {
    png_size_t check;
 
-   JFileSystem *fileSystem = (JFileSystem*)png_ptr->io_ptr;
+   JFile* jFile = (JFile*)png_ptr->io_ptr;
+   JFileSystem* fileSystem = JFileSystem::GetInstance();
 
-   check = fileSystem->ReadFile(data, length);
+   check = fileSystem->ReadFile(jFile, data, length);
 
    if (check != length)
    {
@@ -1038,23 +1039,24 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
   bits32 = NULL;
 
         JFileSystem* fileSystem = JFileSystem::GetInstance();
-        if (!fileSystem->OpenFile(filename))
+        JFile* jFile = fileSystem->OpenFile(filename);
+        if (!jFile)
         {
                 return;
         }
 
-        rawsize = fileSystem->GetFileSize();
+        rawsize = fileSystem->GetFileSize(jFile);
 
         rawdata = new u8[rawsize];
 
         if (!rawdata)
         {
-                fileSystem->CloseFile();
+                fileSystem->CloseFile(jFile);
                 return;
         }
 
-        fileSystem->ReadFile(rawdata, rawsize);
-        fileSystem->CloseFile();
+        fileSystem->ReadFile(jFile, rawdata, rawsize);
+        fileSystem->CloseFile(jFile);
 
 
         cinfo.err = jpeg_std_error(&jerr);
@@ -1362,24 +1364,25 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode,
   u32* line;
 
   JFileSystem* fileSystem = JFileSystem::GetInstance();
-  if (!fileSystem->OpenFile(filename)) return JGE_ERR_CANT_OPEN_FILE;
+  JFile* jFile = fileSystem->OpenFile(filename);
+  if (!jFile) return JGE_ERR_CANT_OPEN_FILE;
 
   //JLOG("PNG opened - creating read struct");
   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
   if (png_ptr == NULL) {
-    fileSystem->CloseFile();
+    fileSystem->CloseFile(jFile);
     return JGE_ERR_PNG;
   }
   //JLOG("Setting error callback func");
   png_set_error_fn(png_ptr, (png_voidp) NULL, (png_error_ptr) NULL, PNGCustomWarningFn);
   info_ptr = png_create_info_struct(png_ptr);
   if (info_ptr == NULL) {
-    fileSystem->CloseFile();
+    fileSystem->CloseFile(jFile);
     png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
     return JGE_ERR_PNG;
   }
   png_init_io(png_ptr, NULL);
-  png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn);
+  png_set_read_fn(png_ptr, (png_voidp)jFile, PNGCustomReadDataFn);
 
   png_set_sig_bytes(png_ptr, sig_read);
   png_read_info(png_ptr, info_ptr);
@@ -1392,7 +1395,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode,
   png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
   line = (u32*) malloc(width * 4);
   if (!line) {
-    fileSystem->CloseFile();
+    fileSystem->CloseFile(jFile);
     png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
     return JGE_ERR_MALLOC_FAILED;
   }
@@ -1430,7 +1433,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode,
         std::ostringstream stream;
         stream << "Alloc failed for: Tex Width: " << texWidth << " Tex Height: " << kVerticalBlockSize << ", total bytes: " << texWidth * kVerticalBlockSize * sizeof(PIXEL_TYPE);
         JLOG(stream.str().c_str());
-        fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
         png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
         return JGE_ERR_MALLOC_FAILED;
       }
@@ -1505,7 +1508,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char* filename, int mode,
   png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
 
   //JLOG("Closing PNG");
-  fileSystem->CloseFile();
+  fileSystem->CloseFile(jFile);
 
   if (done)
   {
@@ -1725,9 +1728,9 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
 
 int image_gif_read(GifFileType * ft, GifByteType * buf, int size)
 {
-
-	JFileSystem *fileSys = (JFileSystem *)ft->UserData;
-	if (fileSys->ReadFile(buf, size))
+    JFileSystem *fileSys = JFileSystem::GetInstance();
+    JFile* jFile = (JFile*)ft->UserData;
+    if (fileSys->ReadFile(jFile, buf, size))
 		return size;
 	else
 		return 0;
@@ -1740,15 +1743,17 @@ void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode
 
 
 	JFileSystem *fileSys = JFileSystem::GetInstance();
-	if (!fileSys->OpenFile(filename))
+    JFile* jFile = fileSys->OpenFile(filename);
+
+    if (!jFile)
 		return;
 
 	DWORD bkcol;
-	int result = image_readgif(fileSys, textureInfo, &bkcol, image_gif_read, mode);
+    int result = image_readgif(jFile, textureInfo, &bkcol, image_gif_read, mode);
 
 	if(result!=0)
 		textureInfo.mBits=NULL;
-	fileSys->CloseFile();
+    fileSys->CloseFile(jFile);
 
 	return ;
 }
@@ -2262,4 +2267,4 @@ void JRenderer::FillRoundRect(float x, float y, float w, float h, float radius,
 void JRenderer::SetImageFilter(JImageFilter* imageFilter)
 {
 	mImageFilter = imageFilter;
-}
+}

JGE/src/JLBFont.cpp

@@ -42,10 +42,11 @@ JLBFont::JLBFont(const char *fontname, int lineheight, bool useVideoRAM)
 
     //FILE *file;
     JFileSystem *fileSys = JFileSystem::GetInstance();
-    if (!fileSys->OpenFile(filename)) return;
+    JFile* jFile = fileSys->OpenFile(filename);
+    if (!jFile) return;
 
-    fileSys->ReadFile((u8 *)buffer, 2048);
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, (u8 *)buffer, 2048);
+    fileSys->CloseFile(jFile);
 
     sprintf(filename, "%s.png", fontname);
     mTexture = mRenderer->LoadTexture(filename, useVideoRAM);

JGE/src/JMD2Model.cpp

@@ -96,7 +96,8 @@ bool JMD2Model::Load(char *filename, char *textureName)
 	// open the model file
 
 	JFileSystem* fileSystem = JFileSystem::GetInstance();
-	if (!fileSystem->OpenFile(filename))
+    JFile* jFile = fileSystem->OpenFile(filename);
+	if (!jFile)
 		return false;
 	//filePtr = fopen(filename, "rb");
 	//if (filePtr == NULL)
@@ -107,13 +108,13 @@ bool JMD2Model::Load(char *filename, char *textureName)
     //fileLen = ftell(filePtr);
     //fseek(filePtr, 0, SEEK_SET);
 
-	fileLen = fileSystem->GetFileSize();
+	fileLen = fileSystem->GetFileSize(jFile);
 	
     // read entire file into buffer
     buffer = (char*)malloc(fileLen + 1);
     //fread(buffer, sizeof(char), fileLen, filePtr);
-	fileSystem->ReadFile(buffer, fileLen);
-	fileSystem->CloseFile();
+	fileSystem->ReadFile(jFile, buffer, fileLen);
+	fileSystem->CloseFile(jFile);
 
 	// extract model file header from buffer
     modelHeader = (modelHeader_t*)buffer;

JGE/src/JOBJModel.cpp

@@ -47,14 +47,15 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 {
 
 	JFileSystem* fileSys = JFileSystem::GetInstance();
-	if (!fileSys->OpenFile(modelName))
+    JFile* jFile = fileSys->OpenFile(modelName);
+	if (!jFile)
 		return false;
 
-	int size = fileSys->GetFileSize();
+	int size = fileSys->GetFileSize(jFile);
 	char *buffer = new char[size];
 
-	fileSys->ReadFile(buffer, size);
-	fileSys->CloseFile();
+	fileSys->ReadFile(jFile, buffer, size);
+	fileSys->CloseFile(jFile);
 
 	Vector3D vert;
 

JGE/src/JParticleEffect.cpp

@@ -55,11 +55,12 @@ bool JParticleEffect::Load(const char* filename)
 	JFileSystem *fileSystem = JFileSystem::GetInstance();
 	if (fileSystem == NULL) return false;
 
-	if (!fileSystem->OpenFile(filename)) return false;
+    JFile* jFile = fileSystem->OpenFile(filename);
+	if (!jFile) return false;
 
-	int size = fileSystem->GetFileSize();
+	int size = fileSystem->GetFileSize(jFile);
 	char *xmlBuffer = new char[size];
-	fileSystem->ReadFile(xmlBuffer, size);
+	fileSystem->ReadFile(jFile, xmlBuffer, size);
 
 	TiXmlDocument doc;
 	
@@ -296,7 +297,7 @@ bool JParticleEffect::Load(const char* filename)
 		}
 	}
 
-	fileSystem->CloseFile();
+	fileSystem->CloseFile(jFile);
 	delete[] xmlBuffer;
 
 	return true;

JGE/src/JResourceManager.cpp

@@ -93,13 +93,13 @@ bool JResourceManager::LoadResource(const string& resourceName)
 	JFileSystem *fileSystem = JFileSystem::GetInstance();
 	if (fileSystem == NULL) return false;
 
+    JFile* jFile = fileSystem->OpenFile(path.c_str());
 
+	if (!jFile) return false;
 
-	if (!fileSystem->OpenFile(path.c_str())) return false;
-
-	int size = fileSystem->GetFileSize();
+	int size = fileSystem->GetFileSize(jFile);
 	char *xmlBuffer = new char[size];
-	fileSystem->ReadFile(xmlBuffer, size);
+	fileSystem->ReadFile(jFile, xmlBuffer, size);
 
 	TiXmlDocument doc;
 	doc.Parse(xmlBuffer);
@@ -179,7 +179,7 @@ bool JResourceManager::LoadResource(const string& resourceName)
 
 	}
 
-	fileSystem->CloseFile();
+	fileSystem->CloseFile(jFile);
 	delete[] xmlBuffer;
 //	JGERelease();
 

JGE/src/JSpline.cpp

@@ -41,11 +41,12 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 	JFileSystem *fileSystem = JFileSystem::GetInstance();
 
 	if (fileSystem == NULL) return false;
-	if (!fileSystem->OpenFile(filename)) return false;
+    JFile* jFile = fileSystem->OpenFile(filename);
+	if (!jFile) return false;
 
-	int size = fileSystem->GetFileSize();
+	int size = fileSystem->GetFileSize(jFile);
 	char *xmlBuffer = new char[size];
-	fileSystem->ReadFile(xmlBuffer, size);
+	fileSystem->ReadFile(jFile, xmlBuffer, size);
 
 	TiXmlDocument doc;
 	doc.Parse(xmlBuffer);
@@ -76,7 +77,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 		
 	}
 
-	fileSystem->CloseFile();
+	fileSystem->CloseFile(jFile);
 	delete[] xmlBuffer;
 
 	return true;

JGE/src/JTTFont.cpp

@@ -199,15 +199,16 @@ bool JTTFont::Load(const char *filename, int size, int mode)
 	
 	if (FT_Init_FreeType( &mLibrary ) == 0)
 	{
-		JFileSystem* fileSystem = JFileSystem::GetInstance();
-		if (fileSystem->OpenFile(filename))
+        JFileSystem* fileSystem = JFileSystem::GetInstance();
+        JFile* jFile = fileSystem->OpenFile(filename);
+        if (jFile)
 		{
-			mFontBitsSize = fileSystem->GetFileSize();
+            mFontBitsSize = fileSystem->GetFileSize(jFile);
 
 			mFontBits = (FT_Byte*)malloc(mFontBitsSize);
 			
-			fileSystem->ReadFile(mFontBits, mFontBitsSize);
-			fileSystem->CloseFile();
+            fileSystem->ReadFile(jFile, mFontBits, mFontBitsSize);
+            fileSystem->CloseFile(jFile);
 
 			if (FT_New_Memory_Face(mLibrary, mFontBits, mFontBitsSize, 0, &mFace ) == 0)
 			{

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 && string(argv[1]) == "testsuite")
+    {
+        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");
 

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
 

JGE/src/hge/hgefont.cpp

@@ -57,19 +57,20 @@ hgeFont::hgeFont(const char *szFont, bool bMipmap __attribute__((unused)))
 	// Load font description
 
 	JFileSystem* fileSys = JFileSystem::GetInstance();
-	if (!fileSys->OpenFile(szFont)) return;
+    JFile* jFile = fileSys->OpenFile(szFont);
+	if (!jFile) return;
 
 	//data=hge->Resource_Load(szFont, &size);
 	//if(!data) return;
-	size = fileSys->GetFileSize();
+	size = fileSys->GetFileSize(jFile);
 
 	desc = new char[size+1];
 	//memcpy(desc,data,size);
-	fileSys->ReadFile(desc, size);
+	fileSys->ReadFile(jFile, desc, size);
 	desc[size]=0;
 
 	//hge->Resource_Free(data);
-	fileSys->CloseFile();
+	fileSys->CloseFile(jFile);
 
 	pdesc=_get_line(desc,linebuf);
 	if(strcmp(linebuf, FNTHEADERTAG))

JGE/src/hge/hgeparticle.cpp

@@ -50,46 +50,41 @@ float Random_Float(float min, float max)
 
 hgeParticleSystem::hgeParticleSystem(const char *filename, JQuad *sprite)
 {
-  //void *psi;
-  //hgeParticleSystemInfo psi;
-
-  JFileSystem* fileSys = JFileSystem::GetInstance();
-  //hge=hgeCreate(HGE_VERSION);
-
-  //psi=hge->Resource_Load(filename);
-  if (!fileSys->OpenFile(filename)) return;
-
-  //if(!psi) return;
-
-  //memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
-  //hge->Resource_Free(psi);
-
-  // Skip reading the pointer as it may be larger than 4 bytes in the structure
-  void *dummyPointer;
-  fileSys->ReadFile(&dummyPointer, 4);
-  // we're actually trying to read more than the file size now, but it's no problem.
-  // Note that this fix is only to avoid the largest problems, filling a structure
-  // by directly reading a file, is really a bad idea ...
-  fileSys->ReadFile(&(info.nEmission), sizeof(hgeParticleSystemInfo) - 4);
-  fileSys->CloseFile();
-
-  info.sprite=sprite;
-  //  	info.fGravityMin *= 100;
-  //  	info.fGravityMax *= 100;
-  // 	info.fSpeedMin *= 100;
-  // 	info.fSpeedMax *= 100;
-
-  vecLocation.x=vecPrevLocation.x=0.0f;
-  vecLocation.y=vecPrevLocation.y=0.0f;
-  fTx=fTy=0;
-
-  fEmissionResidue=0.0f;
-  nParticlesAlive=0;
-  fAge=-2.0;
-  mTimer = 0.0f;
-
-  rectBoundingBox.Clear();
-  bUpdateBoundingBox=false;
+    JFileSystem* fileSys = JFileSystem::GetInstance();
+    JFile* jFile = fileSys->OpenFile(filename);
+    if (!jFile) return;
+    
+    //if(!psi) return;
+    
+    //memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
+    //hge->Resource_Free(psi);
+    
+    // Skip reading the pointer as it may be larger than 4 bytes in the structure
+    void *dummyPointer;
+    fileSys->ReadFile(jFile, &dummyPointer, 4);
+    // we're actually trying to read more than the file size now, but it's no problem.
+    // Note that this fix is only to avoid the largest problems, filling a structure
+    // by directly reading a file, is really a bad idea ...
+    fileSys->ReadFile(jFile, &(info.nEmission), sizeof(hgeParticleSystemInfo) - 4);
+    fileSys->CloseFile(jFile);
+    
+    info.sprite=sprite;
+    //  	info.fGravityMin *= 100;
+    //  	info.fGravityMax *= 100;
+    // 	info.fSpeedMin *= 100;
+    // 	info.fSpeedMax *= 100;
+    
+    vecLocation.x=vecPrevLocation.x=0.0f;
+    vecLocation.y=vecPrevLocation.y=0.0f;
+    fTx=fTy=0;
+    
+    fEmissionResidue=0.0f;
+    nParticlesAlive=0;
+    fAge=-2.0;
+    mTimer = 0.0f;
+    
+    rectBoundingBox.Clear();
+    bUpdateBoundingBox=false;
 }
 
 hgeParticleSystem::hgeParticleSystem(hgeParticleSystemInfo *psi)

JGE/src/pc/JGfx.cpp

@@ -1683,20 +1683,21 @@ void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode
     int	rawsize, i;
 
     JFileSystem* fileSystem = JFileSystem::GetInstance();
-    if (!fileSystem->OpenFile(filename)) return;
+    JFile* jFile = fileSystem->OpenFile(filename);
+    if (!jFile) return;
 
-    rawsize = fileSystem->GetFileSize();
+    rawsize = fileSystem->GetFileSize(jFile);
 
     rawdata = new BYTE[rawsize];
 
     if (!rawdata)
     {
-        fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
         return;
     }
 
-    fileSystem->ReadFile(rawdata, rawsize);
-    fileSystem->CloseFile();
+    fileSystem->ReadFile(jFile, rawdata, rawsize);
+    fileSystem->CloseFile(jFile);
 
     // Initialize libJpeg Object
     cinfo.err = jpeg_std_error(&jerr);
@@ -1804,9 +1805,10 @@ static void PNGCustomReadDataFn(png_structp png_ptr, png_bytep data, png_size_t
 {
     png_size_t check;
 
-    JFileSystem *fileSystem = (JFileSystem*)png_ptr->io_ptr;
+    JFileSystem* fileSystem = JFileSystem::GetInstance();
+    JFile *jFile = (JFile*)png_ptr->io_ptr;
 
-    check = fileSystem->ReadFile(data, length);
+    check = fileSystem->ReadFile(jFile, data, length);
 
     if (check != length)
     {
@@ -1869,13 +1871,14 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     DWORD* line;
 
     JFileSystem* fileSystem = JFileSystem::GetInstance();
-    if (!fileSystem->OpenFile(filename))
+    JFile* jFile = fileSystem->OpenFile(filename);
+    if (!jFile)
         return JGE_ERR_CANT_OPEN_FILE;
 
     png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
     if (png_ptr == NULL)
     {
-        fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 
         return JGE_ERR_PNG;
     }
@@ -1885,14 +1888,14 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     if (info_ptr == NULL)
     {
         //fclose(fp);
-        fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 
         png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
 
         return JGE_ERR_PNG;
     }
     png_init_io(png_ptr, NULL);
-    png_set_read_fn(png_ptr, (png_voidp)fileSystem, PNGCustomReadDataFn);
+    png_set_read_fn(png_ptr, (png_voidp)jFile, PNGCustomReadDataFn);
 
     png_set_sig_bytes(png_ptr, sig_read);
     png_read_info(png_ptr, info_ptr);
@@ -1908,7 +1911,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     if (!line)
     {
         //fclose(fp);
-        fileSystem->CloseFile();
+        fileSystem->CloseFile(jFile);
 
         png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
         return JGE_ERR_MALLOC_FAILED;
@@ -1957,7 +1960,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     png_read_end(png_ptr, info_ptr);
     png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
 
-    fileSystem->CloseFile();
+    fileSystem->CloseFile(jFile);
 
 
     textureInfo.mBits = buffer;
@@ -2116,9 +2119,10 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
 
 int image_gif_read(GifFileType * ft, GifByteType * buf, int size)
 {
-    JFileSystem *fileSys = (JFileSystem *)ft->UserData;
-    //return fread(buf, 1, size, (FILE *)ft->UserData);
-    if (fileSys->ReadFile(buf, size))
+    JFileSystem* fileSystem = JFileSystem::GetInstance();
+    JFile* jFile = (JFile*)ft->UserData;
+
+    if (fileSys->ReadFile(jFile, buf, size))
         return size;
     else
         return 0;
@@ -2130,17 +2134,18 @@ void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode
     ///*
     //FILE * fp = fopen(filename, "rb");
     JFileSystem *fileSys = JFileSystem::GetInstance();
-    if (!fileSys->OpenFile(filename))
+    JFile* jFile = fileSystem->OpenFile(filename);
+    if (!jFile))
         return;
 
     //if(fp == NULL)
     //	return;
     DWORD bkcol;
-    int result = image_readgif(fileSys, textureInfo, &bkcol, image_gif_read, mode);
+    int result = image_readgif(jFile, textureInfo, &bkcol, image_gif_read, mode);
     if(result!=0)
         textureInfo.mBits=NULL;
     //fclose(fp);
-    fileSys->CloseFile();
+    fileSys->CloseFile(jFile);
     return ;//*/
 }
 #endif //(!defined IOS) && (!defined QT_CONFIG) && (!defined SDL_CONFIG)
@@ -2161,20 +2166,21 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
     UIImage *image = NULL;
 
     do {
-        if (!fileSystem->OpenFile(filename))
+        JFile* jFile = fileSystem->OpenFile(filename);
+        if (!jFile)
             break;
 
-        rawsize = fileSystem->GetFileSize();
+        rawsize = fileSystem->GetFileSize(jFile);
         rawdata = new BYTE[rawsize];
 
         if (!rawdata)
         {
-            fileSystem->CloseFile();
+            fileSystem->CloseFile(jFile);
             break;
         }
 
-        fileSystem->ReadFile(rawdata, rawsize);
-        fileSystem->CloseFile();
+        fileSystem->ReadFile(jFile, rawdata, rawsize);
+        fileSystem->CloseFile(jFile);
 
         texData = [[NSData alloc] initWithBytes:rawdata length:rawsize];
         image = [[UIImage alloc] initWithData:texData];
@@ -2254,20 +2260,21 @@ JTexture* JRenderer::LoadTexture(const char* filename, int, int)
     JFileSystem* fileSystem = JFileSystem::GetInstance();
 
     do {
-        if (!fileSystem->OpenFile(filename))
+        JFile* jFile = fileSystem->OpenFile(filename);
+        if (!jFile)
             break;
 
-        rawsize = fileSystem->GetFileSize();
+        rawsize = fileSystem->GetFileSize(jFile);
         rawdata = new BYTE[rawsize];
 
         if (!rawdata)
         {
-            fileSystem->CloseFile();
+            fileSystem->CloseFile(jFile);
             break;
         }
 
-        fileSystem->ReadFile(rawdata, rawsize);
-        fileSystem->CloseFile();
+        fileSystem->ReadFile(jFile, rawdata, rawsize);
+        fileSystem->CloseFile(jFile);
 
         QImage tmpImage = QImage::fromData(rawdata, rawsize);
         if(tmpImage.isNull())

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,66 @@ 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();
+      JFile* jFile = fileSystem->OpenFile(fileName);
+      if (jFile)
+	{
+      int size = fileSystem->GetFileSize(jFile);
+	  char *buffer = new char[size];
+      fileSystem->ReadFile(jFile, buffer, size);
+	  music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
 
-            delete[] buffer;
-            fileSystem->CloseFile();
-        }
+	  delete[] buffer;
+      fileSystem->CloseFile(jFile);
+	}
     }
+  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 +214,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 +265,48 @@ 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();
+      JFile* jFile = fileSystem->OpenFile(fileName);
+      if (jFile)
+	{
+      int size = fileSystem->GetFileSize(jFile);
+	  char *buffer = new char[size];
+      fileSystem->ReadFile(jFile, 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(jFile);
+	}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);

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
 
@@ -21,8 +19,3 @@ It is highly customizable and allows the player to tweak the rules / create thei
 Info, downloads, discussions and more at http://wololo.net/forum/index.php
 
 -![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)

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
-

projects/mtg/Android/jni/Android.mk

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

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();

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

projects/mtg/bin/Res/createResourceZip.py

@@ -30,8 +30,8 @@ def createResZipFile(filename):
         zip_file.close()
         
         if rename:
-            os.rename('settings/options.txt', 'settings/options.orig.txt')
-            os.rename('player/options.txt', 'player/options.orig.txt')
+	    os.rename('settings/options.txt', 'settings/options.orig.txt')
+	    os.rename('player/options.txt', 'player/options.orig.txt')
 
 def getFilename():
     p = Properties();
@@ -42,20 +42,51 @@ def getFilename():
     filename = 'core_' + major + minor + point 
     return filename
 
+def createQrcFile():
+    utilities = ZipUtilities()
+    print "Creating Qt Resource File"
+    filename = "core.qrc"
+    f = open(filename, 'w')
+    f.seek(0,0)
+    f.write("""<!DOCTYPE RCC><RCC version="1.0">\n<qresource>\n""")
+    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
+    utilities.addFolderToQrc(f, 'themes')
+    utilities.addFolderToQrc(f, 'sound')
+    utilities.addFolderToQrc(f, 'settings')
+    utilities.addFolderToQrc(f, 'sets')
+    utilities.addFolderToQrc(f, 'rules')
+    utilities.addFolderToQrc(f, 'player')
+    utilities.addFolderToQrc(f, 'packs')
+    utilities.addFolderToQrc(f, 'lang')
+    utilities.addFolderToQrc(f, 'graphics')
+    utilities.addFolderToQrc(f, 'campaigns')
+    utilities.addFolderToQrc(f, 'ai')        
+    if rename:
+        os.rename('settings/options.txt', 'settings/options.orig.txt')
+        os.rename('player/options.txt', 'player/options.orig.txt')
+
+    f.seek(0,2)
+    f.write('</qresource>\n</RCC>\n')
+    f.close
+    print >> sys.stderr, 'Created Resource Package for Qt projects: {0}'.format( filename)
 
 
-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,29 +111,45 @@ 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)
 
+    def addFolderToQrc(self, qrc, folder):
+        qrc.seek(0,2)
+        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)
+                        qrc.write('<file>')
+                        qrc.write(full_path)
+                        qrc.write('</file>\n')
+                elif os.path.isdir(full_path):
+                        print 'Entering folder: ' + str(full_path)
+                        self.addFolderToQrc(qrc, 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")
-    parser.add_option("-n", "--name", help="NAME: specify resource file name", metavar="NAME", dest="name")
+    parser.add_option("-p", "--platform", help="PLATFORM: specify custom build. (eg qt, ios, android, etc)", metavar="PLATFORM", dest="platform")
 
     (options, args) = parser.parse_args()
 	
     if (options.platform):
-        if (options.platform == "ios"):
-            createIosResFile(options.name)
-        else:
-            createStandardResFile(options.name)
+                print "reading %s..." % options.platform
+                if (options.platform == 'ios'):
+			createIosResFile()
+                elif (options.platform == 'qt'):
+			createQrcFile()
+		else:
+			createStandardResFile()
     else:
-        createStandardResFile(options.name)
+		createStandardResFile()
 
 if __name__ == "__main__":
 	main()

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]

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
@@ -309,9 +308,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

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]

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]

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]

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]

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]

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]

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()

projects/mtg/build.xml

@@ -3,7 +3,7 @@
 	<property file="build.properties" />
 	<property file="build.number.properties" />
 	<property environment="env"/>
-    
+
 	<path id="groovy.class.path" >
 		<fileset dir="${groovy.dir}" />
 	</path>
@@ -90,9 +90,7 @@ Author: Michael Nguyen
 #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
 

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

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:");

projects/mtg/include/CardDescriptor.h

@@ -64,7 +64,6 @@ class CardDescriptor: public MTGCardInstance
   string compareName;
   int CDopponentDamaged;
   int CDcontrollerDamaged;
-  int CDdamager;
 };
 
 #endif

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_

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
 {

projects/mtg/include/MTGCardInstance.h

@@ -65,7 +65,6 @@ public:
     bool wasDealtDamage;
     bool damageToOpponent;
     bool damageToController;
-    bool damageToCreature;
     bool mPropertiesChangedSinceLastUpdate;
     int reduxamount;
     int flanked;

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

projects/mtg/src/AllAbilities.cpp

@@ -4723,15 +4723,14 @@ void AVanishing::Update(float dt)
 
 int AVanishing::resolve()
 {
+
     return 1;
 }
 
 const string AVanishing::getMenuText()
 {
-    if (counterName.find("fade") != string::npos)
-    {
-        return "Fading";
-    }
+if(counterName.find("fade") != string::npos)
+return "Fading";
     return "Vanishing";
 }
 
@@ -5704,8 +5703,7 @@ void ATutorialMessage::Update(float dt)
 
     mElapsed += dt;
 
-    if(!mUserCloseRequest)
-        IconButtonsController::Update(dt);
+    IconButtonsController::Update(dt);
 
     if (mIsImage)
         return;

projects/mtg/src/CardDescriptor.cpp

@@ -23,7 +23,6 @@ CardDescriptor::CardDescriptor()
     colorComparisonMode = COMPARISON_NONE;
     CDopponentDamaged = 0;
     CDcontrollerDamaged = 0;
-    CDdamager = 0;
 }
 
 int CardDescriptor::init()
@@ -227,27 +226,16 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
         {
             match = NULL;
         }
-
-        if ((CDdamager == -1 && (card->damageToOpponent || card->damageToController || card->damageToCreature)) 
-                || (CDdamager == 1 && !(card->damageToOpponent || card->damageToController || card->damageToCreature)))
-        {
-            match = NULL;
-        }
-
     if(CDopponentDamaged == -1 || CDopponentDamaged == 1)
     {
         Player * p = card->controller()->opponent();//controller()->opponent();
-        if ((CDopponentDamaged == -1 && card->damageToOpponent && card->controller() == p)
-            || (CDopponentDamaged == 1 && !card->damageToOpponent && card->controller() == p)
-            || (CDopponentDamaged == -1 && card->damageToController && card->controller() == p->opponent())
-            || (CDopponentDamaged == 1 && !card->damageToController && card->controller() == p->opponent()))
+        if ((CDopponentDamaged == -1 && card->damageToOpponent && card->controller() == p) || (CDopponentDamaged == 1 && !card->damageToOpponent && card->controller() == p)
+            || (CDopponentDamaged == -1 && card->damageToController && card->controller() == p->opponent()) || (CDopponentDamaged == 1 && !card->damageToController && card->controller() == p->opponent()))
         {
             match = NULL;
         }
-        if ((CDcontrollerDamaged == -1 && card->damageToController && card->controller() == p)
-            || (CDcontrollerDamaged == 1 && !card->damageToController && card->controller() == p)
-            || (CDcontrollerDamaged == -1 && card->damageToOpponent && card->controller() == p->opponent())
-            || (CDcontrollerDamaged == 1 && !card->damageToOpponent && card->controller() == p->opponent()))
+        if ((CDcontrollerDamaged == -1 && card->damageToController && card->controller() == p) || (CDcontrollerDamaged == 1 && !card->damageToController && card->controller() == p)
+            || (CDcontrollerDamaged == -1 && card->damageToOpponent && card->controller() == p->opponent()) || (CDcontrollerDamaged == 1 && !card->damageToOpponent && card->controller() == p->opponent()))
         {
             match = NULL;
         }

projects/mtg/src/CardGui.cpp

@@ -1224,18 +1224,6 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                         cd.CDcontrollerDamaged = 1;
                     }
                 }
-                //creature dealt damage to anything
-                else if (attribute.find("damager") != string::npos)
-                {
-                    if (minus)
-                    {
-                        cd.CDdamager = -1;
-                    } 
-                    else 
-                    {
-                        cd.CDdamager = 1;
-                    }
-                }
                 else if (attribute.find("multicolor") != string::npos)
                 {
                     //card is multicolored?

projects/mtg/src/Damage.cpp

@@ -192,10 +192,8 @@ int Damage::resolve()
         //return the left over amount after effects have been applied to them.
         a = target->dealDamage(damage);
         target->damageCount += damage;//the amount must be the actual damage so i changed this from 1 to damage, this fixes pdcount and odcount
-        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE){
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
             ((MTGCardInstance*)target)->wasDealtDamage = true;
-            ((MTGCardInstance*)source)->damageToCreature = true;
-        }
         if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
         {
             if(target == source->controller())

projects/mtg/src/Effects.cpp

@@ -0,0 +1,3 @@
+#include "../include/Effects.h"
+
+int Effect::id_counter = 0;

projects/mtg/src/ExtraCost.cpp

@@ -151,44 +151,6 @@ int LifeCost::doPay()
     return 1;
 }
 
-//Specific life cost
-SpecificLifeCost * SpecificLifeCost::clone() const
-{
-    SpecificLifeCost * ec = NEW SpecificLifeCost(*this);
-    if (tc)
-        ec->tc = tc->clone();
-    return ec;
-}
-
-SpecificLifeCost::SpecificLifeCost(TargetChooser *_tc, int slc)
-    : ExtraCost("Life", _tc), slc(slc)
-{
-}
-
-int SpecificLifeCost::canPay()
-{
-    MTGCardInstance * _target = (MTGCardInstance *) target;
-    if(_target->controller()->life >= slc)
-    {
-        return 1;
-    }
-    return 0;
-}
-
-int SpecificLifeCost::doPay()
-{
-    if (!target)
-        return 0;
-
-    MTGCardInstance * _target = (MTGCardInstance *) target;
-
-    _target->controller()->loseLife(slc);
-    target = NULL;
-    if (tc)
-        tc->initTargets();
-    return 1;
-}
-
 //life or Mana cost
 LifeorManaCost * LifeorManaCost::clone() const
 {

projects/mtg/src/GameObserver.cpp

@@ -795,7 +795,6 @@ void GameObserver::gameStateBasedEffects()
                     c->wasDealtDamage = false;
                 c->damageToController = false;
                 c->damageToOpponent = false;
-                c->damageToCreature = false;
                 c->isAttacking = NULL;
             }
             for (int t = 0; t < nbcards; t++)

projects/mtg/src/GameStateDuel.cpp

@@ -1843,7 +1843,7 @@ int Tournament::getRandomDeck(bool noEasyDecks)
     DeckManager *deckManager = DeckManager::GetInstance();
     vector<DeckMetaData *> *deckList =  deckManager->getAIDeckOrderList();
 
-    int deckNumber;
+    int deckNumber=0;
     unsigned int random=0;
     int k=0;
     bool isDouble=true;

projects/mtg/src/GameStateMenu.cpp

@@ -300,12 +300,12 @@ string GameStateMenu::loadRandomWallpaper()
         return wallpaper;
 
     vector<string> wallpapers;
-    izfstream file;
-    if (! JFileSystem::GetInstance()->openForRead(file, "graphics/wallpapers.txt"))
+    JFile* jFile = JFileSystem::GetInstance()->OpenFile("graphics/wallpapers.txt");
+    if (!jFile)
         return wallpaper;
 
     string s;
-    while (std::getline(file, s))
+    while (JFileSystem::GetInstance()->ReadFileLine(jFile, s))
     {
         if (!s.size())
             continue;
@@ -313,7 +313,7 @@ string GameStateMenu::loadRandomWallpaper()
             s.erase(s.size() - 1); //Handle DOS files
         wallpapers.push_back(s);
     }
-    file.close();
+    JFileSystem::GetInstance()->CloseFile(jFile);
 
     int rnd = rand() % (wallpapers.size());
     wallpaper = wallpapers[rnd];
@@ -352,21 +352,21 @@ void GameStateMenu::loadLangMenu()
     vector<string> langFiles = JFileSystem::GetInstance()->scanfolder("lang/");
     for (size_t i = 0; i < langFiles.size(); ++i)
     {
-        izfstream file;
         string filePath = "lang/";
         filePath.append(langFiles[i]);
-        if (! JFileSystem::GetInstance()->openForRead(file, filePath))
+        JFile* jFile = JFileSystem::GetInstance()->OpenFile(filePath);
+        if (!jFile)
             continue;
 
         string s;
         string lang;
 
-        if (std::getline(file, s))
+        if (JFileSystem::GetInstance()->ReadFileLine(jFile, s))
         {
             lang = getLang(s);
         }
 
-        file.close();
+        JFileSystem::GetInstance()->CloseFile(jFile);
 
         if (lang.size())
         {

projects/mtg/src/GameStateOptions.cpp

@@ -215,39 +215,34 @@ void GameStateOptions::Render()
     const char * const CreditsText[] = {
         "Wagic, The Homebrew?! by Wololo",
         "",
-        "Updates, new cards, and more on http://wololo.net/wagic",
+        "updates, new cards, and more on http://wololo.net/wagic",
         "Many thanks to the people who help this project",
         "",
         "",
-        "Art:",
-        "Ilya B, Julio, Jeck, J, Kaioshin, Lakeesha",
+        "Art: Ilya B, Julio, Jeck, J, Kaioshin, Lakeesha",
         "Check themeinfo.txt for the full credits of each theme!",
         "",
         "Dev Team:",
-        "Abrasax, Almosthumane, Daddy32, DJardin, Dr.Solomat, J, Jeck,",
-        "kevlahnota, Leungclj, linshier, Mootpoint, Mnguyen, Psyringe,",
-        "Rolzad73, Salmelo, Superhiro, Wololo, Yeshua, Zethfox",
+        "Abrasax, Almosthumane, Daddy32, DJardin, Dr.Solomat,",
+        "J, Jeck, kevlahnota, Leungclj, linshier, Mootpoint, Mnguyen,",
+        "Psyringe, Salmelo, Superhiro, Wololo, Yeshua, Zethfox",
         "",
         "Music by Celestial Aeon Project, http://www.jamendo.com",
         "",
-        "Deck Builders:",
-        "Abrasax, AzureKnight, colarchon, Excessum, Hehotfarv,",
-        "Jeremy, Jog1118, JonyAS, Lachaux, Link17, Muddobbers,",
-        "Nakano, Niegen, Kaioshin, Psyringe, r1c47, Superhiro,",
-        "Szei, Thanatos02, Whismer, Wololo",
+        "Deck Builders: Abrasax, AzureKnight, colarchon",
+        "Excessum, Hehotfarv, Jeremy, Jog1118, JonyAS",
+        "Lachaux, Link17, Muddobbers, Nakano, Niegen",
+        "Kaioshin, Psyringe, r1c47, Superhiro, Szei",
+        "Thanatos02, Whismer, Wololo",
         "",
         "Thanks also go to Dr.Watson, Orine, Raphael, Sakya, Tyranid",
         "for their help.",
         "",
         "Thanks to everyone who contributes code/content on the forums!",
         "",
-        "",
-        "Source:",
-        "http://code.google.com/p/wagic (2009-2013)",
-        "https://github.com/WagicProject/wagic (2013- )",
-        "",
-        "Developed with the JGE++ Library",
+        "Developed with the JGE++ Library (http://code.google.com/p/wagic)",
         "SFX From www.soundsnap.com",
+
         "",
         "",
         "This work is not related to or endorsed by Wizards of the Coast, Inc",

projects/mtg/src/MTGAbility.cpp

@@ -4284,7 +4284,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell)
         }
         else if (card->alternateCostPaid[ManaCost::MANA_PAID_WITH_BUYBACK] > 0)
         {
-            card->alternateCostPaid[ManaCost::MANA_PAID_WITH_BUYBACK] = 0;
             zones->putInZone(card, zones->stack, Endzones->hand);
         }
         else if (card->alternateCostPaid[ManaCost::MANA_PAID_WITH_FLASHBACK] > 0)

projects/mtg/src/MTGCardInstance.cpp

@@ -158,7 +158,6 @@ void MTGCardInstance::initMTGCI()
     auras = 0;
     damageToOpponent = false;
     damageToController = false;
-    damageToCreature = false;
     wasDealtDamage = false;
     isDualWielding = false;
     suspended = false;

projects/mtg/src/MTGDeck.cpp

@@ -399,8 +399,8 @@ int MTGAllCards::load(const string &config_file, int set_id)
 
     int lineNumber = 0;
     std::string contents;
-    izfstream file;
-    if (!JFileSystem::GetInstance()->openForRead(file, config_file))
+    JFile* jFile = JFileSystem::GetInstance()->OpenFile(config_file);
+    if (!jFile)
     {
         DebugTrace("MTGAllCards::load: error loading: " << config_file);
         return total_cards;
@@ -408,7 +408,7 @@ int MTGAllCards::load(const string &config_file, int set_id)
 
     string s;
 
-    while (getline(file,s))
+    while (JFileSystem::GetInstance()->ReadFileLine(jFile, s))
     {
         lineNumber++;
         if (!s.size()) continue;
@@ -448,7 +448,7 @@ int MTGAllCards::load(const string &config_file, int set_id)
                     if (!maxGrade) maxGrade = Constants::GRADE_BORDERLINE; //Default setting for grade is borderline?
                     if (fileGrade > maxGrade)
                     {
-                        file.close();
+                        JFileSystem::GetInstance()->CloseFile(jFile);
                         return total_cards;
                     }
                 }
@@ -480,7 +480,7 @@ int MTGAllCards::load(const string &config_file, int set_id)
             continue;
         }
     }
-    file.close();
+    JFileSystem::GetInstance()->CloseFile(jFile);
     return total_cards;
 }
 

projects/mtg/src/ManaCost.cpp

@@ -159,19 +159,10 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
                         { //Mill to exile yourself as a cost (Library 2 Exile)
                             manaCost->addExtraCost(NEW MillExileCost(tc));
                         }
-                        else if (value == "l")
+                        else
                         { //Life cost
                             manaCost->addExtraCost(NEW LifeCost(tc));
                         }
-                        else
-                        { //Specific Life cost
-                            vector<string>valSplit = parseBetween(value,"l:"," ",false);
-                            if (valSplit.size()) {
-                                WParsedInt* lifetopay = NEW WParsedInt(valSplit[1], NULL, c);
-                                manaCost->addExtraCost(NEW SpecificLifeCost(tc,lifetopay->getValue()));
-                                SAFE_DELETE(lifetopay);
-                            }
-                        }
                         break;
                     case 'd': //DiscardRandom cost
                         if (value == "d")

projects/mtg/src/OptionItem.cpp

@@ -326,16 +326,16 @@ void OptionLanguage::Reload()
     vector<string> langFiles = JFileSystem::GetInstance()->scanfolder("lang/");
     for (size_t i = 0; i < langFiles.size(); ++i)
     {
-        izfstream file;
         string filePath = "lang/";
         filePath.append(langFiles[i]);
-        if (! JFileSystem::GetInstance()->openForRead(file, filePath))
+        JFile* jFile = JFileSystem::GetInstance()->OpenFile(filePath);
+        if (!jFile)
             continue;
 
         string s;
         string lang;
 
-        if (std::getline(file, s))
+        if (JFileSystem::GetInstance()->ReadFileLine(jFile, s))
         {
             if (!s.size())
             {
@@ -352,7 +352,7 @@ void OptionLanguage::Reload()
                     lang = s.substr(6);
             }
         }
-        file.close();
+        JFileSystem::GetInstance()->CloseFile(jFile);
 
         if (lang.size())
         {

projects/mtg/src/PlayGuiObject.cpp

@@ -38,9 +38,13 @@ void PlayGuiObject::Update(float dt)
         if (mHeight < defaultHeight) mHeight = defaultHeight;
     }
     wave = (wave + 2 * (int) (100 * dt)) % 255;
+    for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
+        (*it)->Update(dt);
     Pos::Update(dt);
 }
 
 void PlayGuiObject::Render()
 {
+    for (vector<Effect*>::iterator it = effects.begin(); it != effects.end(); ++it)
+        (*it)->Render();
 }

projects/mtg/src/StoryFlow.cpp

@@ -599,16 +599,17 @@ bool StoryFlow::parse(string path)
     JFileSystem *fileSystem = JFileSystem::GetInstance();
     if (!fileSystem) return false;
 
-    if (!fileSystem->OpenFile(path.c_str())) return false;
+    JFile* jFile = fileSystem->OpenFile(path.c_str());
+    if (!jFile) return false;
 
-    int size = fileSystem->GetFileSize();
+    int size = fileSystem->GetFileSize(jFile);
     char *xmlBuffer = NEW char[size];
-    fileSystem->ReadFile(xmlBuffer, size);
+    fileSystem->ReadFile(jFile, xmlBuffer, size);
 
     TiXmlDocument doc;
     doc.Parse(xmlBuffer);
 
-    fileSystem->CloseFile();
+    fileSystem->CloseFile(jFile);
     delete[] xmlBuffer;
 
     for (TiXmlNode* node = doc.FirstChild(); node; node = node->NextSibling())

projects/mtg/src/TargetChooser.cpp

@@ -485,18 +485,6 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         cd->CDcontrollerDamaged = 1;
                     }
                 }
-                //creature dealt damage to anything
-                else if (attribute.find("damager") != string::npos)
-                {
-                    if (minus)
-                    {
-                        cd->CDdamager = -1;
-                    } 
-                    else 
-                    {
-                        cd->CDdamager = 1;
-                    }
-                }
                 else if (attribute.find("multicolor") != string::npos)
                 {
                     //card is multicolored?

projects/mtg/src/WCachedResource.cpp

@@ -333,8 +333,9 @@ bool WCachedParticles::Attempt(const string& filename, int, int & error)
 {
 
     JFileSystem* fileSys = JFileSystem::GetInstance();
+    JFile* jFile = fileSys->OpenFile(WResourceManager::Instance()->graphicsFile(filename));
 
-    if (!fileSys->OpenFile(WResourceManager::Instance()->graphicsFile(filename)))
+    if (!jFile)
     {
         error = CACHE_ERROR_404;
         return false;
@@ -345,12 +346,12 @@ bool WCachedParticles::Attempt(const string& filename, int, int & error)
     particles = NEW hgeParticleSystemInfo;
     // We Skip reading the pointer as it may be larger than 4 bytes in the structure
     void *dummyPointer;
-    fileSys->ReadFile(&dummyPointer, 4);
+    fileSys->ReadFile(jFile, &dummyPointer, 4);
     // we're actually trying to read more than the file size now, but it's no problem.
     // Note that this fix is only to avoid the largest problems, filling a structure
     // by directly reading a file, is really a bad idea ...
-    fileSys->ReadFile(&(particles->nEmission), sizeof(hgeParticleSystemInfo) - sizeof(void*));
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, &(particles->nEmission), sizeof(hgeParticleSystemInfo) - sizeof(void*));
+    fileSys->CloseFile(jFile);
 
     particles->sprite = NULL;
     error = CACHE_ERROR_NONE;

projects/mtg/src/WFont.cpp

@@ -171,20 +171,22 @@ WFont(inFontID), mTexture(0)
         unsigned char height;
     } sizeStr = { 0, 0, 0 };
 
-    if (!fileSys->OpenFile(engFileName)) return;
-    size = fileSys->GetFileSize();
+    JFile* jFile = fileSys->OpenFile(engFileName);
+    if (!jFile) return;
+    size = fileSys->GetFileSize(jFile);
     mStdFont = NEW u8[size];
-    fileSys->ReadFile(mStdFont, size);
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mStdFont, size);
+    fileSys->CloseFile(jFile);
 
-    if (!fileSys->OpenFile(fontname)) return;
-    fileSys->ReadFile(&sizeStr, 4); // Works only for little-endian machines (PSP and PC are)
+    jFile = fileSys->OpenFile(fontname);
+    if (!jFile) return;
+    fileSys->ReadFile(jFile, &sizeStr, 4); // Works only for little-endian machines (PSP and PC are)
     size = sizeStr.chars * sizeStr.width * sizeStr.height / 2;
     mExtraFont = NEW u8[size]; // 4 bits for a pixel
     mIndex = NEW u16[65536];
-    fileSys->ReadFile(mIndex, 65536 * sizeof(u16));
-    fileSys->ReadFile(mExtraFont, size);
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mIndex, 65536 * sizeof(u16));
+    fileSys->ReadFile(jFile, mExtraFont, size);
+    fileSys->CloseFile(jFile);
 
     mColor0 = ARGB(255, 255, 255, 255);
     mColor = mColor0;
@@ -612,17 +614,19 @@ WGBKFont::WGBKFont(int inFontID, const char *fontname, int lineheight, bool) :
     JFileSystem *fileSys = JFileSystem::GetInstance();
     int size = 0;
 
-    if (!fileSys->OpenFile(fontname)) return;
-    size = fileSys->GetFileSize();
+    JFile* jFile = fileSys->OpenFile(fontname);
+    if (!jFile) return;
+    size = fileSys->GetFileSize(jFile);
     mExtraFont = NEW u8[size];
-    fileSys->ReadFile(mExtraFont, size);
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mExtraFont, size);
+    fileSys->CloseFile(jFile);
 
-    if (!fileSys->OpenFile(engFileName)) return;
-    size = fileSys->GetFileSize();
+    jFile = fileSys->OpenFile(engFileName);
+    if (!jFile) return;
+    size = fileSys->GetFileSize(jFile);
     mStdFont = NEW u8[size];
-    fileSys->ReadFile(mStdFont, size);
-    fileSys->CloseFile();
+    fileSys->ReadFile(jFile, mStdFont, size);
+    fileSys->CloseFile(jFile);
 
     mIndex = 0;
 

projects/mtg/template.vcxproj

@@ -493,6 +493,7 @@
     <ClInclude Include="include\DeckView.h" />
     <ClInclude Include="include\DuelLayers.h" />
     <ClInclude Include="include\Easing.h" />
+    <ClInclude Include="include\Effects.h" />
     <ClInclude Include="include\ExtraCost.h" />
     <ClInclude Include="include\GameApp.h" />
     <ClInclude Include="include\GameObserver.h" />
@@ -591,4 +592,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

projects/mtg/template.vcxproj.filters

@@ -417,6 +417,9 @@
     <ClInclude Include="include\DuelLayers.h">
       <Filter>inc</Filter>
     </ClInclude>
+    <ClInclude Include="include\Effects.h">
+      <Filter>inc</Filter>
+    </ClInclude>
     <ClInclude Include="include\ExtraCost.h">
       <Filter>inc</Filter>
     </ClInclude>
@@ -722,4 +725,4 @@
       <Filter>res</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>

projects/mtg/wagic-qt.pro

@@ -5,7 +5,7 @@ addExclusiveBuilds(graphics, Graphics, console, Console)
 
 INCLUDEPATH += ../../JGE/include/qt
 CONFIG(console, graphics|console){
-    QT += core network multimedia
+    QT += core network
     QT -= gui
 
     DEFINES += CONSOLE_CONFIG
@@ -15,9 +15,10 @@ CONFIG(console, graphics|console){
 }
 else:CONFIG(graphics, graphics|console){
     folder_01.source = qml/QmlWagic
-    folder_01.target = /usr/share
+    folder_01.target = qml
     DEPLOYMENTFOLDERS = folder_01
-    QT += core gui opengl network multimedia
+    windows:RESOURCES = bin/Res/core.qrc
+    QT += core gui opengl network
     QT -= declarative quick qml
     #maemo5:DEFINES += QT_WIDGET
     DEFINES += QT_WIDGET
@@ -46,7 +47,6 @@ CONFIG(graphics, graphics|console){
         ../../JGE/src/qt/corewrapper.cpp\
         ../../JGE/src/Qtmain.cpp\
         ../../JGE/src/JMD2Model.cpp\
-        ../../JGE/src/pc/JSfx.cpp\
         ../../JGE/src/pc/JGfx.cpp
 }
 else:CONFIG(console, graphics|console){
@@ -55,7 +55,6 @@ else:CONFIG(console, graphics|console){
 
     SOURCES += \
         ../../JGE/src/OutputCapturer.cpp\
-        ../../JGE/src/pc/JSfx.cpp\
         ../../JGE/src/JGfx-fake.cpp\
         ../../JGE/src/Qtconsole.cpp\
 }

projects/mtg/wagic.pri

@@ -11,7 +11,6 @@ unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs
 unix:!*macx*:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror
 
 windows:DEFINES += _CRT_SECURE_NO_WARNINGS
-windows|winrt:DEFINES += NOMINMAX
 unix|macx:DEFINES += LINUX
 CONFIG(debug, debug|release) {
     DEFINES += _DEBUG
@@ -33,7 +32,6 @@ windows{
     *-msvc* {
         INCLUDEPATH += extra
         DEFINES += WIN32
-        DEFINES += FORCE_GL2
     }
 }
 macx:INCLUDEPATH += /opt/include
@@ -43,7 +41,8 @@ INCLUDEPATH += ../../Boost
 INCLUDEPATH += include
 
 unix:!symbian:LIBS += -lz
-windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib
+win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib
+win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib
 PRECOMPILED_HEADER = include/PrecompiledHeader.h
 
 #DEFINES += TRACK_OBJECT_USAGE
@@ -81,6 +80,7 @@ SOURCES += \
         src/DeckStats.cpp\
         src/DeckView.cpp\
         src/DuelLayers.cpp\
+        src/Effects.cpp\
         src/ExtraCost.cpp\
         src/GameApp.cpp\
         src/GameLauncher.cpp\
@@ -271,6 +271,7 @@ HEADERS  += \
         include/WResourceManager.h\
         include/DuelLayers.h\
         include/GuiStatic.h\
+        include/Effects.h\
         include/StyleManager.h\
         include/WFont.h\
         include/DeckManager.h\
@@ -282,7 +283,6 @@ HEADERS  += \
 
 # JGE, could probably be moved outside
 SOURCES += \
-        ../../JGE/src/Downloader.cpp\
         ../../JGE/src/Encoding.cpp\
         ../../JGE/src/JAnimator.cpp\
         ../../JGE/src/JApp.cpp\
@@ -302,6 +302,7 @@ SOURCES += \
         ../../JGE/src/JSpline.cpp\
         ../../JGE/src/JNetwork.cpp\
         ../../JGE/src/pc/JSocket.cpp\
+        ../../JGE/src/pc/JSfx.cpp\
         ../../JGE/src/JSprite.cpp\
         ../../JGE/src/Vector2D.cpp\
         ../../JGE/src/tinyxml/tinystr.cpp\
@@ -319,7 +320,6 @@ SOURCES += \
         ../../JGE/src/zipFS/zstream.cpp
 
 HEADERS += \
-        ../../JGE/include/Downloader.h\
         ../../JGE/include/Threading.h\
         ../../JGE/include/decoder_prx.h\
         ../../JGE/include/DebugRoutines.h\
@@ -371,110 +371,3 @@ HEADERS += \
         ../../JGE/src/tinyxml/tinystr.h\
         ../../JGE/src/tinyxml/tinyxml.h\
         ../../JGE/include/vram.h
-
-# maemo 5 packaging
-maemo5: {
-    # Variables
-    BINDIR = /opt/wagic/bin
-    RESDIR = /home/user/wagic/Res
-    USERDIR = MyDocs/.Wagic
-    ICONDIR = /usr/share
-
-    DEFINES += RESDIR=\\\"$$RESDIR\\\"
-    DEFINES += USERDIR=\\\"$$USERDIR\\\"
-
-    INSTALLS += target \
-        desktop \
-        icon
-
-    target.path = $$BINDIR
-
-    desktop.path = $$ICONDIR/applications/hildon
-    desktop.files += wagic.desktop
-
-    icon.path = $$ICONDIR/icons/hicolor/64x64/apps
-    icon.files += wagic-64x64.png
-
-# Meego/maemo 6 packaging (no launcher)
-} else:contains(MEEGO_EDITION,harmattan): {
-    # Variables
-    BINDIR = /opt/wagic/bin
-    RESDIR = /opt/wagic/Res
-    USERDIR = MyDocs/.Wagic
-    ICONDIR = /usr/share
-
-    DEFINES += RESDIR=\\\"$$RESDIR\\\"
-    DEFINES += USERDIR=\\\"$$USERDIR\\\"
-
-    INSTALLS += target \
-        desktop \
-        icon \
-        policy
-
-    target.path = $$BINDIR
-
-    desktop.path = /usr/share/applications
-    desktop.files += debian_harmattan/wagic.desktop
-
-    icon.files = wagic-80x80.png
-    icon.path = /usr/share/icons/hicolor/64x64/apps
-
-    policy.files = debian_harmattan/wagic.conf
-    policy.path = /usr/share/policy/etc/syspart.conf.d
-
-} else:symbian {
-    TARGET.UID3 = 0xE1D807D3
-
-    # Smart Installer package's UID
-    # This UID is from the protected range
-    # and therefore the package will fail to install if self-signed
-    # By default qmake uses the unprotected range value if unprotected UID is defined for the application
-    # and 0x2002CCCF value if protected UID is given to the application
-    #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
-
-    # Allow network access on Symbian... that's probably pointless
-    TARGET.CAPABILITY += NetworkServices
-
-    RESDIR = some/res/dir
-    USERDIR = .Wagic
-    DEFINES += RESDIR=\"$$RESDIR\"
-    DEFINES += USERDIR=\"$$USERDIR\"
-    ICON = wagic.svg
-} else:android {
-    DEFINES += Q_WS_ANDROID
-    RESDIR = Res
-    USERDIR = /sdcard/Wagic/Res
-    DEFINES += RESDIR=\\\"$$RESDIR\\\"
-    DEFINES += USERDIR=\\\"$$USERDIR\\\"
-} else:unix {
-    # Variables
-    BINDIR = /usr/bin
-    ICONDIR = /usr/share
-    RESDIR = Res
-    USERDIR = .Wagic
-
-    DEFINES += RESDIR=\\\"$$RESDIR\\\"
-    DEFINES += USERDIR=\\\"$$USERDIR\\\"
-
-    target.path = $$BINDIR
-
-    desktop.path = $$ICONDIR/applications
-    desktop.files += wagic.desktop
-
-    icon.path = $$ICONDIR/icons/hicolor/64x64/apps
-    icon.files += wagic-64x64.png
-
-    INSTALLS += target \
-        desktop \
-        icon
-
-} else:windows {
-    RESDIR = ./Res
-    USERDIR = .Wagic
-    DEFINES += RESDIR=\\\"$$RESDIR\\\"
-    DEFINES += USERDIR=\\\"$$USERDIR\\\"
-}
-
-
-
-

projects/mtg/wagic.xcodeproj/project.pbxproj

@@ -67,6 +67,7 @@
 		12059DA814980B7300DAC43B /* AllAbilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F41291C60500B9016A /* AllAbilities.cpp */; };
 		12059DA914980B7300DAC43B /* CardDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F51291C60500B9016A /* CardDescriptor.cpp */; };
 		12059DAA14980B7300DAC43B /* CardDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F61291C60500B9016A /* CardDisplay.cpp */; };
+		12059DAB14980B7300DAC43B /* CardEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F71291C60500B9016A /* CardEffect.cpp */; };
 		12059DAC14980B7300DAC43B /* CardGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F81291C60500B9016A /* CardGui.cpp */; };
 		12059DAD14980B7300DAC43B /* CardPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F91291C60500B9016A /* CardPrimitive.cpp */; };
 		12059DAE14980B7300DAC43B /* CardSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376FA1291C60500B9016A /* CardSelector.cpp */; };
@@ -84,6 +85,7 @@
 		12059DBA14980B7300DAC43B /* DeckMetaData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377061291C60500B9016A /* DeckMetaData.cpp */; };
 		12059DBB14980B7300DAC43B /* DeckStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377071291C60500B9016A /* DeckStats.cpp */; };
 		12059DBC14980B7300DAC43B /* DuelLayers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377081291C60500B9016A /* DuelLayers.cpp */; };
+		12059DBD14980B7300DAC43B /* Effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377091291C60500B9016A /* Effects.cpp */; };
 		12059DBE14980B7300DAC43B /* ExtraCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770A1291C60500B9016A /* ExtraCost.cpp */; };
 		12059DBF14980B7300DAC43B /* GameApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770B1291C60500B9016A /* GameApp.cpp */; };
 		12059DC014980B7300DAC43B /* GameLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770C1291C60500B9016A /* GameLauncher.cpp */; };
@@ -196,6 +198,7 @@
 		12059E4A14980B7300DAC43B /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 12D095E014417D0500F69056 /* libstdc++.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12059E4B14980B7300DAC43B /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EBA14934A2C00641703 /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12059E4C14980B7300DAC43B /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EB814934A1800641703 /* MobileCoreServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		12059E4D14980B7300DAC43B /* libGoogleAdMobAds.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED379148BAE7B00C58E83 /* libGoogleAdMobAds.a */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12059E4E14980B7300DAC43B /* libc++abi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1216D632148F7411000F2295 /* libc++abi.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12059E4F14980B7300DAC43B /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED50F148BCC1900C58E83 /* libsqlite3.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12059E5014980B7300DAC43B /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 129654D0148A52730031100B /* iAd.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
@@ -214,6 +217,7 @@
 		12059E5D14980B7300DAC43B /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED50B148BCBBC00C58E83 /* MapKit.framework */; };
 		12059E5E14980B7300DAC43B /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED518148BF0E000C58E83 /* MediaPlayer.framework */; };
 		1216D633148F7411000F2295 /* libc++abi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1216D632148F7411000F2295 /* libc++abi.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
+		1216D634148F747D000F2295 /* libGoogleAdMobAds.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 128ED379148BAE7B00C58E83 /* libGoogleAdMobAds.a */; settings = {ATTRIBUTES = (Weak, ); }; };
 		12211E7914931CBB00641703 /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2814931CBB00641703 /* ASIAuthenticationDialog.m */; };
 		12211E7A14931CBB00641703 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2B14931CBB00641703 /* ASIDataCompressor.m */; };
 		12211E7B14931CBB00641703 /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211E2D14931CBB00641703 /* ASIDataDecompressor.m */; };
@@ -281,9 +285,6 @@
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		28FD15000DC6FC520079059D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD14FF0DC6FC520079059D /* OpenGLES.framework */; };
 		28FD15080DC6FC5B0079059D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FD15070DC6FC5B0079059D /* QuartzCore.framework */; };
-		751E1F1518FAE53E001B1E16 /* CarouselDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */; };
-		751E1F1618FAE53E001B1E16 /* DeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1318FAE53E001B1E16 /* DeckView.cpp */; };
-		751E1F1718FAE53E001B1E16 /* GridDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */; };
 		75D209D3181D54FD009916AC /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D1181D54FD009916AC /* Default-568h@2x.png */; };
 		75D209D4181D54FD009916AC /* wagic-80x80.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D2181D54FD009916AC /* wagic-80x80.png */; };
 		CE97CD1E1295AB4300FDFD3B /* SimplePopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE97CD1D1295AB4300FDFD3B /* SimplePopup.cpp */; };
@@ -306,6 +307,7 @@
 		CEA3775E1291C60500B9016A /* AllAbilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F41291C60500B9016A /* AllAbilities.cpp */; };
 		CEA3775F1291C60500B9016A /* CardDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F51291C60500B9016A /* CardDescriptor.cpp */; };
 		CEA377601291C60500B9016A /* CardDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F61291C60500B9016A /* CardDisplay.cpp */; };
+		CEA377611291C60500B9016A /* CardEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F71291C60500B9016A /* CardEffect.cpp */; };
 		CEA377621291C60500B9016A /* CardGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F81291C60500B9016A /* CardGui.cpp */; };
 		CEA377631291C60500B9016A /* CardPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376F91291C60500B9016A /* CardPrimitive.cpp */; };
 		CEA377641291C60500B9016A /* CardSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA376FA1291C60500B9016A /* CardSelector.cpp */; };
@@ -323,6 +325,7 @@
 		CEA377701291C60500B9016A /* DeckMetaData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377061291C60500B9016A /* DeckMetaData.cpp */; };
 		CEA377711291C60500B9016A /* DeckStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377071291C60500B9016A /* DeckStats.cpp */; };
 		CEA377721291C60500B9016A /* DuelLayers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377081291C60500B9016A /* DuelLayers.cpp */; };
+		CEA377731291C60500B9016A /* Effects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA377091291C60500B9016A /* Effects.cpp */; };
 		CEA377741291C60500B9016A /* ExtraCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770A1291C60500B9016A /* ExtraCost.cpp */; };
 		CEA377751291C60500B9016A /* GameApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770B1291C60500B9016A /* GameApp.cpp */; };
 		CEA377761291C60500B9016A /* GameLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3770C1291C60500B9016A /* GameLauncher.cpp */; };
@@ -575,13 +578,6 @@
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		28FD14FF0DC6FC520079059D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		28FD15070DC6FC5B0079059D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		751E1F0E18FAE52D001B1E16 /* CarouselDeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CarouselDeckView.h; sourceTree = "<group>"; };
-		751E1F0F18FAE52D001B1E16 /* DeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeckView.h; sourceTree = "<group>"; };
-		751E1F1018FAE52D001B1E16 /* Easing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Easing.h; sourceTree = "<group>"; };
-		751E1F1118FAE52D001B1E16 /* GridDeckView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridDeckView.h; sourceTree = "<group>"; };
-		751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CarouselDeckView.cpp; sourceTree = "<group>"; };
-		751E1F1318FAE53E001B1E16 /* DeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeckView.cpp; sourceTree = "<group>"; };
-		751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridDeckView.cpp; sourceTree = "<group>"; };
 		75D209D1181D54FD009916AC /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
 		75D209D2181D54FD009916AC /* wagic-80x80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wagic-80x80.png"; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* wagic-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "wagic-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
@@ -613,6 +609,7 @@
 		CEA3768C1291C60500B9016A /* AllAbilities.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = AllAbilities.h; sourceTree = "<group>"; };
 		CEA3768D1291C60500B9016A /* CardDescriptor.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardDescriptor.h; sourceTree = "<group>"; };
 		CEA3768E1291C60500B9016A /* CardDisplay.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardDisplay.h; sourceTree = "<group>"; };
+		CEA3768F1291C60500B9016A /* CardEffect.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardEffect.h; sourceTree = "<group>"; };
 		CEA376901291C60500B9016A /* CardGui.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardGui.h; sourceTree = "<group>"; };
 		CEA376911291C60500B9016A /* CardPrimitive.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardPrimitive.h; sourceTree = "<group>"; };
 		CEA376921291C60500B9016A /* CardSelector.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = CardSelector.h; sourceTree = "<group>"; };
@@ -630,6 +627,7 @@
 		CEA3769E1291C60500B9016A /* DeckMetaData.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DeckMetaData.h; sourceTree = "<group>"; };
 		CEA3769F1291C60500B9016A /* DeckStats.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DeckStats.h; sourceTree = "<group>"; };
 		CEA376A01291C60500B9016A /* DuelLayers.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DuelLayers.h; sourceTree = "<group>"; };
+		CEA376A11291C60500B9016A /* Effects.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = Effects.h; sourceTree = "<group>"; };
 		CEA376A21291C60500B9016A /* ExtraCost.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = ExtraCost.h; sourceTree = "<group>"; };
 		CEA376A31291C60500B9016A /* GameApp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = GameApp.h; sourceTree = "<group>"; };
 		CEA376A41291C60500B9016A /* GameObserver.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = GameObserver.h; sourceTree = "<group>"; };
@@ -713,6 +711,7 @@
 		CEA376F41291C60500B9016A /* AllAbilities.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = AllAbilities.cpp; sourceTree = "<group>"; };
 		CEA376F51291C60500B9016A /* CardDescriptor.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardDescriptor.cpp; sourceTree = "<group>"; };
 		CEA376F61291C60500B9016A /* CardDisplay.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardDisplay.cpp; sourceTree = "<group>"; };
+		CEA376F71291C60500B9016A /* CardEffect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardEffect.cpp; sourceTree = "<group>"; };
 		CEA376F81291C60500B9016A /* CardGui.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardGui.cpp; sourceTree = "<group>"; };
 		CEA376F91291C60500B9016A /* CardPrimitive.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardPrimitive.cpp; sourceTree = "<group>"; };
 		CEA376FA1291C60500B9016A /* CardSelector.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = CardSelector.cpp; sourceTree = "<group>"; };
@@ -730,6 +729,7 @@
 		CEA377061291C60500B9016A /* DeckMetaData.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DeckMetaData.cpp; sourceTree = "<group>"; };
 		CEA377071291C60500B9016A /* DeckStats.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DeckStats.cpp; sourceTree = "<group>"; };
 		CEA377081291C60500B9016A /* DuelLayers.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = DuelLayers.cpp; sourceTree = "<group>"; };
+		CEA377091291C60500B9016A /* Effects.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = Effects.cpp; sourceTree = "<group>"; };
 		CEA3770A1291C60500B9016A /* ExtraCost.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = ExtraCost.cpp; sourceTree = "<group>"; };
 		CEA3770B1291C60500B9016A /* GameApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = GameApp.cpp; sourceTree = "<group>"; };
 		CEA3770C1291C60500B9016A /* GameLauncher.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = GameLauncher.cpp; sourceTree = "<group>"; };
@@ -890,6 +890,7 @@
 				12059E4A14980B7300DAC43B /* libstdc++.dylib in Frameworks */,
 				12059E4B14980B7300DAC43B /* CFNetwork.framework in Frameworks */,
 				12059E4C14980B7300DAC43B /* MobileCoreServices.framework in Frameworks */,
+				12059E4D14980B7300DAC43B /* libGoogleAdMobAds.a in Frameworks */,
 				12059E4E14980B7300DAC43B /* libc++abi.dylib in Frameworks */,
 				12059E4F14980B7300DAC43B /* libsqlite3.dylib in Frameworks */,
 				12059E5014980B7300DAC43B /* iAd.framework in Frameworks */,
@@ -921,6 +922,7 @@
 				12D095E114417D0500F69056 /* libstdc++.dylib in Frameworks */,
 				12211EBB14934A2C00641703 /* CFNetwork.framework in Frameworks */,
 				12211EB914934A1900641703 /* MobileCoreServices.framework in Frameworks */,
+				1216D634148F747D000F2295 /* libGoogleAdMobAds.a in Frameworks */,
 				1216D633148F7411000F2295 /* libc++abi.dylib in Frameworks */,
 				128ED510148BCC1900C58E83 /* libsqlite3.dylib in Frameworks */,
 				129654D1148A52740031100B /* iAd.framework in Frameworks */,
@@ -1282,10 +1284,6 @@
 		CEA376851291C60500B9016A /* include */ = {
 			isa = PBXGroup;
 			children = (
-				751E1F0E18FAE52D001B1E16 /* CarouselDeckView.h */,
-				751E1F0F18FAE52D001B1E16 /* DeckView.h */,
-				751E1F1018FAE52D001B1E16 /* Easing.h */,
-				751E1F1118FAE52D001B1E16 /* GridDeckView.h */,
 				12272FC114CD558C00192DC7 /* SimpleButton.h */,
 				12CCA032144A05DF00E343A0 /* AbilityParser.h */,
 				127694891441274D0088F6D3 /* AIPlayerBaka.h */,
@@ -1308,6 +1306,7 @@
 				CEA3768C1291C60500B9016A /* AllAbilities.h */,
 				CEA3768D1291C60500B9016A /* CardDescriptor.h */,
 				CEA3768E1291C60500B9016A /* CardDisplay.h */,
+				CEA3768F1291C60500B9016A /* CardEffect.h */,
 				CEA376901291C60500B9016A /* CardGui.h */,
 				CEA376911291C60500B9016A /* CardPrimitive.h */,
 				CEA376921291C60500B9016A /* CardSelector.h */,
@@ -1325,6 +1324,7 @@
 				CEA3769E1291C60500B9016A /* DeckMetaData.h */,
 				CEA3769F1291C60500B9016A /* DeckStats.h */,
 				CEA376A01291C60500B9016A /* DuelLayers.h */,
+				CEA376A11291C60500B9016A /* Effects.h */,
 				CEA376A21291C60500B9016A /* ExtraCost.h */,
 				CEA376A31291C60500B9016A /* GameApp.h */,
 				CEA376A41291C60500B9016A /* GameObserver.h */,
@@ -1408,9 +1408,6 @@
 		CEA376ED1291C60500B9016A /* src */ = {
 			isa = PBXGroup;
 			children = (
-				751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */,
-				751E1F1318FAE53E001B1E16 /* DeckView.cpp */,
-				751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */,
 				12CCA02F144A05D100E343A0 /* AbilityParser.cpp */,
 				12769483144127380088F6D3 /* AIPlayerBaka.cpp */,
 				12769484144127380088F6D3 /* AIPlayerBakaB.cpp */,
@@ -1430,6 +1427,7 @@
 				CEA376F41291C60500B9016A /* AllAbilities.cpp */,
 				CEA376F51291C60500B9016A /* CardDescriptor.cpp */,
 				CEA376F61291C60500B9016A /* CardDisplay.cpp */,
+				CEA376F71291C60500B9016A /* CardEffect.cpp */,
 				CEA376F81291C60500B9016A /* CardGui.cpp */,
 				CEA376F91291C60500B9016A /* CardPrimitive.cpp */,
 				CEA376FA1291C60500B9016A /* CardSelector.cpp */,
@@ -1447,6 +1445,7 @@
 				CEA377061291C60500B9016A /* DeckMetaData.cpp */,
 				CEA377071291C60500B9016A /* DeckStats.cpp */,
 				CEA377081291C60500B9016A /* DuelLayers.cpp */,
+				CEA377091291C60500B9016A /* Effects.cpp */,
 				CEA3770A1291C60500B9016A /* ExtraCost.cpp */,
 				CEA3770B1291C60500B9016A /* GameApp.cpp */,
 				CEA3770C1291C60500B9016A /* GameLauncher.cpp */,
@@ -1704,7 +1703,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0430;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "wagic" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1828,6 +1827,7 @@
 				12059DA814980B7300DAC43B /* AllAbilities.cpp in Sources */,
 				12059DA914980B7300DAC43B /* CardDescriptor.cpp in Sources */,
 				12059DAA14980B7300DAC43B /* CardDisplay.cpp in Sources */,
+				12059DAB14980B7300DAC43B /* CardEffect.cpp in Sources */,
 				12059DAC14980B7300DAC43B /* CardGui.cpp in Sources */,
 				12059DAD14980B7300DAC43B /* CardPrimitive.cpp in Sources */,
 				12059DAE14980B7300DAC43B /* CardSelector.cpp in Sources */,
@@ -1845,6 +1845,7 @@
 				12059DBA14980B7300DAC43B /* DeckMetaData.cpp in Sources */,
 				12059DBB14980B7300DAC43B /* DeckStats.cpp in Sources */,
 				12059DBC14980B7300DAC43B /* DuelLayers.cpp in Sources */,
+				12059DBD14980B7300DAC43B /* Effects.cpp in Sources */,
 				12059DBE14980B7300DAC43B /* ExtraCost.cpp in Sources */,
 				12059DBF14980B7300DAC43B /* GameApp.cpp in Sources */,
 				12059DC014980B7300DAC43B /* GameLauncher.cpp in Sources */,
@@ -2008,6 +2009,7 @@
 				CEA3775E1291C60500B9016A /* AllAbilities.cpp in Sources */,
 				CEA3775F1291C60500B9016A /* CardDescriptor.cpp in Sources */,
 				CEA377601291C60500B9016A /* CardDisplay.cpp in Sources */,
+				CEA377611291C60500B9016A /* CardEffect.cpp in Sources */,
 				CEA377621291C60500B9016A /* CardGui.cpp in Sources */,
 				CEA377631291C60500B9016A /* CardPrimitive.cpp in Sources */,
 				CEA377641291C60500B9016A /* CardSelector.cpp in Sources */,
@@ -2025,6 +2027,7 @@
 				CEA377701291C60500B9016A /* DeckMetaData.cpp in Sources */,
 				CEA377711291C60500B9016A /* DeckStats.cpp in Sources */,
 				CEA377721291C60500B9016A /* DuelLayers.cpp in Sources */,
+				CEA377731291C60500B9016A /* Effects.cpp in Sources */,
 				CEA377741291C60500B9016A /* ExtraCost.cpp in Sources */,
 				CEA377751291C60500B9016A /* GameApp.cpp in Sources */,
 				CEA377761291C60500B9016A /* GameLauncher.cpp in Sources */,
@@ -2054,7 +2057,6 @@
 				CEA3778F1291C60500B9016A /* ManaCostHybrid.cpp in Sources */,
 				CEA377901291C60500B9016A /* MenuItem.cpp in Sources */,
 				CEA377911291C60500B9016A /* MTGAbility.cpp in Sources */,
-				751E1F1718FAE53E001B1E16 /* GridDeckView.cpp in Sources */,
 				CEA377931291C60500B9016A /* MTGCard.cpp in Sources */,
 				CEA377941291C60500B9016A /* MTGCardInstance.cpp in Sources */,
 				CEA377951291C60500B9016A /* MTGDeck.cpp in Sources */,
@@ -2093,7 +2095,6 @@
 				CEA377BA1291C60500B9016A /* utils.cpp in Sources */,
 				CEA377BB1291C60500B9016A /* WCachedResource.cpp in Sources */,
 				CEA377BC1291C60500B9016A /* WDataSrc.cpp in Sources */,
-				751E1F1618FAE53E001B1E16 /* DeckView.cpp in Sources */,
 				CEA377BD1291C60500B9016A /* WEvent.cpp in Sources */,
 				CEA377BE1291C60500B9016A /* WFilter.cpp in Sources */,
 				CEA377BF1291C60500B9016A /* WFont.cpp in Sources */,
@@ -2103,7 +2104,6 @@
 				CE9A478512B514BA00C9F38A /* EAGLView.m in Sources */,
 				CE9A478612B514BA00C9F38A /* EAGLViewController.m in Sources */,
 				CE9A478912B514BA00C9F38A /* ES2Renderer.m in Sources */,
-				751E1F1518FAE53E001B1E16 /* CarouselDeckView.cpp in Sources */,
 				CE9A478A12B514BA00C9F38A /* main.m in Sources */,
 				CE9A478D12B514BA00C9F38A /* wagicAppDelegate.m in Sources */,
 				CE9E71DD1375A58600759DDC /* thread.cpp in Sources */,
@@ -2152,6 +2152,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = (
+					armv6,
+					"$(ARCHS_STANDARD_32_BIT)",
+				);
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -2201,6 +2205,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					"$(ARCHS_STANDARD_32_BIT)",
+				);
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
@@ -2244,6 +2252,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = (
+					armv6,
+					"$(ARCHS_STANDARD_32_BIT)",
+				);
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -2279,7 +2291,10 @@
 					"\"$(SRCROOT)/../../admobsdk/iOS/GoogleAdMobAdsSDKiOS-5.0.5\"",
 				);
 				"New Setting" = "";
-				OTHER_LDFLAGS = "-Wl";
+				OTHER_LDFLAGS = (
+					"-no_implicit_dylibs",
+					"-Wl",
+				);
 				PRODUCT_NAME = wagic;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -2292,6 +2307,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					armv6,
+					"$(ARCHS_STANDARD_32_BIT)",
+				);
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
@@ -2320,7 +2339,10 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../admobsdk/iOS/GoogleAdMobAdsSDKiOS-5.0.5\"",
 				);
-				OTHER_LDFLAGS = "-Wl";
+				OTHER_LDFLAGS = (
+					"-no_implicit_dylibs",
+					"-Wl",
+				);
 				PRODUCT_NAME = wagic;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -2332,6 +2354,7 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEPLOYMENT_LOCATION = NO;
@@ -2342,11 +2365,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../Boost/boost;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = (
-					"-DTIXML_USE_STL",
-					"-fno-objc-arc",
-				);
 				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2356,6 +2374,7 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -2363,10 +2382,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../Boost/boost;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
-				OTHER_CFLAGS = (
-					"-DNS_BLOCK_ASSERTIONS=1",
-					"-DTIXML_USE_STL=1",
-				);
+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;

projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic-opengl1.1.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

projects/mtg/wagic.xcodeproj/xcuserdata/mnguyen.xcuserdatad/xcschemes/wagic.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

travis-script.sh

@@ -1,23 +1,10 @@
 #!/bin/sh -ex
 
 # let's dump some info to debug a bit
+echo PSPDEV = $PSPDEV
+echo psp-config = `psp-config --psp-prefix`
 echo ls = `ls`
 echo pwd = `pwd`
-# computing potential release name
-echo TRAVIS_PULL_REQUEST = $TRAVIS_PULL_REQUEST
-echo TRAVIS_BRANCH = $TRAVIS_BRANCH
-
-if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-if [ "$TRAVIS_BRANCH" = "alphas" ]; then
-    export RELEASE_NAME="alpha-${TRAVIS_BUILD_NUMBER}"
-else if [ "$TRAVIS_BRANCH" = "master" ]; then
-    export RELEASE_NAME="latest-master"
-fi
-fi
-fi
-
-echo RELEASE_NAME = $RELEASE_NAME
-
 
 # updating versions with the TRAVIS build numbers
 cd projects/mtg/
@@ -27,80 +14,77 @@ cd ../..
 # we create resource package
 cd projects/mtg/bin/Res
 python createResourceZip.py
+python createResourceZip.py --platform=qt
 # if we let the zip here, Wagic will use it in the testsuite
 # and we'll get 51 failed test cases
 mv core_*.zip ../../../../core.zip
 cd ../../../..
 
 # we're building a PSP binary here
-if [ "$BUILD_TYPE" = "PSP" ]; then
- # let's dump some info to debug a bit
- echo PSPDEV = $PSPDEV
-  echo psp-config = `psp-config --psp-prefix`
-  cd JGE
-  make -j 4
-  cd ..
-  cd projects/mtg
-  mkdir objs
-  make -j 4
-  mkdir WTH
-  mkdir WTH/Res
-  mv EBOOT.PBP WTH/
-  mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
-  cp ../../core.zip WTH/Res
-  cd WTH/Res
-  unzip core.zip
-  rm core.zip
-  cd ..
-  chmod -R 775 Res
-  cd ..
-  zip psprelease.zip -r WTH/
-  cd ../..
-fi
+cd JGE
+make -j 8
+make -j 8 -f Makefile.hge install
+cd ..
+cd projects/mtg
+mkdir objs
+make -j 8
+mkdir WTH
+mkdir WTH/Res
+mv EBOOT.PBP WTH/
+mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
+cp ../../core.zip WTH/Res
+cd WTH/Res
+unzip core.zip
+rm core.zip
+cd ..
+chmod -R 775 Res
+cd ..
+zip psprelease.zip -r WTH/
+cd ../..
 
 # we're building an Android binary here
-if [ "$BUILD_TYPE" = "Android" ]; then
-  android-ndk-r9/ndk-build -C projects/mtg/Android -j4
-  $ANDROID list targets
-  $ANDROID update project -t 1 -p projects/mtg/Android
-  ant debug -f projects/mtg/Android/build.xml
-fi
+android-ndk-r9/ndk-build -C projects/mtg/Android -j8
+$ANDROID list targets
+$ANDROID update project -t 1 -p projects/mtg/Android
+ant debug -f projects/mtg/Android/build.xml
 
-if [ "$BUILD_TYPE" = "Qt" ]; then
-  # we're building a Qt version with GUI here
-  mkdir qt-gui-build
-  cd qt-gui-build
-  $QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
-  make -j 4
-  cd ..
-  # let's try an Intel linux binary in debug text-mode-only
-  $QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
-  make -j 4
+# we're building a Qt version with GUI here
+mkdir qt-gui-build
+cd qt-gui-build
+mv ../projects/mtg/bin/Res/settings/options.orig.txt ../projects/mtg/bin/Res/settings/options.txt
+mv ../projects/mtg/bin/Res/player/options.orig.txt ../projects/mtg/bin/Res/player/options.txt
+qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
+make -j 8
+cd ..
 
-  # we're cross-compiling a Qt Windows version here,
-  # PATH is only set here to prevent colision
+# let's try an Intel linux binary in debug text-mode-only
+qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
+make -j 8
 
-  # export PATH="$PATH:/opt/mingw32/bin"
-  # mkdir build
-  # cd build
-  # mkdir win-cross
-  # cd win-cross
-  # /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
-  # make -j 4
-  # cd release
-  # cp ../../../projects/mtg/bin/fmod.dll .
-  # cp /opt/mingw32/bin/QtCore4.dll .
-  # cp /opt/mingw32/bin/QtGui4.dll .
-  # cp /opt/mingw32/bin/QtNetwork4.dll .
-  # cp /opt/mingw32/bin/QtOpenGL4.dll .
-  # cp ../../../projects/mtg/bin/zlib1.dll .
-  # cp /opt/mingw32/bin/libpng15-15.dll .
-  # cd ..
-  # zip win-cross.zip -r release/
-  # cd ../..
+# we're cross-compiling a Qt Windows version here, 
+# PATH is only set here to prevent collision
+export PATH="$PATH:/opt/mingw32/bin"
+mkdir build
+cd build
+mkdir win-cross
+cd win-cross
+/opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
+make -j 8
+cd release
+cp ../../../projects/mtg/bin/fmod.dll .
+cp /opt/mingw32/bin/QtCore4.dll .
+cp /opt/mingw32/bin/QtGui4.dll .
+cp /opt/mingw32/bin/QtNetwork4.dll .
+cp /opt/mingw32/bin/QtOpenGL4.dll .
+cp ../../../projects/mtg/bin/zlib1.dll .
+cp /opt/mingw32/bin/libpng15-15.dll .
+cd ..
+zip win-cross.zip -r release/
+mv ../../projects/mtg/bin/Res/settings/options.txt ../../projects/mtg/bin/Res/settings/options.orig.txt
+mv ../../projects/mtg/bin/Res/player/options.txt ../../projects/mtg/bin/Res/player/options.orig.txt
+cd ../..
 
-  # Now we run the testsuite (Res needs to be in the working directory)
-  cd projects/mtg
-  ../../wagic
-  cd ../..
-fi
+# Now we run the testsuite (Res needs to be in the working directory)
+cd projects/mtg
+../../wagic
+cd ../..

upload-binaries.py

@@ -1,66 +0,0 @@
-import sys
-import os
-import zipfile
-from pyjavaproperties import Properties
-from optparse import OptionParser
-from github3 import login
-
-def checkRelease(repository, remote):
-    release = None
-    for r in repository.iter_releases():
-        if r.name == 'latest-master' :
-            release = r
-            for a in r.assets :
-                if a.name == remote :
-                    # need to delete the old release
-                    r.delete()
-                    # need also to delete the tag (reference)
-                    ref = repository.ref('tags/latest-master')
-                    ref.delete()
-                    release = None
-
-    if release is None:
-        # now, we recreate a new one
-        release = repository.create_release('latest-master', 'master', 'latest-master',
-            'Latest successful builds of the master branch automatically uploaded by Travis or AppVeyor CI.',
-            False,
-            True)
-
-    return release
-
-
-def suffixFilename(filename, build):
-    p = Properties();
-    p.load(open('projects/mtg/build.number.properties'));
-    minor = p['build.minor'];
-    major = p['build.major'];
-    point = p['build.point'];
-    name, extension = os.path.splitext(filename)
-    filename = name + '-' + major + minor + point + '-' + build + extension
-    return filename
-
-def main():
-    parser = OptionParser()
-    parser.add_option("-t", "--token", help="TOKEN: specify authentication token to use", metavar="TOKEN", dest="token")
-    parser.add_option("-s", "--sha", help="SHA: specify commit SHA", metavar="SHA", dest="sha")
-    parser.add_option("-l", "--local", help="FILE: specify local file path to upload", metavar="LOCAL", dest="local")
-    parser.add_option("-r", "--remote", help="NAME: specify remote asset name in the release.", metavar="REMOTE", dest="remote")
-    parser.add_option("-b", "--branch", help="BRANCH: specify branch of the commit", metavar="BRANCH", dest="branch")
-
-    (options, args) = parser.parse_args()
-
-    if (options.token and options.sha and options.local and options.remote and options.branch == 'master'):
-        gh = login(token = options.token)
-    else:
-        parser.print_help()
-        return
-
-    repository = gh.repository('WagicProject', 'wagic')
-    r = checkRelease(repository, options.remote)
-    filename = options.remote
-    with open(options.local, 'rb') as fd:
-        r.upload_asset('application/zip', filename , fd)
-
-
-if __name__ == "__main__":
-        main()

upload-binaries.sh

@@ -10,28 +10,28 @@ if [ "$TRAVIS_BRANCH" == "alphas" ]; then
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @core.zip \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core.zip"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Uploading android package\n"
   curl -X POST -H "Authorization: token ${GH_TOKEN}" \
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @projects/mtg/Android/bin/Wagic-debug.apk \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android.apk"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android-${TRAVIS_BUILD_NUMBER}.apk"
 
   echo -e "Uploading PSP package\n"
   curl -X POST -H "Authorization: token ${GH_TOKEN}" \
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @projects/mtg/psprelease.zip \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp-${TRAVIS_BUILD_NUMBER}.zip"
 
-#  echo -e "Uploading Windows package\n"
-#  curl -X POST -H "Authorization: token ${GH_TOKEN}" \
-#     -H "Accept: application/vnd.github.manifold-preview" \
-#     -H "Content-Type: application/zip" \
-#     --data-binary @build/win-cross/win-cross.zip \
-#     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip"
+  echo -e "Uploading Windows package\n"
+  curl -X POST -H "Authorization: token ${GH_TOKEN}" \
+     -H "Accept: application/vnd.github.manifold-preview" \
+     -H "Content-Type: application/zip" \
+     --data-binary @build/win-cross/win-cross.zip \
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Done uploading\n"
 fi
@@ -71,28 +71,28 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @core.zip \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core.zip"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Uploading android package\n"
   curl -X POST -H "Authorization: token ${GH_TOKEN}" \
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @projects/mtg/Android/bin/Wagic-debug.apk \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android.apk"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android-${TRAVIS_BUILD_NUMBER}.apk"
 
   echo -e "Uploading PSP package\n"
   curl -X POST -H "Authorization: token ${GH_TOKEN}" \
      -H "Accept: application/vnd.github.manifold-preview" \
      -H "Content-Type: application/zip" \
      --data-binary @projects/mtg/psprelease.zip \
-     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp-${TRAVIS_BUILD_NUMBER}.zip"
 
-#  echo -e "Uploading Windows package\n"
-#  curl -X POST -H "Authorization: token ${GH_TOKEN}" \
-#     -H "Accept: application/vnd.github.manifold-preview" \
-#     -H "Content-Type: application/zip" \
-#     --data-binary @build/win-cross/win-cross.zip \
-#     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip"
+  echo -e "Uploading Windows package\n"
+  curl -X POST -H "Authorization: token ${GH_TOKEN}" \
+     -H "Accept: application/vnd.github.manifold-preview" \
+     -H "Content-Type: application/zip" \
+     --data-binary @build/win-cross/win-cross.zip \
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Done uploading\n"
 fi