From 564b220add850e623a990d9c43426c7d23e97d80 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 29 Jul 2006 00:17:46 +0000
Subject: [PATCH] Remove 'txdist' keyword

git-svn-id: https://svn.eduke32.com/eduke32@251 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/gamedef.c  | 6 +-----
 polymer/eduke32/source/gamedef.h  | 3 +--
 polymer/eduke32/source/gameexec.c | 8 ++------
 polymer/eduke32/source/sector.c   | 9 ---------
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 02ca1de1c..7e4a160cf 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -384,7 +384,7 @@ char *keyw[] = {
                    "setplayervar",             // 238
                    "mulscale",                 // 239
                    "setaspect",                // 240
-                   "txdist",                   // 241
+                   "ezshoot",                  // 241
                    "spritenoshade",            // 242
                    "movesprite",               // 243
                    "checkavailweapon",         // 244
@@ -438,7 +438,6 @@ char *keyw[] = {
                    "findnearactorzvar",        // 292
                    "findnearspritez",          // 293
                    "findnearspritezvar",       // 294
-                   "ezshoot",                  // 295
                    "<null>"
                };
 
@@ -3536,7 +3535,6 @@ char parsecommand(void)
     case CON_GMAXAMMO:
     case CON_DIST:
     case CON_LDIST:
-    case CON_TXDIST:
     case CON_GETANGLE:
     case CON_MULSCALE:
     case CON_SETASPECT:
@@ -3545,7 +3543,6 @@ char parsecommand(void)
         {
         case CON_DIST:
         case CON_LDIST:
-        case CON_TXDIST:
         case CON_GETANGLE:
             transvartype(GAMEVAR_FLAG_READONLY);
             break;
@@ -3563,7 +3560,6 @@ char parsecommand(void)
         {
         case CON_DIST:
         case CON_LDIST:
-        case CON_TXDIST:
         case CON_GETANGLE:
             transvar();
             break;
diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h
index 301be378d..ceefdd52e 100644
--- a/polymer/eduke32/source/gamedef.h
+++ b/polymer/eduke32/source/gamedef.h
@@ -670,7 +670,7 @@ enum keywords {
     CON_SETPLAYERVAR,       // 238
     CON_MULSCALE,           // 239
     CON_SETASPECT,          // 240
-    CON_TXDIST,             // 241
+    CON_EZSHOOT,            // 241
     CON_SPRITENOSHADE,      // 242
     CON_MOVESPRITE,         // 243
     CON_CHECKAVAILWEAPON,   // 244
@@ -724,6 +724,5 @@ enum keywords {
     CON_FINDNEARACTORZVAR,  // 292
     CON_FINDNEARSPRITEZ,    // 293
     CON_FINDNEARSPRITEZVAR, // 294
-    CON_EZSHOOT,            // 295
     END
 };
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index ecf618aea..0f1590704 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -4388,7 +4388,6 @@ SKIPJIBS:
 
     case CON_DIST:
     case CON_LDIST:
-    case CON_TXDIST:
         {
             long distvar, xvar, yvar, distx=0;
 
@@ -4405,9 +4404,6 @@ SKIPJIBS:
             case CON_LDIST:
                 distx = ldist(&sprite[GetGameVarID(xvar, g_i, g_p)],&sprite[GetGameVarID(yvar, g_i, g_p)]);
                 break;
-            case CON_TXDIST:
-                distx = txdist(&sprite[GetGameVarID(xvar, g_i, g_p)],&sprite[GetGameVarID(yvar, g_i, g_p)]);
-                break;
             }
 
             SetGameVarID(distvar, distx, g_i, g_p);
@@ -5582,7 +5578,7 @@ good:
                         lTemp=ldist(&sprite[g_i], &sprite[j]);
                         if(lTemp < lMaxDist)
                         {
-                            lTemp2=klabs(sprite[g_i].z-sprite[j].z);//txdist(&sprite[g_i], &sprite[j]);
+                            lTemp2=klabs(sprite[g_i].z-sprite[j].z);
                             if (lTemp2 < lMaxZDist)
                             {
                                 lFound=j;
@@ -5632,7 +5628,7 @@ good:
                         lTemp=ldist(&sprite[g_i], &sprite[j]);
                         if(lTemp < lMaxDist)
                         {
-                            lTemp2=klabs(sprite[g_i].z-sprite[j].z); // txdist(&sprite[g_i], &sprite[j]);
+                            lTemp2=klabs(sprite[g_i].z-sprite[j].z);
                             if (lTemp2 < lMaxZDist)
                             {
                                 lFound=j;
diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c
index a30b354f7..bcb4e7555 100644
--- a/polymer/eduke32/source/sector.c
+++ b/polymer/eduke32/source/sector.c
@@ -210,15 +210,6 @@ long dist(spritetype *s1,spritetype *s2)
     return(FindDistance3D(vx,vy,vz>>4));
 }
 
-long txdist(spritetype *s1,spritetype *s2)
-{
-    long vx,vy,vz;
-    vx = s1->x - s2->x;
-    vy = s1->y - s2->y;
-    vz = s1->z - s2->z - s2->yrepeat;
-    return(FindDistance3D(vx,vy,vz>>4));
-}
-
 short findplayer(spritetype *s,long *d)
 {
     short j, closest_player;