Update API and bump version for 8193.37-17 (#1843)

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

NWNXLib/API/API/CExoString.hpp

@@ -93,12 +93,12 @@ struct CExoString
     {
         return m_nStringLength;
     }
-    void Insert(const CExoString & string, uint32_t position);
+    void Insert(const CExoString & string, int32_t position);
     BOOL IsEmpty() const { return GetLength() == 0; }
-    CExoString Left(uint32_t count) const;
+    CExoString Left(int32_t count) const;
     CExoString LowerCase() const;
-    CExoString Right(uint32_t count) const;
-    CExoString SubString(uint32_t start, uint32_t count=~0) const;
+    CExoString Right(int32_t count) const;
+    CExoString SubString(int32_t start, int32_t count=-1) const;
     CExoString UpperCase() const;
     BOOL CompareNoCase(const CExoString & sString) const;
     BOOL ComparePrefixNoCase(const CExoString & sString, int32_t nSize) const;

NWNXLib/API/API/CNWCreatureStatsUpdate.hpp

@@ -45,7 +45,7 @@ struct CNWCreatureStatsUpdate
     char m_nFortSave;
     char m_nWillSave;
     char m_nReflexSave;
-    char m_nNegativeLevels[3];
+    char m_nNegativeLevels[8];
     int16_t m_nCurrentHP;
     int16_t m_nMaxHP;
     uint32_t m_nCurrentXP;

NWNXLib/API/API/CScriptCompiler.hpp

@@ -32,14 +32,19 @@ typedef int BOOL;
 
 // Removes any functions that cannot possibly be called by any codepath
 #define CSCRIPTCOMPILER_OPTIMIZE_DEAD_FUNCTIONS                       0x00000001
-// Merges constant expressions into a single constant where possible.
-// Note: Only affects runtime expressions, assignments to const variables are always folded.
-#define CSCRIPTCOMPILER_OPTIMIZE_FOLD_CONSTANTS                       0x00000002
 // Post processes generated instructions to merge sequences into shorter equivalents
-#define CSCRIPTCOMPILER_OPTIMIZE_MELD_INSTRUCTIONS                    0x00000004
+#define CSCRIPTCOMPILER_OPTIMIZE_MELD_INSTRUCTIONS                    0x00000002
+// Removes the jump and the dead branches in if (CONST) constructs
+#define CSCRIPTCOMPILER_OPTIMIZE_DEAD_BRANCHES                        0x00000004
 
+// Optimization groups - roughly corresponding to -O0, -O1, -O2, -O3. Each group includes the previous one.
+// Safe - Known good, used by the game and toolset
+// Aggressive - Probably good, used by the external compiler
+// Experimental - Untested or known to break something
 #define CSCRIPTCOMPILER_OPTIMIZE_NOTHING                              0x00000000
-#define CSCRIPTCOMPILER_OPTIMIZE_EVERYTHING                           0xFFFFFFFF
+#define CSCRIPTCOMPILER_OPTIMIZE_SAFE                                 (CSCRIPTCOMPILER_OPTIMIZE_DEAD_FUNCTIONS)
+#define CSCRIPTCOMPILER_OPTIMIZE_AGGRESSIVE                           (CSCRIPTCOMPILER_OPTIMIZE_SAFE | CSCRIPTCOMPILER_OPTIMIZE_DEAD_BRANCHES)
+#define CSCRIPTCOMPILER_OPTIMIZE_EXPERIMENTAL                         (CSCRIPTCOMPILER_OPTIMIZE_AGGRESSIVE | CSCRIPTCOMPILER_OPTIMIZE_MELD_INSTRUCTIONS)
 
 struct CScriptCompilerAPI
 {
@@ -297,7 +302,7 @@ struct CScriptCompiler
     int32_t GetStructureSize(const CExoString & sStructureName);
     int32_t GetIdentifierByName(const CExoString & sIdentifierName);
     int32_t AddToGlobalVariableList(CScriptParseTreeNode * pGlobalVariableNode);
-    BOOL ConstantFoldNode(CScriptParseTreeNode *pNode, BOOL bForce = false);
+    BOOL ConstantFoldNode(CScriptParseTreeNode *pNode);
     CScriptParseTreeNode *TrimParseTree(CScriptParseTreeNode *pNode);
     void InitializeSwitchLabelList();
     int32_t TraverseTreeForSwitchLabels(CScriptParseTreeNode * pNode);

NWNXLib/API/Constants/Messages.hpp

@@ -64,9 +64,12 @@ namespace MessageMajor
         GuiEvent                               = 0x35,
         Device                                 = 0x36,
         Nui                                    = 0x37,
+        SetShaderUniform                       = 0x38,
+        TargetingData                          = 0x39,
+        AudioStream                            = 0x40,
     };
     constexpr int32_t MIN   = 0;
-    constexpr int32_t MAX   = 0x37;
+    constexpr int32_t MAX   = 0x40;
 
     constexpr const char* ToString(const unsigned value)
     {
@@ -128,6 +131,9 @@ namespace MessageMajor
             "GuiEvent",
             "Device",
             "Nui",
+            "SetShaderUniform",
+            "TargetingData",
+            "AudioStream",
         };
 
         return (value > MAX) ? "(invalid)" : TYPE_STRINGS[value];

Plugins/Compiler/Compiler.cpp

@@ -153,7 +153,7 @@ static std::unique_ptr<CScriptCompiler> CreateAndConfigureCompiler(const CExoStr
     auto scriptCompiler = std::make_unique<CScriptCompiler>(Constants::ResRefType::NSS, Constants::ResRefType::NCS, Constants::ResRefType::NDB);
 
     scriptCompiler->SetGenerateDebuggerOutput(Config::Get<int>("GENERATE_DEBUGGER_OUTPUT", 0));
-    scriptCompiler->SetOptimizationFlags(Config::Get<uint32_t>("OPTIMIZATION_FLAGS", CSCRIPTCOMPILER_OPTIMIZE_EVERYTHING));
+    scriptCompiler->SetOptimizationFlags(Config::Get<uint32_t>("OPTIMIZATION_FLAGS", CSCRIPTCOMPILER_OPTIMIZE_AGGRESSIVE));
     scriptCompiler->SetIdentifierSpecification("nwscript");
     scriptCompiler->SetCompileConditionalOrMain(true);
     scriptCompiler->SetCompileConditionalFile(true);

Plugins/Util/Util.cpp

@@ -339,7 +339,7 @@ NWNX_EXPORT ArgumentStack AddScript(ArgumentStack&& args)
     {
         s_scriptCompiler = std::make_unique<CScriptCompiler>(Constants::ResRefType::NSS, Constants::ResRefType::NCS, Constants::ResRefType::NDB);
         s_scriptCompiler->SetGenerateDebuggerOutput(0);
-        s_scriptCompiler->SetOptimizationFlags(CSCRIPTCOMPILER_OPTIMIZE_EVERYTHING);
+        s_scriptCompiler->SetOptimizationFlags(CSCRIPTCOMPILER_OPTIMIZE_AGGRESSIVE);
         s_scriptCompiler->SetCompileConditionalOrMain(true);
         s_scriptCompiler->SetIdentifierSpecification("nwscript");
     }

README.md

@@ -1,10 +1,10 @@
 [![Discord](https://img.shields.io/discord/382306806866771978.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/hxTt8Fr)
 
-# NWNX:EE (build 8193.37.15 - v89)
+# NWNX:EE (build 8193.37.17 - v89)
 
 - Latest release: [build8193.37.13-HEAD](https://github.com/nwnxee/unified/releases/latest) - [Changelog](https://github.com/nwnxee/unified/blob/master/CHANGELOG.md#Unreleased)
 - Docker tag: `nwnxee/unified:latest`
-- nwserver-linux md5: `745847640ed0821ca087f86c92bdef74`
+- nwserver-linux md5: `0fa8c362e21f38321ec8fb9f6d885949`
 
 @mainpage
 @tableofcontents