Remove marine

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

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index d2176d9051c5a9334622d5ab72f3b89d587c61ae..ff2a3d00e13d066580d3fa8882ef2031d32c313e 100644 (file)
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -39,24 +39,14 @@ void monster_precache(float _mid)
                        precache_model(BRUISER_MODEL);
                        break;
                }
-               case MONSTER_MARINE:
-               {
-                       precache_model(SOLDIER_MODEL);
-                       precache_sound("weapons/shotgun_fire.wav");
-                       precache_sound("weapons/uzi_fire.wav");
-                       precache_sound("weapons/laser_fire.wav");
-                       precache_sound("weapons/reload.wav");
-                       precache_model("models/weapons/v_seeker.md3");
-                       break;
-               }
                case MONSTER_WYVERN:
                {
                        precache_model(WYVERN_MODEL);
                        break;
                }
-               case MONSTER_DOG:
+               case MONSTER_CERBERUS:
                {
-                       precache_model(DOG_MODEL);
+                       precache_model(CERBERUS_MODEL);
                        break;
                }
                case MONSTER_SLIME:
@@ -65,9 +55,9 @@ void monster_precache(float _mid)
                        precache_sound("weapons/rocket_impact.wav");
                        break;
                }
-               case MONSTER_HELLKNIGHT:
+               case MONSTER_KNIGHT:
                {
-                       precache_model(HELLKNIGHT_MODEL);
+                       precache_model(KNIGHT_MODEL);
                        break;
                }
                case MONSTER_FISH:
@@ -77,7 +67,7 @@ void monster_precache(float _mid)
                }
                case MONSTER_MAGE:
                {
-                       precache_model(SHALRATH_MODEL);
+                       precache_model(MAGE_MODEL);
                        break;
                }
                case MONSTER_SPIDER:
@@ -144,14 +134,6 @@ void monster_mid2info(float _mid)
                        if(self) self.scale = 1.3;
                        break;
                }
-               case MONSTER_MARINE:
-               {
-                       mid2info_model = SOLDIER_MODEL;
-                       mid2info_name = "Marine";
-                       mid2info_min = SOLDIER_MIN;
-                       mid2info_max = SOLDIER_MAX;
-                       break;
-               }
                case MONSTER_WYVERN:
                {
                        mid2info_model = WYVERN_MODEL;
@@ -161,12 +143,12 @@ void monster_mid2info(float _mid)
                        if(self) self.scale = 1.3;
                        break;
                }
-               case MONSTER_DOG:
+               case MONSTER_CERBERUS:
                {
-                       mid2info_model = DOG_MODEL;
+                       mid2info_model = CERBERUS_MODEL;
                        mid2info_name = "Cerberus";
-                       mid2info_min = DOG_MIN;
-                       mid2info_max = DOG_MAX;
+                       mid2info_min = CERBERUS_MIN;
+                       mid2info_max = CERBERUS_MAX;
                        break;
                }
                case MONSTER_SLIME:
@@ -177,12 +159,12 @@ void monster_mid2info(float _mid)
                        mid2info_max = SLIME_MAX;
                        break;
                }
-               case MONSTER_HELLKNIGHT:
+               case MONSTER_KNIGHT:
                {
-                       mid2info_model = HELLKNIGHT_MODEL;
-                       mid2info_name = "Hell-Knight";
-                       mid2info_min = HELLKNIGHT_MIN;
-                       mid2info_max = HELLKNIGHT_MAX;
+                       mid2info_model = KNIGHT_MODEL;
+                       mid2info_name = "Knight";
+                       mid2info_min = KNIGHT_MIN;
+                       mid2info_max = KNIGHT_MAX;
                        if(self) self.scale = 1.3;
                        break;
                }
@@ -197,10 +179,10 @@ void monster_mid2info(float _mid)
                }
                case MONSTER_MAGE:
                {
-                       mid2info_model = SHALRATH_MODEL;
+                       mid2info_model = MAGE_MODEL;
                        mid2info_name = "Mage";
-                       mid2info_min = SHALRATH_MIN;
-                       mid2info_max = SHALRATH_MAX;
+                       mid2info_min = MAGE_MIN;
+                       mid2info_max = MAGE_MAX;
                        break;
                }
                case MONSTER_SPIDER:
@@ -227,6 +209,8 @@ void monster_changeteam()
        
        if(self.team)
                self.colormap = 1024 + (self.team - 1) * 17;
+       else
+               self.colormap = 1024;
 }
 
 void monster_die()
@@ -290,11 +274,11 @@ void ent_monster()
                self.angles_y = ReadAngle();
                
                self.skin = ReadByte();
+               self.team = ReadByte();
                
                monster_precache(self.monsterid);
                monster_construct();
-               self.colormap = 1024;
-               self.glowmod = '0 1 1'; 
+               monster_changeteam();
        }
        
        if(sf & MSF_ANG)