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

diff --git a/progs.h b/progs.h
index 79e625647737fecc32a096d74cd31cde96190310..1c0fee0cf69196b9429bc60332e4d49d7b23b9d1 100644 (file)
--- 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 3204ebd8d1f01597f33f66272ff61f4986e2cb54..eb36fd7e2a0115e2b9474ffaf80762bd311ed833 100644 (file)
--- 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 7f95e28e3eb20b3f5e46ce609758c36dacabd6f0..07a614d66c05d39c308ab0a7bbfe01ec06a5b235 100644 (file)
--- 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;