zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: iw5 weapon attachment and override loading

Browse Source
This commit is contained in:
Jan 2024-04-21 19:35:04 +02:00
parent 94aee91592
commit 6ca7d892f9
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ObjLoading/Game/IW5/AssetLoaders/AssetLoaderWeapon.cpp
View File

@ -237,6 +237,7 @@ namespace
} }
m_weapon->weapCompleteDef.animOverrides = animOverrides; m_weapon->weapCompleteDef.animOverrides = animOverrides;
m_weapon->weapCompleteDef.numAnimOverrides = valueArray.size();
return true; return true;
} }
@ -271,6 +272,7 @@ namespace
} }
m_weapon->weapCompleteDef.soundOverrides = soundOverrides; m_weapon->weapCompleteDef.soundOverrides = soundOverrides;
m_weapon->weapCompleteDef.numSoundOverrides = valueArray.size();
return true; return true;
} }
@ -308,6 +310,7 @@ namespace
} }
m_weapon->weapCompleteDef.fxOverrides = fxOverrides; m_weapon->weapCompleteDef.fxOverrides = fxOverrides;
m_weapon->weapCompleteDef.numFxOverrides = valueArray.size();
return true; return true;
} }
@ -341,6 +344,7 @@ namespace
} }
m_weapon->weapCompleteDef.reloadOverrides = reloadOverrides; m_weapon->weapCompleteDef.reloadOverrides = reloadOverrides;
m_weapon->weapCompleteDef.numReloadStateTimerOverrides = valueArray.size();
return true; return true;
} }
@ -396,6 +400,7 @@ namespace
m_weapon->weapCompleteDef.notetrackOverrides = m_weapon->weapCompleteDef.notetrackOverrides =
static_cast<NoteTrackToSoundEntry*>(m_memory->Alloc(sizeof(NoteTrackToSoundEntry) * overrideVector.size())); static_cast<NoteTrackToSoundEntry*>(m_memory->Alloc(sizeof(NoteTrackToSoundEntry) * overrideVector.size()));
memcpy(m_weapon->weapCompleteDef.notetrackOverrides, overrideVector.data(), sizeof(NoteTrackToSoundEntry) * overrideVector.size()); memcpy(m_weapon->weapCompleteDef.notetrackOverrides, overrideVector.data(), sizeof(NoteTrackToSoundEntry) * overrideVector.size());
m_weapon->weapCompleteDef.numNotetrackOverrides = overrideVector.size();
return true; return true;
} }
@ -411,7 +416,7 @@ namespace
const auto* scope = m_weapon->scopes[i]; const auto* scope = m_weapon->scopes[i];
if (scope && scope->szInternalName && value == scope->szInternalName) if (scope && scope->szInternalName && value == scope->szInternalName)
{ {
attachment.scope = static_cast<unsigned short>(i); attachment.scope = static_cast<unsigned short>(i + 1);
return true; return true;
} }
} }
@ -421,7 +426,7 @@ namespace
const auto* underBarrel = m_weapon->underBarrels[i]; const auto* underBarrel = m_weapon->underBarrels[i];
if (underBarrel && underBarrel->szInternalName && value == underBarrel->szInternalName) if (underBarrel && underBarrel->szInternalName && value == underBarrel->szInternalName)
{ {
attachment.underBarrel = static_cast<unsigned short>(i); attachment.underBarrel = static_cast<unsigned short>(i + 1);
return true; return true;
} }
} }
@ -672,6 +677,9 @@ namespace
weapon->weapCompleteDef.weapDef = &weapon->weapDef; weapon->weapCompleteDef.weapDef = &weapon->weapDef;
weapon->weapCompleteDef.hideTags = weapon->hideTags; weapon->weapCompleteDef.hideTags = weapon->hideTags;
weapon->weapCompleteDef.szXAnims = weapon->szXAnims; weapon->weapCompleteDef.szXAnims = weapon->szXAnims;
weapon->weapCompleteDef.scopes = weapon->scopes;
weapon->weapCompleteDef.underBarrels = weapon->underBarrels;
weapon->weapCompleteDef.others = weapon->others;
weapon->weapDef.gunXModel = weapon->gunXModel; weapon->weapDef.gunXModel = weapon->gunXModel;
weapon->weapDef.szXAnimsRightHanded = weapon->szXAnimsRightHanded; weapon->weapDef.szXAnimsRightHanded = weapon->szXAnimsRightHanded;
weapon->weapDef.szXAnimsLeftHanded = weapon->szXAnimsLeftHanded; weapon->weapDef.szXAnimsLeftHanded = weapon->szXAnimsLeftHanded;