eukara/valve
1
0
Fork 0
forked from fn/valve
Code Pull requests Activity

Convert all classes to use the new parent names. The old ones were marked for deprecation long ago.

Browse source
This commit is contained in:
Marco Cawthorne 2022-05-10 15:00:15 -07:00
parent 27028a834b
commit ee17e3b7a4
Signed by: eukara
GPG key ID: C196CD8BA993248A
35 changed files with 121 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/item_longjump.qc
View file

@ -23,7 +23,7 @@ Allows the player to jump longer distance by holding crouch
and pressing jump.
*/
class item_longjump:CBaseTrigger
class item_longjump:NSRenderableEntity
{
string m_strOnPlayerTouch;
@ -91,7 +91,7 @@ item_longjump::SpawnKey(string strKey, string strValue)
m_strOnPlayerTouch = strcat(m_strOnPlayerTouch, ",_", strValue);
break;
default:
CBaseTrigger::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
break;
}
}
@ -103,5 +103,5 @@ item_longjump::item_longjump(void)
precache_sound("items/suitchargeok1.wav");
precache_sound("fvox/powermove_on.wav");
precache_sound("fvox/blip.wav");
CBaseTrigger::CBaseTrigger();
super::NSRenderableEntity();
}

6
src/server/item_suit.qc
View file

@ -25,7 +25,7 @@ When SUIT_LONGINTRO is set, the intro dialog will be longer.
*/
class item_suit:CBaseTrigger
class item_suit:NSRenderableEntity
{
string m_strOnPlayerTouch;
@ -97,7 +97,7 @@ item_suit::SpawnKey(string strKey, string strValue)
m_strOnPlayerTouch = strcat(m_strOnPlayerTouch, ",_", strValue);
break;
default:
CBaseTrigger::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
break;
}
}
@ -110,7 +110,7 @@ item_suit::item_suit(void)
precache_sound("fvox/hev_logon.wav");
precache_sound("fvox/bell.wav");
Sound_Precache("item.respawn");
CBaseTrigger::CBaseTrigger();
super::NSRenderableEntity();
m_strOnPlayerTouch = CreateOutput(m_strOnPlayerTouch);
}

2
src/server/items.h
View file

@ -15,7 +15,7 @@
*/
/* PICKUP ITEMS */
class item_pickup:CBaseTrigger
class item_pickup:NSRenderableEntity
{
int m_bFloating;
int m_iClip;

2
src/server/items.qc
View file

@ -85,5 +85,5 @@ void item_pickup::item_pickup(void)
{
Sound_Precache("item.respawn");
Sound_Precache("weapon.pickup");
CBaseTrigger::CBaseTrigger();
super::NSRenderableEntity();
}

10
src/server/monster_alien_controller.qc
View file

@ -45,7 +45,7 @@ enum
CON_DIE
};
class monster_alien_controller:CBaseMonster
class monster_alien_controller:NSMonster
{
float m_flIdleTime;
float m_flPainTime;
@ -61,7 +61,7 @@ class monster_alien_controller:CBaseMonster
void
monster_alien_controller::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flPainTime > time) {
return;
@ -86,7 +86,7 @@ monster_alien_controller::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
@ -108,7 +108,7 @@ monster_alien_controller::IdleNoise(void)
void
monster_alien_controller::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(CON_IDLE);
}
@ -124,5 +124,5 @@ monster_alien_controller::monster_alien_controller(void)
model = "models/controller.mdl";
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_alien_grunt.qc
View file

@ -58,7 +58,7 @@ enum
AG_LAND
};
class monster_alien_grunt:CBaseMonster
class monster_alien_grunt:NSMonster
{
float m_flIdleTime;
float m_flPainTime;
@ -74,7 +74,7 @@ class monster_alien_grunt:CBaseMonster
void
monster_alien_grunt::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flPainTime > time) {
return;
@ -109,7 +109,7 @@ monster_alien_grunt::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
@ -131,7 +131,7 @@ monster_alien_grunt::IdleNoise(void)
void
monster_alien_grunt::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(AG_IDLE);
}
@ -149,5 +149,5 @@ monster_alien_grunt::monster_alien_grunt(void)
base_mins = [-32,-32,0];
base_maxs = [32,32,64];
base_health = Skill_GetValue("agrunt_health", 90);
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_alien_slave.qc
View file

