From 0c2f9bb0c5d8d2e2cdced9ffa90ae49b8346fab9 Mon Sep 17 00:00:00 2001
From: dwsJason <JGAndersen@gmail.com>
Date: Sun, 19 Aug 2018 16:10:35 -0400
Subject: [PATCH] More GFXST also defined for GFXGS

---
 src/draw.c        | 2 +-
 src/e_bomb.c      | 8 ++++----
 src/ents.c        | 2 +-
 src/scr_getname.c | 4 ++--
 src/scr_imap.c    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/draw.c b/src/draw.c
index 813120e..9d939c0 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -668,7 +668,7 @@ draw_clearStatus(void)
 #ifdef GFXPC
     draw_tile(map_map[MAP_ROW_SCRTOP + (DRAW_STATUS_Y / 8)][i]);
 #endif
-#if defined(GFXST)||defined(GFXGS)
+#if defined(GFXST) || defined(GFXGS)
     draw_tile('@');
 #endif
   }
diff --git a/src/e_bomb.c b/src/e_bomb.c
index eb48cb8..cb8e5b8 100644
--- a/src/e_bomb.c
+++ b/src/e_bomb.c
@@ -69,7 +69,7 @@ void e_bomb_init(U16 x, U16 y)
      * Atari ST dynamite sprites are not centered the
      * way IBM PC sprites were ... need to adjust things a little bit
      */
-#ifdef GFXST
+#if defined(GFXST) || defined(GFXGS)
     E_BOMB_ENT.x += 4;
     E_BOMB_ENT.y += 5;
 #endif
@@ -105,7 +105,7 @@ e_bomb_action(UNUSED(U8 e))
 		if ((e_bomb_ticker & 0x03) == 0x02)
 			syssnd_play(WAV_BOMBSHHT, 1);
 #endif
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
 		/* ST bomb sprites sequence is longer */
 		if (e_bomb_ticker < 40)
 			E_BOMB_ENT.sprite = 0x99 + 19 - (e_bomb_ticker >> 1);
@@ -124,7 +124,7 @@ e_bomb_action(UNUSED(U8 e))
 #ifdef GFXPC
 		E_BOMB_ENT.sprite = 0x24 + 4 - (e_bomb_ticker >> 1);
 #endif
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
 		/* See above: fixing alignment */
 		E_BOMB_ENT.x -= 4;
 		E_BOMB_ENT.y -= 5;
@@ -144,7 +144,7 @@ e_bomb_action(UNUSED(U8 e))
 #ifdef GFXPC
 		E_BOMB_ENT.sprite = 0x24 + 4 - (e_bomb_ticker >> 1);
 #endif
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
 		E_BOMB_ENT.sprite = 0xa8 + 4 - (e_bomb_ticker >> 1);
 #endif
 		/* exploding, hence lethal */
diff --git a/src/ents.c b/src/ents.c
index 28e8ae0..5fc822f 100644
--- a/src/ents.c
+++ b/src/ents.c
@@ -313,7 +313,7 @@ ent_addrect(S16 x, S16 y, U16 width, U16 height)
 
   /*sys_printf("-> %#04x,%#04x %#04x %#04x\n", x0, y0, w0, h0);*/
 
-#ifdef GFXST
+#if defined(GFXST) || defined(GFXGS)
   y0 += 8;
 #endif
 
diff --git a/src/scr_getname.c b/src/scr_getname.c
index 9840b97..6247012 100644
--- a/src/scr_getname.c
+++ b/src/scr_getname.c
@@ -97,7 +97,7 @@ screen_getname(void)
 	draw_tile('A' + i + j * 6);
       }
     draw_setfb(TOPLEFT_X, TOPLEFT_Y + 64);
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
     draw_tilesListImm((U8 *)"Y@Z@.@@@\074\373\374\375\376");
 #endif
 #ifdef GFXPC
@@ -267,7 +267,7 @@ name_draw(void)
   for (i = p; i < 10; i++)
     draw_tile(TILE_CURSOR);
 
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
   draw_setfb(NAMEPOS_X, NAMEPOS_Y + 8);
   for (i = 0; i < 10; i++)
     draw_tile('@');
diff --git a/src/scr_imap.c b/src/scr_imap.c
index a0296bc..adce99d 100644
--- a/src/scr_imap.c
+++ b/src/scr_imap.c
@@ -71,7 +71,7 @@ screen_introMap(void)
     draw_tilesBank = 1;
     draw_filter = 0xAAAA;
 #endif
-#ifdef GFXST
+#if defined(GFXST)||defined(GFXGS)
     draw_tilesBank = 0;
 #endif
     draw_tllst = screen_imaptext[game_map];