From: sparky4 <sparky4@cock.li>
Date: Sun, 24 May 2015 05:52:37 +0000 (-0500)
Subject: fack!! oh well~
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=03a770d033676d87f693ff7108415c08a85427b0;p=16.git

fack!! oh well~
	modified:   maptest.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/bitmap.c
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/maptest.exe b/maptest.exe
index 8c75a739..36e27fca 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 2c9959a3..0ac0815e 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 74b3f6c5..352c5f92 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 3777c3d1..81458938 100644
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -89,7 +89,7 @@ bitmapLoadPcx(char *filename) {
     loadPcxStage1(file, &result);
 
     /* allocate the buffer */
-	bufSize = ((dword)result.width * result.height);
+	bufSize = (result.width * result.height);
 	result.data = malloc((bufSize));
 	/*0000printf("Size of block is %u bytes\n", _msize(result.data));
 	printf("Size of bufSize is %lu bytes\n", bufSize);
diff --git a/src/scroll.c b/src/scroll.c
index dc6459c2..ccbb9d69 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -124,7 +124,8 @@ void main() {
 	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
 	fprintf(stderr, "testing~\n");
-	loadmap("data/test.map", &map);
+	loadmap("data/test.map", &map);
+	fprintf(stderr, "yay map loaded~~\n");
 //----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
 	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
 //----	initMap(&map);
diff --git a/test.exe b/test.exe
index f79cea4e..ee37f8b6 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index a289dfd0..9b4249c7 100644
Binary files a/test2.exe and b/test2.exe differ