Go over all major classes to fix precaches.

src/server/ammo.qc

@@ -18,6 +18,7 @@ class item_ammo:NSRenderableEntity
 {
 	void(void) item_ammo;
 
+	virtual void(void) Spawned;
 	virtual void(void) Respawn;
 	virtual void(entity) Touch;
 };
@@ -62,14 +63,19 @@ item_ammo::Respawn(void)
 }
 
 void
-item_ammo::item_ammo(void)
+item_ammo::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("ammo.pickup");
 	Sound_Precache("ammo.respawn");
 	precache_model(model);
+}
+
+void
+item_ammo::item_ammo(void)
+{
 	m_oldModel = model;
-	SetModel(GetSpawnModel());
-	super::NSRenderableEntity();
 }
 
 /*QUAKED ammo_357 (0 0 0.8) (-16 -16 0) (16 16 32)
@@ -93,7 +99,6 @@ void
 ammo_357::ammo_357(void)
 {
 	model = "models/w_357ammobox.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -132,7 +137,6 @@ void
 ammo_9mmAR::ammo_9mmAR(void)
 {
 	model = "models/w_9mmarclip.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -172,7 +176,6 @@ void
 ammo_9mmbox::ammo_9mmbox(void)
 {
 	model = "models/w_chainammo.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -211,7 +214,6 @@ void
 ammo_9mmclip::ammo_9mmclip(void)
 {
 	model = "models/w_9mmclip.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -250,7 +252,6 @@ void
 ammo_ARgrenades::ammo_ARgrenades(void)
 {
 	model = "models/w_argrenade.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -290,7 +291,6 @@ void
 ammo_buckshot::ammo_buckshot(void)
 {
 	model = "models/w_shotbox.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -329,7 +329,6 @@ void
 ammo_crossbow::ammo_crossbow(void)
 {
 	model = "models/w_crossbow_clip.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -368,7 +367,6 @@ void
 ammo_gaussclip::ammo_gaussclip(void)
 {
 	model = "models/w_gaussammo.mdl";
-	item_ammo::item_ammo();
 }
 
 void
@@ -406,7 +404,6 @@ void
 ammo_rpgclip::ammo_rpgclip(void)
 {
 	model = "models/w_rpgammo.mdl";
-	item_ammo::item_ammo();
 }
 
 void

src/server/item_battery.qc

@@ -33,6 +33,7 @@ class item_battery:NSRenderableEntity
 {
 	void(void) item_battery;
 
+	virtual void(void) Spawned;
 	virtual void(void) Respawn;
 	virtual void(entity) Touch;
 };
@@ -90,10 +91,16 @@ void item_battery::Respawn(void)
 	DropToFloor();
 }
 
-void item_battery::item_battery(void)
+void
+item_battery::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("item.battery");
 	Sound_Precache("item.respawn");
-	model = "models/w_battery.mdl";
-	super::NSRenderableEntity();
+}
+
+void item_battery::item_battery(void)
+{
+	model = "models/w_battery.mdl";
 }

src/server/item_healthkit.qc

@@ -28,6 +28,7 @@ class item_healthkit:NSRenderableEntity
 {
 	void(void) item_healthkit;
 
+	virtual void(void) Spawned;
 	virtual void(void) Respawn;
 	virtual void(entity) Touch;
 };
@@ -73,10 +74,16 @@ void item_healthkit::Respawn(void)
 	DropToFloor();
 }
 
-void item_healthkit::item_healthkit(void)
+void
+item_healthkit::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("item.healthkit");
 	Sound_Precache("item.respawn");
-	model = "models/w_medkit.mdl";
-	super::NSRenderableEntity();
+}
+
+void item_healthkit::item_healthkit(void)
+{
+	model = "models/w_medkit.mdl";
 }

src/server/item_longjump.qc

@@ -29,6 +29,7 @@ class item_longjump:NSRenderableEntity
 
 	void(void) item_longjump;
 
+	virtual void(void) Spawned;
 	virtual void(entity) Touch;
 	virtual void(void) Respawn;
 	virtual void(string, string) SpawnKey;
@@ -97,11 +98,17 @@ item_longjump::SpawnKey(string strKey, string strValue)
 }
 
 void
-item_longjump::item_longjump(void)
+item_longjump::Spawned(void)
 {
-	model = "models/w_longjump.mdl";
+	super::Spawned();
+
 	precache_sound("items/suitchargeok1.wav");
 	precache_sound("fvox/powermove_on.wav");
 	precache_sound("fvox/blip.wav");
-	super::NSRenderableEntity();
+}
+
+void
+item_longjump::item_longjump(void)
+{
+	model = "models/w_longjump.mdl";
 }

src/server/item_suit.qc

@@ -31,6 +31,7 @@ class item_suit:NSRenderableEntity
 
 	void(void) item_suit;
 
+	virtual void(void) Spawned;
 	virtual void(entity) Touch;
 	virtual void(void) Respawn;
 	virtual void(string, string) SpawnKey;
@@ -103,14 +104,21 @@ item_suit::SpawnKey(string strKey, string strValue)
 }
 
 void
-item_suit::item_suit(void)
+item_suit::Spawned(void)
 {
-	model = "models/w_suit.mdl";
+	super::Spawned();
+
 	precache_sound("items/suitchargeok1.wav");
 	precache_sound("fvox/hev_logon.wav");
 	precache_sound("fvox/bell.wav");
 	Sound_Precache("item.respawn");
-	super::NSRenderableEntity();
 
-	m_strOnPlayerTouch = CreateOutput(m_strOnPlayerTouch);
+	if (m_strOnPlayerTouch)
+		m_strOnPlayerTouch = CreateOutput(m_strOnPlayerTouch);
+}
+
+void
+item_suit::item_suit(void)
+{
+	model = "models/w_suit.mdl";
 }

src/server/item_weaponbox.qc

@@ -40,6 +40,7 @@ class item_weaponbox:NSRenderableEntity
 
 	void(void) item_weaponbox;
 
+	virtual void(void) Spawned;
 	virtual void(entity) Touch;
 	virtual void(player) setup;
 };
@@ -145,15 +146,20 @@ item_weaponbox::setup(player pl)
 }
 
 void
-item_weaponbox::item_weaponbox(void)
+item_weaponbox::Spawned(void)
 {
+	super::Spawned();
+
 	SetModel("models/w_weaponbox.mdl");
 	SetSize([-16,-16,0], [16,16,16]);
 	SetSolid(SOLID_TRIGGER);
 	SetMovetype(MOVETYPE_TOSS);
-	botinfo = BOTINFO_AMMO;
+}
 
-	super::NSRenderableEntity();
+void
+item_weaponbox::item_weaponbox(void)
+{
+	botinfo = BOTINFO_AMMO;
 }
 
 void

src/server/items.h

@@ -23,6 +23,7 @@ class item_pickup:NSRenderableEntity
 	int id;
 	void(void) item_pickup;
 
+	virtual void(void) Spawned;
 	virtual void(entity) Touch;
 	virtual void(int i) SetItem;
 	virtual void(void) Respawn;

src/server/items.qc

@@ -81,9 +81,15 @@ void item_pickup::Respawn(void)
 	}
 }
 
-void item_pickup::item_pickup(void)
+void
+item_pickup::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("item.respawn");
 	Sound_Precache("weapon.pickup");
-	super::NSRenderableEntity();
+}
+
+void item_pickup::item_pickup(void)
+{
 }

src/server/monster_alien_controller.qc

@@ -124,5 +124,4 @@ monster_alien_controller::monster_alien_controller(void)
 	model = "models/controller.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSMonster();
 }

src/server/monster_alien_grunt.qc

@@ -149,5 +149,4 @@ monster_alien_grunt::monster_alien_grunt(void)
 	base_mins = [-32,-32,0];
 	base_maxs = [32,32,64];
 	base_health = Skill_GetValue("agrunt_health", 90);
-	super::NSMonster();
 }

src/server/monster_alien_slave.qc

@@ -250,5 +250,4 @@ monster_alien_slave::monster_alien_slave(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	m_iAlliance = MAL_ALIEN;
-	super::NSTalkMonster();
 }

src/server/monster_apache.qc

@@ -44,5 +44,4 @@ void monster_apache::monster_apache(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	base_health = Skill_GetValue("apache_health", 250);
-	super::NSMonster();
 }

src/server/monster_babycrab.qc

@@ -30,5 +30,4 @@ class monster_babycrab:monster_headcrab
 void
 monster_babycrab::monster_babycrab(void)
 {
-	monster_headcrab::monster_headcrab();
 }

src/server/monster_barnacle.qc

@@ -79,5 +79,4 @@ void monster_barnacle::monster_barnacle(void)
 	base_mins = [-16,-16,-36];
 	base_maxs = [16,16,0];
 	base_health = Skill_GetValue("barnacle_health", 25);
-	super::NSMonster();
 }

src/server/monster_barney.qc

@@ -205,5 +205,4 @@ monster_barney::monster_barney(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	m_iAlliance = MAL_FRIEND;
-	super::NSTalkMonster();
 }

src/server/monster_barney_dead.qc

@@ -70,5 +70,4 @@ void
 monster_barney_dead::monster_barney_dead(void)
 {
 	model = "models/barney.mdl";
-	super::NSTalkMonster();
 }

src/server/monster_bigmomma.qc

@@ -128,5 +128,4 @@ 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];
-	super::NSMonster();
 }

src/server/monster_bloater.qc

@@ -33,5 +33,4 @@ void monster_bloater::monster_bloater(void)
 	model = "models/floater.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSMonster();
 }

src/server/monster_bullchicken.qc

@@ -151,5 +151,4 @@ void monster_bullchicken::monster_bullchicken(void)
 	base_health = Skill_GetValue("bullsquid_health", 40);
 	base_mins = [-32,-32,0];
 	base_maxs = [32,32,64];
-	super::NSMonster();
 }

src/server/monster_cockroach.qc

@@ -50,5 +50,4 @@ void monster_cockroach::monster_cockroach(void)
 	model = "models/roach.mdl";
 	base_mins = [-1,-1,0];
 	base_maxs = [1,1,1];
-	super::NSMonster();
 }

src/server/monster_flyer_flock.qc

@@ -33,5 +33,4 @@ void monster_flyer_flock::monster_flyer_flock(void)
 	model = "models/aflock.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,16];
-	super::NSMonster();
 }

src/server/monster_gargantua.qc

@@ -118,8 +118,11 @@ monster_gargantua::Respawn(void)
 	iBleeds = FALSE;
 }
 
-void monster_gargantua::monster_gargantua(void)
+void
+monster_gargantua::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_gargantua.alert");
 	Sound_Precache("monster_gargantua.attack");
 	Sound_Precache("monster_gargantua.attackflame");
@@ -129,10 +132,13 @@ void monster_gargantua::monster_gargantua(void)
 	Sound_Precache("monster_gargantua.idle");
 	Sound_Precache("monster_gargantua.pain");
 	Sound_Precache("monster_gargantua.step");
+}
+
+void monster_gargantua::monster_gargantua(void)
+{
 	netname = "Gargantua";
 	model = "models/garg.mdl";
 	base_health = Skill_GetValue("gargantua_health", 800);
 	base_mins = [-32,-32,0];
 	base_maxs = [32,32,128];
-	super::NSMonster();
 }

src/server/monster_gman.qc

@@ -83,5 +83,4 @@ void monster_gman::monster_gman(void)
 	model = "models/gman.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSTalkMonster();
 }

src/server/monster_headcrab.qc

@@ -155,15 +155,21 @@ monster_headcrab::IdleNoise(void)
 }
 
 void
-monster_headcrab::monster_headcrab(void)
+monster_headcrab::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_headcrab.alert");
 	Sound_Precache("monster_headcrab.attack");
 	Sound_Precache("monster_headcrab.attackhit");
 	Sound_Precache("monster_headcrab.die");
 	Sound_Precache("monster_headcrab.idle");
 	Sound_Precache("monster_headcrab.pain");
+}
 
+void
+monster_headcrab::monster_headcrab(void)
+{
 	if (classname == "monster_babycrab") {
 		netname = "Baby Headcrab";
 		model = "models/baby_headcrab.mdl";
@@ -177,5 +183,4 @@ monster_headcrab::monster_headcrab(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,36];
 	m_iAlliance = MAL_ALIEN;
-	super::NSMonster();
 }

src/server/monster_hevsuit_dead.qc

@@ -93,5 +93,4 @@ monster_hevsuit_dead::monster_hevsuit_dead(void)
 {
 	model = "models/player.mdl";
 	m_iBody = 2;
-	super::NSMonster();
 }

src/server/monster_hgrunt_dead.qc

@@ -92,5 +92,4 @@ void
 monster_hgrunt_dead::monster_hgrunt_dead(void)
 {
 	model = "models/hgrunt.mdl";
-	super::NSMonster();
 }

src/server/monster_houndeye.qc

@@ -65,6 +65,7 @@ class monster_houndeye:NSMonster
 
 	void(void) monster_houndeye;
 
+	virtual void(void) Spawned;
 	virtual void(void) Pain;
 	virtual void(void) Death;
 	virtual void(void) IdleNoise;
@@ -184,19 +185,25 @@ monster_houndeye::Respawn(void)
 }
 
 void
-monster_houndeye::monster_houndeye(void)
+monster_houndeye::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_houndeye.alert");
 	Sound_Precache("monster_houndeye.attack");
 	Sound_Precache("monster_houndeye.blast");
 	Sound_Precache("monster_houndeye.die");
 	Sound_Precache("monster_houndeye.idle");
 	Sound_Precache("monster_houndeye.pain");
+}
+
+void
+monster_houndeye::monster_houndeye(void)
+{
 	netname = "Houndeye";
 	model = "models/houndeye.mdl";
 	base_health = Skill_GetValue("houndeye_health", 20);
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,36];
 	m_iAlliance = MAL_ALIEN;
-	super::NSMonster();
 }

src/server/monster_human_assassin.qc

@@ -90,5 +90,4 @@ monster_human_assassin::monster_human_assassin(void)
 	base_health = Skill_GetValue("hassassin_health", 50);
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSMonster();
 }

src/server/monster_human_grunt.qc

@@ -275,12 +275,17 @@ monster_human_grunt::Respawn(void)
 	SetFrame(GR_IDLE);
 }
 
+void
+monster_human_grunt::Spawned(void)
+{
+	super::Spawned();
+
+	Sound_Precache("monster_human_grunt.die");
+	Sound_Precache("monster_human_grunt.pain");
+}
 
 void monster_human_grunt::monster_human_grunt(void)
 {
-	Sound_Precache("monster_human_grunt.die");
-	Sound_Precache("monster_human_grunt.pain");
-
 	/* Adding some into other slots in hopes it feels right
 	 * listed below are other setences that might need their own:
 	 * !HG_MONST - Monster HG_ALERT
@@ -308,12 +313,10 @@ void monster_human_grunt::monster_human_grunt(void)
 	m_talkFollow = "";
 	m_talkStopFollow = "";
 
-	
 	netname = "Grunt";
 	model = "models/hgrunt.mdl";
 	base_health = Skill_GetValue("hgrunt_health", 50);
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	m_iAlliance = MAL_ENEMY;
-	super::NSMonster();
 }

src/server/monster_ichthyosaur.qc

@@ -48,6 +48,7 @@ class monster_ichthyosaur:NSMonster
 
 	void(void) monster_ichthyosaur;
 
+	virtual void(void) Spawned;
 	virtual void(void) Pain;
 	virtual void(void) Death;
 	virtual void(void) IdleNoise;
@@ -122,16 +123,22 @@ monster_ichthyosaur::Respawn(void)
 }
 
 void
-monster_ichthyosaur::monster_ichthyosaur(void)
+monster_ichthyosaur::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_ichthyosaur.alert");
 	Sound_Precache("monster_ichthyosaur.attack");
 	Sound_Precache("monster_ichthyosaur.die");
 	Sound_Precache("monster_ichthyosaur.idle");
 	Sound_Precache("monster_ichthyosaur.pain");
+}
+
+void
+monster_ichthyosaur::monster_ichthyosaur(void)
+{
 	netname = "Ichthyosaur";
 	model = "models/icky.mdl";
 	base_mins = [-32,-32,0];
 	base_maxs = [32,32,64];
-	super::NSMonster();
 }

src/server/monster_leech.qc

@@ -40,6 +40,7 @@ class monster_leech:NSMonster
 
 	void(void) monster_leech;
 
+	virtual void(void) Spawned;
 	virtual void(void) Death;
 	virtual void(void) DeathEnd;
 	virtual void(void) Respawn;
@@ -72,13 +73,19 @@ monster_leech::Respawn(void)
 	SetFrame(LEECH_SWIM);
 }
 
-void monster_leech::monster_leech(void)
+void
+monster_leech::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_leech.alert");
 	Sound_Precache("monster_leech.attack");
+}
+
+void monster_leech::monster_leech(void)
+{
 	netname = "Leech";
 	model = "models/leech.mdl";
 	base_mins = [-6,-6,0];
 	base_maxs = [6,6,6];
-	super::NSMonster();
 }

src/server/monster_miniturret.qc

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

src/server/monster_nihilanth.qc

@@ -53,6 +53,7 @@ class monster_nihilanth:NSMonster
 
 	void(void) monster_nihilanth;
 
+	virtual void(void) Spawned;
 	virtual void(void) Death;
 	virtual void(void) Pain;
 	virtual void(void) IdleNoise;
@@ -116,8 +117,11 @@ monster_nihilanth::Respawn(void)
 	SetFrame(NIL_IDLE);
 }
 
-void monster_nihilanth::monster_nihilanth(void)
+void
+monster_nihilanth::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_nihilanth.attack");
 	Sound_Precache("monster_nihilanth.attackball");
 	Sound_Precache("monster_nihilanth.attackballmove");
@@ -125,10 +129,14 @@ void monster_nihilanth::monster_nihilanth(void)
 	Sound_Precache("monster_nihilanth.idle");
 	Sound_Precache("monster_nihilanth.pain");
 	Sound_Precache("monster_nihilanth.recharge");
+}
+
+void
+monster_nihilanth::monster_nihilanth(void)
+{
 	netname = "Nihilanth";
 	model = "models/nihilanth.mdl";
 	base_health = Skill_GetValue("nihilanth_health", 800);
 	base_mins = [-192,-192,-32];
 	base_maxs = [192,192,384];
-	super::NSMonster();
 }

src/server/monster_osprey.qc

@@ -41,5 +41,4 @@ void monster_osprey::monster_osprey(void)
 	model = "models/osprey.mdl";
 	base_mins = [-480,-480,-112];
 	base_maxs = [480,480,24];
-	super::NSMonster();
 }

src/server/monster_rat.qc

@@ -33,5 +33,4 @@ void monster_rat::monster_rat(void)
 	model = "models/bigrat.mdl";
 	base_mins = [-6,-6,-0];
 	base_maxs = [6,6,6];
-	super::NSMonster();
 }

src/server/monster_scientist.qc

@@ -73,6 +73,7 @@ class monster_scientist:NSTalkMonster
 {
 	void(void) monster_scientist;
 
+	virtual void(void) Spawned;
 	virtual void(void) Respawn;
 	virtual void(void) Pain;
 	virtual void(void) Death;
@@ -147,11 +148,41 @@ monster_scientist::SpawnKey(string strKey, string strValue)
 }
 
 void
-monster_scientist::monster_scientist(void)
+monster_scientist::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_scientist.die");
 	Sound_Precache("monster_scientist.pain");
 
+	/* has the body not been overriden, etc. choose a character for us */
+	if (m_iBody == -1) {
+		SetBody((int)floor(random(1,5)));
+	}
+
+	switch (m_iBody) {
+	case 1:
+		m_flPitch = 105;
+		netname = "Walter";
+		break;
+	case 2:
+		m_flPitch = 100;
+		netname = "Einstein";
+		break;
+	case 3:
+		m_flPitch = 95;
+		netname = "Luther";
+		SetSkin(1);
+		break;
+	default:
+		m_flPitch = 100;
+		netname = "Slick";
+	}
+}
+
+void
+monster_scientist::monster_scientist(void)
+{
 	if (spawnflags & MSF_PREDISASTER) {
 		m_talkAsk = "";
 		m_talkPlayerAsk = "!SC_PQUEST";
@@ -187,30 +218,4 @@ monster_scientist::monster_scientist(void)
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	base_health = Skill_GetValue("scientist_health", 20);
-
-	super::NSTalkMonster();
-
-	/* has the body not been overriden, etc. choose a character for us */
-	if (m_iBody == -1) {
-		SetBody((int)floor(random(1,5)));
-	}
-
-	switch (m_iBody) {
-	case 1:
-		m_flPitch = 105;
-		netname = "Walter";
-		break;
-	case 2:
-		m_flPitch = 100;
-		netname = "Einstein";
-		break;
-	case 3:
-		m_flPitch = 95;
-		netname = "Luther";
-		SetSkin(1);
-		break;
-	default:
-		m_flPitch = 100;
-		netname = "Slick";
-	}
 }

src/server/monster_scientist_dead.qc

@@ -102,7 +102,7 @@ monster_scientist_dead::Respawn(void)
 		SetFrame(DSCIA_LYING1);
 	}
 
