Skip to content

Supply ProfileID to LUA scripts instead of SoldierID #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 1 commit into from
Oct 11, 2025
Merged

Supply ProfileID to LUA scripts instead of SoldierID #539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Strategic/LuaInitNPCs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8657,7 +8657,7 @@ static int l_TileIsOutOfBoundsClosestPC(lua_State* L)
static int l_FindSoldierByProfileID(lua_State* L)
{
SOLDIERTYPE* pSoldier;
UINT16 id = NOBODY;
UINT8 foundProfileID = -1;
UINT16 ubLoop = 0, ubLoopLimit = MAX_NUM_SOLDIERS;

if (lua_gettop(L))
Expand All @@ -8668,11 +8668,12 @@ static int l_FindSoldierByProfileID(lua_State* L)
{
if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC)
{
id = pSoldier->ubID;
foundProfileID = pSoldier->ubProfile;
break;
}
}

lua_pushinteger(L, id);
lua_pushinteger(L, foundProfileID);
}

return 1;
Expand All @@ -8695,6 +8696,7 @@ static int l_FindSoldierByProfileIDBool(lua_State* L)
if (pSoldier->bActive && pSoldier->ubProfile == ubTargetNPC)
{
ProfBool = TRUE;
break;
}
}

Expand Down