shithub: rott

Download patch

ref: 7b887272f5ff8fe1b171c43d45b67aa657002b24
parent: 050ad59e0f1d5cf901b42828f4b7ea9f8677318d
author: Marc-Alexandre Espiaut <marcalexandre@member.fsf.org>
date: Tue Jun 5 10:03:22 EDT 2018

Removing useless ANSIESC code

--- a/rott/modexlib.c
+++ b/rott/modexlib.c
@@ -85,11 +85,7 @@
 #ifndef STUB_FUNCTION
 
 /* rt_def.h isn't included, so I just put this here... */
-#if !defined(ANSIESC)
 #define STUB_FUNCTION fprintf(stderr,"STUB: %s at " __FILE__ ", line %d, thread %d\n",__FUNCTION__,__LINE__,getpid())
-#else
-#define STUB_FUNCTION
-#endif
 
 #endif
 
--- a/rott/rt_def.h
+++ b/rott/rt_def.h
@@ -141,11 +141,7 @@
 #error please define for your platform.
 #endif
 
-#if !defined(ANSIESC)
 #define STUB_FUNCTION fprintf(stderr,"STUB: %s at " __FILE__ ", line %d, thread %d\n",__FUNCTION__,__LINE__,getpid())
-#else
-#define STUB_FUNCTION
-#endif
 
 #define far
 #define cdecl
--- a/rott/rt_main.c
+++ b/rott/rt_main.c
@@ -411,9 +411,6 @@
     {
         SetTextMode();
         TurnOffTextCursor ();
-#ifdef ANSIESC
-            printf("\n\n\n");
-#endif
             strcpy (title,"Rise of the Triad Startup  Version ");
             strcat (title,itoa(ROTTMAJORVERSION,&buf[0],10));
             strcat (title,".");
@@ -423,9 +420,7 @@
 #else
             strcat (title,"DFISH");
 #endif
-#ifndef ANSIESC
             strcat (title,"\n");
-#endif
 
             px=(80-strlen(title))>>1;
             py=0;
@@ -455,9 +450,7 @@
             py=1;
 
             UL_printf(title);
-#ifndef ANSIESC
             printf ("\n");
-#endif
 
             UL_ColorBox (0, 0, 80, 2, 0x1e);
     }
--- a/rott/rt_util.c
+++ b/rott/rt_util.c
@@ -324,9 +324,6 @@
 
 
     SetTextMode ();
-#if defined (ANSIESC)
-    DisplayTextSplash (&ROTT_ERR, 7);
-#endif
     memset (msgbuf, 0, 300);
 
     va_start (argptr, error);
@@ -360,11 +357,6 @@
         GetToken (true);
     }
 
-#ifdef ANSIESC
-    for (i = 0; i < 8; i++)
-        printf ("\n");
-#endif
-
     if (player!=NULL)
     {
         printf ("Player X     = %lx\n", (long int)player->x);
@@ -1415,11 +1407,7 @@
 
 void UL_printf (byte *str)
 {
-#ifdef ANSIESC
-    printf ("\x1b[%d;%dH%s",py,px,str);
-#else
     printf ("%s ",str);	// Hackish but works - DDOI
-#endif
 }
 
 /*
@@ -1432,19 +1420,6 @@
 
 void UL_ColorBox (int x, int y, int w, int h, int color)
 {
-#if defined (ANSIESC)
-    int i,j;
-
-
-    for (j=0; j<h; j++)
-    {
-        for (i=0; i<w; i++)
-        {
-            printf ("\x1b[%d;%dH",y+j,x+i);
-            put_dos2ansi(color);
-        }
-    }
-#endif
 }
 
 //******************************************************************************