diff --git a/dlls/rp/fgrunt.cpp b/dlls/rp/fgrunt.cpp index dce169e3..ce1cef74 100644 --- a/dlls/rp/fgrunt.cpp +++ b/dlls/rp/fgrunt.cpp @@ -81,10 +81,6 @@ public: void IdleSound(void); void SpeakSentence(void); - int Save(CSave &save); - int Restore(CRestore &restore); - - //CBaseEntity *Kick(void); Schedule_t *GetSchedule(void); Schedule_t *GetScheduleOfType(int Type); @@ -98,24 +94,6 @@ public: LINK_ENTITY_TO_CLASS( monster_human_grunt_ally, CFGrunt ) -TYPEDESCRIPTION CFGrunt::m_SaveData[] = -{ - DEFINE_FIELD( CFGrunt, m_flNextGrenadeCheck, FIELD_TIME ), - DEFINE_FIELD( CFGrunt, m_flNextPainTime, FIELD_TIME ), - //DEFINE_FIELD( CFGrunt, m_flLastEnemySightTime, FIELD_TIME ), // don't save, go to zero - DEFINE_FIELD( CFGrunt, m_vecTossVelocity, FIELD_VECTOR ), - DEFINE_FIELD( CFGrunt, m_fThrowGrenade, FIELD_BOOLEAN ), - DEFINE_FIELD( CFGrunt, m_fStanding, FIELD_BOOLEAN ), - DEFINE_FIELD( CFGrunt, m_fFirstEncounter, FIELD_BOOLEAN ), - DEFINE_FIELD( CFGrunt, m_cClipSize, FIELD_INTEGER ), - DEFINE_FIELD( CFGrunt, m_voicePitch, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iBrassShell, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iShotgunShell, FIELD_INTEGER ), - DEFINE_FIELD( CFGrunt, m_iSentence, FIELD_INTEGER ), -}; - -IMPLEMENT_SAVERESTORE( CFGrunt, CSquadMonster ) - const char *CFGrunt::pGruntSentences[] = { "FG_GREN", // grenade scared grunt diff --git a/dlls/rp/ngrunt.cpp b/dlls/rp/ngrunt.cpp index 7c9bfc5b..b6e0ae91 100644 --- a/dlls/rp/ngrunt.cpp +++ b/dlls/rp/ngrunt.cpp @@ -80,10 +80,6 @@ public: void IdleSound(void); void SpeakSentence(void); - int Save(CSave &save); - int Restore(CRestore &restore); - - //CBaseEntity *Kick(void); Schedule_t *GetSchedule(void); Schedule_t *GetScheduleOfType(int Type); @@ -97,24 +93,6 @@ public: LINK_ENTITY_TO_CLASS( monster_nari_grunt, CNGrunt ) -TYPEDESCRIPTION CNGrunt::m_SaveData[] = -{ - DEFINE_FIELD( CNGrunt, m_flNextGrenadeCheck, FIELD_TIME ), - DEFINE_FIELD( CNGrunt, m_flNextPainTime, FIELD_TIME ), - //DEFINE_FIELD( CNGrunt, m_flLastEnemySightTime, FIELD_TIME ), // don't save, go to zero - DEFINE_FIELD( CNGrunt, m_vecTossVelocity, FIELD_VECTOR ), - DEFINE_FIELD( CNGrunt, m_fThrowGrenade, FIELD_BOOLEAN ), - DEFINE_FIELD( CNGrunt, m_fStanding, FIELD_BOOLEAN ), - DEFINE_FIELD( CNGrunt, m_fFirstEncounter, FIELD_BOOLEAN ), - DEFINE_FIELD( CNGrunt, m_cClipSize, FIELD_INTEGER ), - DEFINE_FIELD( CNGrunt, m_voicePitch, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iBrassShell, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iShotgunShell, FIELD_INTEGER ), - DEFINE_FIELD( CNGrunt, m_iSentence, FIELD_INTEGER ), -}; - -IMPLEMENT_SAVERESTORE( CNGrunt, CSquadMonster ) - const char *CNGrunt::pGruntSentences[] = { "FG_GREN", // grenade scared grunt diff --git a/dlls/rp/zgrunt.cpp b/dlls/rp/zgrunt.cpp index a586565b..148c5207 100644 --- a/dlls/rp/zgrunt.cpp +++ b/dlls/rp/zgrunt.cpp @@ -82,40 +82,18 @@ public: void IdleSound(void); void SpeakSentence(void); - int Save(CSave &save); - int Restore(CRestore &restore); - Schedule_t *GetSchedule(void); Schedule_t *GetScheduleOfType(int Type); int IRelationship(CBaseEntity *pTarget); CUSTOM_SCHEDULES; - static TYPEDESCRIPTION m_SaveData[]; static const char *pGruntSentences[]; }; LINK_ENTITY_TO_CLASS( monster_zombie_grunt, CZGrunt ) -TYPEDESCRIPTION CZGrunt::m_SaveData[] = -{ - DEFINE_FIELD( CZGrunt, m_flNextGrenadeCheck, FIELD_TIME ), - DEFINE_FIELD( CZGrunt, m_flNextPainTime, FIELD_TIME ), - //DEFINE_FIELD( CZGrunt, m_flLastEnemySightTime, FIELD_TIME ), // don't save, go to zero - DEFINE_FIELD( CZGrunt, m_vecTossVelocity, FIELD_VECTOR ), - DEFINE_FIELD( CZGrunt, m_fThrowGrenade, FIELD_BOOLEAN ), - DEFINE_FIELD( CZGrunt, m_fStanding, FIELD_BOOLEAN ), - DEFINE_FIELD( CZGrunt, m_fFirstEncounter, FIELD_BOOLEAN ), - DEFINE_FIELD( CZGrunt, m_cClipSize, FIELD_INTEGER ), - DEFINE_FIELD( CZGrunt, m_voicePitch, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iBrassShell, FIELD_INTEGER ), - //DEFINE_FIELD( CShotgun, m_iShotgunShell, FIELD_INTEGER ), - DEFINE_FIELD( CZGrunt, m_iSentence, FIELD_INTEGER ), -}; - -IMPLEMENT_SAVERESTORE( CZGrunt, CSquadMonster ) - const char *CZGrunt::pGruntSentences[] = { "ZG_GREN", // grenade scared grunt