# HG changeset patch
# User nemo
# Date 1316962098 14400
# Node ID 647d52370ce95f13b93c062c598eb142d1c8b468
# Parent  c24fdd9a045835fabfba53c112037228c5f37a55# Parent  3c578f531cc15cf45d84420fcdcf31baaeb85270
merge from default.  Pulls in sheepluva's frontend work, and unbreaks engine cmake.

diff -r c24fdd9a0458 -r 647d52370ce9 CMakeLists.txt
diff -r c24fdd9a0458 -r 647d52370ce9 ChangeLog.txt
--- a/ChangeLog.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/ChangeLog.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -2,6 +2,9 @@
 * bugfixes
 
 0.9.15 -> 0.9.16:
+ + In-game chat now supports backspace-repeat and Escape to close the text input area
+ + Team status bars shrunk/made translucent if they take up a significant portion of the screen
+ + Background music change on sudden death mode
  + Stereoscopic rendering
  + Installing content (anything under Data/ - maps, sounds, and any such stuff) to user profile allows custom adding/overriding of any Data/ content
  + Screen for downloadable content
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/QTfrontend/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -1,6 +1,5 @@
 # Configure for Qt4
 set(QT_MIN_VERSION "4.5.0")
-include(CheckLibraryExists)
 
 set(QT_USE_QTCORE TRUE)
 set(QT_USE_QTGUI TRUE)
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/chatwidget.cpp
--- a/QTfrontend/chatwidget.cpp	Mon Sep 19 19:12:19 2011 +0200
+++ b/QTfrontend/chatwidget.cpp	Sun Sep 25 10:48:18 2011 -0400
@@ -30,6 +30,7 @@
 #include <QCursor>
 #include <QScrollBar>
 #include <QItemSelectionModel>
+#include <QStringList>
 
 #include "hwconsts.h"
 #include "SDLs.h"
@@ -313,8 +314,10 @@
 
 void HWChatWidget::returnPressed()
 {
-    emit chatLine(chatEditLine->text());
+    QStringList lines = chatEditLine->text().split('\n');
     chatEditLine->clear();
+    foreach (const QString &line, lines)
+        emit chatLine(line);
 }
 
 
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/mapContainer.cpp
--- a/QTfrontend/mapContainer.cpp	Mon Sep 19 19:12:19 2011 +0200
+++ b/QTfrontend/mapContainer.cpp	Sun Sep 25 10:48:18 2011 -0400
@@ -509,14 +509,14 @@
 {
     int i = MAPGEN_MAP + 3 + numMissions + rand() % (chooseMap->count() - MAPGEN_MAP - 3 - numMissions);
     chooseMap->setCurrentIndex(i);
-    updatePreview();
+    mapChanged(i);
 }
 
 void HWMapContainer::setRandomMission()
 {
     int i = MAPGEN_MAP + 2 + rand() % numMissions;
     chooseMap->setCurrentIndex(i);
-    updatePreview();
+    mapChanged(i);
 }
 
 void HWMapContainer::setRandomSeed()
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/StatsMedal1@2x.png
Binary file QTfrontend/res/StatsMedal1@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/StatsMedal2@2x.png
Binary file QTfrontend/res/StatsMedal2@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/StatsMedal3@2x.png
Binary file QTfrontend/res/StatsMedal3@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/StatsMedal4@2x.png
Binary file QTfrontend/res/StatsMedal4@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/ammopic@2x.png
Binary file QTfrontend/res/ammopic@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconBox@2x.png
Binary file QTfrontend/res/iconBox@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconDamage.png
Binary file QTfrontend/res/iconDamage.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconDamage@2x.png
Binary file QTfrontend/res/iconDamage@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconDud@2x.png
Binary file QTfrontend/res/iconDud@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconHealth.png
Binary file QTfrontend/res/iconHealth.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconHealth@2x.png
Binary file QTfrontend/res/iconHealth@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconMine@2x.png
Binary file QTfrontend/res/iconMine@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconRope@2x.png
Binary file QTfrontend/res/iconRope@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconSuddenDeath.png
Binary file QTfrontend/res/iconSuddenDeath.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconSuddenDeath@2x.png
Binary file QTfrontend/res/iconSuddenDeath@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 QTfrontend/res/iconTime@2x.png
Binary file QTfrontend/res/iconTime@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 gameServer/ClientIO.hs
--- a/gameServer/ClientIO.hs	Mon Sep 19 19:12:19 2011 +0200
+++ b/gameServer/ClientIO.hs	Sun Sep 25 10:48:18 2011 -0400
@@ -58,6 +58,10 @@
 clientSendLoop :: Socket -> ThreadId -> Chan [B.ByteString] -> ClientIndex -> IO ()
 clientSendLoop s tId chan ci = do
     answer <- readChan chan
+
+    when (isQuit answer) $
+        killReciever . B.unpack $ quitMessage answer
+
     Exception.handle
         (\(e :: Exception.IOException) -> unless (isQuit answer) . killReciever $ show e) $
             sendAll s $ B.unlines answer `B.snoc` '\n'
@@ -65,7 +69,6 @@
     if isQuit answer then
         do
         Exception.handle (\(_ :: Exception.IOException) -> putStrLn "error on sClose") $ sClose s
-        killReciever . B.unpack $ quitMessage answer
         else
         clientSendLoop s tId chan ci
 
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/hedgewars/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -152,9 +152,6 @@
         MAIN_DEPENDENCY ${hwengine_project}
         DEPENDS ${engine_sources}
         )
-
-    add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
-    add_dependencies(${engine_output_name} ENGINECLEAN)
 ELSE()
     #let's build sdlmain, which is absent from the framework
     find_package(SDL REQUIRED)
@@ -186,6 +183,8 @@
 
 
 add_custom_target(${engine_output_name} ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}")
+add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars")
+add_dependencies(${engine_output_name} ENGINECLEAN)
 
 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
 
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/GSHandlers.inc
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/HHHandlers.inc
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/PascalExports.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/hwengine.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uAmmos.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uGears.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uMobile.pas
--- a/hedgewars/uMobile.pas	Mon Sep 19 19:12:19 2011 +0200
+++ b/hedgewars/uMobile.pas	Sun Sep 25 10:48:18 2011 -0400
@@ -38,7 +38,7 @@
 
 procedure GameLoading; inline;
 procedure GameLoaded; inline;
-procedure AmmoUpdate; // don't inline
+procedure AmmoUpdate; // do not inline
 procedure NewTurnBeginning; inline;
 procedure SaveBegan; inline;
 procedure SaveFinished; inline;
@@ -46,6 +46,7 @@
 implementation
 uses uVariables;
 
+// this function is just to determine whether we are running on a limited screen device
 function isPhone: Boolean; inline;
 begin
 {$IFDEF IPHONEOS}
@@ -54,12 +55,17 @@
     exit(false);
 end;
 
+// this function should make the device vibrate in some way
 procedure performRumble; inline;
 const kSystemSoundID_Vibrate = $00000FFF;
 begin
+    // do not vibrate while synchronising a demo/save
+    if not fastUntilLag then
+        begin
 {$IFDEF IPHONEOS}
-    AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+        AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
 {$ENDIF}
+        end;
 end;
 
 procedure GameLoading; inline;
@@ -76,7 +82,7 @@
 {$ENDIF}
 end;
 
-procedure AmmoUpdate; // don't inline
+procedure AmmoUpdate; // do not inline
 begin
 {$IFDEF IPHONEOS}
     if (CurrentTeam = nil) or
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uScript.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uTeams.pas
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Mon Sep 19 19:12:19 2011 +0200
+++ b/hedgewars/uTypes.pas	Sun Sep 25 10:48:18 2011 -0400
@@ -36,7 +36,7 @@
         end;
 
     // Possible states of the game
-    TGameState = (gsLandGen, gsStart, gsGame, gsChat, gsConfirm, gsExit);
+    TGameState = (gsLandGen, gsStart, gsGame, gsChat, gsConfirm, gsExit, gsSuspend);
 
     // Game types that help determining what the engine is actually supposed to do
     TGameType = (gmtLocal, gmtDemo, gmtNet, gmtSave, gmtLandPreview, gmtSyntax);
diff -r c24fdd9a0458 -r 647d52370ce9 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Mon Sep 19 19:12:19 2011 +0200
+++ b/hedgewars/uWorld.pas	Sun Sep 25 10:48:18 2011 -0400
@@ -31,7 +31,7 @@
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 procedure ShowMission(caption, subcaption, text: ansistring; icon, time : LongInt);
 procedure HideMission;
-procedure ShakeCamera(amount: LongWord);
+procedure ShakeCamera(amount: LongInt);
 procedure InitCameraBorders;
 procedure MoveCamera;
 procedure onFocusStateChanged;
@@ -54,7 +54,8 @@
     uRender,
     uCaptions,
     uCursor,
-    uCommands
+    uCommands,
+    uMobile
     ;
 
 var cWaveWidth, cWaveHeight: LongInt;
@@ -914,11 +915,11 @@
 DrawCaptions;
 
 // Teams Healths
-if TeamsCount * 20 > cScreenHeight div 7 then  // take up less screen on small displays
+if TeamsCount * 20 > Longword(cScreenHeight) div 7 then  // take up less screen on small displays
     begin
     SetScale(1.5);
     smallScreenOffset:= cScreenHeight div 6;
-    if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$80);
+    if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$80);
     end
 else smallScreenOffset:= 0;
 for t:= 0 to Pred(TeamsCount) do
@@ -957,7 +958,7 @@
       // this approach should be faster than drawing all borders one by one tinted or not
       if highlight then
          begin
-         if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$80)
+         if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$80)
          else Tint($FF, $FF, $FF, $FF);
 
          // draw name
@@ -979,7 +980,7 @@
 if smallScreenOffset <> 0 then
     begin
     SetScale(cDefaultZoomLevel);
