removed two unused Key_Event implementations (which let me remove some unused variabl...

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index af5c4d45832c9850dad8b2941a2735a3c93c2bfa..2a5e0ca6bbdf458c677717c70949ac41afd85dc7 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1755,7 +1755,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,44 +1802,30 @@ 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 "";
        }
 }
 
-int PRVM_SetQCString(const char *s)
-{
-       int i;
-       if (!s)
-               return 0;
-       if (s >= prog->strings && s <= prog->strings + prog->stringssize)
-               return s - prog->strings;
-       for (i = 0;i < prog->numknownstrings;i++)
-               if (prog->knownstrings[i] == s)
-                       return -1 - i;
-       Host_Error("PRVM_SetQCString: unknown string\n");
-       return -1 - i;
-}
-
 int PRVM_SetEngineString(const char *s)
 {
        int i;
        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)
@@ -1854,6 +1840,7 @@ int PRVM_SetEngineString(const char *s)
                }
                prog->numknownstrings++;
        }
+       prog->firstfreeknownstring = i + 1;
        prog->knownstrings[i] = s;
        return -1 - i;
 }
@@ -1863,7 +1850,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)
@@ -1878,7 +1865,8 @@ int PRVM_AllocString(int bufferlength, char **pointer)
                }
                prog->numknownstrings++;
        }
-       (char *)(prog->knownstrings[i]) = PRVM_Alloc(bufferlength);
+       prog->firstfreeknownstring = i + 1;
+       prog->knownstrings[i] = PRVM_Alloc(bufferlength);
        if (pointer)
                *pointer = (char *)(prog->knownstrings[i]);
        return -1 - i;
@@ -1887,18 +1875,19 @@ 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");
                PRVM_Free((char *)prog->knownstrings[num]);
                prog->knownstrings[num] = NULL;
+               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);
 }