From db1c4a1ac4ebe3818dc0a3fed9790460e4388d66 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Fri, 29 Sep 2006 00:53:35 +0000
Subject: [PATCH] fixes for some menu glitches

---
 main/kconfig.c |  9 ++++++---
 main/network.c |  2 +-
 main/scores.c  | 16 ++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/main/kconfig.c b/main/kconfig.c
index 9dec2ef99..f72a037ba 100755
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -209,8 +209,8 @@ fix Cruise_speed=0;
 
 // macros for drawing lo/hi res kconfig screens (see scores.c as well)
 
-#define LHX(x)		((x)*(MenuHires?FONTSCALE_X(2):1))
-#define LHY(y)		((y)*(MenuHires?FONTSCALE_Y(2.4):1))
+#define LHX(x)		((x)*(MenuHires?FONTSCALE_X(2):FONTSCALE_X(1)))
+#define LHY(y)		((y)*(MenuHires?FONTSCALE_Y(2.4):FONTSCALE_Y(1)))
 
 
 #define BT_KEY 				0
@@ -909,7 +909,10 @@ void kconfig_sub(kc_item * items,int nitems, char * title)
 
 	scale=FONTSCALE_X(GAME_FONT->ft_h/5.0);
 	printf("scale=%f\n",scale);
-	gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 240*scale)/2, 320*scale, 240*scale);
+	if (MenuHires)
+		gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 240*scale)/2, 320*scale, 240*scale);
+	else
+		gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 200*scale)/2, 320*scale, 200*scale);
 	gr_set_current_canvas(&canvas);
 
 	save_font = grd_curcanv->cv_font;
diff --git a/main/network.c b/main/network.c
index cc9ea2cbe..d25836a8f 100755
--- a/main/network.c
+++ b/main/network.c
@@ -3059,7 +3059,7 @@ int network_get_game_params( char * game_name, int *mode, int *game_flags, int *
 	{
 		m[opt].type = NM_TYPE_RADIO; m[opt].text = "Hoard"; m[opt].value=0; m[opt].group=0; opt++;
 		m[opt].type = NM_TYPE_RADIO; m[opt].text = "Team Hoard"; m[opt].value=0; m[opt].group=0; opt_team_hoard=opt; opt++;
-	   m[opt].type = NM_TYPE_TEXT; m[opt].text = ""; opt++;
+// 	   m[opt].type = NM_TYPE_TEXT; m[opt].text = ""; opt++;
 	} 
 	else
 	 {  m[opt].type = NM_TYPE_TEXT; m[opt].text = ""; opt++; }
diff --git a/main/scores.c b/main/scores.c
index 49fbdefa8..2ba31aec1 100755
--- a/main/scores.c
+++ b/main/scores.c
@@ -81,8 +81,8 @@ char scores_filename[128];
 #define XX  (7)
 #define YY  (-3)
 
-#define LHX(x)		((x)*(MenuHires?FONTSCALE_X(2):1))
-#define LHY(y)		((y)*(MenuHires?FONTSCALE_Y(2.4):1))
+#define LHX(x)		((x)*(MenuHires?FONTSCALE_X(2):FONTSCALE_X(1)))
+#define LHY(y)		((y)*(MenuHires?FONTSCALE_Y(2.4):FONTSCALE_Y(1)))
 
 
 char * get_scores_filename()
@@ -357,7 +357,9 @@ static float scale=1.0;
 
 void scores_view(int citem)
 {
+#ifdef OGL
 	gr_palette_load( gr_palette ); // ZICO - added to be sure right palette is loaded after engame
+#endif
 	fix t1;
 	int i,done,looper;
 	int k;
@@ -372,12 +374,14 @@ ReshowScores:
 	gr_set_current_canvas(NULL);
 
 	scale=FONTSCALE_X(GAME_FONT->ft_h/5);//5 is the size of the standard font the menus were designed for.
-	gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 240*scale)/2, 320*scale, 240*scale); // ZICO - added
+	if (MenuHires)
+		gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 240*scale)/2, 320*scale, 240*scale);
+	else
+		gr_init_sub_canvas(&canvas, &grd_curscreen->sc_canvas, (SWIDTH - 320*scale)/2, (SHEIGHT - 200*scale)/2, 320*scale, 200*scale);
 	gr_set_current_canvas(&canvas);
 	
-	nm_draw_background(0, 0, GWIDTH-1, GHEIGHT-1); // ZICO - added
-	
-	//nm_draw_background(0,0,grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h ); // ZICO - removed
+	nm_draw_background(0, 0, GWIDTH-1, GHEIGHT-1);
+	//nm_draw_background(0,0,grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h );
 
 	grd_curcanv->cv_font = MEDIUM3_FONT;