Removing previous releases in order to upload new one

.travis.yml

@@ -8,18 +8,16 @@ before_install:
 - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin"
 - export ANDROID="android-sdk-linux/tools/android"
 install:
-- 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
+- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi
 - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download
 - tar -x --xz -f sdk.lzma
 - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv
 - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv
 - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2
 - tar -zxf android-sdk_r22-linux.tgz
-- $ANDROID list sdk --extended -a
-- echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.0.1","android-10" --no-ui --force > log.txt
+- $ANDROID list sdk -a
+- echo yes | $ANDROID update sdk -a --filter 1,2,4,18 --no-ui --force > log.txt
 - sudo pip install pyjavaproperties
 script: ./travis-script.sh
 env:

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/JAnimator.h

@@ -297,6 +297,7 @@ public:
 private:
 	float mTimer;
 	float mFrameTime;
+	JAnimator* mAnimator;
 	vector<JAnimatorObject *> mObjects;
 
 };

JGE/include/JDistortionMesh.h

@@ -37,6 +37,7 @@ private:
 	float mTexY;
 	float mTexWidth;
 	float mTexHeight;
+	JTexture* mTexture;
 	JQuad* mQuad;
 	
 	

JGE/include/JFileSystem.h

@@ -128,7 +128,6 @@ public:
     bool readIntoString(const string & FilePath, string & target);
     bool openForWrite(ofstream & File, const string & FilePath, ios_base::openmode mode = ios_base::out );
     bool Rename(string from, string to);
-    bool Remove(string aFile);
 
     //Returns true if strFilename exists somewhere in the fileSystem
     bool FileExists(const string& strFilename);

JGE/include/Threading.h

@@ -1,7 +1,7 @@
 #ifndef THREADING_H
 #define THREADING_H
 
-#if !defined(PSP) && !defined(QT_CONFIG) && !(__cplusplus > 199711L) && !defined(SDL_CONFIG)
+#if !defined(PSP) && !defined(QT_CONFIG)
 #include <boost/date_time.hpp>
 
 #ifdef WIN32
@@ -14,7 +14,7 @@
 #endif
 
 #include <boost/thread/mutex.hpp>
-#elif defined(PSP)
+#elif !defined(QT_CONFIG)
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
@@ -212,13 +212,13 @@ namespace boost
     **
     ** The intent of its usage is this form only:
     ** mWorkerThread = boost::thread(ThreadProc, this);
-    ** where ThreadProc is a static member function of the 'this' class,eg:
-    ** static void FOO::ThreadProc(void* inParam)
-    ** {
-    **		FOO* instance = reinterpret_cast<FOO*>(inParam);
-    **		// now you have class instance data available...
-    ** }
-    **
+	** where ThreadProc is a static member function of the 'this' class,eg:
+	** static void FOO::ThreadProc(void* inParam)
+	** {
+	**		FOO* instance = reinterpret_cast<FOO*>(inParam);
+	**		// now you have class instance data available...
+	** }
+	** 
     ** Any other variant of a thread proc with more than one param is unimplemented.
     */
     class thread
@@ -307,7 +307,7 @@ namespace boost
     }
 }
 
-#elif defined(QT_CONFIG) && (__cplusplus <= 199711L)
+#elif defined(QT_CONFIG)
 
 #include <QMutex>
 #include <QThread>
@@ -537,300 +537,6 @@ namespace boost
     }
 }
 
