get rid of 'local' prefixes (does nothing)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / m_monsters.qc

diff --git a/qcsrc/server/monsters/m_monsters.qc b/qcsrc/server/monsters/m_monsters.qc
index dd12e96bcb9471ff27b53a6364e4ff1b64988b5f..c43538e023abbb6696deea4aca1fdffb8e759835 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;
                }
@@ -152,7 +156,7 @@ void() monster_death_use =
 
 void() monsterinwall =
 {
-       local entity e;
+       entity e;
        if (!autocvar_developer)
                return;
        // this is handy for level designers,
@@ -255,6 +259,7 @@ void() walkmonster_start_go =
 // spread think times so they don't all happen at same time
        self.nextthink = self.nextthink + random()*0.5 + 0.1;
        self.iscreature = TRUE;
+       self.damagedbycontents = TRUE;
 
        force_retouch = 2; // mainly to detect teleports
 
@@ -348,6 +353,7 @@ void() flymonster_start_go =
                }
        }
        self.iscreature = TRUE;
+       self.damagedbycontents = TRUE;
 
        force_retouch = 2; // mainly to detect teleports
 
@@ -436,6 +442,7 @@ void() swimmonster_start_go =
                }
        }
        self.iscreature = TRUE;
+       self.damagedbycontents = TRUE;
 
        force_retouch = 2; // mainly to detect teleports
 
@@ -459,7 +466,7 @@ void() swimmonster_start =
 
 void(vector org, float bodydamage, float armordamage, vector force, float damgtype) genericbleedfunc =
 {
-        local vector v;
+        vector v;
         v = '0 0 0' - force * 0.05;
         if (armordamage > 0)
                 te_spark(org, v, armordamage * 3);