Change new CNPC_BaseZombie customization vars to match actual data types

This commit is contained in:
ALLEN-PC\acj30 2025-01-09 12:50:19 -06:00
parent 0921f7409b
commit aa31835f36
2 changed files with 8 additions and 8 deletions

View File

@ -211,8 +211,8 @@ BEGIN_DATADESC( CNPC_BaseZombie )
DEFINE_FIELD( m_fIsTorso, FIELD_BOOLEAN ), DEFINE_FIELD( m_fIsTorso, FIELD_BOOLEAN ),
#ifdef MAPBASE #ifdef MAPBASE
DEFINE_KEYFIELD( m_fIsHeadless, FIELD_BOOLEAN, "Headless" ), DEFINE_KEYFIELD( m_fIsHeadless, FIELD_BOOLEAN, "Headless" ),
DEFINE_KEYFIELD( m_iMeleeReach, FIELD_INTEGER, "MeleeReach" ), DEFINE_KEYFIELD( m_flMeleeReach, FIELD_FLOAT, "MeleeReach" ),
DEFINE_KEYFIELD( m_iMaxPlayerDistToSwat, FIELD_INTEGER, "MaxPlayerDistToSwat" ), DEFINE_KEYFIELD( m_flMaxDistToSwat, FIELD_FLOAT, "MaxDistToSwat" ),
DEFINE_KEYFIELD( m_iMaxObjMassToSwat, FIELD_INTEGER, "MaxObjMassToSwat" ), DEFINE_KEYFIELD( m_iMaxObjMassToSwat, FIELD_INTEGER, "MaxObjMassToSwat" ),
#else #else
DEFINE_FIELD( m_fIsHeadless, FIELD_BOOLEAN ), DEFINE_FIELD( m_fIsHeadless, FIELD_BOOLEAN ),
@ -260,8 +260,8 @@ CNPC_BaseZombie::CNPC_BaseZombie()
m_iMoanSound = g_numZombies; m_iMoanSound = g_numZombies;
#ifdef MAPBASE #ifdef MAPBASE
m_iMeleeReach = ZOMBIE_MELEE_REACH; m_flMeleeReach = ZOMBIE_MELEE_REACH;
m_iMaxPlayerDistToSwat = ZOMBIE_PLAYER_MAX_SWAT_DIST; m_flMaxDistToSwat = ZOMBIE_PLAYER_MAX_SWAT_DIST;
m_iMaxObjMassToSwat = ZOMBIE_MAX_PHYSOBJ_MASS; m_iMaxObjMassToSwat = ZOMBIE_MAX_PHYSOBJ_MASS;
#endif #endif
@ -307,7 +307,7 @@ bool CNPC_BaseZombie::FindNearestPhysicsObject( int iMaxMass )
#ifndef MAPBASE #ifndef MAPBASE
if (dist > ZOMBIE_PLAYER_MAX_SWAT_DIST) if (dist > ZOMBIE_PLAYER_MAX_SWAT_DIST)
#else #else
if (dist > m_iMaxPlayerDistToSwat) if (dist > m_flMaxDistToSwat)
#endif #endif
{ {
// Player is too far away. Don't bother // Player is too far away. Don't bother

View File

@ -145,7 +145,7 @@ public:
virtual float GetClawAttackRange() const virtual float GetClawAttackRange() const
{ {
#ifdef MAPBASE #ifdef MAPBASE
return m_iMeleeReach; return m_flMeleeReach;
#else #else
return ZOMBIE_MELEE_REACH; return ZOMBIE_MELEE_REACH;
#endif #endif
@ -266,8 +266,8 @@ protected:
float m_flNextFlinch; float m_flNextFlinch;
#ifdef MAPBASE #ifdef MAPBASE
int m_iMeleeReach; float m_flMeleeReach;
int m_iMaxPlayerDistToSwat; float m_flMaxDistToSwat;
int m_iMaxObjMassToSwat; int m_iMaxObjMassToSwat;
#endif #endif