From: Jakob MG Date: Mon, 20 Jun 2011 23:05:49 +0000 (+0200) Subject: Get rid of serverside sound/partivle effects. this are done on client. get rid of... X-Git-Tag: xonotic-v0.5.0~199^2~11^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=453ad9963bf92febf07d6016d8cde457f01a77ae;p=xonotic%2Fxonotic-data.pk3dir.git Get rid of serverside sound/partivle effects. this are done on client. get rid of unused precache_'s. remove some unused/unnessesary stuff --- diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index a2ea17986..c20ba7acf 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -1,6 +1,5 @@ #define RACER_MIN '-120 -120 -40' #define RACER_MAX '120 120 40' -#define RACER_ENGINE "sound/vehicles/racer.wav" #ifdef SVQC void racer_exit(float eject); @@ -547,9 +546,6 @@ void racer_spawn() void racer_blowup() { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("explosion_big"), self.origin, '0 0 0', 1); - self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); @@ -559,7 +555,6 @@ void racer_blowup() autocvar_g_vehicle_racer_blowup_forceintensity, DEATH_WAKIBLOWUP, world); - self.alpha = -1; self.nextthink = time + autocvar_g_vehicle_racer_respawntime; self.think = racer_spawn; self.movetype = MOVETYPE_NONE; @@ -576,7 +571,6 @@ void racer_blowup() void racer_deadtouch() { - dprint("Boink!\n"); self.avelocity_x *= 0.7; self.cnt -= 1; if(self.cnt <= 0) @@ -650,10 +644,8 @@ void spawnfunc_vehicle_racer() self.vehicle_flags |= VHF_DMGSHAKE; self.vehicle_flags |= VHF_DMGROLL; - precache_sound ("weapons/laserimpact.wav"); precache_sound ("weapons/lasergun_fire.wav"); precache_sound ("weapons/rocket_fire.wav"); - precache_sound ("weapons/rocket_impact.wav"); precache_sound ("vehicles/racer_idle.wav"); precache_sound ("vehicles/racer_move.wav"); diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc index 991010007..33b5e7d5a 100644 --- a/qcsrc/server/vehicles/raptor.qc +++ b/qcsrc/server/vehicles/raptor.qc @@ -1,7 +1,7 @@ #ifdef SVQC #define RAPTOR_MIN '-80 -80 0' #define RAPTOR_MAX '80 80 70' -//#define RAPTOR_ENGINE "sound/vehicles/raptor.wav" + float autocvar_g_vehicle_raptor_respawntime; float autocvar_g_vehicle_raptor_movestyle; @@ -129,11 +129,6 @@ void raptor_bomb_burst() remove(self); } -void raptor_bomb_touch() -{ - raptor_bomb_burst(); -} - void raptor_bombdrop() { entity bomb_1, bomb_2; @@ -146,7 +141,7 @@ void raptor_bombdrop() bomb_1.movetype = bomb_2.movetype = MOVETYPE_BOUNCE; bomb_1.velocity = bomb_2.velocity = self.velocity; - bomb_1.touch = bomb_2.touch = raptor_bomb_touch; + bomb_1.touch = bomb_2.touch = raptor_bomb_burst; bomb_1.think = bomb_2.think = raptor_bomb_burst; bomb_1.cnt = bomb_2.cnt = time + 10; @@ -165,17 +160,13 @@ void raptor_bombdrop() CSQCProjectile(bomb_1, TRUE, PROJECTILE_RAPTORBOMB, TRUE); CSQCProjectile(bomb_2, TRUE, PROJECTILE_RAPTORBOMB, TRUE); - } void raptor_fire_cannon(entity gun, string tagname) { - entity bolt; - vector b_org; - b_org = gettaginfo(gun, gettagindex(gun, tagname)); - bolt = vehicles_projectile("raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav", - b_org, normalize(v_forward + randomvec() * autocvar_g_vehicle_raptor_cannon_spread) * autocvar_g_vehicle_raptor_cannon_speed, + vehicles_projectile("raptor_cannon_muzzleflash", "weapons/lasergun_fire.wav", + gettaginfo(gun, gettagindex(gun, tagname)), normalize(v_forward + randomvec() * autocvar_g_vehicle_raptor_cannon_spread) * autocvar_g_vehicle_raptor_cannon_speed, autocvar_g_vehicle_raptor_cannon_damage, autocvar_g_vehicle_raptor_cannon_radius, autocvar_g_vehicle_raptor_cannon_force, 0, DEATH_RAPTOR_CANNON, PROJECTILE_RAPTORCANNON, 0, TRUE, TRUE); } @@ -267,7 +258,6 @@ float raptor_takeoff() player = self; raptor = self.vehicle; self = raptor; - if(self.sound_nexttime < time) { self.sound_nexttime = time + 7.955812; //soundlength("vehicles/raptor_fly.wav"); @@ -323,7 +313,6 @@ float raptor_frame() player = self; raptor = self.vehicle; self = raptor; - vehicles_painframe(); /* ftmp = vlen(self.velocity); @@ -554,9 +543,6 @@ float raptor_frame() void raptor_blowup() { - sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("explosion_big"), self.origin, '0 0 0', 1); - self.deadflag = DEAD_DEAD; self.vehicle_exit(VHEF_NORMAL); RadiusDamage (self, self, 250, 15, 250, world, 250, DEATH_WAKIBLOWUP, world); @@ -575,9 +561,6 @@ void raptor_blowup() void raptor_diethink() { - //self.avelocity += '0 0.5 1' * (random() * 5); - //self.avelocity -= '0 0.5 1' * (random() * 5); - if(random() < 0.1) { sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); @@ -744,13 +727,12 @@ void spawnfunc_vehicle_raptor() precache_model ("models/vehicles/raptor_gun.dpm"); precache_model ("models/vehicles/spinner.dpm"); precache_model ("models/vehicles/raptor_cockpit.dpm"); - precache_model ("models/vehicles/clusterbomb.md3"); + //precache_model ("models/vehicles/clusterbomb.md3"); precache_model ("models/vehicles/clusterbomb_folded.md3"); precache_model ("models/vehicles/raptor_body.dpm"); precache_sound ("vehicles/raptor_fly.wav"); precache_sound ("vehicles/raptor_speed.wav"); - precache_sound (""); self.think = raptor_dinit; self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5); diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index dbaac0cce..96ea14067 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -582,9 +582,6 @@ void spiderbot_blowup() void spiderbot_die() { - sound (self, CHAN_TRIGGER, "vehicles/spiderbot_die.wav", VOL_BASE, ATTN_NORM); - pointparticles(particleeffectnum("explosion_medium"), self.origin + '0 0 100', '0 0 0', 1); - self.health = 0; self.event_damage = SUB_Null; self.takedamage = DAMAGE_NO; @@ -648,7 +645,6 @@ void spawnfunc_vehicle_spiderbot() precache_model ( "models/vehicles/spiderbot_cockpit.dpm"); precache_model ( "models/uziflash.md3"); - precache_sound ( "weapons/rocket_impact.wav" ); precache_sound ( "weapons/uzi_fire.wav" ); precache_sound ( "weapons/rocket_impact.wav"); diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 20f731db2..820c2ecbd 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -383,7 +383,6 @@ void vehicles_touch() // Colided with world? if(other == world) { - // Apply velocity based self damage here } else {