-    if TeamsCount * 20 > cScreenHeight div 5 then Tint($FF,$FF,$FF,$FF);
+    if TeamsCount * 20 > Longword(cScreenHeight) div 5 then Tint($FF,$FF,$FF,$FF);
     end;
 
 // Lag alert
@@ -1196,7 +1197,10 @@
     else
     begin
         CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
-        CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y)+ hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
+        if isPhone() then
+            CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + WorldDy)) div 8
+        else
+            CursorPoint.Y:= (prevPoint.Y * 7 + cScreenHeight - (hwRound(FollowGear^.Y) + hwSign(FollowGear^.dY) * z + WorldDy)) div 8;
     end;
 
 wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
@@ -1312,7 +1316,7 @@
     if missionTex <> nil then FreeTexture(missionTex);
 end;
 
-procedure ShakeCamera(amount: LongWord);
+procedure ShakeCamera(amount: LongInt);
 begin
     if isCursorVisible then exit;
     amount:= Max(1, round(amount*zoom/2));
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/AboutViewController.m
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -79,6 +79,8 @@
 
     // first all the names, then the title (which is offset 5)
     cell.textLabel.text = [[self.people objectAtIndex:self.segmentedControl.selectedSegmentIndex] objectAtIndex:[indexPath row]];
+    cell.textLabel.adjustsFontSizeToFitWidth = YES;
+    cell.textLabel.minimumFontSize = 8;
     cell.detailTextLabel.text = [[self.people objectAtIndex:(self.segmentedControl.selectedSegmentIndex + 5)] objectAtIndex:[indexPath row]];
 
     return cell;
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -169,9 +169,10 @@
         [self.view addSubview:button];
         [array addObject:button];
 
-        int x_src = ((i*32)/(int)ammoStoreImage.size.height)*32;
-        int y_src = (i*32)%(int)ammoStoreImage.size.height;
-        UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, 32, 32)];
+        int size = 32*getScreenScale();
+        int x_src = ((i*size)/(int)(ammoStoreImage.size.height*getScreenScale()))*size;
+        int y_src = (i*size)%(int)(ammoStoreImage.size.height*getScreenScale());
+        UIImage *img = [ammoStoreImage cutAt:CGRectMake(x_src, y_src, size, size)];
         [imgs addObject:img];
     }
     [self performSelectorOnMainThread:@selector(setButtonsArray:) withObject:array waitUntilDone:NO];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/CommodityFunctions.h
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.h	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.h	Sun Sep 25 10:48:18 2011 -0400
@@ -24,7 +24,6 @@
 #define DOCUMENTS_FOLDER()      [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]
 
 #define DEBUG_FILE()            [DOCUMENTS_FOLDER() stringByAppendingString:@"/hw-game.log"]
-#define HEDGEHOG_FILE()         [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/hedgehog.png"]
 #define BASICFLAGS_FILE()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/basicFlags.plist"]
 #define GAMEMODS_FILE()         [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/gameMods.plist"]
 #define CREDITS_FILE()          [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/credits.plist"]
@@ -35,10 +34,9 @@
 #define SAVES_DIRECTORY()       [DOCUMENTS_FOLDER() stringByAppendingString:@"/Saves/"]
 
 #define GRAPHICS_DIRECTORY()    [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/"]
+#define ICONS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Icons/"]
 #define HATS_DIRECTORY()        [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hats/"]
 #define GRAVES_DIRECTORY()      [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Graves/"]
-#define BOTLEVELS_DIRECTORY()   [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Hedgehog/botlevels/"]
-#define BTN_DIRECTORY()         [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Btn/"]
 #define FLAGS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Graphics/Flags/"]
 #define FORTS_DIRECTORY()       [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Forts/"]
 #define VOICES_DIRECTORY()      [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Data/Sounds/voices/"]
@@ -67,7 +65,6 @@
 
 void print_free_memory (void);
 void playSound (NSString *snd);
-BOOL isApplePhone (void);
 NSInteger randomPort (void);
 
 NSString *getModelType (void);
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/CommodityFunctions.m
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Sun Sep 25 10:48:18 2011 -0400
@@ -63,10 +63,6 @@
 #endif
 }
 
-BOOL inline isApplePhone () {
-    return (IS_IPAD() == NO);
-}
-
 NSString *getModelType () {
     size_t size;
     // set 'oldp' parameter to NULL to get the size of the data returned so we can allocate appropriate amount of space
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/CreationChamber.h
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.h	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.h	Sun Sep 25 10:48:18 2011 -0400
@@ -24,4 +24,4 @@
 void createSettings (void);
 void createTeamNamed (NSString *nameWithoutExt);
 void createWeaponNamed (NSString *nameWithoutExt, int type);
-void createSchemeNamed (NSString *nameWithoutExt);
+void createSchemeNamed (NSString *nameWithoutExt, int type);
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/CreationChamber.m
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m	Sun Sep 25 10:48:18 2011 -0400
@@ -150,7 +150,7 @@
     [theWeapon release];
 }
 
-void createSchemeNamed (NSString *nameWithoutExt) {
+void createSchemeNamed (NSString *nameWithoutExt, int type) {
     NSString *schemesDirectory = SCHEMES_DIRECTORY();
 
     if (![[NSFileManager defaultManager] fileExistsAtPath: schemesDirectory]) {
@@ -173,8 +173,106 @@
         [gamemodArray addObject:[NSNumber numberWithBool:NO]];
     [mods release];
 
-    // workaround for randomorder that has to be set to YES
-    [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+    switch (type) {
+        case 0: // default
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 1: // pro mode
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:15]];
+            [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 2: // shoppa
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+            [basicArray replaceObjectAtIndex:3 withObject:[NSNumber numberWithInt:50]];
+            [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:1]];
+            [basicArray replaceObjectAtIndex:8 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:25]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+            [gamemodArray replaceObjectAtIndex:1 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:19 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 3: // clean slate
+            [gamemodArray replaceObjectAtIndex:6 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:18 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:19 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 4: // minefield
+            [basicArray replaceObjectAtIndex:0 withObject:[NSNumber numberWithInt:50]];
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+            [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:80]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 5: // barrel mayhem
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+            [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:40]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 6: // tunnel hogs
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:30]];
+            [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:3]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:10]];
+            [basicArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithInt:10]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:10]];
+            [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:14 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:15 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:16 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 7: // fort mode
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:0]];
+            [gamemodArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:3 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 8: // timeless
+            [basicArray replaceObjectAtIndex:2 withObject:[NSNumber numberWithInt:100]];
+            [basicArray replaceObjectAtIndex:4 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:5 withObject:[NSNumber numberWithInt:0]];
+            [basicArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithInt:30]];
+            [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:5]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:3]];
+            [basicArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithInt:10]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:20 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 9: // thinking with portals
+            [basicArray replaceObjectAtIndex:7 withObject:[NSNumber numberWithInt:2]];
+            [basicArray replaceObjectAtIndex:8 withObject:[NSNumber numberWithInt:25]];
+            [basicArray replaceObjectAtIndex:10 withObject:[NSNumber numberWithInt:4]];
+            [basicArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithInt:5]];
+            [basicArray replaceObjectAtIndex:13 withObject:[NSNumber numberWithInt:5]];
+            [gamemodArray replaceObjectAtIndex:9 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        case 10:// king mode
+            [gamemodArray replaceObjectAtIndex:11 withObject:[NSNumber numberWithBool:YES]];
+            [gamemodArray replaceObjectAtIndex:12 withObject:[NSNumber numberWithBool:YES]];
+            break;
+        default:
+            DLog(@"Impossible");
+            break;
+    }
 
     NSMutableDictionary *theScheme = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
                                       basicArray,@"basic",
@@ -182,7 +280,7 @@
                                       nil];
     [gamemodArray release];
     [basicArray release];
-    
+
     NSString *schemeFile = [[NSString alloc] initWithFormat:@"%@/%@.plist", schemesDirectory, nameWithoutExt];
     
     [theScheme writeToFile:schemeFile atomically:YES];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/FortsViewController.m
--- a/project_files/HedgewarsMobile/Classes/FortsViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/FortsViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -23,7 +23,7 @@
 #import "CommodityFunctions.h"
 #import "UIImageExtra.h"
 
-#define IMGNUM_PER_FORT 4
+#define IMGNUM_PER_FORT 6
 
 @implementation FortsViewController
 @synthesize teamDictionary, fortArray, lastIndexPath;
@@ -40,10 +40,10 @@
     [super viewDidLoad];
 
     NSArray *directoryContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:FORTS_DIRECTORY() error:NULL];
-    NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / 3)];
+    NSMutableArray *filteredContents = [[NSMutableArray alloc] initWithCapacity:([directoryContents count] / IMGNUM_PER_FORT)];
     // we need to remove the double entries and the L.png suffix
     for (int i = 0; i < [directoryContents count]; i++) {
-        if (i % IMGNUM_PER_FORT == 3) {
+        if (i % IMGNUM_PER_FORT == IMGNUM_PER_FORT-1) {
             NSString *currentName = [directoryContents objectAtIndex:i];
             NSString *correctName = [currentName substringToIndex:([currentName length] - 5)];
             [filteredContents addObject:correctName];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.m
--- a/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HedgewarsAppDelegate.m	Sun Sep 25 10:48:18 2011 -0400
@@ -133,12 +133,12 @@
     // don't clean mainMenuViewController here!!!
 }
 
+// true multitasking with sdl works only on 4.2 and above; we close the game to avoid a black screen at return
 -(void) applicationWillResignActive:(UIApplication *)application {
-    // true multitasking with sdl works only on 4.2 and above; we close the game to avoid a black screen at return
-    if (self.isInGame && ([[[UIDevice currentDevice] systemVersion] floatValue] < 4.2f))
-        HW_terminate(NO);
+    if (self.isInGame && [[[UIDevice currentDevice] systemVersion] floatValue] < 4.2f)
+            HW_terminate(NO);
+
     [super applicationWillResignActive:application];
 }
 
-
 @end
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/HogHatViewController.m
--- a/project_files/HedgewarsMobile/Classes/HogHatViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/HogHatViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -42,8 +42,8 @@
     self.hatArray = array;
 
     // load the base hog image, drawing will occure in cellForRow...
-    NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
-    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile andCutAt:CGRectMake(96, 0, 32, 32)];
+    NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/basehat-hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile];
     [normalHogFile release];
     self.normalHogSprite = hogSprite;
     [hogSprite release];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/LevelViewController.m
