Add sounds support to every monster

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index bf12cb4e8a815b9f94fcad36c45fcba59b149fc8..50cb7fc15bb3df405eb122582e1fb73e91a399bf 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -182,6 +182,16 @@ void monster_precachesounds(entity e)
        precache_sound(e.msound_pain);
 }
 
+void monster_setupsounds(string mon)
+{
+       if(self.msound_idle == "") self.msound_idle = strzone(strcat("monsters/", mon, "_idle.wav"));
+       if(self.msound_death == "") self.msound_death = strzone(strcat("monsters/", mon, "_death.wav"));
+       if(self.msound_pain == "") self.msound_pain = strzone(strcat("monsters/", mon, "_pain.wav"));
+       if(self.msound_attack_melee == "") self.msound_attack_melee = strzone(strcat("monsters/", mon, "_melee.wav"));
+       if(self.msound_attack_ranged == "") self.msound_attack_ranged = strzone(strcat("monsters/", mon, "_attack.wav"));
+       if(self.msound_sight == "") self.msound_sight = strzone(strcat("monsters/", mon, "_sight.wav"));
+}
+
 void monster_melee (entity targ, float damg, float er, float deathtype, float dostop)
 {
        float bigdmg, dot, rdmg = damg * random();

diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc
index a417dd8b227777a25c9c9e409d343590562c4adc..ecf8c84188762e5a49de099d285915b61af68052 100644 (file)
--- a/qcsrc/server/monsters/monster/demon.qc
+++ b/qcsrc/server/monsters/monster/demon.qc
@@ -98,6 +98,8 @@ void demon_spawn ()
        
        monsters_setframe(demon_anim_stand);
        
+       monster_setupsounds("demon");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/dog.qc b/qcsrc/server/monsters/monster/dog.qc
index 66385e4aece1042fb27331809f0eca71877a7069..8a9b306efe1efa66303ca04e765f02ee30df5232 100644 (file)
--- a/qcsrc/server/monsters/monster/dog.qc
+++ b/qcsrc/server/monsters/monster/dog.qc
@@ -92,6 +92,8 @@ void dog_spawn ()
        self.sprite_height              = 20;
        monsters_setframe(dog_anim_idle);
        
+       monster_setupsounds("dog");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/enforcer.qc b/qcsrc/server/monsters/monster/enforcer.qc
index d9720258c7ce72eed1329f0eb765cf59ddc85d8d..1f8b176b4a03a1f1e36559ae5b67278e5aa57bb8 100644 (file)
--- a/qcsrc/server/monsters/monster/enforcer.qc
+++ b/qcsrc/server/monsters/monster/enforcer.qc
@@ -121,6 +121,8 @@ void enforcer_spawn ()
        
        monsters_setframe(enforcer_anim_stop);
        
+       monster_setupsounds("enforcer");
+       
        setmodel(self, ENFORCER_MODEL); // for weapon entity
        
        self.weaponentity = spawn();

diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc
index afbb13baa4bddad9843fe3d4a0c49977ceb48f99..82cf6162aefd64d42b248e8fa6b47bff5aeae9e9 100644 (file)
--- a/qcsrc/server/monsters/monster/fish.qc
+++ b/qcsrc/server/monsters/monster/fish.qc
@@ -63,6 +63,8 @@ void fish_spawn ()
        self.think                              = fish_think;
        self.sprite_height              = 20;
        
+       monster_setupsounds("fish");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index 780647a81e8c7389d0bd58fceac9dc0192a0a0a0..a916e60f616590171bf5828dc070340569c3da9e 100644 (file)
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -433,6 +433,8 @@ void hellknight_spawn ()
        
        monsters_setframe(hellknight_anim_stand);
        
+       monster_setupsounds("hellknight");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc
index 07701b659ab7b7592cb83d57efaaddfeded61127..93cbe663cd8e594ebbd471541f65d1bf1369199a 100644 (file)
--- a/qcsrc/server/monsters/monster/knight.qc
+++ b/qcsrc/server/monsters/monster/knight.qc
@@ -77,6 +77,8 @@ void knight_spawn ()
        
        monsters_setframe(knight_anim_stand);
        
+       monster_setupsounds("knight");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index 2710d585504affe512344d3fa4f553b89ad115c7..451d89b75cf94ccdb80fcaf13e4e3470c7bc0a45 100644 (file)
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -148,6 +148,8 @@ void ogre_spawn ()
        
        monsters_setframe(ogre_anim_idle);
        
+       monster_setupsounds("ogre");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index 2d481ac4f54fbabab8d4c59e102e13a209741693..4b836965c4ddda2791b324fffa9b672840c193cd 100644 (file)
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -274,6 +274,8 @@ void shalrath_spawn ()
        
        monsters_setframe(shalrath_anim_walk);
        
+       monster_setupsounds("shalrath");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 5732d79a6bca2aeba720cf01d2b5f7cd05ec5a6d..15b505b0314358fa66cc35c59a262021ed390515 100644 (file)
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -167,6 +167,8 @@ void shambler_spawn ()
        
        monsters_setframe(shambler_anim_stand);
        
+       monster_setupsounds("shambler");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index 98ff5cad93eeea7b3b40491b8149b48a4f018307..9be7211d23e6f80b6c12da67457f3b281e86fbf9 100644 (file)
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -177,6 +177,8 @@ void soldier_spawn ()
        
        monsters_setframe(soldier_anim_draw);
        
+       monster_setupsounds("soldier");
+       
        setmodel(self, SOLDIER_MODEL);
        
        RandomSelection_Init();

diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index cb22046c79d1947c75e541d7afc3b6997347c11a..be1e7b77e9fee272f6e3cea4dfa5d08fe4c943b3 100644 (file)
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -174,6 +174,8 @@ void spider_spawn()
        
        monsters_setframe(spider_anim_idle);
        
+       monster_setupsounds("spider");
+       
        if not(self.spider_type)
                self.spider_type = autocvar_g_monster_spider_attack_type;
        

diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index b438de4b5bef1831ee0465f09acf10c0f92f9a7e..bf83d649521f1d44c9fda1334c47e9e54ab78e12 100644 (file)
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -129,6 +129,8 @@ void tarbaby_spawn ()
        
        monsters_setframe(tarbaby_anim_walk);
        
+       monster_setupsounds("tarbaby");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index e87555f8b76c580899f8f5269a74698edf21caeb..b498009960e54e914d21fe1f70d07eb13f1affd6 100644 (file)
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -151,6 +151,8 @@ void wizard_spawn ()
        self.think                              = wizard_think;
        self.sprite_height              = 30;
        
+       monster_setupsounds("wizard");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 

diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc
index 48ab86c161fe5d1077405b35a5f32beae47b7dd4..99e38ab20f3af8630e8578455e365022564dcd87 100644 (file)
--- a/qcsrc/server/monsters/monster/zombie.qc
+++ b/qcsrc/server/monsters/monster/zombie.qc
@@ -141,13 +141,7 @@ void zombie_spawn()
        if not(self.monster_respawned)
                self.skin = rint(random() * 4);
        
-       // some sounds
-       if(self.msound_idle == "") self.msound_idle = "monsters/zombie_idle.wav";
-       if(self.msound_death == "") self.msound_death = "monsters/zombie_death.wav";
-       if(self.msound_pain == "") self.msound_pain = "monsters/zombie_pain.wav";
-       if(self.msound_attack_melee == "") self.msound_attack_melee = "monsters/zombie_melee.wav";
-       if(self.msound_attack_ranged == "") self.msound_attack_ranged = "monsters/zombie_attack.wav";
-       if(self.msound_sight == "") self.msound_sight = "monsters/zombie_sight.wav";
+       monster_setupsounds("zombie");
        
        monster_hook_spawn(); // for post-spawn mods
 }