Skip to content

Commit 51ebf46

Browse files
mtijanicmtijanic
committed
nwnx64: api fixes
1 parent 62e9593 commit 51ebf46

File tree

160 files changed

+878
-1303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+878
-1303
lines changed

‎NWNXLib/API/API/ALL_CLASSES.hpp

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,9 @@ struct CTlkTableToken;
3636
struct CTlkTableTokenCustom;
3737
struct CTlkTable;
3838
struct CCallbackHandlerBase;
39-
struct CGuiCallbackBase;
40-
struct CGuiCallback;
41-
struct CGuiCallbacki;
42-
struct CGuiCallbackii;
43-
struct CGuiCallbackS;
44-
struct CGuiCallbackf;
45-
struct CGuiCallbacki_i;
4639
struct KeyFileData;
4740
struct CExtendedServerInfo;
4841
struct CNetLayerSessionInfo;
49-
struct CFriendInfo;
50-
struct CFriendPresenceInfo;
5142
struct CNetLayer;
5243
struct CNetLayerPlayerCDKeyInfo;
5344
struct CNetLayerPlayerInfo;
@@ -59,15 +50,13 @@ struct CERFString;
5950
struct SJournalEntry;
6051
struct CWorldJournalEntry;
6152
struct CNWNameGen;
62-
struct CNWSync;
63-
struct ManifestEntry;
64-
struct ResRefBatchInsertEntry;
65-
struct MappingBatchInsertEntry;
66-
struct ManifestMetaData;
67-
struct ManifestInfo;
68-
struct AsyncHousekeepingStatus;
69-
struct Status;
70-
struct StorageType;
53+
struct StartupConfig;
54+
struct Provider;
55+
struct PlatformIntrinsicsProvider;
56+
struct out_of_space_error;
57+
struct StorageShard;
58+
struct DestroyHelper;
59+
struct StorageShardAllocParams;
7160
struct CPathfindInfoIntraTileSuccessors;
7261
struct CPathfindInformation;
7362
struct EXO2DAHEADER;
@@ -170,10 +159,12 @@ struct KEYFILE_HEADER;
170159
struct KEYFILE_RESFILENAME;
171160
struct KEYFILE_KEYENTRY;
172161
struct BIFFFILE_HEADER;
173-
struct BIFFFILE_VARRESENTRY;
162+
struct BIFFFILE_VARRESENTRY_V1;
163+
struct BIFFFILE_VARRESENTRY_E1;
174164
struct ENCAPSULATED_HEADER;
175165
struct ENCAPSULATED_KEYLISTENTRY;
176166
struct ENCAPSULATED_RESLISTENTRY;
167+
struct ENCAPSULATED_RESLISTENTRY_E1;
177168
struct CKeyTableEntry;
178169
struct CKeyTableInfo;
179170
struct CExoKeyTable;
@@ -323,3 +314,6 @@ struct CResGFFStruct;
323314
struct CResGFFField;
324315
struct CResGFFLabel;
325316
struct CResGFF;
317+
struct CNWSync;
318+
struct NWSyncAdvertisementManifest;
319+
struct NWSyncAdvertisement;

‎NWNXLib/API/API/AsyncHousekeepingStatus.hpp

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎NWNXLib/API/API/List.hpp renamed to ‎NWNXLib/API/API/AurList.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "List.hpp"
4+
#include "AurList.hpp"
55

66

77
#ifdef NWN_API_PROLOGUE
8-
NWN_API_PROLOGUE(List)
8+
NWN_API_PROLOGUE(AurList)
99
#endif
1010

1111

1212

1313

1414

15-
template <class Type> struct List
15+
template <class Type> struct AurList
1616
{
1717
Type * element;
1818
int32_t num;
1919
int32_t array_size;
2020

21-
List(int s = 0);
22-
List(List<Type> & list);
23-
~List();
21+
AurList(int s = 0);
22+
AurList(AurList<Type> & list);
23+
~AurList();
2424
void allocate(int32_t s);
2525
void SetSize(int32_t s);
2626
void Pack();
@@ -31,16 +31,16 @@ template <class Type> struct List
3131
int32_t IndexOf(Type );
3232
void Remove(Type );
3333
void DelIndex(int32_t i);
34-
List<Type> & operator=(List<Type> & list);
34+
AurList<Type> & operator=(AurList<Type> & list);
3535

3636

37-
#ifdef NWN_CLASS_EXTENSION_List
38-
NWN_CLASS_EXTENSION_List
37+
#ifdef NWN_CLASS_EXTENSION_AurList
38+
NWN_CLASS_EXTENSION_AurList
3939
#endif
4040
};
4141

4242

4343
#ifdef NWN_API_EPILOGUE
44-
NWN_API_EPILOGUE(List)
44+
NWN_API_EPILOGUE(AurList)
4545
#endif
4646

‎NWNXLib/API/API/BIFFFILE_VARRESENTRY.hpp

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎NWNXLib/API/API/BIFFFILE_VARRESENTRY_E1.hpp

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#pragma once
2+
#include "nwn_api.hpp"
3+
4+
5+
6+
#ifdef NWN_API_PROLOGUE
7+
NWN_API_PROLOGUE(BIFFFILE_VARRESENTRY_E1)
8+
#endif
9+
10+
11+
12+
13+
14+
struct BIFFFILE_VARRESENTRY_E1
15+
{
16+
uint32_t nID;
17+
uint32_t nOffset;
18+
uint32_t nSize;
19+
uint32_t nType;
20+
uint32_t nUncompressedSize;
21+
22+
23+
24+
#ifdef NWN_CLASS_EXTENSION_BIFFFILE_VARRESENTRY_E1
25+
NWN_CLASS_EXTENSION_BIFFFILE_VARRESENTRY_E1
26+
#endif
27+
};
28+
29+
30+
#ifdef NWN_API_EPILOGUE
31+
NWN_API_EPILOGUE(BIFFFILE_VARRESENTRY_E1)
32+
#endif
33+

