16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index ce2305b5d24cc48bc583a5d9da8ab3a74c46497a..3322046c9b0ae1901f77cda3ee2d714dc6edb273 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -7,7 +7,7 @@
 #include "src/lib/16_tdef.h"\r
 \r
 #define __DEBUG__\r
-#define __DEBUG_InputMgr__\r
+//#define __DEBUG_InputMgr__\r
 #define __DEBUG_MAP__\r
 //#define __DEBUG_2__\r
 //#define __DEBUG_CA__\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 68ae6bb890e460cefefb5f4e3d1ede505142cdfc..dac2cfe205617d6edcb6d483c23bc3d4254977d1 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 68ae6bb890e460cefefb5f4e3d1ede505142cdfc
+Subproject commit dac2cfe205617d6edcb6d483c23bc3d4254977d1

diff --git a/src/xcroll.c b/src/xcroll.c
index a8c8e2eaaaf83ff9d670bca4f360a7b8866c2b80..20a50904ea99b91b89bd141ef397925db7404baa 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,9 +24,11 @@
 #include "src/lib/16_timer.h"\r
 #include "src/lib/16_dbg.h"\r
 \r
-#define FADE\r
+//#define FADE\r
 //#define NOMAPLOAD\r
 \r
+#define VERBOSESCROLL\r
+\r
 static map_t map;\r
 float t;\r
 \r
@@ -63,6 +65,8 @@ 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
@@ -74,22 +78,40 @@ void main(int argc, char *argv[])
        //----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-//     fprintf(stderr, "testing map load~      ");\r
+               #ifdef VERBOSESCROLL\r
+       fprintf(stderr, "testing map load~      ");\r
+               #endif\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
-       // input!\r
-       IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);\r
+               #ifdef VERBOSESCROLL\r
+       fprintf(stderr, "press a key wwww\n");\r
+       IN_StartAck (&gvar);    while (!IN_CheckAck (&gvar)){}\r
+               #endif\r
 \r
        // save the palette\r
 #ifdef FADE\r
@@ -109,6 +131,9 @@ 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
@@ -117,6 +142,9 @@ 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