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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-20 19:56:38 +02:00
parent e4fe066da0
commit 8e4307b2fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/LuaInitNPCs.cpp
+3 -3
View File
@@ -12034,7 +12034,7 @@ static int l_VisibleTown (lua_State *L)
static int l_HireMerc(lua_State *L) static int l_HireMerc(lua_State *L)
{ {
MERC_HIRE_STRUCT HireMercStruct; MERC_HIRE_STRUCT HireMercStruct;
INT16 sSoldierID = 0; SoldierID sSoldierID = NOBODY;
INT16 iTotalContract = 7; INT16 iTotalContract = 7;
UINT32 iTimeTillMercArrives = 0; UINT32 iTimeTillMercArrives = 0;
UINT8 n = lua_gettop(L); UINT8 n = lua_gettop(L);
@@ -12071,8 +12071,8 @@ static int l_HireMerc(lua_State *L)
if (!HireMerc(&HireMercStruct)) if (!HireMerc(&HireMercStruct))
{ {
sSoldierID = GetSoldierIDFromMercID(ubCurrentSoldier); sSoldierID = GetSoldierIDFromMercID(ubCurrentSoldier);
if (sSoldierID > -1) if (sSoldierID != NOBODY)
Menptr[sSoldierID].bTypeOfLastContract = CONTRACT_EXTEND_1_WEEK; sSoldierID->bTypeOfLastContract = CONTRACT_EXTEND_1_WEEK;
gMercProfiles[ubCurrentSoldier].bMercStatus = MERC_OK; gMercProfiles[ubCurrentSoldier].bMercStatus = MERC_OK;