Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index bd2a216bc985b0e71b3275ac38e24b1037c32afb..3fe8567aee36c8f178616d76e8dad81fd234fae7 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -2,16 +2,16 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
 {
        // ensure spawnfunc database is initialized
        initialize_field_db();
-       
+
        entity e = spawn();
-       
+
        e.spawnflags = MONSTERFLAG_SPAWNED;
-       
-       if not(respwn)
+
+       if(!respwn)
                e.spawnflags |= MONSTERFLAG_NORESPAWN;
-       
+
        setorigin(e, orig);
-       
+
        if(monster != "")
        {
                float i, found = 0;
@@ -25,33 +25,33 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
                                break;
                        }
                }
-               if not(found)
+               if(!found)
                        monster = (get_monsterinfo(MON_FIRST)).netname;
        }
-               
+
        if(monster == "")
        if(monster_id)
                monster = (get_monsterinfo(monster_id)).netname;
-       
+
        e.realowner = spawnedby;
-       
+
        if(moveflag)
                e.monster_moveflags = moveflag;
-       
+
        if(IS_PLAYER(spawnedby))
        {
                if(teamplay && autocvar_g_monsters_teams)
                        e.team = spawnedby.team; // colors handled in spawn code
-                       
+
                if(autocvar_g_monsters_owners)
                        e.monster_owner = own; // using .owner makes the monster non-solid for its master
-                       
+
                e.angles = spawnedby.angles;
        }
-               
+
        monster = strcat("$ spawnfunc_monster_", monster);
-               
+
        target_spawn_edit_entity(e, monster, world, world, world, world, world);
-               
+
        return e;
 }