fixing scroll wwww

	modified:   data/g.pal
	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/data/g.pal b/data/g.pal
index a234f82cf8f66fa49d1057244aa661141c14cf8d..2ef9eed0349712a6e3e7b842d41d446a7ba5f22b 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/scroll.exe b/scroll.exe
index a0f20084adab9139654edb0cdffe6c4476458865..98ca00f7d058814540435a3f9cc864459d178e08 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 8279a20e10a17cb8ce9eb5a26641563a20d126a8..0b5fc6b1fc86d786f2a3d5d1420457fc19228e36 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -4,6 +4,8 @@
 #include "src/lib/wtest/wtest.c"\r
 #include "src/lib/planar.c"\r
 //====#include "src\lib\ems.c"\r
+
+//#define LOADDATA
 \r
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
@@ -124,9 +126,11 @@ void main() {
 \r
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-//0000 fprintf(stderr, "testing~\n");\r
+       fprintf(stderr, "testing~\n");
+//#ifdef LOADDATA
        loadmap("data/test.map", &map);
-//0000 fprintf(stderr, "yay map loaded~~\n");\r
+//#endif
+       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
@@ -138,13 +142,17 @@ void main() {
        ptr = map.data;\r
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
-//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());\r
-       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\r
+//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
+#ifdef LOADDATA\r
+       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+#endif\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
        \r
        /* create the planar buffer */\r
-//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());\r
-       p = planar_buf_from_bitmap(&ptmp);\r
+//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
+#ifdef LOADDATA\r
+       p = planar_buf_from_bitmap(&ptmp);
+#endif\r
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r