hedgewars-draft: comparison hedgewars/uScript.pas

equal deleted inserted replaced

-:05029b4d8490
+:85695e3d2623
 // functions called from Lua:
 // function(L : Plua_State) : LongInt; Cdecl;
 // where L contains the state, returns the number of return values on the stack
 // call lua_gettop(L) to receive number of parameters passed
+function lc_band(L: PLua_State): LongInt; Cdecl;
+begin
+if lua_gettop(L) <> 2 then
+begin
+LuaError('Lua: Wrong number of parameters passed to band!');
+lua_pushnil(L);
+end
+else lua_pushinteger(L, lua_tointeger(L, 2) and lua_tointeger(L, 1));
+lc_band := 1;
+end;
+function lc_bor(L: PLua_State): LongInt; Cdecl;
+begin
+if lua_gettop(L) <> 2 then
+begin
+LuaError('Lua: Wrong number of parameters passed to bor!');
+lua_pushnil(L);
+end
+else lua_pushinteger(L, lua_tointeger(L, 2) or lua_tointeger(L, 1));
+lc_bor := 1;
+end;
+function lc_bnot(L: PLua_State): LongInt; Cdecl;
+begin
+if lua_gettop(L) <> 1 then
+begin
+LuaError('Lua: Wrong number of parameters passed to bnot!');
+lua_pushnil(L);
+end
+else lua_pushinteger(L, not lua_tointeger(L, 1));
+lc_bnot := 1;
+end;
 function lc_writelntoconsole(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) = 1 then
 begin
 WriteLnToConsole('Lua: ' + lua_tostring(L ,1));
 lua_pushnil(L);
 end
 else begin
 gear := SpawnCustomCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 HealthCrate, 0);
-lua_pushnumber(L, gear^.uid);
+lua_pushinteger(L, gear^.uid);
 end;
 lc_spawnhealthcrate := 1;
 end;
 function lc_spawnammocrate(L: PLua_State): LongInt; Cdecl;
 lua_pushnil(L);
 end
 else begin
 gear := SpawnCustomCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 AmmoCrate, lua_tointeger(L, 3));
-lua_pushnumber(L, gear^.uid);
+lua_pushinteger(L, gear^.uid);
 end;
 lc_spawnammocrate := 1;
 end;
 function lc_spawnutilitycrate(L: PLua_State): LongInt; Cdecl;
 lua_pushnil(L);
 end
 else begin
 gear := SpawnCustomCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 UtilityCrate, lua_tointeger(L, 3));
-lua_pushnumber(L, gear^.uid);
+lua_pushinteger(L, gear^.uid);
 end;
 lc_spawnutilitycrate := 1;
 end;
 function lc_addgear(L : Plua_State) : LongInt; Cdecl;
 dx:= int2hwFloat(round(lua_tonumber(L, 5) * 1000)) / 1000;
 dy:= int2hwFloat(round(lua_tonumber(L, 6) * 1000)) / 1000;
 t:= lua_tointeger(L, 7);
 gear:= AddGear(x, y, gt, s, dx, dy, t);
-lua_pushnumber(L, gear^.uid)
+lua_pushinteger(L, gear^.uid)
 end;
 lc_addgear:= 1; // 1 return value
 end;
 function lc_deletegear(L : Plua_State) : LongInt; Cdecl;
 vgt:= TVisualGearType(lua_tointeger(L, 3));
 s:= lua_tointeger(L, 4);
 c:= lua_toboolean(L, 5);
 vg:= AddVisualGear(x, y, vgt, s, c);
-if vg <> nil then lua_pushnumber(L, vg^.uid)
+if vg <> nil then lua_pushinteger(L, vg^.uid)
-else lua_pushnumber(L, 0)
+else lua_pushinteger(L, 0)
 end;
 lc_addvisualgear:= 1; // 1 return value
 end;
 function lc_deletevisualgear(L : Plua_State) : LongInt; Cdecl;
 end
 else
 if FollowGear = nil then
 lua_pushnil(L)
 else
-lua_pushnumber(L, FollowGear^.uid);
+lua_pushinteger(L, FollowGear^.uid);
 lc_getfollowgear:= 1; // 1 return value
 end;
 function lc_getgeartype(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
-lua_pushnumber(L, gear^.Timer)
+lua_pushinteger(L, gear^.Timer)
 else
 lua_pushnil(L);
 end;
 lc_gettimer:= 1
 end;
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
-lua_pushnumber(L, gear^.Health)
+lua_pushinteger(L, gear^.Health)
 else
 lua_pushnil(L);
 end;
 lc_gethealth:= 1
 end;
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
-lua_pushnumber(L, hwRound(gear^.X))
+lua_pushinteger(L, hwRound(gear^.X))
 else
 lua_pushnil(L);
 end;
 lc_getx:= 1
 end;
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
-lua_pushnumber(L, hwRound(gear^.Y))
+lua_pushinteger(L, hwRound(gear^.Y))
 else
 lua_pushnil(L);
 end;
 lc_gety:= 1
 end;
 if (vgear^.FrameTicks < 1) or (vgear^.FrameTicks > 3) then vgear^.FrameTicks:= 1;
 end;
 end
 end;
 lc_hogsay:= 0
+end;
+function lc_addammo(L : Plua_State) : LongInt; Cdecl;
+var gear : PGear;
+begin
+if lua_gettop(L) <> 2 then
+begin
+LuaError('Lua: Wrong number of parameters passed to AddAmmo!');
+end
+else
+begin
+gear:= GearByUID(lua_tointeger(L, 1));
+if (gear <> nil) and (gear^.Hedgehog <> nil) then
+AddAmmo(gear^.Hedgehog^, TAmmoType(lua_tointeger(L, 2)));
+end;
+lc_addammo:= 0
 end;
 function lc_sethealth(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 for he:= Low(THogEffect) to High(THogEffect) do
 ScriptSetInteger(EnumToStr(he), ord(he));
 // register functions
+lua_register(luaState, 'band', @lc_band);
+lua_register(luaState, 'bor', @lc_bor);
+lua_register(luaState, 'bnot', @lc_bnot);
 lua_register(luaState, 'AddGear', @lc_addgear);
 lua_register(luaState, 'DeleteGear', @lc_deletegear);
 lua_register(luaState, 'AddVisualGear', @lc_addvisualgear);
 lua_register(luaState, 'DeleteVisualGear', @lc_deletevisualgear);
 lua_register(luaState, 'GetVisualGearValues', @lc_getvisualgearvalues);
 lua_register(luaState, 'AddCaption', @lc_addcaption);
 lua_register(luaState, 'SetAmmo', @lc_setammo);
 lua_register(luaState, 'PlaySound', @lc_playsound);
 lua_register(luaState, 'AddTeam', @lc_addteam);
 lua_register(luaState, 'AddHog', @lc_addhog);
+lua_register(luaState, 'AddAmmo', @lc_addammo);
 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);

changeset 4485	85695e3d2623
parent 4484	b7a098f2649a
child 4496	ba5da3388110