Added/fixed primitives.

Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.
Added new keyword to count creature of the same type with both unique and common names, added/fixed primitives form M19 set.

.travis.yml

@@ -1,4 +1,5 @@
 language: cpp
+dist: trusty
 branches:
   except:
     - latest-master
@@ -7,28 +8,35 @@ before_install:
   - export BUILD_PSP=YES
   - export BUILD_ANDROID=YES
   - export BUILD_Qt=YES
-  - export BUILD_MAC=YES
+  - export BUILD_MAC=NO
+# Only building on Mac when not handling pull request
+# - if [ "$TRAVIS_PULL_REQUEST" ==  "false" ]; then
+#     export BUILD_MAC=YES;
+#   fi
   - sudo apt-get update -qq
 # Building for PSP here
   - if [ "$BUILD_PSP" == "YES" ]; 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;
+      wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma;
+    fi
+# Building for Qt here
+  - if [ "$BUILD_Qt" == "YES" ]; then
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" &&
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" &&
+      sudo apt-get -qq update &&
+      sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
+      export QMAKE="qmake -qt=qt5";
     fi
 # Building for Android here
   - if [ "$BUILD_ANDROID" == "YES" ]; 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 &&
+      if [ `uname -m` = x86_64 ]; then 
-      wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
+        sudo dpkg --add-architecture i386 && sudo apt-get update &&
-      wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz -nv;
+        sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; fi &&
-    fi
+        wget https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip -nv &&
-# Building for Qt here
+        wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -nv;
-  - if [ "$BUILD_Qt" == "YES" ]; 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
     
 install:
@@ -36,21 +44,16 @@ install:
     tar -x --xz -f sdk.lzma;
   fi
 - if [ "$BUILD_ANDROID" == "YES" ]; then
-    tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
+    unzip android-ndk-r22-linux-x86_64.zip &&
-    tar -zxf android-sdk_r24.3.3-linux.tgz &&
+    tar -zxf android-sdk_r24.4.1-linux.tgz &&
     $ANDROID list sdk --extended -a &&
-    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https;
+    echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-23 --no-ui --force --no-https;
   fi
+- sudo python -m easy_install --upgrade pyOpenSSL
 - sudo pip install pyjavaproperties
 - sudo pip install github3.py
 - sudo pip install cpp-coveralls
   
-env:
-  global:
-  - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8="
-  - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ="
-  - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA="
-
 script: "tools/travis-script.sh"
 
 after_success:
@@ -58,3 +61,4 @@ after_success:
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH
 - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH
+- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l qt-gui-build/linuxqtrelease.zip -r Wagic-linux-QT.zip -b $TRAVIS_BRANCH

Boost/boost/thread/xtime.hpp

