shithub: rott

Download patch

ref: 0dce4913dd412523b5fdf52fc5232bf042c12cc8
parent: afc001948a99b74a27e0ebcedad7f9b6d9e79fda
author: Marc-Alexandre Espiaut <marcalexandre@member.fsf.org>
date: Tue Jun 5 09:41:27 EDT 2018 

Removing cryptic and useless WHEREAMI code


--- a/rott/develop.h
+++ b/rott/develop.h
@@ -39,30 +39,5 @@
 // okay?
 
 #define TEDLAUNCH   0
-#define WHEREAMI    0
-
-
-
-
-#if (WHEREAMI==1)
-
-#define wami(val)      \
-   {                   \
-   programlocation=val;\
-   }
-
-#define waminot()
-/*
-   {                  \
-   programlocation=-1;\
-   }
-*/
-
-#else
-
-#define wami(val)
-#define waminot()
-
-#endif
 
 #endif
--- a/rott/rt_main.c
+++ b/rott/rt_main.c
@@ -108,10 +108,6 @@
 
 boolean DebugOk = false;
 
-#if (WHEREAMI==1)
-int programlocation=-1;
-#endif
-
 #if SAVE_SCREEN
 static char savename[13] = "ROTT0000.LBM";
 static int totalbytes;
@@ -1053,8 +1049,6 @@
 {
     int NextLevel;
 
-    wami(1);
-
     while (1)
     {
         //no longer needed in SDL2
@@ -1549,7 +1543,6 @@
             ;
         }
     }
-    waminot();
 }
 
 boolean CheckForQuickLoad  (void )
@@ -1683,12 +1676,9 @@
     objtype * ob,*temp;
     battle_status BattleStatus;
 
-    wami(2);
-
     if (controlupdatestarted==0)
     {
         return;
-        waminot();
     }
 
     atime=GetFastTics();
@@ -1787,9 +1777,6 @@
             FX_SetReverb( min( numareatiles[ player->areanumber ] >> 1, 90 ) );
         }
     }
-
-    waminot();
-
 }
 
 extern boolean doRescaling;
@@ -1850,9 +1837,6 @@
     boolean canquit = true;
     int     quittime = 0;
 
-    wami(3);
-
-
     if ( (loadedgame == false) && (timelimitenabled == false) )
     {
         gamestate.TimeCount = 0;
@@ -2084,7 +2068,6 @@
             }
         }
     }
-    waminot();
 }
 
 //******************************************************************************
@@ -2097,7 +2080,6 @@
 {
     int num=-1;
 
-    wami(4);
     switch (scancode)
     {
     case sc_F1:
@@ -2142,7 +2124,6 @@
         AddRemoteRidiculeCommand ( consoleplayer, MSG_DIRECTED_TO_ALL, num );
         LastScan=0;
     }
-    waminot();
 }
 
 //******************************************************************************
@@ -2171,8 +2152,6 @@
 {
     static char autopressed = false;
 
-    wami(5);
-
     if (demoplayback==true)
     {
         IN_UpdateKeyboard();
@@ -2505,7 +2484,6 @@
             Keystate[0x45] = 0;
     }
 #endif
-    waminot();
 }
 
 
--- a/rott/rt_main.h
+++ b/rott/rt_main.h
@@ -145,10 +145,6 @@
 void ShutDown ( void );
 void UpdateGameObjects ( void );
 
-#if (WHEREAMI==1)
-extern int programlocation;
-#endif
-
 extern  int polltime;
 extern  int oldpolltime;
 extern  volatile int oldtime;
--- a/rott/rt_net.c
+++ b/rott/rt_net.c
@@ -597,8 +597,6 @@
     else
         InUCC = true;
 
-    wami(6);
-
 #if 0
 
     delta=GetTicCount()-lastcontrolupdatetime;
@@ -742,8 +740,6 @@
     }
 
     InUCC = false;
-
-    waminot();
 }
 
 //****************************************************************************
@@ -773,7 +769,6 @@
 //****************************************************************************
 void CheckForPacket ( void )
 {
-    wami(7);
     while (ReadPacket()==true)
     {
         if (badpacket==0)
@@ -783,7 +778,6 @@
         else
             RequestPacket (LastCommandTime[rottcom->remotenode]+controldivisor, rottcom->remotenode, controldivisor);
     }
-    waminot();
 }
 
 
@@ -950,8 +944,6 @@
 {
     MoveType * pkt;
 
-    wami(8);
-
     pkt=(MoveType *)NextLocalCommand();
 
     pkt->time=controlupdatetime;
@@ -969,7 +961,6 @@
         SendPacket (pkt, server);
 
     controlupdatetime+=controldivisor;
-    waminot();
 }