--- a/cmake_modules/paths.cmake	Sat Apr 18 10:32:12 2015 +0100
+++ b/cmake_modules/paths.cmake	Mon May 04 23:52:56 2015 +0200
@@ -60,11 +60,12 @@
     set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
     #install_name_tool for libraries
     set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Frameworks")
-else(APPLE)
+else(APPLE AND NOT (${CMAKE_INSTALL_PREFIX} MATCHES "/usr"))
     #paths where to find libraries (final slash not optional):
     # - the first is relative to the executable
     # - the second is the same directory of the executable (so it runs in bin/)
     # - the third one is the full path of the system dir
     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+    #skip this if the install prefix is the standard one
     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
 endif(APPLE)

--- a/gameServer/NetRoutines.hs	Sat Apr 18 10:32:12 2015 +0100
+++ b/gameServer/NetRoutines.hs	Mon May 04 23:52:56 2015 +0200
@@ -29,18 +29,18 @@
 import qualified Data.ByteString.Char8 as B
 import qualified Control.Exception as E
 import System.Entropy
+import Data.Either
 -----------------------------
 import CoreTypes
 import Utils
 
 
 acceptLoop :: Socket -> Chan CoreMessage -> IO ()
-acceptLoop servSock chan = E.bracket openHandle closeHandle f
+acceptLoop servSock chan = E.bracket openHandle closeHandle (forever . f)
     where
-    f ch = forever $
-        do
-        (sock, sockAddr) <- Network.Socket.accept servSock
-
+    f ch = E.try (Network.Socket.accept servSock) >>= \v -> case v of
+      Left (e :: E.IOException) -> return ()
+      Right (sock, sockAddr) -> do
         clientHost <- sockAddr2String sockAddr
 
         currentTime <- getCurrentTime

--- a/hedgewars/uChat.pas	Sat Apr 18 10:32:12 2015 +0100
+++ b/hedgewars/uChat.pas	Mon May 04 23:52:56 2015 +0200
@@ -36,7 +36,7 @@
 uses SDLh, uInputHandler, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO, uScript, uRenderUtils;
 
 const MaxStrIndex = 27;
-      MaxInputStrLen = 240;
+      MaxInputStrLen = 200;
 
 type TChatLine = record
     Tex: PTexture;
@@ -47,19 +47,15 @@
     end;
     TChatCmd = (ccQuit, ccPause, ccFinish, ccShowHistory, ccFullScreen);
 
-type TInputStrL = array[0..260] of byte;
-
 var Strs: array[0 .. MaxStrIndex] of TChatLine;
     MStrs: array[0 .. MaxStrIndex] of shortstring;
     LocalStrs: array[0 .. MaxStrIndex] of shortstring;
-    LocalStrsL: array[0 .. MaxStrIndex] of TInputStrL;
     missedCount: LongWord;
     lastStr: LongWord;
     localLastStr: LongInt;
     history: LongInt;
     visibleCount: LongWord;
     InputStr: TChatLine;
-    InputStrL: TInputStrL; // for full str + 4-byte utf-8 char
     ChatReady: boolean;
     showAll: boolean;
     liveLua: boolean;
@@ -72,8 +68,6 @@
 
 
 const