-#elif (__cplusplus > 199711L)
-
-#include <thread>
-#include <mutex>
-
-namespace boost
-{
-    typedef std::thread thread;
-
-    template <class Mutex>
-    struct unique_lock
-    {
-        unique_lock(Mutex& inMutex) : mMutex(&inMutex)
-        {
-            mMutex->lock();
-        }
-
-        ~unique_lock()
-        {
-            mMutex->unlock();
-        }
-
-        Mutex* mMutex;
-    };
-
-    class mutex
-    {
-    public:
-
-        typedef unique_lock<mutex> scoped_lock;
-
-        mutex()
-          : mQMutex()
-        {
-        }
-
-        ~mutex()
-        {
-        }
-
-        void lock()
-        {
-            mQMutex.lock();
-        }
-
-        void unlock()
-        {
-            mQMutex.unlock();
-        }
-
-        std::mutex mQMutex;
-
-    private:
-        mutex(mutex const&);
-        mutex& operator=(mutex const&);
-    };
-
-    namespace posix_time
-    {
-        typedef unsigned int milliseconds;
-    }
-
-    /**
-    ** boost's platform neutral sleep call.
-    */
-    namespace this_thread
-    {
-        inline void sleep(boost::posix_time::milliseconds const& time)
-        {
-            std::this_thread::sleep_for(std::chrono::milliseconds(time));
-        }
-    }
-}
-
-#elif defined(SDL_CONFIG)
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include "../include/JLogger.h"
-
-namespace boost
-{
-    template <class Mutex>
-    struct unique_lock
-    {
-        unique_lock(Mutex& inMutex) : mMutex(&inMutex)
-        {
-            mMutex->lock();
-        }
-
-        ~unique_lock()
-        {
-            mMutex->unlock();
-        }
-
-        Mutex* mMutex;
-    };
-
-    class mutex
-    {
-    public:
-
-        typedef unique_lock<mutex> scoped_lock;
-
-        mutex()
-          : mpSDLMutex(0)
-        {
-            mpSDLMutex = SDL_CreateMutex();
-        }
-
-        ~mutex()
-        {
-            SDL_DestroyMutex(mpSDLMutex);
-        }
-
-        void lock()
-        {
-            SDL_mutexP(mpSDLMutex);
-        }
-
-        void unlock()
-        {
-            SDL_mutexV(mpSDLMutex);
-        }
-
-        SDL_mutex* mpSDLMutex;
-
-    private:
-        mutex(mutex const&);
-        mutex& operator=(mutex const&);
-    };
-
-
-
-    class recursive_mutex
-    {
-    public:
-
-        typedef unique_lock<recursive_mutex> scoped_lock;
-
-        recursive_mutex()
-            : mpSDLMutex(0)
-        {
-            mpSDLMutex = SDL_CreateMutex();
-        }
-
-        ~recursive_mutex()
-        {
-            SDL_DestroyMutex(mpSDLMutex);
-        }
-
-        void lock()
-        {
-            SDL_mutexP(mpSDLMutex);
-        }
-
-        void unlock()
-        {
-            SDL_mutexV(mpSDLMutex);
-        }
-
-        SDL_mutex* mpSDLMutex;
-
-    private:
-        recursive_mutex(recursive_mutex const&);
-        recursive_mutex& operator=(recursive_mutex const&);
-    };
-
-
-    /**
-    ** Emulating boost::thread configuration glue, with some shortcuts
-    ** This detail namespace is a distillation of boost's thread.hpp, thread_data.hpp.
-    */
-    namespace detail
-    {
-        struct thread_data_base
-        {
-            thread_data_base()
-            {
-            }
-
-            virtual ~thread_data_base()
-            {
-            }
-
-            virtual void run() = 0;
-        };
-
-        typedef boost::shared_ptr<detail::thread_data_base> thread_data_ptr;
-
-        template<typename F>
-        class thread_data : public detail::thread_data_base
-        {
-        public:
-            thread_data(F f_) : f(f_)
-            {
-            }
-
-            void run()
-            {
-                f();
-            }
-
-        private:
-            F f;
-
-            void operator=(thread_data&);
-            thread_data(thread_data&);
-        };
-
-    } //namespace detail
-
-    /**
-    ** A simplistic implementation of boost::thread, using QThread.
-    **
-    */
-    class thread
-    {
-        /*
-        ** Helper class for sceKernelStartThread, which passes args by value, not by reference
-        ** We use this struct to wrap any pointers that we want to pass to the worker thread.
-        */
-        struct CallbackData
-        {
-            CallbackData(detail::thread_data_ptr inThreadInfo)
-                : mThreadInfo(inThreadInfo)
-            {
-            }
-
-            detail::thread_data_ptr mThreadInfo;
-        };
-
-    public:
-
-        thread()
-        {
-        }
-
-        template <class F,class A1>
-        thread(F f, A1 a1) : mThreadInfo(make_thread_info(boost::bind(boost::type<void>(), f, a1)))
-        {
-            mpSDLThread = SDL_CreateThread(ThreadProc, &mThreadInfo);
-        }
-
-        ~thread()
-        {
-        }
-
-        void join()
-        {
-            int status;
-            SDL_WaitThread(mpSDLThread, &status);
-        }
-
-    private:
-        static int ThreadProc(void *inParam)
-        {
-            detail::thread_data_ptr* threadInfo = reinterpret_cast<detail::thread_data_ptr* >(inParam);
-            CallbackData callbackData(*threadInfo);
-
-            LOG("Entering thread::ThreadProc");
-            callbackData.mThreadInfo->run();
-            return 0;
-        }
-
-        template<typename F>
-        static inline detail::thread_data_ptr make_thread_info(F f)
-        {
-            return detail::thread_data_ptr(new detail::thread_data<F>(f));
-        }
-
-        detail::thread_data_ptr mThreadInfo;
-        SDL_Thread* mpSDLThread;
-    };
-
-    namespace posix_time
-    {
-        typedef unsigned int milliseconds;
-    }
-
-    /**
-    ** boost's platform neutral sleep call.
-    */
-    namespace this_thread
-    {
-        inline void sleep(boost::posix_time::milliseconds const& time)
-        {
-            SDL_Delay(time);
-        }
-    }
-}
 #endif
 
 #endif // THREADING_H

