changed two comments from saying long to int

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index 11c9dd19ff300e06b662a1de570eb693b9e52e51..e1143248971b26b71c897d8491945bb256290c3e 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1221,6 +1221,51 @@ void PRVM_ResetProg()
        memset(prog,0,sizeof(prvm_prog_t));
 }
 
+/*
+===============
+PRVM_LoadLNO
+===============
+*/
+void PRVM_LoadLNO( const char *progname ) {
+       qbyte *lno;
+       unsigned long *header;
+       char filename[512];
+
+       FS_StripExtension( progname, filename, sizeof( filename ) );
+       strlcat( filename, ".lno", sizeof( filename ) );
+
+       lno = FS_LoadFile( filename, tempmempool, false );
+       if( !lno ) {
+               return;
+       }
+
+/*
+<Spike>    SafeWrite (h, &lnotype, sizeof(int));
+<Spike>    SafeWrite (h, &version, sizeof(int));
+<Spike>    SafeWrite (h, &numglobaldefs, sizeof(int));
+<Spike>    SafeWrite (h, &numpr_globals, sizeof(int));
+<Spike>    SafeWrite (h, &numfielddefs, sizeof(int));
+<Spike>    SafeWrite (h, &numstatements, sizeof(int));
+<Spike>    SafeWrite (h, statement_linenums, numstatements*sizeof(int));
+*/
+       if( (unsigned) fs_filesize < (6 + prog->progs->numstatements) * sizeof( long ) ) {
+        return;
+       }
+
+       header = (unsigned long *) lno;
+       if( header[ 0 ] == *(unsigned long *) "LNOF" &&
+               LittleLong( header[ 1 ] ) == 1 &&
+               LittleLong( header[ 2 ] ) == prog->progs->numglobaldefs && 
+               LittleLong( header[ 3 ] ) == prog->progs->numglobals &&
+               LittleLong( header[ 4 ] ) == prog->progs->numfielddefs &&
+               LittleLong( header[ 5 ] ) == prog->progs->numstatements ) 
+       {
+               prog->statement_linenums = Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof( long ) );
+               memcpy( prog->statement_linenums, (long *) lno + 6, prog->progs->numstatements * sizeof( long ) ); 
+       }
+       Mem_Free( lno );
+}
+
 /*
 ===============
 PRVM_LoadProgs
@@ -1268,6 +1313,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
        prog->numknownstrings = 0;
        prog->maxknownstrings = 0;
        prog->knownstrings = NULL;
+       prog->knownstrings_freeable = NULL;
 
        prog->globaldefs = (ddef_t *)((qbyte *)prog->progs + prog->progs->ofs_globaldefs);
 
@@ -1447,6 +1493,8 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
                }
        }
 
+       PRVM_LoadLNO( filename );
+
        PRVM_Init_Exec();
 
        prog->loaded = TRUE;
@@ -1755,7 +1803,7 @@ prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline)
 /*
 int NUM_FOR_EDICT_ERROR(prvm_edict_t *e)
 {
-       Host_Error ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->edicts);
+       PRVM_ERROR ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->edicts);
        return 0;
 }
 
@@ -1802,12 +1850,12 @@ const char *PRVM_GetString(int num)
        {
                num = -1 - num;
                if (!prog->knownstrings[num])
-                       Host_Error("PRVM_GetString: attempt to get string that is already freed\n");
+                       PRVM_ERROR("PRVM_GetString: attempt to get string that is already freed\n");
                return prog->knownstrings[num];
        }
        else
        {
-               Host_Error("PRVM_GetString: invalid string offset %i\n", num);
+               PRVM_ERROR("PRVM_GetString: invalid string offset %i\n", num);
                return "";
        }
 }
@@ -1818,14 +1866,14 @@ int PRVM_SetEngineString(const char *s)
        if (!s)
                return 0;
        if (s >= prog->strings && s <= prog->strings + prog->stringssize)
-               Host_Error("PRVM_SetEngineString: s in prog->strings area\n");
+               PRVM_ERROR("PRVM_SetEngineString: s in prog->strings area\n");
        for (i = 0;i < prog->numknownstrings;i++)
                if (prog->knownstrings[i] == s)
                        return -1 - i;
        // new unknown engine string
        if (developer.integer >= 3)
                Con_Printf("new engine string %p\n", s);
-       for (i = 0;i < prog->numknownstrings;i++)
+       for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
                if (!prog->knownstrings[i])
                        break;
        if (i >= prog->numknownstrings)
@@ -1833,13 +1881,19 @@ int PRVM_SetEngineString(const char *s)
                if (i >= prog->maxknownstrings)
                {
                        const char **oldstrings = prog->knownstrings;
+                       const qbyte *oldstrings_freeable = prog->knownstrings_freeable;
                        prog->maxknownstrings += 128;
                        prog->knownstrings = PRVM_Alloc(prog->maxknownstrings * sizeof(char *));
+                       prog->knownstrings_freeable = PRVM_Alloc(prog->maxknownstrings * sizeof(qbyte));
                        if (prog->numknownstrings)
+                       {
                                memcpy((char **)prog->knownstrings, oldstrings, prog->numknownstrings * sizeof(char *));
+                               memcpy((char **)prog->knownstrings_freeable, oldstrings_freeable, prog->numknownstrings * sizeof(qbyte));
+                       }
                }
                prog->numknownstrings++;
        }
+       prog->firstfreeknownstring = i + 1;
        prog->knownstrings[i] = s;
        return -1 - i;
 }
@@ -1849,7 +1903,7 @@ int PRVM_AllocString(int bufferlength, char **pointer)
        int i;
        if (!bufferlength)
                return 0;
-       for (i = 0;i < prog->numknownstrings;i++)
+       for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
                if (!prog->knownstrings[i])
                        break;
        if (i >= prog->numknownstrings)
@@ -1857,14 +1911,21 @@ int PRVM_AllocString(int bufferlength, char **pointer)
                if (i >= prog->maxknownstrings)
                {
                        const char **oldstrings = prog->knownstrings;
+                       const qbyte *oldstrings_freeable = prog->knownstrings_freeable;
                        prog->maxknownstrings += 128;
                        prog->knownstrings = PRVM_Alloc(prog->maxknownstrings * sizeof(char *));
+                       prog->knownstrings_freeable = PRVM_Alloc(prog->maxknownstrings * sizeof(qbyte));
                        if (prog->numknownstrings)
+                       {
                                memcpy((char **)prog->knownstrings, oldstrings, prog->numknownstrings * sizeof(char *));
+                               memcpy((char **)prog->knownstrings_freeable, oldstrings_freeable, prog->numknownstrings * sizeof(qbyte));
+                       }
                }
                prog->numknownstrings++;
        }
-       (char *)(prog->knownstrings[i]) = PRVM_Alloc(bufferlength);
+       prog->firstfreeknownstring = i + 1;
+       prog->knownstrings[i] = PRVM_Alloc(bufferlength);
+       prog->knownstrings_freeable[i] = true;
        if (pointer)
                *pointer = (char *)(prog->knownstrings[i]);
        return -1 - i;
@@ -1873,18 +1934,22 @@ int PRVM_AllocString(int bufferlength, char **pointer)
 void PRVM_FreeString(int num)
 {
        if (num == 0)
-               Host_Error("PRVM_FreeString: attempt to free a NULL string\n");
+               PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string\n");
        else if (num >= 0 && num < prog->stringssize)
-               Host_Error("PRVM_FreeString: attempt to free a constant string\n");
+               PRVM_ERROR("PRVM_FreeString: attempt to free a constant string\n");
        else if (num < 0 && num >= -prog->numknownstrings)
        {
                num = -1 - num;
                if (!prog->knownstrings[num])
-                       Host_Error("PRVM_FreeString: attempt to free a non-existent or already freed string\n");
+                       PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string\n");
+               if (!prog->knownstrings[num])
+                       PRVM_ERROR("PRVM_FreeString: attempt to free a string owned by the engine\n");
                PRVM_Free((char *)prog->knownstrings[num]);
                prog->knownstrings[num] = NULL;
+               prog->knownstrings_freeable[num] = false;
+               prog->firstfreeknownstring = min(prog->firstfreeknownstring, num);
        }
        else
-               Host_Error("PRVM_FreeString: invalid string offset %i\n", num);
+               PRVM_ERROR("PRVM_FreeString: invalid string offset %i\n", num);
 }