diff --git a/source/D2Common/src/D2Collision.cpp b/source/D2Common/src/D2Collision.cpp index 314a8719d..1272ee1e4 100644 --- a/source/D2Common/src/D2Collision.cpp +++ b/source/D2Common/src/D2Collision.cpp @@ -861,6 +861,7 @@ void __fastcall COLLISION_SetCollisionMaskForBoundingBoxRecursively(D2ActiveRoom } //D2Common.0x6FD436F0 (#10130) +//1.14d: 0x0064EA90 void __stdcall COLLISION_SetMaskWithPattern(D2ActiveRoomStrc* pRoom, int nX, int nY, int nCollisionPattern, uint16_t nMask) { D2BoundingBoxStrc tBoundingBox = {}; @@ -1004,6 +1005,7 @@ void __fastcall COLLISION_ResetCollisionMaskForBoundingBoxRecursively(D2ActiveRo } //D2Common.0x6FD43E60 (#10126) +//1.14d: 0x0064EC10 void __stdcall COLLISION_ResetMaskWithPattern(D2ActiveRoomStrc* pRoom, int nX, int nY, int nCollisionPattern, uint16_t nMask) { D2BoundingBoxStrc pBoundingBox = {}; diff --git a/source/D2Common/src/Path/Path.cpp b/source/D2Common/src/Path/Path.cpp index 252d42a2d..33b0d147f 100644 --- a/source/D2Common/src/Path/Path.cpp +++ b/source/D2Common/src/Path/Path.cpp @@ -192,6 +192,7 @@ void __stdcall PATH_GetClientCoordsVelocity(D2UnitStrc* pUnit, int* pX, int* pY) } //D2Common.0x6FDA8320 (#10222) +//1.14d: 0x00649400 void __stdcall PATH_AddCollisionFootprintForUnit(D2UnitStrc* pUnit) { D2CoordStrc pCoords = {}; @@ -213,6 +214,7 @@ void __stdcall PATH_AddCollisionFootprintForUnit(D2UnitStrc* pUnit) } //D2Common.0x6FDA8450 (#10223) +//1.14d: 0x00649560 BOOL __stdcall PATH_RemoveCollisionFootprintForUnit(D2UnitStrc* pUnit, BOOL bForce) { D2CoordStrc pCoords = {}; @@ -350,6 +352,7 @@ uint8_t PATH_UpdateTargetUnit(D2PathInfoStrc* pPathInfo) //1.00: D2Common.0x10059110 (#10141) //1.10f: D2Common.0x6FDA8600 (#10142) //1.13c: D2Common.0x6FD86230 (#10334) +//1.14d: 0x00649970 int __stdcall D2Common_10142(D2DynamicPathStrc* pPath, D2UnitStrc* pUnit, int bAllowInTown) { @@ -648,6 +651,7 @@ int __stdcall PATH_GetCollisionPatternFromMonStats2Txt(int nMonsterId) } //D2Common.0x6FDA9250 (#11281) +//1.14d: 0x00648580 int __stdcall D2Common_11281_CollisionPatternFromSize(D2UnitStrc* pUnit, int nSize) { if (nSize < 0 && nSize >= COLLISION_UNIT_SIZE_COUNT) @@ -676,6 +680,7 @@ int __stdcall D2Common_11281_CollisionPatternFromSize(D2UnitStrc* pUnit, int nSi } //D2Common.0x6FDA92F0 (#10214) +//1.14d: 0x00649CA0 //TODO: Find a name void __stdcall D2Common_10214(D2UnitStrc* pUnit) { @@ -875,6 +880,7 @@ void __stdcall D2Common_10228(D2UnitStrc* pUnit) } //D2Common.0x6FDA9870 (#10143) +//1.14d: 0x00649F70 void __stdcall PATH_SetUnitDeadCollision(D2UnitStrc* pUnit, BOOL bForGameLogic) { D2_ASSERT(pUnit->pDynamicPath != nullptr); @@ -1320,6 +1326,7 @@ int __stdcall PATH_GetFootprintCollisionMask(D2DynamicPathStrc* pDynamicPath) } //D2Common.0x6FDA9FE0 (#10182) +//1.14d: 0x00648C30 void __stdcall PATH_SetFootprintCollisionMask(D2DynamicPathStrc* pDynamicPath, int nCollisionMask) { if (pDynamicPath->pRoom) diff --git a/source/D2Common/src/Path/PathMisc.cpp b/source/D2Common/src/Path/PathMisc.cpp index bc53d50f9..93fbf2dbb 100644 --- a/source/D2Common/src/Path/PathMisc.cpp +++ b/source/D2Common/src/Path/PathMisc.cpp @@ -1065,6 +1065,7 @@ void __fastcall PATH_ComputeVelocityAndDirectionVectorsToNextPoint(D2DynamicPath //1.10f: D2Common.0x6FDAC8F0 (#10236) //1.13c: D2Common.0x6FD5D820 (#10831) +//1.14d: 0x00650350 //TODO: Find a name int __stdcall D2Common_10236(D2UnitStrc* pUnit, int a2) { @@ -1154,6 +1155,7 @@ void sub_6FD5CEB0(D2DynamicPathStrc* pDynamicPath, int nBaseVelocity) //1.10f: Inlined //1.13c: D2Common.0x6FD5DB70 +//1.14d: 0x006503F0 BOOL sub_6FD5DB70(D2DynamicPathStrc* pDynamicPath) { if ((pDynamicPath->dwPathType == PATHTYPE_MON_CIRCLE_CW || pDynamicPath->dwPathType == PATHTYPE_MON_CIRCLE_CCW) @@ -1288,6 +1290,7 @@ BOOL __stdcall D2Common_10227(D2UnitStrc* pUnit) } //D2Common.0x6FDAD590 (#10229) +//1.14d: 0x00650BE0 BOOL __stdcall D2Common_10229(D2DynamicPathStrc *pDynamicPath, D2UnitStrc *pUnit, D2ActiveRoomStrc *pDestRoom, uint32_t nDestX, uint32_t nDestY) { D2PathPointStrc tCoords = { uint16_t(nDestX), uint16_t(nDestY) }; diff --git a/source/D2Common/src/Path/PathUtil.cpp b/source/D2Common/src/Path/PathUtil.cpp index 4b38be0b6..1d1c36416 100644 --- a/source/D2Common/src/Path/PathUtil.cpp +++ b/source/D2Common/src/Path/PathUtil.cpp @@ -20,6 +20,7 @@ void __fastcall PATHUtil_AdvanceTowardsTarget_6FDAB890(D2DynamicPathStrc* ptPath //1.10f: D2Common.0x6FDAB940 //1.13c: D2Common.0x6FD8E310 +//1.14d: 0x00679250 void __fastcall sub_6FDAB940(D2PathPointStrc* pOutPathPoint, D2DynamicPathStrc* ptPath) { D2_ASSERT(ptPath); diff --git a/source/D2Common/src/Path/Step.cpp b/source/D2Common/src/Path/Step.cpp index 2cef67e8f..eab5113fa 100644 --- a/source/D2Common/src/Path/Step.cpp +++ b/source/D2Common/src/Path/Step.cpp @@ -848,6 +848,7 @@ BOOL __stdcall D2Common_10234(D2DynamicPathStrc* pDynamicPath) //1.00: D2Common.0x10060C60 (#10231) //1.10f: D2Common.0x6FDAE520 (#10235) +//1.14d: 0x006505E0 void __stdcall D2Common_10235_PATH_UpdateRiderPath(D2UnitStrc* pRiderUnit, D2UnitStrc* pMountUnit) { D2_ASSERT(pRiderUnit); // Named hRiderUnit in original game diff --git a/source/D2Common/src/Units/Units.cpp b/source/D2Common/src/Units/Units.cpp index d1346b73a..e47afad42 100644 --- a/source/D2Common/src/Units/Units.cpp +++ b/source/D2Common/src/Units/Units.cpp @@ -1050,6 +1050,7 @@ void __stdcall UNITS_SetAnimationFrame(D2UnitStrc* pUnit, int nFrame) } //D2Common.0x6FDBEE60 (#10373) +//1.14d: 0x00623E00 void __stdcall UNITS_StopSequence(D2UnitStrc* pUnit) { pUnit->nActionFrame = 0; @@ -1701,6 +1702,7 @@ __forceinline void __fastcall UNITS_UpdateRunWalkAnimRateAndVelocity(D2UnitStrc* //1.10f: D2Common.0x6FDBF050 (#10376) //1.13c: D2Common.0x6FD83110 (#10819) +//1.14d: 0x00623F50 void __stdcall UNITS_UpdateAnimRateAndVelocity(D2UnitStrc* pUnit, const char* szFile, int nLine) { if (!pUnit) @@ -1763,6 +1765,7 @@ void __stdcall UNITS_SetAnimationSpeed(D2UnitStrc* pUnit, int nSpeed) } //D2Common.0x6FDBF910 (#10378) +//1.14d: 0x006217C0 int __stdcall UNITS_IsAtEndOfFrameCycle(D2UnitStrc* pUnit) { D2_ASSERT(pUnit); diff --git a/source/D2Game/src/AI/AiThink.cpp b/source/D2Game/src/AI/AiThink.cpp index 41744b292..0f10a139d 100644 --- a/source/D2Game/src/AI/AiThink.cpp +++ b/source/D2Game/src/AI/AiThink.cpp @@ -9749,6 +9749,7 @@ enum D2C_HireableAIParams }; //D2Game.0x6FCE4610 +//1.14d: 0x005E5050 void __fastcall sub_6FCE4610(D2GameStrc* pGame, D2UnitStrc* pUnit, int32_t nClassId, D2UnitStrc* pOwner, D2UnitStrc* pTarget, D2SeedStrc* pSeed, D2AiTickParamStrc* pAiTickParam) { uint32_t nChance = 0; diff --git a/source/D2Game/src/GAME/Event.cpp b/source/D2Game/src/GAME/Event.cpp index 76f5d302d..b45499082 100644 --- a/source/D2Game/src/GAME/Event.cpp +++ b/source/D2Game/src/GAME/Event.cpp @@ -23,6 +23,7 @@ __forceinline int32_t EVENT_MapUnitTypeToIndex(int32_t nUnitType) //D2Game.0x6FC34840 +//1.14d: 0x00540E60 void __fastcall D2GAME_EVENTS_Delete_6FC34840(D2GameStrc* pGame, D2UnitStrc* pUnit, D2C_EventTypes nEventType, int32_t nEventCustomId) { D2EventTimerStrc* pEventTimer = SUNIT_GetTimerFromUnit(pUnit); @@ -176,6 +177,7 @@ void __fastcall EVENT_AllocEventQueue(D2GameStrc* pGame) } //D2Game.0x6FC34BD0 +//1.14d: 0x005414D0 void __fastcall EVENT_IterateEvents(D2GameStrc* pGame) { D2EventTimerQueueStrc* pTimerQueue = pGame->pTimerQueue; @@ -269,6 +271,7 @@ void __fastcall EVENT_ExecutePlayerEvents(D2GameStrc* pGame, D2EventTimerQueueSt } //D2Game.0x6FC34DB0 +//1.14d: 0x00541060 void __fastcall EVENT_ExecuteMonsterEvents(D2GameStrc* pGame, D2EventTimerQueueStrc* pTimerQueue, D2EventTimerStrc* pEventTimer, int32_t a4) { EVENT_ExecuteEventsImpl(MONSTERMODE_EventHandler, pGame, pTimerQueue, pEventTimer, a4); @@ -334,6 +337,7 @@ void __fastcall EVENT_SetEvent(D2GameStrc* pGame, D2UnitStrc* pUnit, D2C_EventTy } //D2Game.0x6FC351D0 +//1.14d: 0x005416B0 void __fastcall D2GAME_InitTimer_6FC351D0(D2GameStrc* pGame, D2UnitStrc* pUnit, D2C_EventTypes nEventType, int32_t nExpireFrame, EventTimerCallback pfCallBack, int32_t dwEventCustomId, int32_t dwEventCustomParam) { // TODO: v19 @@ -503,6 +507,7 @@ D2EventTimerStrc* __fastcall EVENT_AllocateUnitTimer(D2GameStrc* pGame, D2UnitSt } //D2Game.0x6FC35570 +//1.14d: 0x00541650 void __fastcall sub_6FC35570(D2GameStrc* pGame, D2UnitStrc* pUnit, D2C_EventTypes nEventType, int32_t dwEventCustomId, int32_t dwEventCustomParam) { if (nEventType >= EVENTTYPE_COUNT) diff --git a/source/D2Game/src/MONSTER/MonsterMode.cpp b/source/D2Game/src/MONSTER/MonsterMode.cpp index 74bc852e0..00ac26da1 100644 --- a/source/D2Game/src/MONSTER/MonsterMode.cpp +++ b/source/D2Game/src/MONSTER/MonsterMode.cpp @@ -685,6 +685,7 @@ D2MonStatsTxt* __fastcall MONSTERMODE_GetMonStatsTxtRecord(int32_t nMonsterId) } //D2Game.0x6FC63680 +//1.14d: 0x005A8030 void __fastcall sub_6FC63680(D2GameStrc* pGame, D2UnitStrc* pUnit) { if (!pUnit || pUnit->dwUnitType != UNIT_MONSTER) @@ -1157,6 +1158,7 @@ int32_t __fastcall sub_6FC64450(D2GameStrc* pGame, D2ModeChangeStrc* pModeChange } //D2Game.0x6FC64480 +//1.14d: 0x005A8490 int32_t __fastcall sub_6FC64480(D2GameStrc* pGame, D2UnitStrc* pUnit) { if (STATES_CheckState(pUnit, STATE_BLAZE)) @@ -1191,6 +1193,7 @@ int32_t __fastcall sub_6FC644E0(D2GameStrc* pGame, D2ModeChangeStrc* pModeChange } //D2Game.0x6FC64510 +//1.14d: 0x005A84F0 int32_t __fastcall sub_6FC64510(D2GameStrc* pGame, D2UnitStrc* pUnit) { if (sub_6FCBC930(pGame, pUnit) == 2) @@ -1583,6 +1586,7 @@ int32_t __fastcall sub_6FC64E60(D2GameStrc* pGame, D2ModeChangeStrc* pModeChange } //D2Game.0x6FC64E90 +//1.14d: 0x005A8670 int32_t __fastcall sub_6FC64E90(D2GameStrc* pGame, D2UnitStrc* pUnit) { if (UNITS_IsAtEndOfFrameCycle(pUnit)) @@ -1698,6 +1702,7 @@ const D2MonModeCallbackTableStrc* __fastcall MONSTERMODE_GetCallbackTableRecord( } //D2Game.0x6FC65080 +//1.14d: 0x005A7BA0 void __fastcall D2GAME_MONSTERS_AiFunction01_6FC65080(D2GameStrc* pGame, D2UnitStrc* pUnit, int32_t a3, int32_t a4) { int32_t nAnimMode = 0; @@ -1727,6 +1732,7 @@ void __fastcall D2GAME_MONSTERS_AiFunction01_6FC65080(D2GameStrc* pGame, D2UnitS } //D2Game.0x6FC65150 +//1.14d: 0x005A7BE0 void __fastcall D2GAME_MONSTERS_AiFunction02_6FC65150(D2GameStrc* pGame, D2UnitStrc* pUnit, int32_t a3, int32_t a4) { int32_t nAnimMode = 0; diff --git a/source/D2Game/src/MONSTER/MonsterRegion.cpp b/source/D2Game/src/MONSTER/MonsterRegion.cpp index f54565343..720acfbb5 100644 --- a/source/D2Game/src/MONSTER/MonsterRegion.cpp +++ b/source/D2Game/src/MONSTER/MonsterRegion.cpp @@ -26,6 +26,7 @@ //D2Game.0x6FC66260 +//1.14d: 0x0054DC40 int32_t __fastcall sub_6FC66260(D2GameStrc* pGame, D2ActiveRoomStrc* pRoom, D2RoomCoordListStrc* pRoomCoordList, int32_t nSuperUniqueId, int32_t* pX, int32_t* pY, int32_t a7) { int32_t nLeft = 0; diff --git a/source/D2Game/src/UNIT/SUnit.cpp b/source/D2Game/src/UNIT/SUnit.cpp index 0a4610ed5..3de528eae 100644 --- a/source/D2Game/src/UNIT/SUnit.cpp +++ b/source/D2Game/src/UNIT/SUnit.cpp @@ -1310,6 +1310,7 @@ D2UnitStrc* __stdcall SUNIT_GetTargetUnit(D2GameStrc* pGame, D2UnitStrc* pUnit) } //D2Game.0x6FCBC930 +//1.14d: 0x00554CA0 int32_t __fastcall sub_6FCBC930(D2GameStrc* pGame, D2UnitStrc* pMissile) { D2_ASSERT(pGame); @@ -1693,6 +1694,7 @@ void __fastcall sub_6FCBD120(D2GameStrc* pGame, D2UnitStrc* pUnit, int32_t a3) } //D2Game.0x6FCBD260 +//1.14d: 0x00553DC0 void __fastcall D2GAME_SKILLS_RewindSkillEx_6FCBD260(D2GameStrc* pGame, D2UnitStrc* pUnit, int32_t a3) { D2GAME_EVENTS_Delete_6FC34840(pGame, pUnit, EVENTTYPE_MODECHANGE, 0); @@ -1759,6 +1761,7 @@ void __fastcall D2GAME_SKILLS_RewindSkillEx_6FCBD260(D2GameStrc* pGame, D2UnitSt } //D2Game.0x6FCBD3A0 +//1.14d: 0x00553F00 void __fastcall sub_6FCBD3A0(D2GameStrc* pGame, D2UnitStrc* pUnit) { D2GAME_EVENTS_Delete_6FC34840(pGame, pUnit, EVENTTYPE_MODECHANGE, 0);