Remove some unused headers and other cleanup (#89)

fabiangreffrath · Sep 22, 2024 · 1e70c8a · 1e70c8a
1 parent 58842af
commit 1e70c8a
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 279 deletions.
diff --git a/rott/_isr.h b/rott/_isr.h
diff --git a/rott/isr.c b/rott/isr.c
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "rt_def.h"
 #include "isr.h"
-#include "_isr.h"
 #include "rt_in.h"
 #include "rt_util.h"
 #include "profile.h"

diff --git a/rott/modexlib.c b/rott/modexlib.c
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "modexlib.h"
 #include "rt_util.h"
 #include "rt_net.h" // for GamePaused
-#include "myprint.h"
 
 #include "isr.h" // for VBLCOUNTER
 

diff --git a/rott/myprint.h b/rott/myprint.h
diff --git a/rott/rt_net.c b/rott/rt_net.c
@@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "rt_rand.h"
 #include "rt_game.h"
 #include "rt_draw.h"
-#include "myprint.h"
 #include "rt_debug.h"
 #include "rt_view.h"
 #include "rt_battl.h"

diff --git a/rott/rt_str.c b/rott/rt_str.c
@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "rt_msg.h"
 #include "rt_playr.h"
 #include "rt_sound.h"
-#include "myprint.h"
 
 
 //******************************************************************************

diff --git a/rott/rt_str.h b/rott/rt_str.h
@@ -120,6 +120,4 @@ void DrawIntensityString (unsigned short x, unsigned short y, const char *string
 void VW_MeasureIntensityPropString (const char *string, int *width, int *height);
 byte GetIntensityColor (byte pix);
 
-#include "myprint.h"
-
 #endif
diff --git a/rott/rt_util.h b/rott/rt_util.h
@@ -33,6 +33,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_misc2.h"
 #include "develop.h"
 
+enum COLORS
+   {
+   BLACK, BLUE, GREEN, CYAN, RED, MAGENTA, BROWN, LIGHTGRAY, DARKGRAY,
+   LIGHTBLUE, LIGHTGREEN, LIGHTCYAN, LIGHTRED, LIGHTMAGENTA, YELLOW, WHITE
+   };
+
 extern  int    egacolor[16];
 extern  byte   *  origpal;
 extern  int      _argc;

diff --git a/rott/splib.h b/rott/splib.h
diff --git a/rott/vga_font_cp437.h → rott/vgafont.h b/rott/vga_font_cp437.h → rott/vgafont.h
diff --git a/rott/vgatext.c b/rott/vgatext.c
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "SDL.h"
 
-#include "vga_font_cp437.h"
+#include "vgafont.h"
 
 #define BLINK_HZ ((1000 / 70) * 16)