--- a/project_files/HedgewarsMobile/Classes/LevelViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/LevelViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -119,7 +119,7 @@
             cell.accessoryType = UITableViewCellAccessoryNone;
         }
         
-        NSString *botlevelPath = [[NSString alloc] initWithFormat:@"%@/%d.png",BOTLEVELS_DIRECTORY(),row+1];
+        NSString *botlevelPath = [[NSString alloc] initWithFormat:@"%@/bot%d.png",[[NSBundle mainBundle] resourcePath],row+1];
         UIImage *levelImage = [[UIImage alloc] initWithContentsOfFile:botlevelPath];
         [botlevelPath release];
         cell.imageView.image = levelImage;
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/MainMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -71,16 +71,19 @@
     // SCHEMES - always overwrite and delete custom ones
     if ([[NSFileManager defaultManager] fileExistsAtPath:SCHEMES_DIRECTORY()] == YES)
         [[NSFileManager defaultManager] removeItemAtPath:SCHEMES_DIRECTORY() error:NULL];
-    NSString *baseSchemesDir = [[NSString alloc] initWithFormat:@"%@/Settings/Schemes/",resourcesDir];
-    [[NSFileManager defaultManager] copyItemAtPath:baseSchemesDir toPath:SCHEMES_DIRECTORY() error:NULL];
-    [baseSchemesDir release];
+    createSchemeNamed(@"Default", 0);
+    createSchemeNamed(@"Pro Mode", 1);
+    createSchemeNamed(@"Shoppa", 2);
+    createSchemeNamed(@"Clean Slate", 3);
+    createSchemeNamed(@"Minefield", 4);
+    createSchemeNamed(@"Barrel Mayhem", 5);
+    createSchemeNamed(@"Tunnel Hogs", 6);
+    createSchemeNamed(@"Fort Mode", 7);
+    createSchemeNamed(@"Timeless", 8);
+    createSchemeNamed(@"Thinking with Portals", 9);
+    createSchemeNamed(@"King Mode", 10);
 
     // WEAPONS - always overwrite
-    if ([[NSFileManager defaultManager] fileExistsAtPath:WEAPONS_DIRECTORY()] == NO)
-        [[NSFileManager defaultManager] createDirectoryAtPath:WEAPONS_DIRECTORY()
-                                  withIntermediateDirectories:YES
-                                                   attributes:nil
-                                                        error:NULL];
     createWeaponNamed(@"Default", 0);
     createWeaponNamed(@"Crazy", 1);
     createWeaponNamed(@"Pro Mode", 2);
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/MasterViewController.m
--- a/project_files/HedgewarsMobile/Classes/MasterViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/MasterViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -92,7 +92,7 @@
             iconStr = [NSString stringWithFormat:@"%@/Egg.png",GRAPHICS_DIRECTORY()];
             break;
         case 2:
-            iconStr = [NSString stringWithFormat:@"%@/Molotov.png",GRAPHICS_DIRECTORY()];
+            iconStr = [NSString stringWithFormat:@"%@/cheese.png",GRAPHICS_DIRECTORY()];
             break;
         case 3:
             iconStr = [NSString stringWithFormat:@"%@/Target.png",GRAPHICS_DIRECTORY()];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/ObjcExports.h
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.h	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.h	Sun Sep 25 10:48:18 2011 -0400
@@ -27,6 +27,7 @@
 NSInteger cachedGrenadeTime();
 void clearView();
 void setGrenadeTime(NSInteger value);
+BOOL isApplePhone(void);
 
 void startSpinningProgress();
 void stopSpinningProgress();
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/ObjcExports.m
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.m	Sun Sep 25 10:48:18 2011 -0400
@@ -62,6 +62,10 @@
 
 #pragma mark -
 #pragma mark functions called by pascal code
+BOOL inline isApplePhone() {
+    return (IS_IPAD() == NO);
+}
+
 void startSpinningProgress() {
     gameRunning = NO;
     overlay_instance.lowerIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
@@ -102,6 +106,7 @@
 void saveBeganSynching() {
     savedGame = YES;
     stopSpinningProgress();
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
 
     overlay_instance.view.backgroundColor = [UIColor blackColor];
     overlay_instance.view.alpha = 0.75;
@@ -128,6 +133,7 @@
     [overlay_instance.savesIndicator stopAnimating];
     [overlay_instance.savesIndicator performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1];
 
+    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
     gameRunning = YES;
 }
 
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/PascalImports.h
--- a/project_files/HedgewarsMobile/Classes/PascalImports.h	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/PascalImports.h	Sun Sep 25 10:48:18 2011 -0400
@@ -71,8 +71,6 @@
 
     void *HW_getSDLWindow(void);
     void HW_terminate(BOOL andCloseFrontend);
-    void HW_suspend(void);
-    void HW_resume(void);
 
     void HW_setCursor(int x, int y);
     void HW_getCursor(int *x, int *y);
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/SchemeSettingsViewController.m
--- a/project_files/HedgewarsMobile/Classes/SchemeSettingsViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SchemeSettingsViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -78,7 +78,7 @@
 -(void) addScheme:(id) sender {
     NSString *fileName = [[NSString alloc] initWithFormat:@"Scheme %u.plist", [self.listOfSchemes count]];
 
-    createSchemeNamed([fileName stringByDeletingPathExtension]);
+    createSchemeNamed([fileName stringByDeletingPathExtension], 0);
 
     [self.listOfSchemes addObject:fileName];
 
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m
--- a/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleSchemeViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -184,7 +184,8 @@
                 [label release];
             }
 
-            UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/icon%@.png",BTN_DIRECTORY(),[[self.basicSettingList objectAtIndex:row] objectForKey:@"image"]]];
+            UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/icon%@.png",ICONS_DIRECTORY(),
+                                                                    [[self.basicSettingList objectAtIndex:row] objectForKey:@"image"]]];
             cell.imageView.image = img;
             [img release];
 
@@ -230,7 +231,8 @@
             switcher.tag = SWITCH_TAG + row;
             [switcher setOn:[[[self.schemeDictionary objectForKey:@"gamemod"] objectAtIndex:row] boolValue] animated:NO];
             
-            UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",BTN_DIRECTORY(),[[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
+            UIImage *image = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/btn%@.png",ICONS_DIRECTORY(),
+                                                                      [[self.gameModifierArray objectAtIndex:row] objectForKey:@"image"]]];
             cell.imageView.image = image;
             [image release];
             [cell.imageView.layer setCornerRadius:7.0f];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/SingleTeamViewController.m
--- a/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleTeamViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -85,8 +85,8 @@
     [moreArray release];
 
     // load the base hog image, drawing will occure in cellForRow...
-    NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/Hedgehog.png",GRAPHICS_DIRECTORY()];
-    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile andCutAt:CGRectMake(96, 0, 32, 32)];
+    NSString *normalHogFile = [[NSString alloc] initWithFormat:@"%@/basehat-hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:normalHogFile];
     [normalHogFile release];
     self.normalHogSprite = hogSprite;
     [hogSprite release];
@@ -255,24 +255,25 @@
                     [accessoryImage release];
                     break;
                 case 2: // fort
-                    accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-preview.png",
+                    accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@-icon.png",
                                                                               FORTS_DIRECTORY(),[teamDictionary objectForKey:@"fort"]]];
-                    cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
+                    cell.imageView.image = accessoryImage;
                     [accessoryImage release];
                     break;
                 case 3: // flags
                     accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",
                                                                               FLAGS_DIRECTORY(),[teamDictionary objectForKey:@"flag"]]];
-                    cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(27, 19)];
+                    cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(26, 18)];
                     cell.imageView.layer.borderWidth = 0.3;
                     [accessoryImage release];
                     break;
                 case 4: // level
-                    accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%d.png",
-                                                                              BOTLEVELS_DIRECTORY(),[[[[teamDictionary objectForKey:@"hedgehogs"]
-                                                                                                      objectAtIndex:0] objectForKey:@"level"]
-                                                                                                     intValue]]];
-                    cell.imageView.image = [accessoryImage scaleToSize:CGSizeMake(32, 32)];
+                    accessoryImage = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/bot%d.png",
+                                                                              [[NSBundle mainBundle] resourcePath],
+                                                                              [[[[teamDictionary objectForKey:@"hedgehogs"]
+                                                                                 objectAtIndex:0] objectForKey:@"level"]
+                                                                               intValue]]];
+                    cell.imageView.image = accessoryImage;
                     [accessoryImage release];
                     break;
                 default:
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m
--- a/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SingleWeaponViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -165,10 +165,12 @@
             weaponCell.delegate = self;
         }
 
-        int x = ((row*32)/(int)self.ammoStoreImage.size.height)*32;
-        int y = (row*32)%(int)self.ammoStoreImage.size.height;
+        int size = 32 * getScreenScale();
+        int corners = 8 * getScreenScale();
+        int x = ((row*size)/(int)(self.ammoStoreImage.size.height*getScreenScale()))*size;
+        int y = (row*size)%(int)(self.ammoStoreImage.size.height*getScreenScale());
 
