API Update 37-6

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 5)
+set(TARGET_NWN_BUILD_POSTFIX 6)
 set(NWNX_BUILD_SHA ${SHORT_HASH})
 set(PLUGIN_PREFIX NWNX_)
 

NWNXLib/API/API/ALL_CLASSES.hpp

@@ -200,7 +200,6 @@ struct CNWSAreaGridTransTableEntry;
 struct CNWSAreaInterTileSuccessors;
 struct CNWSArea;
 struct CNWSBarter;
-struct CNWSClient;
 struct CNWSCombatRoundAction;
 struct CNWSCombatAttackData;
 struct CNWSCombatRound;
@@ -278,7 +277,6 @@ struct CNWSSoundObject;
 struct CNWSAreaOfEffectObject;
 struct CStoreCustomer;
 struct CNWSStore;
-struct CNWSSysAdmin;
 struct CNWSTile;
 struct CNWSTileSet;
 struct CNWSTransition;

NWNXLib/API/API/CBaseExoApp.hpp

@@ -18,11 +18,11 @@ typedef int BOOL;
 struct CBaseExoApp
 {
 
-    virtual BOOL AdmitNetworkAddress(uint32_t nProtocol, CExoString sAddress);
+    virtual BOOL AdmitNetworkAddress(CExoString sAddress);
     virtual BOOL AdmitPlayerName(CExoString sPlayerName);
-    virtual BOOL SetNetworkAddressBan(uint32_t nProtocol, CExoString sAddress, BOOL bBanPlayer);
+    virtual BOOL SetNetworkAddressBan(CExoString sAddress, BOOL bBanPlayer);
     virtual void PlayerListChange(uint32_t nPlayerId, BOOL bEnter, BOOL bPrimaryPlayer = false);
-    virtual BOOL HandleMessage(uint32_t nPlayerId, uint8_t * pData, uint32_t dwSize, BOOL bRawMessage);
+    virtual void HandleMessage(uint32_t nPlayerId, uint8_t * pData, uint32_t dwSize);
     virtual float GetFPS();
     virtual BOOL ContinueMessageProcessing();
     virtual class CNetLayer * GetNetLayer();

NWNXLib/API/API/CNWMessage.hpp

@@ -60,7 +60,6 @@ struct CNWMessage
     CNWMessage();
     virtual ~CNWMessage();
     BOOL SetReadMessage(uint8_t * pMessage, uint32_t dwSize, uint32_t dwPlayerID = 0xffffffff, BOOL bHighPriority = true);
-    void ClearReadMessage();
     void HandleExpectedTypeMismatch(MessageType expect, MessageType got);
     void ExpectType(MessageType t);
     BOOL ReadBOOL();
@@ -80,8 +79,8 @@ struct CNWMessage
     CExoString ReadCExoString(int32_t nCount = 32);
     void * ReadVOIDPtr(int32_t nSize);
     json ReadJSON();
-    BOOL MessageReadOverflow(BOOL bWarn = true);
-    BOOL MessageReadUnderflow(BOOL bWarn = true);
+    BOOL MessageReadOverflow();
+    BOOL MessageReadUnderflow();
     BOOL MessageMoreDataToRead();
     void CreateWriteMessage(uint32_t nSize = 128, uint32_t dwPlayerID = 0xffffffff, BOOL bHighPriority = true);
     void WriteType(MessageType t);

NWNXLib/API/API/CNWSClient.hpp

@@ -10,8 +10,7 @@ NWN_API_PROLOGUE(CNWSEffectListHandler)
 
 struct CGameEffect;
 struct CNWSObject;
-typedef int32_t (*pfAECommands)(CNWSObject *, CGameEffect *, BOOL);
-typedef int32_t (*pfRECommands)(CNWSObject *, CGameEffect *);
+
 
 
 typedef int BOOL;
@@ -20,7 +19,9 @@ typedef uint32_t OBJECT_ID;
 
 struct CNWSEffectListHandler : CGameEffectApplierRemover
 {
+    typedef int32_t (CNWSEffectListHandler::*pfAECommands)(CNWSObject *, CGameEffect *, BOOL);
     pfAECommands * m_pApplyEffectCommands;
+    typedef int32_t (CNWSEffectListHandler::*pfRECommands)(CNWSObject *, CGameEffect *);
     pfRECommands * m_pRemoveEffectCommands;
 
     ~CNWSEffectListHandler();

NWNXLib/API/API/CNWSEffectListHandler.hpp

@@ -12,15 +12,15 @@ struct CNWSItem;
 struct CNWSObject;
 struct CNWSCreature;
 
-typedef int32_t (*pfAIPCommands)(CNWSItem*, CNWItemProperty*, CNWSCreature*, uint32_t, BOOL);
-typedef int32_t (*pfRIPCommands)(CNWSItem*, CNWItemProperty*, CNWSCreature*, uint32_t);
 typedef int BOOL;
 typedef uint32_t OBJECT_ID;
 
 
 struct CNWSItemPropertyHandler : CItemPropertyApplierRemover
 {
+    typedef int32_t (CNWSItemPropertyHandler::*pfAIPCommands)(CNWSItem*, CNWItemProperty*, CNWSCreature*, uint32_t, BOOL);
     pfAIPCommands * m_pApplyItemPropertyCommands;
+    typedef int32_t (CNWSItemPropertyHandler::*pfRIPCommands)(CNWSItem*, CNWItemProperty*, CNWSCreature*, uint32_t);
     pfRIPCommands * m_pRemoveItemPropertyCommands;
 
     ~CNWSItemPropertyHandler();

NWNXLib/API/API/CNWSItemPropertyHandler.hpp

@@ -82,10 +82,9 @@ struct CNWSMessage : CNWMessage
     BOOL HandlePlayerToServerGoldMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerInventoryMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerLoginMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
-    BOOL HandlePlayerToServerMessage(uint32_t nPlayerId, uint8_t * pBuffer, uint32_t nBufferSize);
+    void HandlePlayerToServerMessage(uint32_t nPlayerId, uint8_t * pBuffer, uint32_t nBufferSize);
     BOOL HandlePlayerToServerModuleMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerParty(CNWSPlayer * pPlayer, uint8_t nMinor);
-    BOOL HandlePlayerToServerServerChatMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerServerStatusMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerQuickChatMessage(CNWSPlayer * pPlayer, uint8_t nMinor);
     BOOL HandlePlayerToServerJournalMessage(CNWSPlayer * pPlayer, uint8_t nMinor);

NWNXLib/API/API/CNWSMessage.hpp

@@ -5,7 +5,6 @@
 #include "CExoString.hpp"
 #include "CLastUpdateObject.hpp"
 #include "CLastUpdatePartyObject.hpp"
-#include "CNWSClient.hpp"
 #include "CResRef.hpp"
 #include <unordered_map>
 #include <vector>
@@ -40,7 +39,7 @@ struct ExponentialSmoother
     time_t m_prev;
 };
 
-struct CNWSPlayer : CNWSClient
+struct CNWSPlayer
 {
     struct NuiState
     {
@@ -66,6 +65,8 @@ struct CNWSPlayer : CNWSClient
     BOOL m_bFloatyEffects;
     int32_t m_nAreas;
     OBJECT_ID * m_pAreas;
+    uint32_t m_nPlayerID;
+    int32_t m_nLanguage;
     uint8_t m_nLoginState;
     OBJECT_ID m_oidNWSObject;
     uint64_t m_nLastUpdatedTime;
@@ -103,11 +104,9 @@ struct CNWSPlayer : CNWSClient
     ExponentialSmoother m_cSmoothedLatency;
 
     CNWSPlayer(uint32_t nPlayerID);
-    virtual ~CNWSPlayer();
+    ~CNWSPlayer();
     void ClearPlayerOnDestroyGame();
     void Update();
-    virtual CNWSPlayer * AsNWSPlayer();
-    virtual CNWSPlayer * AsNWSDungeonMaster();
     STRREF LoadLocalCharacter();
     STRREF LoadDMCharacter();
     STRREF LoadServerCharacter(CResRef cResRef, BOOL bSubDirChar = false);