diff --git a/src/Common/Game/IW5/IW5_Assets.h b/src/Common/Game/IW5/IW5_Assets.h index 08cc2db1..33a21ada 100644 --- a/src/Common/Game/IW5/IW5_Assets.h +++ b/src/Common/Game/IW5/IW5_Assets.h @@ -3941,7 +3941,7 @@ namespace IW5 SoundOverrideTypes soundType; }; - enum FXOverrideTypes : unsigned int + enum FxOverrideTypes : unsigned int { FXTYPE_NONE = 0x0, FXTYPE_VIEW_FLASH = 0x1, @@ -3952,13 +3952,13 @@ namespace IW5 FXTYPE_COUNT }; - struct FXOverrideEntry + struct FxOverrideEntry { WeaponAttachmentCombination attachment1; WeaponAttachmentCombination attachment2; - FxEffectDef* overrideFX; - FxEffectDef* altmodeFX; - FXOverrideTypes fxType; + FxEffectDef* overrideFx; + FxEffectDef* altmodeFx; + FxOverrideTypes fxType; }; struct ReloadStateTimerEntry @@ -3991,8 +3991,8 @@ namespace IW5 AnimOverrideEntry* animOverrides; unsigned int numSoundOverrides; SoundOverrideEntry* soundOverrides; - unsigned int numFXOverrides; - FXOverrideEntry* fxOverrides; + unsigned int numFxOverrides; + FxOverrideEntry* fxOverrides; unsigned int numReloadStateTimerOverrides; ReloadStateTimerEntry* reloadOverrides; unsigned int numNotetrackOverrides; diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp index ad16bdd4..d6b84ce4 100644 --- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp +++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp @@ -427,7 +427,7 @@ namespace IW5 std::stringstream ss; bool first = true; - for (auto i = 0u; i < m_weapon->weapCompleteDef.numFXOverrides; i++) + for (auto i = 0u; i < m_weapon->weapCompleteDef.numFxOverrides; i++) { const auto& fxOverride = m_weapon->weapCompleteDef.fxOverrides[i]; @@ -455,15 +455,15 @@ namespace IW5 if (fxOverride.fxType < FXTYPE_COUNT) ss << fxOverrideTypeNames[fxOverride.fxType] << ' '; - if (fxOverride.overrideFX && fxOverride.overrideFX->name && fxOverride.overrideFX->name[0]) - ss << fxOverride.overrideFX->name; + if (fxOverride.overrideFx && fxOverride.overrideFx->name && fxOverride.overrideFx->name[0]) + ss << fxOverride.overrideFx->name; else ss << "none"; ss << ' '; - if (fxOverride.altmodeFX && fxOverride.altmodeFX->name && fxOverride.altmodeFX->name[0]) - ss << fxOverride.altmodeFX->name; + if (fxOverride.altmodeFx && fxOverride.altmodeFx->name && fxOverride.altmodeFx->name[0]) + ss << fxOverride.altmodeFx->name; else ss << "none"; } diff --git a/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt b/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt index fef404d0..4e69504f 100644 --- a/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt +++ b/src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt @@ -25,7 +25,7 @@ set count animOverrides numAnimOverrides; set reusable soundOverrides; set count soundOverrides numSoundOverrides; set reusable fxOverrides; -set count fxOverrides numFXOverrides; +set count fxOverrides numFxOverrides; set reusable reloadOverrides; set count reloadOverrides numReloadStateTimerOverrides; set reusable notetrackOverrides;