From: Michael Georgoulopoulos <mgeorgoulopoulos@gmail.com>
Date: Sun, 18 Sep 2016 16:37:23 +0000 (+0300)
Subject: Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=9dda65bd2ac317cf110c080e561f40b2ee221c93

Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
---

9dda65bd2ac317cf110c080e561f40b2ee221c93
diff --cc src/grise.c
index 3ac12cb,e6cd7ea..ed15de0
--- a/src/grise.c
+++ b/src/grise.c
@@@ -274,15 -204,9 +274,15 @@@ static void draw(void
  	/* Then after displacement, blit the objects */
  	for (i = 0; i < 5; i++) rleBlit(backBuffer + PIXEL_PADDING, fb_width, fb_height, BB_SIZE, grobj, 134 + (i-3) * 60, 100);
  
 +	for (scanline = 0; scanline < 32; scanline++) {
 +		for (i = 0; i < 32; i++) {
 +			backBuffer[PIXEL_PADDING + scanline * BB_SIZE + i] = wheel(i, scanline);
 +		}
 +	}
 +
  	/* Blit effect to framebuffer */
  	src = backBuffer + PIXEL_PADDING;
- 	dst = fb_pixels;
+ 	dst = vmem_back;
  	for (scanline = 0; scanline < fb_height; scanline++) {
  		memcpy(dst, src, fb_width * 2);
  		src += BB_SIZE;