-	droptofloor();
+	DropToFloor();
 }
 
 void
@@ -127,5 +127,4 @@ void
 monster_scientist_dead::monster_scientist_dead(void)
 {
 	model = "models/scientist.mdl";
-	super::NSMonster();
 }

src/server/monster_sentry.qc

@@ -36,7 +36,8 @@ enum
 class monster_sentry:NSMonster
 {
 	void(void) monster_sentry;
-	
+
+	virtual void(void) Spawned;
 	virtual void(void) Death;
 	virtual void(void) Respawn;
 
@@ -59,20 +60,27 @@ void
 monster_sentry::Respawn(void)
 {
 	super::Respawn();
+
 	SetFrame(SENT_IDLE);
 	iBleeds = FALSE;
 }
 
-void monster_sentry::monster_sentry(void)
+void
+monster_sentry::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_sentry.alert");
 	Sound_Precache("monster_sentry.die");
 	Sound_Precache("monster_sentry.idle");
 	Sound_Precache("monster_sentry.retract");
+}
+
+void monster_sentry::monster_sentry(void)
+{
 	netname = "Sentry";
 	model = "models/sentry.mdl";
 	base_health = Skill_GetValue("sentry_health", 40);
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSMonster();
 }

src/server/monster_sitting_scientist.qc