@ -56,7 +56,7 @@ enum
SLV_JABBER
};
class monster_alien_slave:CBaseNPC
class monster_alien_slave:NSTalkMonster
{
float m_flIdleTime;
float m_flPainTime;
@ -169,7 +169,7 @@ monster_alien_slave::IdleChat(void)
void
monster_alien_slave::Pain(void)
{
CBaseNPC::Pain();
super::Pain();
if (m_flPainTime > time) {
return;
@ -204,13 +204,13 @@ monster_alien_slave::Death(void)
}
/* set the functional differences */
CBaseNPC::Death();
super::Death();
}
void
monster_alien_slave::Respawn(void)
{
CBaseNPC::Respawn();
super::Respawn();
SetFrame(SLV_IDLE);
}
@ -250,5 +250,5 @@ monster_alien_slave::monster_alien_slave(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
m_iAlliance = MAL_ALIEN;
CBaseNPC::CBaseNPC();
super::NSTalkMonster();
}

6
src/server/monster_apache.qc
View file

@ -22,7 +22,7 @@ Boeing AH-64 Apache
*/
class monster_apache:CBaseMonster
class monster_apache:NSMonster
{
void(void) monster_apache;
virtual void(void) Respawn;
@ -30,7 +30,7 @@ class monster_apache:CBaseMonster
void monster_apache::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
movetype = MOVETYPE_NONE;
takedamage = DAMAGE_NO;
iBleeds = FALSE;
@ -44,5 +44,5 @@ void monster_apache::monster_apache(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
base_health = Skill_GetValue("apache_health", 250);
CBaseMonster::CBaseMonster();
super::NSMonster();
}

8
src/server/monster_barnacle.qc
View file

@ -33,7 +33,7 @@ enum
BCL_DIE
};
class monster_barnacle:CBaseMonster
class monster_barnacle:NSMonster
{
void(void) monster_barnacle;
@ -58,13 +58,13 @@ monster_barnacle::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_barnacle::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(BCL_IDLE);
}
@ -79,5 +79,5 @@ void monster_barnacle::monster_barnacle(void)
base_mins = [-16,-16,-36];
base_maxs = [16,16,0];
base_health = Skill_GetValue("barnacle_health", 25);
CBaseMonster::CBaseMonster();
super::NSMonster();
}

12
src/server/monster_barney.qc
View file

@ -44,7 +44,7 @@ enum
BA_FLINCH_SML
};
class monster_barney:CBaseNPC
class monster_barney:NSTalkMonster
{
void(void) monster_barney;
@ -122,13 +122,13 @@ monster_barney::OnPlayerUse(void)
return;
}
CBaseNPC::OnPlayerUse();
super::OnPlayerUse();
}
void
monster_barney::Pain(void)
{
CBaseNPC::Pain();
super::Pain();
WarnAllies();
@ -158,13 +158,13 @@ monster_barney::Death(void)
}
/* now mark our state as 'dead' */
CBaseNPC::Death();
super::Death();
}
void
monster_barney::Respawn(void)
{
CBaseNPC::Respawn();
super::Respawn();
m_iFlags |= MONSTER_CANFOLLOW;
PlayerUse = OnPlayerUse;
}
@ -205,5 +205,5 @@ monster_barney::monster_barney(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
m_iAlliance = MAL_FRIEND;
CBaseNPC::CBaseNPC();
super::NSTalkMonster();
}

10
src/server/monster_bigmomma.qc
View file

@ -46,7 +46,7 @@ enum
GON_FALLDIE
};
class monster_bigmomma:CBaseMonster
class monster_bigmomma:NSMonster
{
float m_flIdleTime;
@ -78,7 +78,7 @@ monster_bigmomma::IdleNoise(void)
void
monster_bigmomma::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -103,13 +103,13 @@ monster_bigmomma::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_bigmomma::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(GON_IDLE);
}
@ -128,5 +128,5 @@ void monster_bigmomma::monster_bigmomma(void)
base_health = Skill_GetValue("bigmomma_health_factor", 1.5) * 300;
base_mins = [-95,-95,0];
base_maxs = [95,95,190];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

4
src/server/monster_bloater.qc
View file

@ -22,7 +22,7 @@ Flocking Floater
*/
class monster_bloater:CBaseMonster
class monster_bloater:NSMonster
{
void(void) monster_bloater;
};
@ -33,5 +33,5 @@ void monster_bloater::monster_bloater(void)
model = "models/floater.mdl";
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

8
src/server/monster_bullchicken.qc
View file

