p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 0f4bf060c2ce668cad69fb63ebe0f331dce2cbc0..2fd958694ae593fe83e6de65108d823f0ba19a55 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -26,6 +26,7 @@
 #include "src/lib/16_dbg.h"\r
 \r
 #define FADE\r
+//#define NOMAPLOAD\r
 \r
 //map_view_t mv[4];\r
 static map_t map;\r
@@ -85,11 +86,15 @@ void main(int argc, char *argv[])
        // create the map\r
 //     fprintf(stderr, "testing map load~      ");\r
        CA_loadmap("data/test.map", &map, &gvar);\r
+#ifndef NOMAPLOAD\r
        chkmap(&map, 0);\r
 //     initMap(&map);\r
 //     printf("chkmap ok       ");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
-\r
+#else\r
+       chkmap(&map, 1);\r
+       //initMap(&map);\r
+#endif\r
        // data\r
        VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
 \r
@@ -156,6 +161,7 @@ void main(int argc, char *argv[])
        {\r
                gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
                gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+               modexWaitBorder();\r
                shinku(&gvar);\r
                //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
                //to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction\r