diff -r f2c36df8c7b1 -r 2f6f8baa2a97 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Mon Dec 28 23:37:44 2015 +0300 +++ b/hedgewars/uScript.pas Tue Dec 29 14:44:32 2015 -0500 @@ -921,29 +921,30 @@ lua_pushinteger(L, Integer(gear^.ImpactSound)); lua_pushinteger(L, gear^.nImpactSounds); lua_pushinteger(L, gear^.Tint); - lua_pushinteger(L, gear^.Damage) + lua_pushinteger(L, gear^.Damage); + lua_pushinteger(L, gear^.Boom) end else begin lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); - lua_pushnil(L); lua_pushnil(L) + lua_pushnil(L); lua_pushnil(L); lua_pushnil(L) end end else begin lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); - lua_pushnil(L); lua_pushnil(L) + lua_pushnil(L); lua_pushnil(L); lua_pushnil(L) end; - lc_getgearvalues:= 12 + lc_getgearvalues:= 13 end; function lc_setgearvalues(L : Plua_State) : LongInt; Cdecl; var gear : PGear; begin -// Currently allows 1-13 params -// if CheckLuaParamCount(L, 13, 'SetGearValues', 'gearUid, Angle, Power, WDTimer, Radius, Density, Karma, DirAngle, AdvBounce, ImpactSound, # ImpactSounds, Tint, Damage') then +// Currently allows 1-14 params +// if CheckLuaParamCount(L, 14, 'SetGearValues', 'gearUid, Angle, Power, WDTimer, Radius, Density, Karma, DirAngle, AdvBounce, ImpactSound, # ImpactSounds, Tint, Damage, Boom') then // begin gear:= GearByUID(lua_tointeger(L, 1)); if gear <> nil then @@ -972,6 +973,8 @@ gear^.Tint := lua_tointeger(L, 12); if not lua_isnoneornil(L, 13) then gear^.Damage := lua_tointeger(L, 13); + if not lua_isnoneornil(L, 14) then + gear^.Boom := lua_tointeger(L, 14); end; // end // else