1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Expand UB_SetNumberJa25EnemiesInSurfaceSector

Browse Source 
* Allow adding jeeps and robots to sectors now
* From Lua side, it is now possible to add differing amount of arguments to the function. Minimum required is 3 (sector x & y and amount of admins)
So all of the following examples will work correctly:

- UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins )

- UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins, ubNumTroops )

- - UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins, ubNumTroops,ubNumElites )

- UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins, ubNumTroops,ubNumElites, ubNumTanks )

- UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins, ubNumTroops,ubNumElites, ubNumTanks , ubNumJeeps )

- UB_SetNumberJa25EnemiesInSurfaceSector( x, y, ubNumAdmins, ubNumTroops,ubNumElites, ubNumTanks , ubNumJeeps, ubNumRobots )
This commit is contained in:
Asdow
2025-11-29 11:46:45 +02:00
parent d86dc39f9f
commit c1b8309753
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+25 -5
View File
@@ -2243,18 +2243,38 @@ static int l_SetNumberOfJa25BloodCatsInSector(lua_State* L)
static int l_SetNumberJa25EnemiesInSurfaceSector(lua_State* L) static int l_SetNumberJa25EnemiesInSurfaceSector(lua_State* L)
{ {
if (lua_gettop(L) >= 6) if ( lua_gettop(L) >= 3 )
{ {
INT16 sSectorX = lua_tointeger(L, 1); INT16 sSectorX = lua_tointeger(L, 1);
INT16 sSectorY = lua_tointeger(L, 2); INT16 sSectorY = lua_tointeger(L, 2);
UINT8 ubNumAdmins = lua_tointeger(L, 3); UINT8 ubNumAdmins = lua_tointeger(L, 3);
UINT8 ubNumTroops = lua_tointeger(L, 4); UINT8 ubNumTroops = 0;
UINT8 ubNumElites = lua_tointeger(L, 5); UINT8 ubNumElites = 0;
UINT8 ubNumTanks = lua_tointeger(L, 6); UINT8 ubNumTanks = 0;
//TODO: expand lua call to include these two
UINT8 ubNumJeeps = 0; UINT8 ubNumJeeps = 0;
UINT8 ubNumRobots = 0; UINT8 ubNumRobots = 0;
if ( lua_gettop(L) >= 4 )
{
ubNumTroops = lua_tointeger(L, 4);
}
if ( lua_gettop(L) >= 5 )
{
ubNumElites = lua_tointeger(L, 5);
}
if ( lua_gettop(L) >= 6 )
{
ubNumTanks = lua_tointeger(L, 6);
}
if ( lua_gettop(L) >= 7 )
{
ubNumJeeps = lua_tointeger(L, 7);
}
if ( lua_gettop(L) >= 8 )
{
ubNumRobots = lua_tointeger(L, 8);
}
SetNumberJa25EnemiesInSurfaceSector(SECTOR(sSectorX, sSectorY), ubNumAdmins, ubNumTroops, ubNumElites, ubNumTanks, ubNumJeeps, ubNumRobots); SetNumberJa25EnemiesInSurfaceSector(SECTOR(sSectorX, sSectorY), ubNumAdmins, ubNumTroops, ubNumElites, ubNumTanks, ubNumJeeps, ubNumRobots);
} }