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

fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-11 19:53:14 +02:00
parent 95032e1575
commit 4e18bfe2d0
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/game/g_local.h
View file

@ -268,7 +268,7 @@ struct gentity_s {
/*@shared@*/ /*@null@*/ void (*reached)(/*@shared@*/ gentity_t *self); //!< movers call this when hitting endpoint
/*@shared@*/ /*@null@*/ void (*blocked)(/*@shared@*/ gentity_t *self, /*@shared@*/ gentity_t *other); //!< movers call this when blocked
/*@shared@*/ /*@null@*/ void (*touch)(/*@shared@*/ gentity_t *self, /*@shared@*/ gentity_t *other, /*@shared@*/ trace_t *trace); //!< touch function for triggers
/*@shared@*/ /*@null@*/ void (*use)(/*@shared@*/ gentity_t *self, /*@shared@*/ gentity_t *other, /*@shared@*/ gentity_t *activator); //!< function that gets called if the entity is used
/*@shared@*/ /*@null@*/ void (*use)(/*@shared@*/ gentity_t *self, /*@shared@*/ /*@null@*/ gentity_t *other, /*@shared@*/ /*@null@*/ gentity_t *activator); //!< function that gets called if the entity is used
/*@shared@*/ /*@null@*/ void (*pain)(/*@shared@*/ gentity_t *self, /*@shared@*/ gentity_t *attacker, int damage); //!< function that gets called if entity gets damged
/*@shared@*/ /*@null@*/ void (*die)(/*@shared@*/ gentity_t *self, /*@shared@*/ gentity_t *inflictor, /*@shared@*/ gentity_t *attacker, int damage, int mod); //!< function that gets called if entity dies

13
code/game/g_target.c
View file

@ -2866,6 +2866,10 @@ none
void target_shaderremap_think(/*@shared@*/ gentity_t *ent) {
float f = 0.0f;
if(ent->falsename == NULL || ent->truename == NULL) {
return;
}
if(ent->spawnflags == 0) {
f = (float)(level.time) * 0.001f;
AddRemap(ent->falsename, ent->truename, f);
@ -2955,16 +2959,17 @@ void target_selfdestruct_think(gentity_t *ent) {
healthEnt->use(healthEnt, NULL, NULL);
}else{
while ((safezone = G_Find( safezone, FOFS( classname ), "target_zone" )) != NULL ){
if(!Q_stricmp(safezone->targetname, ent->bluename))
if(Q_stricmp(safezone->targetname, ent->bluename) == 0)
safezone->n00bCount = 0;
}
safezone = NULL;
while ((safezone = G_Find( safezone, FOFS( classname ), "target_zone" )) != NULL ){
// go through all safe zones and tag all safe players
if(safezone->count == 1 && safezone->n00bCount == 1 && Q_stricmp(safezone->targetname, ent->bluename)) {
if(safezone->count == 1 && safezone->n00bCount == 1 && Q_stricmp(safezone->targetname, ent->bluename) != 0) {
memset(entlist, 0, sizeof(entlist));
num = trap_EntitiesInBox(safezone->r.mins, safezone->r.maxs, entlist, MAX_GENTITIES);
for(n = 0; n < num; n++) {
if(entlist[n] < g_maxclients.integer && g_entities[entlist[n]].client) {
if(entlist[n] < g_maxclients.integer && g_entities[entlist[n]].client != NULL) {
while((client = G_Find( client, FOFS( classname ), "player" ))!= NULL){
if(client->s.number == entlist[n])
client->client->nokilli = 1;
@ -3558,7 +3563,7 @@ void target_shiphealth_think(/*@shared@*/ gentity_t *ent) {
void SP_target_shiphealth(gentity_t *ent) {
if(ent->targetname == NULL || ent->health == NULL || ent->splashRadius == NULL || !ent->angle || !ent->speed){
if(ent->targetname == NULL || ent->health == 0 || ent->splashRadius == 0 || !ent->angle || !ent->speed){
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_shiphealth at %s is missing one or more parameters, removing entity.\n", vtos(ent->s.origin)););
G_FreeEntity(ent);
return;