Revert motorsep's change r12222.

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

diff --git a/progdefs.h b/progdefs.h
index cc1f45bfde7f4a36026225a6fb2980e6023f5d53..7086dbdc459767c2d70a87b8e7d92cd5e8d4cd78 100644 (file)
--- a/progdefs.h
+++ b/progdefs.h
@@ -150,10 +150,6 @@ typedef struct entvars_s
        float   spawnflags;
        string_t        target;
        string_t        targetname;
        float   spawnflags;
        string_t        target;
        string_t        targetname;

-       // motorsep 08/05/2015; support for Doom 3 entity spawnargs (whem mapping in DarkRadiant)
-       string_t        target0;
-       string_t        name;
-       // motorsep ends

        float   dmg_take;
        float   dmg_save;
        int     dmg_inflictor;
        float   dmg_take;
        float   dmg_save;
        int     dmg_inflictor;

diff --git a/prvm_edict.c b/prvm_edict.c
index c66d3f1e711af788fddee91da5a7105397608725..bc6c5ad53efa731413ba8ad91ddd4dc239801741 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -3257,16 +3257,11 @@ static qboolean PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, i
 {
        int i, j;
        int edictnum = PRVM_NUM_FOR_EDICT(edict);
 {
        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));
 
 
        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;
        if(targetname)
                if(!*targetname) // ""
                        targetname = NULL;


@@ -3293,12 +3288,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));
                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;
                        if(target)
                                if(!strcmp(target, targetname))
                                        return true;

diff --git a/prvm_offsets.h b/prvm_offsets.h
index 7fd8d05b6ac001def7e37764f69892969880e024..1563a0510f29264f475cfb436d0ec11b8395231f 100644 (file)
--- a/prvm_offsets.h
+++ b/prvm_offsets.h
@@ -376,10 +376,6 @@ PRVM_DECLARE_field(tag_index)
 PRVM_DECLARE_field(takedamage)
 PRVM_DECLARE_field(target)
 PRVM_DECLARE_field(targetname)
 PRVM_DECLARE_field(takedamage)
 PRVM_DECLARE_field(target)
 PRVM_DECLARE_field(targetname)

-// motorsep 08/05/2015; support for Doom 3 entity spawnargs (whem mapping in DarkRadiant)
-PRVM_DECLARE_field(target0)
-PRVM_DECLARE_field(name)
-// motorsep ends

 PRVM_DECLARE_field(team)
 PRVM_DECLARE_field(teleport_time)
 PRVM_DECLARE_field(think)
 PRVM_DECLARE_field(team)
 PRVM_DECLARE_field(teleport_time)
 PRVM_DECLARE_field(think)