ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-02-21 11:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source 
last game warning count (lgwc): 9138
This commit is contained in:
Walter Julius Hennecke 2013-05-25 00:47:18 +02:00
parent 2d2831ecea
commit 5a06858a75
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/game/g_fx.c
View file

@ -80,17 +80,17 @@ void spark_link( gentity_t *ent )
//TiM : for optional length in other functions
ent->s.time = 10000;
if ( !( ent->spawnflags & 1 ) ) {
if ( ( ent->spawnflags & 1 ) == 0) {
G_AddEvent( ent, EV_FX_SPARK, 0 );
ent->count = 1;
ent->think = spark_think;
ent->nextthink = level.time + 10000.0;
ent->nextthink = level.time + 10000;
}
else {
ent->count = 0;
ent->think = 0;
ent->think = NULL;
ent->nextthink = -1;
}
}
@ -98,7 +98,7 @@ void spark_link( gentity_t *ent )
//------------------------------------------
void SP_fx_spark( gentity_t *ent )
{
if (!ent->wait)
if (ent->wait == 0)
{
ent->wait = 2000;
}
@ -141,16 +141,18 @@ void steam_think( gentity_t *ent )
if(ent->targetname) //toggleable effect needs to be updated more often
ent->nextthink = level.time + 1000;
else
ent->nextthink = level.time + 10000.0; // send a refresh message every 10 seconds
ent->nextthink = level.time + 10000; // send a refresh message every 10 seconds
// FIXME: This may be a bit weird for steam bursts*/
// If a fool gets in the bolt path, zap 'em
if ( ent->damage )
if ( ent->damage == 0)
{
vec3_t start, temp;
trace_t trace;
memset(&trace, 0, sizeof(trace));
VectorSubtract( ent->s.origin2, ent->r.currentOrigin, temp );
VectorNormalize( temp );
VectorMA( ent->r.currentOrigin, 1, temp, start );

2
code/game/g_local.h
View file

@ -3081,7 +3081,7 @@ void trap_SetBrushModel( gentity_t* ent, const char* name );
* from start to end and checks whether it colides with anything that matches the contentmask.
* The entities that math the passEntityNum will be ingnored.
*/
void trap_Trace( trace_t* results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask );
void trap_Trace( trace_t* results, const vec3_t start, /*@null@*/ const vec3_t mins, /*@null@*/ const vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask );
/**
* \param point the point