@ -54,7 +54,7 @@ enum
* for close range attacks
*/
class monster_bullchicken:CBaseMonster
class monster_bullchicken:NSMonster
{
float m_flIdleTime;
@ -106,7 +106,7 @@ monster_bullchicken::IdleNoise(void)
void
monster_bullchicken::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -134,7 +134,7 @@ monster_bullchicken::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void monster_bullchicken::monster_bullchicken(void)
@ -151,5 +151,5 @@ void monster_bullchicken::monster_bullchicken(void)
base_health = Skill_GetValue("bullsquid_health", 40);
base_mins = [-32,-32,0];
base_maxs = [32,32,64];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_cockroach.qc
View file

@ -22,7 +22,7 @@ Cockroach
*/
class monster_cockroach:CBaseMonster
class monster_cockroach:NSMonster
{
void(void) monster_cockroach;
virtual void(void) Death;
@ -40,7 +40,7 @@ monster_cockroach::Death(void)
health = -100;
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void monster_cockroach::monster_cockroach(void)
@ -50,5 +50,5 @@ void monster_cockroach::monster_cockroach(void)
model = "models/roach.mdl";
base_mins = [-1,-1,0];
base_maxs = [1,1,1];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

4
src/server/monster_flyer_flock.qc
View file

@ -22,7 +22,7 @@ Boid
*/
class monster_flyer_flock:CBaseMonster
class monster_flyer_flock:NSMonster
{
void(void) monster_flyer_flock;
};
@ -33,5 +33,5 @@ void monster_flyer_flock::monster_flyer_flock(void)
model = "models/aflock.mdl";
base_mins = [-16,-16,0];
base_maxs = [16,16,16];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_gargantua.qc
View file

@ -48,7 +48,7 @@ enum
GARG_BUST
};
class monster_gargantua:CBaseMonster
class monster_gargantua:NSMonster
{
float m_flIdleTime;
@ -80,7 +80,7 @@ monster_gargantua::IdleNoise(void)
void
monster_gargantua::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -105,13 +105,13 @@ monster_gargantua::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_gargantua::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(GARG_IDLE);
/* takes damage from explosives only
* takedamage = DAMAGE_NO; */
@ -134,5 +134,5 @@ void monster_gargantua::monster_gargantua(void)
base_health = Skill_GetValue("gargantua_health", 800);
base_mins = [-32,-32,0];
base_maxs = [32,32,128];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_headcrab.qc
View file

@ -110,7 +110,7 @@ monster_headcrab::Touch(entity eToucher)
void
monster_headcrab::Pain(void)
{
NSMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -135,7 +135,7 @@ monster_headcrab::Death(void)
}
/* set the functional differences */
NSMonster::Death();
super::Death();
}
void
@ -177,5 +177,5 @@ monster_headcrab::monster_headcrab(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,36];
m_iAlliance = MAL_ALIEN;
NSMonster::NSMonster();
super::NSMonster();
}

6
src/server/monster_hevsuit_dead.qc
View file

@ -22,7 +22,7 @@ HEV-Suit/Player's corpse
*/
class monster_hevsuit_dead:CBaseMonster
class monster_hevsuit_dead:NSMonster
{
int m_iPose;
void(void) monster_hevsuit_dead;
@ -84,7 +84,7 @@ monster_hevsuit_dead::SpawnKey(string strKey, string strValue)
SetSkin(stoi(strValue));
break;
default:
CBaseMonster::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
}
}
@ -93,5 +93,5 @@ monster_hevsuit_dead::monster_hevsuit_dead(void)
{
model = "models/player.mdl";
m_iBody = 2;
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_hgrunt_dead.qc
View file

@ -22,7 +22,7 @@ Human Grunt's corpse
*/
class monster_hgrunt_dead:CBaseMonster
class monster_hgrunt_dead:NSMonster
{
int m_iPose;
void(void) monster_hgrunt_dead;
@ -84,7 +84,7 @@ monster_hgrunt_dead::SpawnKey(string strKey, string strValue)
skin = stoi(strValue);
break;
default:
CBaseMonster::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
}
}
@ -92,5 +92,5 @@ void
monster_hgrunt_dead::monster_hgrunt_dead(void)
{
model = "models/hgrunt.mdl";
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_houndeye.qc
View file

@ -59,7 +59,7 @@ enum
HE_JUMPWINDOW
};
class monster_houndeye:CBaseMonster
class monster_houndeye:NSMonster
{
float m_flIdleTime;
@ -131,7 +131,7 @@ monster_houndeye::AttackBlast(void)
void
monster_houndeye::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -157,7 +157,7 @@ monster_houndeye::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
@ -179,7 +179,7 @@ monster_houndeye::IdleNoise(void)
void
monster_houndeye::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(HE_IDLE);
}
@ -198,5 +198,5 @@ monster_houndeye::monster_houndeye(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,36];
m_iAlliance = MAL_ALIEN;
CBaseMonster::CBaseMonster();
super::NSMonster();
}