JGE/include/qt/corewrapper.h

@@ -136,20 +136,6 @@ signals:
 private slots:
 
 private:
-    int lastPosx(){
-#if QT_VERSION >= 0x050000
-        return m_lastPos.x()*devicePixelRatio();
-#else
-        return m_lastPos.x();
-#endif
-    }
-    int lastPosy(){
-#if QT_VERSION >= 0x050000
-        return m_lastPos.y()*devicePixelRatio();
-#else
-        return m_lastPos.y();
-#endif
-    }
     void timerEvent( QTimerEvent* );
     void doAndEnqueue(JButton action) {
         m_engine->HoldKey_NoRepeat(action);
@@ -168,7 +154,6 @@ private:
     int m_timerId;
     bool m_active;
     QRect m_viewPort;
-    QPoint m_lastPos;
 #ifdef QT_WIDGET
 #if (defined Q_WS_MAEMO_5) || (defined MEEGO_EDITION_HARMATTAN) || (defined Q_WS_ANDROID)
   int mMouseDownX;

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/JFileSystem.cpp

@@ -313,15 +313,11 @@ bool JFileSystem::readIntoString(const string & FilePath, string & target)
 
     int fileSize = GetFileSize(file);
 
-#ifndef __MINGW32__
     try {
-#endif
         target.resize((std::string::size_type) fileSize);
-#ifndef __MINGW32__
     } catch (bad_alloc&) {
         return false;
     }
-#endif
 
 
     if (fileSize)
@@ -557,13 +553,7 @@ bool JFileSystem::Rename(string _from, string _to)
     string from = mUserFSPath + _from;
     string to = mUserFSPath + _to;
     std::remove(to.c_str());
-    return (rename(from.c_str(), to.c_str()) == 0);
-}
-
-bool JFileSystem::Remove(string aFile)
-{
-    string toRemove = mUserFSPath + aFile;
-    return (std::remove(toRemove.c_str()) == 0);
+    return rename(from.c_str(), to.c_str()) ? true: false;
 }
 
 int JFileSystem::GetFileSize(izfstream & file)

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/qt/corewrapper.cpp

