16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / 16 / src / lib / bitmap.c

diff --git a/16/src/lib/bitmap.c b/16/src/lib/bitmap.c
index 22bad98103086b9a36e7a7af57c700f448aebcd7..caeb0111a8e3fc86252e275605d33f903463c0ad 100755 (executable)
--- a/16/src/lib/bitmap.c
+++ b/16/src/lib/bitmap.c
@@ -23,7 +23,7 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <malloc.h>\r
-#include "src/lib/bitmap.h"\r
+#include "16/src/lib/bitmap.h"\r
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_pm.h"\r
 #include "src/lib/16_ca.h"\r
@@ -77,7 +77,7 @@ static void loadPcxPalette(FILE *file, bitmap_t *result) {
        /* handle the palette */\r
        fseek(file, -769, SEEK_END);\r
        val = fgetc(file);\r
-       result->palette = modexNewPal();\r
+       result->palette = omodexNewPal();\r
        if(head.version == 5 && val == 12) {\r
        /* use the vga palette */\r
        for(index=0; !feof(file) && index < PAL_SIZE; index++) {\r
@@ -184,7 +184,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
        ts.palette = result.palette;\r
 \r
        /* allocate the pixel storage for the tiles */\r
-       ts.data = _fmalloc(sizeof(byte*) * ts.ntiles);\r
+       ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
        //ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);\r
        for(i=1; i < ts.ntiles; i++) {\r
                ts.data[i] = ts.data[i-1] + twidth * theight;\r