Skip to content

Commit 22c36db

Browse files
committed
Fix muscle_fat
1 parent 0ff411b commit 22c36db

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/features/weapon/bloodremap.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,23 @@ void BloodRemapFeature::Process(RwFrame* frame, CWeapon *pWeapon) {
4747

4848
if (!data.m_Textures[name].m_bInit) {
4949
Initialize(frame, pWeapon);
50+
CWeaponInfo* pWeaponInfo = CWeaponInfo::GetWeaponInfo(pWeapon->m_eWeaponType, FindPlayerPed()->GetWeaponSkill(pWeapon->m_eWeaponType));
51+
if (!pWeaponInfo) return;
52+
53+
CWeaponModelInfo* pWeaponModelInfo = static_cast<CWeaponModelInfo*>(CModelInfo::GetModelInfo(pWeaponInfo->m_nModelId1));
54+
if (!pWeaponModelInfo) return;
55+
56+
RpClumpForAllAtomics(pWeaponModelInfo->m_pRwClump, [](RpAtomic *atomic, void *data) {
57+
if (atomic->geometry) {
58+
RpGeometryForAllMaterials(atomic->geometry, [](RpMaterial *material, void *data) {
59+
WepData *pData = reinterpret_cast<WepData*>(data);
60+
material->texture = pData->m_Textures[pData->m_CurNode].m_pFrames[0];
61+
return material;
62+
}, data);
63+
}
64+
return atomic;
65+
}, &data);
66+
5067
data.m_Textures[name].m_bInit = true;
5168
}
5269

src/features/weapon/bodystate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void BodyStateFeature::ProcessZen(RwFrame* frame, CWeapon *pWeapon) {
6464
if (bodyState != data.prevBodyState) {
6565
Util::HideAllChilds(frame);
6666
if (isFat && isMuscle) {
67-
Util::ShowChildWithName(frame, "fat_muscle");
67+
Util::ShowChildWithName(frame, "muscle_fat");
6868
}
6969
else if (isFat) {
7070
Util::ShowChildWithName(frame, isPlus? "fat+" : "fat");

0 commit comments

Comments
 (0)