From 8a77a745ddb6d1a6e48eeab798e3e0d9338f09c5 Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 7 May 2007 03:01:40 +0000 Subject: [PATCH] removed PRVM_EDICT_NUM_UNSIGNED (PRVM_EDICT_NUM now casts to unsigned) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7241 d7cf8633-e32d-0410-b094-e92efae38249 --- progs.h | 5 +---- progsvm.h | 3 +-- world.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/progs.h b/progs.h index 79e62564..1c0fee0c 100644 --- a/progs.h +++ b/progs.h @@ -178,8 +178,6 @@ void PR_Profile_f (void); void PR_PrintState(void); void PR_Crash (void); -void SV_IncreaseEdicts(void); - prvm_edict_t *ED_Alloc (void); void ED_Free (prvm_edict_t *ed); void ED_ClearEdict (prvm_edict_t *e); @@ -194,8 +192,7 @@ void ED_ParseGlobals (const char *data); void ED_LoadFromFile (const char *data); prvm_edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline); -#define PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__)) -#define EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__)) +#define PRVM_EDICT_NUM(n) (((unsigned int)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__)) //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e); #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts)) diff --git a/progsvm.h b/progsvm.h index 3204ebd8..eb36fd7e 100644 --- a/progsvm.h +++ b/progsvm.h @@ -485,8 +485,7 @@ void PRVM_ED_ParseGlobals (const char *data); void PRVM_ED_LoadFromFile (const char *data); prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline); -#define PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__)) -#define PRVM_EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__)) +#define PRVM_EDICT_NUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__)) //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e); #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts)) diff --git a/world.c b/world.c index 7f95e28e..07a614d6 100644 --- a/world.c +++ b/world.c @@ -163,7 +163,7 @@ int World_EntitiesInBox(world_t *world, vec3_t mins, vec3_t maxs, int maxlist, p grid = &world->areagrid_outside; for (l = grid->next;l != grid;l = l->next) { - ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber); + ent = PRVM_EDICT_NUM(l->entitynumber); if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber) { ent->priv.server->areagridmarknumber = world->areagrid_marknumber; @@ -187,7 +187,7 @@ int World_EntitiesInBox(world_t *world, vec3_t mins, vec3_t maxs, int maxlist, p { for (l = grid->next;l != grid;l = l->next) { - ent = PRVM_EDICT_NUM_UNSIGNED(l->entitynumber); + ent = PRVM_EDICT_NUM(l->entitynumber); if (ent->priv.server->areagridmarknumber != world->areagrid_marknumber) { ent->priv.server->areagridmarknumber = world->areagrid_marknumber; -- 2.39.2