ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-10 15:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source 
lgwc: 9063
This commit is contained in:
Walter Julius Hennecke 2013-05-25 00:50:40 +02:00
parent 5a06858a75
commit 46c7b0e521
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/game/g_fx.c
View file

@ -98,9 +98,9 @@ void spark_link( gentity_t *ent )
//------------------------------------------
void SP_fx_spark( gentity_t *ent )
{
if (ent->wait == 0)
if (ent->wait == 0.0)
{
ent->wait = 2000;
ent->wait = 2000.0;
}
SnapVector(ent->s.origin);
@ -164,7 +164,7 @@ void steam_think( gentity_t *ent )
if ( trace.entityNum < ENTITYNUM_WORLD )
{
gentity_t *victim = &g_entities[trace.entityNum];
if ( victim && victim->takedamage )
if ( (victim != NULL) && victim->takedamage )
{
G_Damage( victim, ent, ent->activator, temp, trace.endpos, ent->damage, 0, MOD_LAVA );
}

2
code/game/g_local.h
View file

@ -1391,7 +1391,7 @@ qboolean CanDamage (gentity_t* targ, vec3_t origin);
* DAMAGE_NO_KNOCKBACK do not affect velocity, just view angles
* DAMAGE_NO_PROTECTION kills godmode, armor, everything
*/
void G_Damage (gentity_t* targ, gentity_t* inflictor, gentity_t* attacker, vec3_t dir, vec3_t point, int damage, int dflags, int mod);
void G_Damage (gentity_t* targ, /*@null@*/ gentity_t* inflictor, /*@null@*/ gentity_t* attacker, vec3_t dir, vec3_t point, int damage, int dflags, int mod);
/**
* Damage all entities around an origin in a specified radius.