From: Mario <mario.mario@y7mail.com>
Date: Wed, 17 Apr 2013 07:01:46 +0000 (+1000)
Subject: Move onslaught engine damage models to the client
X-Git-Tag: xonotic-v0.8.0~241^2^2~375
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a44fbf08c103ba90bf1879d638d957f21194fa9e;p=xonotic%2Fxonotic-data.pk3dir.git

Move onslaught engine damage models to the client
---

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 6c4614e90..a3a707c2c 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -638,7 +638,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
 
 		onslaught_updatelinks();
 	}
-
+	/*
 	if(self.health <= 0)
 		setmodel(self, "models/onslaught/generator_dead.md3");
 	else if(self.health < self.max_health * 0.10)
@@ -660,6 +660,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
 	else if(self.health < self.max_health * 0.90)
 		setmodel(self, "models/onslaught/generator_dmg1.md3");
 	setsize(self, GENERATOR_MIN, GENERATOR_MAX);
+	*/
 
 	// Throw some flaming gibs on damage, more damage = more chance for gib
 	if(random() < damage/220)
@@ -889,16 +890,6 @@ void spawnfunc_onslaught_generator()
 	//entity e;
 	precache_model("models/onslaught/generator.md3");
 	precache_model("models/onslaught/generator_shield.md3");
-	precache_model("models/onslaught/generator_dmg1.md3");
-	precache_model("models/onslaught/generator_dmg2.md3");
-	precache_model("models/onslaught/generator_dmg3.md3");
-	precache_model("models/onslaught/generator_dmg4.md3");
-	precache_model("models/onslaught/generator_dmg5.md3");
-	precache_model("models/onslaught/generator_dmg6.md3");
-	precache_model("models/onslaught/generator_dmg7.md3");
-	precache_model("models/onslaught/generator_dmg8.md3");
-	precache_model("models/onslaught/generator_dmg9.md3");
-	precache_model("models/onslaught/generator_dead.md3");
 	precache_model("models/onslaught/shockwave.md3");
 	precache_model("models/onslaught/shockwavetransring.md3");
 	precache_model("models/onslaught/gen_gib1.md3");
diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index 506d83ed6..5b31e1331 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -128,6 +128,7 @@ void spawnfunc_td_generator()
 	
 	setsize(self, GENERATOR_MIN, GENERATOR_MAX);
 	
+	setorigin(self, self.origin + '0 0 20');
 	droptofloor();
 	
 	generator_link(td_generator_setup);