Move some more precaching to the client

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 93c0943454b0bc0084326545bfe75ed2752775b3..f7a5e1dad94427ebdfac84c1dd82bff91f1127c7 100644 (file)
--- 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 f231b0c06b1a6ded3e0dcdcceb203692687019c7..780647a81e8c7389d0bd58fceac9dc0192a0a0a0 100644 (file)
--- 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 cea6f94bea0735a70c6fb26c874acfe6ed7b8f0a..5732d79a6bca2aeba720cf01d2b5f7cd05ec5a6d 100644 (file)
--- 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 8b5c20fd5049e081fc4a69f5a933296a9e36ddaa..98ff5cad93eeea7b3b40491b8149b48a4f018307 100644 (file)
--- 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 be67702a07baecb0c47097c4ed48c9f08fc687e8..b438de4b5bef1831ee0465f09acf10c0f92f9a7e 100644 (file)
--- 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 301f91e7c8ca547716e94d9efa77c725000c74bb..cc9374807f49f05af52416f8630f392976080423 100644 (file)
--- 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