fix a couple EDICT_NUM errors that often happened when loading savegames with more...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3073 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index 83edbffcaaa713a8157014b3bc901dda5dc9d991..98d3526639b6298f5d50aa30b2ddcc148f287836 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -600,6 +600,10 @@ void Host_PerformLoadGame(char *name)
                else
                {
                        // parse an edict
+                       if (entnum >= MAX_EDICTS)
+                               Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
+                       while (entnum >= sv.max_edicts)
+                               SV_IncreaseEdicts();
                        ent = EDICT_NUM(entnum);
                        memset (ent->v, 0, progs->entityfields * 4);
                        ent->e->free = false;

diff --git a/pr_edict.c b/pr_edict.c
index b7d347304a8c2c3c22245668fe001cd97129b7bc..83a780e602e76839d59af352f4af32170b1788cb 100644 (file)
--- a/pr_edict.c
+++ b/pr_edict.c
@@ -203,7 +203,6 @@ instead of being removed and recreated, which can cause interpolated
 angles and bad trails.
 =================
 */
-extern void SV_IncreaseEdicts(void);
 edict_t *ED_Alloc (void)
 {
        int                     i;
@@ -905,7 +904,12 @@ qboolean   ED_ParseEpair (void *base, ddef_t *key, const char *s)
                break;
 
        case ev_entity:
-               *(int *)d = EDICT_TO_PROG(EDICT_NUM(atoi (s)));
+               i = atoi (s);
+               if (i < 0 || i >= MAX_EDICTS)
+                       Con_DPrintf("ED_ParseEpair: ev_entity reference too large (edict %i >= MAX_EDICTS %i)\n", i, MAX_EDICTS);
+               while (i >= sv.max_edicts)
+                       SV_IncreaseEdicts();
+               *(int *)d = EDICT_TO_PROG(EDICT_NUM(i));
                break;
 
        case ev_field:
@@ -1574,7 +1578,7 @@ void PR_Init (void)
 // LordHavoc: turned EDICT_NUM into a #define for speed reasons
 edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline)
 {
-       Host_Error ("EDICT_NUM: bad number %i (called at %f:%i)", n, filename, fileline);
+       Host_Error ("EDICT_NUM: bad number %i (called at %s:%i)", n, filename, fileline);
        return NULL;
 }
 

diff --git a/progs.h b/progs.h
index 9fdaffd44b302ea3b28b7e80f041a11e5a74815b..ee5d9e2eb2c0ac940a9d3f90a8a59bd2b4c8f2c6 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -154,6 +154,8 @@ void PR_Profile_f (void);
 
 void PR_Crash (void);
 
+void SV_IncreaseEdicts(void);
+
 edict_t *ED_Alloc (void);
 void ED_Free (edict_t *ed);
 void ED_ClearEdict (edict_t *e);