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

fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-07 22:39:56 +02:00
parent 3dd5075276
commit cc7b10c858
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
code/game/g_target.c
View file

@ -997,7 +997,7 @@ none
"targetanme" - entity needs to be used "targetanme" - entity needs to be used
*/ */
void target_evosuit_use (/*@shared@*/ /*@null@*/ gentity_t *self, /*@shared@*/ /*@null@*/ gentity_t *other, /*@shared@*/ gentity_t *activator) void target_evosuit_use (/*@shared@*/ /*@unused@*/ gentity_t *self, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator)
{ {
if(activator == NULL || activator->client == NULL) { if(activator == NULL || activator->client == NULL) {
@ -1082,7 +1082,7 @@ static void target_turbolift_unlock ( gentity_t *ent )
} }
static void target_turbolift_endMove ( gentity_t *ent ) static void target_turbolift_endMove ( /*@shared@*/ gentity_t *ent )
{ {
gentity_t* lights=NULL; gentity_t* lights=NULL;
gentity_t* otherLift=NULL; gentity_t* otherLift=NULL;
@ -1109,37 +1109,41 @@ static void target_turbolift_endMove ( gentity_t *ent )
if(ent->target != NULL) { if(ent->target != NULL) {
while ( ( lights = G_Find( lights, FOFS( targetname ), ent->target ) ) != NULL ) while ( ( lights = G_Find( lights, FOFS( targetname ), ent->target ) ) != NULL )
{ {
if ( !Q_stricmp( lights->classname, "func_usable" ) ) if ( Q_stricmp( lights->classname, "func_usable" ) == 0 )
{ {
if(!rpg_calcLiftTravelDuration.integer) { if(rpg_calcLiftTravelDuration.integer == 0) {
lights->use( lights, lights, ent ); lights->use( lights, lights, ent );
#ifdef G_LUA #ifdef G_LUA
if(lights->luaUse) if(lights->luaUse != NULL) {
LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities); LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities);
}
#endif #endif
} }
else { else {
if(ent->s.eventParm < 0 && lights->targetname2) { if(ent->s.eventParm < 0 && lights->targetname2 != NULL) {
if(!Q_stricmp(lights->targetname2, va("%s_dn", ent->target))) { if(Q_stricmp(lights->targetname2, va("%s_dn", ent->target)) == 0) {
lights->use(lights, lights, ent); lights->use(lights, lights, ent);
#ifdef G_LUA #ifdef G_LUA
if(lights->luaUse) if(lights->luaUse != NULL) {
LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities); LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities);
}
#endif #endif
} }
} else if(ent->s.eventParm > 0 && lights->targetname2) { } else if(ent->s.eventParm > 0 && lights->targetname2 != NULL) {
if(!Q_stricmp(lights->targetname2, va("%s_up", ent->target))) { if(Q_stricmp(lights->targetname2, va("%s_up", ent->target)) == 0) {
lights->use(lights, lights, ent); lights->use(lights, lights, ent);
#ifdef G_LUA #ifdef G_LUA
if(lights->luaUse) if(lights->luaUse != NULL) {
LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities); LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities);
}
#endif #endif
} }
} else { } else {
lights->use(lights, lights, ent); lights->use(lights, lights, ent);
#ifdef G_LUA #ifdef G_LUA
if(lights->luaUse) if(lights->luaUse != NULL) {
LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities); LuaHook_G_EntityUse(lights->luaUse, lights-g_entities, ent-g_entities, ent-g_entities);
}
#endif #endif
} }
} }