fix other CHAN_ use

diff --git a/qcsrc/client/csqc_constants.qc b/qcsrc/client/csqc_constants.qc
index 5976eb975eee0e3151deff590e4348916714e41a..e82f4399bdb0ce9921ceabe7bf059ab9ff8673fd 100644 (file)
--- a/qcsrc/client/csqc_constants.qc
+++ b/qcsrc/client/csqc_constants.qc
@@ -64,18 +64,6 @@ const float          STAT_FRAGLIMIT                                  = 235;
 const float            STAT_TIMELIMIT                                  = 236;
 const float     STAT_MOVEVARS_GRAVITY           = 242;
 
-// Sound Constants
-//const float          CHAN_AUTO                                               = 0;
-//const float          CHAN_WEAPON                                             = 1;
-//const float          CHAN_VOICE                                              = 2;
-//const float          CHAN_ITEM                                               = 3;
-//const float          CHAN_BODY                                               = 4;
-
-//const float          ATTN_NONE                                               = 0;
-//const float          ATTN_NORM                                               = 1;
-//const float          ATTN_IDLE                                               = 2;
-//const float          ATTN_STATIC                                             = 3;
-
 // Quake-style Point Contents
 const float            CONTENT_EMPTY                                   = -1;
 const float            CONTENT_SOLID                                   = -2;

diff --git a/qcsrc/server/monsters/ai.qc b/qcsrc/server/monsters/ai.qc
index 022fde20152fec14ba2b6e223308569b6b146ff8..b7c775578cc22b339a0c124e87c63c08a9d97ac8 100644 (file)
--- a/qcsrc/server/monsters/ai.qc
+++ b/qcsrc/server/monsters/ai.qc
@@ -115,8 +115,10 @@ void() t_movetarget =
        self = other;
        other = temp;
 
+       /* PLEASE FIX THE SOUND CHANNEL BEFORE ACTIVATING THIS
        if (self.classname == "monster_ogre")
                sound (self, CHAN_VOICE, "ogre/ogdrag.wav", 1, ATTN_IDLE);// play chainsaw drag sound
+       */
 
 //dprint ("t_movetarget\n");
        self.goalentity = self.movetarget = find (world, targetname, other.target);
@@ -168,8 +170,10 @@ void() monster_wanderpathtouch =
        if (other.enemy)
                return;         // fighting, not following a path
 
+       /* PLEASE FIX THE SOUND CHANNEL BEFORE ACTIVATING THIS
        if (other.classname == "monster_ogre")
                sound (other, CHAN_VOICE, "ogre/ogdrag.wav", 1, ATTN_IDLE);// play chainsaw drag sound
+       */
        monster_wanderpaththink();
 };
 

diff --git a/qcsrc/server/monsters/m_monsters.qc b/qcsrc/server/monsters/m_monsters.qc
index dd12e96bcb9471ff27b53a6364e4ff1b64988b5f..ceb3f207cc45d59c3f50d218a1c6ad61af75dc94 100644 (file)
--- a/qcsrc/server/monsters/m_monsters.qc
+++ b/qcsrc/server/monsters/m_monsters.qc
@@ -104,7 +104,9 @@ void(float a) monster_setalpha =
                        if (random() < 0.005)
                        {
                                // blink for an instant, this causes the appear sound, alarming the player as if under attack
+                               /* PLEASE FIX THE SOUND CHANNEL BEFORE ACTIVATING THIS
                                sound(self, CHAN_AUTO, "wizard/wsight.wav", 1, ATTN_NORM);
+                               */
                                a = 1;
                        }
                }
@@ -117,8 +119,10 @@ void(float a) monster_setalpha =
                else
                {
                        // if unghosting, make sure we have an enemy, otherwise stay ghosted (even if blinking) so we can't be shot while blinking
+                       /* PLEASE FIX THE SOUND CHANNEL BEFORE ACTIVATING THIS
                        if (self.solid != SOLID_SLIDEBOX)
                                sound(self, CHAN_AUTO, "wizard/wsight.wav", 1, ATTN_NORM);
+                       */
                        self.solid = SOLID_SLIDEBOX;
                        self.takedamage = DAMAGE_AIM;
                }

diff --git a/qcsrc/server/tturrets/units/unit_hk.qc b/qcsrc/server/tturrets/units/unit_hk.qc
index f62d2ad9a97b7bc8191bb98b8f232afe3408de6b..5ad222fa09c93ffbee62968df451a2864f6db7b2 100644 (file)
--- a/qcsrc/server/tturrets/units/unit_hk.qc
+++ b/qcsrc/server/tturrets/units/unit_hk.qc
@@ -283,7 +283,6 @@ void turret_hk_missile_think()
         self.cnt = time + 0.25;
         self.nextthink = 0;
         self.movetype         = MOVETYPE_BOUNCE;
-        sound    (self, CHAN_VOICE, "", 0.4 * VOL_BASE, ATTN_NORM);
         return;
     }