From: sparky4 Date: Sun, 24 May 2015 10:37:16 +0000 (-0500) Subject: hmmmm..... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4815fa30e092074ad9ada29f3937c232b8ee8522;p=16.git hmmmm..... modified: pcxtest.exe modified: src/lib/bitmap.c modified: src/pcxtest.c --- diff --git a/pcxtest.exe b/pcxtest.exe index fbde82ae..4a557710 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c index cdec73bd..82a8525d 100644 --- a/src/lib/bitmap.c +++ b/src/lib/bitmap.c @@ -91,8 +91,8 @@ bitmapLoadPcx(char *filename) { /* allocate the buffer */ //printf("%zu\n", _memmax()); bufSize = (/*(dword)*/result.width * result.height); -// result.data = malloc(bufSize); - result.data = (byte far *)_fmalloc(bufSize); + result.data = malloc(bufSize); +// result.data = (byte far *)_fmalloc(bufSize); // result.data = (byte __huge *)halloc(bufSize, sizeof(byte)); printf("&bufSize=%p\n", &bufSize); printf("&result.data=%p\n", result.data); diff --git a/src/pcxtest.c b/src/pcxtest.c index ea1d296c..ea8bfdf0 100644 --- a/src/pcxtest.c +++ b/src/pcxtest.c @@ -71,7 +71,7 @@ void main() { modexEnter(); /* fix up the palette and everything */ -//++++ modexPalUpdate(&bmp, 0, 0, 0); + modexPalUpdate1(bmp.palette); /* clear and draw one sprite and one bitmap */ modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);