From: Mario Date: Mon, 22 Apr 2013 09:29:04 +0000 (+1000) Subject: Fix reversed noalign usage X-Git-Tag: xonotic-v0.8.0~241^2^2~323 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e73722bc5b96c82dc5d671cf926955440bbed8f;p=xonotic%2Fxonotic-data.pk3dir.git Fix reversed noalign usage --- diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index d1fd958dd..f5e901e50 100644 --- 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 f1f68cf6b..babf232d7 100644 --- 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 c83cbbd96..d1872f944 100644 --- 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;