/* 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
#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
\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
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
/* allocate the buffer */\r
//printf("%zu\n", _memmax());\r
bufSize = (/*(dword)*/result.width * result.height);\r
- result.data = _fmalloc(bufSize);\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
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
}\r
\r
//TODO: update!!\r
+/*\r
tileset_t\r
bitmapLoadPcxTiles(char *filename, word twidth, word theight) {\r
tileset_t ts;\r
bitmap_t result;\r
int i;\r
\r
- /* open the PCX file for reading */\r
+ // open the PCX file for reading\r
file = fopen(filename, "rb");\r
if(!file) {\r
printf("Could not open %s for reading.\n", filename);\r
exit(-2);\r
}\r
\r
- /* load the first part of the pcx file */\r
+ // load the first part of the pcx file\r
loadPcxStage1(file, &result);\r
\r
- /* get the number of tiles and set up the result structure */\r
+ // get the number of tiles and set up the result structure\r
ts.twidth = twidth;\r
ts.theight = theight;\r
ts.ntiles = (result.width/twidth) * (result.height/theight);\r
ts.palette = result.palette;\r
\r
- /* allocate the pixel storage for the tiles */\r
- ts.data = malloc(sizeof(byte*) * ts.ntiles);\r
+ // allocate the pixel storage for the tiles\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
}\r
\r
- /* finish off the file */\r
+ // finish off the file\r
loadPcxPalette(file, &result);\r
\r
fclose(file);\r
\r
return ts;\r
-}\r
+}*/\r