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

Fix l_SoldierGiveItem(lua_State* L)

Browse Source 
Don't use SoldierID when matching for profile id
This commit is contained in:
Asdow
2025-09-29 11:58:55 +03:00
parent 0cb13650ed
commit a15ed3aceb
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+17 -27
View File
@@ -8996,40 +8996,30 @@ static int l_SoldierGiveItem(lua_State* L)
{
if (lua_gettop(L) >= 3)
{
SOLDIERTYPE* pSoldier;
SOLDIERTYPE* pSoldier2;
BOOLEAN bol = FALSE;
SoldierID ubID1 = lua_tointeger(L, 1);
SoldierID ubID2 = lua_tointeger(L, 2);
UINT8 ubID1 = lua_tointeger(L, 1);
UINT8 ubID2 = lua_tointeger(L, 2);
UINT32 item = lua_tointeger(L, 3);
if (ubID1 != NOBODY && ubID2 != NOBODY)
SOLDIERTYPE* pSoldier = FindSoldierByProfileID(ubID1, FALSE);
SOLDIERTYPE* pSoldier2 = FindSoldierByProfileID(ubID2, FALSE);
BOOLEAN bol = FALSE;
if (!pSoldier || !pSoldier2)
bol = FALSE;
else
bol = TRUE;
if (bol == TRUE)
{
pSoldier = FindSoldierByProfileID(ubID1, FALSE);
pSoldier2 = FindSoldierByProfileID(ubID2, FALSE);
// Look for item....
INT8 bInvPos = FindObj(pSoldier, item);
if (!pSoldier || !pSoldier2)
bol = FALSE;
else
bol = TRUE;
AssertMsg(bInvPos != NO_SLOT, "Interface Dialogue.C: Gift item does not exist in NPC.");
if (bol == TRUE)
{
// Look for letter....
{
INT8 bInvPos;
// Look for item....
bInvPos = FindObj(pSoldier, item);
AssertMsg(bInvPos != NO_SLOT, "Interface Dialogue.C: Gift item does not exist in NPC.");
SoldierGiveItem(pSoldier, pSoldier2, &(pSoldier->inv[bInvPos]), bInvPos);
}
}
SoldierGiveItem(pSoldier, pSoldier2, &(pSoldier->inv[bInvPos]), bInvPos);
}
}
return 0;
}