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

more fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-05-26 22:47:22 +02:00
parent 29e7b8e348
commit a2b377cf07
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/game/g_fx.c
View file

@ -626,12 +626,12 @@ void surface_explosion_link( gentity_t *ent )
}
else
{
VectorSet(normal, 0, 0, 1);
VectorSet(normal, 0.0, 0.0, 1.0);
}
VectorCopy( normal, ent->s.origin2 );
ent->think = 0;
ent->think = NULL;
ent->nextthink = -1;
ent->use = surface_explosion_use;
@ -641,7 +641,7 @@ void surface_explosion_link( gentity_t *ent )
//------------------------------------------
void SP_fx_surface_explosion( gentity_t *ent )
{
if ( !(ent->spawnflags&4) ){
if ( (ent->spawnflags & 4) == 0 ){
G_SpawnInt( "damage", "50", &ent->splashDamage );
G_SpawnFloat( "radius", "20", &ent->distance ); // was: ent->radius
ent->splashRadius = 160;
@ -688,7 +688,7 @@ none
//"count" - Number of chunks to spew (default 5)
//"speed" - How fast a chunk will move when it get's spewed (default 175)
//------------------------------------------
void blow_chunks_use( gentity_t *self, gentity_t *other, gentity_t *activator)
void blow_chunks_use( gentity_t *self, /*@unused@*/ gentity_t *other, /*@unused@*/ gentity_t *activator)
{
self->r.svFlags |= SVF_BROADCAST;
G_AddEvent( self, EV_FX_CHUNKS, 0 );
@ -699,14 +699,21 @@ void blow_chunks_link( gentity_t *ent )
{
gentity_t *target = NULL;
ent->think = 0;
ent->think = NULL;
ent->nextthink = -1;
target = G_Find (target, FOFS(targetname), ent->target);
if(ent->target != NULL && ent->target[0] != 0) {
target = G_Find (target, FOFS(targetname), ent->target);
} else {
G_Printf(S_COLOR_RED "blow_chunks_link: ent->target is NULL\n");
G_FreeEntity(ent);
return;
}
if ( !target )
if ( target == NULL )
{
Com_Printf("blow_chunks_link: unable to find target %s\n", ent->target );
G_Printf(S_COLOR_RED "blow_chunks_link: unable to find target %s\n", ent->target );
G_FreeEntity(ent);
return;
}