From 44ffbe36a8e7eaab7d7851bb79f229c4383c6545 Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Tue, 13 Jan 2004 02:21:06 +0000
Subject: Added breakpoints to memory menu and added extra GUI items.  Plus
 general fixes.

---
 src/gfx.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/gfx.c')

diff --git a/src/gfx.c b/src/gfx.c
index a2d1623..7906e84 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -50,9 +50,6 @@ static const char ident_fh[]=ESPEC_FONT_H;
 #define FALSE 0
 #endif
 
-#define SCR_W	320
-#define SCR_H	300
-
 #define LOCK	do							\
 		{							\
 		    if (SDL_MUSTLOCK(surface))				\
@@ -179,8 +176,8 @@ void GFXInit(void)
 	    Exit("Failed to init SDL: %s\n",SDL_GetError());
     }
 
-    if (!(surface=SDL_SetVideoMode(SCR_W*scale,
-				   SCR_H*scale,
+    if (!(surface=SDL_SetVideoMode(GFX_WIDTH*scale,
+				   GFX_HEIGHT*scale,
 				   0,
 				   IConfig(CONF_FULLSCREEN) ?
 				   		SDL_FULLSCREEN : 0)))
@@ -362,11 +359,11 @@ void GFXPrint(int x, int y, Uint32 col, const char *format, ...)
     {
 	for(sy=0;sy<8;sy++)
 	{
-	    if (y+sy<SCR_H && x<SCR_W)
+	    if (y+sy<GFX_HEIGHT && x<GFX_WIDTH)
 	    {
 		for(sx=0;sx<8;sx++)
 		{
-		    if (font[(int)*p][sx+sy*8] && x+sx<SCR_W)
+		    if (font[(int)*p][sx+sy*8] && x+sx<GFX_WIDTH)
 			putpixel(x+sx,y+sy,col);
 		}
 	    }
@@ -400,11 +397,11 @@ void GFXPrintPaper(int x, int y, Uint32 col, Uint32 paper,
     {
 	for(sy=0;sy<8;sy++)
 	{
-	    if (y+sy<SCR_H && x<SCR_W)
+	    if (y+sy<GFX_HEIGHT && x<GFX_WIDTH)
 	    {
 		for(sx=0;sx<8;sx++)
 		{
-		    if (font[(int)*p][sx+sy*8] && x+sx<SCR_W)
+		    if (font[(int)*p][sx+sy*8] && x+sx<GFX_WIDTH)
 			putpixel(x+sx,y+sy,col);
 		    else
 			putpixel(x+sx,y+sy,paper);
-- 
cgit v1.2.3