]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Move onslaught engine damage models to the client
authorMario <mario.mario@y7mail.com>
Wed, 17 Apr 2013 07:01:46 +0000 (17:01 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 17 Apr 2013 07:01:46 +0000 (17:01 +1000)
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_towerdefense.qc

index 6c4614e904f740b064aaa67862f5fb0f051345e1..a3a707c2c89bc5405163ebecda5184e60844df9c 100644 (file)
@@ -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");
index 506d83ed6314456a1e36d0ad03ee9d691c13f7fd..5b31e1331f7b5439bcca0794094a095a26ffebff 100644 (file)
@@ -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);