-        UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, 32, 32)] makeRoundCornersOfSize:CGSizeMake(7, 7)];
+        UIImage *img = [[self.ammoStoreImage cutAt:CGRectMake(x, y, size, size)] makeRoundCornersOfSize:CGSizeMake(corners, corners)];
         weaponCell.weaponIcon.image = img;
         weaponCell.weaponName.text = [NSString stringWithUTF8String:HW_getWeaponNameByIndex(row)];
         weaponCell.tag = row;
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/StatsPageViewController.m
--- a/project_files/HedgewarsMobile/Classes/StatsPageViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/StatsPageViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -73,14 +73,16 @@
     static NSString *CellIdentifier0 = @"Cell0";
     NSInteger section = [indexPath section];
     NSInteger row = [indexPath row];
-    NSString *imgString = @"";
+    NSString *imgName = @"";
+    NSString *imgPath = ICONS_DIRECTORY();
 
     UITableViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:CellIdentifier0];
     if (cell == nil)
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier0] autorelease];
 
     if (section == 0) {         // winning team
-        imgString = @"StatsStar";
+        imgName = @"star";
+        imgPath = [[NSBundle mainBundle] resourcePath];
         cell.textLabel.text = [self.statsArray objectAtIndex:1];
         cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
     } else if (section == 1) {  // teams ranking
@@ -92,9 +94,9 @@
                                                     blue:(color & 0xFF)/255.0f
                                                    alpha:1.0f];
         cell.textLabel.text = [NSString stringWithFormat:@"%d. %@ (%@ kills)", row+1, [info objectAtIndex:2], [info objectAtIndex:1]];
-        imgString = [NSString stringWithFormat:@"StatsMedal%d",row+1];
+        imgName = [NSString stringWithFormat:@"StatsMedal%d",row+1];
     } else if (section == 2) {  // general info
-        imgString = @"iconDamage";
+        imgName = @"iconDamage";
         cell.textLabel.text = [self.statsArray objectAtIndex:row + 2];
         cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT;
     } else {                    // exit button
@@ -104,7 +106,9 @@
         cell.imageView.image = nil;
     }
 
-    UIImage *img = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.png",BTN_DIRECTORY(),imgString]];
+    NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",imgPath,imgName];
+    UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString];
+    [imgString release];
     UIImageView *imgView = [[UIImageView alloc] initWithImage:img];
     cell.imageView.image = img;
     [img release];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/SupportViewController.m
--- a/project_files/HedgewarsMobile/Classes/SupportViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -64,6 +64,7 @@
     static NSString *CellIdentifier = @"Cell";
     NSInteger row = [indexPath row];
     NSInteger section = [indexPath section];
+    NSString *imgName = @"";
 
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     if (cell == nil)
@@ -71,33 +72,35 @@
 
     NSString *rowString = [self.waysToSupport objectAtIndex:(row + section)];
     cell.textLabel.text = rowString;
-    NSString *imgString = nil;
 
     if (section == 0) {
-        imgString = [BTN_DIRECTORY() stringByAppendingString:@"/StatsStar.png"];
+        imgName = @"star";
         cell.textLabel.textAlignment = UITextAlignmentCenter;
         cell.imageView.image = nil;
     } else {
         cell.textLabel.textAlignment = UITextAlignmentLeft;
         switch (row) {
             case 0:
-                imgString = @"fb.png";
+                imgName = @"fb";
                 break;
             case 1:
-                imgString = @"tw.png";
+                imgName = @"tw";
                 break;
             case 2:
-                imgString = @"Icon-Small.png";
+                imgName = @"hedgehog";
                 break;
             case 3:
-                imgString = @"irc.png";
+                imgName = @"irc";
                 break;
             default:
                 DLog(@"No way");
                 break;
         }
     }
+
+    NSString *imgString = [[NSString alloc] initWithFormat:@"%@/%@.png",[[NSBundle mainBundle] resourcePath],imgName];
     UIImage *img = [[UIImage alloc] initWithContentsOfFile:imgString];
+    [imgString release];
     cell.imageView.image = img;
     if (section == 0) {
         UIImageView *imgView = [[UIImageView alloc] initWithImage:img];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/TeamConfigViewController.m
--- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m	Sun Sep 25 10:48:18 2011 -0400
@@ -102,7 +102,9 @@
 }
 
 -(UIImage *)drawHogsRepeated:(NSInteger) manyTimes {
-    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:HEDGEHOG_FILE()];
+    NSString *imgString = [[NSString alloc] initWithFormat:@"%@/hedgehog.png",[[NSBundle mainBundle] resourcePath]];
+    UIImage *hogSprite = [[UIImage alloc] initWithContentsOfFile:imgString];
+    [imgString release];
     CGFloat screenScale = getScreenScale();
     int w = hogSprite.size.width * screenScale;
     int h = hogSprite.size.height * screenScale;
@@ -185,8 +187,9 @@
         NSString *teamPath = [NSString stringWithFormat:@"%@/%@.plist",TEAMS_DIRECTORY(),cell.textLabel.text];
         NSDictionary *firstHog = [[[NSDictionary dictionaryWithContentsOfFile:teamPath] objectForKey:@"hedgehogs"] objectAtIndex:0];
         if ([[firstHog objectForKey:@"level"] intValue] != 0) {
-            NSString *filePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/Settings/Images/robotBadge.png"];
-            UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:filePath];
+            NSString *imgString = [[NSString alloc] initWithFormat:@"%@/robotBadge.png",[[NSBundle mainBundle] resourcePath]];
+            UIImage *sprite = [[UIImage alloc] initWithContentsOfFile:imgString];
+            [imgString release];
             UIImageView *spriteView = [[UIImageView alloc] initWithImage:sprite];
             [sprite release];
             
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Classes/WeaponCellView.m
--- a/project_files/HedgewarsMobile/Classes/WeaponCellView.m	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Classes/WeaponCellView.m	Sun Sep 25 10:48:18 2011 -0400
@@ -67,15 +67,18 @@
         crateSli.minimumValue = 0;
         crateSli.tag = 400;
 
-        NSString *imgAmmoStr = [NSString stringWithFormat:@"%@/iconAmmo.png",BTN_DIRECTORY()];
-        NSString *imgDamageStr = [NSString stringWithFormat:@"%@/iconDamage.png",BTN_DIRECTORY()];
-        NSString *imgTimeStr = [NSString stringWithFormat:@"%@/iconTime.png",BTN_DIRECTORY()];
-        NSString *imgBoxStr = [NSString stringWithFormat:@"%@/iconBox.png",BTN_DIRECTORY()];
-
+        NSString *imgAmmoStr = [[NSString alloc] initWithFormat:@"%@/ammopic.png",ICONS_DIRECTORY()];
         initialImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgAmmoStr]];
+        [imgAmmoStr release];
+        NSString *imgDamageStr = [[NSString alloc] initWithFormat:@"%@/iconDamage.png",ICONS_DIRECTORY()];
         probabilityImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgDamageStr]];
+        [imgDamageStr release];
+        NSString *imgTimeStr = [[NSString alloc] initWithFormat:@"%@/iconTime.png",ICONS_DIRECTORY()];
         delayImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgTimeStr]];
+        [imgTimeStr release];
+        NSString *imgBoxStr = [[NSString alloc] initWithFormat:@"%@/iconBox.png",ICONS_DIRECTORY()];
         crateImg = [[UIImageView alloc] initWithImage:[UIImage imageWithContentsOfFile:imgBoxStr]];
+        [imgBoxStr release];
 
         initialLab = [[UILabel alloc] init];
         initialLab.backgroundColor = [UIColor clearColor];
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sun Sep 25 10:48:18 2011 -0400
@@ -50,7 +50,7 @@
 		61188C0512A6FE8F0026C5DA /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; };
 		61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */; };
 		61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FECA1298CE4E00D73365 /* settingsButton@2x.png */; };
-		61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title@2x.png */; };
+		61188C0812A6FE9A0026C5DA /* title@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 618899811299516000D55FD6 /* title@2x~iphone.png */; };
 		61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6103D385129B348200911D8D /* tw@2x.png */; };
 		611D9BFB12497E9800008271 /* SavedGamesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611D9BF912497E9800008271 /* SavedGamesViewController.m */; };
 		611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611D9BFA12497E9800008271 /* SavedGamesViewController.xib */; };
@@ -113,6 +113,28 @@
 		6167A6761391514600AA6D07 /* RestoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6167A6741391514600AA6D07 /* RestoreViewController.m */; };
 		6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */; };
 		6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */; };
+		6167C87414294727003DD50F /* surprise@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C87314294727003DD50F /* surprise@2x.png */; };
+		6167C88C14294738003DD50F /* denied@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C88B14294738003DD50F /* denied@2x.png */; };
+		6167C8F51429502C003DD50F /* hedgehog.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8EF1429502C003DD50F /* hedgehog.png */; };
+		6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F01429502C003DD50F /* hedgehog@2x.png */; };
+		6167C8F71429502C003DD50F /* robotBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F11429502C003DD50F /* robotBadge.png */; };
+		6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F21429502C003DD50F /* robotBadge@2x.png */; };
+		6167C8F91429502C003DD50F /* star.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F31429502C003DD50F /* star.png */; };
+		6167C8FA1429502C003DD50F /* star@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167C8F41429502C003DD50F /* star@2x.png */; };
+		6167CA37142A6ED7003DD50F /* bot0.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2B142A6ED7003DD50F /* bot0.png */; };
+		6167CA38142A6ED7003DD50F /* bot0@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2C142A6ED7003DD50F /* bot0@2x.png */; };
+		6167CA39142A6ED7003DD50F /* bot1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2D142A6ED7003DD50F /* bot1.png */; };
+		6167CA3A142A6ED7003DD50F /* bot1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2E142A6ED7003DD50F /* bot1@2x.png */; };
+		6167CA3B142A6ED7003DD50F /* bot2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA2F142A6ED7003DD50F /* bot2.png */; };
+		6167CA3C142A6ED7003DD50F /* bot2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA30142A6ED7003DD50F /* bot2@2x.png */; };
+		6167CA3D142A6ED7003DD50F /* bot3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA31142A6ED7003DD50F /* bot3.png */; };
+		6167CA3E142A6ED7003DD50F /* bot3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA32142A6ED7003DD50F /* bot3@2x.png */; };
+		6167CA3F142A6ED7003DD50F /* bot4.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA33142A6ED7003DD50F /* bot4.png */; };
+		6167CA40142A6ED7003DD50F /* bot4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA34142A6ED7003DD50F /* bot4@2x.png */; };
+		6167CA41142A6ED7003DD50F /* bot5.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA35142A6ED7003DD50F /* bot5.png */; };
+		6167CA42142A6ED7003DD50F /* bot5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CA36142A6ED7003DD50F /* bot5@2x.png */; };
+		6167CB48142A8769003DD50F /* basehat-hedgehog.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CB46142A8769003DD50F /* basehat-hedgehog.png */; };
+		6167CB49142A8769003DD50F /* basehat-hedgehog@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */; };
 		6172FED91298CF9800D73365 /* background~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FED71298CF9800D73365 /* background~iphone.png */; };
 		6172FEEF1298D25D00D73365 /* mediumBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEEB1298D25D00D73365 /* mediumBackground~ipad.png */; };
 		6172FEF11298D25D00D73365 /* smallerBackground~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */; };
