Precache in the correct VM

diff --git a/qcsrc/common/monsters/monster/brute.qc b/qcsrc/common/monsters/monster/brute.qc
index 7d747457af78b79312a3ad7ddc8cc8378477217c..91a307bdff0b60bb6842fe84423b8522bd34e715 100644 (file)
--- a/qcsrc/common/monsters/monster/brute.qc
+++ b/qcsrc/common/monsters/monster/brute.qc
@@ -230,7 +230,9 @@ float m_brute(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_sound ("weapons/uzi_fire.wav");
+                       precache_sound ("weapons/grenade_impact.wav");
+                       precache_sound ("weapons/grenade_fire.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -257,9 +259,6 @@ float m_brute(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/ogre.dpm");
-                       precache_sound ("weapons/uzi_fire.wav");
-                       precache_sound ("weapons/grenade_impact.wav");
-                       precache_sound ("weapons/grenade_fire.wav");
                        return TRUE;
                }
        }

diff --git a/qcsrc/common/monsters/monster/knight.qc b/qcsrc/common/monsters/monster/knight.qc
index ab7422df7e6e72f98c1232e9c04d6a519c46c721..37dee43df813f48dfded0a55ff3d331c0b11e8b1 100644 (file)
--- a/qcsrc/common/monsters/monster/knight.qc
+++ b/qcsrc/common/monsters/monster/knight.qc
@@ -301,6 +301,7 @@ float m_knight(float req)
                case MR_INIT:
                {
                        precache_sound ("player/lava.wav");
+                       precache_sound ("weapons/fireball2.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -327,8 +328,6 @@ float m_knight(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/hknight.mdl");
-                       precache_sound ("player/lava.wav");
-                       precache_sound ("weapons/fireball2.wav");
                        return TRUE;
                }
        }

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index e308b618e6cff76b7998e71a460eba9a3d7fb702..9b527b76a5107abb058768fc57d67d49a5474c77 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -448,7 +448,9 @@ float m_mage(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_model ("models/items/g_h50.md3");
+                       precache_model ("models/ctf/shield.md3");
+                       precache_sound ("weapons/grenade_impact.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -475,9 +477,6 @@ float m_mage(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/mage.dpm");
-                       precache_model ("models/items/g_h50.md3");
-                       precache_model ("models/ctf/shield.md3");
-                       precache_sound ("weapons/grenade_impact.wav");
                        return TRUE;
                }
        }

diff --git a/qcsrc/common/monsters/monster/slime.qc b/qcsrc/common/monsters/monster/slime.qc
index f322d9a2fc212ed23fb0be246aeebd82e3515ccc..ffda3b99feaa35b70bfac68f169944fd8d68bad7 100644 (file)
--- a/qcsrc/common/monsters/monster/slime.qc
+++ b/qcsrc/common/monsters/monster/slime.qc
@@ -131,7 +131,7 @@ float m_slime(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_sound ("weapons/rocket_impact.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -158,7 +158,6 @@ float m_slime(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/slime.dpm");
-                       precache_sound ("weapons/rocket_impact.wav");
                        return TRUE;
                }
        }

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index b7678a7cf7f9ef9fcc642fd6c625bb3fa77025da..612affd0ce42561f3b9e649fe496aafd075886b6 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -201,7 +201,8 @@ float m_spider(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_sound ("weapons/electro_fire2.wav");
+                       precache_sound ("weapons/fireball_fire.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -228,8 +229,6 @@ float m_spider(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/spider.dpm");
-                       precache_sound ("weapons/electro_fire2.wav");
-                       precache_sound ("weapons/fireball_fire.wav");
                        return TRUE;
                }
        }