MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-05 10:10:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

m_iMeleeReach now defaults to 55

Browse Source
This commit is contained in:
Wikot235 2025-01-05 16:13:16 +01:00
parent a736b0f96a
commit 959af0b130
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sp/src/game/server/hl2/npc_BaseZombie.cpp
View File

@ -211,7 +211,7 @@ 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_flMeleeReach, FIELD_FLOAT, "MeleeReach" ), DEFINE_KEYFIELD( m_iMeleeReach, FIELD_INTEGER, "MeleeReach" ),
#else #else
DEFINE_FIELD( m_fIsHeadless, FIELD_BOOLEAN ), DEFINE_FIELD( m_fIsHeadless, FIELD_BOOLEAN ),
#endif #endif
@ -257,6 +257,10 @@ CNPC_BaseZombie::CNPC_BaseZombie()
// moan loop. // moan loop.
m_iMoanSound = g_numZombies; m_iMoanSound = g_numZombies;
#ifdef MAPBASE
m_iMeleeReach = 55;
#endif
g_numZombies++; g_numZombies++;
} }

21
sp/src/game/server/hl2/npc_BaseZombie.h
View File

@ -20,6 +20,10 @@
#define ENVELOPE_CONTROLLER (CSoundEnvelopeController::GetController()) #define ENVELOPE_CONTROLLER (CSoundEnvelopeController::GetController())
#ifndef MAPBASE
#define ZOMBIE_MELEE_REACH 55
#endif
extern int AE_ZOMBIE_ATTACK_RIGHT; extern int AE_ZOMBIE_ATTACK_RIGHT;
extern int AE_ZOMBIE_ATTACK_LEFT; extern int AE_ZOMBIE_ATTACK_LEFT;
extern int AE_ZOMBIE_ATTACK_BOTH; extern int AE_ZOMBIE_ATTACK_BOTH;
@ -42,8 +46,8 @@ extern int AE_ZOMBIE_POUND;
#define ZOMBIE_BLOOD_BITE 3 #define ZOMBIE_BLOOD_BITE 3
#ifdef MAPBASE #ifdef MAPBASE
#define SF_ZOMBIE_NO_TORSO ( 1 << 15 ) #define SF_ZOMBIE_NO_TORSO ( 1 << 15 )
#define SF_ZOMBIE_NO_HEADCRAB_SPAWN ( 1 << 16 ) #define SF_ZOMBIE_NO_HEADCRAB_SPAWN ( 1 << 16 )
#endif #endif
@ -140,7 +144,14 @@ public:
} }
int MeleeAttack1Conditions ( float flDot, float flDist ); int MeleeAttack1Conditions ( float flDot, float flDist );
virtual float GetClawAttackRange() const { return m_flMeleeReach; } virtual float GetClawAttackRange() const
{
#ifdef MAPBASE
return m_iMeleeReach;
#else
return ZOMBIE_MELEE_REACH;
#endif
}
// No range attacks // No range attacks
int RangeAttack1Conditions ( float flDot, float flDist ) { return( 0 ); } int RangeAttack1Conditions ( float flDot, float flDist ) { return( 0 ); }
@ -256,7 +267,9 @@ protected:
float m_flNextFlinch; float m_flNextFlinch;
float m_flMeleeReach; #ifdef MAPBASE
int m_iMeleeReach;
#endif
bool m_bHeadShot; // Used to determine the survival of our crab beyond our death. bool m_bHeadShot; // Used to determine the survival of our crab beyond our death.