Revert "too tired to continue"

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

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 7f9df1f0f836a65cd6454b05a4407e677ea9d755..22bad98103086b9a36e7a7af57c700f448aebcd7 100755 (executable)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -24,6 +24,9 @@
 #include <stdlib.h>\r
 #include <malloc.h>\r
 #include "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
 \r
 static struct pcxHeader {\r
        byte id;\r
@@ -91,7 +94,7 @@ static void loadPcxPalette(FILE *file, bitmap_t *result) {
 \r
 \r
 bitmap_t\r
-bitmapLoadPcx(char *filename) {\r
+bitmapLoadPcx(char *filename, global_game_variables_t *gv) {\r
        FILE *file;\r
        bitmap_t result;\r
        dword bufSize;\r
@@ -102,7 +105,7 @@ bitmapLoadPcx(char *filename) {
        file = fopen(filename, "rb");\r
        if(!file) {\r
                printf("Could not open %s for reading.\n", filename);\r
-               exit(-2);\r
+               //exit(-2);\r
        }\r
 \r
        /* load the first part of the pcx file */\r
@@ -111,7 +114,9 @@ bitmapLoadPcx(char *filename) {
        /* allocate the buffer */\r
        //printf("%zu\n", _memmax());\r
        bufSize = (/*(dword)*/result.width * result.height);\r
+       //CA_LoadFile(filename, (memptr *)(result.data), gv);\r
        result.data = malloc(bufSize);\r
+\r
 //     result.data = (byte far *)_fmalloc(bufSize);\r
 //     result.data = (byte __huge *)halloc(bufSize, sizeof(byte));\r
        /*printf("&bufSize=%p\n", &bufSize);\r
@@ -121,11 +126,10 @@ bitmapLoadPcx(char *filename) {
        printf("Size of result.width is %zu \n", result.width);\r
        printf("Size of result.height is %zu \n", result.height);\r
        printf("Dimensions of result is %lu\n", (dword)result.width*result.height);*/\r
-       //exit(0);\r
        if(!result.data) {\r
                fprintf(stderr, "Could not allocate memory for bitmap data.");\r
                fclose(file);\r
-               exit(-1);\r
+               //exit(-1);\r
        }\r
 \r
        /*  read the buffer in */\r
@@ -180,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 = malloc(sizeof(byte*) * ts.ntiles);\r
+       ts.data = _fmalloc(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