From: Mario <mario.mario@y7mail.com>
Date: Sat, 13 Apr 2013 12:47:54 +0000 (+1000)
Subject: Move some more precaching to the client
X-Git-Tag: xonotic-v0.8.0~241^2^2~415
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68d6e9bbdaa51f6a033b3e19744992d33a6d8104;p=xonotic%2Fxonotic-data.pk3dir.git

Move some more precaching to the client
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 93c094345..f7a5e1dad 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -42,6 +42,11 @@ void monster_precache(float _mid)
 		case MONSTER_MARINE:
 		{
 			precache_model(SOLDIER_MODEL);
+			precache_sound("weapons/shotgun_fire.wav");
+			precache_sound("weapons/uzi_fire.wav");
+			precache_sound("weapons/laser_fire.wav");
+			precache_sound("weapons/reload.wav");
+			precache_model("models/weapons/v_seeker.md3");
 			break;
 		}
 		case MONSTER_SCRAG:
@@ -57,6 +62,7 @@ void monster_precache(float _mid)
 		case MONSTER_TARBABY:
 		{
 			precache_model(TARBABY_MODEL);
+			precache_sound("weapons/rocket_impact.wav");
 			break;
 		}
 		case MONSTER_HELLKNIGHT:
@@ -77,6 +83,7 @@ void monster_precache(float _mid)
 		case MONSTER_ENFORCER:
 		{
 			precache_model(ENFORCER_MODEL);
+			precache_model("models/turrets/ewheel-gun1.md3");
 			break;
 		}
 		case MONSTER_SPIDER:
diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index f231b0c06..780647a81 100644
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -78,7 +78,6 @@ void hknight_shoot ()
 		flytime = 0.1;
 
 	self.effects |= EF_MUZZLEFLASH;
-	sound (self, CHAN_WEAPON, "weapons/spike.wav", 1, ATTN_NORM);
 
 	missile = spawn ();
 	missile.owner = missile.realowner = self;
@@ -457,8 +456,6 @@ void spawnfunc_monster_hell_knight ()
 		remove(self);
 		return;
 	}
-	
-	precache_sound ("weapons/spike.wav");
 }
 
 // compatibility with old spawns
diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index cea6f94be..5732d79a6 100644
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -190,11 +190,6 @@ void spawnfunc_monster_shambler ()
 		remove(self);
 		return;
 	}
-	
-	precache_model ("progs/beam.mdl");
-	precache_model ("models/weapons/g_nex.md3");
-	
-	precache_sound ("weapons/lgbeam_fire.wav");
 }
 
 #endif // SVQC
diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index 8b5c20fd5..98ff5cad9 100644
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -220,12 +220,6 @@ void spawnfunc_monster_soldier ()
 		remove(self);
 		return;
 	}
-	
-	precache_sound ("weapons/shotgun_fire.wav");
-	precache_sound ("weapons/uzi_fire.wav");
-	precache_sound ("weapons/laser_fire.wav");
-	precache_sound ("weapons/reload.wav");
-	precache_model ("models/weapons/v_seeker.md3");
 }
 
 // compatibility with old spawns
diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index be67702a0..b438de4b5 100644
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -152,8 +152,6 @@ void spawnfunc_monster_tarbaby ()
 		remove(self);
 		return;
 	}
-	
-	precache_sound ("weapons/rocket_impact.wav");
 }
 
 // compatibility with old spawns
diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index 301f91e7c..cc9374807 100644
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -171,9 +171,6 @@ void spawnfunc_monster_wizard ()
 		remove(self);
 		return;
 	}
-	
-	precache_model ("models/spike.mdl");
-	precache_sound ("weapons/spike.wav");
 }
 
 // compatibility with old spawns