@@ -203,7 +225,7 @@
 		61E2F7441283752C00E12521 /* fb.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7421283752C00E12521 /* fb.png */; };
 		61E2F7451283752C00E12521 /* tw.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E2F7431283752C00E12521 /* tw.png */; };
 		61E5D68D12AB006F00566F29 /* uLandPainted.pas in Sources */ = {isa = PBXBuildFile; fileRef = 61E5D68C12AB006F00566F29 /* uLandPainted.pas */; };
-		61EBA62A11DFF2BC0048B68A /* title.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title.png */; };
+		61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EBA62811DFF2BC0048B68A /* title~iphone.png */; };
 		61EDB5B0135B3F97009B29A6 /* GameInterfaceBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */; };
 		61EF920E11DF57AC003441C4 /* arrowDown.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920511DF57AC003441C4 /* arrowDown.png */; };
 		61EF920F11DF57AC003441C4 /* arrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61EF920611DF57AC003441C4 /* arrowLeft.png */; };
@@ -434,6 +456,28 @@
 		6167A6741391514600AA6D07 /* RestoreViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RestoreViewController.m; sourceTree = "<group>"; };
 		6167A6751391514600AA6D07 /* RestoreViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPhone.xib"; path = "../Resources/RestoreViewController-iPhone.xib"; sourceTree = "<group>"; };
 		6167A72C13919E6800AA6D07 /* RestoreViewController-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "RestoreViewController-iPad.xib"; path = "../Resources/RestoreViewController-iPad.xib"; sourceTree = "<group>"; };
+		6167C87314294727003DD50F /* surprise@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "surprise@2x.png"; path = "Resources/surprise@2x.png"; sourceTree = "<group>"; };
+		6167C88B14294738003DD50F /* denied@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "denied@2x.png"; path = "Resources/denied@2x.png"; sourceTree = "<group>"; };
+		6167C8EF1429502C003DD50F /* hedgehog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hedgehog.png; path = Resources/Icons/hedgehog.png; sourceTree = "<group>"; };
+		6167C8F01429502C003DD50F /* hedgehog@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "hedgehog@2x.png"; path = "Resources/Icons/hedgehog@2x.png"; sourceTree = "<group>"; };
+		6167C8F11429502C003DD50F /* robotBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = robotBadge.png; path = Resources/Icons/robotBadge.png; sourceTree = "<group>"; };
+		6167C8F21429502C003DD50F /* robotBadge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "robotBadge@2x.png"; path = "Resources/Icons/robotBadge@2x.png"; sourceTree = "<group>"; };
+		6167C8F31429502C003DD50F /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = star.png; path = Resources/Icons/star.png; sourceTree = "<group>"; };
+		6167C8F41429502C003DD50F /* star@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "star@2x.png"; path = "Resources/Icons/star@2x.png"; sourceTree = "<group>"; };
+		6167CA2B142A6ED7003DD50F /* bot0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot0.png; path = Resources/Icons/bot0.png; sourceTree = "<group>"; };
+		6167CA2C142A6ED7003DD50F /* bot0@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot0@2x.png"; path = "Resources/Icons/bot0@2x.png"; sourceTree = "<group>"; };
+		6167CA2D142A6ED7003DD50F /* bot1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot1.png; path = Resources/Icons/bot1.png; sourceTree = "<group>"; };
+		6167CA2E142A6ED7003DD50F /* bot1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot1@2x.png"; path = "Resources/Icons/bot1@2x.png"; sourceTree = "<group>"; };
+		6167CA2F142A6ED7003DD50F /* bot2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot2.png; path = Resources/Icons/bot2.png; sourceTree = "<group>"; };
+		6167CA30142A6ED7003DD50F /* bot2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot2@2x.png"; path = "Resources/Icons/bot2@2x.png"; sourceTree = "<group>"; };
+		6167CA31142A6ED7003DD50F /* bot3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot3.png; path = Resources/Icons/bot3.png; sourceTree = "<group>"; };
+		6167CA32142A6ED7003DD50F /* bot3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot3@2x.png"; path = "Resources/Icons/bot3@2x.png"; sourceTree = "<group>"; };
+		6167CA33142A6ED7003DD50F /* bot4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot4.png; path = Resources/Icons/bot4.png; sourceTree = "<group>"; };
+		6167CA34142A6ED7003DD50F /* bot4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot4@2x.png"; path = "Resources/Icons/bot4@2x.png"; sourceTree = "<group>"; };
+		6167CA35142A6ED7003DD50F /* bot5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bot5.png; path = Resources/Icons/bot5.png; sourceTree = "<group>"; };
+		6167CA36142A6ED7003DD50F /* bot5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bot5@2x.png"; path = "Resources/Icons/bot5@2x.png"; sourceTree = "<group>"; };
+		6167CB46142A8769003DD50F /* basehat-hedgehog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "basehat-hedgehog.png"; path = "Resources/Icons/basehat-hedgehog.png"; sourceTree = "<group>"; };
+		6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "basehat-hedgehog@2x.png"; path = "Resources/Icons/basehat-hedgehog@2x.png"; sourceTree = "<group>"; };
 		6172FEA21298C7F900D73365 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Icons/Default@2x.png"; sourceTree = "<group>"; };
 		6172FEC81298CE4800D73365 /* savesButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "savesButton@2x.png"; path = "Resources/Frontend/savesButton@2x.png"; sourceTree = "<group>"; };
 		6172FECA1298CE4E00D73365 /* settingsButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "settingsButton@2x.png"; path = "Resources/Frontend/settingsButton@2x.png"; sourceTree = "<group>"; };
@@ -493,7 +537,7 @@
 		61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = "<group>"; };
 		61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = "<group>"; };
 		6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = "<group>"; };
-		618899811299516000D55FD6 /* title@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x.png"; path = "Resources/Frontend/title@2x.png"; sourceTree = "<group>"; };
+		618899811299516000D55FD6 /* title@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title@2x~iphone.png"; path = "Resources/Frontend/title@2x~iphone.png"; sourceTree = "<group>"; };
 		61889984129995B500D55FD6 /* title~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~ipad.png"; path = "Resources/Frontend/title~ipad.png"; sourceTree = "<group>"; };
 		618E27B612A2C30700C20EF0 /* SDL_net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL_net.xcodeproj; path = "../../../Library/SDL_net/Xcode-iPhoneOS/SDL_net.xcodeproj"; sourceTree = SOURCE_ROOT; };
 		619598181364BCD200B429B6 /* Tremor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Tremor.xcodeproj; path = ../../misc/libtremor/Xcode/Tremor.xcodeproj; sourceTree = SOURCE_ROOT; };
@@ -542,7 +586,7 @@
 		61E2F7421283752C00E12521 /* fb.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fb.png; path = Resources/Icons/fb.png; sourceTree = "<group>"; };
 		61E2F7431283752C00E12521 /* tw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tw.png; path = Resources/Icons/tw.png; sourceTree = "<group>"; };
 		61E5D68C12AB006F00566F29 /* uLandPainted.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandPainted.pas; path = ../../hedgewars/uLandPainted.pas; sourceTree = SOURCE_ROOT; };
-		61EBA62811DFF2BC0048B68A /* title.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title.png; path = Resources/Frontend/title.png; sourceTree = "<group>"; };
+		61EBA62811DFF2BC0048B68A /* title~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "title~iphone.png"; path = "Resources/Frontend/title~iphone.png"; sourceTree = "<group>"; };
 		61EDB5AE135B3F97009B29A6 /* GameInterfaceBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameInterfaceBridge.h; sourceTree = "<group>"; };
 		61EDB5AF135B3F97009B29A6 /* GameInterfaceBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameInterfaceBridge.m; sourceTree = "<group>"; };
 		61EF920511DF57AC003441C4 /* arrowDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrowDown.png; path = Resources/Overlay/arrowDown.png; sourceTree = "<group>"; };
@@ -653,11 +697,11 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
+				61DE91561258B76800B80214 /* Custom UIs */,
 				61AC067212B2E32D000B52A2 /* Appirater.h */,
 				61AC067312B2E32D000B52A2 /* Appirater.m */,
 				6165929C11CA9E2F00D6E256 /* HedgewarsAppDelegate.h */,
 				6165929D11CA9E2F00D6E256 /* HedgewarsAppDelegate.m */,
-				61DE91561258B76800B80214 /* Custom UIs */,
 				32CA4F630368D1EE00C91783 /* Hedgewars_Prefix.pch */,
 				61A97F0E136F675A00DD9878 /* hwconsts.h */,
 				6165922911CA9BD500D6E256 /* PascalImports.h */,
