Fix muscle_fat

user-grinch · Jan 3, 2024 · 22c36db · 22c36db
1 parent 0ff411b
commit 22c36db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/features/weapon/bloodremap.cpp b/src/features/weapon/bloodremap.cpp
@@ -47,6 +47,23 @@ void BloodRemapFeature::Process(RwFrame* frame, CWeapon *pWeapon) {
 
         if (!data.m_Textures[name].m_bInit) {
             Initialize(frame, pWeapon);
+            CWeaponInfo* pWeaponInfo = CWeaponInfo::GetWeaponInfo(pWeapon->m_eWeaponType, FindPlayerPed()->GetWeaponSkill(pWeapon->m_eWeaponType));
+            if (!pWeaponInfo) return;
+
+            CWeaponModelInfo* pWeaponModelInfo = static_cast<CWeaponModelInfo*>(CModelInfo::GetModelInfo(pWeaponInfo->m_nModelId1));
+            if (!pWeaponModelInfo) return;
+
+            RpClumpForAllAtomics(pWeaponModelInfo->m_pRwClump, [](RpAtomic *atomic, void *data) {
+                if (atomic->geometry) {
+                    RpGeometryForAllMaterials(atomic->geometry, [](RpMaterial *material, void *data) {
+                        WepData *pData = reinterpret_cast<WepData*>(data);
+                        material->texture = pData->m_Textures[pData->m_CurNode].m_pFrames[0];
+                        return material;
+                    }, data);
+                }
+                return atomic;
+            }, &data);
+
             data.m_Textures[name].m_bInit = true;
         }
 

diff --git a/src/features/weapon/bodystate.cpp b/src/features/weapon/bodystate.cpp
@@ -64,7 +64,7 @@ void BodyStateFeature::ProcessZen(RwFrame* frame, CWeapon *pWeapon) {
          if (bodyState != data.prevBodyState) {
             Util::HideAllChilds(frame);
             if (isFat && isMuscle) {
-                Util::ShowChildWithName(frame, "fat_muscle");
+                Util::ShowChildWithName(frame, "muscle_fat");
             }
             else if (isFat) { 
                 Util::ShowChildWithName(frame, isPlus? "fat+" : "fat");