X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fscr%2Fgreets.c;h=9a49527b141e064f9053b6fc488feafd43722d68;hp=8b128c65eece58618492f8a689dc5c42434f6110;hb=b49854e0980a030cc8338a7f4ee779ecde1aae38;hpb=ba648ddfc62fc6d3f47294aa8bfc10ea6ca3f479

diff --git a/src/scr/greets.c b/src/scr/greets.c
index 8b128c6..9a49527 100644
--- a/src/scr/greets.c
+++ b/src/scr/greets.c
@@ -65,12 +65,12 @@ static int init(void)
 		return -1;
 	}
 
-	smokebuf_size = fb_width * fb_height * sizeof *cur_smokebuf;
+	smokebuf_size = FB_WIDTH * FB_HEIGHT * sizeof *cur_smokebuf;
 	if(!(cur_smokebuf = malloc(smokebuf_size * 2))) {
 		perror("failed to allocate smoke framebuffer");
 		return -1;
 	}
-	prev_smokebuf = cur_smokebuf + fb_width * fb_height;
+	prev_smokebuf = cur_smokebuf + FB_WIDTH * FB_HEIGHT;
 
 	return 0;
 }
@@ -150,26 +150,19 @@ static void draw(void)
 
 	memcpy(cur_smokebuf, prev_smokebuf, smokebuf_size);
 
-	g3d_framebuffer(fb_width, fb_height, cur_smokebuf);
+	g3d_framebuffer(FB_WIDTH, FB_HEIGHT, cur_smokebuf);
 	draw_smktxt(stx);
-	g3d_framebuffer(fb_width, fb_height, fb_pixels);
-
-	dest = fb_pixels;
-	src = cur_smokebuf;
-	for(i=0; i<fb_height; i++) {
-		for(j=0; j<fb_width; j++) {
-			unsigned int alpha = *src++;
-			*dest++ = PACK_RGB16(alpha, alpha, alpha);
-		}
-	}
+	g3d_framebuffer(FB_WIDTH, FB_HEIGHT, fb_pixels);
+
+	memcpy(fb_pixels, cur_smokebuf, smokebuf_size);
 
 	/*perf_start();*/
-	blur_grey_horiz(prev_smokebuf, cur_smokebuf, fb_width, fb_height, BLUR_RAD, 240);
+	blur_horiz(prev_smokebuf, cur_smokebuf, FB_WIDTH, FB_HEIGHT, BLUR_RAD, 240);
 	/*
 	perf_end();
 	printf("blur perf: %lu\n", (unsigned long)perf_interval_count);
 	*/
-	blur_grey_vert(cur_smokebuf, prev_smokebuf, fb_width, fb_height, BLUR_RAD, 240);
+	blur_vert(cur_smokebuf, prev_smokebuf, FB_WIDTH, FB_HEIGHT, BLUR_RAD, 240);
 	swap_smoke_buffers();
 
 	msec = get_msec();