From b475a527c91b537be405f82de8192066d88bbb4a Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sun, 18 Dec 2016 09:27:56 +0100 Subject: [PATCH] Change edict_s->show_hostile from qboolean to int and add casts This variable is used as an integer. Defining it as a qbooblean is just wrong. Add some explicit float -> int casts while at it. --- src/g_ai.c | 8 ++++---- src/header/local.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/g_ai.c b/src/g_ai.c index ab5fa0d..a6019ac 100644 --- a/src/g_ai.c +++ b/src/g_ai.c @@ -404,7 +404,7 @@ FoundTarget(edict_t *self) level.sight_entity->light_level = 128; } - self->show_hostile = level.time + 1; /* wake up other monsters */ + self->show_hostile = (int)level.time + 1; /* wake up other monsters */ VectorCopy(self->enemy->s.origin, self->monsterinfo.last_sighting); self->monsterinfo.trail_time = level.time; @@ -577,7 +577,7 @@ FindTarget(edict_t *self) if (r == RANGE_NEAR) { - if ((client->show_hostile < level.time) && !infront(self, client)) + if ((client->show_hostile < (int)level.time) && !infront(self, client)) { return false; } @@ -908,7 +908,7 @@ ai_checkattack(edict_t *self, float dist) } else { - self->show_hostile = level.time + 1; + self->show_hostile = (int)level.time + 1; return false; } } @@ -980,7 +980,7 @@ ai_checkattack(edict_t *self, float dist) } } - self->show_hostile = level.time + 1; /* wake up other monsters */ + self->show_hostile = (int)level.time + 1; /* wake up other monsters */ /* check knowledge of enemy */ enemy_vis = visible(self, self->enemy); diff --git a/src/header/local.h b/src/header/local.h index 37d2f20..0649461 100644 --- a/src/header/local.h +++ b/src/header/local.h @@ -1033,7 +1033,7 @@ struct edict_s int max_health; int gib_health; int deadflag; - qboolean show_hostile; + int show_hostile; float powerarmor_time;