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

chore: rename fx related override structs in iw5

Browse Source
This commit is contained in:
Jan 2024-04-21 18:42:32 +02:00
parent d3c0325fea
commit 49239f2007
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Common/Game/IW5/IW5_Assets.h
View File

@ -3941,7 +3941,7 @@ namespace IW5
SoundOverrideTypes soundType; SoundOverrideTypes soundType;
}; };
enum FXOverrideTypes : unsigned int enum FxOverrideTypes : unsigned int
{ {
FXTYPE_NONE = 0x0, FXTYPE_NONE = 0x0,
FXTYPE_VIEW_FLASH = 0x1, FXTYPE_VIEW_FLASH = 0x1,
@ -3952,13 +3952,13 @@ namespace IW5
FXTYPE_COUNT FXTYPE_COUNT
}; };
struct FXOverrideEntry struct FxOverrideEntry
{ {
WeaponAttachmentCombination attachment1; WeaponAttachmentCombination attachment1;
WeaponAttachmentCombination attachment2; WeaponAttachmentCombination attachment2;
FxEffectDef* overrideFX; FxEffectDef* overrideFx;
FxEffectDef* altmodeFX; FxEffectDef* altmodeFx;
FXOverrideTypes fxType; FxOverrideTypes fxType;
}; };
struct ReloadStateTimerEntry struct ReloadStateTimerEntry
@ -3991,8 +3991,8 @@ namespace IW5
AnimOverrideEntry* animOverrides; AnimOverrideEntry* animOverrides;
unsigned int numSoundOverrides; unsigned int numSoundOverrides;
SoundOverrideEntry* soundOverrides; SoundOverrideEntry* soundOverrides;
unsigned int numFXOverrides; unsigned int numFxOverrides;
FXOverrideEntry* fxOverrides; FxOverrideEntry* fxOverrides;
unsigned int numReloadStateTimerOverrides; unsigned int numReloadStateTimerOverrides;
ReloadStateTimerEntry* reloadOverrides; ReloadStateTimerEntry* reloadOverrides;
unsigned int numNotetrackOverrides; unsigned int numNotetrackOverrides;

10
src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperWeapon.cpp
View File

@ -427,7 +427,7 @@ namespace IW5
std::stringstream ss; std::stringstream ss;
bool first = true; 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]; const auto& fxOverride = m_weapon->weapCompleteDef.fxOverrides[i];
@ -455,15 +455,15 @@ namespace IW5
if (fxOverride.fxType < FXTYPE_COUNT) if (fxOverride.fxType < FXTYPE_COUNT)
ss << fxOverrideTypeNames[fxOverride.fxType] << ' '; ss << fxOverrideTypeNames[fxOverride.fxType] << ' ';
if (fxOverride.overrideFX && fxOverride.overrideFX->name && fxOverride.overrideFX->name[0]) if (fxOverride.overrideFx && fxOverride.overrideFx->name && fxOverride.overrideFx->name[0])
ss << fxOverride.overrideFX->name; ss << fxOverride.overrideFx->name;
else else
ss << "none"; ss << "none";
ss << ' '; ss << ' ';
if (fxOverride.altmodeFX && fxOverride.altmodeFX->name && fxOverride.altmodeFX->name[0]) if (fxOverride.altmodeFx && fxOverride.altmodeFx->name && fxOverride.altmodeFx->name[0])
ss << fxOverride.altmodeFX->name; ss << fxOverride.altmodeFx->name;
else else
ss << "none"; ss << "none";
} }

2
src/ZoneCode/Game/IW5/XAssets/WeaponCompleteDef.txt
View File

@ -25,7 +25,7 @@ set count animOverrides numAnimOverrides;
set reusable soundOverrides; set reusable soundOverrides;
set count soundOverrides numSoundOverrides; set count soundOverrides numSoundOverrides;
set reusable fxOverrides; set reusable fxOverrides;
set count fxOverrides numFXOverrides; set count fxOverrides numFxOverrides;
set reusable reloadOverrides; set reusable reloadOverrides;
set count reloadOverrides numReloadStateTimerOverrides; set count reloadOverrides numReloadStateTimerOverrides;
set reusable notetrackOverrides; set reusable notetrackOverrides;