Fix reversed noalign usage

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index d1fd958dd3a190bcd5e5afe54c8c17769ad7b36d..f5e901e505f1d91f329125b87bddee09268bad2b 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2117,7 +2117,7 @@ float WinningCondition_RanOutOfSpawns()
 }
 
 // TD winning condition:
-// game terminates if there are no generators (or 1 dies if td_dontend is TRUE)
+// game terminates if there are no generators (or 1 dies if td_dontend is FALSE)
 float gensurvived;
 float WinningCondition_TowerDefense()
 {

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index f1f68cf6b94e1f7cb70ba5692396f34d194290f3..babf232d7bffefaefa14f49c582f74ae10c2c525 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -925,9 +925,9 @@ void monster_hook_spawn()
        self.pain_finished = self.nextthink;
        self.anim_start_time = time;
        
-       if(self.noalign)
+       if not(self.noalign)
        {
-               setorigin(self, self.origin);
+               setorigin(self, self.origin + '0 0 20');
                tracebox(self.origin + '0 0 100', self.mins, self.maxs, self.origin - '0 0 10000', MOVE_WORLDONLY, self);
                setorigin(self, trace_endpos);
        }
@@ -1017,7 +1017,7 @@ float monster_initialize(string  net_name, float mon_id,
        self.view_ofs                   = '0 0 1' * (self.maxs_z * 0.5);
        self.oldtarget2                 = self.target2;
        self.deadflag                   = DEAD_NO; // UNDEAD
-       self.noalign                    = !nodrop;
+       self.noalign                    = nodrop;
        self.dphitcontentsmask  = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
        
        if not(self.ticrate)

diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index c83cbbd96645f7e5fb7ae77b0a8e9b2a7a1fc7d9..d1872f9448bfcba2960dedc8e9b6f1fbf86d1041 100644 (file)
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -808,8 +808,6 @@ MUTATOR_HOOKFUNCTION(td_MonsterSpawn)
        
        self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_CORPSE | DPCONTENTS_MONSTERCLIP;
        
-       self.origin += '0 0 25'; // hopefully this fixes monsters falling through the floor
-       
        switch(self.monsterid)
        {
                case MONSTER_ZOMBIE: n_zombies -= 1; break;