8
src/server/monster_human_assassin.qc
View file

@ -43,7 +43,7 @@ enum
HAS_LAND
};
class monster_human_assassin:CBaseMonster
class monster_human_assassin:NSMonster
{
float m_flIdleTime;
@ -72,13 +72,13 @@ monster_human_assassin::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_human_assassin::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
frame = HAS_IDLE;
}
@ -90,5 +90,5 @@ monster_human_assassin::monster_human_assassin(void)
base_health = Skill_GetValue("hassassin_health", 50);
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_human_grunt.qc
View file

@ -109,7 +109,7 @@ enum
GR_PLUNGER
};
class monster_human_grunt:CBaseNPC
class monster_human_grunt:NSTalkMonster
{
float m_flIdleTime;
int m_iMP5Burst;
@ -229,7 +229,7 @@ void monster_human_grunt::IdleChat(void)
void
monster_human_grunt::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -265,13 +265,13 @@ monster_human_grunt::Death(void)
Sound_Play(this, CHAN_VOICE, "monster_human_grunt.die");
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_human_grunt::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(GR_IDLE);
}
@ -315,5 +315,5 @@ void monster_human_grunt::monster_human_grunt(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
m_iAlliance = MAL_ENEMY;
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_ichthyosaur.qc
View file

@ -42,7 +42,7 @@ enum
ICHY_JUMP
};
class monster_ichthyosaur:CBaseMonster
class monster_ichthyosaur:NSMonster
{
float m_flIdleTime;
@ -57,7 +57,7 @@ class monster_ichthyosaur:CBaseMonster
void
monster_ichthyosaur::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -95,7 +95,7 @@ monster_ichthyosaur::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
@ -117,7 +117,7 @@ monster_ichthyosaur::IdleNoise(void)
void
monster_ichthyosaur::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(ICHY_IDLE);
}
@ -133,5 +133,5 @@ monster_ichthyosaur::monster_ichthyosaur(void)
model = "models/icky.mdl";
base_mins = [-32,-32,0];
base_maxs = [32,32,64];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

8
src/server/monster_leech.qc
View file

@ -34,7 +34,7 @@ enum
LEECH_DIEEND
};
class monster_leech:CBaseMonster
class monster_leech:NSMonster
{
float m_flIdleTime;
@ -62,13 +62,13 @@ monster_leech::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_leech::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(LEECH_SWIM);
}
@ -80,5 +80,5 @@ void monster_leech::monster_leech(void)
model = "models/leech.mdl";
base_mins = [-6,-6,0];
base_maxs = [6,6,6];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

4
src/server/monster_miniturret.qc
View file

@ -32,7 +32,7 @@ enum
TUR_DIE
};
class monster_miniturret:CBaseMonster
class monster_miniturret:NSMonster
{
void(void) monster_miniturret;
};
@ -43,5 +43,5 @@ void monster_miniturret::monster_miniturret(void)
model = "models/miniturret.mdl";
base_mins = [-16,-16,-32];
base_maxs = [16,16,32];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_nihilanth.qc
View file

@ -47,7 +47,7 @@ enum
NIL_SHOOT
};
class monster_nihilanth:CBaseMonster
class monster_nihilanth:NSMonster
{
float m_flIdleTime;
@ -80,7 +80,7 @@ monster_nihilanth::IdleNoise(void)
void
monster_nihilanth::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -106,13 +106,13 @@ monster_nihilanth::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_nihilanth::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(NIL_IDLE);
}
@ -130,5 +130,5 @@ void monster_nihilanth::monster_nihilanth(void)
base_health = Skill_GetValue("nihilanth_health", 800);
base_mins = [-192,-192,-32];
base_maxs = [192,192,384];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_osprey.qc
View file

@ -22,7 +22,7 @@ Bell Boeing VV-22 Osprey
*/
class monster_osprey:CBaseMonster
class monster_osprey:NSMonster
{
void(void) monster_osprey;
virtual void(void) Respawn;
@ -30,7 +30,7 @@ class monster_osprey:CBaseMonster
void monster_osprey::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
takedamage = DAMAGE_NO;
iBleeds = FALSE;
}
@ -41,5 +41,5 @@ void monster_osprey::monster_osprey(void)
model = "models/osprey.mdl";
base_mins = [-480,-480,-112];
base_maxs = [480,480,24];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

4
src/server/monster_rat.qc
View file

