Properly fix monsters thinking they're fish

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / lib / monsters.qc

diff --git a/qcsrc/common/monsters/lib/monsters.qc b/qcsrc/common/monsters/lib/monsters.qc
index 6691b9e485db13e497becd2ed965f20b68961413..3bd5a46f663913102e7621a3768e8e417a0bec70 100644 (file)
--- a/qcsrc/common/monsters/lib/monsters.qc
+++ b/qcsrc/common/monsters/lib/monsters.qc
@@ -757,7 +757,6 @@ float monster_send(entity to, float sf)
                
                WriteByte(MSG_ENTITY, self.skin);
                WriteByte(MSG_ENTITY, self.team);
-               WriteByte(MSG_ENTITY, self.scale);
     }
     
     if(sf & MSF_ANG)
@@ -998,7 +997,7 @@ void monster_spawn()
        self.SendFlags = MSF_SETUP;
 }
 
-float monster_initialize(float mon_id, float nodrop, float sflags)
+float monster_initialize(float mon_id, float nodrop)
 {
        if not(autocvar_g_monsters)
                return FALSE;
@@ -1059,10 +1058,10 @@ float monster_initialize(float mon_id, float nodrop, float sflags)
        self.gravity                    = 1;
        self.dphitcontentsmask  = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
        
-       if(sflags & MONSTER_TYPE_SWIM)
+       if(mon.spawnflags & MONSTER_TYPE_SWIM)
                self.flags |= FL_SWIM;
                
-       if(sflags & MONSTER_TYPE_FLY)
+       if(mon.spawnflags & MONSTER_TYPE_FLY)
        {
                self.flags |= FL_FLY;
                self.movetype = MOVETYPE_FLY;
@@ -1071,7 +1070,7 @@ float monster_initialize(float mon_id, float nodrop, float sflags)
        if not(self.scale)
                self.scale = 1;
                
-       if(sflags & MONSTER_SIZE_BROKEN)
+       if(mon.spawnflags & MONSTER_SIZE_BROKEN)
                self.scale = 1.3;
        
        if not(self.attack_range)