Merge branch 'master' into master

gta-reversed · Aug 6, 2023 · 393c439 · 393c439
2 parents 27c07d2 + a5b7040
commit 393c439
Show file tree

Hide file tree

Showing 12 changed files with 259 additions and 260 deletions.
diff --git a/source/InjectHooksMain.cpp b/source/InjectHooksMain.cpp
@@ -441,7 +441,6 @@ void InjectHooksMain() {
     CPedAttractorPedPlacer::InjectHooks();
     BoneNode_c::InjectHooks();
     BoneNodeManager_c::InjectHooks();
-    CAnimBlendClumpData::InjectHooks();
     IKChainManager_c::InjectHooks();
     IKChain_c::InjectHooks();
     CCheckpoint::InjectHooks();
@@ -1222,6 +1221,7 @@ void InjectHooksMain() {
         CAnimManager::InjectHooks();
     };
 
+    Animation();
     App();
     Audio();
     Tasks();

diff --git a/source/game_sa/Animation/AnimAssocDefinitions.cpp b/source/game_sa/Animation/AnimAssocDefinitions.cpp
@@ -6,7 +6,7 @@
 
 //             animsCount,   anims
 #define awc(a) std::size(a), a
-std::array<AnimAssocDefinition, NUM_ANIM_ASSOC_GROUPS> CAnimManager::ms_aAnimAssocDefinitionsX = std::to_array<AnimAssocDefinition>({ // 0x8AA5A8
+std::array<AnimAssocDefinition, NUM_ANIM_ASSOC_GROUPS> CAnimManager::ms_aAnimAssocDefinitionsX{{ // 0x8AA5A8
     { "default",            "ped",           MODEL_MALE01,  awc(aStdAnimations),                aStdAnimDescs          },
     { "door",               "ped",           MODEL_INVALID, awc(aDoorAnimations),               aDoorDescs             },
     { "bikes",              "bikes",         MODEL_MALE01,  awc(aBikesAnimations),              aBikesDescs            },
@@ -125,5 +125,5 @@ std::array<AnimAssocDefinition, NUM_ANIM_ASSOC_GROUPS> CAnimManager::ms_aAnimAss
     { "harrplaneanims",     "rustler",       MODEL_MALE01,  awc(aHarrPlaneAnimations),          aCarAnimDescs1         },
     { "stdcarupright",      "ped",           MODEL_MALE01,  awc(aStdCarAnimations),             aCarAnimDescs2         },
     { "nvadaplaneanims",    "nevada",        MODEL_MALE01,  awc(aNevadaPlaneAnimations),        aCarAnimDescs1         }
-});
+}};
 #undef awc
diff --git a/source/game_sa/Animation/AnimBlendHierarchy.cpp b/source/game_sa/Animation/AnimBlendHierarchy.cpp
@@ -28,7 +28,7 @@ void CAnimBlendHierarchy::InjectHooks() {
 CAnimBlendHierarchy::CAnimBlendHierarchy() {
     m_pSequences = nullptr;
     m_nSeqCount = 0;
-    m_bRunningCompressed = false;
+    m_bIsCompressed = false;
     m_bKeepCompressed = false;
     m_nAnimBlockId = -1;
     m_fTotalTime = 0.0f;
@@ -44,7 +44,7 @@ CAnimBlendHierarchy::~CAnimBlendHierarchy() {
 // 0x4CF980
 void CAnimBlendHierarchy::Shutdown() {
     RemoveAnimSequences();
-    m_bRunningCompressed = false;
+    m_bIsCompressed = false;
 }
 
 // 0x4CF8E0
@@ -156,7 +156,7 @@ void CAnimBlendHierarchy::Uncompress() {
         CMemoryMgr::Free(oldFrameData);
     }
 
-    m_bRunningCompressed = false;
+    m_bIsCompressed = false;
     if (m_fTotalTime == 0.0f) {
         RemoveQuaternionFlips();
         CalcTotalTime();
@@ -194,7 +194,7 @@ void CAnimBlendHierarchy::RemoveUncompressedData() {
         CMemoryMgr::Free(oldFrameData);
     }
 
-    m_bRunningCompressed = true;
+    m_bIsCompressed = true;
 }
 
 // 0x4CF800

diff --git a/source/game_sa/Animation/AnimBlendHierarchy.h b/source/game_sa/Animation/AnimBlendHierarchy.h
@@ -13,7 +13,7 @@ class CAnimBlendHierarchy {
     uint32              m_hashKey;
     CAnimBlendSequence* m_pSequences;
     uint16              m_nSeqCount;
-    bool                m_bRunningCompressed;
+    bool                m_bIsCompressed;
     bool                m_bKeepCompressed;
     int32               m_nAnimBlockId;
     float               m_fTotalTime;