forked from valve/halflife-sdk
Fixup write-strings on weapons code
This commit is contained in:
Alibek Omarov
parent
61f94cfd11
commit
137f3923ca
8 changed files with 112 additions and 112 deletions
|
|
@ -253,8 +253,8 @@ public:
|
|||
|
||||
virtual BOOL UseDecrement( void );
|
||||
|
||||
virtual char *szGetDeathNoticeString(){ return ""; }; // The death message to send to clients
|
||||
virtual float flGetTiltedDamage(){ return 0; }; // The weapon returns its own damage based on several variables, including state code
|
||||
virtual const char *szGetDeathNoticeString(){ return ""; } // The death message to send to clients
|
||||
virtual float flGetTiltedDamage(){ return 0; } // The weapon returns its own damage based on several variables, including state code
|
||||
virtual int iGetWeight(); // How heavy is this weapon?
|
||||
|
||||
// Replication of member variables, if needed
|
||||
|
|
@ -328,10 +328,10 @@ public:
|
|||
int m_iState; // Whip, Aim, or Shoot?
|
||||
int m_iOldState;
|
||||
|
||||
virtual char *GetAnimPlayer(){return ""; } // Used so the player knows what weapon animation to play.
|
||||
virtual char *GetModelV() { return ""; }
|
||||
virtual char *GetModelP() { return ""; }
|
||||
virtual char *GetModelW() { return ""; }
|
||||
virtual const char *GetAnimPlayer(){return ""; } // Used so the player knows what weapon animation to play.
|
||||
virtual const char *GetModelV() { return ""; }
|
||||
virtual const char *GetModelP() { return ""; }
|
||||
virtual const char *GetModelW() { return ""; }
|
||||
private:
|
||||
// hacks to handle aim mode (animations)
|
||||
BOOL m_bAimReload;
|
||||
|
|
@ -345,21 +345,21 @@ public:
|
|||
int iItemSlot( void ){ return 1; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void AttachToPlayer( CBasePlayer *pPlayer );
|
||||
|
||||
char *GetAnimPlayer(){ return "onehanded"; }
|
||||
char *GetModelV(){ return "models/v_beretta.mdl"; }
|
||||
char *GetModelP(){ return "models/p_beretta.mdl"; }
|
||||
char *GetModelW(){ return "models/w_beretta.mdl"; }
|
||||
const char *GetAnimPlayer(){ return "onehanded"; }
|
||||
const char *GetModelV(){ return "models/v_beretta.mdl"; }
|
||||
const char *GetModelP(){ return "models/p_beretta.mdl"; }
|
||||
const char *GetModelW(){ return "models/w_beretta.mdl"; }
|
||||
|
||||
char *GetSoundEmpty(){ return "weapons/beretta_fire_empty.wav"; }
|
||||
char *GetSoundReload1(){ return "weapons/beretta_reload1.wav"; }
|
||||
char *GetSoundReload2(){ return "weapons/beretta_reload2.wav"; }
|
||||
char *GetSoundReloadNotEmpty(){ return "weapons/beretta_reload_not_empty.wav"; }
|
||||
char *GetSoundDraw1(){ return "weapons/beretta_draw.wav"; }
|
||||
char *GetSoundDraw2(){ return GetSoundDraw1(); }
|
||||
const char *GetSoundEmpty(){ return "weapons/beretta_fire_empty.wav"; }
|
||||
const char *GetSoundReload1(){ return "weapons/beretta_reload1.wav"; }
|
||||
const char *GetSoundReload2(){ return "weapons/beretta_reload2.wav"; }
|
||||
const char *GetSoundReloadNotEmpty(){ return "weapons/beretta_reload_not_empty.wav"; }
|
||||
const char *GetSoundDraw1(){ return "weapons/beretta_draw.wav"; }
|
||||
const char *GetSoundDraw2(){ return GetSoundDraw1(); }
|
||||
|
||||
int GetWhipDmg(){ return BERETTA_DMG_WHIP; }
|
||||
};
|
||||
|
|
@ -380,12 +380,12 @@ public:
|
|||
int iItemSlot( void ){ return 2; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
char *GetAnimPlayer(){ return "onehanded"; }
|
||||
char *GetModelV(){ return "models/v_colt.mdl"; }
|
||||
char *GetModelP(){ return "models/p_colt.mdl"; }
|
||||
char *GetModelW(){ return "models/w_colt.mdl"; }
|
||||
const char *GetAnimPlayer(){ return "onehanded"; }
|
||||
const char *GetModelV(){ return "models/v_colt.mdl"; }
|
||||
const char *GetModelP(){ return "models/p_colt.mdl"; }
|
||||
const char *GetModelW(){ return "models/w_colt.mdl"; }
|
||||
|
||||
int GetWhipDmg(){ return COLT_DMG_WHIP; }
|
||||
};
|
||||
|
|
@ -406,14 +406,14 @@ public:
|
|||
int iItemSlot( void ){ return 3; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void SwingWeapon();
|
||||
|
||||
char *GetAnimPlayer(){ return "onehanded"; }
|
||||
char *GetModelV(){ return "models/v_deagle.mdl"; }
|
||||
char *GetModelP(){ return "models/p_deagle.mdl"; }
|
||||
char *GetModelW(){ return "models/w_deagle.mdl"; }
|
||||
const char *GetAnimPlayer(){ return "onehanded"; }
|
||||
const char *GetModelV(){ return "models/v_deagle.mdl"; }
|
||||
const char *GetModelP(){ return "models/p_deagle.mdl"; }
|
||||
const char *GetModelW(){ return "models/w_deagle.mdl"; }
|
||||
|
||||
int GetWhipDmg(){ return DEAGLE_DMG_WHIP; }
|
||||
};
|
||||
|
|
@ -438,7 +438,7 @@ public:
|
|||
int iItemSlot( void ){ return 4; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
// Replication
|
||||
void PackWeapon(void *weapon_data);
|
||||
|
|
@ -456,10 +456,10 @@ public:
|
|||
|
||||
void SetState(int statenum);
|
||||
|
||||
char *GetAnimPlayer(){ return "onehanded"; }
|
||||
char *GetModelV(){ return "models/v_ruger.mdl"; }
|
||||
char *GetModelP(){ return "models/p_ruger.mdl"; }
|
||||
char *GetModelW(){ return "models/w_ruger.mdl"; }
|
||||
const char *GetAnimPlayer(){ return "onehanded"; }
|
||||
const char *GetModelV(){ return "models/v_ruger.mdl"; }
|
||||
const char *GetModelP(){ return "models/p_ruger.mdl"; }
|
||||
const char *GetModelW(){ return "models/w_ruger.mdl"; }
|
||||
|
||||
int GetWhipDmg(){ return 0; }
|
||||
|
||||
|
|
@ -494,7 +494,7 @@ public:
|
|||
int iItemSlot(){ return 5; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
// Replication
|
||||
void PackWeapon(void *weapon_data);
|
||||
|
|
@ -578,7 +578,7 @@ public:
|
|||
int iItemSlot(){ return 1; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -600,7 +600,7 @@ public:
|
|||
int iItemSlot(){ return 2; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -626,7 +626,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
int iItemSlot(){ return 6; }
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void FireShotgun(int barrels);
|
||||
|
||||
|
|
@ -656,7 +656,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
int iItemSlot(){ return 3; }
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -710,7 +710,7 @@ public:
|
|||
int iItemSlot(){ return 3; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -748,7 +748,7 @@ public:
|
|||
int iItemSlot(){ return 1; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -783,7 +783,7 @@ public:
|
|||
int iItemSlot(){ return 2; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void Reload();
|
||||
|
|
@ -807,7 +807,7 @@ public:
|
|||
int iItemSlot(){ return 4; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -846,7 +846,7 @@ public:
|
|||
int iItemSlot(){ return 4; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -888,7 +888,7 @@ public:
|
|||
int iItemSlot(){ return 5; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void ItemPostFrame();
|
||||
void PrimaryAttack();
|
||||
|
|
@ -929,7 +929,7 @@ public:
|
|||
void Precache();
|
||||
int iItemSlot(){ return 1; }
|
||||
int GetItemInfo(ItemInfo *p);
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
void AttachToPlayer(CBasePlayer *pPlayer);
|
||||
int AddDuplicate(CBasePlayerItem *pItem);
|
||||
float flGetTiltedDamage();
|
||||
|
|
@ -982,7 +982,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
void AttachToPlayer(CBasePlayer *pPlayer);
|
||||
int AddDuplicate(CBasePlayerItem *pItem);
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -1000,7 +1000,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
void AttachToPlayer(CBasePlayer *pPlayer);
|
||||
int AddDuplicate(CBasePlayerItem *pItem);
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -1024,9 +1024,9 @@ public:
|
|||
virtual void PlayHitSound();
|
||||
BOOL PlayEmptySound();
|
||||
|
||||
virtual char *pszGetViewModel() = 0;
|
||||
virtual char *pszGetPlayerModel() = 0;
|
||||
virtual char *pszGetWorldModel() = 0;
|
||||
virtual const char *pszGetViewModel() = 0;
|
||||
virtual const char *pszGetPlayerModel() = 0;
|
||||
virtual const char *pszGetWorldModel() = 0;
|
||||
|
||||
virtual int iGetDamageType() = 0;
|
||||
|
||||
|
|
@ -1050,7 +1050,7 @@ public:
|
|||
virtual void ThrowObject() = 0;
|
||||
|
||||
virtual int iGetMaxAmmo() = 0;
|
||||
virtual char *pszGetAmmoName() = 0;
|
||||
virtual const char *pszGetAmmoName() = 0;
|
||||
|
||||
float m_flStartAttack;
|
||||
BOOL m_bJustThrown;
|
||||
|
|
@ -1064,16 +1064,16 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 1; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
BOOL Deploy();
|
||||
void WeaponIdle();
|
||||
|
||||
char *pszGetViewModel(){ return "models/v_combatknife.mdl"; }
|
||||
char *pszGetPlayerModel(){ return "models/p_combatknife.mdl"; }
|
||||
char *pszGetWorldModel(){ return "models/w_combatknife.mdl"; }
|
||||
const char *pszGetViewModel(){ return "models/v_combatknife.mdl"; }
|
||||
const char *pszGetPlayerModel(){ return "models/p_combatknife.mdl"; }
|
||||
const char *pszGetWorldModel(){ return "models/w_combatknife.mdl"; }
|
||||
|
||||
int iGetDamageType(){ return DMG_CLUB|DMG_NEVERGIB; }
|
||||
|
||||
|
|
@ -1090,15 +1090,15 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 3; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
BOOL Deploy();
|
||||
void WeaponIdle();
|
||||
|
||||
char *pszGetViewModel(){ return "models/v_baseballbat.mdl"; }
|
||||
char *pszGetPlayerModel(){ return "models/p_baseballbat.mdl"; }
|
||||
char *pszGetWorldModel(){ return "models/w_baseballbat.mdl"; }
|
||||
const char *pszGetViewModel(){ return "models/v_baseballbat.mdl"; }
|
||||
const char *pszGetPlayerModel(){ return "models/p_baseballbat.mdl"; }
|
||||
const char *pszGetWorldModel(){ return "models/w_baseballbat.mdl"; }
|
||||
|
||||
int iGetDamageType(){ return DMG_CLUB|DMG_NEVERGIB; }
|
||||
|
||||
|
|
@ -1113,15 +1113,15 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 4; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
BOOL Deploy();
|
||||
void WeaponIdle();
|
||||
|
||||
char *pszGetViewModel(){ return "models/v_sledge.mdl"; }
|
||||
char *pszGetPlayerModel(){ return "models/p_sledge.mdl"; }
|
||||
char *pszGetWorldModel(){ return "models/w_sledge.mdl"; }
|
||||
const char *pszGetViewModel(){ return "models/v_sledge.mdl"; }
|
||||
const char *pszGetPlayerModel(){ return "models/p_sledge.mdl"; }
|
||||
const char *pszGetWorldModel(){ return "models/w_sledge.mdl"; }
|
||||
|
||||
int iGetDamageType(){ return DMG_CLUB; }
|
||||
|
||||
|
|
@ -1136,7 +1136,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 5; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void SecondaryAttack();
|
||||
|
|
@ -1144,9 +1144,9 @@ public:
|
|||
void Holster(int skiplocal = 0);
|
||||
void WeaponIdle();
|
||||
|
||||
char *pszGetViewModel(){ return "models/v_katana.mdl"; }
|
||||
char *pszGetPlayerModel(){ return "models/p_katana.mdl"; }
|
||||
char *pszGetWorldModel(){ return "models/w_katana.mdl"; }
|
||||
const char *pszGetViewModel(){ return "models/v_katana.mdl"; }
|
||||
const char *pszGetPlayerModel(){ return "models/p_katana.mdl"; }
|
||||
const char *pszGetWorldModel(){ return "models/w_katana.mdl"; }
|
||||
|
||||
int iGetDamageType(){ return DMG_CLUB|DMG_NEVERGIB; }
|
||||
|
||||
|
|
@ -1167,7 +1167,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 2; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PrimaryAttack();
|
||||
void ItemPostFrame();
|
||||
|
|
@ -1176,7 +1176,7 @@ public:
|
|||
void WeaponIdle();
|
||||
|
||||
int iGetMaxAmmo(){ return AMMO_MAX_THROWINGKNIFE; }
|
||||
char *pszGetAmmoName(){ return "ThrowingKnives"; }
|
||||
const char *pszGetAmmoName(){ return "ThrowingKnives"; }
|
||||
};
|
||||
|
||||
class CSpear : public CThrowingWeapon
|
||||
|
|
@ -1187,7 +1187,7 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 6; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void SwingWeapon();
|
||||
void ThrowObject();
|
||||
|
|
@ -1198,7 +1198,7 @@ public:
|
|||
void WeaponIdle();
|
||||
|
||||
int iGetMaxAmmo(){ return AMMO_MAX_SPEARS; }
|
||||
char *pszGetAmmoName(){ return "Spears"; }
|
||||
const char *pszGetAmmoName(){ return "Spears"; }
|
||||
private:
|
||||
unsigned short m_usFire1;
|
||||
};
|
||||
|
|
@ -1211,16 +1211,16 @@ public:
|
|||
int GetItemInfo(ItemInfo *p);
|
||||
int iItemSlot(){ return 7; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void PlayHitSound();
|
||||
void PrimaryAttack();
|
||||
BOOL Deploy();
|
||||
void WeaponIdle();
|
||||
|
||||
char *pszGetViewModel(){ return "models/v_cattleprod.mdl"; }
|
||||
char *pszGetPlayerModel(){ return "models/p_cattleprod.mdl"; }
|
||||
char *pszGetWorldModel(){ return "models/w_cattleprod.mdl"; }
|
||||
const char *pszGetViewModel(){ return "models/v_cattleprod.mdl"; }
|
||||
const char *pszGetPlayerModel(){ return "models/p_cattleprod.mdl"; }
|
||||
const char *pszGetWorldModel(){ return "models/w_cattleprod.mdl"; }
|
||||
|
||||
int iGetDamageType(){ return DMG_SHOCK|DMG_CLUB|DMG_NEVERGIB; }
|
||||
|
||||
|
|
@ -1265,7 +1265,7 @@ public:
|
|||
int GetItemInfo( ItemInfo *p );
|
||||
int iItemSlot(){ return 1; };
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
BOOL Deploy();
|
||||
};
|
||||
|
|
@ -1278,7 +1278,7 @@ public:
|
|||
int GetItemInfo( ItemInfo *p );
|
||||
int iItemSlot(){ return 2; };
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
BOOL Deploy();
|
||||
};
|
||||
|
|
@ -1291,7 +1291,7 @@ public:
|
|||
int GetItemInfo( ItemInfo *p );
|
||||
int iItemSlot(){ return 3; };
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
BOOL Deploy();
|
||||
};
|
||||
|
|
@ -1304,7 +1304,7 @@ public:
|
|||
int GetItemInfo( ItemInfo *p );
|
||||
int iItemSlot(){ return 4; }
|
||||
float flGetTiltedDamage();
|
||||
char *szGetDeathNoticeString();
|
||||
const char *szGetDeathNoticeString();
|
||||
|
||||
void ItemPostFrame();
|
||||
void FireSawedOffs( int iShellsFired );
|
||||
|
|
@ -1358,4 +1358,4 @@ public:
|
|||
|
||||
void FindHullIntersection( const Vector &vecSrc, TraceResult &tr, float *mins, float *maxs, edict_t *pEntity );
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ public:
|
|||
int Restore( CRestore &restore );
|
||||
static TYPEDESCRIPTION m_SaveData[];
|
||||
|
||||
HasWeapon( CBasePlayerItem *pCheckItem );
|
||||
BOOL HasWeapon( CBasePlayerItem *pCheckItem );
|
||||
BOOL PackWeapon( CBasePlayerItem *pWeapon );
|
||||
BOOL PackAmmo( int iszName, int iCount );
|
||||
void SetModel(char *pszModelname);
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ float CAkimboBerettas::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT( 38, 48 );
|
||||
}
|
||||
|
||||
char *CAkimboBerettas::szGetDeathNoticeString()
|
||||
const char *CAkimboBerettas::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_AKIMBOBERETTAS_1 : DEATH_AKIMBOBERETTAS_2;
|
||||
}
|
||||
|
|
@ -334,7 +334,7 @@ float CAkimboColts::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT( 45, 55 );
|
||||
}
|
||||
|
||||
char *CAkimboColts::szGetDeathNoticeString()
|
||||
const char *CAkimboColts::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_AKIMBOCOLTS_1 : DEATH_AKIMBOCOLTS_2;
|
||||
}
|
||||
|
|
@ -399,7 +399,7 @@ float CAkimboDeagles::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT( 50, 60 );
|
||||
}
|
||||
|
||||
char *CAkimboDeagles::szGetDeathNoticeString()
|
||||
const char *CAkimboDeagles::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_AKIMBODEAGLES_1 : DEATH_AKIMBODEAGLES_2;
|
||||
}
|
||||
|
|
@ -461,7 +461,7 @@ float CAkimboSawedOffs::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT( 16, 19 );
|
||||
}
|
||||
|
||||
char *CAkimboSawedOffs::szGetDeathNoticeString()
|
||||
const char *CAkimboSawedOffs::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_SAWEDOFF_1 : DEATH_SAWEDOFF_2;
|
||||
}
|
||||
|
|
@ -596,4 +596,4 @@ BOOL CAkimboSawedOffs::Deploy()
|
|||
return FALSE;
|
||||
|
||||
return CWasteWeapon::Deploy();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ float CSmg9::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CSmg9::szGetDeathNoticeString()
|
||||
const char *CSmg9::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_SMG9_1 : DEATH_SMG9_2;
|
||||
}
|
||||
|
|
@ -567,7 +567,7 @@ float CFnFal::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CFnFal::szGetDeathNoticeString()
|
||||
const char *CFnFal::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_FNFAL_1 : DEATH_FNFAL_2;
|
||||
}
|
||||
|
|
@ -866,7 +866,7 @@ float CTommyGun::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(35,45);
|
||||
}
|
||||
|
||||
char *CTommyGun::szGetDeathNoticeString()
|
||||
const char *CTommyGun::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_TOMMYGUN_1 : DEATH_TOMMYGUN_2;
|
||||
}
|
||||
|
|
@ -1072,7 +1072,7 @@ float CG11::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(30,40);
|
||||
}
|
||||
|
||||
char *CG11::szGetDeathNoticeString()
|
||||
const char *CG11::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_G11_1 : DEATH_G11_2;
|
||||
}
|
||||
|
|
@ -1517,7 +1517,7 @@ float CBoltRifle::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CBoltRifle::szGetDeathNoticeString()
|
||||
const char *CBoltRifle::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_BOLTRIFLE_1 : DEATH_BOLTRIFLE_2;
|
||||
}
|
||||
|
|
@ -1987,7 +1987,7 @@ float CSten::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CSten::szGetDeathNoticeString()
|
||||
const char *CSten::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_STEN_1 : DEATH_STEN_2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ float CMolotovCocktail::flGetTiltedDamage()
|
|||
return 0;
|
||||
}
|
||||
|
||||
char *CMolotovCocktail::szGetDeathNoticeString()
|
||||
const char *CMolotovCocktail::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_MOLOTOVCOCKTAIL_1 : DEATH_MOLOTOVCOCKTAIL_2;
|
||||
}
|
||||
|
|
@ -664,7 +664,7 @@ int CFragGrenade::AddDuplicate(CBasePlayerItem *pItem)
|
|||
return 1; // We just wanted to add ammo
|
||||
}
|
||||
|
||||
char *CFragGrenade::szGetDeathNoticeString()
|
||||
const char *CFragGrenade::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_FRAGGRENADE_1 : DEATH_FRAGGRENADE_2;
|
||||
}
|
||||
|
|
@ -775,7 +775,7 @@ int CPipebomb::AddDuplicate(CBasePlayerItem *pItem)
|
|||
return 1; // We just wanted to add ammo
|
||||
}
|
||||
|
||||
char *CPipebomb::szGetDeathNoticeString()
|
||||
const char *CPipebomb::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_PIPEBOMB_1 : DEATH_PIPEBOMB_2;
|
||||
}
|
||||
|
|
@ -967,4 +967,4 @@ void CThrownFrag::ExpUse(CBaseEntity *pActivator,CBaseEntity *pCaller,USE_TYPE u
|
|||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ float CCombatKnife::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(35,45);
|
||||
}
|
||||
|
||||
char *CCombatKnife::szGetDeathNoticeString()
|
||||
const char *CCombatKnife::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_COMBATKNIFE_1 : DEATH_COMBATKNIFE_2;
|
||||
}
|
||||
|
|
@ -440,7 +440,7 @@ float CThrowingKnife::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(55,65);
|
||||
}
|
||||
|
||||
char *CThrowingKnife::szGetDeathNoticeString()
|
||||
const char *CThrowingKnife::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_THROWINGKNIFE_1 : DEATH_THROWINGKNIFE_2;
|
||||
}
|
||||
|
|
@ -558,7 +558,7 @@ float CBaseballBat::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(55,65);
|
||||
}
|
||||
|
||||
char *CBaseballBat::szGetDeathNoticeString()
|
||||
const char *CBaseballBat::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_BASEBALLBAT_1 : DEATH_BASEBALLBAT_2;
|
||||
}
|
||||
|
|
@ -639,7 +639,7 @@ float CSledgeHammer::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(65,75);
|
||||
}
|
||||
|
||||
char *CSledgeHammer::szGetDeathNoticeString()
|
||||
const char *CSledgeHammer::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_SLEDGEHAMMER_1 : DEATH_SLEDGEHAMMER_2;
|
||||
}
|
||||
|
|
@ -743,7 +743,7 @@ void CKatana::UnpackWeapon(void *weapon_data)
|
|||
#endif
|
||||
}
|
||||
|
||||
char *CKatana::szGetDeathNoticeString()
|
||||
const char *CKatana::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_KATANA_1 : DEATH_KATANA_2;
|
||||
}
|
||||
|
|
@ -853,7 +853,7 @@ float CCattleProd::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(30,40);
|
||||
}
|
||||
|
||||
char *CCattleProd::szGetDeathNoticeString()
|
||||
const char *CCattleProd::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_CATTLEPROD_1 : DEATH_CATTLEPROD_2;
|
||||
}
|
||||
|
|
@ -966,7 +966,7 @@ float CSpear::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(55,65);
|
||||
}
|
||||
|
||||
char *CSpear::szGetDeathNoticeString()
|
||||
const char *CSpear::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_SPEAR_1 : DEATH_SPEAR_2;
|
||||
}
|
||||
|
|
@ -1309,4 +1309,4 @@ void CThrownMelee::ThrownThink()
|
|||
UTIL_Remove(this);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ float CMossberg::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(14,19);
|
||||
}
|
||||
|
||||
char *CMossberg::szGetDeathNoticeString()
|
||||
const char *CMossberg::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_MOSSBERG_1 : DEATH_MOSSBERG_2;
|
||||
}
|
||||
|
|
@ -514,7 +514,7 @@ float CWinchester::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT(75,85);
|
||||
}
|
||||
|
||||
char *CWinchester::szGetDeathNoticeString()
|
||||
const char *CWinchester::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_WINCHESTER_1 : DEATH_WINCHESTER_2;
|
||||
}
|
||||
|
|
@ -733,7 +733,7 @@ float CSawedOff::flGetTiltedDamage()
|
|||
return RANDOM_FLOAT( 16, 19 );
|
||||
}
|
||||
|
||||
char *CSawedOff::szGetDeathNoticeString()
|
||||
const char *CSawedOff::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_SAWEDOFF_1 : DEATH_SAWEDOFF_2;
|
||||
}
|
||||
|
|
@ -942,7 +942,7 @@ float CJackHammer::flGetTiltedDamage()
|
|||
return RANDOM_LONG(14,19);
|
||||
}
|
||||
|
||||
char *CJackHammer::szGetDeathNoticeString()
|
||||
const char *CJackHammer::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_JACKHAMMER_1 : DEATH_JACKHAMMER_2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -567,7 +567,7 @@ float CBeretta::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CBeretta::szGetDeathNoticeString()
|
||||
const char *CBeretta::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_BERETTA_1 : DEATH_BERETTA_2;
|
||||
}
|
||||
|
|
@ -683,7 +683,7 @@ float CColt::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CColt::szGetDeathNoticeString()
|
||||
const char *CColt::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_COLT_1 : DEATH_COLT_2;
|
||||
}
|
||||
|
|
@ -772,7 +772,7 @@ float CDesertEagle::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CDesertEagle::szGetDeathNoticeString()
|
||||
const char *CDesertEagle::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_DEAGLE_1 : DEATH_DEAGLE_2;
|
||||
}
|
||||
|
|
@ -871,7 +871,7 @@ float CRuger::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CRuger::szGetDeathNoticeString()
|
||||
const char *CRuger::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_RUGER_1 : DEATH_RUGER_2;
|
||||
}
|
||||
|
|
@ -1277,7 +1277,7 @@ float CHandcannon::flGetTiltedDamage()
|
|||
return fRet;
|
||||
}
|
||||
|
||||
char *CHandcannon::szGetDeathNoticeString()
|
||||
const char *CHandcannon::szGetDeathNoticeString()
|
||||
{
|
||||
return RANDOM_LONG(0,1) ? DEATH_HANDCANNON_1 : DEATH_HANDCANNON_2;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue