# HG changeset patch
# User koda
# Date 1388450029 -3600
# Node ID 1c02143bfe9cfad74817cbb59ba8dcf262226ab9
# Parent  6e09ca662fa32a5d2c6365d7f45819d8f9e62f46# Parent  af0520a6bf0061b27f8321514d35fcd2b1ef5f9c
merge from .20 again

diff -r 6e09ca662fa3 -r 1c02143bfe9c .hgtags
--- a/.hgtags	Tue Dec 31 00:53:29 2013 +0400
+++ b/.hgtags	Tue Dec 31 01:33:49 2013 +0100
@@ -60,4 +60,3 @@
 0000000000000000000000000000000000000000 0.9.18-release
 2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
 1617149e01a4fa25637e2ab655d0287ef9c21b7c 0.9.19-release
-2b8f928faa1470858190cd9724b9ceed2a887358 0.9.20-release
diff -r 6e09ca662fa3 -r 1c02143bfe9c CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 31 00:53:29 2013 +0400
+++ b/CMakeLists.txt	Tue Dec 31 01:33:49 2013 +0100
@@ -43,7 +43,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 20)
-set(HEDGEWARS_PROTO_VER 46)
+set(HEDGEWARS_PROTO_VER 47)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 include(${CMAKE_MODULE_PATH}/revinfo.cmake)
 
@@ -74,14 +74,11 @@
 
 #set default compiler flags
 add_flag_append(CMAKE_C_FLAGS "-Wall -pipe")
-add_flag_append(CMAKE_C_FLAGS_RELEASE "-Os")
+add_flag_append(CMAKE_C_FLAGS_RELEASE "-O2")
 add_flag_append(CMAKE_C_FLAGS_DEBUG "-Wextra -O0")
 add_flag_append(CMAKE_CXX_FLAGS "-Wall -pipe")
-add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-Os")
+add_flag_append(CMAKE_CXX_FLAGS_RELEASE "-O2")
 add_flag_append(CMAKE_CXX_FLAGS_DEBUG "-Wextra -O0")
-add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000")
-add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-O- -gv")
-add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Os -Xs")
 
 #CMake adds a lot of additional configuration flags, so let's clear them up
 if(${MINIMAL_FLAGS})
diff -r 6e09ca662fa3 -r 1c02143bfe9c cmake_modules/CMakePascalInformation.cmake
--- a/cmake_modules/CMakePascalInformation.cmake	Tue Dec 31 00:53:29 2013 +0400
+++ b/cmake_modules/CMakePascalInformation.cmake	Tue Dec 31 01:33:49 2013 +0100
@@ -9,7 +9,7 @@
 include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
 
 # This section should actually be in Platform/${CMAKE_SYSTME_NAME}-fpc.cmake
-set(CMAKE_Pascal_FLAGS_DEBUG_INIT "-g -gl -gp -gh")
+set(CMAKE_Pascal_FLAGS_DEBUG_INIT "-O- -g -gl -gp -gh")
 set(CMAKE_Pascal_FLAGS_MINSIZEREL_INIT "-Os -dNDEBUG")
 set(CMAKE_Pascal_FLAGS_RELEASE_INIT "-O2 -dNDEBUG")
 set(CMAKE_Pascal_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -gl -gp")
diff -r 6e09ca662fa3 -r 1c02143bfe9c hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Tue Dec 31 00:53:29 2013 +0400
+++ b/hedgewars/CMakeLists.txt	Tue Dec 31 01:33:49 2013 +0100
@@ -8,6 +8,10 @@
 
 
 enable_language(Pascal)
+add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000")
+add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-gv")
+add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Xs")
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
diff -r 6e09ca662fa3 -r 1c02143bfe9c hedgewars/uGearsHandlersMess.pas
--- a/hedgewars/uGearsHandlersMess.pas	Tue Dec 31 00:53:29 2013 +0400
+++ b/hedgewars/uGearsHandlersMess.pas	Tue Dec 31 01:33:49 2013 +0100
@@ -3008,8 +3008,6 @@
 
     FollowGear := Gear;
 
-    Gear^.dY:= cMaxWindSpeed * 100;
-
     Gear^.doStep := @doStepCakeFall
 end;
 
@@ -3192,7 +3190,7 @@
 procedure doStepDrill(Gear: PGear);
 var
     t: PGearArray;
-    oldX, oldY, oldDx, oldDy: hwFloat;
+    oldDx, oldDy: hwFloat;
     t2: hwFloat;
 begin
     AllInactive := false;
@@ -3202,8 +3200,6 @@
 
     oldDx := Gear^.dX;
     oldDy := Gear^.dY;
-    oldX := Gear^.X;
-    oldY := Gear^.Y;
 
     doStepFallingGear(Gear);
 
@@ -3219,8 +3215,6 @@
         //hit
         Gear^.dX := oldDx;
         Gear^.dY := oldDy;
-        Gear^.X := oldX;
-        Gear^.Y := oldY;
 
         if GameTicks > Gear^.FlightTime then
             t := CheckGearsCollision(Gear)
@@ -3245,8 +3239,6 @@
             exit;
             end;
 
-        Gear^.X:= Gear^.X+Gear^.dX*4;
-        Gear^.Y:= Gear^.Y+Gear^.dY*4;
         Gear^.SoundChannel := LoopSound(sndDrillRocket);
         Gear^.doStep := @doStepDrillDrilling;