XCROLL IS MYSTERIOUSLY NOT WORKING

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 16995908d33d42cc7d68696998ea26c5e566c212..b9e928430425082927d17516a70e6dfb1f73bf10 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,6 +68,7 @@ void main(int argc, char *argv[])
        Startup16(&gvar);\r
 \r
        ggvv=&gvar;\r
+\r
        // input!\r
        IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
 \r
@@ -78,40 +82,21 @@ 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
+       printf("loading vrs     ");\r
+       VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);      printf("ok\n");\r
        IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
-               #endif\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -131,9 +116,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 +124,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
@@ -154,8 +133,7 @@ void main(int argc, char *argv[])
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 \r
-//0000\r
-       IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
+//0000 IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
 #ifdef FADE\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r
@@ -182,6 +160,10 @@ void main(int argc, char *argv[])
        gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
 \r
+#ifdef OLDWALKSHOWPAGESTUFF\r
+       VL_ShowPage(&(gvar.video.page[gvar.video.sp]), gvar.kurokku.fpscap, 0);\r
+#endif\r
+\r
        shinku(&gvar);\r
 //modexpdump(gvar.mv[0].page);\r
 #ifdef FADE\r
@@ -200,7 +182,8 @@ void main(int argc, char *argv[])
                IN_ReadControl(&gvar.player[0], &gvar);\r
                if(!panswitch){\r
                        //ZC_walk2(gvar.player[0].ent, mv);\r
-                       ZC_walk(&gvar.mv, &gvar.player, 0);\r
+                       //ZC_walk(&gvar.mv, &gvar.player, 0);\r
+                       ZC_walk(&gvar, 0);\r
                }else{\r
                        TAIL_PANKEYFUNZC;\r
                        //printf("      gvar.player[0].enti.q: %d", gvar.player[0].enti.q);     printf("        gvar.player[0].d: %d\n", gvar.player[0].d);\r