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

Supply ProfileID to LUA scripts instead of SoldierID

Browse Source 
Lua scripts expect to receive the same profileID value back from l_FindSolderByProfileID() that is supplied to it on the script side. This is a bit suboptimal as we constantly keep searching for the correct soldier on different calls to C++ side with the way it works now.
This commit is contained in:
Asdow
2025-10-11 11:43:37 +03:00
parent 219cc6f88d
commit 584f6b47e6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+5 -3
View File
@@ -8657,7 +8657,7 @@ static int l_TileIsOutOfBoundsClosestPC(lua_State* L)
static int l_FindSoldierByProfileID(lua_State* L) static int l_FindSoldierByProfileID(lua_State* L)
{ {
SOLDIERTYPE* pSoldier; SOLDIERTYPE* pSoldier;
UINT16 id = NOBODY; UINT8 foundProfileID = -1;
UINT16 ubLoop = 0, ubLoopLimit = MAX_NUM_SOLDIERS; UINT16 ubLoop = 0, ubLoopLimit = MAX_NUM_SOLDIERS;
if (lua_gettop(L)) if (lua_gettop(L))
@@ -8668,11 +8668,12 @@ static int l_FindSoldierByProfileID(lua_State* L)
{ {
if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC) if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC)
{ {
id = pSoldier->ubID; foundProfileID = pSoldier->ubProfile;
break;
} }
} }
lua_pushinteger(L, id); lua_pushinteger(L, foundProfileID);
} }
return 1; return 1;
@@ -8695,6 +8696,7 @@ static int l_FindSoldierByProfileIDBool(lua_State* L)
if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC) if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC)
{ {
ProfBool = TRUE; ProfBool = TRUE;
break;
} }
} }