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

fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-07 22:23:08 +02:00
parent 83880795de
commit e93aba820c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/game/g_target.c
View file

@ -633,7 +633,7 @@ void SP_target_kill( gentity_t *self ) {
trap_LinkEntity(self); trap_LinkEntity(self);
} }
static void target_location_linkup(/*@shared@*/ /*@out@*/ gentity_t *ent) static void target_location_linkup(/*@shared@*/ gentity_t *ent)
{ {
int i; int i;
int n; int n;
@ -916,7 +916,7 @@ This changes the servers gravity to the ammount set.
void target_gravity_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator) void target_gravity_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator)
{ {
//CIf spawn flag 1 is set, change gravity to specific user //CIf spawn flag 1 is set, change gravity to specific user
if((self->spawnflags & 1) && activator != NULL && activator->client != NULL) if((self->spawnflags & 1) != 0 && activator != NULL && activator->client != NULL)
{ {
if(self->targetname2 != NULL) { if(self->targetname2 != NULL) {
activator->client->ps.gravity = atoi(self->targetname2); activator->client->ps.gravity = atoi(self->targetname2);
@ -926,7 +926,7 @@ void target_gravity_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/
activator->client->SpecialGrav = qtrue; activator->client->SpecialGrav = qtrue;
} }
//resyncing players grav to map grav. //resyncing players grav to map grav.
else if((self->spawnflags & 2) && activator && activator->client) else if((self->spawnflags & 2) != 0 && activator != NULL && activator->client != NULL)
{ {
activator->client->ps.gravity = g_gravity.integer; activator->client->ps.gravity = g_gravity.integer;
activator->client->SpecialGrav = qfalse; activator->client->SpecialGrav = qfalse;
@ -934,7 +934,11 @@ void target_gravity_use (/*@shared@*/ gentity_t *self, /*@shared@*/ /*@unused@*/
//Else change gravity for all clients //Else change gravity for all clients
else else
{ {
trap_Cvar_Set( "g_gravity", self->targetname2 ); if(self->targetname2 == NULL) { // fallback
trap_Cvar_Set( "g_gravity", va("%d", g_gravity.integer));
} else {
trap_Cvar_Set( "g_gravity", self->targetname2 );
}
} }
} }