API Update 37-9

Author: Daztek

CMakeLists.txt

@@ -20,7 +20,7 @@ find_package(Sanitizers)
 execute_process(COMMAND git rev-parse --short HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE SHORT_HASH)
 set(TARGET_NWN_BUILD 8193)
 set(TARGET_NWN_BUILD_REVISION 37)
-set(TARGET_NWN_BUILD_POSTFIX 7)
+set(TARGET_NWN_BUILD_POSTFIX 9)
 set(NWNX_BUILD_SHA ${SHORT_HASH})
 set(PLUGIN_PREFIX NWNX_)
 

NWNXLib/API/API/C2DA.hpp

@@ -57,7 +57,7 @@ struct C2DA : CResHelper<CRes2DA, 2017>
     BOOL SetBlankEntry(CExoString sRowLabel, CExoString sColumnLabel);
     BOOL SetBlankEntry(int32_t nRow, CExoString sColumnLabel);
     BOOL SetBlankEntry(CExoString sRowLabel, int32_t nColumn);
-    BOOL Load2DArray();
+    BOOL Load2DArray(BOOL optional = false);
     void Unload2DArray();
     int32_t GetColumnIndex(const CExoString & sColumn);
     uint32_t GetNextLineLength(char * pBuffer, uint32_t nBufferSize);

NWNXLib/API/API/CNWCCMessageData.hpp

