hmmm scroll.exe is seriously broken... wwww

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

diff --git a/data/g.pal b/data/g.pal
index 9ce11752436d2b674f5203a746a27cd658815e1c..f977ba228c7d317afd83aac38a89050270e5acf9 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/scroll.exe b/scroll.exe
index a72bd9b530190810460b58126a0fe59c27a0ce1e..fd7110f9f6660da2e55b8a527bc409241794f332 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 72ad4d5c60d32ea8b14268721f0374bb3027ec94..b2b1f98f4faf08ce0562eabe7492dcadc4246b2c 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -106,9 +106,9 @@ void main() {
 \r
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-//0000 fprintf(stderr, "testing~\n");
-       loadmap("data/test.map", &map);
-//0000 fprintf(stderr, "yay map loaded~~\n");
+       fprintf(stderr, "testing~\n");
+//++++ 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\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r
@@ -121,12 +121,12 @@ void main() {
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
 //0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
-       //++++ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //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());
-//++++ p = planar_buf_from_bitmap(&ptmp);
+       p = planar_buf_from_bitmap(&ptmp);
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r