Unify boolean constants

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

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index e5155b8aedac5e2a98194838244424eb024a5dcf..411e1c68674ec7a847eb1a876758c8e66979f898 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -93,7 +93,7 @@ float zombie_block()
 
        defer(2, zombie_blockend);
 
-       return TRUE;
+       return true;
 }
 
 float zombie_attack(float attack_type)
@@ -114,7 +114,7 @@ float zombie_attack(float attack_type)
                        if(random() < 0.3 && self.health < 75 && self.enemy.health > 10)
                                return zombie_block();
 
-                       return monster_melee(self.enemy, (autocvar_g_monster_zombie_attack_melee_damage), chosen_anim, self.attack_range, (autocvar_g_monster_zombie_attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE);
+                       return monster_melee(self.enemy, (autocvar_g_monster_zombie_attack_melee_damage), chosen_anim, self.attack_range, (autocvar_g_monster_zombie_attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, true);
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -123,21 +123,14 @@ float zombie_attack(float attack_type)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_zombie()
 {
        self.classname = "monster_zombie";
 
-       self.monster_spawnfunc = spawnfunc_monster_zombie;
-
-       self.spawnflags |= MONSTER_RESPAWN_DEATHPOINT;
-
-       if(Monster_CheckAppearFlags(self))
-               return;
-
-       if(!monster_initialize(MON_ZOMBIE, FALSE)) { remove(self); return; }
+       if(!monster_initialize(MON_ZOMBIE)) { remove(self); return; }
 }
 
 float m_zombie(float req)
@@ -147,14 +140,14 @@ float m_zombie(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_zombie_speed_run), (autocvar_g_monster_zombie_speed_walk), (autocvar_g_monster_zombie_speed_stop), zombie_anim_runforward, zombie_anim_runforward, zombie_anim_idle);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.armorvalue = 0;
                        self.m_armor_blockpercent = autocvar_g_monsters_armor_blockpercent;
                        self.frame = ((random() > 0.5) ? zombie_anim_deathback1 : zombie_anim_deathfront1);
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -163,6 +156,8 @@ float m_zombie(float req)
                        if(self.spawnflags & MONSTERFLAG_NORESPAWN)
                                self.spawnflags &= ~MONSTERFLAG_NORESPAWN; // zombies always respawn
 
+                       self.spawnflags |= MONSTER_RESPAWN_DEATHPOINT;
+
                        self.monster_loot = spawnfunc_item_health_medium;
                        self.monster_attackfunc = zombie_attack;
                        self.frame = zombie_anim_spawn;
@@ -170,16 +165,16 @@ float m_zombie(float req)
                        self.spawnshieldtime = self.spawn_time;
                        self.respawntime = 0.2;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/zombie.dpm");
-                       return TRUE;
+                       precache_model("models/monsters/zombie.dpm");
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -190,12 +185,11 @@ float m_zombie(float req)
        {
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/zombie.dpm");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC