From 8e4307b2fb5206d041c84e8ebba0e95ad317cbe4 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Wed, 20 Nov 2024 19:56:38 +0200 Subject: [PATCH] Use SoldierID --- Strategic/LuaInitNPCs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index f8ad68eb..b99141c7 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -12034,7 +12034,7 @@ static int l_VisibleTown (lua_State *L) static int l_HireMerc(lua_State *L) { MERC_HIRE_STRUCT HireMercStruct; - INT16 sSoldierID = 0; + SoldierID sSoldierID = NOBODY; INT16 iTotalContract = 7; UINT32 iTimeTillMercArrives = 0; UINT8 n = lua_gettop(L); @@ -12071,8 +12071,8 @@ static int l_HireMerc(lua_State *L) if (!HireMerc(&HireMercStruct)) { sSoldierID = GetSoldierIDFromMercID(ubCurrentSoldier); - if (sSoldierID > -1) - Menptr[sSoldierID].bTypeOfLastContract = CONTRACT_EXTEND_1_WEEK; + if (sSoldierID != NOBODY) + sSoldierID->bTypeOfLastContract = CONTRACT_EXTEND_1_WEEK; gMercProfiles[ubCurrentSoldier].bMercStatus = MERC_OK;