@@ -102,10 +102,9 @@ monster_sitting_scientist::SpawnKey(string strKey, string strValue)
 }
 
 void
-monster_sitting_scientist::monster_sitting_scientist(void)
+monster_sitting_scientist::Spawned(void)
 {
-	model = "models/scientist.mdl";
-	super::NSTalkMonster();
+	super::Spawned();
 
 	/* has the body not been overriden, etc. choose a character for us */
 	if (m_iBody == -1) {
@@ -131,3 +130,9 @@ monster_sitting_scientist::monster_sitting_scientist(void)
 		netname = "Slick";
 	}
 }
+
+void
+monster_sitting_scientist::monster_sitting_scientist(void)
+{
+	model = "models/scientist.mdl";
+}

src/server/monster_tentacle.qc

@@ -118,15 +118,21 @@ monster_tentacle::Respawn(void)
 }
 
 void
-monster_tentacle::monster_tentacle(void)
+monster_tentacle::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_tentacle.alert");
 	Sound_Precache("monster_tentacle.attack");
 	Sound_Precache("monster_tentacle.die");
 	Sound_Precache("monster_tentacle.idle");
+}
+
+void
+monster_tentacle::monster_tentacle(void)
+{
 	netname = "Tentacle";
 	model = "models/tentacle2.mdl";
 	base_mins = [-32,-32,0];
 	base_maxs = [32,32,64];
-	super::NSMonster();
 }