-    InputStrLNoPred: byte = 255;
-
     colors: array[#0..#6] of TSDL_Color = (
             (r:$FF; g:$FF; b:$FF; a:$FF), // unused, feel free to take it for anything
             (r:$FF; g:$FF; b:$FF; a:$FF), // chat message [White]
@@ -98,6 +92,13 @@
 const Padding  = 2;
       ClHeight = 2 * Padding + 16; // font height
 
+// relevant for UTF-8 handling
+function IsFirstCharByte(c: char): boolean; inline;
+begin
+    // based on https://en.wikipedia.org/wiki/UTF-8#Description
+    IsFirstCharByte:= (byte(c) and $C0) <> $80;
+end;
+
 function charIsForHogSpeech(c: char): boolean;
 begin
 exit((c = '"') or (c = '''') or (c = '-'));
@@ -427,7 +428,6 @@
     // put in input history
     localLastStr:= (localLastStr + 1) mod MaxStrIndex;
     LocalStrs[localLastStr]:= s;
-    LocalStrsL[localLastStr]:= InputStrL;
     end;
 
 t:= LocalTeam;
@@ -576,7 +576,7 @@
 end;
 
 procedure DelBytesFromInputStrBack(endIdx: integer; count: byte);
-var i, startIdx: integer;
+var startIdx: integer;
 begin
     // nothing to do if count is 0
     if count = 0 then
@@ -588,45 +588,48 @@
     // delete bytes from string
     Delete(InputStr.s, startIdx, count);
 
-    // wipe utf8 info for deleted char
-    InputStrL[endIdx]:= InputStrLNoPred;
-
-    // shift utf8 char info to reflect new string
-    for i:= endIdx + 1 to Length(InputStr.s) + count do
-        begin
-        if InputStrL[i] <> InputStrLNoPred then
-            begin
-            InputStrL[i-count]:= InputStrL[i] - count;
-            InputStrL[i]:= InputStrLNoPred;
-            end;
-        end;
-
     SetLine(InputStr, InputStr.s, true);
 end;
 
-// returns count of removed bytes
-function DelCharFromInputStr(idx: integer): integer;
-var btw: byte;
+procedure MoveCursorToPreviousChar();
 begin
-    // note: idx is always at last byte of utf8 chars. cuz relevant for InputStrL
-
-    if (Length(InputStr.s) < 1) or (idx < 1) or (idx > Length(InputStr.s)) then
-        exit(0);
-
-    btw:= byte(idx) - InputStrL[idx];
-
-    DelCharFromInputStr:= btw;
-
-    DelBytesFromInputStrBack(idx, btw);
+    if cursorPos > 0 then
+        begin
+        while (not IsFirstCharByte(InputStr.s[cursorPos])) do
+            begin
+            dec(cursorPos);
+            end;
+        dec(cursorPos);
+        end;
 end;
 
-// unchecked
-procedure DoCursorStepForward();
+procedure MoveCursorToNextChar();
 begin
-    // go to end of next utf8-char
-    repeat
-        inc(cursorPos);
-    until InputStrL[cursorPos] <> InputStrLNoPred;
+    if cursorPos <  Length(InputStr.s) then
+        begin
+        inc(cursorPos, 2);
+        while (cursorPos <  Length(InputStr.s)) and (not IsFirstCharByte(InputStr.s[cursorPos])) do
+            begin
+            inc(cursorPos);
+            end;
+        dec(cursorPos);
+        end;
+end;
+
+procedure DeleteLastUTF8CharFromStr(var s: shortstring);
+var l: byte;
+begin
+    l:= Length(s);
+
+    while (l > 1) and (not IsFirstCharByte(s[l])) do
+        begin
+        dec(l);
+        end;
+
+    if l > 0 then
+        dec(l);
+
+    s[0]:= char(l);
 end;
 
 procedure DeleteSelected();
@@ -635,8 +638,8 @@
         begin
         DelBytesFromInputStrBack(max(cursorPos, selectedPos), abs(selectedPos-cursorPos));
         cursorPos:= min(cursorPos, selectedPos);
-        ResetSelection();
         end;
+    ResetSelection();
     UpdateCursorCoords();
 end;
 
@@ -656,10 +659,6 @@
 function GetInputCharSkipClass(index: LongInt): TCharSkip;
 var  c: char;
 begin
-    // multi-byte chars counts as letter
-    if (index > 1) and (InputStrL[index] <> index - 1) then
-        exit(numalpha);
-
     c:= InputStr.s[index];
 
     // non-ascii counts as letter
@@ -700,33 +699,31 @@
         begin
         skip:= GetInputCharSkipClass(cursorPos);
         if skip = wspace then
-            cursorPos:= InputStrL[cursorPos];
+            MoveCursorToPreviousChar();
         end;
     // skip same-type chars
     while (cursorPos > 0) and (GetInputCharSkipClass(cursorPos) = skip) do
-        cursorPos:= InputStrL[cursorPos];
+        MoveCursorToPreviousChar();
     end
 else
     begin
     // skip same-type chars
     while cursorPos < Length(InputStr.s) do
         begin
-        DoCursorStepForward();
+        MoveCursorToNextChar();
         if (GetInputCharSkipClass(cursorPos) <> skip) then
             begin
-            // go back 1 char
-            cursorPos:= InputStrL[cursorPos];
+            MoveCursorToPreviousChar();
             break;
             end;
         end;
     // skip trailing whitespace, similar to Qt
     while cursorPos < Length(InputStr.s) do
         begin
-        DoCursorStepForward();
+        MoveCursorToNextChar();
         if (GetInputCharSkipClass(cursorPos) <> wspace) then
             begin
-            // go back 1 char
-            cursorPos:= InputStrL[cursorPos];
+            MoveCursorToPreviousChar();
             break;
             end;
         end;
@@ -748,42 +745,44 @@
         end;
 end;
 
-// TODO: honor utf8, don't break utf8 chars when shifting chars beyond limit
 procedure InsertIntoInputStr(s: shortstring);
-var i, l, il, lastc: integer;
+var limit: integer;
 begin
-    // safe length for string
-    l:= min(MaxInputStrLen-cursorPos, Length(s));
-    s:= copy(s,1,l);
+    // we check limit for trailing stuff before insertion limit for a reason
+    // (possible remaining space after too long UTF8-insertion has been shortened)
 
-    // if we insert rather than append, shift info in InputStrL accordingly
-    if cursorPos < Length(InputStr.s) then
+    // length limit for stuff to that will trail the insertion
+    limit:= max(cursorPos, MaxInputStrLen-Length(s));
+
+    while Length(InputStr.s) > limit do
         begin
-        for i:= Length(InputStr.s) downto cursorPos + 1 do
-            begin
-            if InputStrL[i] <> InputStrLNoPred then
-                begin
-                il:= i + l;
-                // only shift if not overflowing
-                if il <= MaxInputStrLen then
-                    InputStrL[il]:= InputStrL[i] + l;
-                InputStrL[i]:= InputStrLNoPred;
-                end;
-            end;
+        DeleteLastUTF8CharFromStr(InputStr.s);
         end;
 
-    InputStrL[cursorPos + l]:= cursorPos;
-    // insert string truncated to safe length
-    Insert(s, InputStr.s, cursorPos + 1);
-    if Length(InputStr.s) > MaxInputStrLen then
-        InputStr.s[0]:= char(MaxInputStrLen);
+    // length limit for stuff to insert
+    limit:= max(0, MaxInputStrLen-cursorPos);
+
+    if limit = 0 then
+        s:= ''
+    else while Length(s) > limit do
+        begin
+        DeleteLastUTF8CharFromStr(s);
+        end;
 
-    SetLine(InputStr, InputStr.s, true);
+    if Length(s) > 0 then
+        begin
+        // insert string truncated to safe length
+        Insert(s, InputStr.s, cursorPos + 1);
 
-    // move cursor to end of inserted string
-    lastc:= MaxInputStrLen;
-    cursorPos:= min(lastc, cursorPos + l);
-    UpdateCursorCoords();
+        if Length(InputStr.s) > MaxInputStrLen then
+            InputStr.s[0]:= char(MaxInputStrLen);
+
+        SetLine(InputStr, InputStr.s, true);
+
+        // move cursor to end of inserted string
+        inc(cursorPos, Length(s));
+        UpdateCursorCoords();
+        end;
 end;
 
 procedure PasteFromClipboard();
@@ -821,60 +820,41 @@
             begin
             if selectedPos < 0 then
                 begin
-                if ctrl then
-                    skip:= GetInputCharSkipClass(cursorPos);
-
-                // remove char before cursor
-                dec(cursorPos, DelCharFromInputStr(cursorPos));
+                HandleSelection(true);
 
                 // delete more if ctrl is held
-                if ctrl and (selectedPos < 0) then
-                    begin
-                    HandleSelection(true);
-                    SkipInputChars(skip, true);
-                    DeleteSelected();
-                    end
+                if ctrl then
+                    SkipInputChars(GetInputCharSkipClass(cursorPos), true)
                 else
-                    UpdateCursorCoords();
+                    MoveCursorToPreviousChar();
 
-                end
-            else
-                DeleteSelected();
+                end;
+
+            DeleteSelected();
+            UpdateCursorCoords();
             end;
         SDLK_DELETE:
             begin
             if selectedPos < 0 then
                 begin
-                // remove char after cursor
-                if cursorPos < Length(InputStr.s) then
-                    begin
-                    DoCursorStepForward();
-                    if ctrl then
-                        skip:= GetInputCharSkipClass(cursorPos);
-
-                    // delete char
-                    dec(cursorPos, DelCharFromInputStr(cursorPos));
+                HandleSelection(true);
 
-                    // delete more if ctrl is held
-                    if ctrl and (cursorPos < Length(InputStr.s)) then
-                        begin
-                        HandleSelection(true);
-                        SkipInputChars(skip, false);
-                        DeleteSelected();
-                        end;
-                    end
+                // delete more if ctrl is held
+                if ctrl then
+                    SkipInputChars(GetInputCharSkipClass(cursorPos), false)
                 else
-                    UpdateCursorCoords();
-                end
-            else
-                DeleteSelected();
+                    MoveCursorToNextChar();
+
+                end;
+
+            DeleteSelected();
+            UpdateCursorCoords();
             end;
         SDLK_ESCAPE:
             begin
             if Length(InputStr.s) > 0 then
                 begin
                 SetLine(InputStr, '', true);
-                FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
                 ResetCursor();
                 end
             else CleanupInput
@@ -885,7 +865,6 @@
                 begin
                 AcceptChatString(InputStr.s);
                 SetLine(InputStr, '', false);
-                FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
                 ResetCursor();
                 end;
             CleanupInput
@@ -898,12 +877,10 @@
             if (index > localLastStr) then
                 begin
                 SetLine(InputStr, '', true);
-                FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
                 end
             else
                 begin
                 SetLine(InputStr, LocalStrs[index], true);
-                InputStrL:= LocalStrsL[index];
                 end;
             cursorPos:= Length(InputStr.s);
             ResetSelection();
@@ -946,7 +923,7 @@
                     begin
                     HandleSelection(selMode);
                     // go to end of previous utf8-char
-                    cursorPos:= InputStrL[cursorPos];
+                    MoveCursorToPreviousChar();
                     end
                 else // if we're leaving selection mode, jump to its left end
                     begin
@@ -971,7 +948,7 @@
                 if selMode or (selectedPos < 0) then
                     begin
                     HandleSelection(selMode);
-                    DoCursorStepForward();
+                    MoveCursorToNextChar();
                     end
                 else // if we're leaving selection mode, jump to its right end
                     begin
@@ -1018,7 +995,10 @@
             begin
             // paste
             if ctrl then
-                PasteFromClipboard()
+                begin
+                DeleteSelected();
+                PasteFromClipboard();
+                end
             else
                 action:= false;
             end;
@@ -1062,6 +1042,7 @@
         if Length(InputStr.s) + btw > MaxInputStrLen then
             exit;
 
+        // if speech bubble quotes are used as first input, add the closing quote and place cursor inbetween
         if (Length(InputStr.s) = 0) and (Length(utf8) = 1) and (charIsForHogSpeech(utf8[1])) then
             begin
             InsertIntoInputStr(utf8);
@@ -1127,9 +1108,6 @@
     else
         begin
         SetLine(InputStr, '/team ', true);
-        // update InputStrL and cursor accordingly
-        // this allows cursor-jumping over '/team ' as if it was a single char
-        InputStrL[6]:= 0;
         cursorPos:= 6;
         UpdateCursorCoords();
         end;
@@ -1162,8 +1140,6 @@
     for i:= 0 to MaxStrIndex do
         Strs[i].Tex := nil;
 
-    FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
-
     LastKeyPressTick:= 0;
     ResetCursor();
 end;

--- a/hedgewars/uWorld.pas	Sat Apr 18 10:32:12 2015 +0100
+++ b/hedgewars/uWorld.pas	Mon May 04 23:52:56 2015 +0200
@@ -1706,7 +1706,7 @@
 var PrevSentPointTime: LongWord = 0;
 
 procedure MoveCamera;
-var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY, cameraJump: LongInt;
+var EdgesDist, wdy, shs,z, amNumOffsetX, amNumOffsetY, cameraJump, dstX: LongInt;
     inbtwnTrgtAttks: Boolean;
 begin
 {$IFNDEF MOBILE}
@@ -1724,28 +1724,36 @@
         end
     else
         begin
-        if (WorldEdge = weWrap) then
-            cameraJump:= LongInt(playWidth) div 2 + 50
-        else
-            cameraJump:= LongInt(rightX) - leftX - 100;
+            dstX:= hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx;
 
-        if abs(prevPoint.X - WorldDx - hwRound(FollowGear^.X)) > cameraJump then
-            begin
-            if prevPoint.X - WorldDx < LongInt(playWidth div 2) then
-                cameraJump:= LongInt(playWidth)
-            else
-                cameraJump:= -LongInt(playWidth);
-            WorldDx:= WorldDx - cameraJump;
-            end;
+            if (WorldEdge = weWrap) then
+                begin
+                    if dstX - prevPoint.X < (LongInt(leftX) - rightX) div 2 then
+                        CursorPoint.X:= (prevPoint.X * 7 + dstX - (leftX - rightX)) div 8
+                    else if dstX - prevPoint.X > (LongInt(rightX) - leftX) div 2 then
+                        CursorPoint.X:= (prevPoint.X * 7 + dstX - (rightX - leftX)) div 8
+                    else
+                        CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8;
+                end
+            else // usual camera movement routine
+                begin
+                    CursorPoint.X:= (prevPoint.X * 7 + dstX) div 8;
+                end;
 
-        CursorPoint.X:= (prevPoint.X * 7 + hwRound(FollowGear^.X) + hwSign(FollowGear^.dX) * z + WorldDx) div 8;
-
-        if isPhone() or (cScreenHeight < 600) or ((hwSign(FollowGear^.dY) * z) < 10)  then
+        if isPhone() or (cScreenHeight < 600) or ((FollowGear^.dY * z).Round < 10) 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;
 
+if (WorldEdge = weWrap) then
+    begin
+        if -WorldDx < leftX then
+            WorldDx:= WorldDx - LongInt(rightX) + leftX
+        else if -WorldDx > rightX then
+            WorldDx:= WorldDx + LongInt(rightX) - leftX;
+    end;
+
 wdy:= trunc(cScreenHeight / cScaleFactor) + cScreenHeight div 2 - cWaterLine - cVisibleWater;
 if WorldDy < wdy then
     WorldDy:= wdy;

Binary file share/hedgewars/Data/Scripts/Multiplayer/TechRacer.hwp has changed

--- a/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Sat Apr 18 10:32:12 2015 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Mon May 04 23:52:56 2015 +0200
@@ -1,5 +1,5 @@
 ------------------------------------------
--- TECH RACER v0.2
+-- TECH RACER v0.3
 -----------------------------------------
 
 --------------
@@ -14,6 +14,13 @@
 -- changed theme
 -- minor cleanups?
 
+--------------
+--0.3
+--------------
+-- ehh, scrap everything? those old maps probably still desync so they can die for now
+-- hopefully fix map 3
+-- add two new crappy map to test an idea.
+
 -----------------------------
 -- SCRIPT BEGINS
 -----------------------------
@@ -479,7 +486,7 @@
 		-- these are from onParameters()
 		if mapID == "0" then
 			--AddCaption("don't load any map")
-		elseif mapID == "1" then
+		--[[elseif mapID == "1" then
 
 			--simple testmap
 			------ GIRDER LIST ------
@@ -603,7 +610,7 @@
 
 		elseif mapID == "2" then
 
-			-- simple land flags test map
+			-- simple land flags test map, really shit, can delete
 			------ GIRDER LIST ------
 			PlaceSprite(335, 622, sprAmGirder, 16, nil, nil, nil, nil, 16384)
 			PlaceSprite(474, 569, sprAmGirder, 13, nil, nil, nil, nil, 16384)
@@ -640,119 +647,126 @@
 			tempG = SpawnAmmoCrate(1155, 528, amBazooka)
 
 			------ UTILITY CRATE LIST ------
-			tempG = SpawnUtilityCrate(2006, 1102, amRope)
+			tempG = SpawnUtilityCrate(2006, 1102, amRope)]]
 
 		elseif mapID == "3" then
 
-			-- more detailed landflag test map
-			------ GIRDER LIST ------
-			PlaceSprite(396, 665, sprAmGirder, 1)
-			PlaceSprite(619, 665, sprAmGirder, 3)
-			PlaceSprite(696, 635, sprAmGirder, 0)
-			PlaceSprite(319, 637, sprAmGirder, 0)
-			PlaceSprite(268, 604, sprAmGirder, 2)
-			PlaceSprite(746, 603, sprAmGirder, 2)
-			PlaceSprite(325, 495, sprAmGirder, 7)
-			PlaceSprite(689, 493, sprAmGirder, 5)
-			PlaceSprite(504, 422, sprAmGirder, 6)
-			PlaceSprite(595, 422, sprAmGirder, 4)
-			PlaceSprite(412, 422, sprAmGirder, 4)
-			PlaceSprite(320, 696, sprAmGirder, 4)
-			PlaceSprite(249, 786, sprAmGirder, 6)
-			PlaceSprite(249, 948, sprAmGirder, 6)
-			PlaceSprite(191, 785, sprAmGirder, 6)
-			PlaceSprite(191, 946, sprAmGirder, 6)
-			PlaceSprite(191, 1107, sprAmGirder, 6)
-			PlaceSprite(249, 1109, sprAmGirder, 6)
-			PlaceSprite(130, 1251, sprAmGirder, 7)
-			PlaceSprite(306, 1251, sprAmGirder, 5)
-			PlaceSprite(72, 1360, sprAmGirder, 2)
-			PlaceSprite(364, 1360, sprAmGirder, 2)
-			PlaceSprite(132, 1462, sprAmGirder, 5)
-			PlaceSprite(304, 1463, sprAmGirder, 7)
-			PlaceSprite(182, 1616, sprAmGirder, 6)
-			PlaceSprite(255, 1613, sprAmGirder, 6)
-			PlaceSprite(217, 1796, sprAmGirder, 4)
-			PlaceSprite(221, 1381, sprAmGirder, 0)--
-			PlaceSprite(154, 669, sprAmGirder, 1)
-			PlaceSprite(124, 553, sprAmGirder, 6)
-			PlaceSprite(326, 467, sprAmGirder, 3)
-			PlaceSprite(223, 592, sprAmGirder, 3)
+			-- more detailed landflag test map, should hopefully work now
+			PlaceSprite(402, 1863, sprAmGirder, 0, 16448250, nil, nil, nil, lfIce)
+			PlaceSprite(442, 1863, sprAmGirder, 4, 16448250, nil, nil, nil, lfIce)
+
+			PlaceSprite(2067, 1945, sprAmGirder, 6, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(1943, 1653, sprAmGirder, 6, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(1999, 1504, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2143, 1445, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2432, 1565, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2593, 1565, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2752, 1565, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2206, 1949, sprAmGirder, 6, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2262, 1800, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2407, 1745, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2569, 1745, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2005, 1797, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2288, 1503, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2715, 1802, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2898, 1624, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3014, 1740, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2830, 1919, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3131, 1856, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3191, 1968, sprAmGirder, 2, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3264, 2021, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2840, 2006, sprAmGirder, 3, 2516582650, nil, nil, nil, lfIndestructible)
+
 
-			PlaceSprite(638, 791, sprAmGirder, 5)
-			PlaceSprite(752, 907, sprAmGirder, 5)
-			PlaceSprite(866, 1022, sprAmGirder, 5)
-			PlaceSprite(402, 1863, sprAmGirder, 18, nil, nil, nil, nil, 2048)
-			PlaceSprite(442, 1863, sprAmGirder, 22, nil, nil, nil, nil, 2048)
-			PlaceSprite(2067, 1945, sprAmGirder, 15, nil, nil, nil, nil, 16384)
-			PlaceSprite(2005, 1797, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(1943, 1653, sprAmGirder, 15, nil, nil, nil, nil, 16384)
-			PlaceSprite(1999, 1504, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2143, 1445, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2288, 1503, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(2432, 1565, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2593, 1565, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2752, 1565, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2206, 1949, sprAmGirder, 15, nil, nil, nil, nil, 16384)
-			PlaceSprite(2262, 1800, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2407, 1745, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2569, 1745, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2715, 1802, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(2898, 1624, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3014, 1740, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(2830, 1919, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3131, 1856, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3191, 1968, sprAmGirder, 11, nil, nil, nil, nil, 16384)
-			PlaceSprite(3264, 2021, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2840, 2006, sprAmGirder, 12, nil, nil, nil, nil, 16384)
-			PlaceSprite(1505, 395, sprAmGirder, 7)
-			PlaceSprite(1445, 544, sprAmGirder, 6)
-			PlaceSprite(1506, 686, sprAmGirder, 5)
-			PlaceSprite(1650, 339, sprAmGirder, 4)
-			PlaceSprite(1797, 397, sprAmGirder, 5)
-			PlaceSprite(1857, 547, sprAmGirder, 6)
-			PlaceSprite(1797, 688, sprAmGirder, 7)
-			PlaceSprite(1652, 754, sprAmGirder, 4)
-			PlaceSprite(3326, 863, sprAmGirder, 4)
-			PlaceSprite(3474, 921, sprAmGirder, 5)
-			PlaceSprite(3180, 921, sprAmGirder, 7)
-			PlaceSprite(3120, 1071, sprAmGirder, 6)
-			PlaceSprite(3183, 1214, sprAmGirder, 5)
-			PlaceSprite(3536, 1071, sprAmGirder, 6)
-			PlaceSprite(3480, 1214, sprAmGirder, 7)
-			PlaceSprite(3330, 1279, sprAmGirder, 4)
-			PlaceSprite(2502, 556, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2601, 634, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2616, 441, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2716, 519, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(2756, 379, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2862, 466, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(2918, 379, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(3023, 467, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(3080, 378, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(3172, 527, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3232, 428, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3289, 647, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3350, 545, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3406, 764, sprAmGirder, 14, nil, nil, nil, nil, 16384)
-			PlaceSprite(3469, 556, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(3616, 503, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(3552, 828, sprAmGirder, 13, nil, nil, nil, nil, 16384)
-			PlaceSprite(3696, 763, sprAmGirder, 16, nil, nil, nil, nil, 16384)
-			PlaceSprite(3708, 575, sprAmGirder, 15, nil, nil, nil, nil, 16384)
-			PlaceSprite(3705, 680, sprAmGirder, 10, nil, nil, nil, nil, 16384)
+			PlaceSprite(396, 665, sprAmGirder, 1, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(619, 665, sprAmGirder, 3, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(696, 635, sprAmGirder, 0, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(319, 637, sprAmGirder, 0, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(268, 604, sprAmGirder, 2, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(746, 603, sprAmGirder, 2, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(325, 495, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(689, 493, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(504, 422, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(595, 422, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(412, 422, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(320, 696, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(249, 786, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(249, 948, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(191, 785, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(191, 946, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(191, 1107, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(249, 1109, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(130, 1251, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(306, 1251, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(72, 1360, sprAmGirder, 2, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(364, 1360, sprAmGirder, 2, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(132, 1462, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(304, 1463, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(182, 1616, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(255, 1613, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(217, 1796, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(221, 1381, sprAmGirder, 0, 4294967295, nil, nil, nil, lfNormal)--
+			PlaceSprite(154, 669, sprAmGirder, 1, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(124, 553, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(326, 467, sprAmGirder, 3, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(223, 592, sprAmGirder, 3, 4294967295, nil, nil, nil, lfNormal)
+
+			PlaceSprite(638, 791, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(752, 907, sprAmGirder,  5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(866, 1022, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
 
-			PlaceSprite(1481, 1133, sprAmGirder, 7)
-			PlaceSprite(1626, 1078, sprAmGirder, 4)
-			PlaceSprite(1772, 1135, sprAmGirder, 5)
-			PlaceSprite(1422, 1280, sprAmGirder, 6)
-			PlaceSprite(1831, 1286, sprAmGirder, 6)
-			PlaceSprite(1773, 1429, sprAmGirder, 7)
-			PlaceSprite(1627, 1492, sprAmGirder, 4)
-			PlaceSprite(1482, 1427, sprAmGirder, 5)
-			PlaceSprite(587, 855, sprAmGirder, 4)
-			PlaceSprite(425, 855, sprAmGirder, 4)
-			PlaceSprite(302, 822, sprAmGirder, 1)
+			PlaceSprite(1505, 395, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1445, 544, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1506, 686, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1650, 339, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1797, 397, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1857, 547, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1797, 688, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1652, 754, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3326, 863, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3474, 921, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3180, 921, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3120, 1071, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3183, 1214, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3536, 1071, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3480, 1214, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(3330, 1279, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1481, 1133, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1626, 1078, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1772, 1135, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1422, 1280, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1831, 1286, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1773, 1429, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1627, 1492, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(1482, 1427, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(587, 855, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(425, 855, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+			PlaceSprite(302, 822, sprAmGirder, 1, 4294967295, nil, nil, nil, lfNormal)
+
+			PlaceSprite(2502, 556, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2601, 634, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2616, 441, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2716, 519, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3469, 556, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3696, 763, sprAmGirder, 7, 2516582650, nil, nil, nil, lfIndestructible)
+
+
+			PlaceSprite(2756, 379, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2862, 466, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(2918, 379, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3023, 467, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3080, 378, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3616, 503, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3552, 828, sprAmGirder, 4, 2516582650, nil, nil, nil, lfIndestructible)
+
+			PlaceSprite(3172, 527, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3232, 428, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3289, 647, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3350, 545, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3406, 764, sprAmGirder, 5, 2516582650, nil, nil, nil, lfIndestructible)
+
+			PlaceSprite(3708, 575, sprAmGirder, 6, 2516582650, nil, nil, nil, lfIndestructible)
+			PlaceSprite(3705, 680, sprAmGirder, 1, 2516582650, nil, nil, nil, lfIndestructible)
 
 			------ RUBBER BAND LIST ------
 			PlaceSprite(505, 708, sprAmRubber, 0, nil, nil, nil, nil, lfBouncy)
@@ -838,6 +852,331 @@
 			tempG = AddGear(686, 829, gtSMine, 0, 0, 0, 0)
 			tempG = AddGear(649, 792, gtSMine, 0, 0, 0, 0)
 
+		elseif mapID == "4" then
+
+			------ GIRDER LIST ------
+	PlaceSprite(3942, 116, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3999, 270, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3925, 407, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3777, 470, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3791, 65, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3644, 121, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3629, 413, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+
+	------ AMMO CRATE LIST ------
+	tempG = SpawnAmmoCrate(3772, 446, amWatermelon)
+	tempG = SpawnAmmoCrate(3769, 415, amWatermelon)
+	tempG = SpawnAmmoCrate(3773, 384, amWatermelon)
+	tempG = SpawnAmmoCrate(3771, 353, amWatermelon)
+	tempG = SpawnAmmoCrate(3770, 322, amWatermelon)
+	tempG = SpawnAmmoCrate(3775, 291, amWatermelon)
+	tempG = SpawnAmmoCrate(3776, 260, amWatermelon)
+	tempG = SpawnAmmoCrate(3775, 229, amWatermelon)
+	tempG = SpawnAmmoCrate(3772, 198, amWatermelon)
+	tempG = SpawnAmmoCrate(3776, 167, amWatermelon)
+
+	------ UTILITY CRATE LIST ------
+	tempG = SpawnUtilityCrate(3723, 446, amJetpack)
+	tempG = SpawnUtilityCrate(3725, 415, amJetpack)
+	tempG = SpawnUtilityCrate(3814, 446, amJetpack)
+	tempG = SpawnUtilityCrate(3814, 415, amJetpack)
+	tempG = SpawnUtilityCrate(3815, 384, amJetpack)
+	tempG = SpawnUtilityCrate(3728, 384, amJetpack)
+
+	------ AIR MINE LIST ------
+	SetTimer(AddGear(3489, 110, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3509, 366, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3399, 114, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3438, 383, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3322, 113, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3369, 384, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3290, 379, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3253, 112, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3178, 111, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3228, 375, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3173, 384, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3115, 118, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3039, 126, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2954, 139, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3121, 404, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2918, 414, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2880, 144, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2815, 146, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2731, 140, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2867, 408, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2802, 394, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2733, 392, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2661, 392, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2672, 147, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2608, 144, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2558, 117, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2495, 86, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2425, 49, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2373, 79, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2313, 104, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2256, 156, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2218, 226, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2205, 318, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2218, 419, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2255, 479, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2290, 522, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2343, 557, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2413, 540, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2500, 514, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2572, 471, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2618, 436, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2926, 478, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2926, 548, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2924, 615, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3126, 472, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3128, 553, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3136, 623, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3139, 683, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2927, 657, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2919, 720, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3132, 746, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2920, 771, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3137, 798, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2926, 820, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3140, 848, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(945, 441, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(900, 477, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(899, 540, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(915, 631, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1013, 616, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(970, 533, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1062, 458, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1060, 537, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1094, 640, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1029, 692, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(928, 718, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(831, 592, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(860, 666, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(823, 493, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1032, 427, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(953, 351, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(845, 375, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1101, 326, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1128, 565, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1126, 446, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1208, 703, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1139, 726, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1024, 777, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(918, 775, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(812, 758, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3171, 887, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3222, 939, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3273, 977, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3330, 1011, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3401, 1051, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2928, 899, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2935, 966, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2959, 1021, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2999, 1077, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3050, 1136, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3108, 1184, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3159, 1221, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3214, 1243, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3289, 1279, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3453, 1087, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3515, 1136, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3566, 1202, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3604, 1275, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3618, 1345, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3608, 1436, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3582, 1505, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3528, 1565, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3456, 1610, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3368, 1651, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3289, 1666, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3205, 1668, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3132, 1672, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3270, 1325, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3192, 1346, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3140, 1346, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3067, 1359, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2997, 1373, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2918, 1391, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2839, 1406, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3078, 1672, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3019, 1659, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2936, 1667, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2859, 1675, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(975, 722, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(967, 636, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1078, 687, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(868, 740, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(863, 453, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1010, 494, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1080, 590, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(869, 589, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1013, 569, gtAirMine, 0, 0, 0, 0), 1)
+
+
+	elseif mapID == "5" then
+
+	------ GIRDER LIST ------
+	PlaceSprite(3703, 157, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3846, 100, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3991, 162, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(4049, 311, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3648, 308, sprAmGirder, 6, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3988, 454, sprAmGirder, 7, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3843, 515, sprAmGirder, 4, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3616, 429, sprAmGirder, 3, 4294967295, nil, nil, nil, lfNormal)
+	PlaceSprite(3725, 548, sprAmGirder, 3, 4294967295, nil, nil, nil, lfNormal)
+
+	------ RUBBER BAND LIST ------
+
+	------ LAND SPRITE LIST ------
+
+	------ HEALTH CRATE LIST ------
+
+	------ AMMO CRATE LIST ------
+
+	------ UTILITY CRATE LIST ------
+	tempG = SpawnUtilityCrate(3846, 491, amJetpack)
+	tempG = SpawnUtilityCrate(3847, 460, amJetpack)
+	tempG = SpawnUtilityCrate(3844, 429, amJetpack)
+	tempG = SpawnUtilityCrate(3845, 398, amJetpack)
+	tempG = SpawnUtilityCrate(3848, 367, amJetpack)
+
+	------ BARREL LIST ------
+
+	------ MINE LIST ------
+
+	------ STICKY MINE LIST ------
+
+	------ AIR MINE LIST ------
+	SetTimer(AddGear(3684, 595, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3648, 641, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3613, 695, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3575, 733, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3537, 781, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3505, 829, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3476, 881, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3447, 930, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3418, 979, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3388, 1021, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3356, 1072, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3561, 469, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3528, 500, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3496, 545, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3467, 584, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3444, 619, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3404, 656, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3373, 693, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3351, 726, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3329, 756, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3306, 798, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3339, 1115, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3321, 1163, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3298, 1206, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3281, 1250, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3259, 1302, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3238, 1343, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3220, 1397, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3269, 810, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3225, 788, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3188, 762, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3149, 735, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3106, 709, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3064, 682, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3023, 652, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2983, 619, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3164, 983, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3143, 1029, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3130, 1077, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3122, 1127, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3100, 1174, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3069, 1226, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3042, 1287, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3178, 1440, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3125, 1480, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3088, 1521, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2988, 1326, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2944, 1357, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2884, 1356, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2813, 1356, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2755, 1356, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2677, 1347, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2591, 1354, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2532, 1354, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3045, 1553, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2974, 1588, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2901, 1584, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2850, 1569, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2782, 1570, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2708, 1577, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2648, 1579, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2585, 1576, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2525, 1581, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2490, 1338, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2435, 1306, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2386, 1283, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2344, 1242, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3126, 942, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3070, 919, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(3005, 897, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2962, 865, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2907, 838, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2858, 803, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2807, 769, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2764, 741, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2714, 703, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2665, 671, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2613, 629, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2557, 591, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2513, 545, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2450, 537, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2390, 569, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2341, 603, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2299, 649, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2271, 700, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2243, 754, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2185, 783, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2125, 801, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2084, 864, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2113, 933, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2154, 974, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2191, 1016, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2223, 1061, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2257, 1113, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2283, 1153, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2316, 1202, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2479, 1553, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2422, 1513, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2363, 1477, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2302, 1446, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2243, 1388, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2188, 1335, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2136, 1273, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2086, 1204, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2033, 1132, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1992, 1085, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1967, 1022, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2943, 560, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2890, 511, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2834, 477, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2774, 451, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2710, 428, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2652, 410, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2578, 375, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2482, 342, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2380, 335, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2302, 359, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2256, 409, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2183, 469, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2111, 513, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(2049, 558, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1986, 586, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1949, 651, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1925, 704, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1923, 769, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1925, 841, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1946, 930, gtAirMine, 0, 0, 0, 0), 1)
+	SetTimer(AddGear(1953, 975, gtAirMine, 0, 0, 0, 0), 1)
+
 		else
 
 
@@ -1580,6 +1919,7 @@
 		(GetGearType(gear) == gtExplosives) or
 		(GetGearType(gear) == gtMine) or
 		(GetGearType(gear) == gtSMine) or
+		(GetGearType(gear) == gtAirMine) or
 		(GetGearType(gear) == gtCase)
 	then
 		return(true)