Merge pull request #1198 from Fuzzysqurl/master

Version change
po-devs · Jul 19, 2014 · 5696ee9 · 5696ee9
2 parents 3ffd103 + 0878a22
commit 5696ee9
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 8 deletions.
diff --git a/bin/Themes/Classic/battle_fields/1.png b/bin/Themes/Classic/battle_fields/1.png
diff --git a/bin/Themes/Classic/battle_fields/10.png b/bin/Themes/Classic/battle_fields/10.png
diff --git a/bin/Themes/Classic/battle_fields/11.png b/bin/Themes/Classic/battle_fields/11.png
diff --git a/bin/Themes/Classic/battle_fields/2.png b/bin/Themes/Classic/battle_fields/2.png
diff --git a/bin/Themes/Classic/battle_fields/3.png b/bin/Themes/Classic/battle_fields/3.png
diff --git a/bin/Themes/Classic/battle_fields/4.png b/bin/Themes/Classic/battle_fields/4.png
diff --git a/bin/Themes/Classic/battle_fields/5.png b/bin/Themes/Classic/battle_fields/5.png
diff --git a/bin/Themes/Classic/battle_fields/6.png b/bin/Themes/Classic/battle_fields/6.png
diff --git a/bin/Themes/Classic/battle_fields/7.png b/bin/Themes/Classic/battle_fields/7.png
diff --git a/bin/Themes/Classic/battle_fields/8.png b/bin/Themes/Classic/battle_fields/8.png
diff --git a/bin/Themes/Classic/battle_fields/9.png b/bin/Themes/Classic/battle_fields/9.png
diff --git a/bin/version.ini b/bin/version.ini
@@ -1,3 +1,3 @@
 [General]
 updateId=4
-version=2.2.4
+version=2.4.2
diff --git a/src/Shared/config.h b/src/Shared/config.h
@@ -3,11 +3,11 @@
 
 #include <qglobal.h>
 
-#define VERSION QString("2.4.1")
+#define VERSION QString("2.4.2")
 
 static const quint16 PROTOCOL_VERSION = 3;
 static const quint16 PROTOCOL_SUBVERSION = 1;
-static const quint16 CLIENT_VERSION_NUMBER = 2302;
+static const quint16 CLIENT_VERSION_NUMBER = 2402;
 static const int UPDATE_ID = 4;
 
 #ifdef Q_OS_LINUX

diff --git a/src/libraries/BattleManager/regularbattlescene.cpp b/src/libraries/BattleManager/regularbattlescene.cpp
@@ -507,16 +507,17 @@ void GraphicsZone::updatePos(int spot)
 
     if (player == myself()) {
         if (!info()->multiples()) {
-            items[spot]->setPos(50 - width/2, 146 - height);
+            items[spot]->setPos(75 - width/2, 182 - height);
         } else {
-            items[spot]->setPos(info()->slotNum(spot)*60, 146-height);
+            items[spot]->setPos(info()->slotNum(spot)*75, 182-height);
         }
     } else {
         if (!info()->multiples()) {
-            items[spot]->setPos(184 - width/2, 96 - height);
+            items[spot]->setPos(235 - width/2, 115 - height);
         } else {
-            int base = 257-80-(info()->numberOfSlots()/2 - 1)*60;
-            items[spot]->setPos(base + info()->slotNum(spot)*60, 96-height);
+            //Triples has really erratic placing at some points still in 6G.
+            int base = 321-90-(info()->numberOfSlots()/2 - 1)*60;
+            items[spot]->setPos(base + info()->slotNum(spot)*60, 120-height);
         }
     }
 }