merge
authormikade <redgrinner@gmail.com>
Wed, 13 Apr 2016 21:42:00 +0900
changeset 11648 89fc5e6ccc76
parent 11646 42d7f5dbd8dc (diff)
parent 11647 b4d621700bbb (current diff)
child 11649 1fd1525653d8
child 11767 c21278c4218d
merge
share/hedgewars/Data/Scripts/Multiplayer/Racer.lua
--- a/hedgewars/CMakeLists.txt	Sun Apr 10 14:00:09 2016 +0900
+++ b/hedgewars/CMakeLists.txt	Wed Apr 13 21:42:00 2016 +0900
@@ -11,7 +11,7 @@
 
 
 enable_language(Pascal)
-add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000")
+add_flag_append(CMAKE_Pascal_FLAGS "-Cs2000000 -B")
 add_flag_append(CMAKE_Pascal_FLAGS_DEBUG "-gv")
 add_flag_append(CMAKE_Pascal_FLAGS_RELEASE "-Xs")
 if(UNIX)
--- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Sun Apr 10 14:00:09 2016 +0900
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua	Wed Apr 13 21:42:00 2016 +0900
@@ -692,7 +692,7 @@
                                 trackTime = 0
 
                                 SetGearPosition(CurrentHedgehog, wpX[0], wpY[0])
-                                AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
+                                AddGear(GetX(CurrentHedgehog)+boostX, GetY(CurrentHedgehog)+boostY, gtGrenade, 0, 0, 0, 1)
                                 FollowGear(CurrentHedgehog)
 
                                 HideMission()