@@ -20,7 +20,7 @@ namespace boost {
 
 enum xtime_clock_types
 {
-    TIME_UTC=1
+    TIME_UTC_=1
 //    TIME_TAI,
 //    TIME_MONOTONIC,
 //    TIME_PROCESS,
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time)
 
 inline int xtime_get(struct xtime* xtp, int clock_type)
 {
-    if (clock_type == TIME_UTC)
+    if (clock_type == TIME_UTC_)
     {
         *xtp=get_xtime(get_system_time());
         return clock_type;

Boost/lib/pthread/thread.cpp

@@ -350,7 +350,7 @@ namespace boost
                     cond.timed_wait(lock, xt);
 #   endif
                     xtime cur;
-                    xtime_get(&cur, TIME_UTC);
+                    xtime_get(&cur, TIME_UTC_);
                     if (xtime_cmp(xt, cur) <= 0)
                         return;
                 }
@@ -365,7 +365,7 @@ namespace boost
             BOOST_VERIFY(!pthread_yield());
 #   else
             xtime xt;
-            xtime_get(&xt, TIME_UTC);
+            xtime_get(&xt, TIME_UTC_);
             sleep(xt);
 #   endif
         }

Boost/lib/pthread/timeconv.inl

@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000;
 inline void to_time(int milliseconds, boost::xtime& xt)
 {
     int res = 0;
-    res = boost::xtime_get(&xt, boost::TIME_UTC);
+    res = boost::xtime_get(&xt, boost::TIME_UTC_);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
     xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
     {
@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         milliseconds = 0;
@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         microseconds = 0;

CHANGELOG.md

@@ -1,6 +1,147 @@
 # Changelog
 
 ## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 8/3/16
+- *Merged pull-request:* andAbility on ATokenCreator, Extend AAFlip [#\824] (https://github.com/WagicProject/wagic/pull/824) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/31/16
+- *Merged pull-request:* Fix Chandra, Flamecaller & Cryptolith Rite [#\818] (https://github.com/WagicProject/wagic/pull/818) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/28/16
+- *Merged pull-request:* changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. [#\800] (https://github.com/WagicProject/wagic/pull/800) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/26/16
+- *Merged pull-request:* granted flashback [#\791] (https://github.com/WagicProject/wagic/pull/791) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/23/16
+- *Merged pull-request:* Fix Flying vs Moat (multiples of them). Fixes issue #526 [#\783] (https://github.com/WagicProject/wagic/pull/783) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/19/16
+- *Merged pull-request:* pushing to master [#\770] (https://github.com/WagicProject/wagic/pull/770) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/18/16
+- *Merged pull-request:* Fix Deck Menu layer, Change Main Menu Layout, Fix Crash cdaactive on tokens [#\765] (https://github.com/WagicProject/wagic/pull/765) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/12/16
+- *Merged pull-request:* Pushing fixes [#\750] (https://github.com/WagicProject/wagic/pull/750) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* try to fix failed logic here [#\747] (https://github.com/WagicProject/wagic/pull/747) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/9/16
+- *Merged pull-request:* pushing to master [#\738] (https://github.com/WagicProject/wagic/pull/738) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\736] (https://github.com/WagicProject/wagic/pull/736) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/7/16
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* push to wagicproject [#\725] (https://github.com/WagicProject/wagic/pull/725) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/4/16
+- *Merged pull-request:* Sorted Primitives & Updated Premium Deck Series [#\719] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Fails but I have no idea why [#\717] (https://github.com/WagicProject/wagic/pull/717) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Updated Sets [#\715] (https://github.com/WagicProject/wagic/pull/715) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/2/16
+- *Merged pull-request:* Updated Masters, Beginners, Duels and Vault Sets [#\714] (https://github.com/WagicProject/wagic/pull/714) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/1/16
+- *Merged pull-request:* Cleaned and Sorted all Core and Expansion Sets [#\713] (https://github.com/WagicProject/wagic/pull/713) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Soulbond Pair Indicator [#\712] (https://github.com/WagicProject/wagic/pull/712) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/30/16
+- *Merged pull-request:* Sorted Primitives [#\711] (https://github.com/WagicProject/wagic/pull/711) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Add Shackle Ability [#\710] (https://github.com/WagicProject/wagic/pull/710) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Fix Cascade, Crash fix on lastController and some corrections [#\709] (https://github.com/WagicProject/wagic/pull/709) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/29/16
+- *Merged pull-request:* Updated Primitives and Hide Highlight Border [#\707] (https://github.com/WagicProject/wagic/pull/707) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Committed:* Pretty huge patch here(sorry old habits never die :( )  [#\6ee00c1] (https://github.com/WagicProject/wagic/commit/6ee00c138ce374d54cb3ee034575ce440288ca0e) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 6/23/16
+- *Merged pull-request:* Fix producecolor:color [#\704] (https://github.com/WagicProject/wagic/pull/704) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/17/16
+- *Merged pull-request:* Force Mounting 2 [#\699] (https://github.com/WagicProject/wagic/pull/699) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/16/16
+- *Merged pull-request:* Import Deck Options [#\697] (https://github.com/WagicProject/wagic/pull/697) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/11/16
+- *Merged pull-request:* Refactor & Devotion [#\690] (https://github.com/WagicProject/wagic/pull/690) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/9/16
+- *Closed issue:* Clone goes to graveyard before being able to copy anything [\#546](https://github.com/WagicProject/wagic/issues/546)
+
+- *Closed issue:* Blinking an aura causes freeze [\#541](https://github.com/WagicProject/wagic/issues/541)
+
+- *Closed issue:* Profile name at upper left side is not being updated correctly [\#469](https://github.com/WagicProject/wagic/issues/469)
+
+- *Closed issue:* Giving card C protection from X does not remove cards attached to C which have quality X [\#464](https://github.com/WagicProject/wagic/issues/464)
+
+- *Closed issue:* (graphical glitch) wood / gold textures [\#461](https://github.com/WagicProject/wagic/issues/461)
+
+- *Closed issue:* Clone does not get all P/T bonuses [\#448](https://github.com/WagicProject/wagic/issues/448)
+
+- *Closed issue:* Card "threaten" messes up the GUI [\#473](https://github.com/WagicProject/wagic/issues/473)
+
+#### 6/7/16
+- *Closed issue:* Emrakul isn't killed by creatures with deathtouch [\#597](https://github.com/WagicProject/wagic/issues/597)
+
+#### 6/3/16
+- *Merged pull-request:* Cost Increaser & Reducer Fix [#\676] (https://github.com/WagicProject/wagic/pull/676) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 5/30/16
+- *Fixed Bug:* deckstats crash when "unlock cards" is used [#\668] (https://github.com/WagicProject/wagic/issues/668) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 5/26/16
+- *Closed issue:* Nasty memleak crashing devices and its fix. [#\664] (https://github.com/WagicProject/wagic/issues/664) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 11/08/15
+- *Merged pull-request:* produce mana for lands you/opponent could produce [#\658] (https://github.com/WagicProject/wagic/pull/658) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 11/07/15
+- *Merged pull-request:* Manacost Changes, Anyzone for CDA, PayZero Cost [#\656] (https://github.com/WagicProject/wagic/pull/656) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/31/15
+- *Merged pull-request:* Exile Zone, Altercost and Hand modifier [#\653] (https://github.com/WagicProject/wagic/pull/653) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/17/15
+- *Merged pull-request:* Fix issue #473 #784 [#\646] (https://github.com/WagicProject/wagic/pull/646) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/15/15
+- *Merged pull-request:* Bug Fix: Planeswalker Rule & ABlink return to play ability for Aura cards [#\644] (https://github.com/WagicProject/wagic/pull/644) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/14/15
+- *Merged pull-request:* Fix Legend Rule [#\643] (https://github.com/WagicProject/wagic/pull/643) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/12/15
+- *Merged pull-request:* Fix crash bug, support doubled res texture for background, avatars, menutitle [#\641] (https://github.com/WagicProject/wagic/pull/641) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/02/15
+- *Merged pull-request:* LKI for power, toughness and basic abilities, produceextra ability [#\636] (https://github.com/WagicProject/wagic/pull/636) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/29/15
+- *Merged pull-request:* Fix Recover Cards, Cloner, Copier, and Preliminary support for Madness [#\635] (https://github.com/WagicProject/wagic/pull/635) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/22/15
+- *Merged pull-request:* Auraward, unattach event and statebased action for protection from quality [#\631] (https://github.com/WagicProject/wagic/pull/631) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/19/15
+- *Merged pull-request:* PT Switch like Layer 7e and Token Indicator [#\626] (https://github.com/WagicProject/wagic/pull/626) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/18/15
+- *Merged pull-request:* Token Cloning fix and colored PT [#\624] (https://github.com/WagicProject/wagic/pull/624) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/15/15
+- *Merged pull-request:* CDA and X manacost on stack [\#623] (https://github.com/WagicProject/wagic/pull/623) ([kevlahnota](https://github.com/kevlahnota))
+
 #### 08/12/14
 - *Merged pull-request:* Fix for guild_keywords Devotion, added some "Chroma" cards [\#606](https://github.com/WagicProject/wagic/pull/606) ([kevlahnota](https://github.com/kevlahnota))
 

JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c

@@ -77,6 +77,13 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
         : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
     return (result == 0);
 
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+    int result;
+    __asm__ __volatile__(
+        "lock ; xchgl %0, (%1)\n"
+        : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
+    return (result == 0);
+
 #else
     /* Need CPU instructions for spinlock here! */
     __need_spinlock_implementation__

JGE/Dependencies/libpng/png.h

@@ -474,7 +474,7 @@
 
 #ifndef PNG_VERSION_INFO_ONLY
 /* include the compression library's header */
-#include "zlib.h"
+#include "../include/zlib.h"
 #endif
 
 /* include all user configurable info, including optional assembler routines */

JGE/Makefile

@@ -32,6 +32,7 @@ HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \
 
 CXXFLAGS = -W -Wall -Werror -Wno-unused
 CXXFLAGS += -DTIXML_USE_STL
+CXXFLAGS += -Wno-deprecated-declarations -Wno-sign-compare
 
 ifdef DEBUG
 CXXFLAGS += -ggdb3
@@ -82,8 +83,8 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
 OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
 TARGET_LIB = libjge.a
 TARGET_HGE = libhgetools.a
-INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I../Boost -Isrc/zipFS -Iinclude/
+INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I/usr/include/boost -Isrc/zipFS -Iinclude/
-CXXFLAGS += -DLINUX $(FMOD)
+CXXFLAGS += -DLINUX -DNETWORK_SUPPORT $(FMOD)
 CXXFLAGS += $(INCDIR)
 LIBDIR = lib/linux
 endif

JGE/include/DebugRoutines.h

@@ -18,9 +18,9 @@ using namespace std;
 template <class T>
 std::string ToHex(T* pointer)
 {
-    std::ostringstream stream;
+	std::ostringstream stream;
-    stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
+	stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
-    return stream.str();
+	return stream.str();
 }
 
 #ifdef LINUX
@@ -42,9 +42,9 @@ std::string ToHex(T* pointer)
 #else // CAPTURE_STDERR
 #define DebugTrace(inString)								\
 {															\
-  std::ostringstream stream;								\
+	std::ostringstream stream;								\
-  stream << inString;					    \
+	stream << inString;					    \
-  qDebug("%s", stream.str().c_str()); \
+	qDebug("%s", stream.str().c_str()); \
 }
 #endif // CAPTURE_STDERR
 
@@ -52,16 +52,16 @@ std::string ToHex(T* pointer)
 #include <android/log.h>
 #define DebugTrace(inString)								\
 {															\
-  std::ostringstream stream;								\
+	std::ostringstream stream;								\
-  stream << inString;					    \
+	stream << inString;					    \
-  __android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
+	__android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
 }
 #else
 #define DebugTrace(inString)								\
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-  OutputDebugStringA(stream.str().c_str());  \
+	OutputDebugStringA(stream.str().c_str());  \
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux
@@ -71,7 +71,7 @@ std::string ToHex(T* pointer)
 #ifndef DebugTrace
 #define DebugTrace(inString)								\
 {															\
-  std::cerr << inString << std::endl;					    \
+	std::cerr << inString << std::endl;					    \
 }
 #endif //DEBUG
 #endif

JGE/include/JGE.h

@@ -394,6 +394,7 @@ class JGE
    void SetJNIEnv(JNIEnv * env, jclass cls);
    void sendJNICommand(std::string command);
    std::string getFileSystemLocation();
+   std::string getFileUserFolderPath();
 #endif 
   
  protected:

JGE/include/JGui.h

@@ -30,6 +30,7 @@ const int kInfoMenuID = -200;
 const int kRandomPlayerMenuID = -11;
 const int kRandomAIPlayerMenuID = -12;
 const int kEvilTwinMenuID = -14;
+const int kCommanderMenuID = -33;
 
 class JGuiListener
 {

JGE/include/JLBFont.h

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

JGE/include/JRenderer.h

@@ -598,8 +598,6 @@ private:
   GLint     prog2_positionLoc;
   GLint     prog2_texCoordLoc;
   GLint     prog2_colorLoc;
-  // MVP matrix
-  ESMatrix  prog2_mvpMatrix;
   // Uniform locations
   GLint     prog2_mvpLoc;
 
@@ -612,13 +610,11 @@ private:
   int mCurrentTextureFormat;
 #endif
 
+#ifdef PSP
 	bool mVsync;
-
+    int mTexCounter;
+#endif
 	int mSwizzle;
-	int mTexCounter;
-  
-
-
 	int mCurrentTextureFilter;
 
 	int mCurrTexBlendSrc;

JGE/include/JSoundSystem.h

@@ -258,7 +258,9 @@ private:
 #endif
 
     int mVolume;
+#ifndef IOS
     int mMusicVolume;
+#endif
     int mSampleVolume;
 
 

JGE/include/JSpline.h

@@ -18,12 +18,11 @@ using namespace std;
 
 #define MID_POINT_THRESHOLD			1.0f
 
-
 //////////////////////////////////////////////////////////////////////////
 /// Position of a single dot on screen.
 /// 
 //////////////////////////////////////////////////////////////////////////
-class Point
+class JPoint
 {
 public:
 
@@ -34,13 +33,13 @@ public:
 	/// @param _y - Y position.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point(float _x, float _y) { x = _x; y = _y; }
+    JPoint(float _x, float _y) { x = _x; y = _y; }
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Constructor, set position to default (0.0f, 0.0f)
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point() { x = 0.0f; y = 0.0f; }
+    JPoint() { x = 0.0f; y = 0.0f; }
 
 	float x;	///< X position.
 	float y;	///< Y position.
@@ -95,7 +94,7 @@ public:
 	/// @param pt - Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void AddControlPoint(const Point &pt);
+    void AddControlPoint(const JPoint &pt);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a control point of the spline.
@@ -105,7 +104,7 @@ public:
 	/// @return Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetControlPoint(Point &point, int index);
+    void GetControlPoint(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Work out all pixels of the spline.
@@ -128,7 +127,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3);
+    void PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a number of pixels for this spline.
@@ -146,7 +145,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetPixel(Point &point, int index);
+    void GetPixel(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Render the spline to screen.
@@ -156,8 +155,8 @@ public:
 
 private:
 
-	vector<Point> mMidPoints;
+    vector<JPoint> mMidPoints;
-	vector<Point> mPixels;
+    vector<JPoint> mPixels;
 	int mCount;
 
 };

JGE/include/Threading.h

@@ -311,9 +311,7 @@ namespace boost
 
 #include <QMutex>
 #include <QThread>
-
+#include <QSharedPointer>
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include "../include/JLogger.h"
 
@@ -420,23 +418,25 @@ namespace boost
             virtual void run() = 0;
         };
 
-        typedef boost::shared_ptr<detail::thread_data_base> thread_data_ptr;
 
-        template<typename F>
+        typedef QSharedPointer<detail::thread_data_base> thread_data_ptr;
+
+        template<typename F, typename A1>
         class thread_data : public detail::thread_data_base
         {
         public:
-            thread_data(F f_) : f(f_)
+            thread_data(F f_, A1 a1_) : f(f_), a1(a1_)
             {
             }
 
             void run()
             {
-                f();
+                f(a1);
             }
 
         private:
             F f;
+            A1 a1;
 
             void operator=(thread_data&);
             thread_data(thread_data&);
@@ -493,7 +493,7 @@ namespace boost
         }
 
         template <class F,class A1>
-        thread(F f, A1 a1) : mThreadInfo(make_thread_info(boost::bind(boost::type<void>(), f, a1)))
+        thread(F f, A1 a1) : mThreadInfo(make_thread_info(f, a1))
         {
             mpThread = new threadImpl(mThreadInfo);
             LOG("Calling start func");
@@ -510,10 +510,10 @@ namespace boost
         }
 
     private:
-        template<typename F>
+        template<typename F, typename A1>
-        static inline detail::thread_data_ptr make_thread_info(F f)
+        static inline detail::thread_data_ptr make_thread_info(F f, A1 a1)
         {
-            return detail::thread_data_ptr(new detail::thread_data<F>(f));
+            return detail::thread_data_ptr(new detail::thread_data<F, A1>(f, a1));
         }
 
         detail::thread_data_ptr mThreadInfo;

JGE/src/JFileSystem.cpp

@@ -16,9 +16,14 @@ User folder is the only one that is really needed to guarantee both read and wri
 The content that users should not be touching.
 */
 
-#ifndef PSP
+#if defined (ANDROID)
 #include "PrecompiledHeader.h"
-#endif //PSP
+#endif //ANDROID
+
+#if defined (LINUX)
+#include "../../projects/mtg/include/PrecompiledHeader.h"
+#endif //LINUX
+
 
 #ifdef WIN32
 #pragma warning(disable : 4786)
@@ -38,6 +43,12 @@ The content that users should not be touching.
 #include <QDir>
 #endif
 
+/*
+#ifdef IOS
+#include <Foundation/Foundation.h>
+#endif
+*/
+
 JFileSystem* JFileSystem::mInstance = NULL;
 
 JZipCache::JZipCache()
@@ -120,10 +131,11 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     systemPath = [[documentsDirectory  stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
 
 #elif defined (ANDROID)
-    userPath = JGE::GetInstance()->getFileSystemLocation();
+    userPath = JGE::GetInstance()->getFileUserFolderPath();
-    systemPath = "";
+    systemPath = JGE::GetInstance()->getFileSystemLocation();
 
-	DebugTrace("User path " << userPath);
+    DebugTrace("User path " << userPath);
+    DebugTrace("System path " << systemPath);
 #elif defined (QT_CONFIG)
 
     QDir sysDir(RESDIR);
@@ -248,6 +260,7 @@ void JFileSystem::clearZipCache()
 
 bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL */)
 {
+#ifndef WIN32
     if (mZipAvailable && mZipFile.is_open())
     {
         if (mZipFileName != zipfile)
@@ -255,7 +268,7 @@ bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL
         else
             return true;
     }
-
+#endif
     mZipFileName = zipfile;
     mPassword = password;
 

JGE/src/JGE.cpp

@@ -249,6 +249,7 @@ u32 JGE::BindKey(LocalKeySym sym, JButton button)
 u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
 {
     for (keycodes_it it = keyBinds.begin(); it != keyBinds.end(); )
+    {
         if (sym == it->first && button == it->second)
         {
             keycodes_it er = it;
@@ -256,7 +257,8 @@ u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
             keyBinds.erase(er);
         }
         else ++it;
-        return keyBinds.size();
+    }
+    return keyBinds.size();
 }
 
 u32 JGE::UnbindKey(LocalKeySym sym)
@@ -666,7 +668,7 @@ string JGE::getFileSystemLocation()
     if (env == NULL)
     {
         DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
     };
 
     jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
@@ -675,7 +677,36 @@ string JGE::getFileSystemLocation()
     if (methodId == 0)
     {
         DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic"); 
-    	return "/mnt/sdcard/Wagic";
+    	return "/mnt/sdcard/Wagic/Res";
+    };
+
+    jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);
+
+    // Now convert the Java String to C++ char array
+	const char* cstr = env->GetStringUTFChars(systemPath, 0); 
+	string retVal (cstr);
+	env->ReleaseStringUTFChars(systemPath, cstr); 
+	env->DeleteLocalRef(systemPath);
+
+    return retVal;
+}
+
+string JGE::getFileUserFolderPath()
+{
+    JNIEnv * env = getJNIEnv();
+    if (env == NULL)
+    {
+        DebugTrace("An Error Occurred in getting the JNI Environment whie trying to get the system folder location.  Defaulting to /mnt/sdcard/net.wagic.app/Wagic");
+        return "/mnt/sdcard/Wagic/User";
+    };
+
+    jclass jniClass = env->FindClass("org/libsdl/app/SDLActivity");
+    jmethodID methodId = env->GetStaticMethodID( jniClass, "getUserFolderPath", "()Ljava/lang/String;");
+
+    if (methodId == 0)
+    {
+        DebugTrace("An Error Occurred in getting the JNI methodID for getSystemFolderPath. Defaulting to /mnt/sdcard/Wagic");
+        return "/mnt/sdcard/Wagic/User";
     };
 
     jstring systemPath = (jstring) env->CallStaticObjectMethod(jniClass, methodId);

JGE/src/JGui.cpp

@@ -197,7 +197,7 @@ bool JGuiController::CheckUserInput(JButton key)
                     mObjects[mCurr]->Entering();
                 }
                 mEngine->LeftClickedProcessed();
-				mEngine->ResetInput();
+                mEngine->ResetInput();
                 return true;
             }
             mEngine->LeftClickedProcessed();

JGE/src/JSpline.cpp

@@ -71,7 +71,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 		element->QueryFloatAttribute("x", &xx);
 		element->QueryFloatAttribute("y", &yy);
 
-		Point pt(xx*xscale, yy*yscale);
+        JPoint pt(xx*xscale, yy*yscale);
 		AddControlPoint(pt);
 		
 	}
@@ -84,7 +84,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 
 
 
-void JSpline::PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3)
+void JSpline::PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3)
 {
 	float t2 = t * t;
 	float t3 = t2 * t;
@@ -113,8 +113,8 @@ void JSpline::GeneratePixels()
 	x = mMidPoints[1].x;
 	y = mMidPoints[1].y;
 
-	Point newPt(x, y);
+    JPoint newPt(x, y);
-	Point extraPt;
+    JPoint extraPt;
 
 	mPixels.push_back(newPt);
 
@@ -151,13 +151,13 @@ void JSpline::GeneratePixels()
 }
 
 
-void JSpline::AddControlPoint(const Point &pt)
+void JSpline::AddControlPoint(const JPoint &pt)
 {
 	mMidPoints.push_back(pt);
 }
 
 
-void JSpline::GetControlPoint(Point &point, int index)
+void JSpline::GetControlPoint(JPoint &point, int index)
 {
 	if (index < (int)mMidPoints.size())
 	{
@@ -167,7 +167,7 @@ void JSpline::GetControlPoint(Point &point, int index)
 }
 
 
-void JSpline::GetPixel(Point &point, int index)
+void JSpline::GetPixel(JPoint &point, int index)
 {
 	if (index < (int)mPixels.size())
 	{

JGE/src/Qtconsole.cpp

@@ -87,8 +87,6 @@ WagicWrapper::~WagicWrapper()
 
 int main(int argc, char* argv[])
 {
-    QCoreApplication a(argc, argv);
-
     int result = 0;
     WagicWrapper* wagicCore =  new WagicWrapper();
     MTGCollection()->loadFolder("sets/primitives/");

JGE/src/SDLmain.cpp

@@ -18,6 +18,11 @@
 #include <stdexcept>
 #include <iostream>
 #include <math.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
 
 #if (defined FORCE_GLES)
 #undef GL_ES_VERSION_2_0
@@ -53,6 +58,7 @@ JGameLauncher* g_launcher = NULL;
 #ifdef ANDROID
 JNIEnv * mJNIEnv = NULL;
 jclass * mJNIClass = NULL;
+int SDL_ResumeSyncTime = 0;
 #endif
 
 class SdlApp;
@@ -78,6 +84,7 @@ extern "C" void Java_org_libsdl_app_SDLActivity_nativeResume(
 {    
 	if (!g_engine)
 		return;
+    SDL_ResumeSyncTime = 100000;
     g_engine->Resume();
 }
 
@@ -136,8 +143,16 @@ public:
                     if(!g_engine->IsPaused())
                         OnEvent(&Event);
                 }
-                if(!g_engine->IsPaused())
+                if(!g_engine->IsPaused()){
+                    #ifdef ANDROID
+                    // Fix for SDL crash on resuming Android app from background.
+                    if(SDL_ResumeSyncTime){
+                        usleep(SDL_ResumeSyncTime);
+                        SDL_ResumeSyncTime = 0;
+                    }
+                    #endif
                     OnUpdate();
+                }
             }
         }
 
@@ -293,17 +308,18 @@ static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[]
 	{ SDLK_DOWN,          JGE_BTN_DOWN },
 	{ SDLK_LEFT,          JGE_BTN_LEFT },
 	{ SDLK_RIGHT,         JGE_BTN_RIGHT },
-	{ SDLK_z,             JGE_BTN_UP },
+	{ SDLK_w,             JGE_BTN_UP },
-	{ SDLK_d,             JGE_BTN_RIGHT },
 	{ SDLK_s,             JGE_BTN_DOWN },
-	{ SDLK_q,             JGE_BTN_LEFT },
+	{ SDLK_a,             JGE_BTN_LEFT },
-	{ SDLK_a,             JGE_BTN_PREV },
+	{ SDLK_d,             JGE_BTN_RIGHT },
+	{ SDLK_q,             JGE_BTN_PREV },
 	{ SDLK_e,             JGE_BTN_NEXT },
 	{ SDLK_i,             JGE_BTN_CANCEL },
 	{ SDLK_l,             JGE_BTN_OK },
 	{ SDLK_SPACE,         JGE_BTN_OK },
 	{ SDLK_k,             JGE_BTN_SEC },
 	{ SDLK_j,             JGE_BTN_PRI },
+	{ SDLK_b,             JGE_BTN_SOUND },
 	{ SDLK_f,             JGE_BTN_FULLSCREEN },
 
 	/* old Qt ones, basically modified to comply with the N900 keyboard

JGE/src/Xmain.cpp

@@ -185,9 +185,9 @@ static const int doubleBufferAttributes[] = {
     GLX_RED_SIZE,      1,     /* the maximum number of bits per component    */
     GLX_GREEN_SIZE,    1,
     GLX_BLUE_SIZE,     1,
-    None
+    0L /* None */
 };
-static Bool WaitForNotify(Display *dpy, XEvent *event, XPointer arg)
+static int WaitForNotify(Display *dpy, XEvent *event, XPointer arg)
 {
   return (event->type == MapNotify) && (event->xmap.window == (Window) arg);
 }
@@ -387,13 +387,13 @@ int main(int argc, char* argv[])
       if (XCheckWindowEvent(gXDisplay, gXWindow, KeyPressMask | KeyReleaseMask | StructureNotifyMask, &event))
 	switch (event.type)
 	  {
-	  case KeyPress:
+	  case 2: /* KeyPress */
             {
               const KeySym sym = XKeycodeToKeysym(gXDisplay, event.xkey.keycode, 1);
               g_engine->HoldKey_NoRepeat(sym);
             }
             break;
-	  case KeyRelease:
+	  case 3: /* KeyRelease */
             g_engine->ReleaseKey(XKeycodeToKeysym(gXDisplay, event.xkey.keycode, 1));
             break;
 	  case ConfigureNotify:

JGE/src/android/JSfx.cpp

@@ -185,6 +185,12 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
             result = (*engineEngine)->CreateAudioPlayer(engineEngine, &music->playerObject, &audioSrc, &audioSnk, 2, ids, req);
             DebugTrace("result " << result);
             
+            if(result == SL_RESULT_MEMORY_FAILURE){
+                 delete music;
+                 mCurrentMusic = NULL;
+                 return NULL;
+            }
+            
             // realize the player
             result = (*music->playerObject)->Realize(music->playerObject, SL_BOOLEAN_FALSE);
             DebugTrace("result " << result);
@@ -303,6 +309,12 @@ JSample *JSoundSystem::LoadSample(const char *fileName)
               1, ids, req);
         DebugTrace("result " << result);
 
+        if(result == SL_RESULT_MEMORY_FAILURE){
+             delete sample;
+             mCurrentSample = NULL;
+             return NULL;
+        }
+
         // realize the player
         result = (*sample->playerObject)->Realize(sample->playerObject, SL_BOOLEAN_FALSE);
         DebugTrace("result " << result);

JGE/src/hge/hgeparticle.cpp

@@ -96,7 +96,8 @@ hgeParticleSystem::hgeParticleSystem(hgeParticleSystemInfo *psi)
 {
   //hge=hgeCreate(HGE_VERSION);
 
-  memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
+	if (psi)
+		memcpy(&info, psi, sizeof(hgeParticleSystemInfo));
 
   vecLocation.x=vecPrevLocation.x=0.0f;
   vecLocation.y=vecPrevLocation.y=0.0f;

JGE/src/iOS/EAGLViewController.h

@@ -10,5 +10,6 @@ void resumeGame();
 @property (nonatomic, retain) id eaglView;
 @property (nonatomic, retain) UITextField *inputField;
 @property (nonatomic, assign) BOOL bannerIsVisible;
+- (void)toggleKeyboardWithState: (NSString *) initialText;
 
 @end

JGE/src/iOS/EAGLViewController.m

@@ -53,28 +53,28 @@
 
 - (void)viewWillAppear:(BOOL)animated {
 	NSLog(@"EAGL ViewController - view Will Appear");
-    [self.view resumeGame];
+    [(id)self.view resumeGame];
 }
 
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)pauseGame
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)resumeGame
 {
-    [self.view resumeGame];
+    [(id)self.view resumeGame];
 }
 
 - (void)endGame
 {
-    [self.view endGame];
+    [(id)self.view endGame];
 }
 
 - (void)viewDidAppear:(BOOL)animated {

JGE/src/iOS/wagicAppDelegate.m

@@ -337,7 +337,7 @@
 
 - (void)applicationWillTerminate:(UIApplication *)application
 {
-    [self.glViewController.view destroyGame];
+    [(id)self.glViewController.view destroyGame];
 }
 
 - (void)initializeKeyboard: (id) initialState

JGE/src/pc/JGfx.cpp

@@ -1804,7 +1804,7 @@ 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*)png_get_io_ptr(png_ptr);
 
     check = fileSystem->ReadFile(data, length);
 
@@ -1887,7 +1887,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
 
         return JGE_ERR_PNG;
     }
@@ -1896,11 +1896,15 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
     png_set_sig_bytes(png_ptr, sig_read);
     png_read_info(png_ptr, info_ptr);
-    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
+    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
     png_set_strip_16(png_ptr);
     png_set_packing(png_ptr);
     if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png_ptr);
+#if PNG_LIBPNG_VER >= 10400
+    if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
+#endif
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
     png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
 
@@ -1910,7 +1914,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
         return JGE_ERR_MALLOC_FAILED;
     }
 
@@ -1932,7 +1936,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
         for (y = 0; y < (int)height; y++)
         {
-            png_read_row(png_ptr, (BYTE*) line, png_bytep_NULL);
+            png_read_row(png_ptr, (BYTE*) line, NULL);
             for (x = 0; x < (int)width; x++)
             {
                 DWORD color32 = line[x];
@@ -1955,7 +1959,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     free (line);
 
     png_read_end(png_ptr, info_ptr);
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
     fileSystem->CloseFile();
 
@@ -1998,8 +2002,15 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     GifFileType *GifFileIn = NULL;
     ColorMapObject *palette;
     int ExtCode;
+
+#if GIFLIB_MAJOR >= 5
+    if ((GifFileIn = DGifOpen(handle, readFunc, NULL)) == NULL)
+        return 1;
+#else
     if ((GifFileIn = DGifOpen(handle, readFunc)) == NULL)
         return 1;
+#endif
+
     *bgcolor = 0;
     textureInfo.mWidth = 0;
     textureInfo.mHeight = 0;
@@ -2008,7 +2019,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     do {
         if (DGifGetRecordType(GifFileIn, &RecordType) == GIF_ERROR)
         {
+#if GIFLIB_MAJOR >= 5
+            DGifCloseFile(GifFileIn, NULL);
+#else
             DGifCloseFile(GifFileIn);
+#endif
             return 1;
         }
 
@@ -2017,12 +2032,20 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
             {
                 if (DGifGetImageDesc(GifFileIn) == GIF_ERROR)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 if((palette = (GifFileIn->SColorMap != NULL) ? GifFileIn->SColorMap : GifFileIn->Image.ColorMap) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mWidth = GifFileIn->Image.Width;
@@ -2030,7 +2053,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 *bgcolor = gif_color32(GifFileIn->SBackGroundColor);
                 if((LineIn = (GifRowType) malloc(GifFileIn->Image.Width * sizeof(GifPixelType))) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mTexWidth = getNextPower2(GifFileIn->Image.Width);
@@ -2040,7 +2067,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 if((p32 = (DWORD *)malloc(sizeof(PIXEL_TYPE) * textureInfo.mTexWidth * textureInfo.mTexHeight)) == NULL)
                 {
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 DWORD * curr = p32;
@@ -2052,7 +2083,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     {
                         free((void *)p32);
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                        DGifCloseFile(GifFileIn, NULL);
+#else
                         DGifCloseFile(GifFileIn);
+#endif
                         return 1;
                     }
                     for (GifWord j = 0; j < GifFileIn->Image.Width; j ++)
@@ -2081,7 +2116,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 }
                 if(LineIn != NULL)
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                DGifCloseFile(GifFileIn, NULL);
+#else
                 DGifCloseFile(GifFileIn);
+#endif
                 return 1;
             }
             while (Extension != NULL) {
@@ -2094,7 +2133,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     }
                     if(LineIn != NULL)
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
             }
@@ -2109,7 +2152,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
 
     if(LineIn != NULL)
         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+    DGifCloseFile(GifFileIn, NULL);
+#else
     DGifCloseFile(GifFileIn);
+#endif
 
     return 0;
 }

JGE/src/pc/JSfx.cpp

@@ -67,9 +67,7 @@ void JMusic::seekAtTheBegining()
 
 //////////////////////////////////////////////////////////////////////////
 JSample::JSample()
-#ifdef QT_CONFIG
+#ifdef USE_PHONON
-    : effect(0)
-#elif (defined USE_PHONON)
   : mOutput(0), mMediaObject(0)
 #endif
 {
@@ -79,11 +77,9 @@ JSample::JSample()
 JSample::~JSample()
 {
 #if (defined QT_CONFIG) && (!defined USE_PHONON)
-    if(effect) {
+    if(effect)
         delete effect;
-        effect = 0;
+#elif USE_PHONON
-    }
-#elif (defined USE_PHONON)
   if(mOutput)
     delete mOutput;
   if(mMediaObject)

JGE/src/pc/JSocket.cpp

@@ -7,6 +7,7 @@
 #include <winsock.h>
 #include <fcntl.h>
 #elif LINUX
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -47,7 +48,9 @@ JSocket::JSocket(string ipAddr)
 
 #ifdef WIN32
 	unsigned int addr_dest = inet_addr(ipAddr.c_str());
-	hostentptr=gethostbyaddr((char*) &addr_dest, 4, AF_INET);
+	hostentptr = gethostbyaddr((char*) &addr_dest, 4, AF_INET);
+	if (hostentptr == NULL)
+	    hostentptr = gethostbyname(ipAddr.c_str()); // Fix for Windows if IP Address cannot be resolved.
 #elif LINUX
 	hostentptr = gethostbyname(ipAddr.c_str());
 #endif

JGE/src/unzip/crypt.h

@@ -87,13 +87,13 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #  endif
 
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
+static int crypthead(
-    const char *passwd;         /* password string */
+    const char *passwd,         /* password string */
-    unsigned char *buf;         /* where to write header */
+    unsigned char *buf,         /* where to write header */
-    int bufSize;
+    int bufSize,
-    unsigned long* pkeys;
+    unsigned long* pkeys,
-    const unsigned long* pcrc_32_tab;
+    const unsigned long* pcrc_32_tab,
-    unsigned long crcForCrypting;
+    unsigned long crcForCrypting)
 {
     int n;                       /* index in random header */
     int t;                       /* temporary */

JGE/src/unzip/ioapi.c

@@ -65,10 +65,10 @@ int ZCALLBACK ferror_file_func OF((
    voidpf stream));
 
 
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
+voidpf ZCALLBACK fopen_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   const char* filename;
+   const char* filename,
-   int mode;
+   int mode)
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
@@ -87,11 +87,11 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
 }
 
 
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
+uLong ZCALLBACK fread_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream,
-   void* buf;
+   void* buf,
-   uLong size;
+   uLong size)
 {
     uLong ret;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
@@ -99,31 +99,31 @@ uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
 }
 
 
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
+uLong ZCALLBACK fwrite_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream,
-   const void* buf;
+   const void* buf,
-   uLong size;
+   uLong size)
 {
     uLong ret;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK ftell_file_func (opaque, stream)
+long ZCALLBACK ftell_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream)
 {
     long ret;
     ret = ftell((FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
+long ZCALLBACK fseek_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream,
-   uLong offset;
+   uLong offset,
-   int origin;
+   int origin)
 {
     int fseek_origin=0;
     long ret;
@@ -145,26 +145,26 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
     return ret;
 }
 
-int ZCALLBACK fclose_file_func (opaque, stream)
+int ZCALLBACK fclose_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream)
 {
     int ret;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
-int ZCALLBACK ferror_file_func (opaque, stream)
+int ZCALLBACK ferror_file_func (
-   voidpf opaque;
+   voidpf opaque,
-   voidpf stream;
+   voidpf stream)
 {
     int ret;
     ret = ferror((FILE *)stream);
     return ret;
 }
 
-void fill_fopen_filefunc (pzlib_filefunc_def)
+void fill_fopen_filefunc (
-  zlib_filefunc_def* pzlib_filefunc_def;
+  zlib_filefunc_def* pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen_file = fopen_file_func;
     pzlib_filefunc_def->zread_file = fread_file_func;

JGE/src/unzip/unzip.c

@@ -168,10 +168,7 @@ local int unzlocal_getByte OF((
     voidpf filestream,
     int *pi));
 
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
+local int unzlocal_getByte(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,int *pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -198,10 +195,7 @@ local int unzlocal_getShort OF((
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
+local int unzlocal_getShort (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
 {
     uLong x ;
     int i;
@@ -226,10 +220,7 @@ local int unzlocal_getLong OF((
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
+local int unzlocal_getLong (const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream,uLong *pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
 {
     uLong x ;
     int i;
@@ -259,9 +250,7 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
 
 
 /* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
+local int strcmpcasenosensitive_internal (const char* fileName1,const char* fileName2)
-    const char* fileName1;
-    const char* fileName2;
 {
     for (;;)
     {
@@ -302,10 +291,7 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
         (like 1 on Unix, 2 on Windows)
 
 */
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
 {
     if (iCaseSensitivity==0)
         iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
@@ -328,9 +314,7 @@ local uLong unzlocal_SearchCentralDir OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+local uLong unzlocal_SearchCentralDir(const zlib_filefunc_def* pzlib_filefunc_def,voidpf filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
 {
     unsigned char* buf;
     uLong uSizeFile;
@@ -394,9 +378,7 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
      Else, the return value is a unzFile Handle, usable with other function
        of this unzip package.
 */
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
+extern unzFile ZEXPORT unzOpen2 (const char *path, zlib_filefunc_def* pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
 {
     unz_s us;
     unz_s *s;
@@ -497,8 +479,7 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
 }
 
 
-extern unzFile ZEXPORT unzOpen (path)
+extern unzFile ZEXPORT unzOpen (const char *path)
-    const char *path;
 {
     return unzOpen2(path, NULL);
 }
@@ -508,8 +489,7 @@ extern unzFile ZEXPORT unzOpen (path)
   If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
+extern int ZEXPORT unzClose (unzFile file)
-    unzFile file;
 {
     unz_s* s;
     if (file==NULL)
@@ -529,9 +509,7 @@ extern int ZEXPORT unzClose (file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
+extern int ZEXPORT unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
 {
     unz_s* s;
     if (file==NULL)
@@ -545,9 +523,7 @@ extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
 /*
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
+local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
 {
     uLong uDate;
     uDate = (uLong)(ulDosDate>>16);
@@ -574,21 +550,16 @@ local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   char *szComment,
                                                   uLong commentBufferSize));
 
-local int unzlocal_GetCurrentFileInfoInternal (file,
+local int unzlocal_GetCurrentFileInfoInternal (
-                                              pfile_info,
+    unzFile file,
-                                              pfile_info_internal,
+    unz_file_info *pfile_info,
-                                              szFileName, fileNameBufferSize,
+    unz_file_info_internal *pfile_info_internal,
-                                              extraField, extraFieldBufferSize,
+    char *szFileName,
-                                              szComment,  commentBufferSize)
+    uLong fileNameBufferSize,
-    unzFile file;
+    void *extraField,
-    unz_file_info *pfile_info;
+    uLong extraFieldBufferSize,
-    unz_file_info_internal *pfile_info_internal;
+    char *szComment,
-    char *szFileName;
+    uLong commentBufferSize)
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
 {
     unz_s* s;
     unz_file_info file_info;
@@ -746,19 +717,15 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int ZEXPORT unzGetCurrentFileInfo (file,
+extern int ZEXPORT unzGetCurrentFileInfo (
-                                          pfile_info,
+    unzFile file,
-                                          szFileName, fileNameBufferSize,
+    unz_file_info *pfile_info,
-                                          extraField, extraFieldBufferSize,
+    char *szFileName,
-                                          szComment,  commentBufferSize)
+    uLong fileNameBufferSize,
-    unzFile file;
+    void *extraField,
-    unz_file_info *pfile_info;
+    uLong extraFieldBufferSize,
-    char *szFileName;
+    char *szComment,
-    uLong fileNameBufferSize;
+    uLong commentBufferSize)
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
 {
     return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
                                                 szFileName,fileNameBufferSize,
@@ -770,8 +737,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (file,
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int ZEXPORT unzGoToFirstFile (file)
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
-    unzFile file;
 {
     int err=UNZ_OK;
     unz_s* s;
@@ -792,8 +758,7 @@ extern int ZEXPORT unzGoToFirstFile (file)
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int ZEXPORT unzGoToNextFile (file)
+extern int ZEXPORT unzGoToNextFile (unzFile file)
-    unzFile file;
 {
     unz_s* s;
     int err;
@@ -826,10 +791,7 @@ extern int ZEXPORT unzGoToNextFile (file)
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
 {
     unz_s* s;
     int err;
@@ -905,9 +867,7 @@ typedef struct unz_file_pos_s
 } unz_file_pos;
 */
 
-extern int ZEXPORT unzGetFilePos(file, file_pos)
+extern int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos* file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
 {
     unz_s* s;
 
@@ -923,9 +883,7 @@ extern int ZEXPORT unzGetFilePos(file, file_pos)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
+extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos*file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
 {
     unz_s* s;
     int err;
@@ -959,13 +917,11 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos)
   store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
+local int unzlocal_CheckCurrentFileCoherencyHeader (
-                                                    poffset_local_extrafield,
+    unz_s* s,
-                                                    psize_local_extrafield)
+    uInt* piSizeVar,
-    unz_s* s;
+    uLong *poffset_local_extrafield,
-    uInt* piSizeVar;
+    uInt  *psize_local_extrafield)
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
 {
     uLong uMagic,uData,uFlags;
     uLong size_filename;
@@ -1050,12 +1006,12 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
+extern int ZEXPORT unzOpenCurrentFile3 (
-    unzFile file;
+    unzFile file,
-    int* method;
+    int* method,
-    int* level;
+    int* level,
-    int raw;
+    int raw,
-    const char* password;
+    const char* password)
 {
     int err=UNZ_OK;
     uInt iSizeVar;
@@ -1136,7 +1092,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
       pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
       pfile_in_zip_read_info->stream.zfree = (free_func)0;
       pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (Bytef*)0;
       pfile_in_zip_read_info->stream.avail_in = 0;
 
       err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
@@ -1195,24 +1151,21 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzOpenCurrentFile (file)
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
-    unzFile file;
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
 }
 
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password)
-    unzFile file;
-    const char* password;
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
 }
 
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
+extern int ZEXPORT unzOpenCurrentFile2 (
-    unzFile file;
+    unzFile file,
-    int* method;
+    int* method,
-    int* level;
+    int* level,
-    int raw;
+    int raw)
 {
     return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
@@ -1227,10 +1180,10 @@ extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
+extern int ZEXPORT unzReadCurrentFile(
-    unzFile file;
+    unzFile file,
-    voidp buf;
+    voidp buf,
-    unsigned len;
+    unsigned len)
 {
     int err=UNZ_OK;
     uInt iRead = 0;
@@ -1388,8 +1341,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 /*
   Give the current position in uncompressed data
 */
-extern z_off_t ZEXPORT unztell (file)
+extern z_off_t ZEXPORT unztell (unzFile file)
-    unzFile file;
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1408,8 +1360,7 @@ extern z_off_t ZEXPORT unztell (file)
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
-extern int ZEXPORT unzeof (file)
+extern int ZEXPORT unzeof (unzFile file)
-    unzFile file;
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1441,10 +1392,10 @@ extern int ZEXPORT unzeof (file)
   the return value is the number of bytes copied in buf, or (if <0)
     the error code
 */
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
+extern int ZEXPORT unzGetLocalExtrafield (
-    unzFile file;
+    unzFile file,
-    voidp buf;
+    voidp buf,
-    unsigned len;
+    unsigned len)
 {
     unz_s* s;
     file_in_zip_read_info_s* pfile_in_zip_read_info;
@@ -1492,8 +1443,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
   Close the file in zip opened with unzipOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int ZEXPORT unzCloseCurrentFile (file)
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
-    unzFile file;
 {
     int err=UNZ_OK;
 
@@ -1535,12 +1485,11 @@ extern int ZEXPORT unzCloseCurrentFile (file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
+extern int ZEXPORT unzGetGlobalComment (
-    unzFile file;
+    unzFile file,
-    char *szComment;
+    char *szComment,
-    uLong uSizeBuf;
+    uLong uSizeBuf)
 {
-    int err=UNZ_OK;
     unz_s* s;
     uLong uReadThis ;
     if (file==NULL)
@@ -1567,8 +1516,7 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 }
 
 /* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
+extern uLong ZEXPORT unzGetOffset (unzFile file)
-    unzFile file;
 {
     unz_s* s;
 
@@ -1583,9 +1531,9 @@ extern uLong ZEXPORT unzGetOffset (file)
     return s->pos_in_central_dir;
 }
 
-extern int ZEXPORT unzSetOffset (file, pos)
+extern int ZEXPORT unzSetOffset (
-        unzFile file;
+        unzFile file,
-        uLong pos;
+        uLong pos)
 {
     unz_s* s;
     int err;

JGE/src/unzip/zip.c

@@ -172,8 +172,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
     return ldi;
 }
 
-local void free_datablock(ldi)
+local void free_datablock(linkedlist_datablock_internal* ldi)
-    linkedlist_datablock_internal* ldi;
 {
     while (ldi!=NULL)
     {
@@ -183,24 +182,24 @@ local void free_datablock(ldi)
     }
 }
 
-local void init_linkedlist(ll)
+local void init_linkedlist(
-    linkedlist_data* ll;
+    linkedlist_data* ll)
 {
     ll->first_block = ll->last_block = NULL;
 }
 
-local void free_linkedlist(ll)
+local void free_linkedlist(
-    linkedlist_data* ll;
+    linkedlist_data* ll)
 {
     free_datablock(ll->first_block);
     ll->first_block = ll->last_block = NULL;
 }
 
 
-local int add_data_in_datablock(ll,buf,len)
+local int add_data_in_datablock(
-    linkedlist_data* ll;
+    linkedlist_data* ll,
-    const void* buf;
+    const void* buf,
-    uLong len;
+    uLong len)
 {
     linkedlist_datablock_internal* ldi;
     const unsigned char* from_copy;
@@ -263,11 +262,11 @@ local int add_data_in_datablock(ll,buf,len)
 
 local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
                                 voidpf filestream, uLong x, int nbByte));
-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
+local int ziplocal_putValue (
-    const zlib_filefunc_def* pzlib_filefunc_def;
+    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream;
+    voidpf filestream,
-    uLong x;
+    uLong x,
-    int nbByte;
+    int nbByte)
 {
     unsigned char buf[4];
     int n;
@@ -291,10 +290,10 @@ local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
 }
 
 local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
-local void ziplocal_putValue_inmemory (dest, x, nbByte)
+local void ziplocal_putValue_inmemory (
-    void* dest;
+    void* dest,
-    uLong x;
+    uLong x,
-    int nbByte;
+    int nbByte)
 {
     unsigned char* buf=(unsigned char*)dest;
     int n;
@@ -315,9 +314,9 @@ local void ziplocal_putValue_inmemory (dest, x, nbByte)
 /****************************************************************************/
 
 
-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
+local uLong ziplocal_TmzDateToDosDate(
-    const tm_zip* ptm;
+    const tm_zip* ptm,
-    uLong dosDate;
+    uLong dosDate)
 {
     uLong year = (uLong)ptm->tm_year;
     if (year>1980)
@@ -337,10 +336,10 @@ local int ziplocal_getByte OF((
     voidpf filestream,
     int *pi));
 
-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
+local int ziplocal_getByte(
-    const zlib_filefunc_def* pzlib_filefunc_def;
+    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream;
+    voidpf filestream,
-    int *pi;
+    int *pi)
 {
     unsigned char c;
     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
@@ -367,10 +366,10 @@ local int ziplocal_getShort OF((
     voidpf filestream,
     uLong *pX));
 
-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
+local int ziplocal_getShort (
-    const zlib_filefunc_def* pzlib_filefunc_def;
+    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream;
+    voidpf filestream,
-    uLong *pX;
+    uLong *pX)
 {
     uLong x ;
     int i;
@@ -395,10 +394,10 @@ local int ziplocal_getLong OF((
     voidpf filestream,
     uLong *pX));
 
-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
+local int ziplocal_getLong (
-    const zlib_filefunc_def* pzlib_filefunc_def;
+    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream;
+    voidpf filestream,
-    uLong *pX;
+    uLong *pX)
 {
     uLong x ;
     int i;
@@ -437,9 +436,9 @@ local uLong ziplocal_SearchCentralDir OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+local uLong ziplocal_SearchCentralDir(
-    const zlib_filefunc_def* pzlib_filefunc_def;
+    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream;
+    voidpf filestream)
 {
     unsigned char* buf;
     uLong uSizeFile;
@@ -496,11 +495,11 @@ local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
 #endif /* !NO_ADDFILEINEXISTINGZIP*/
 
 /************************************************************/
-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
+extern zipFile ZEXPORT zipOpen2 (
-    const char *pathname;
+    const char *pathname,
-    int append;
+    int append,
-    zipcharpc* globalcomment;
+    zipcharpc* globalcomment,
-    zlib_filefunc_def* pzlib_filefunc_def;
+    zlib_filefunc_def* pzlib_filefunc_def)
 {
     zip_internal ziinit;
     zip_internal* zi;
@@ -615,7 +614,7 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
 
         if (size_comment>0)
         {
-            ziinit.globalcomment = ALLOC(size_comment+1);
+            ziinit.globalcomment = (char*)ALLOC(size_comment+1);
             if (ziinit.globalcomment)
             {
                size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
@@ -680,35 +679,30 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
     }
 }
 
-extern zipFile ZEXPORT zipOpen (pathname, append)
+extern zipFile ZEXPORT zipOpen (
-    const char *pathname;
+    const char *pathname,
-    int append;
+    int append)
 {
     return zipOpen2(pathname,append,NULL,NULL);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
+extern int ZEXPORT zipOpenNewFileInZip3 (
-                                         extrafield_local, size_extrafield_local,
+    zipFile file,
-                                         extrafield_global, size_extrafield_global,
+    const char* filename,
-                                         comment, method, level, raw,
+    const zip_fileinfo* zipfi,
-                                         windowBits, memLevel, strategy,
+    const void* extrafield_local,
-                                         password, crcForCrypting)
+    uInt size_extrafield_local,
-    zipFile file;
+    const void* extrafield_global,
-    const char* filename;
+    uInt size_extrafield_global,
-    const zip_fileinfo* zipfi;
+    const char* comment,
-    const void* extrafield_local;
+    int method,
-    uInt size_extrafield_local;
+    int level,
-    const void* extrafield_global;
+    int raw,
-    uInt size_extrafield_global;
+    int windowBits,
-    const char* comment;
+    int memLevel,
-    int method;
+    int strategy,
-    int level;
+    const char* password,
-    int raw;
+    uLong crcForCrypting)
-    int windowBits;
-    int memLevel;
-    int strategy;
-    const char* password;
-    uLong crcForCrypting;
 {
     zip_internal* zi;
     uInt size_filename;
@@ -896,21 +890,18 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     return err;
 }
 
-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
+extern int ZEXPORT zipOpenNewFileInZip2(
-                                        extrafield_local, size_extrafield_local,
+    zipFile file,
-                                        extrafield_global, size_extrafield_global,
+    const char* filename,
-                                        comment, method, level, raw)
+    const zip_fileinfo* zipfi,
-    zipFile file;
+    const void* extrafield_local,
-    const char* filename;
+    uInt size_extrafield_local,
-    const zip_fileinfo* zipfi;
+    const void* extrafield_global,
-    const void* extrafield_local;
+    uInt size_extrafield_global,
-    uInt size_extrafield_local;
+    const char* comment,
-    const void* extrafield_global;
+    int method,
-    uInt size_extrafield_global;
+    int level,
-    const char* comment;
+    int raw)
-    int method;
-    int level;
-    int raw;
 {
     return zipOpenNewFileInZip3 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
@@ -920,20 +911,17 @@ extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
                                  NULL, 0);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
+extern int ZEXPORT zipOpenNewFileInZip (
-                                        extrafield_local, size_extrafield_local,
+    zipFile file,
-                                        extrafield_global, size_extrafield_global,
+    const char* filename,
-                                        comment, method, level)
+    const zip_fileinfo* zipfi,
-    zipFile file;
+    const void* extrafield_local,
-    const char* filename;
+    uInt size_extrafield_local,
-    const zip_fileinfo* zipfi;
+    const void* extrafield_global,
-    const void* extrafield_local;
+    uInt size_extrafield_global,
-    uInt size_extrafield_local;
+    const char* comment,
-    const void* extrafield_global;
+    int method,
-    uInt size_extrafield_global;
+    int level)
-    const char* comment;
-    int method;
-    int level;
 {
     return zipOpenNewFileInZip2 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
@@ -941,8 +929,8 @@ extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
                                  comment, method, level, 0);
 }
 
-local int zipFlushWriteBuffer(zi)
+local int zipFlushWriteBuffer(
-  zip_internal* zi;
+  zip_internal* zi)
 {
     int err=ZIP_OK;
 
@@ -963,10 +951,10 @@ local int zipFlushWriteBuffer(zi)
     return err;
 }
 
-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
+extern int ZEXPORT zipWriteInFileInZip (
-    zipFile file;
+    zipFile file,
-    const void* buf;
+    const void* buf,
-    unsigned len;
+    unsigned len)
 {
     zip_internal* zi;
     int err=ZIP_OK;
@@ -978,9 +966,9 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
     if (zi->in_opened_file_inzip == 0)
         return ZIP_PARAMERROR;
 
-    zi->ci.stream.next_in = (void*)buf;
+    zi->ci.stream.next_in = (Bytef*)buf;
     zi->ci.stream.avail_in = len;
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
+    zi->ci.crc32 = crc32(zi->ci.crc32,(const Bytef*)buf,len);
 
     while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
     {
@@ -1028,10 +1016,10 @@ extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
+extern int ZEXPORT zipCloseFileInZipRaw (
-    zipFile file;
+    zipFile file,
-    uLong uncompressed_size;
+    uLong uncompressed_size,
-    uLong crc32;
+    uLong crc32)
 {
     zip_internal* zi;
     uLong compressed_size;
@@ -1124,15 +1112,15 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZip (file)
+extern int ZEXPORT zipCloseFileInZip (
-    zipFile file;
+    zipFile file)
 {
     return zipCloseFileInZipRaw (file,0,0);
 }
 
-extern int ZEXPORT zipClose (file, global_comment)
+extern int ZEXPORT zipClose (
-    zipFile file;
+    zipFile file,
-    const char* global_comment;
+    const char* global_comment)
 {
     zip_internal* zi;
     int err = 0;

JGE/src/zipFS/zfsystem.cpp

@@ -42,7 +42,6 @@ filesystem * filesystem::pCurrentFS = NULL;
 std::vector<filesystem::pooledBuffer *> filesystem::m_Buffers;
 
 static const int STORED = 0;
-static const int DEFLATED = 8;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -632,8 +631,8 @@ streamoff filesystem::CentralDirZipped(std::istream & File, std::streamoff begin
     std::streamoff eof = begin + size;
 
 	// Look for the "end of central dir" header. Start minimum 22 bytes before end.
-    if (! File.seekg(eof - 22, ios::beg))
+	if (! File.seekg(eof - 22, ios::beg))
-        return -1;
+		return -1;
 
 	streamoff EndPos;
 	streamoff StartPos = File.tellg();

JGE/src/zipFS/zfsystem.h

@@ -258,8 +258,8 @@ inline void izfstream::open(const char * FilePath, filesystem * pFS) {
     if (pFS)
         m_pFS = pFS;
 
-	if (m_pFS != NULL)
+    if (m_pFS != NULL)
-		m_pFS->Open(* this, FilePath);
+        m_pFS->Open(* this, FilePath);
 }
 
 inline void izfstream::close() {

JGE/src/zipFS/zstream.cpp

@@ -76,8 +76,8 @@ bool zbuffer::use(std::streamoff Offset, std::streamoff Size)
 		return false;
 
     //Don't use a buffer already used;
-    if (m_Used)
+	if (m_Used)
-        return false;
+		return false;
 
 	// adjust file position
 	if (! m_ZipFile.seekg(Offset, ios::beg))

README.md

@@ -1,7 +1,7 @@
 #Wagic the Homebrew
 
 
-[![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic)
+[![Build Status](https://travis-ci.com/WagicProject/wagic.png?branch=master)](https://travis-ci.com/WagicProject/wagic)
 [![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master)
 [![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master)
 
@@ -20,7 +20,7 @@ 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")
+![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")
 
 
 

appveyor.yml

@@ -22,7 +22,7 @@ environment:
 
 # 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')
+  - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/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"

projects/mtg/Android/.gitignore

@@ -1,3 +1,4 @@
 /gen
 /bin
+/libs
 

projects/mtg/Android/AndroidManifest.xml

@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="0192" android:versionName="@string/app_version" package="net.wagic.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+          android:versionCode="0231"
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+          android:installLocation="preferExternal"
-    <uses-permission android:name="android.permission.INTERNET"/>
+          android:versionName="@string/app_version"
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+          package="net.wagic.app">
-    <application android:debuggable="true" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+  <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-        <activity android:configChanges="keyboard|keyboardHidden|orientation" android:label="@string/app_name" android:name="org.libsdl.app.SDLActivity" android:screenOrientation="sensorLandscape">
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-            <intent-filter>
+  <uses-permission android:name="android.permission.INTERNET" />
-                <action android:name="android.intent.action.MAIN"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+  <application android:icon="@drawable/icon"
-            </intent-filter>
+               android:label="@string/app_name"
-        </activity>
+               android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
                
-        <activity android:configChanges="keyboard|keyboardHidden|orientation" android:name="com.google.ads.AdActivity" android:screenOrientation="sensorLandscape"/>
+    <activity android:debuggable="false"
-    </application>
+              android:configChanges="keyboard|keyboardHidden|orientation"
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
+              android:label="@string/app_name"
+              android:name="org.libsdl.app.SDLActivity"
+              android:screenOrientation="sensorLandscape">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+  <uses-sdk android:minSdkVersion="10"
+            android:targetSdkVersion="29" />
 </manifest>

projects/mtg/Android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/jni/Android.mk

@@ -11,9 +11,8 @@ SDL_PATH := $(JGE_PATH)/Dependencies/SDL
 BOOST_PATH := $(MY_WAGIC_ROOT)/Boost
 JPEG_PATH := $(JGE_PATH)/Dependencies/libjpeg
 PNG_PATH := $(JGE_PATH)/Dependencies/libpng
-DEBUG ?= DEBUG
 
-LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -D_$(DEBUG)
+LOCAL_CFLAGS += -DLINUX -DANDROID -DSDL_CONFIG -DNETWORK_SUPPORT
 LOCAL_CFLAGS += -D_STLP_USE_SIMPLE_NODE_ALLOC -DTIXML_USE_STL
 LOCAL_CFLAGS += -D__arm__ -D_REENTRANT -D_GLIBCXX__PTHREADS
 LOCAL_STATIC_LIBRARIES := libpng libjpeg
@@ -134,6 +133,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
         $(MTG_PATH)/src/WFilter.cpp \
         $(MTG_PATH)/src/WFont.cpp \
         $(MTG_PATH)/src/WGui.cpp \
+        $(MTG_PATH)/src/WParsedInt.cpp \
         $(MTG_PATH)/src/WResourceManager.cpp \
         $(MTG_PATH)/src/DeckView.cpp \
         $(MTG_PATH)/src/CarouselDeckView.cpp \

projects/mtg/Android/jni/Application.mk

@@ -1,7 +1,8 @@
 APP_PROJECT_PATH := $(call my-dir)/..
 APP_CPPFLAGS += -frtti -fexceptions
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := armeabi-v7a
-APP_STL := gnustl_static
+#APP_ABI := x86 # mainly for emulators
+APP_STL := c++_static
 APP_MODULES := libpng libjpeg main SDL
 
 #APP_OPTIM is 'release' by default

projects/mtg/Android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-10
+target=android-23

projects/mtg/Android/res/layout/main.xml

@@ -4,6 +4,7 @@
     android:id="@+id/mainLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:keepScreenOn="true"
     >
 <TextView  
     android:layout_width="fill_parent" 

projects/mtg/Android/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Wagic</string>
-    <string name="app_version">0.19.2</string>
+    <string name="app_version">0.23.1</string>
-    <string name="info_text">Wagic v0.19.2\\nAll Rights Reserved.</string>
+    <string name="info_text">All Rights Reserved.</string>
 </resources>

projects/mtg/Android/src/net/wagic/utils/DeckImporter.java

@@ -0,0 +1,279 @@
+package net.wagic.utils;
+
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.File;
+import java.io.IOException;
+import java.util.Scanner;
+
+import android.util.Log;
+
+public class DeckImporter
+{
+    public static String importDeck( File f, String mypath, String activePath )
+    {
+        String message = "";
+        String deck = "";
+        String deckname = "";
+        String prefix = "";
+        int cardcount = 0;
+        if(f.exists() && !f.isDirectory())
+        { 
+            deckname = f.getName();
+            int pos = deckname.lastIndexOf(".");
+            if (pos > 0) 
+            {
+                deckname = deckname.substring(0, pos);
+            }
+            deck += "#NAME:"+deckname+"\n"; 
+            try
+            {
+                Scanner scanner = new Scanner(new File(mypath));                
+                if (scanner.hasNext()) 
+                {
+                    while (scanner.hasNext()) 
+                    {
+                        String line = scanner.nextLine();
+                        line = line.trim();
+                        if (line.equals("")) {
+                            line = scanner.nextLine();
+                            if (line.equals("")) {
+                                line = scanner.nextLine();
+                                prefix = "#SB:"; // Sideboard started from next card (we assumed that there are 2 blank lines from main deck and sideboard).
+                            }
+                        }
+                        if (!line.equals("")) // don't write out blank lines
+                        {
+                            String[] slines = line.split("\\s+");
+                            String arranged = "";
+                            for (int idx = 1; idx < slines.length; idx++)
+                            {
+                                arranged += slines[idx] + " ";
+                            }
+                            if ((isNumeric(slines[0])) && arranged != null)
+                            {
+                                if (slines[1] != null && slines[1].startsWith("["))
+                                {
+                                    arranged = arranged.substring(5);
+                                    slines[1] = slines[1].replaceAll("\\[", "").replaceAll("\\]", "");
+                                    deck += prefix + arranged + " (" + renameSet(slines[1]) + ") * " + slines[0] + "\n";
+                                } else
+                                {
+                                    deck += prefix + arranged + "(*) * " + slines[0] + "\n";
+                                }
+                                cardcount += Integer.parseInt(slines[0]);
+                            }
+                        }
+                    }
+                    File profile = new File(activePath + "/User/settings/options.txt");
+                    String profileName = "Default";
+                    if (profile.exists() && !profile.isDirectory())
+                        profileName = getActiveProfile(profile);
+                    File rootDecks = null;
+                    if (!profileName.equalsIgnoreCase("Default"))
+                        rootDecks = new File(activePath + "/User/profiles/" + profileName);
+                    else
+                        rootDecks = new File(activePath + "/User/player/");
+                    if (rootDecks.exists() && rootDecks.isDirectory())
+                    {
+                        //save deck
+                        int countdeck = 1;
+                        File[] files = rootDecks.listFiles();
+                        for (int i = 0; i < files.length; i++)
+                        {//check if there is available deck...
+                            if (files[i].getName().startsWith("deck"))
+                                countdeck++;
+                        }
+                        File toSave = new File(rootDecks + "/deck" + countdeck + ".txt");
+                        try
+                        {
+                            FileOutputStream fop = new FileOutputStream(toSave);
+
+                            // if file doesn't exists, then create it
+                            if (!toSave.exists())
+                            {
+                                toSave.createNewFile();
+                            }
+                            // get the content in bytes
+                            byte[] contentInBytes = deck.getBytes();
+                            fop.write(contentInBytes);
+                            fop.flush();
+                            fop.close();
+                            message = "The deck has been successfully imported as: " + toSave.getName() + "\n" + cardcount + " total cards in this deck\n\n" + deck;
+                        } catch (IOException e)
+                        {
+                            message = e.getMessage();
+                        }
+                    } else
+                    {
+                        message = "Problem opening decks folder: " + rootDecks.getAbsolutePath();
+                    }
+                } else
+                {
+                    message = "No errors, and file EMPTY";
+                }
+            } catch (IOException e)
+            {
+                message = e.getMessage();
+            }
+        }
+        return message;
+    }
+      
+    private static boolean isNumeric(String input)
+    {
+        try
+        {
+            Integer.parseInt(input);
+        }
+        catch(NumberFormatException ex)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    private static String getActiveProfile(File mypath)
+    {
+        String name = "";
+        try
+            {
+                Scanner scanner = new Scanner(new File(mypath.toString()));                
+                if (scanner.hasNext()) 
+                {
+                    String line = scanner.nextLine();
+                    name = line.substring(8);    
+                }
+                else
+                {
+                    return "Default";
+                }
+            }
+            catch(IOException e)
+            {
+                return "Default";
+            }
+        return name;
+    }
+
+    private static String renameSet(String set)
+    {
+        if (set == "")
+            return "*";
+        if (set == "AL")
+            return "ALL";
+        if (set == "AQ")
+            return "ATQ";
+        if (set == "AP")
+            return "APC";
+        if (set == "AN")
+            return "ARN";
+        if (set == "AE")
+            return "ARC";
+        if (set == "BR")
+            return "BRB";
+        if (set == "BD")
+            return "BTD";
+        if (set == "CH")
+            return "CHR";
+        if (set == "6E")
+            return "6ED";
+        if (set == "CS")
+            return "CSP";
+        if (set == "DS")
+            return "DST";
+        if (set == "D2")
+            return "DD2";
+        if (set == "8E")
+            return "8ED";
+        if (set == "EX")
+            return "EXO";
+        if (set == "FE")
+            return "FEM";
+        if (set == "FD")
+            return "5DN";
+        if (set == "5E")
+            return "5ED";
+        if (set == "4E")
+            return "4ED";
+        if (set == "GP")
+            return "GPT";
+        if (set == "HL")
+            return "HML";
+        if (set == "IA")
+            return "ICE";
+        if (set == "IN")
+            return "INV";
+        if (set == "JU")
+            return "JUD";
+        if (set == "LG")
+            return "LEG";
+        if (set == "LE")
+            return "LGN";
+        if (set == "A")
+            return "LEA";
+        if (set == "B")
+            return "LEB";
+        if (set == "MM")
+            return "MMQ";
+        if (set == "MI")
+            return "MIR";
+        if (set == "MR")
+            return "MRD";
+        if (set == "NE")
+            return "NEM";
+        if (set == "9E")
+            return "9ED";
+        if (set == "OD")
+            return "ODY";
+        if (set == "ON")
+            return "ONS";
+        if (set == "PS")
+            return "PLS";
+        if (set == "PT")
+            return "POR";
+        if (set == "P2")
+            return "P02";
+        if (set == "P3")
+            return "PTK";
+        if (set == "PR")
+            return "PPR";
+        if (set == "PY")
+            return "PCY";
+        if (set == "R")
+            return "RV";
+        if (set == "SC")
+            return "SCG";
+        if (set == "7E")
+            return "7ED";
+        if (set == "ST")
+            return "S99";
+        if (set == "ST2K")
+            return "S00";
+        if (set == "SH")
+            return "STH";
+        if (set == "TE")
+            return "TMP";
+        if (set == "DK")
+            return "DRK";
+        if (set == "TO")
+            return "TOR";
+        if (set == "UG")
+            return "UGL";
+        if (set == "U")
+            return "2ED";
+        if (set == "UD")
+            return "UDS";
+        if (set == "UL")
+            return "ULG";
+        if (set == "US")
+            return "USG";
+        if (set == "VI")
+            return "VIS";
+        if (set == "WL")
+            return "WTH";
+        else
+            return set;
+    }
+}

projects/mtg/Android/src/net/wagic/utils/StorageOptions.java

@@ -5,11 +5,16 @@ import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Scanner;
 
+import java.util.HashSet;
+import java.util.Set;
+import android.os.Build;
+
 import android.os.Environment;
 import android.util.Log;
 
 public class StorageOptions
 {
+    private static final String      TAG     = StorageOptions.class.getCanonicalName();
     private static ArrayList<String> mMounts = new ArrayList<String>();
     private static ArrayList<String> mVold   = new ArrayList<String>();
 
@@ -18,13 +23,29 @@ public class StorageOptions
     public static int                count   = 0;
     public static String             defaultMountPoint;
 
-    public static void determineStorageOptions()
+    public static void determineStorageOptions(android.content.Context mContext)
     {
         initializeMountPoints();
+        if (findForcemount()){
+            readMountsFileTest();
+        }
         readMountsFile();
         readVoldFile();
+        if (findForcemount()){
+            removeDuplicates(mMounts);
+        }
         compareMountsWithVold();
         testAndCleanMountsList();
+        File[] externalStorageVolumes = mContext.getExternalFilesDirs("");
+        for(int i = 0; i < externalStorageVolumes.length; i++){
+            mMounts.add(externalStorageVolumes[i].getAbsolutePath());
+        }
+        for(int i = 0; i < mMounts.size(); i++){
+            for(int j = 0; j < mMounts.size(); j++){
+                if(i!=j && mMounts.get(i).startsWith(mMounts.get(j)))
+                    mMounts.remove(i);
+            }
+        }
         setProperties();
     }
 
@@ -40,6 +61,42 @@ public class StorageOptions
         }
     }
 
+    private static void readMountsFileTest()
+    {
+        /*
+         * Test mountpoints storage -kevlahnota
+         */
+
+        try
+        {
+            Scanner scanner = new Scanner(new File("/proc/mounts"));
+            while (scanner.hasNext())
+            {
+                String line = scanner.nextLine();
+                if (line.startsWith("/"))
+                {
+                    String[] lineElements = line.split("\\s+");
+                    if ("vfat".equals(lineElements[2]) || "fuse".equals(lineElements[2]) || "sdcardfs".equals(lineElements[2])) 
+                    {
+                        File mountPoint = new File(lineElements[1]);
+                        if (!lineElements[1].equals(defaultMountPoint))
+                            if (mountPoint.isDirectory() && mountPoint.canRead())
+                                mMounts.add(lineElements[1]);
+                    }
+                }
+            }
+        } catch (FileNotFoundException fnfex)
+        {
+            // if proc/mount doesn't exist we just use
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            mMounts.add(defaultMountPoint);
+        } catch (Exception e)
+        {
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading mounts file");
+            mMounts.add(defaultMountPoint);
+        }
+    }
+
     private static void readMountsFile()
     {
         /*
@@ -65,11 +122,11 @@ public class StorageOptions
         } catch (FileNotFoundException fnfex)
         {
             // if proc/mount doesn't exist we just use
-            Log.i(StorageOptions.class.getCanonicalName(), fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
             mMounts.add(defaultMountPoint);
         } catch (Exception e)
         {
-            Log.e(StorageOptions.class.getCanonicalName(), e.getMessage() + ": unknown exception while reading mounts file");
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading mounts file");
             mMounts.add(defaultMountPoint);
         }
     }
@@ -98,15 +155,32 @@ public class StorageOptions
         } catch (FileNotFoundException fnfex)
         {
             // if vold.fstab doesn't exist we use the value gathered from the Environment
-            Log.i(StorageOptions.class.getCanonicalName(), fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
+            Log.i(TAG, fnfex.getMessage() + ": assuming " + defaultMountPoint + " is the only mount point");
             mMounts.add(defaultMountPoint);
         } catch (Exception e)
         {
-            Log.e(StorageOptions.class.getCanonicalName(), e.getMessage() + ": unknown exception while reading mounts file");
+            Log.e(TAG, e.getMessage() + ": unknown exception while reading vold.fstab file");
             mMounts.add(defaultMountPoint);
         }
     }
     
+    private static ArrayList<String> removeDuplicates(ArrayList<String> list) 
+    {
+        ArrayList<String> result = new ArrayList<String>();
+
+        HashSet<String> set = new HashSet<String>();
+
+        for (String item : list) 
+        {
+            if (!set.contains(item)) 
+            {
+                result.add(item);
+                set.add(item);
+            }
+        }
+        return result;
+    }
+
     private static void compareMountsWithVold()
     {
         /*
@@ -115,11 +189,14 @@ public class StorageOptions
          * Compare the two lists together and remove items that are not in both lists.
          */
 
-        for (int i = 0; i < mMounts.size(); i++)
+        if (mVold.size() > 0)
         {
-            String mount = mMounts.get(i);
+            for (int i = 0; i < mMounts.size(); i++)
-            if (!mVold.contains(mount))
+            {
-                mMounts.remove(i--);
+                String mount = mMounts.get(i);
+                if (!mVold.contains(mount))
+                    mMounts.remove(i--);
+            }
         }
 
         // don't need this anymore, clear the vold list to reduce memory
@@ -132,18 +209,60 @@ public class StorageOptions
         /*
          * Now that we have a cleaned list of mount paths Test each one to make sure it's a valid and available path. If it is not, remove it from the list.
          */
-
+        int t = 0;
         for (int i = 0; i < mMounts.size(); i++)
         {
+            t++;
             String mount = mMounts.get(i);
             File root = new File(mount);
             if (!root.exists() || !root.isDirectory() || !root.canWrite())
                 mMounts.remove(i--);
         }
+
+        if (t == 0 && Build.VERSION.SDK_INT >= 16 && findForcemount())
+        {
+            //if none is found lets force it for Jellybean and above...
+            if (System.getenv("EXTERNAL_STORAGE") != null)
+            {
+                File root = new File(System.getenv("EXTERNAL_STORAGE"));
+                if (root.exists() && root.isDirectory() && root.canWrite())
+                {
+                    if(!isRooted())
+                    {
+                        File folder = new File(System.getenv("EXTERNAL_STORAGE")+"/Android/data/net.wagic.app/files");
+                        folder.mkdirs();
+                        mMounts.add(folder.toString());
+                    }
+                    else
+                    {
+                        mMounts.add(System.getenv("EXTERNAL_STORAGE"));
+                    }
+                }
+            }
+
+            if (System.getenv("SECONDARY_STORAGE") != null)
+            {
+                File root = new File(System.getenv("SECONDARY_STORAGE"));
+                if (root.exists() && root.isDirectory() && root.canWrite())
+                {
+                    if(!isRooted())
+                    {
+                        File folder = new File(System.getenv("SECONDARY_STORAGE")+"/Android/data/net.wagic.app/files");
+                        folder.mkdirs();
+                        mMounts.add(folder.toString());
+                    }
+                    else
+                    {
+                        mMounts.add(System.getenv("SECONDARY_STORAGE"));
+                    }
+                }
+            }
+        }
     }
 
     private static void setProperties()
     {
+        Log.d(TAG, "setProperties()");
         /*
          * At this point all the paths in the list should be valid. Build the public properties.
          */
@@ -151,12 +270,27 @@ public class StorageOptions
         ArrayList<String> mLabels = new ArrayList<String>();
 
         int i = 1;
-        for (String path : mMounts)
+        if(findForcemount()){
-        { // TODO: /mnt/sdcard is assumed to always mean internal storage. Use this comparison until there is a better way to do this
+            for (String path : mMounts)
-            if ("/mnt/sdcard".equalsIgnoreCase(path))
+            {//with forcemount menu
-                mLabels.add("Built-in Storage");
+                if ("/mnt/sdcard".equalsIgnoreCase(path) || "/storage/sdcard0".equalsIgnoreCase(path))
-            else
+                    mLabels.add("Internal SD " + "[" + path + "/]");
-                mLabels.add("External SD Card " + i++);
+                else if (path.contains("emulated"))
+                    mLabels.add("Emulated SD " + " [" + path + "/]");
+                else
+                    mLabels.add("External SD " + " [" + path + "/]");
+            }
+        }
+        else
+        {
+            for (String path : mMounts)
+            {
+                // TODO: /mnt/sdcard and emulated are assumed to always mean internal storage. Use this comparison until there is a better way to do this
+                if ("/mnt/sdcard".equalsIgnoreCase(path) || path.contains("emulated"))
+                    mLabels.add("Built-in Storage " + "[" + path + "/]");
+                else
+                    mLabels.add("External SD Card " + "[" + path + "/]");
+            }
         }
         
         labels = new String[mLabels.size()];
@@ -171,4 +305,119 @@ public class StorageOptions
         // use and to prepare it for the next time it's needed.
         mMounts.clear();
     }
+    
+    private static boolean isExternalStorageReadOnly() {
+        String extStorageState = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(extStorageState)) {
+            return true;
+        }
+        return false;
+    }
+ 
+    private static boolean isExternalStorageAvailable() {
+        String extStorageState = Environment.getExternalStorageState();
+        if (Environment.MEDIA_MOUNTED.equals(extStorageState)) {
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+    * Checks if the device is rooted.
+    *
+    * @return <code>true</code> if the device is rooted, <code>false</code> otherwise.
+    */
+    public static boolean isRooted()
+    {
+        // get from build info
+        String buildTags = android.os.Build.TAGS;
+        if (buildTags != null && buildTags.contains("test-keys"))
+        {
+            return true;
+        }
+
+        // check if /system/app/Superuser.apk is present
+        try
+        {
+            File file = new File("/system/app/Superuser.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        try
+        {
+            File file = new File("/system/app/Superuser/Superuser.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        //SuperSU
+        try
+        {
+            File file = new File("/system/app/SuperSU.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        try
+        {
+            File file = new File("/system/app/SuperSU/SuperSU.apk");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e1)
+        {
+            // ignore
+        }
+        // try executing commands
+        return canExecuteCommand("/system/xbin/which su")
+                || canExecuteCommand("/system/bin/which su") || canExecuteCommand("which su");
+    }
+
+    // executes a command on the system
+    private static boolean canExecuteCommand(String command)
+    {
+        boolean executedSuccesfully;
+        try
+        {
+            Runtime.getRuntime().exec(command);
+            executedSuccesfully = true;
+        } catch (Exception e)
+        {
+            executedSuccesfully = false;
+        }
+
+        return executedSuccesfully;
+    }
+
+    private static boolean findForcemount()
+    {
+        Log.d(TAG, "findForcemount()");
+        try
+        {
+            File file = new File(System.getenv("EXTERNAL_STORAGE") + "/forcemount");
+            if (file.exists())
+            {
+                return true;
+            }
+        } catch (Exception e)
+        {
+            Log.w(TAG, e.getMessage());
+            return false;
+        }
+        return false;
+    }
 }

projects/mtg/Makefile

@@ -27,7 +27,7 @@ OBJS	= objs/InteractiveButton.o objs/AbilityParser.o objs/ActionElement.o\
 	objs/ThisDescriptor.o objs/Token.o objs/Translate.o objs/TranslateKeys.o\
 	objs/Trash.o objs/utils.o objs/WEvent.o objs/WResourceManager.o\
 	objs/WCachedResource.o objs/WDataSrc.o objs/WGui.o objs/WFilter.o objs/Tasks.o\
-	objs/WFont.o objs/CarouselDeckView.o objs/GridDeckView.o objs/DeckView.o
+	objs/WFont.o objs/WParsedInt.o objs/CarouselDeckView.o objs/GridDeckView.o objs/DeckView.o
 DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS))
 
 RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)
@@ -59,7 +59,6 @@ endif
 
 ifeq ($(TARGET_ARCHITECTURE),psp)
 DEFAULT_RULE = 3xx
-TARGET_ARCHITECTURE = psp
 PSP_FW_VERSION=371
 BUILD_PRX = 1
 SIGN_PRX = 1
@@ -74,19 +73,36 @@ PSP_EBOOT_PIC1 = pic1.png
 INCDIR = ../../JGE/include ../../JGE/src/zipFS ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include ../../Boost
 LIBDIR = ../../JGE/lib/psp
 CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP -DTIXML_USE_STL
+
 else
+
+ifeq ($(MAKECMDGOALS),x11)
+
+OBJS += objs/TestSuiteAI.o
+INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I/usr/include/boost -I../../JGE/src/zipFS
+LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib
+LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lpthread $(FMOD)
+CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -DTIXML_USE_STL -Wno-nonnull-compare 
+
+ASFLAGS = $(CXXFLAGS)
+
+all: $(DEFAULT_RULE)
+else
+
 OBJS += objs/TestSuiteAI.o
 INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS
 LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib
 LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD)
-CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1
+CFLAGS = $(INCDIR) -DLINUX -DNETWORK_SUPPORT -DUSE_PRECOMPILED_HEADERS=1 -Wno-nonnull-compare 
+
 ASFLAGS = $(CXXFLAGS)
 
 all: $(DEFAULT_RULE)
 
+endif
 endif
 
-CFLAGS := -Wall -W -Wno-unused $(CFLAGS)
+CFLAGS := -Wall -W -Werror -Wno-unused -Wno-deprecated-declarations $(CFLAGS)
 CXXFLAGS += $(CFLAGS)
 # -fno-exceptions
 
@@ -110,8 +126,6 @@ debug: all
 
 else
 
-
-
 $(TARGET): Makefile.$(TARGET_ARCHITECTURE) $(OBJS) ../../JGE/lib/linux/libjge.a
 	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) $(LIBDIR)
 

projects/mtg/bin/Res/ai/baka/deck104.txt

@@ -1,5 +1,11 @@
 #NAME:Kill by Numbers
 #DESC:They just keep multiplying.
+#HINT:castpriority(enchantment,instant,sorcery,artifact,creature)
+#HINT:dontattackwith(Rhys the Redeemed)
+#HINT:dontblockwith(Rhys the Redeemed)
+#HINT:dontattackwith(Kazandu Tuskcaller)
+#HINT:dontblockwith(Kazandu Tuskcaller)
+
 Mox Emerald	 (LEA) *2
 Mox Pearl	 (LEA) *2
 Forest	 (LEA) *15

projects/mtg/bin/Res/ai/baka/deck110.txt

@@ -1,7 +1,6 @@
 #NAME:Etched Affinity
 #DESC:Modern URB Aggro
 #HINT:dontattackwith(creature[power<=0])
-#HINT:combo hold(Glimmervoid|myhand)^until(artifact|mybattlefield)^cast(Glimmervoid|myhand)^totalmananeeded({0})
 #HINT:combo hold(Galvanic Blast|myhand)^cast(Galvanic Blast|myhand)^restriction{type(artifact|mybattlefield)~morethan~2,turn:3}^totalmananeeded({R})
 
 #25 creatures

projects/mtg/bin/Res/ai/baka/deck129.txt

@@ -23,23 +23,23 @@
 369072
 
 #4 x Armada Wurm (RTR), {2}{g}{g}{w}{w}, Creature Wurm, 5/5, trample; 
-999009
+253587
-999009
+253587
-999009
+253587
-999009
+253587
 
 #2 x Precinct Captain (RTR), {w}{w}, Creature Human Soldier, 2/2, first strike; 
-999171
+270792
-999171
+270792
 
 #4 x Wayfaring Temple (RTR), {1}{g}{w}, Creature Elemental, 0/0, 
-999260
+253539
-999260
+253539
-999260
+253539
-999260
+253539
 
 #1 x Worldspine Wurm (RTR), {8}{g}{g}{g}, Creature Wurm, 15/15, trample; 
-999262
+253575
 
 
 
@@ -57,14 +57,14 @@
 369060
 
 #2 x Chromatic Lantern (RTR), {3}, Artifact, 
-999039
+290542
-999039
+290542
 
 #4 x Growing Ranks (RTR), {2}{g/w}{g/w}, Enchantment, 
-999106
+270957
-999106
+270957
-999106
+270957
-999106
+270957
 
 
 
@@ -84,26 +84,26 @@
 369018
 
 #4 x Forest (RTR), Basic Land Forest, 
-999086
+289326
-999086
+289326
-999086
+289326
-999086
+289326
 
 #4 x Plains (RTR), Basic Land Plains, 
-999168
+289310
-999168
+289310
-999168
+289310
-999168
+289310
 
 #2 x Temple Garden (RTR), Land Forest Plains, 
-999238
+253681
-999238
+253681
 
 #4 x Plains (RTR), Basic Land Plains, 
-999265
+289309
-999265
+289309
-999265
+289309
-999265
+289309