]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add random skin support to all monsters
authorMario <mario.mario@y7mail.com>
Mon, 22 Apr 2013 14:29:28 +0000 (00:29 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 22 Apr 2013 14:29:28 +0000 (00:29 +1000)
qcsrc/client/monsters.qc
qcsrc/server/monsters/lib/monsters.qc
qcsrc/server/monsters/monster/zombie.qc

index dcd6f26675c4e0234b3c4b525d88371e19e73ac4..5b66e65eb858629937761fe0659cee573b4621c9 100644 (file)
@@ -279,7 +279,7 @@ void ent_monster()
        sf = ReadByte();
 
        if(sf & MSF_SETUP)
-       {               
+       {
                self.monsterid = ReadByte();
                                
                self.origin_x = ReadCoord();
index b477095f3a4b60efa020d89479218d30efadf1a5..2dc50ab448262af3022258e9e2e0eba32181e67d 100644 (file)
@@ -916,6 +916,9 @@ void monster_hook_spawn()
                setorigin(self, trace_endpos);
        }
        
+       if not(self.monster_respawned)
+               self.skin = rint(random() * 4);
+       
        self.pos1 = self.origin;
 
        monster_precachesounds(self);
index d9d239b2c5810db18eac90bfc2c583b7abf41414..38c61cd0234d353f4511c71acdf16a8e4ca21881 100644 (file)
@@ -135,9 +135,6 @@ void zombie_spawn()
        
        monsters_setframe(zombie_anim_spawn);
        
-       if not(self.monster_respawned)
-               self.skin = rint(random() * 4);
-       
        monster_setupsounds("zombie");
        
        monster_hook_spawn(); // for post-spawn mods