X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=16%2Fsrc%2Flib%2Fbitmap.c;h=caeb0111a8e3fc86252e275605d33f903463c0ad;hb=7546211d6de190a33b63eca728777c8b79d00550;hp=22bad98103086b9a36e7a7af57c700f448aebcd7;hpb=791c3fa594b0dfc3f1cea801a191ab12c80dca98;p=16.git

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