[xcroll.exe needs testing on real hardware] it is working but not flexible 16_ca...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 29ef17f4b7537423ab268f0c4bfab65e56d6b2f5..ef1d11ede98961b7f3fa501906e47ac4f9075dd2 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,12 +22,15 @@
 \r
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
-#include "src/lib/16_dbg.h"\r
+//#include "src/lib/16_dbg.h"\r
 \r
-//#define FADE\r
-//#define NOMAPLOAD\r
+#ifdef __DEBUG__\r
+boolean\r
+       dbg_nointest=1;\r
+#endif\r
 \r
-//#define VERBOSESCROLL\r
+#define FADE\r
+//#define NOMAPLOAD\r
 \r
 static map_t map;\r
 float t;\r
@@ -65,8 +68,6 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        ggvv=&gvar;\r
-       // input!\r
-       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
        if (argc >= 2) {\r
                if(argv[1]){ strcpy(bakapee, argv[1]);\r
@@ -78,40 +79,22 @@ void main(int argc, char *argv[])
        //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "testing map load~      ");\r
-               #endif\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
 #else\r
        chkmap(&map, 1);\r
        //initMap(&map);\r
 #endif\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "chkmap ok      ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
-               #endif\r
-\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "press a key wwww\n");\r
-       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
-               #endif\r
-\r
        // data\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "VRS_LoadVRS    ");\r
-               #endif\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "ok~\n");\r
-               #endif\r
 \r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "press a key wwww\n");\r
-       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
-               #endif\r
+       // input!\r
+       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -131,9 +114,6 @@ void main(int argc, char *argv[])
        //printf("1:    %d\n", paloffset);\r
        map.tiles->data->offset=(paloffset/3);\r
        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "VL_LoadPalFile ");\r
-               #endif\r
        VL_LoadPalFile(bakapeep, &gvar.video.palette, &gvar);\r
        //VL_LoadPalFile("data/default.pal", &gvar.video.palette);\r
 \r
@@ -142,9 +122,6 @@ void main(int argc, char *argv[])
        modexSavePalFile("data/g.pal", &gvar.video.palette);\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
-               #ifdef VERBOSESCROLL\r
-       fprintf(stderr, "ok\n");\r
-               #endif\r
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar);\r