@ -22,7 +22,7 @@ Rat
*/
class monster_rat:CBaseMonster
class monster_rat:NSMonster
{
void(void) monster_rat;
};
@ -33,5 +33,5 @@ void monster_rat::monster_rat(void)
model = "models/bigrat.mdl";
base_mins = [-6,-6,-0];
base_maxs = [6,6,6];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_scientist_dead.qc
View file

@ -33,7 +33,7 @@ enum
DSCIA_DEADHANG
};
class monster_scientist_dead:CBaseMonster
class monster_scientist_dead:NSMonster
{
int m_iPose;
void(void) monster_scientist_dead;
@ -119,7 +119,7 @@ monster_scientist_dead::SpawnKey(string strKey, string strValue)
SetSkin(stoi(strValue));
break;
default:
CBaseMonster::SpawnKey(strKey, strValue);
super::SpawnKey(strKey, strValue);
}
}
@ -127,5 +127,5 @@ void
monster_scientist_dead::monster_scientist_dead(void)
{
model = "models/scientist.mdl";
CBaseMonster::CBaseMonster();
super::NSMonster();
}

8
src/server/monster_sentry.qc
View file

@ -33,7 +33,7 @@ enum
};
class monster_sentry:CBaseMonster
class monster_sentry:NSMonster
{
void(void) monster_sentry;
@ -52,13 +52,13 @@ monster_sentry::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
monster_sentry::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(SENT_IDLE);
iBleeds = FALSE;
}
@ -74,5 +74,5 @@ void monster_sentry::monster_sentry(void)
base_health = Skill_GetValue("sentry_health", 40);
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

6
src/server/monster_tentacle.qc
View file

@ -80,7 +80,7 @@ enum
TE_GRAB
};
class monster_tentacle:CBaseMonster
class monster_tentacle:NSMonster
{
float m_flIdleTime;
@ -110,7 +110,7 @@ monster_tentacle::IdleNoise(void)
void
monster_tentacle::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
/* not entirely true, takes damage then retreats and reheals */
takedamage = DAMAGE_NO;
iBleeds = FALSE;
@ -128,5 +128,5 @@ monster_tentacle::monster_tentacle(void)
model = "models/tentacle2.mdl";
base_mins = [-32,-32,0];
base_maxs = [32,32,64];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

4
src/server/monster_turret.qc
View file

@ -32,7 +32,7 @@ enum
TUR_DIE
};
class monster_turret:CBaseMonster
class monster_turret:NSMonster
{
void(void) monster_turret;
};
@ -43,5 +43,5 @@ void monster_turret::monster_turret(void)
model = "models/turret.mdl";
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
CBaseMonster::CBaseMonster();
super::NSMonster();
}

10
src/server/monster_zombie.qc
View file

@ -70,7 +70,7 @@ enum
ZO_RISESNACK
};
class monster_zombie:CBaseMonster
class monster_zombie:NSMonster
{
float m_flIdleTime;
@ -142,7 +142,7 @@ monster_zombie::AttackFlail(void)
void
monster_zombie::Pain(void)
{
CBaseMonster::Pain();
super::Pain();
if (m_flAnimTime > time) {
return;
@ -177,7 +177,7 @@ monster_zombie::Death(void)
}
/* set the functional differences */
CBaseMonster::Death();
super::Death();
}
void
@ -199,7 +199,7 @@ monster_zombie::IdleNoise(void)
void
monster_zombie::Respawn(void)
{
CBaseMonster::Respawn();
super::Respawn();
SetFrame(ZO_IDLE);
}
@ -218,5 +218,5 @@ monster_zombie::monster_zombie(void)
base_mins = [-16,-16,0];
base_maxs = [16,16,72];
m_iAlliance = MAL_ALIEN;
CBaseMonster::CBaseMonster();
super::NSMonster();
}

2
src/server/world_items.qc
View file

@ -15,7 +15,7 @@
*/
/* This is one of those leftovers from trying to get a game out in time */
class world_items:CBaseTrigger
class world_items:NSRenderableEntity
{
void(void) world_items;
};

4
src/shared/fx_gibhuman.qc
View file

@ -68,7 +68,6 @@ FX_GibHuman(vector vecOrigin, vector vecDir, float flForce)
return;
}
makevectors(vecDir);
vecDir = v_forward;
@ -76,7 +75,8 @@ FX_GibHuman(vector vecOrigin, vector vecDir, float flForce)
vector vel = vecDir;
vel += random(-1,1) * v_right;
vel += random(-1,1) * v_up;
vel *= flForce + [0,0,80];
vel *= flForce;
vel += [0,0,80];
entity gibb = spawn();
setmodel(gibb, g_hgibs[i]);