summaryrefslogtreecommitdiffstats
path: root/src/weapons/WeaponInfo.cpp
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-02-03 13:12:24 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2021-02-03 13:12:24 +0100
commitf5415200404546400933582bd7d827f46fd5ae23 (patch)
treed6580693c2d3a5a25819c80d274098d256b388d4 /src/weapons/WeaponInfo.cpp
parentOAL Loops, fixes (diff)
parentMerge pull request #1020 from erorcun/master (diff)
downloadre3-f5415200404546400933582bd7d827f46fd5ae23.tar
re3-f5415200404546400933582bd7d827f46fd5ae23.tar.gz
re3-f5415200404546400933582bd7d827f46fd5ae23.tar.bz2
re3-f5415200404546400933582bd7d827f46fd5ae23.tar.lz
re3-f5415200404546400933582bd7d827f46fd5ae23.tar.xz
re3-f5415200404546400933582bd7d827f46fd5ae23.tar.zst
re3-f5415200404546400933582bd7d827f46fd5ae23.zip
Diffstat (limited to 'src/weapons/WeaponInfo.cpp')
-rw-r--r--src/weapons/WeaponInfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp
index 10737acb..ba872454 100644
--- a/src/weapons/WeaponInfo.cpp
+++ b/src/weapons/WeaponInfo.cpp
@@ -37,8 +37,8 @@ CWeaponInfo::Initialise(void)
debug("Initialising CWeaponInfo...\n");
for (int i = 0; i < WEAPONTYPE_TOTALWEAPONS; i++) {
aWeaponInfo[i].m_eWeaponFire = WEAPON_FIRE_INSTANT_HIT;
- aWeaponInfo[i].m_AnimToPlay = ANIM_PUNCH_R;
- aWeaponInfo[i].m_Anim2ToPlay = NUM_ANIMS;
+ aWeaponInfo[i].m_AnimToPlay = ANIM_STD_PUNCH;
+ aWeaponInfo[i].m_Anim2ToPlay = ANIM_STD_NUM;
aWeaponInfo[i].m_Flags = WEAPONFLAG_USE_GRAVITY | WEAPONFLAG_SLOWS_DOWN | WEAPONFLAG_RAND_SPEED | WEAPONFLAG_EXPANDS | WEAPONFLAG_EXPLODES;
}
debug("Loading weapon data...\n");
@@ -96,7 +96,7 @@ CWeaponInfo::LoadWeaponData(void)
fireType[0] = '\0';
fireOffsetY = 0.0f;
fireOffsetZ = 0.0f;
- animId = ANIM_WALK;
+ animId = ANIM_STD_WALK;
sscanf(
&line[lp],
"%s %s %f %d %d %d %d %f %f %f %f %f %f %f %s %s %f %f %f %f %d %d",