Remove old monster sound system

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 62555c371b83312db81051e2b532065ded92f271..6638dc3a8e9ef3157dacda2d8509c87139c97da1 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -443,7 +443,6 @@ void monster_checkattack(entity e, entity targ)
        if(vlen(targ.origin - e.origin) <= e.attack_range)
        if(e.monster_attackfunc(MONSTER_ATTACK_MELEE))
        {
-               //monster_sound(e.msound_attack_melee, 0, FALSE);
                MonsterSound(monstersound_melee, 0, FALSE, CH_VOICE);
                return;
        }
@@ -451,7 +450,6 @@ void monster_checkattack(entity e, entity targ)
        if(vlen(targ.origin - e.origin) > e.attack_range)
        if(e.monster_attackfunc(MONSTER_ATTACK_RANGED))
        {
-               //monster_sound(e.msound_attack_ranged, 0, FALSE);
                MonsterSound(monstersound_ranged, 0, FALSE, CH_VOICE);
                return;
        }
@@ -645,7 +643,6 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                        self.enemy = FindTarget(self);
                        if(self.enemy)
                                MonsterSound(monstersound_sight, 0, FALSE, CH_VOICE);
-                               //monster_sound(self.msound_sight, 0, FALSE);
                }
 
                self.last_enemycheck = time + 0.5;
@@ -660,7 +657,6 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 
        if not(self.enemy)
                MonsterSound(monstersound_idle, 5, TRUE, CH_VOICE);
-               //monster_sound(self.msound_idle, 5, TRUE);
 
        if(self.state != MONSTER_STATE_ATTACK_LEAP && self.state != MONSTER_STATE_ATTACK_MELEE)
                self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95);
@@ -897,7 +893,6 @@ void monster_die()
        monster_dropitem();
 
        MonsterSound(monstersound_death, 0, FALSE, CH_VOICE);
-       //monster_sound(self.msound_death, 0, FALSE);
 
        if(!(self.spawnflags & MONSTERFLAG_SPAWNED) && !self.monster_respawned)
                monsters_killed += 1;
@@ -1037,8 +1032,7 @@ void monster_spawn()
 
        if(teamplay)
                self.monster_attack = TRUE; // we can have monster enemies in team games
-
-       //monster_sound(self.msound_spawn, 0, FALSE);
+               
        MonsterSound(monstersound_spawn, 0, FALSE, CH_VOICE);
 
        self.think = monster_think;

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index e929defe83778d04d2c7106cabcd8ebf2da05420..2327887cce5e018506c9c18933ede02fb5970f41 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -34,6 +34,7 @@ const float MONSTER_ATTACK_RANGED     = 2;
 
 // monster sounds
 // copied from player sounds
+.float msound_delay; // temporary antilag system
 #define ALLMONSTERSOUNDS \
                _MSOUND(death) \
                _MSOUND(sight) \
@@ -63,15 +64,6 @@ const float MONSTERFLAG_INFRONT = 32; // only check for enemies infront of us
 const float MONSTERFLAG_MINIBOSS = 64;  // monster spawns as mini-boss (also has a chance of naturally becoming one)
 const float MONSTERFLAG_SPAWNED = 16384; // flag for spawned monsters
 
-.float msound_delay; // restricts some monster sounds
-.string msound_idle;
-.string msound_death;
-.string msound_attack_melee;
-.string msound_attack_ranged;
-.string msound_spawn;
-.string msound_sight;
-.string msound_pain;
-
 .void() monster_spawnfunc;
 
 .float monster_movestate; // used to tell what the monster is currently doing