Added NWNX_Damage_DealMeleeDamage()

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = lf
+
+[*.{nss,c,h,cpp,hpp}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8

CHANGELOG.md

@@ -54,6 +54,7 @@ https://github.com/nwnxee/unified/compare/build8193.34...HEAD
 - Player: UpdateSkyBox();
 - Player: UpdateFogColor();
 - Player: UpdateFogAmount();
+- Player: GetGameObject()
 - Regex: Match()
 
 ### Changed

CMakeLists.txt

@@ -19,7 +19,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 34)
+set(TARGET_NWN_BUILD_REVISION 35)
 set(NWNX_BUILD_SHA ${SHORT_HASH})
 set(PLUGIN_PREFIX NWNX_)
 
@@ -47,9 +47,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
                            -Wno-gnu-zero-variadic-macro-arguments -Wno-global-constructors -Wno-exit-time-destructors \
                            -Wno-missing-prototypes -Wno-unused-function -Wno-weak-vtables -Wno-missing-noreturn \
                            -Wno-non-virtual-dtor -Wno-double-promotion -Wno-covered-switch-default -Wno-unused-macros \
-                           -Wno-register")
+                           -Wno-register -Wno-pmf-conversions")
 else()
-    set(WARNING_FLAGS_CXX "-Wall -Wextra")
+    set(WARNING_FLAGS_CXX "-Wall -Wextra -Wno-pmf-conversions")
 endif()
 
 set(NWNX_STANDARD_FLAGS "-m64 -march=x86-64 -fdiagnostics-show-option -fno-omit-frame-pointer -fPIC -fno-strict-aliasing")

Core/NWNXCore.cpp

@@ -122,10 +122,12 @@ NWNXCore::NWNXCore()
     // This will be fixed in a future release of NWNX:EE. For now, the version check will happen *too late* - we may
     // crash before the version check happens.
     std::printf("Starting NWNX %d.%d [%s]\n", NWNX_TARGET_NWN_BUILD, NWNX_TARGET_NWN_BUILD_REVISION, NWNX_BUILD_SHA);
-    // This sets up the base address for every hook and patch to follow.
-    Platform::CalculateBaseAddress();
 
-    m_createServerHook = Hooks::HookFunction(API::Functions::_ZN11CAppManager12CreateServerEv, (void*)&CreateServerHandler);
+    // Initialise export table. New plugin code should endeavour to use direct linking
+    // for hook naming, but these might help if you want to target a overloaded function.
+    NWNXLib::API::Functions::Initialize();
+
+    m_createServerHook = Hooks::HookFunction(&CAppManager::CreateServer, &CreateServerHandler);
 }
 
 NWNXCore::~NWNXCore()
