X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmenuscr.c;h=22846f40d730f173b96dadf1f585c80bd419bc1b;hb=070956bc54dbfedca82aee3e05f5723af63089ed;hp=e3517c494bc310905c5ad2da855669a2876fa70c;hpb=ae47c13224ea63ac83f80ab332f7436b3265cdce;p=eradicate

diff --git a/src/menuscr.c b/src/menuscr.c
index e3517c4..22846f4 100644
--- a/src/menuscr.c
+++ b/src/menuscr.c
@@ -6,13 +6,19 @@
 #include "gfx.h"
 #include "gfxutil.h"
 #include "game.h"
+#include "util.h"
+
+#define PADX	42
+#define PADX2	(PADX * 2)
+#define PADY	16
+#define PADY2	(PADY * 2)
 
 static const struct menuent {
 	int x, y, len, height;
 } menuent[] = {
-	{240, 300, 170, 48},
-	{230, 360, 184, 48},
-	{260, 424, 130, 48}
+	{252 - PADX, 281 - PADY, 147 + PADX2, 37 + PADY2},
+	{244 - PADX, 344 - PADY, 161 + PADX2, 37 + PADY2},
+	{276 - PADX, 407 - PADY, 102 + PADX2, 38 + PADY2}
 };
 
 static int cur;
@@ -38,6 +44,8 @@ void menu_start(void)
 {
 	draw = menu_draw;
 	key_event = menu_keyb;
+
+	memcpy(fb_pixels, bgpix, fb_size);
 }
 
 void menu_stop(void)
@@ -45,36 +53,37 @@ void menu_stop(void)
 }
 
 
-#define BBW		512
-#define BBH		128
+#define BBW		256
+#define BBH		64
 
 void menu_draw(void)
 {
 	static uint16_t blurbuf[2][BBW * BBH];
-	int fboffs, bboffs, tmp;
+	int fboffs, tmp, cleartop;
 	const struct menuent *ent = menuent + cur;
 
 	int blur_rad_x = (int)((sin(time_msec / 1000.0f) * 0.5f + 0.5f) * 50.0f);
 	int blur_rad_y = (int)((cos(time_msec / 1000.0f) * 0.5f + 0.5f) * 50.0f);
 
-	fboffs = (ent->y - ent->height / 2) * fb_width + ent->x;
-	bboffs = (BBH - ent->height) / 2 * BBW + BBW / 2;
+	fboffs = ent->y * fb_width + ent->x;
 
 	memset(blurbuf[0], 0, sizeof blurbuf[0]);
-	blit(blurbuf[0] + bboffs, BBW, bgpix + fboffs, ent->len, ent->height, bgwidth);
+	blit(blurbuf[0], BBW, bgpix + fboffs, ent->len, ent->height, bgwidth);
 
 	blur_horiz(blurbuf[1], blurbuf[0], BBW, BBH, blur_rad_x + 3, 0x140);
 	blur_vert(blurbuf[0], blurbuf[1], BBW, BBH, blur_rad_y / 4 + 3, 0x140);
 
-	wait_vsync();
+	//wait_vsync();
 
-	memcpy(fb_pixels, bgpix, fb_size);
-	tmp = fboffs;
-	fboffs -= 16 * fb_width + 128;
-	bboffs -= 16 * BBW + 128;
-	blit_key(fb_pixels + fboffs, fb_width, blurbuf[0] + bboffs, ent->len + 256, ent->height + 32, BBW, 0);
-	fboffs = tmp;
-	//blit_key(fb_pixels + fboffs, fb_width, bgpix + fboffs, ent->len, ent->height, bgwidth, 0);
+	cleartop = 280 * fb_width;
+	memcpy(fb_pixels + cleartop, bgpix + cleartop, (fb_height - 280) * fb_width << 1);
+
+	blit(fb_pixels + fboffs, fb_width, blurbuf[0], ent->len, ent->height, BBW);
+	blit_key(fb_pixels + fboffs, fb_width, bgpix + fboffs, ent->len, ent->height, bgwidth, 0);
+
+	if(show_fps) {
+		blit(fb_pixels, fb_width, bgpix, 64, 16, bgwidth);
+	}
 
 	blit_frame(fb_pixels, 0);
 }