@@ -418,29 +418,29 @@ void WagicCore::mousePressEvent(QMouseEvent *event)
 {
   if(event->button() == Qt::LeftButton)
   {
-    m_lastPos = event->pos();
+    QPoint lastPos = event->pos();
     // this is intended to convert window coordinate into game coordinate.
     // this is correct only if the game and window have the same aspect ratio, otherwise, it's just wrong
     int actualWidth = (int) JRenderer::GetInstance()->GetActualWidth();
     int actualHeight = (int) JRenderer::GetInstance()->GetActualHeight();
 
-    if (lastPosy() >= m_viewPort.top() &&
-      lastPosy() <= m_viewPort.bottom() &&
-      lastPosx() <= m_viewPort.right() &&
-      lastPosx() >= m_viewPort.left()) {
+    if (lastPos.y() >= m_viewPort.top() &&
+      lastPos.y() <= m_viewPort.bottom() &&
+      lastPos.x() <= m_viewPort.right() &&
+      lastPos.x() >= m_viewPort.left()) {
       m_engine->LeftClicked(
-                  ((lastPosx()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
-                  ((lastPosy()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
+                  ((lastPos.x()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
+                  ((lastPos.y()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
 #if (!defined Q_WS_MAEMO_5) && (!defined MEEGO_EDITION_HARMATTAN) && (!defined Q_WS_ANDROID)
       m_engine->HoldKey_NoRepeat(JGE_BTN_OK);
 #else
-      mMouseDownX = lastPosx();
-      mMouseDownY = lastPosy();
+      mMouseDownX = lastPos.x();
+      mMouseDownY = lastPos.y();
       mLastFingerDownTime = g_startTimer.elapsed();
 #endif
-    } else if(lastPosy()<m_viewPort.top()) {
+    } else if(lastPos.y()<m_viewPort.top()) {
       m_engine->HoldKey_NoRepeat(JGE_BTN_MENU);
-    } else if(lastPosy()>m_viewPort.bottom()) {
+    } else if(lastPos.y()>m_viewPort.bottom()) {
       m_engine->HoldKey_NoRepeat(JGE_BTN_NEXT);
     }
     event->accept();
@@ -465,33 +465,33 @@ void WagicCore::mouseReleaseEvent(QMouseEvent *event)
 {
   if(event->button() == Qt::LeftButton)
   {
-    m_lastPos = event->pos();
+    QPoint lastPos = event->pos();
 
-    if (lastPosy() >= m_viewPort.top() &&
-      lastPosy() <= m_viewPort.bottom() &&
-      lastPosx() <= m_viewPort.right() &&
-      lastPosx() >= m_viewPort.left()) {
+    if (lastPos.y() >= m_viewPort.top() &&
+      lastPos.y() <= m_viewPort.bottom() &&
+      lastPos.x() <= m_viewPort.right() &&
+      lastPos.x() >= m_viewPort.left()) {
 #if (defined Q_WS_MAEMO_5) || (defined MEEGO_EDITION_HARMATTAN) || (defined Q_WS_ANDROID)
       if(g_startTimer.elapsed() - mLastFingerDownTime <= kTapEventTimeout )
       {
-        if(abs(mMouseDownX - lastPosx()) < kHitzonePliancy &&
-           abs(mMouseDownY - lastPosy()) < kHitzonePliancy)
+        if(abs(mMouseDownX - lastPos.x()) < kHitzonePliancy &&
+           abs(mMouseDownY - lastPos.y()) < kHitzonePliancy)
         {
           m_engine->HoldKey_NoRepeat(JGE_BTN_OK);
         }
       }
       else if (g_startTimer.elapsed() - mLastFingerDownTime >= kSwipeEventMinDuration)
       { // Let's swipe
-        m_engine->Scroll(lastPosx()-mMouseDownX, lastPosy()-mMouseDownY);
+        m_engine->Scroll(lastPos.x()-mMouseDownX, lastPos.y()-mMouseDownY);
       }
 #else
 //#if (!defined Q_WS_MAEMO_5) && (!defined MEEGO_EDITION_HARMATTAN)
       m_engine->ReleaseKey(JGE_BTN_OK);
 #endif
       m_engine->ReleaseKey(JGE_BTN_MENU);
-    } else if(lastPosy() < m_viewPort.top()) {
+    } else if(lastPos.y() < m_viewPort.top()) {
       m_engine->ReleaseKey(JGE_BTN_MENU);
-    } else if(lastPosy() > m_viewPort.bottom()) {
+    } else if(lastPos.y() > m_viewPort.bottom()) {
       m_engine->ReleaseKey(JGE_BTN_NEXT);
     }
     event->accept();
@@ -517,15 +517,15 @@ void WagicCore::mouseMoveEvent(QMouseEvent *event)
   int actualWidth = (int) JRenderer::GetInstance()->GetActualWidth();
   int actualHeight = (int) JRenderer::GetInstance()->GetActualHeight();
 
-  m_lastPos = event->pos();
+  QPoint lastPos = event->pos();
 
-  if (lastPosy() >= m_viewPort.top() &&
-    lastPosy() <= m_viewPort.bottom() &&
-    lastPosx() <= m_viewPort.right() &&
-    lastPosx() >= m_viewPort.left()) {
+  if (lastPos.y() >= m_viewPort.top() &&
+    lastPos.y() <= m_viewPort.bottom() &&
+    lastPos.x() <= m_viewPort.right() &&
+    lastPos.x() >= m_viewPort.left()) {
     m_engine->LeftClicked(
-                ((lastPosx()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
-                ((lastPosy()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
+                ((lastPos.x()-m_viewPort.left())*SCREEN_WIDTH)/actualWidth,
+                ((lastPos.y()-m_viewPort.top())*SCREEN_HEIGHT)/actualHeight);
     event->accept();
   } else {
     super::mouseMoveEvent(event);

JGE/src/zipFS/zstream.h

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

README.md

@@ -16,6 +16,6 @@ Wagic, the Homebrew, is a C++ game engine that allows to play card games against
 It is highly customizable and allows the player to tweak the rules / create their own cards, their own themes, etc... 
 
 
-Info, downloads, discussions and more at http://wololo.net/forum/index.php
+Info, Downloads, and more at http://wololo.net
 
 -![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")

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/bin/Res/sets/primitives/mtg.txt

@@ -28204,7 +28204,7 @@ subtype=Equipment
 [card]
 name=Executioner's Swing
 text=Target creature that dealt damage this turn gets -5/-5 until end of turn.
-target=creature[damager]
+target=creature[damaged]
 auto=-5/-5 ueot
 mana={W}{B}
 type=Instant
@@ -31457,7 +31457,7 @@ toughness=2
 [/card]
 [card]
 name=Flourishing Defenses
-auto=@counteradded(-1/-1) from(creature):may token(Elf Warrior,Creature elf warrior,1/1,green)
+auto=@counteradded(-1/-1) from(creature|mybattlefield):may token(Elf Warrior,Creature elf warrior,1/1,green)
 text=Whenever a -1/-1 counter is placed on a creature, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 mana={4}{G}
 type=Enchantment
@@ -37166,7 +37166,7 @@ type=Sorcery
 [/card]
 [card]
 name=Grave Pact
-auto=@movedTo(creature|graveyard) from(mybattlefield):ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice!$ opponent
+auto=@movedTo(creature|mygraveyard) from(mybattlefield):ability$!name(sacrifice) notatarget(creature|mybattlefield) sacrifice!$ opponent
 text=Whenever a creature you control dies, each other player sacrifices a creature.
 mana={1}{B}{B}{B}
 type=Enchantment
@@ -73586,7 +73586,7 @@ toughness=6
 ###The 2 cards below should stay together (Flip Card)###
 [card]
 name=Rune-Tail, Kitsune Ascendant
-auto=this(controllerlife > 29) transforms((,newability[flip(Rune-Tail's Essence)]))
+auto=this(controllerlife >30) all(this) flip(Rune-Tail's Essence)
 text=When you have 30 or more life, flip Rune-Tail, Kitsune Ascendant.
 mana={2}{W}
 type=Legendary Creature
@@ -78444,7 +78444,11 @@ toughness=2
 [/card]
 [card]
 name=Shifting Sky
-auto=chooseacolor lord(*[-land]) becomes(,chosencolor) chooseend
+auto=choice name(choose white) all(this) transforms((,newability[lord(*[-land]) becomes(,white)])) forever
+auto=choice name(choose blue) all(this) transforms((,newability[lord(*[-land]) becomes(,blue)])) forever
+auto=choice name(choose black) all(this) transforms((,newability[lord(*[-land]) becomes(,black)])) forever
+auto=choice name(choose red) all(this) transforms((,newability[lord(*[-land]) becomes(,red)])) forever
+auto=choice name(choose green) all(this) transforms((,newability[lord(*[-land]) becomes(,green)])) forever
 text=As Shifting Sky enters the battlefield, choose a color. -- All nonland permanents are the chosen color.
 mana={2}{U}
 type=Enchantment

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

@@ -308,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/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/build.xml

@@ -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/CardDescriptor.h

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

projects/mtg/include/GameStateAwards.h

@@ -17,6 +17,7 @@ private:
     WSrcCards * setSrc;
     SimpleMenu * menu;
     bool showMenu;
+    bool showAlt;
     bool saveMe;
     int mState;
     int mDetailItem;

projects/mtg/include/GuiPlay.h

@@ -47,6 +47,7 @@ protected:
     {
         static const float HEIGHT;
         unsigned attackers;
+        unsigned blockers;
         unsigned currentAttacker;
         float height;
 

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/SimplePopup.h

@@ -20,6 +20,7 @@ class SimplePopup: public JGuiController
 private:
     float mWidth, mX, mY;
     int mMaxLines;
+    int mFontId;
     DeckMetaData * mDeckInformation;
     string mTitle;
     WFont *mTextFont;

projects/mtg/include/WResource_Fwd.h

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

projects/mtg/include/config.h

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

projects/mtg/src/AIHints.cpp

@@ -314,7 +314,7 @@ bool AIHints::canWeCombo(GameObserver* observer,MTGCardInstance * card,AIPlayerB
         int comboPartsRestriction = 0;
 
         if(gotCombo)
-            return gotCombo;//because more than one might be possible at any time.
+            return gotCombo;//because more then one might be possible at any time.
         if (hints[i]->hold.size())
         {
             for(unsigned int hPart = 0; hPart < hints[i]->hold.size(); hPart++)

projects/mtg/src/AIPlayerBaka.cpp

@@ -445,7 +445,7 @@ int OrderedAIAction::getEfficiency()
             }
             if ((drawer->getNumCards() >= p->game->library->nb_cards && (Targetable*)p == drawer->getTarget()) || (p->game->hand->nb_cards > 10 && (Targetable*)p == drawer->getTarget()))
             {
-                //if the amount im drawing will mill me to death or i have more than 10 cards in hand, eff is 0;
+                //if the amount im drawing will mill me to death or i have more then 10 cards in hand, eff is 0;
                 efficiency = 0;
             }
             break;
@@ -853,7 +853,7 @@ ManaCost * AIPlayerBaka::getPotentialMana(MTGCardInstance * target)
             if (card == target)
                 used[card] = true; //http://code.google.com/p/wagic/issues/detail?id=76
             if (!used[card] && amp->isReactingToClick(card) && amp->output->getConvertedCost() == 1)
-            {//ai can't use cards which produce more than 1 converted while using the old pMana method.
+            {//ai can't use cards which produce more then 1 converted while using the old pMana method.
                 result->add(amp->output);
                 used[card] = true;
             }

projects/mtg/src/AllAbilities.cpp

@@ -1994,23 +1994,28 @@ int AADynamic::resolve()
         break;
     case DYNAMIC_ABILITY_WHO_ITSELF:
         source = ((MTGCardInstance *) _target);
+        _target = _target;
         break;
     case DYNAMIC_ABILITY_WHO_TARGETCONTROLLER:
+        _target = _target;
         secondaryTarget = ((MTGCardInstance *) _target)->controller();
         break;
     case DYNAMIC_ABILITY_WHO_TARGETOPPONENT:
+        _target = _target;
         secondaryTarget = ((MTGCardInstance *) _target)->controller()->opponent();
         break;
     case DYNAMIC_ABILITY_WHO_TOSOURCE:
         tosrc = true;
         break;
     case DYNAMIC_ABILITY_WHO_SOURCECONTROLLER:
+        _target = _target;
         secondaryTarget = ((MTGCardInstance *) OriginalSrc)->controller();
         break;
     case DYNAMIC_ABILITY_WHO_SOURCEOPPONENT:
         secondaryTarget = OriginalSrc->controller()->opponent();
         break;
     default:
+        _target = _target;
         break;
     }
     if(amountsource == DYNAMIC_MYSELF_AMOUNT)
@@ -4723,15 +4728,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 +5708,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/Credits.cpp

@@ -386,7 +386,7 @@ void Credits::computeTournament(GameObserver* g, GameApp * _app,bool tournament,
         }
         if (mGamesWon>mGamesPlayed*0.80 && mGamesWon<mGamesPlayed)
         {
-            CreditBonus * b = NEW CreditBonus(250, _("Won more than 80 percentage of games"));
+            CreditBonus * b = NEW CreditBonus(250, _("Won more then 80 percentage of games"));
             bonus.push_back(b);
         }
 

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

@@ -796,7 +796,7 @@ void GameStateDuel::Update(float dt)
 
         if (game->didWin())
         {
-            //the following section will be called only in a classic or demo gamemode and if a tournament or match with more than one game is activ
+            //the following section will be called only in a classic or demo gamemode and if a tournament or match with more then one game is activ
             if ( (mParent->gameType == GAME_TYPE_CLASSIC || mParent->gameType == GAME_TYPE_DEMO)&& mParent->players[1] == PLAYER_TYPE_CPU && (tournament->isTournament() || tournament->getGamesToPlay()>1 ))
             {
                 setGamePhase(DUEL_STATE_SHOW_SCORE);

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/GuiPlay.cpp

@@ -103,7 +103,7 @@ inline float GuiPlay::VertStack::nextX()
 }
 
 GuiPlay::BattleField::BattleField() :
-    attackers(0), height(0.0), red(0), colorFlow(0)
+    attackers(0), blockers(0), height(0.0), red(0), colorFlow(0)
 {
 }
 const float GuiPlay::BattleField::HEIGHT = 80.0f;

projects/mtg/src/MTGAbility.cpp

@@ -4276,6 +4276,8 @@ void AbilityFactory::addAbilities(int _id, Spell * spell)
     if (card->hasType(Subtypes::TYPE_INSTANT) || card->hasType(Subtypes::TYPE_SORCERY))
     {
         MTGPlayerCards * zones = card->owner->game;
+        if(card->getCurrentZone())
+            card->currentZone->owner->game;//grab it from where ever it is.
         MTGPlayerCards * Endzones = card->owner->game;//put them in thier owners respective zones as per rules.
         if (card->basicAbilities[(int)Constants::EXILEDEATH])
         {

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/MTGRules.cpp

@@ -146,7 +146,7 @@ int MTGEventBonus::receiveEvent(WEvent * event)
             }
             //////bonus for having a LOT of specific type.
             //not else'd becuase it is possible for a card to contain
-            //more than one of the types, and for more than one to trigger.
+            //more then one of the types, and for more then one to trigger.
             if(e->card->hasType(Subtypes::TYPE_ARTIFACT))
                 toys[currentPlayer->getId()]++;
             if(e->card->isCreature())

projects/mtg/src/SimplePopup.cpp

@@ -15,7 +15,7 @@
 #include <iomanip>
 
 SimplePopup::SimplePopup(int id, JGuiListener* listener, const int fontId, const char * _title, DeckMetaData* deckMetaData, MTGAllCards * collection, float cancelX, float cancelY) :
-    JGuiController(JGE::GetInstance(), id, listener), mCollection(collection)
+    JGuiController(JGE::GetInstance(), id, listener), mFontId(fontId), mCollection(collection)
 {
     mX = 19;
     mY = 66;

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/wagic.pri

@@ -4,11 +4,11 @@ TEMPLATE = app
 
 #!macx:CONFIG += precompile_header
 unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter
-unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter
-unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable
-unix|*macx*:QMAKE_CXXFLAGS += -Wno-unused-value
-unix:!*macx*:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs
-unix:!*macx*:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror
+unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter
+unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable
+unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value
+unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs
+unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror
 
 windows:DEFINES += _CRT_SECURE_NO_WARNINGS
 unix|macx:DEFINES += LINUX
@@ -27,7 +27,6 @@ windows{
 #        INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/c++
 	LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
         LIBS += -lwsock32
-        DEFINES += FORCE_GL2
     }
     *-msvc* {
         INCLUDEPATH += extra
@@ -41,8 +40,8 @@ INCLUDEPATH += ../../Boost
 INCLUDEPATH += include
 
 unix:!symbian:LIBS += -lz
-windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib
-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
@@ -283,7 +282,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\
@@ -321,7 +319,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\

travis-script.sh

@@ -5,35 +5,12 @@ 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/
 ant update > error.txt
 cd ../..
 
-# we create resource package
-cd projects/mtg/bin/Res
-python createResourceZip.py
-# 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
 cd JGE
 make -j 8
@@ -41,18 +18,11 @@ 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/
+mkdir psprelease
+mv EBOOT.PBP psprelease/
+mv wagic.elf psprelease/
+mv wagic.prx psprelease/
+zip psprelease.zip -r psprelease/
 cd ../..
 
 # we're building an Android binary here
@@ -64,7 +34,7 @@ ant debug -f projects/mtg/Android/build.xml
 # we're building a Qt version with GUI here
 mkdir qt-gui-build
 cd qt-gui-build
-qmake ../projects/mtg/wagic-SDL.pro CONFIG+=release CONFIG+=graphics
+qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
 make -j 8
 cd ..
 
@@ -72,28 +42,16 @@ cd ..
 qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
 make -j 8
 
-# we're cross-compiling a Qt Windows version here, 
-# PATH is only set here to prevent colision
-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/
-cd ../..
+# we create resource package
+cd projects/mtg/bin/Res
+python createResourceZip.py
+# 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 ../../../..
 
 # Now we run the testsuite (Res needs to be in the working directory)
 cd projects/mtg
 ../../wagic
 cd ../..
+

upload-binaries.sh

@@ -10,35 +10,30 @@ 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"
-
-  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"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Done uploading\n"
 fi
 fi
 
+
+
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-if [ "$TRAVIS_BRANCH" == "master" ]; then
+if [ "$TRAVIS_BRANCH" == "releasing-master" ]; then
 
   # get info about all releases
   echo -e "Getting info about previous releases"
@@ -56,14 +51,9 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then
   curl -X DELETE -H "Authorization: token ${GH_TOKEN}" \
      "https://api.github.com/repos/WagicProject/wagic/releases/${ID_TO_DELETE}"
 
-  # delete previous tag
-  curl -X DELETE -H "Authorization: token ${GH_TOKEN}" \
-    "https://api.github.com/repos/WagicProject/wagic/git/refs/tags/latest-master"
-
-
   echo -e "Creating a release\n"
   curl -X POST -H "Authorization: token ${GH_TOKEN}" \
-      -d '{"tag_name": "latest-master", "target_commitish": "master", "name": "master-'${TRAVIS_BUILD_NUMBER}'", "body": "Automatic release based on latest commit to master branch generated by Travis CI", "draft": false, "prerelease": true}' "https://api.github.com/repos/WagicProject/wagic/releases" > json.txt
+      -d '{"tag_name": "latest-master", "target_commitish": "master", "name": "Master branch release number '${TRAVIS_BUILD_NUMBER}'", "body": "Automatic release on master branch generated by Travis CI", "draft": false, "prerelease": true}' "https://api.github.com/repos/WagicProject/wagic/releases" > json.txt
   IDDI=`cat json.txt | jq '.id'`
 
   echo -e "Uploading Core resources\n"
@@ -71,28 +61,21 @@ 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"
-
-  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"
+     "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp-${TRAVIS_BUILD_NUMBER}.zip"
 
   echo -e "Done uploading\n"
 fi