src/server/monster_turret.qc

@@ -43,5 +43,4 @@ void monster_turret::monster_turret(void)
 	model = "models/turret.mdl";
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
-	super::NSMonster();
 }

src/server/monster_zombie.qc

@@ -76,6 +76,7 @@ class monster_zombie:NSMonster
 
 	void(void) monster_zombie;
 
+	virtual void(void) Spawned;
 	virtual void(void) Pain;
 	virtual void(void) Death;
 	virtual void(void) IdleNoise;
@@ -204,19 +205,25 @@ monster_zombie::Respawn(void)
 }
 
 void
-monster_zombie::monster_zombie(void)
+monster_zombie::Spawned(void)
 {
+	super::Spawned();
+
 	Sound_Precache("monster_zombie.alert");
 	Sound_Precache("monster_zombie.attack");
 	Sound_Precache("monster_zombie.attackhit");
 	Sound_Precache("monster_zombie.attackmiss");
 	Sound_Precache("monster_zombie.idle");
 	Sound_Precache("monster_zombie.pain");
+}
+
+void
+monster_zombie::monster_zombie(void)
+{
 	netname = "Zombie";
 	model = "models/zombie.mdl";
 	base_health = Skill_GetValue("zombie_health", 50);
 	base_mins = [-16,-16,0];
 	base_maxs = [16,16,72];
 	m_iAlliance = MAL_ALIEN;
-	super::NSMonster();
 }