@@ -18,14 +18,14 @@ typedef uint32_t OBJECT_ID;
 
 struct CNWCCMessageData
 {
-    uint8_t m_nType;
+    uint8_t m_nType = 0;
     CExoArrayList<int32_t> m_nParamInteger;
     CExoArrayList<float> m_nParamFloat;
     CExoArrayList<CExoString> m_sParamString;
     CExoArrayList<OBJECT_ID> m_oidParamObjectID;
 
-    CNWCCMessageData();
-    ~CNWCCMessageData();
+    CNWCCMessageData() { }
+    ~CNWCCMessageData() { }
     int32_t GetInteger(int32_t nStorageLocation);
     void SetInteger(int32_t nStorageLocation, int32_t nValue);
     float GetFloat(int32_t nStorageLocation);

Plugins/Events/Events/ClientEvents.cpp

@@ -84,7 +84,7 @@ void RemovePCFromWorldHook(CServerExoAppInternal *pServerExoAppInternal, CNWSPla
     auto *pNetLayer = Globals::AppManager()->m_pServerExoApp->GetNetLayer();
     auto *pPlayerInfo = pNetLayer->GetPlayerInfo(pPlayer->m_nPlayerID);
     auto playerName = pPlayerInfo->m_sPlayerName.CStr();
-    auto cdKey = pPlayerInfo->m_lstKeys[0].sPublic.CStr();
+    auto cdKey = pPlayerInfo->m_cCDKey.sPublic.CStr();
     PushEventData("PLAYER_NAME", playerName);
     PushEventData("CDKEY", cdKey);
     SignalEvent("NWNX_ON_CLIENT_DISCONNECT_BEFORE" , pPlayer->m_oidNWSObject);

Plugins/HTTPClient/NWScript/nwnx_httpclient.nss

@@ -70,44 +70,39 @@ struct NWNX_HTTPClient_Request NWNX_HTTPClient_GetRequest(int nRequestId);
 
 int NWNX_HTTPClient_SendRequest(struct NWNX_HTTPClient_Request s)
 {
-    string sFunc = "SendRequest";
-    NWNX_PushArgumentString(s.sHeaders);
-    NWNX_PushArgumentInt(s.nPort);
-    NWNX_PushArgumentString(s.sAuthPassword);
-    NWNX_PushArgumentString(s.sAuthUserOrToken);
-    NWNX_PushArgumentInt(s.nAuthType);
-    NWNX_PushArgumentString(s.sData);
-    NWNX_PushArgumentInt(s.nContentType);
-    NWNX_PushArgumentString(s.sPath);
-    NWNX_PushArgumentString(s.sHost);
-    NWNX_PushArgumentInt(s.nRequestMethod);
-    NWNX_PushArgumentString(s.sTag);
-    NWNX_CallFunction(NWNX_HTTPClient, sFunc);
-
-    return NWNX_GetReturnValueInt();
+    NWNXPushString(s.sHeaders);
+    NWNXPushInt(s.nPort);
+    NWNXPushString(s.sAuthPassword);
+    NWNXPushString(s.sAuthUserOrToken);
+    NWNXPushInt(s.nAuthType);
+    NWNXPushString(s.sData);
+    NWNXPushInt(s.nContentType);
+    NWNXPushString(s.sPath);
+    NWNXPushString(s.sHost);
+    NWNXPushInt(s.nRequestMethod);
+    NWNXPushString(s.sTag);
+    NWNXCall(NWNX_HTTPClient, "SendRequest");
+    return NWNXPopInt();
 }
 
 struct NWNX_HTTPClient_Request NWNX_HTTPClient_GetRequest(int nRequestId)
 {
-
-    string sFunc = "GetRequest";
-
-    NWNX_PushArgumentInt(nRequestId);
-    NWNX_CallFunction(NWNX_HTTPClient, sFunc);
+    NWNXPushInt(nRequestId);
+    NWNXCall(NWNX_HTTPClient, "GetRequest");
 
     struct NWNX_HTTPClient_Request s;
 
-    s.sTag             = NWNX_GetReturnValueString();
-    s.nRequestMethod   = NWNX_GetReturnValueInt();
-    s.sHost            = NWNX_GetReturnValueString();
-    s.sPath            = NWNX_GetReturnValueString();
-    s.nContentType     = NWNX_GetReturnValueInt();
-    s.sData            = NWNX_GetReturnValueString();
-    s.nAuthType        = NWNX_GetReturnValueInt();
-    s.sAuthUserOrToken = NWNX_GetReturnValueString();
-    s.sAuthPassword    = NWNX_GetReturnValueString();
-    s.nPort            = NWNX_GetReturnValueInt();
-    s.sHeaders         = NWNX_GetReturnValueString();
+    s.sTag             = NWNXPopString();
+    s.nRequestMethod   = NWNXPopInt();
+    s.sHost            = NWNXPopString();
+    s.sPath            = NWNXPopString();
+    s.nContentType     = NWNXPopInt();
+    s.sData            = NWNXPopString();
+    s.nAuthType        = NWNXPopInt();
+    s.sAuthUserOrToken = NWNXPopString();
+    s.sAuthPassword    = NWNXPopString();
+    s.nPort            = NWNXPopInt();
+    s.sHeaders         = NWNXPopString();
 
     return s;
 }

Plugins/Tweaks/CMakeLists.txt

@@ -13,7 +13,6 @@ add_plugin(Tweaks
     "FixArmorDexBonusUnderOne.cpp"
     "FixDispelEffectLevels.cpp"
     "FixGreaterSanctuaryBug.cpp"
-    "FixItemNullptrInCItemRepository.cpp"
     "FixTriggerEnterDetection.cpp"
     "FixUnlimitedPotionsBug.cpp"
     "HideOnCharList.cpp"

Plugins/Tweaks/FixItemNullptrInCItemRepository.cpp

@@ -29,7 +29,6 @@ Tweaks stuff. See below.
 | `NWNX_TWEAKS_UNHARDCODE_SHIELDS` | true or false | baseitems.2da will be used to define shield AC for shields and shield-like items. |
 | `NWNX_TWEAKS_BLOCK_DM_SPAWNITEM` | true or false | Disables the dm_spawnitem console command. |
 | `NWNX_TWEAKS_FIX_ARMOR_DEX_BONUS_UNDER_ONE` | true or false | Allows armor with a max DEX bonus of under 1. |
-| `NWNX_TWEAKS_FIX_ITEM_NULLPTR_IN_CITEMREPOSITORY` | true or false | Fixes a (rare?) inventory crash bug. |
 | `NWNX_TWEAKS_CLEAR_SPELL_EFFECTS_ON_TURDS` | true or false | Effects on logged out player characters will be removed when a caster rests. |
 | `NWNX_TWEAKS_ALWAYS_RETURN_FULL_DEX_STAT` | true or false | Creatures will always have their full dex states, even when immobilized/entangled. |
 | `NWNX_TWEAKS_DISPLAY_NUM_ATTACKS_OVERRIDE_IN_CHARACTER_SHEET` | true or false | The number of attacks per round overridden by SetBaseAttackBonus() will show on the character sheet. |