X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.c;h=433217337db99d0ef0856bcb80037e54873a62e8;hb=34abe02e0e49c2b73912babf54fc63b5cdc56284;hp=19af31f5386846af026278b88df3d0ca94e697b6;hpb=29050ce6a22ce3d6c47183d6946e81ea25b6b5c7;p=16.git

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 19af31f5..43321733 100755
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -24,31 +24,6 @@
 #include <stdlib.h>
 #include <malloc.h>
 #include "src/lib/bitmap.h"
-#include "src/lib/modex16.h"
-
-#ifndef PCXHEADER_H
-#define PCXHEADER_H
-static struct pcxHeader {
-	byte id;
-	byte version;
-	byte encoding;
-	byte bpp;
-	word xmin;
-	word ymin;
-	word xmax;
-	word ymax;
-	word hres;
-	word vres;
-	byte pal16[48];
-	byte res1;
-	word bpplane;
-	word palType;
-	word hScreenSize;
-	word vScreenSize;
-	byte padding[54];
-} head;
-#endif /*PCXHEADER_H*/
-
 
 static void loadPcxStage1(FILE *file, bitmap_t *result) {
 	long bufSize;
@@ -151,6 +126,7 @@ bitmapLoadPcx(char *filename) {
 		result.data[index] = val;
 	}
 	} while(index < bufSize);
+	printf("index=%d\n", index);
 
 	loadPcxPalette(file, &result);
 
@@ -185,7 +161,7 @@ bitmapLoadPcxTiles(char *filename, word twidth, word theight) {
 
 	/* allocate the pixel storage for the tiles */
 	ts.data = malloc(sizeof(byte*) * ts.ntiles);
-	ts.data[0] = malloc(sizeof(byte) * ts.ntiles * twidth * theight);
+	//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;
 	}