‎NWNXLib/API/API/BIFFFILE_VARRESENTRY_V1.hpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#pragma once
2+
#include "nwn_api.hpp"
3+
4+
5+
6+
#ifdef NWN_API_PROLOGUE
7+
NWN_API_PROLOGUE(BIFFFILE_VARRESENTRY_V1)
8+
#endif
9+
10+
11+
12+
13+
14+
struct BIFFFILE_VARRESENTRY_V1
15+
{
16+
uint32_t nID;
17+
uint32_t nOffset;
18+
uint32_t nSize;
19+
uint32_t nType;
20+
21+
22+
23+
#ifdef NWN_CLASS_EXTENSION_BIFFFILE_VARRESENTRY_V1
24+
NWN_CLASS_EXTENSION_BIFFFILE_VARRESENTRY_V1
25+
#endif
26+
};
27+
28+
29+
#ifdef NWN_API_EPILOGUE
30+
NWN_API_EPILOGUE(BIFFFILE_VARRESENTRY_V1)
31+
#endif
32+

‎NWNXLib/API/API/C2DA.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4+
#include "CResHelper.hpp"
5+
#include "CResRef.hpp"
46
#include "CExoString.hpp"
57
#include "CRes2DA.hpp"
6-
#include "CResRef.hpp"
7-
#include "CResHelper.hpp"
88

99

1010
#ifdef NWN_API_PROLOGUE

‎NWNXLib/API/API/CAppManager.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoString.hpp"
54
#include "CExoLocString.hpp"
5+
#include "CExoString.hpp"
66

77

88
#ifdef NWN_API_PROLOGUE
99
NWN_API_PROLOGUE(CAppManager)
1010
#endif
1111

12-
struct CNWTileSetManager;
12+
struct CNWReentrantServerStats;
1313
struct CObjectTableManager;
14-
struct CClientExoApp;
1514
struct CServerExoApp;
16-
struct CNWReentrantServerStats;
15+
struct CNWTileSetManager;
16+
struct CClientExoApp;
1717

1818

1919
typedef int BOOL;

‎NWNXLib/API/API/CBaseExoApp.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoString.hpp"
54
#include "CExoArrayList.hpp"
65
#include "CExoLocString.hpp"
6+
#include "CExoString.hpp"
77

88

99
#ifdef NWN_API_PROLOGUE
@@ -18,7 +18,6 @@ typedef int BOOL;
1818
struct CBaseExoApp
1919
{
2020

21-
// virtual ~CBaseExoApp();
2221
virtual BOOL AdmitNetworkAddress(uint32_t nProtocol, CExoString sAddress);
2322
virtual BOOL AdmitPlayerName(CExoString sPlayerName);
2423
virtual BOOL SetNetworkAddressBan(uint32_t nProtocol, CExoString sAddress, BOOL bBanPlayer);

‎NWNXLib/API/API/CCombatInformation.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoString.hpp"
54
#include "CExoArrayList.hpp"
5+
#include "CExoString.hpp"
66

77

88
#ifdef NWN_API_PROLOGUE
99
NWN_API_PROLOGUE(CCombatInformation)
1010
#endif
1111

12-
struct CResStruct;
1312
struct CCombatInformationNode;
1413
struct CResGFF;
14+
struct CResStruct;
1515

1616

1717
typedef int BOOL;

‎NWNXLib/API/API/CERFFile.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoLinkedList.hpp"
5-
#include "NWERFHEADER.hpp"
64
#include "CERFRes.hpp"
7-
#include "CERFString.hpp"
5+
#include "CExoLinkedList.hpp"
86
#include "CERFKey.hpp"
7+
#include "CERFString.hpp"
8+
#include "NWERFHEADER.hpp"
99

1010

1111
#ifdef NWN_API_PROLOGUE

‎NWNXLib/API/API/CERFKey.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
NWN_API_PROLOGUE(CERFKey)
88
#endif
99

10-
struct CExoString;
1110
struct CExoFile;
11+
struct CExoString;
1212

1313

1414
typedef int BOOL;

‎NWNXLib/API/API/CExoBase.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoString.hpp"
54
#include "CFileInfo.hpp"
65
#include "CExoArrayList.hpp"
6+
#include "CExoString.hpp"
77

88

99
#ifdef NWN_API_PROLOGUE
1010
NWN_API_PROLOGUE(CExoBase)
1111
#endif
1212

13-
struct CExoBaseInternal;
13+
struct CExoAliasList;
14+
struct CExoTimers;
1415
struct CExoIdentity;
1516
struct CExoConfig;
16-
struct CExoIni;
1717
struct CExoDebug;
1818
struct CExoRand;
19-
struct CExoAliasList;
20-
struct CExoTimers;
19+
struct CExoBaseInternal;
20+
struct CExoIni;
2121

2222

2323
typedef uint16_t RESTYPE;

‎NWNXLib/API/API/CExoBaseInternal.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22
#include "nwn_api.hpp"
33

4-
#include "CExoString.hpp"
54
#include "CFileInfo.hpp"
65
#include "CExoArrayList.hpp"
6+
#include "CExoString.hpp"
77

88

99
#ifdef NWN_API_PROLOGUE

0 commit comments

Comments
 (0)