From aa801834af16095d508de4e7c5eebbfa976e8110 Mon Sep 17 00:00:00 2001 From: Harry Young Date: Mon, 15 Oct 2012 14:51:25 +0200 Subject: [PATCH] Fixes to FX-System fixed drip-entity (was stowing duration in wrong state-var) fixed defaultstate for chunks-entity (material was 0 = none, fixed to 1 = metal) disabled spawnfunction for all non-functional SP-Ports (I might look into them gain... maybe I just need to find their shaders) Signed-off-by: Harry Young --- game/g_fx.c | 4 ++-- game/g_spawn.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/game/g_fx.c b/game/g_fx.c index 1cf3198..1032917 100644 --- a/game/g_fx.c +++ b/game/g_fx.c @@ -443,7 +443,7 @@ void SP_fx_drip( gentity_t *ent ) ent->nextthink = level.time + 1000; //TiM - ent->s.time = 10000; + ent->s.powerups = 10000; trap_LinkEntity( ent ); } @@ -669,7 +669,7 @@ void SP_fx_blow_chunks( gentity_t *ent ) if(!ent->distance) // check for spawnTEnt G_SpawnFloat( "radius", "65", &ent->distance ); // was: ent->radius if(!ent->s.powerups) // check for spawnTEnt - G_SpawnInt( "material", "0", &ent->s.powerups ); + G_SpawnInt( "material", "1", &ent->s.powerups ); VectorCopy( ent->s.origin, ent->s.pos.trBase ); diff --git a/game/g_spawn.c b/game/g_spawn.c index c5004ad..3cde48d 100644 --- a/game/g_spawn.c +++ b/game/g_spawn.c @@ -240,12 +240,12 @@ void SP_fx_fire(gentity_t *ent); // Additional ports from SP by Harry Young void SP_fx_cooking_steam( gentity_t *ent ); void SP_fx_electricfire( gentity_t *ent ); -void SP_fx_forge_bolt( gentity_t *ent ); -void SP_fx_plasma( gentity_t *ent ); -void SP_fx_stream( gentity_t *ent ); -void SP_fx_transporter_stream( gentity_t *ent ); -void SP_fx_explosion_trail( gentity_t *ent ); -void SP_fx_borg_energy_beam( gentity_t *ent ); +//void SP_fx_forge_bolt( gentity_t *ent ); +//void SP_fx_plasma( gentity_t *ent ); +//void SP_fx_stream( gentity_t *ent ); +//void SP_fx_transporter_stream( gentity_t *ent ); +//void SP_fx_explosion_trail( gentity_t *ent ); +//void SP_fx_borg_energy_beam( gentity_t *ent ); void SP_fx_shimmery_thing( gentity_t *ent ); void SP_fx_borg_bolt( gentity_t *ent ); @@ -437,12 +437,12 @@ spawn_t spawns[] = { // Additional ports from SP by Harry Young {"fx_cooking_steam", SP_fx_cooking_steam}, {"fx_elecfire", SP_fx_electricfire}, - {"fx_forge_bolt", SP_fx_forge_bolt}, - {"fx_plasma", SP_fx_plasma}, - {"fx_energy_stream", SP_fx_stream}, - {"fx_transporter_stream", SP_fx_transporter_stream}, - {"fx_explosion_trail", SP_fx_explosion_trail}, - {"fx_borg_energy_beam", SP_fx_borg_energy_beam}, + //{"fx_forge_bolt", SP_fx_forge_bolt}, + //{"fx_plasma", SP_fx_plasma}, + //{"fx_energy_stream", SP_fx_stream}, + //{"fx_transporter_stream", SP_fx_transporter_stream}, + //{"fx_explosion_trail", SP_fx_explosion_trail}, + //{"fx_borg_energy_beam", SP_fx_borg_energy_beam}, {"fx_shimmery_thing", SP_fx_shimmery_thing}, {"fx_borg_bolt", SP_fx_borg_bolt},