@@ -174,19 +176,20 @@ void NWNXCore::ConfigureLogLevel(const std::string& plugin)
 
 void NWNXCore::InitialSetupHooks()
 {
-    m_vmSetVarHook         = Hooks::HookFunction(API::Functions::_ZN25CNWVirtualMachineCommands20ExecuteCommandSetVarEii, (void*)&SetVarHandler, Hooks::Order::Final);
-    m_vmGetVarHook         = Hooks::HookFunction(API::Functions::_ZN25CNWVirtualMachineCommands20ExecuteCommandGetVarEii, (void*)&GetVarHandler, Hooks::Order::Final);
-    m_vmTagEffectHook      = Hooks::HookFunction(API::Functions::_ZN25CNWVirtualMachineCommands23ExecuteCommandTagEffectEii, (void*)&TagEffectHandler, Hooks::Order::Final);
-    m_vmTagItemProperyHook = Hooks::HookFunction(API::Functions::_ZN25CNWVirtualMachineCommands29ExecuteCommandTagItemPropertyEii, (void*)&TagItemPropertyHandler, Hooks::Order::Final);
-    m_vmPlaySoundHook      = Hooks::HookFunction(API::Functions::_ZN25CNWVirtualMachineCommands23ExecuteCommandPlaySoundEii, (void*)&PlaySoundHandler, Hooks::Order::Final);
+    m_vmSetVarHook         = Hooks::HookFunction(&CNWVirtualMachineCommands::ExecuteCommandSetVar, &SetVarHandler, Hooks::Order::Final);
+    m_vmGetVarHook         = Hooks::HookFunction(&CNWVirtualMachineCommands::ExecuteCommandGetVar, &GetVarHandler, Hooks::Order::Final);
+    m_vmTagEffectHook      = Hooks::HookFunction(&CNWVirtualMachineCommands::ExecuteCommandTagEffect, &TagEffectHandler, Hooks::Order::Final);
+    m_vmTagItemProperyHook = Hooks::HookFunction(&CNWVirtualMachineCommands::ExecuteCommandTagItemProperty, &TagItemPropertyHandler, Hooks::Order::Final);
+    m_vmPlaySoundHook      = Hooks::HookFunction(&CNWVirtualMachineCommands::ExecuteCommandPlaySound, &PlaySoundHandler, Hooks::Order::Final);
+
 
-    m_destroyServerHook    = Hooks::HookFunction(API::Functions::_ZN11CAppManager13DestroyServerEv, (void*)&DestroyServerHandler, Hooks::Order::Final);
-    m_mainLoopInternalHook = Hooks::HookFunction(API::Functions::_ZN21CServerExoAppInternal8MainLoopEv, (void*)&MainLoopInternalHandler, Hooks::Order::Final);
+    m_destroyServerHook    = Hooks::HookFunction(&CAppManager::DestroyServer, &DestroyServerHandler, Hooks::Order::Final);
+    m_mainLoopInternalHook = Hooks::HookFunction(&CServerExoAppInternal::MainLoop, &MainLoopInternalHandler, Hooks::Order::Final);
 
     POS::InitializeHooks();
 
-    static Hooks::Hook loadModuleInProgressHook = Hooks::HookFunction(API::Functions::_ZN10CNWSModule20LoadModuleInProgressEii,
-            (void*)+[](CNWSModule *pModule, int32_t nAreasLoaded, int32_t nAreasToLoad) -> uint32_t
+    static Hooks::Hook loadModuleInProgressHook = Hooks::HookFunction(&CNWSModule::LoadModuleInProgress,
+            +[](CNWSModule *pModule, int32_t nAreasLoaded, int32_t nAreasToLoad) -> uint32_t
             {
                 int index = nAreasLoaded;
                 auto *node = pModule->m_lstModuleArea.m_pcExoLinkedListInternal->pHead;
@@ -206,8 +209,8 @@ void NWNXCore::InitialSetupHooks()
             }, Hooks::Order::Earliest);
 
     static Hooks::Hook loadModuleFinishHook = Hooks::HookFunction(
-            API::Functions::_ZN10CNWSModule16LoadModuleFinishEv,
-            (void*)+[](CNWSModule *pModule) -> uint32_t
+            &CNWSModule::LoadModuleFinish,
+            +[](CNWSModule *pModule) -> uint32_t
             {
                 MessageBus::Broadcast("NWNX_CORE_SIGNAL", { "ON_MODULE_LOAD_FINISH" });
                 return loadModuleFinishHook->CallOriginal<uint32_t>(pModule);
@@ -216,8 +219,8 @@ void NWNXCore::InitialSetupHooks()
     if (!Config::Get<bool>("ALLOW_NWNX_FUNCTIONS_IN_EXECUTE_SCRIPT_CHUNK", false))
     {
         static Hooks::Hook runScriptChunkHook = Hooks::HookFunction(
-                API::Functions::_ZN15CVirtualMachine14RunScriptChunkERK10CExoStringjii,
-                (void*)+[](CVirtualMachine *pVirtualMachine, const CExoString& sScriptChunk, ObjectID oid, int32_t bOidValid, int32_t bWrapIntoMain) -> int32_t
+                &CVirtualMachine::RunScriptChunk,
+                +[](CVirtualMachine *pVirtualMachine, const CExoString& sScriptChunk, ObjectID oid, int32_t bOidValid, int32_t bWrapIntoMain) -> int32_t
                 {
                     g_core->m_ScriptChunkRecursion += 1;
                     auto retVal = runScriptChunkHook->CallOriginal<int32_t>(pVirtualMachine, sScriptChunk, oid, bOidValid, bWrapIntoMain);
@@ -486,13 +489,6 @@ void NWNXCore::InitialSetupCommands()
                  Log::GetPrintSource(), Log::GetColorOutput(), Log::GetForceColor());
     });
 
-    Commands::Register("resolve", [](std::string&, std::string& args)
-    {
-        auto addr = String::FromString<uint64_t>(args);
-        if (addr)
-            LOG_NOTICE("%s", NWNXLib::Platform::ResolveAddress(*addr));
-    });
-
 }
 
 

Core/NWNXCoreVM.cpp

@@ -4,7 +4,7 @@
 #include "API/CAppManager.hpp"
 #include "API/CExoString.hpp"
 #include "API/Constants.hpp"
-#include "API/Functions.hpp"
+#include "API/nwn_api.hpp"
 #include "API/Globals.hpp"
 #include "API/Vector.hpp"
 #include "API/CExoString.hpp"

NWNXLib/API/API/CExoEncapsulatedFile.hpp

@@ -27,18 +27,13 @@ struct CExoEncapsulatedFile : CExoPackedFile
     CExoEncapsulatedFile();
     ~CExoEncapsulatedFile();
     virtual void AddRefCount();
-    virtual void AddAsyncRefCount();
     virtual BOOL CloseFile();
-    virtual BOOL CloseAsyncFile();
     virtual void DeleteRefCount();
-    virtual void DeleteAsyncRefCount();
     virtual uint32_t GetResourceSize(RESID nID);
     virtual BOOL Initialize();
     virtual BOOL OpenFile();
     virtual BOOL OpenFile(uint8_t * pCipher);
-    virtual BOOL OpenAsyncFile();
     virtual uint32_t ReadResource(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
-    virtual void ReadResourceAsync(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
     virtual BOOL LoadHeader(const char * expectOid, uint8_t nType = 0);
     virtual BOOL UnloadHeader();
 

NWNXLib/API/API/CExoFile.hpp

@@ -32,9 +32,6 @@ struct CExoFile
     int32_t GetSize();
     uint32_t Read(void * ptr, uint32_t size, uint32_t number);
     uint32_t Read(CExoString & string, uint32_t length);
-    void ReadAsync(void * ptr, uint32_t size, uint32_t number);
-    BOOL ReadAsyncComplete();
-    uint32_t ReadAsyncBytesRead();
     uint32_t Write(const void * ptr, uint32_t size, uint32_t number);
     uint32_t Write(const char * string);
     uint32_t Write(const CExoString & string);

NWNXLib/API/API/CExoPackedFile.hpp

@@ -21,28 +21,21 @@ struct CExoPackedFile
     uint16_t m_wDrives;
     uint32_t m_nFileSize;
     CExoFile * m_pExoFile;
-    CExoFile * m_pAsyncExoFile;
     int32_t m_nRefCount;
-    int32_t m_nAsyncRefCount;
     BOOL m_bLoaded;
-    BOOL m_bAsyncLoaded;
     BOOL m_bHeaderLoaded;
 
     CExoPackedFile();
     virtual ~CExoPackedFile();
     virtual void AddRefCount();
-    virtual void AddAsyncRefCount();
     virtual BOOL CloseFile();
-    virtual BOOL CloseAsyncFile();
     virtual void DeleteRefCount();
     virtual void DeleteAsyncRefCount();
     virtual CExoFile * GetFile();
-    virtual CExoFile * GetAsyncFile();
     virtual uint32_t GetResourceSize(RESID nID);
     virtual BOOL Initialize();
     virtual BOOL OpenFile();
     virtual BOOL OpenFile(uint8_t * pCipher);
-    virtual BOOL OpenAsyncFile();
     virtual uint32_t ReadResource(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
     virtual void ReadResourceAsync(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
     virtual BOOL LoadHeader(const char * expectOid, uint8_t nType = 0);

NWNXLib/API/API/CExoResFile.hpp

@@ -30,18 +30,13 @@ struct CExoResFile : CExoPackedFile
     CExoResFile();
     ~CExoResFile();
     virtual void AddRefCount();
-    virtual void AddAsyncRefCount();
     virtual BOOL CloseFile();
-    virtual BOOL CloseAsyncFile();
     virtual void DeleteRefCount();
-    virtual void DeleteAsyncRefCount();
     virtual uint32_t GetResourceSize(RESID nID);
     virtual BOOL Initialize();
     virtual BOOL OpenFile();
     virtual BOOL OpenFile(uint8_t * pCipher);
-    virtual BOOL OpenAsyncFile();
     virtual uint32_t ReadResource(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
-    virtual void ReadResourceAsync(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
     virtual BOOL LoadHeader(const char * expectOid, uint8_t nType = 0);
     virtual BOOL UnloadHeader();
 

NWNXLib/API/API/CExoResMan.hpp

@@ -35,10 +35,6 @@ struct CExoResMan
     int64_t m_nAvailableMemory;
     CExoArrayList<CExoKeyTable *> m_pKeyTables;
     CExoLinkedList<CRes> m_lstToBeFreed;
-    CExoLinkedList<CRes> m_lstAsyncResQueue;
-    CRes * m_pCurrentAsyncRes;
-    CExoFile * m_pAsyncFile;
-    BOOL m_bAsyncSuspended;
     uint32_t m_nTotalDemands;
     uint32_t m_nTotalCacheHits;
     uint32_t m_nTotalOldReleases;
@@ -76,10 +72,8 @@ struct CExoResMan
     BOOL RemoveFixedKeyTableFile(const CExoString & sName);
     BOOL RemoveResourceDirectory(const CExoString & sName);
     BOOL RemoveManifest(const Hash::SHA1 & sManifestHash);
-    void ResumeServicing();
     void SetResObject(const CResRef & cResRef, RESTYPE nType, CRes * pNewRes);
     BOOL SetTotalResourceMemory(int64_t totalAvailableMemory);
-    void SuspendServicing();
     void Update(uint32_t nTimeSlice);
     BOOL UpdateEncapsulatedResourceFile(const CExoString & sName);
     BOOL UpdateFixedKeyTableFile(const CExoString & sName);
@@ -88,19 +82,16 @@ struct CExoResMan
     RESTYPE GetResTypeFromFile(const CExoString & sName);
     void GetResRefFromFile(CResRef & cResRef, const CExoString & sName);
     BOOL GetKeyEntry(const CResRef & cResRef, RESTYPE nType, CExoKeyTable * * pNewTable, CKeyTableEntry * * pNewKey, bool bLogFailure = true);
-    int32_t CancelRequest(CRes * pRes);
     void * Demand(CRes * pRes);
     void Dump(CRes * pRes, BOOL bRemove = false);
     int32_t Release(CRes * pRes);
-    int32_t Request(CRes * pRes);
     BOOL ReadRaw(CRes * pRes, int32_t nSize, char * pBuffer);
     BOOL GetNewResRef(const CResRef & cResRef, RESTYPE nType, CResRef & cTarget);
     BOOL CreateDirectory(CExoString sDirectory);
     BOOL NukeDirectory(CExoString sDirectory, BOOL bDeleteAllFiles = false, BOOL bDeleteAllSubDirectories = false);
     BOOL CleanDirectory(CExoString sDirectory, BOOL bDeleteSubDirectories = false, BOOL bCleanSubDirectories = false, RESTYPE restype = 0xFFFF);
     BOOL RemoveFile(const CExoString & sFile, RESTYPE nResType);
     BOOL GetFreeDiskSpace(const CExoString & sDirectory, uint64_t * pSpaceAvailable);
-    BOOL ServiceCurrentAsyncRes();
     int32_t GetTableCount(CRes * pRes, BOOL bCountStatic);
     BOOL GetIsStaticType(RESTYPE nType);
     void RemoveFromToBeFreedList(CRes * pRes);
@@ -115,11 +106,11 @@ struct CExoResMan
     BOOL FreeChunk();
     CExoKeyTable * GetTable(CRes * pRes);
     BOOL Malloc(CRes * pRes);
-    BOOL ServiceFromDirectory(CRes * pRes, BOOL bAsync = false);
-    BOOL ServiceFromEncapsulated(CRes * pRes, BOOL bAsync = false);
-    BOOL ServiceFromResFile(CRes * pRes, BOOL bAsync = false);
-    BOOL ServiceFromImage(CRes * pRes, BOOL bAsync = false);
-    BOOL ServiceFromManifest(CRes * pRes, BOOL bAsync = false);
+    BOOL ServiceFromDirectory(CRes * pRes);
+    BOOL ServiceFromEncapsulated(CRes * pRes);
+    BOOL ServiceFromResFile(CRes * pRes);
+    BOOL ServiceFromImage(CRes * pRes);
+    BOOL ServiceFromManifest(CRes * pRes);
     BOOL UpdateKeyTable(const CExoString & sName, uint32_t nTableType);
     BOOL ServiceFromDirectoryRaw(CRes * pRes, int32_t nSize, char * pBuffer);
     BOOL ServiceFromEncapsulatedRaw(CRes * pRes, int32_t nSize, char * pBuffer);

NWNXLib/API/API/CExoResourceImageFile.hpp

@@ -24,18 +24,13 @@ struct CExoResourceImageFile : CExoPackedFile
     CExoResourceImageFile();
     ~CExoResourceImageFile();
     virtual void AddRefCount();
-    virtual void AddAsyncRefCount();
     virtual BOOL CloseFile();
-    virtual BOOL CloseAsyncFile();
     virtual void DeleteRefCount();
-    virtual void DeleteAsyncRefCount();
     virtual uint32_t GetResourceSize(RESID nID);
     virtual BOOL Initialize();
     virtual BOOL OpenFile();
     virtual BOOL OpenFile(uint8_t * pCipher);
-    virtual BOOL OpenAsyncFile();
     virtual uint32_t ReadResource(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
-    virtual void ReadResourceAsync(RESID nID, void * pData, uint32_t nSize, uint32_t nDataOffset);
     virtual BOOL LoadHeader(const char * expectOid, uint8_t nType = 0);
     virtual BOOL UnloadHeader();
     virtual void * GetResource(RESID nID);

NWNXLib/API/API/CGameEffect.hpp

@@ -41,6 +41,7 @@ struct CGameEffect
     BOOL m_bSkipOnLoad;
     uint64_t m_nItemPropertySourceId;
     CExoString m_sCustomTag;
+    BOOL m_bIgnoreImmunity;
 
     CGameEffect(BOOL bCreateNewID = true);
     CGameEffect(CGameEffect * pParent, BOOL bCopyIconVisibility = false);

NWNXLib/API/API/CLastUpdateObject.hpp

@@ -18,8 +18,10 @@ NWN_API_PROLOGUE(CLastUpdateObject)
 
 struct CLoopingVisualEffect;
 struct CNWSPlayerLUOQuickbarItemButton;
+struct ObjectVisualTransformData;
 
 
+typedef TextureReplaceInfo AnimationReplaceInfo;
 typedef int BOOL;
 typedef uint32_t OBJECT_ID;
 
@@ -89,8 +91,8 @@ struct CLastUpdateObject
     CExoString m_sSubRace;
     CExoString m_sDeity;
     uint8_t m_nGender;
-    uint8_t m_nClass[3];
-    uint8_t m_nLevel[3];
+    uint8_t m_nClass[8];
+    uint8_t m_nLevel[8];
     int16_t m_nAlignmentLawChaos;
     int16_t m_nAlignmentGoodEvil;
     BOOL m_bSelectableWhenDead;
@@ -108,17 +110,24 @@ struct CLastUpdateObject
     uint8_t m_nAbilityFinalINT;
     uint8_t m_nAbilityFinalWIS;
     uint8_t m_nAbilityFinalCHA;
-    ObjectVisualTransformData m_pObjectVisualTransformData;
+    ObjectVisualTransformData * m_pObjectVisualTransformData;
     CExoArrayList<MaterialShaderParam> m_lMaterialShaderParameters;
     CExoArrayList<TextureReplaceInfo> m_lTextureReplaceInfo;
+    CExoArrayList<AnimationReplaceInfo> m_lAnimationReplaceInfo;
     Vector m_vHiliteColor;
     int32_t m_nMouseCursor;
+    BOOL m_bUseable;
+    int32_t m_nUiDiscoveryMask;
+    int32_t m_nTextBubbleOverrideType;
+    CExoString m_sTextBubbleOverrideText;
     int32_t m_nUpdateDisplayNameSeq;
     int32_t m_nUpdateHiddenSeq;
     CNWSPlayerLUOQuickbarItemButton * m_pQuickbarButton;
 
     CLastUpdateObject();
     ~CLastUpdateObject();
+    const ObjectVisualTransformData & GetVisualTransformData();
+    void SetVisualTransformData(const ObjectVisualTransformData & data);
     void InitializeQuickbar();
 
 

NWNXLib/API/API/CNWArea.hpp

@@ -47,11 +47,13 @@ struct CNWArea
     uint32_t m_nMoonFogColor;
     uint8_t m_nMoonFogAmount;
     BOOL m_bMoonShadows;
+    Vector m_vMoonDirection;
     uint32_t m_nSunAmbientColor;
     uint32_t m_nSunDiffuseColor;
     uint32_t m_nSunFogColor;
     uint8_t m_nSunFogAmount;
     BOOL m_bSunShadows;
+    Vector m_vSunDirection;
     BOOL m_bUseDayNightCycle;
     BOOL m_bIsNight;
     uint8_t m_nSkyBox;

NWNXLib/API/API/CNWClass.hpp

@@ -19,6 +19,7 @@ typedef int BOOL;
 struct CNWClass
 {
     uint32_t m_nName;
+    uint32_t m_nShort;
     uint32_t m_nNameLower;
     uint32_t m_nNamePlural;
     uint32_t m_nDescription;
@@ -67,10 +68,12 @@ struct CNWClass
     uint8_t m_nArcSpellUsePerDayLevel;
     uint8_t m_nDivSpellUsePerDayLevel;
     uint8_t m_nEpicLevel;
+    BOOL m_bSkipSpellSelection;
 
     CNWClass();
     ~CNWClass();
     CExoString GetNameText();
+    CExoString GetShortNameText();
     CExoString GetNameLowerText();
     CExoString GetNamePluralText();
     CExoString GetDescriptionText();

NWNXLib/API/API/CNWRace.hpp

@@ -42,6 +42,7 @@ struct CNWRace
     int32_t m_nNormalFeatEveryNthLevel;
     int32_t m_nNumberNormalFeatsEveryNthLevel;
     int32_t m_nSkillPointModifierAbility;
+    uint16_t m_nFavoredEnemyFeat;
 
     CNWRace();
     ~CNWRace();