# HG changeset patch # User Henek # Date 1289686113 -3600 # Node ID 81391b54b078fc3c605a7a673bbb2c3d2b2c0006 # Parent ba5d5a2f4c4b6e1228f013fc51045302b03fd23b clean up and lua update, very minor diff -r ba5d5a2f4c4b -r 81391b54b078 hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Sat Nov 13 15:32:53 2010 -0500 +++ b/hedgewars/GSHandlers.inc Sat Nov 13 23:08:33 2010 +0100 @@ -2076,8 +2076,6 @@ //////////////////////////////////////////////////////////////////////////////// procedure doStepAirAttackWork(Gear: PGear); -//var -// i: Longint; begin AllInactive := false; Gear^.X := Gear^.X + cAirPlaneSpeed * Gear^.Tag; @@ -2092,9 +2090,6 @@ Gear^.Tag, _0, 0); 2: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtNapalmBomb, 0, cBombsSpeed * Gear^.Tag, _0, 0); - //2: for i:= -19 to 19 do - // FollowGear := AddGear(hwRound(Gear^.X) + i div 3, hwRound(Gear^.Y), gtFlame, 0, - // _0_001 * i, _0, 0); 3: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtDrill, gsttmpFlag, cBombsSpeed * Gear^.Tag, _0, 0); //4: FollowGear := AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtWaterMelon, 0, cBombsSpeed * @@ -2127,7 +2122,7 @@ Gear^.Y := int2hwFloat(topY-300); Gear^.dX := int2hwFloat(TargetPoint.X - 5 * Gear^.Tag * 15); - if (int2hwFloat(TargetPoint.Y) - Gear^.Y > _0) then //and (Gear^.State <> 2) then + if (int2hwFloat(TargetPoint.Y) - Gear^.Y > _0) then Gear^.dX := Gear^.dX - cBombsSpeed * hwSqrt((int2hwFloat(TargetPoint.Y) - Gear^.Y) * 2 / cGravity) * Gear^.Tag; diff -r ba5d5a2f4c4b -r 81391b54b078 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Sat Nov 13 15:32:53 2010 -0500 +++ b/hedgewars/uScript.pas Sat Nov 13 23:08:33 2010 +0100 @@ -1126,6 +1126,7 @@ ScriptSetInteger('gfResetWeps', gfResetWeps); ScriptSetInteger('gfPerHogAmmo', gfPerHogAmmo); ScriptSetInteger('gfDisableWind', gfDisableWind); +ScriptSetInteger('gfMoreWind', gfMoreWind); ScriptSetInteger('gmLeft', gmLeft); ScriptSetInteger('gmRight', gmRight); @@ -1184,6 +1185,7 @@ lua_register(luaState, 'AddTeam', @lc_addteam); lua_register(luaState, 'AddHog', @lc_addhog); lua_register(luaState, 'SetHealth', @lc_sethealth); +lua_register(luaState, 'GetHealth', @lc_gethealth); lua_register(luaState, 'SetEffect', @lc_seteffect); lua_register(luaState, 'GetHogClan', @lc_gethogclan); lua_register(luaState, 'GetHogTeamName', @lc_gethogteamname); @@ -1200,7 +1202,6 @@ lua_register(luaState, 'SetTag', @lc_settag); lua_register(luaState, 'SetTimer', @lc_settimer); lua_register(luaState, 'GetTimer', @lc_gettimer); -lua_register(luaState, 'GetHealth', @lc_gethealth); lua_register(luaState, 'SetZoom', @lc_setzoom); lua_register(luaState, 'GetZoom', @lc_getzoom); lua_register(luaState, 'HogSay', @lc_hogsay);