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 8c75a739cf5450d3e141f369504eea0c718669c4..36e27fcae516a129854353467c4e58a76f94114a 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 2c9959a3121dbc0182e5e7825a5f4023da82c079..0ac0815ecf6dd4cd4d0f7ff895c3a2285c7ea39a 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 74b3f6c531f7edd31b610fb1e8cf77bd33eab5e1..352c5f92074ab3ba8ce59912b64c45dd0ff3b412 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/bitmap.c b/src/lib/bitmap.c
index 3777c3d125b54ead3bb82498682b399db3715c2a..81458938c2bb8cbfdf72373e53ea21d3f10f9601 100644 (file)
--- a/src/lib/bitmap.c
+++ b/src/lib/bitmap.c
@@ -89,7 +89,7 @@ bitmapLoadPcx(char *filename) {
     loadPcxStage1(file, &result);
 \r
     /* allocate the buffer */\r
-       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 dc6459c28b1fb37b75c262ff9e2f70ed3b99413d..ccbb9d696b3d9e85309ba61ebcfbe6f001c7aa56 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -124,7 +124,8 @@ void main() {
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
        fprintf(stderr, "testing~\n");\r
-       loadmap("data/test.map", &map);\r
+       loadmap("data/test.map", &map);
+       fprintf(stderr, "yay map loaded~~\n");\r
 //---- 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\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r

diff --git a/test.exe b/test.exe
index f79cea4eb1a0ae53de4395125abc6df6e0b26e9d..ee37f8b60860d56fe60e9282e45d8ccb7175b188 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index a289dfd085447adf4f520cb89c4497491b3f025f..9b4249c73bfb73fb4daaa8e9c313a8e03924b856 100644 (file)
Binary files a/test2.exe and b/test2.exe differ