Merge pull request #680 from mtijanic/build8193

8193 api update
nwnxee · Dec 3, 2019 · 8371427 · 8371427
2 parents 1b5f0d1 + aabf978
commit 8371427
Show file tree

Hide file tree

Showing 124 changed files with 29,984 additions and 29,915 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/Build/CMa
 # -DSANITIZE_ADDRESS=On
 find_package(Sanitizers)
 
-set(TARGET_NWN_BUILD 8192)
+set(TARGET_NWN_BUILD 8193)
 set(PLUGIN_PREFIX NWNX_)
 set(NWNX64 1)
 

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ COPY ./ .
 # Compile nwnx
 RUN Scripts/buildnwnx.sh -j $(nproc)
 
-FROM beamdog/nwserver:8192
+FROM beamdog/nwserver:8193
 RUN mkdir /nwn/nwnx
 COPY --from=builder /nwnx/home/Binaries/* /nwn/nwnx/
 

diff --git a/NWNXLib/API/API/ALL_CLASSES.hpp b/NWNXLib/API/API/ALL_CLASSES.hpp
@@ -42,6 +42,7 @@ struct CNetLayerSessionInfo;
 struct CNetLayer;
 struct CNetLayerPlayerCDKeyInfo;
 struct CNetLayerPlayerInfo;
+struct CNWAmbientSound;
 struct NWERFHEADER;
 struct CERFFile;
 struct CERFKey;
@@ -174,6 +175,7 @@ struct CExoEncapsulatedFile;
 struct CExoResourceImageFile;
 struct CNetLayerWindow;
 struct CNetLayerInternal;
+struct KXPacket;
 struct IntendedConnectionData;
 struct CScriptParseTreeNode;
 struct CScriptParseTreeNodeBlock;

diff --git a/NWNXLib/API/API/C2DA.hpp b/NWNXLib/API/API/C2DA.hpp
@@ -2,9 +2,9 @@
 #include "nwn_api.hpp"
 
 #include "CResHelper.hpp"
-#include "CResRef.hpp"
 #include "CExoString.hpp"
 #include "CRes2DA.hpp"
+#include "CResRef.hpp"
 
 
 #ifdef NWN_API_PROLOGUE

diff --git a/NWNXLib/API/API/CAppManager.hpp b/NWNXLib/API/API/CAppManager.hpp
@@ -1,19 +1,19 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "CExoLocString.hpp"
 #include "CExoString.hpp"
+#include "CExoLocString.hpp"
 
 
 #ifdef NWN_API_PROLOGUE
 NWN_API_PROLOGUE(CAppManager)
 #endif
 
-struct CNWReentrantServerStats;
 struct CObjectTableManager;
-struct CServerExoApp;
-struct CNWTileSetManager;
 struct CClientExoApp;
+struct CNWTileSetManager;
+struct CNWReentrantServerStats;
+struct CServerExoApp;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CBaseExoApp.hpp b/NWNXLib/API/API/CBaseExoApp.hpp
@@ -2,8 +2,8 @@
 #include "nwn_api.hpp"
 
 #include "CExoArrayList.hpp"
-#include "CExoLocString.hpp"
 #include "CExoString.hpp"
+#include "CExoLocString.hpp"
 
 
 #ifdef NWN_API_PROLOGUE

diff --git a/NWNXLib/API/API/CCombatInformation.hpp b/NWNXLib/API/API/CCombatInformation.hpp
@@ -9,9 +9,9 @@
 NWN_API_PROLOGUE(CCombatInformation)
 #endif
 
-struct CCombatInformationNode;
-struct CResGFF;
 struct CResStruct;
+struct CResGFF;
+struct CCombatInformationNode;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CERFFile.hpp b/NWNXLib/API/API/CERFFile.hpp
@@ -1,24 +1,24 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "CERFRes.hpp"
-#include "CExoLinkedList.hpp"
+#include "NWERFHEADER.hpp"
 #include "CERFKey.hpp"
+#include "CExoLinkedList.hpp"
 #include "CERFString.hpp"
-#include "NWERFHEADER.hpp"
+#include "CERFRes.hpp"
 
 
 #ifdef NWN_API_PROLOGUE
 NWN_API_PROLOGUE(CERFFile)
 #endif
 
-struct CExoFile;
 struct CExoString;
 struct CRes;
+struct CExoFile;
 
 
-typedef uint16_t RESTYPE;
 typedef int BOOL;
+typedef uint16_t RESTYPE;
 
 
 struct CERFFile

diff --git a/NWNXLib/API/API/CERFKey.hpp b/NWNXLib/API/API/CERFKey.hpp
@@ -7,8 +7,8 @@
 NWN_API_PROLOGUE(CERFKey)
 #endif
 
-struct CExoFile;
 struct CExoString;
+struct CExoFile;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CExoBase.hpp b/NWNXLib/API/API/CExoBase.hpp
@@ -1,27 +1,27 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "CFileInfo.hpp"
-#include "CExoArrayList.hpp"
 #include "CExoString.hpp"
+#include "CExoArrayList.hpp"
+#include "CFileInfo.hpp"
 
 
 #ifdef NWN_API_PROLOGUE
 NWN_API_PROLOGUE(CExoBase)
 #endif
 
-struct CExoAliasList;
-struct CExoTimers;
-struct CExoIdentity;
-struct CExoConfig;
 struct CExoDebug;
+struct CExoIdentity;
 struct CExoRand;
-struct CExoBaseInternal;
+struct CExoConfig;
 struct CExoIni;
+struct CExoBaseInternal;
+struct CExoAliasList;
+struct CExoTimers;
 
 
-typedef uint16_t RESTYPE;
 typedef int BOOL;
+typedef uint16_t RESTYPE;
 
 
 struct CExoBase

diff --git a/NWNXLib/API/API/CExoBaseInternal.hpp b/NWNXLib/API/API/CExoBaseInternal.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "CFileInfo.hpp"
-#include "CExoArrayList.hpp"
 #include "CExoString.hpp"
+#include "CExoArrayList.hpp"
+#include "CFileInfo.hpp"
 
 
 #ifdef NWN_API_PROLOGUE

diff --git a/NWNXLib/API/API/CExoEncapsulatedFile.hpp b/NWNXLib/API/API/CExoEncapsulatedFile.hpp
@@ -10,8 +10,8 @@
 NWN_API_PROLOGUE(CExoEncapsulatedFile)
 #endif
 
-struct ENCAPSULATED_HEADER;
 struct ENCAPSULATED_RESLISTENTRY_E1;
+struct ENCAPSULATED_HEADER;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CExoIdentity.hpp b/NWNXLib/API/API/CExoIdentity.hpp
@@ -9,8 +9,8 @@ NWN_API_PROLOGUE(CExoIdentity)
 
 
 
-typedef uint32_t STRREF;
 typedef int BOOL;
+typedef uint32_t STRREF;
 
 
 struct CExoIdentity

diff --git a/NWNXLib/API/API/CExoInput.hpp b/NWNXLib/API/API/CExoInput.hpp
@@ -9,8 +9,8 @@ NWN_API_PROLOGUE(CExoInput)
 #endif
 
 struct CExoInputEvent;
-struct CExoFile;
 struct CExoInputInternal;
+struct CExoFile;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CExoInputClass.hpp b/NWNXLib/API/API/CExoInputClass.hpp
@@ -2,8 +2,8 @@
 #include "nwn_api.hpp"
 
 #include "CExoString.hpp"
-#include "CExoInputEventDesc.hpp"
 #include "CExoLinkedList.hpp"
+#include "CExoInputEventDesc.hpp"
 
 
 #ifdef NWN_API_PROLOGUE

diff --git a/NWNXLib/API/API/CExoKeyTable.hpp b/NWNXLib/API/API/CExoKeyTable.hpp
@@ -2,24 +2,24 @@
 #include "nwn_api.hpp"
 
 #include "CExoString.hpp"
-#include "CExoLinkedList.hpp"
 #include "RESID.hpp"
 #include "CKeyTableInfo.hpp"
+#include "CExoLinkedList.hpp"
 
 
 #ifdef NWN_API_PROLOGUE
 NWN_API_PROLOGUE(CExoKeyTable)
 #endif
 
-struct CKeyTableEntry;
-struct CResRef;
-struct CExoPackedFile;
 struct CExoStringList;
+struct CResRef;
 struct CRes;
+struct CExoPackedFile;
+struct CKeyTableEntry;
 
 
-typedef uint16_t RESTYPE;
 typedef int BOOL;
+typedef uint16_t RESTYPE;
 
 
 struct CExoKeyTable

diff --git a/NWNXLib/API/API/CExoLocString.hpp b/NWNXLib/API/API/CExoLocString.hpp
@@ -11,8 +11,8 @@ NWN_API_PROLOGUE(CExoLocString)
 struct CExoLocStringInternal;
 
 
-typedef uint32_t STRREF;
 typedef int BOOL;
+typedef uint32_t STRREF;
 
 
 struct CExoLocString

diff --git a/NWNXLib/API/API/CExoLocStringInternal.hpp b/NWNXLib/API/API/CExoLocStringInternal.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "EXOLOCSTRING.hpp"
-#include "CExoString.hpp"
 #include "CExoLinkedList.hpp"
+#include "CExoString.hpp"
+#include "EXOLOCSTRING.hpp"
 
 
 #ifdef NWN_API_PROLOGUE

diff --git a/NWNXLib/API/API/CExoResFile.hpp b/NWNXLib/API/API/CExoResFile.hpp
@@ -9,8 +9,8 @@
 NWN_API_PROLOGUE(CExoResFile)
 #endif
 
-struct BIFFFILE_HEADER;
 struct BIFFFILE_VARRESENTRY_E1;
+struct BIFFFILE_HEADER;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CExoResMan.hpp b/NWNXLib/API/API/CExoResMan.hpp
@@ -1,36 +1,36 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "CExoArrayList.hpp"
-#include "CNWSync.hpp"
 #include "CExoString.hpp"
-#include "CExoLinkedList.hpp"
-#include "CRes.hpp"
+#include "CNWSync.hpp"
 #include "CExoLocString.hpp"
 #include "RESID.hpp"
+#include "CExoArrayList.hpp"
+#include "CRes.hpp"
+#include "CExoLinkedList.hpp"
 
 
 #ifdef NWN_API_PROLOGUE
 NWN_API_PROLOGUE(CExoResMan)
 #endif
 
+struct CExoStringList;
+struct CResRef;
 struct CExoKeyTable;
 struct CKeyTableEntry;
-struct CResRef;
-struct CExoFile;
-struct CExoStringList;
 struct CExoKeyTable;
+struct CExoFile;
 
 
-typedef uint16_t RESTYPE;
 typedef int BOOL;
+typedef uint16_t RESTYPE;
 
 
 struct CExoResMan
 {
-    int32_t m_nTotalPhysicalMemory;
-    int32_t m_nTotalAvailableMemory;
-    int32_t m_nAvailableMemory;
+    int64_t m_nTotalPhysicalMemory;
+    int64_t m_nTotalAvailableMemory;
+    int64_t m_nAvailableMemory;
     CExoArrayList<CExoKeyTable *> m_pKeyTables;
     CExoLinkedList<CRes> m_lstToBeFreed;
     CExoLinkedList<CRes> m_lstAsyncResQueue;
@@ -59,7 +59,7 @@ struct CExoResMan
     CExoStringList * GetResOfType(RESTYPE nType, BOOL bERFOnly = false);
     CExoStringList * GetResOfType(RESTYPE nType, CRes * pRes);
     RESID GetResID(const CResRef & cResRef, RESTYPE nType);
-    uint32_t GetTotalPhysicalMemory();
+    int64_t GetTotalPhysicalMemory();
     int32_t ReleaseResObject(CRes * pRes, bool bDontCache = false);
     BOOL RemoveEncapsulatedResourceFile(const CExoString & sName, BOOL bEmitWarningOnFailure = true);
     BOOL RemoveResourceImageFile(const CExoString & sName);
@@ -68,7 +68,7 @@ struct CExoResMan
     BOOL RemoveManifest(const CExoString & sManifestHash);
     void ResumeServicing();
     void SetResObject(const CResRef & cResRef, RESTYPE nType, CRes * pNewRes);
-    BOOL SetTotalResourceMemory(int32_t totalAvailableMemory);
+    BOOL SetTotalResourceMemory(int64_t totalAvailableMemory);
     void SuspendServicing();
     void Update(uint32_t nTimeSlice);
     BOOL UpdateEncapsulatedResourceFile(const CExoString & sName);

diff --git a/NWNXLib/API/API/CExoResourceImageFile.hpp b/NWNXLib/API/API/CExoResourceImageFile.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "nwn_api.hpp"
 
-#include "ENCAPSULATED_KEYLISTENTRY.hpp"
 #include "RESID.hpp"
+#include "ENCAPSULATED_KEYLISTENTRY.hpp"
 #include "CExoPackedFile.hpp"
 
 

diff --git a/NWNXLib/API/API/CFactionManager.hpp b/NWNXLib/API/API/CFactionManager.hpp
@@ -8,10 +8,10 @@
 NWN_API_PROLOGUE(CFactionManager)
 #endif
 
+struct CExoString;
+struct CResList;
 struct CNWSFaction;
 struct CResGFF;
-struct CResList;
-struct CExoString;
 struct CNWSFaction;
 
 

diff --git a/NWNXLib/API/API/CGameEffect.hpp b/NWNXLib/API/API/CGameEffect.hpp
@@ -8,8 +8,8 @@
 NWN_API_PROLOGUE(CGameEffect)
 #endif
 
-struct CResGFF;
 struct CResStruct;
+struct CResGFF;
 
 
 typedef int BOOL;

diff --git a/NWNXLib/API/API/CGameEffectApplierRemover.hpp b/NWNXLib/API/API/CGameEffectApplierRemover.hpp
@@ -7,8 +7,8 @@
 NWN_API_PROLOGUE(CGameEffectApplierRemover)
 #endif
 
-struct CNWSObject;
 struct CGameEffect;
+struct CNWSObject;
 
 
 typedef int BOOL;