From f123c5a9b34b02012b90a84c6b381757843d7b69 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 3 Jul 2011 18:06:30 +0200 Subject: [PATCH] fix other CHAN_ use --- qcsrc/client/csqc_constants.qc | 12 ------------ qcsrc/server/monsters/ai.qc | 4 ++++ qcsrc/server/monsters/m_monsters.qc | 4 ++++ qcsrc/server/tturrets/units/unit_hk.qc | 1 - 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/qcsrc/client/csqc_constants.qc b/qcsrc/client/csqc_constants.qc index 5976eb975..e82f4399b 100644 --- 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 022fde201..b7c775578 100644 --- 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 dd12e96bc..ceb3f207c 100644 --- 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 f62d2ad9a..5ad222fa0 100644 --- 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; } -- 2.39.2