diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-02-03 01:14:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 01:14:48 +0100 |
commit | b47a23ab794e3520c6ec9d1ee19d3f4e3153494c (patch) | |
tree | 411b4fcc6a353de7809816672bf4197785f314fc /src/weapons/WeaponInfo.cpp | |
parent | Merge pull request #1017 from IlDucci/master (diff) | |
parent | Use original animation names from VCS (diff) | |
download | re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.gz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.bz2 re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.lz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.xz re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.tar.zst re3-b47a23ab794e3520c6ec9d1ee19d3f4e3153494c.zip |
Diffstat (limited to 'src/weapons/WeaponInfo.cpp')
-rw-r--r-- | src/weapons/WeaponInfo.cpp | 6 |
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", |