@@ -678,8 +722,6 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				612CABCA1391D3D1005E9596 /* Sounds */,
-				6199E86C12464A8E00DADF8C /* surprise.png */,
 				611EEBC0122B34A800DF6938 /* helpingame.png */,
 				611EEC30122B54D700DF6938 /* helpplain.png */,
 				611EEBC2122B355700DF6938 /* helpbottom.png */,
@@ -687,6 +729,10 @@
 				611EEBC3122B355700DF6938 /* helpright.png */,
 				61842B3F122B66280096E335 /* helpleft.png */,
 				6129B9F611EFB04D0017E305 /* denied.png */,
+				6167C88B14294738003DD50F /* denied@2x.png */,
+				6199E86C12464A8E00DADF8C /* surprise.png */,
+				6167C87314294727003DD50F /* surprise@2x.png */,
+				612CABCA1391D3D1005E9596 /* Sounds */,
 				61F7A42811E2905C0040BA66 /* Icons */,
 				61F903FA11DF58680068B24D /* Frontend */,
 				6179936611501D1E00BA94A9 /* Overlay */,
@@ -726,8 +772,6 @@
 		611D9BF312497B7700008271 /* Other Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				61B7A33612CC21080086B604 /* StatsPageViewController.h */,
-				61B7A33712CC21080086B604 /* StatsPageViewController.m */,
 				61F2E7CB1205EDE0005734F7 /* AboutViewController.h */,
 				61F2E7CC1205EDE0005734F7 /* AboutViewController.m */,
 				61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */,
@@ -738,6 +782,8 @@
 				611D9BF812497E9800008271 /* SavedGamesViewController.h */,
 				611D9BF912497E9800008271 /* SavedGamesViewController.m */,
 				611D9BFA12497E9800008271 /* SavedGamesViewController.xib */,
+				61B7A33612CC21080086B604 /* StatsPageViewController.h */,
+				61B7A33712CC21080086B604 /* StatsPageViewController.m */,
 			);
 			name = "Other Controllers";
 			sourceTree = "<group>";
@@ -984,6 +1030,26 @@
 				6103D383129B346A00911D8D /* fb@2x.png */,
 				61E2F7431283752C00E12521 /* tw.png */,
 				6103D385129B348200911D8D /* tw@2x.png */,
+				6167C8EF1429502C003DD50F /* hedgehog.png */,
+				6167C8F01429502C003DD50F /* hedgehog@2x.png */,
+				6167C8F11429502C003DD50F /* robotBadge.png */,
+				6167C8F21429502C003DD50F /* robotBadge@2x.png */,
+				6167C8F31429502C003DD50F /* star.png */,
+				6167C8F41429502C003DD50F /* star@2x.png */,
+				6167CB46142A8769003DD50F /* basehat-hedgehog.png */,
+				6167CB47142A8769003DD50F /* basehat-hedgehog@2x.png */,
+				6167CA2B142A6ED7003DD50F /* bot0.png */,
+				6167CA2C142A6ED7003DD50F /* bot0@2x.png */,
+				6167CA2D142A6ED7003DD50F /* bot1.png */,
+				6167CA2E142A6ED7003DD50F /* bot1@2x.png */,
+				6167CA2F142A6ED7003DD50F /* bot2.png */,
+				6167CA30142A6ED7003DD50F /* bot2@2x.png */,
+				6167CA31142A6ED7003DD50F /* bot3.png */,
+				6167CA32142A6ED7003DD50F /* bot3@2x.png */,
+				6167CA33142A6ED7003DD50F /* bot4.png */,
+				6167CA34142A6ED7003DD50F /* bot4@2x.png */,
+				6167CA35142A6ED7003DD50F /* bot5.png */,
+				6167CA36142A6ED7003DD50F /* bot5@2x.png */,
 				6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */,
 				6183D83D11E2BCE200A88903 /* Default.png */,
 				6172FEA21298C7F900D73365 /* Default@2x.png */,
@@ -1013,8 +1079,8 @@
 				615FEAE012A2A6640098EE92 /* localplayButton~iphone.png */,
 				615FEADF12A2A6640098EE92 /* localplayButton~ipad.png */,
 				61F9040D11DF59D10068B24D /* netplayButton.png */,
-				61EBA62811DFF2BC0048B68A /* title.png */,
-				618899811299516000D55FD6 /* title@2x.png */,
+				61EBA62811DFF2BC0048B68A /* title~iphone.png */,
+				618899811299516000D55FD6 /* title@2x~iphone.png */,
 				61889984129995B500D55FD6 /* title~ipad.png */,
 				6174F7C612CD62E300205D6F /* smallerTitle.png */,
 				6174F7C712CD62E300205D6F /* smallerTitle@2x.png */,
@@ -1274,7 +1340,7 @@
 				61EF921411DF57AC003441C4 /* joyButtonForwardJump.png in Resources */,
 				61F9040911DF58B00068B24D /* settingsButton.png in Resources */,
 				61F9040B11DF59370068B24D /* background.png in Resources */,
-				61EBA62A11DFF2BC0048B68A /* title.png in Resources */,
+				61EBA62A11DFF2BC0048B68A /* title~iphone.png in Resources */,
 				61F7A43811E290650040BA66 /* Icon-72.png in Resources */,
 				61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */,
 				61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */,
@@ -1342,13 +1408,35 @@
 				61188C0512A6FE8F0026C5DA /* Data in Resources */,
 				61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */,
 				61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */,
-				61188C0812A6FE9A0026C5DA /* title@2x.png in Resources */,
+				61188C0812A6FE9A0026C5DA /* title@2x~iphone.png in Resources */,
 				61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */,
 				6174F7C812CD62E300205D6F /* smallerTitle.png in Resources */,
 				6174F7C912CD62E300205D6F /* smallerTitle@2x.png in Resources */,
 				6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */,
 				6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */,
 				612CABC81391D3CC005E9596 /* hwclassic.mp3 in Resources */,
