Fix several warnings with gcc-5 and an error with mingw (where

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index c66d3f1e711af788fddee91da5a7105397608725..a002fd43c71d8f3cea1426b03c791e76f06e4762 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -3105,7 +3105,11 @@ int PRVM_AllocString(prvm_prog_t *prog, size_t bufferlength, char **pointer)
 {
        int i;
        if (!bufferlength)
+       {
+               if (pointer)
+                       *pointer = NULL;
                return 0;
+       }
        for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
                if (!prog->knownstrings[i])
                        break;
@@ -3257,16 +3261,11 @@ static qboolean PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, i
 {
        int i, j;
        int edictnum = PRVM_NUM_FOR_EDICT(edict);
-       const char *targetname = NULL;  
+       const char *targetname = NULL;
 
        if (prog == SVVM_prog)
                targetname = PRVM_GetString(prog, PRVM_serveredictstring(edict, targetname));
 
-       // motorsep 08/05/2015; support for Doom 3 entity spawnargs (whem mapping in DarkRadiant)
-       if(!targetname)
-               targetname = PRVM_GetString( prog, PRVM_serveredictstring( edict, name ) );
-       // motorsep ends
-
        if(targetname)
                if(!*targetname) // ""
                        targetname = NULL;
@@ -3293,12 +3292,6 @@ static qboolean PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, i
                if(targetname)
                {
                        const char *target = PRVM_GetString(prog, PRVM_serveredictstring(ed, target));
-                       
-                       // motorsep 08/05/2015; support for Doom 3 entity spawnargs (whem mapping in DarkRadiant)
-                       if(!target)
-                               target = PRVM_GetString( prog, PRVM_serveredictstring( ed, target0 ) );
-                       // motorsep ends
-
                        if(target)
                                if(!strcmp(target, targetname))
                                        return true;