Area/Appearance: Use address of member function for function hooks.

Author: jhett12321

NWNXLib/API/API/CNWSArea.hpp

@@ -108,7 +108,7 @@ class CNWSArea : public CNWArea, public CResHelper<CResARE, 2012>, public CGameO
     ~CNWSArea();
     virtual CNWSArea * AsNWSArea();
     virtual CNWSArea * NWAreaAsNWSArea();
-    BOOL AddObjectToArea(OBJECT_ID id, BOOL bRunScripts = true);
+    NWNX_IMPORT BOOL AddObjectToArea(OBJECT_ID id, BOOL bRunScripts = true);
     BOOL AIUpdate();
     Vector ComputeAwayVector(Vector vCurrentPosition, Vector vPositionToMoveAwayFrom, float fMoveAwayRange, CPathfindInformation * pPathInfo);
     int32_t ComputeBestCorner(float fX1, float fY1, float fX2, float fY2, float fX3, float fY3, float fPersonalSpace, float fCreatureHeight, float * fNewX1, float * fNewY1, float * fNewX2, float * fNewY2);

NWNXLib/API/API/CNWSMessage.hpp

@@ -183,7 +183,7 @@ class CNWSMessage : public CNWMessage
     void ComputeGameObjectUpdateForYourselfToo(CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, OBJECT_ID oidObjectToUpdate);
     void ComputeGameObjectUpdateForYourself(CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, OBJECT_ID oidObjectToUpdate);
     CNWSPlayerLUOSortedObjectList * SortObjectsForGameObjectUpdate(CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, int32_t * nMembersInSortedList);
-    void ComputeGameObjectUpdateForObject(CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, OBJECT_ID oidObjectToUpdate);
+    NWNX_IMPORT void ComputeGameObjectUpdateForObject(CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, OBJECT_ID oidObjectToUpdate);
     BOOL ComputeGameObjectUpdateForCategory(uint32_t nCategory, uint32_t nMessageLimit, CNWSPlayer * pPlayer, CNWSObject * pPlayerGameObject, CGameObjectArray * pGameObjectArray, CNWSPlayerLUOSortedObjectList * pSortedList, int32_t nSortedListSize);
     void TestPartyObjectUpdateDifferences(CNWSPlayer * pPlayer, CNWSCreature * pPartyCreature, CLastUpdatePartyObject * * pLastUpdatePartyObject, uint32_t * nObjectUpdatesRequired);
     void StoreValuesInLastUpdatePartyObject(CNWSCreature * pPlayerCreature, CLastUpdatePartyObject * pLastUpdatePartyObject, CNWSCreature * pPartyCreature, uint32_t nObjectUpdatesRequired);

Plugins/Appearance/Appearance.cpp

@@ -70,7 +70,7 @@ static void SetIntValue(int32_t type, int32_t value, std::bitset<OverrideType_MA
 }
 
 static Hooks::Hook s_ComputeGameObjectUpdateForObjectHook =
-    Hooks::HookFunction(Functions::_ZN11CNWSMessage32ComputeGameObjectUpdateForObjectEP10CNWSPlayerP10CNWSObjectP16CGameObjectArrayj,
+    Hooks::HookFunction(&CNWSMessage::ComputeGameObjectUpdateForObject,
         +[](CNWSMessage *pMessage, CNWSPlayer *pPlayer, CNWSObject *pPlayerGameObject,
                    CGameObjectArray *pGameObjectArray, ObjectID oidObjectToUpdate)
         {

Plugins/Area/Area.cpp

@@ -1385,7 +1385,7 @@ NWNX_EXPORT ArgumentStack SetDefaultObjectUiDiscoveryMask(ArgumentStack&& args)
         }
     };
 
-    static Hooks::Hook pAddObjectToAreaHook = Hooks::HookFunction(Functions::_ZN8CNWSArea15AddObjectToAreaEji,
+    static Hooks::Hook pAddObjectToAreaHook = Hooks::HookFunction(&CNWSArea::AddObjectToArea,
     +[](CNWSArea *pThis, ObjectID id, BOOL bRunScripts) -> BOOL
     {
         auto retVal = pAddObjectToAreaHook->CallOriginal<BOOL>(pThis, id, bRunScripts);