From: terencehill <piuntn@gmail.com>
Date: Sat, 31 Aug 2013 10:21:48 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/vehicles_fixes
X-Git-Tag: xonotic-v0.8.0~243^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=105c4e2c93cadac6c8b09a998333e2f5fe11a533;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/vehicles_fixes

Conflicts:
	qcsrc/server/vehicles/spiderbot.qc
---

105c4e2c93cadac6c8b09a998333e2f5fe11a533
diff --cc qcsrc/server/vehicles/spiderbot.qc
index 5dcfdc257,9dc41952f..3d1aa3d83
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@@ -737,9 -729,8 +737,9 @@@ void spiderbot_blowup(
      self.movetype   = MOVETYPE_NONE;
      self.deadflag   = DEAD_DEAD;
      self.solid      = SOLID_NOT;
-     self.tur_head.effects  &~=  EF_FLAME;
+     self.tur_head.effects  &=  ~EF_FLAME;
 -    self.vehicle_hudmodel.viewmodelforclient = self;
 +	self.vehicle_hudmodel.viewmodelforclient = self;
 +	setorigin(self, self.pos1);
  }
  
  void spiderbot_die()