From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Sep 2013 23:58:10 +0000 (+1000)
Subject: Precache in the correct VM
X-Git-Tag: xonotic-v0.8.0~241^2^2~99
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=987a967193136f4e917f16058d74a676b41b8c1c;p=xonotic%2Fxonotic-data.pk3dir.git

Precache in the correct VM
---

diff --git a/qcsrc/common/monsters/monster/brute.qc b/qcsrc/common/monsters/monster/brute.qc
index 7d747457a..91a307bdf 100644
--- 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 ab7422df7..37dee43df 100644
--- 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 e308b618e..9b527b76a 100644
--- 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 f322d9a2f..ffda3b99f 100644
--- 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 b7678a7cf..612affd0c 100644
--- 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;
 		}
 	}