src/server/xen_hair.qc

@@ -43,5 +43,4 @@ void
 xen_hair::xen_hair(void)
 {
 	model = "models/hair.mdl";
-	super::NSRenderableEntity();
 }

src/server/xen_plantlight.qc

@@ -43,5 +43,4 @@ void
 xen_plantlight::xen_plantlight(void)
 {
 	model = "models/light.mdl";
-	super::NSRenderableEntity();
 }

src/server/xen_spore_large.qc

@@ -43,5 +43,4 @@ void
 xen_spore_large::xen_spore_large(void)
 {
 	model = "models/fungus(large).mdl";
-	super::NSRenderableEntity();
 }

src/server/xen_spore_medium.qc

@@ -43,5 +43,4 @@ void
 xen_spore_medium::xen_spore_medium(void)
 {
 	model = "models/fungus.mdl";
-	super::NSRenderableEntity();
 }

src/server/xen_spore_small.qc

@@ -43,5 +43,4 @@ void
 xen_spore_small::xen_spore_small(void)
 {
 	model = "models/fungus(small).mdl";
-	super::NSRenderableEntity();
 }

src/shared/player.qc

@@ -44,6 +44,8 @@ enumflags
 
 class player:NSClientPlayer
 {
+	void(void) player;
+
 	/* animation */
 	PREDICTED_INT(anim_top);
 	PREDICTED_FLOAT(anim_top_time);
@@ -567,3 +569,9 @@ player::SendEntity(entity ePEnt, float fChanged)
 	return (1);
 }
 #endif
+
+void
+player::player(void)
+{
+	print("foobar!!!!!\n");
+}

src/shared/w_egon.qc

@@ -134,6 +134,8 @@ void w_egon_primary(player pl)
 	Client_ShakeOnce(trace_endpos, 128, 0.2, 1.0, 1.0f);
 #endif
 
+	int r = (float)input_sequence % 2;
+
 	pl.ammo_uranium--;
 	pl.gflags |= GF_EGONBEAM;
 
@@ -143,7 +145,6 @@ void w_egon_primary(player pl)
 #endif
 		pl.mode_tempstate = 1;
 		//Weapons_ViewPunchAngle(pl, [-5,0,0]);
-		int r = (float)input_sequence % 2;
 		if (r) {
 			Weapons_ViewAnimation(pl, EGON_FIRE3);
 		} else {