Properly fix monsters thinking they're fish

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_invasion.qc

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index 47af8e78d78ab609a0e976cdbca6b0564674b871..af5b5e70736edd619bfe09c77b1b739c8578a426 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -11,12 +11,14 @@ float invasion_PickMonster(float have_shamblers)
                return MON_ZOMBIE;
 
        float i;
+       entity mon;
        
        RandomSelection_Init();
        
        for(i = MON_FIRST; i <= MON_LAST; ++i)
        {
-               if(i == MON_STINGRAY || i == MON_WYVERN || (i == MON_SHAMBLER && have_shamblers >= 1))
+               mon = get_monsterinfo(i);
+               if((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM) || (i == MON_SHAMBLER && have_shamblers >= 1))
                        continue; // flying/swimming monsters not yet supported
                
                RandomSelection_Add(world, i, "", 1, 1);