+				6167C87414294727003DD50F /* surprise@2x.png in Resources */,
+				6167C88C14294738003DD50F /* denied@2x.png in Resources */,
+				6167C8F51429502C003DD50F /* hedgehog.png in Resources */,
+				6167C8F61429502C003DD50F /* hedgehog@2x.png in Resources */,
+				6167C8F71429502C003DD50F /* robotBadge.png in Resources */,
+				6167C8F81429502C003DD50F /* robotBadge@2x.png in Resources */,
+				6167C8F91429502C003DD50F /* star.png in Resources */,
+				6167C8FA1429502C003DD50F /* star@2x.png in Resources */,
+				6167CA37142A6ED7003DD50F /* bot0.png in Resources */,
+				6167CA38142A6ED7003DD50F /* bot0@2x.png in Resources */,
+				6167CA39142A6ED7003DD50F /* bot1.png in Resources */,
+				6167CA3A142A6ED7003DD50F /* bot1@2x.png in Resources */,
+				6167CA3B142A6ED7003DD50F /* bot2.png in Resources */,
+				6167CA3C142A6ED7003DD50F /* bot2@2x.png in Resources */,
+				6167CA3D142A6ED7003DD50F /* bot3.png in Resources */,
+				6167CA3E142A6ED7003DD50F /* bot3@2x.png in Resources */,
+				6167CA3F142A6ED7003DD50F /* bot4.png in Resources */,
+				6167CA40142A6ED7003DD50F /* bot4@2x.png in Resources */,
+				6167CA41142A6ED7003DD50F /* bot5.png in Resources */,
+				6167CA42142A6ED7003DD50F /* bot5@2x.png in Resources */,
+				6167CB48142A8769003DD50F /* basehat-hedgehog.png in Resources */,
+				6167CB49142A8769003DD50F /* basehat-hedgehog@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1366,7 +1454,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 | cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics from QTfrontend/res...\"\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp    ${PROJECT_DIR}/../../QTfrontend/res/btn*.png        ${PROJECT_DIR}/Data/Graphics/Btn/\ncp    ${PROJECT_DIR}/../../QTfrontend/res/icon*.png       ${PROJECT_DIR}/Data/Graphics/Btn/\ncp    ${PROJECT_DIR}/../../QTfrontend/res/StatsMedal*.png ${PROJECT_DIR}/Data/Graphics/Btn/\ncp    ${PROJECT_DIR}/../../QTfrontend/res/StatsR.png      ${PROJECT_DIR}/Data/Graphics/Btn/StatsStar.png\ncp    ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png     ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels       ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels/\n\necho \"Removing text and dummy files...\"\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.svgz -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\nfind ${PROJECT_DIR}/Data -name *.orig -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,Ruler}\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete unused fonts\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\n#delete all names, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nmv ${PROJECT_DIR}/Data/Maps/{Basketball,Knockball,TrophyRace,CTF_Blizzard,Control} ${PROJECT_DIR}/Data/Missions/Maps/\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\n\n#reduce the number of flakes for City\nawk '{if ($1 == 1500) $1=40; print $0}' < ${PROJECT_DIR}/Data/Themes/City/theme.cfg > /tmp/tempfile\nmv /tmp/tempfile ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\necho \"Done\"";
+			shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\n\n#create config.inc\necho \"Updating config file...\"\nPROTO=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep HEDGEWARS_PROTO_VER | cut -d ' ' -f 2 | cut -d ')' -f 1`\nMAJN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MAJOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nMINN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_MINOR | xargs | cut -d ' ' -f 2 |cut -d ')' -f 1`\nPATN=`cat ${PROJECT_DIR}/../../CMakeLists.txt | grep CPACK_PACKAGE_VERSION_PATCH | xargs | cut -d ' ' -f 2 |cut -d '$' -f 1`\nREVN=-`/usr/local/bin/hg id -n ${PROJECT_DIR}/../../`\necho \"const cNetProtoVersion = $PROTO; const cVersionString = '${MAJN}.${MINN}.${PATN}${REVN}'; const cLuaLibrary = '';\" > ${PROJECT_DIR}/../../hedgewars/config.inc\n\necho \"Copying Data...\"\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\necho \"Fetching additional graphics from QTfrontend...\"\nmkdir ${PROJECT_DIR}/Data/Graphics/Icons\ncp    ${PROJECT_DIR}/../../QTfrontend/res/{btn*,icon*,StatsMedal*,ammopic*}.png  ${PROJECT_DIR}/Data/Graphics/Icons/\n\necho \"Removing text and dummy files...\"\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg* -delete\nfind ${PROJECT_DIR}/Data -name *.psd -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\nfind ${PROJECT_DIR}/Data -name *.orig -delete\nfind ${PROJECT_DIR}/Data -name *.ts -delete\n\n#delete dummy maps and hats, misc stuff\nrm -rf ${PROJECT_DIR}/Data/Maps/test*\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/{TeamCap,TeamHeadband,TeamHair}\nrm -rf ${PROJECT_DIR}/Data/misc/\n\n#delete forbidden maps and WIP themes (remember to check that no Map uses them)\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{Beach,Digital}\n\n#delete all names, reserved hats and unused fonts\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\nrm -rf ${PROJECT_DIR}/Data/Fonts/{wqy-zenhei.ttc,DroidSansFallback.ttf}\n\necho \"Handling audio files...\"\n#delete the Classic voice\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#delete the main theme file\nrm -rf ${PROJECT_DIR}/Data/Music/main_theme.ogg\n#copy mono audio\ncp -R ${PROJECT_DIR}/Audio/* ${PROJECT_DIR}/Data/\n#remove unused voices\nfor i in {Amazing,Brilliant,Bugger,Bungee,Cutitout,Drat,Excellent,Fire,FlawlessPossibility,Gonnagetyou,Grenade,Hmm,Justyouwait,Leavemealone,Ohdear,Ouch,Perfect,Revenge,Runaway,Solong,Thisoneismine,VictoryPossibility,Watchthis,Whatthe,Whoopsee}; do find Data/Sounds/voices/ -name $i.ogg -delete; done\n\necho \"Tweaking Data contents...\"\n#move Lua maps in Missions\nmkdir ${PROJECT_DIR}/Data/Missions/Maps/\nfor i in `ls ${PROJECT_DIR}/Data/Maps/`; do if [[ `ls -f ${PROJECT_DIR}/Data/Maps/$i/map.lua 2> /dev/null` != '' ]]; then mv ${PROJECT_DIR}/Data/Maps/$i ${PROJECT_DIR}/Data/Missions/Maps/; fi; done;\n#workaround for missing map in CTF_Blizzard\nln -s ../../../Maps/Blizzard/map.png ${PROJECT_DIR}/Data/Missions/Maps/CTF_Blizzard/map.png\n#remove cfg files since we have plists\nfind ${PROJECT_DIR}/Data/Scripts -name *.cfg -delete\nif ((`ls ${PROJECT_DIR}/Data/Scripts/Multiplayer/*.lua|wc -l` >= `ls ${PROJECT_DIR}/Data/Scripts/plist/*.plist|wc -l` ))\nthen\necho \"${PROJECT_DIR}/Data/Scripts/Multiplayer/Normal.plist:0: warning, missing plist implementation of a Multiplayer script file\"\nfi\n\n#reduce the number of flakes for City\nsed -ie 's/1500/50/' ${PROJECT_DIR}/Data/Themes/City/theme.cfg\n\necho \"Done\"";
 			showEnvVarsInLog = 0;
 		};
 		9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
@@ -1547,10 +1635,10 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B  -Sgix";
-				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
 				FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
 				FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
-				FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs  -Cfvfpv2 -dNOCONSOLE";
+				FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs  -Cfvfpv3 -dNOCONSOLE";
 				FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DEBUGGING_SYMBOLS = default;
@@ -1630,10 +1718,10 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B  -Sgix";
-				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
 				FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
 				FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
-				FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs- -Cfvfpv2";
+				FPC_SPECIFIC_OPTIONS = "-dDEBUGFILE -O- -g -gl -gw2 -gt -ghttt -Xs- -Cfvfpv3";
 				FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DEBUGGING_SYMBOLS = full;
@@ -1802,10 +1890,10 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				FPC_COMMON_OPTIONS = "-dIPHONEOS -Cs2000000 -vwi -B  -Sgix";
-				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
+				FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.7.1;
 				FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
 				FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
-				FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs  -Cfvfpv2 -dDEBUGFILE";
+				FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -Os -Xs  -Cfvfpv3 -dDEBUGFILE";
 				FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DEBUGGING_SYMBOLS = default;
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Info.plist
--- a/project_files/HedgewarsMobile/Info.plist	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Info.plist	Sun Sep 25 10:48:18 2011 -0400
@@ -28,13 +28,15 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIPrerenderedIcon</key>
+	<true/>
+	<key>UIStatusBarHidden</key>
+	<true/>
 	<key>UILaunchImageFile~ipad</key>
 	<string>Default-ipad</string>
-	<key>UIStatusBarHidden</key>
-	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/background@2x~iphone.png
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/localplayButton@2x~iphone.png
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/smallerBackground@2x~iphone.png
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/title.png
Binary file project_files/HedgewarsMobile/Resources/Frontend/title.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/title@2x.png
Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/title@2x~iphone.png
Binary file project_files/HedgewarsMobile/Resources/Frontend/title@2x~iphone.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Frontend/title~iphone.png
Binary file project_files/HedgewarsMobile/Resources/Frontend/title~iphone.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog.png
Binary file project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/basehat-hedgehog@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot0.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot0.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot0@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot0@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot1.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot1.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot1@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot1@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot2.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot2.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot2@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot2@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot3.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot3.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot3@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot3@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot4.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot4.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot4@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot4@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot5.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot5.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/bot5@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/bot5@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/hedgehog.png
Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/hedgehog@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/hedgehog@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/robotBadge.png
Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/robotBadge@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/robotBadge@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/star.png
Binary file project_files/HedgewarsMobile/Resources/Icons/star.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Icons/star@2x.png
Binary file project_files/HedgewarsMobile/Resources/Icons/star@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib	Sun Sep 25 10:48:18 2011 -0400
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10H574</string>
+		<string key="IBDocument.SystemVersion">10K549</string>
 		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="22"/>
+			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -71,7 +71,7 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">title.png</string>
+							<string key="NSResourceName">title~iphone.png</string>
 						</object>
 					</object>
 					<object class="IBUIButton" id="124270424">
@@ -631,7 +631,7 @@
 				<string>localplayButton~iphone.png</string>
 				<string>savesButton.png</string>
 				<string>settingsButton.png</string>
-				<string>title.png</string>
+				<string>title~iphone.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/RestoreViewController-iPad.xib	Sun Sep 25 10:48:18 2011 -0400
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
+		<string key="IBDocument.SystemVersion">10K549</string>
 		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -105,8 +105,8 @@
 							<int key="NSfFlags">16</int>
 						</object>
 						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MSAxIDAAA</bytes>
+							<int key="NSColorSpace">2</int>
+							<bytes key="NSRGB">MSAwLjc4MDM5MjIyOTYgMAA</bytes>
 						</object>
 						<reference key="IBUIHighlightedColor" ref="790402446"/>
 						<int key="IBUIBaselineAdjustment">1</int>
@@ -305,7 +305,7 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>RestoreViewController</string>
 					<string>UIResponder</string>
-					<string>{{640, 244}, {540, 640}}</string>
+					<string>{{566, 244}, {540, 640}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<object class="NSAffineTransform">
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/RestoreViewController-iPhone.xib	Sun Sep 25 10:48:18 2011 -0400
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
+		<string key="IBDocument.SystemVersion">10K549</string>
 		<string key="IBDocument.InterfaceBuilderVersion">823</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -71,8 +71,8 @@
 							<int key="NSfFlags">16</int>
 						</object>
 						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MSAxIDAAA</bytes>
+							<int key="NSColorSpace">2</int>
+							<bytes key="NSRGB">MSAwLjgyNzQ1MTA1MDMgMAA</bytes>
 						</object>
 						<object class="NSColor" key="IBUIHighlightedColor" id="790402446">
 							<int key="NSColorSpace">3</int>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/hedgehog@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge.png
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge@2x.png
Binary file project_files/HedgewarsMobile/Resources/Settings/Images/robotBadge@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>30</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>0</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-		<integer>40</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>45</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>3</integer>
-		<integer>4</integer>
-		<integer>0</integer>
-		<integer>2</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>45</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>3</integer>
-		<integer>4</integer>
-		<integer>0</integer>
-		<integer>2</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>45</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>3</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>45</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>3</integer>
-		<integer>4</integer>
-		<integer>0</integer>
-		<integer>2</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>50</integer>
-		<integer>150</integer>
-		<integer>30</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>0</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>0</integer>
-		<integer>80</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>15</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>0</integer>
-		<integer>35</integer>
-		<integer>25</integer>
-		<integer>3</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-		<integer>2</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>300</integer>
-		<integer>50</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>1</integer>
-		<integer>0</integer>
-		<integer>35</integer>
-		<integer>3</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-		<integer>0</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>45</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>2</integer>
-		<integer>25</integer>
-		<integer>25</integer>
-		<integer>4</integer>
-		<integer>5</integer>
-		<integer>0</integer>
-		<integer>5</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>30</integer>
-		<integer>5</integer>
-		<integer>3</integer>
-		<integer>10</integer>
-		<integer>2</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist	Mon Sep 19 19:12:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>basic</key>
-	<array>
-		<integer>100</integer>
-		<integer>100</integer>
-		<integer>30</integer>
-		<integer>15</integer>
-		<integer>47</integer>
-		<integer>5</integer>
-		<integer>100</integer>
-		<integer>5</integer>
-		<integer>35</integer>
-		<integer>3</integer>
-		<integer>25</integer>
-		<integer>10</integer>
-		<integer>10</integer>
-		<integer>10</integer>
-	</array>
-	<key>gamemod</key>
-	<array>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<true/>
-		<false/>
-		<false/>
-		<true/>
-		<true/>
-		<true/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-		<false/>
-	</array>
-</dict>
-</plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/credits.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/credits.plist	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/credits.plist	Sun Sep 25 10:48:18 2011 -0400
@@ -16,6 +16,9 @@
 		<string>Richard &quot;Sheepluva&quot; Korlyi</string>
 		<string>Henning &quot;Prg&quot; Kühn</string>
 		<string>Henrik &quot;Henek&quot; Rostedt</string>
+		<string>John &quot;Mikade&quot; Lambert</string>
+		<string>Mayur &quot;Zorg&quot; Pawashe</string>
+		<string>Richard &quot;Xeli&quot; Deurwaarder</string>
 	</array>
 	<array>
 		<string>John &quot;Fizzy&quot; Dum</string>
@@ -40,16 +43,19 @@
 		<string>Andrey Korotaev</string>
 		<string>Nina Kuisma</string>
 		<string>Antoine Turmel</string>
-		<string>Peter Hüwe, Mario Liebisch</string>
-		<string>Luca Bonora</string>
+		<string>Peter Hüwe, Mario Liebisch, Richard Karolyi</string>
+		<string>Talos Kriti</string>
+		<string>Luca Bonora, Marco Bresciani</string>
 		<string>Adam Etienne</string>
-		<string>Maciej Mroziński, Wojciech Latkowski, Maciej Górny</string>
+		<string>Anthony Bellew</string>
+		<string>Lukas Urbonas</string>
+		<string>Maciej Mroziński, Wojciech Latkowski, Piotr Mitana, Maciej Górny</string>
 		<string>Fábio Canário</string>
 		<string>Andrey Korotaev</string>
 		<string>Jose Riha</string>
 		<string>Carlos Vives</string>
-		<string>Niklas Grahn</string>
-		<string>Eugene V. Lyubimkin</string>
+		<string>Niklas Grahn, Henrik Rostedt</string>
+		<string>Eugene V. Lyubimkin, Igor Paliychuk, Eugene Sakara</string>
 	</array>
 	<array>
 		<string>Aleksey Andreev</string>
@@ -58,19 +64,22 @@
 		<string>Adam Higerd</string>
 	</array>
 	<array>
-		<string>Engine, frontend, net server author</string>
-		<string>Desktop frontend improvements</string>
-		<string>Many engine and frontend improvements</string>
+		<string>Engine, frontend, net server</string>
+		<string>Many desktop frontend improvements</string>
+		<string>Many engine and desktop frontend improvements</string>
 		<string>Drillrocket, Ballgun, RC Plane weapons</string>
 		<string>Mine number and time game settings</string>
 		<string>Desktop frontend improvements</string>
 		<string>Desktop frontend improvements</string>
 		<string>Mac OS X and iPhone version</string>
-		<string>Gamepad support</string>
+		<string>Many engine and desktop frontend improvements</string>
+		<string>Gamepad and Lua integration</string>
 		<string>Many engine improvements and graphics</string>
-		<string>Many engine and server improvements</string>
 		<string>Maze maps</string>
-		<string>Engine and frontend improvements</string>
+		<string>Engine and desktop frontend improvements</string>
+		<string>Lua game modes and missions</string>
+		<string>Desktop frontend improvements</string>
+		<string>Android port</string>
 	</array>
 	<array>
 		<string>Main graphics</string>
@@ -96,8 +105,11 @@
 		<string>Finnish</string>
 		<string>French</string>
 		<string>German</string>
+		<string>Greek</string>
 		<string>Italian</string>
 		<string>Japanese</string>
+		<string>Korean</string>
+		<string>Lithuanian</string>
 		<string>Polish</string>
 		<string>Portuguese</string>
 		<string>Russian</string>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/Settings/gameMods.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/gameMods.plist	Mon Sep 19 19:12:19 2011 +0200
+++ b/project_files/HedgewarsMobile/Resources/Settings/gameMods.plist	Sun Sep 25 10:48:18 2011 -0400
@@ -194,5 +194,13 @@
 		<key>title</key>
 		<string>Tag Team</string>
 	</dict>
+	<dict>
+		<key>description</key>
+		<string>Add an indestructible border along the bottom</string>
+		<key>image</key>
+		<string>BottomBorder</string>
+		<key>title</key>
+		<string>Bottom Border</string>
+	</dict>
 </array>
 </plist>
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/denied@2x.png
Binary file project_files/HedgewarsMobile/Resources/denied@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 project_files/HedgewarsMobile/Resources/surprise@2x.png
Binary file project_files/HedgewarsMobile/Resources/surprise@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/CMakeLists.txt
--- a/share/hedgewars/Data/Forts/CMakeLists.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/share/hedgewars/Data/Forts/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -1,4 +1,6 @@
 file(GLOB FortSprites *L.png *R.png) 
+list(REMOVE_ITEM FortSprites *@2x.png)
+list(REMOVE_ITEM FortSprites *-icon.png)
 
 install(FILES
 	${FortSprites}
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Cake-icon.png
Binary file share/hedgewars/Data/Forts/Cake-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Cake-icon@2x.png
Binary file share/hedgewars/Data/Forts/Cake-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Castle-icon.png
Binary file share/hedgewars/Data/Forts/Castle-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Castle-icon@2x.png
Binary file share/hedgewars/Data/Forts/Castle-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Earth-icon.png
Binary file share/hedgewars/Data/Forts/Earth-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Earth-icon@2x.png
Binary file share/hedgewars/Data/Forts/Earth-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/EvilChicken-icon.png
Binary file share/hedgewars/Data/Forts/EvilChicken-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/EvilChicken-icon@2x.png
Binary file share/hedgewars/Data/Forts/EvilChicken-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Flowerhog-icon.png
Binary file share/hedgewars/Data/Forts/Flowerhog-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Flowerhog-icon@2x.png
Binary file share/hedgewars/Data/Forts/Flowerhog-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Hydrant-icon.png
Binary file share/hedgewars/Data/Forts/Hydrant-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Hydrant-icon@2x.png
Binary file share/hedgewars/Data/Forts/Hydrant-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Lego-icon.png
Binary file share/hedgewars/Data/Forts/Lego-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Lego-icon@2x.png
Binary file share/hedgewars/Data/Forts/Lego-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Plane-icon.png
Binary file share/hedgewars/Data/Forts/Plane-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Plane-icon@2x.png
Binary file share/hedgewars/Data/Forts/Plane-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Statue-icon.png
Binary file share/hedgewars/Data/Forts/Statue-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Statue-icon@2x.png
Binary file share/hedgewars/Data/Forts/Statue-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Tank-icon.png
Binary file share/hedgewars/Data/Forts/Tank-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Tank-icon@2x.png
Binary file share/hedgewars/Data/Forts/Tank-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/UFO-icon.png
Binary file share/hedgewars/Data/Forts/UFO-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/UFO-icon@2x.png
Binary file share/hedgewars/Data/Forts/UFO-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Wood-icon.png
Binary file share/hedgewars/Data/Forts/Wood-icon.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Forts/Wood-icon@2x.png
Binary file share/hedgewars/Data/Forts/Wood-icon@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/AmmoMenu/Ammos@2x.png
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw@2x.png
Binary file share/hedgewars/Data/Graphics/AmmoMenu/Ammos_bw@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt
--- a/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -1,5 +1,5 @@
 file(GLOB AmmoMenuSprites *.png)
-list(REMOVE_ITEM AmmoMenuSprites *_iPhone.png)
+list(REMOVE_ITEM AmmoMenuSprites *@2x.png)
 
 install(FILES
 	${AmmoMenuSprites}
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/CMakeLists.txt
--- a/share/hedgewars/Data/Graphics/CMakeLists.txt	Mon Sep 19 19:12:19 2011 +0200
+++ b/share/hedgewars/Data/Graphics/CMakeLists.txt	Sun Sep 25 10:48:18 2011 -0400
@@ -6,6 +6,7 @@
 add_subdirectory(SuddenDeath)
 
 file(GLOB BaseSprites *.png) 
+list(REMOVE_ITEM BaseSprites *@2x.png)
 
 install(FILES
 	${BaseSprites}
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/Egg@2x.png
Binary file share/hedgewars/Data/Graphics/Egg@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/HellishBomb@2x.png
Binary file share/hedgewars/Data/Graphics/HellishBomb@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/Seduction@2x.png
Binary file share/hedgewars/Data/Graphics/Seduction@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/Target@2x.png
Binary file share/hedgewars/Data/Graphics/Target@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/TargetBee@2x.png
Binary file share/hedgewars/Data/Graphics/TargetBee@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Graphics/cheese@2x.png
Binary file share/hedgewars/Data/Graphics/cheese@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Maps/Control/preview@2x.png
Binary file share/hedgewars/Data/Maps/Control/preview@2x.png has changed
diff -r c24fdd9a0458 -r 647d52370ce9 share/hedgewars/Data/Themes/Deepspace/theme.cfg
--- a/share/hedgewars/Data/Themes/Deepspace/theme.cfg	Mon Sep 19 19:12:19 2011 +0200
+++ b/share/hedgewars/Data/Themes/Deepspace/theme.cfg	Sun Sep 25 10:48:18 2011 -0400
@@ -4,6 +4,6 @@
 water-bottom = $2A, $2A, $2A
 water-opacity = $CC
 music = hell.ogg
-clouds = 9
+clouds = 0
 flakes = 50, 1, 1000, 50, 50
 ;1, 1000, 50, 50 are copied from bamboo theme, as these numbers are required