hmmmm.....

	modified:   pcxtest.exe
	modified:   src/lib/bitmap.c
	modified:   src/pcxtest.c

diff --git a/pcxtest.exe b/pcxtest.exe
index fbde82aead6e312f4d84357b210e4df2ba551d60..4a55771059103762cb193ebda3095d395a00457c 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index cdec73bd85a11893ae1fd0cba43f6b6c5abeb086..82a8525d104a13a777477a153518e2e45bfd70b7 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -91,8 +91,8 @@ bitmapLoadPcx(char *filename) {
        /* allocate the buffer */
        //printf("%zu\n", _memmax());\r
        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 ea1d296c6f06221f0c76723cf00cccec74471caf..ea8bfdf0b6cfd53be4d4659b0abca6a69f57cc01 100644 (file)
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -71,7 +71,7 @@ void main() {
        modexEnter();\r
 \r
        /* fix up the palette and everything */\r
-//++++ modexPalUpdate(&bmp, 0, 0, 0);\r
+       modexPalUpdate1(bmp.palette);\r
 \r
        /* clear and draw one sprite and one bitmap */\r
        modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);\r