wwww

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 167365433685807754bec450d7b25443bb61cbe7..0dc84d860f88dc728b431a1d21f731beaeefe5fa 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -70,11 +70,11 @@ void main(int argc, char *argv[])
        player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-       fprintf(stderr, "testing map load~      ");\r
+//     fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
        chkmap(&map, 0);\r
-       printf("chkmap ok       ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
+//     printf("chkmap ok       ");\r
+//     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
        read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
@@ -90,7 +90,7 @@ void main(int argc, char *argv[])
        modexPalSave(dpal);\r
        modexFadeOff(4, dpal);\r
 #endif\r
-       textInit();\r
+       //textInit();\r
        VGAmodeX(bakapee, 1, &gvar);\r
 #ifdef MODEXZ\r
 #ifdef FADE\r
@@ -114,7 +114,7 @@ void main(int argc, char *argv[])
                mv[i].video = &gvar.video;\r
                mv[i].pan       = &pan;\r
        }\r
-       player[0].ent->spri->x = player[0].ent->spri->y = 20;\r
+       player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
 \r
        // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
@@ -138,16 +138,14 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
                modexFadeOn(4, dpal);\r
 #endif\r
-       exit(-4);\r
        }\r
-       //++++animate_spri(&(player[0].ent->spri));\r
+       animate_spri((player[0].ent->spri), &gvar);\r
 \r
        modexShowPage(mv[0].page);//!(gvar.video.p)\r
        shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
-       modexDrawSprite(mv[0].page, 16, 16, (player[0].data));\r
        /*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");\r
        modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);\r
        while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww\r
@@ -181,13 +179,9 @@ void main(int argc, char *argv[])
                if(IN_KeyDown(25)){ modexpdump(mv[0].page);\r
                         IN_UserInput(1,1);\r
                }       //p\r
-#ifdef FADE\r
-               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); IN_UserInput(1,1); } //p\r
-               if(IN_KeyDown(22)){\r
-                       printf("2paloffset      =       %d\n", paloffset/3);\r
-                       IN_UserInput(1,1);\r
-               }\r
-#endif\r
+\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o\r
+               if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u\r
 \r
                //pan switch\r
                if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12\r
@@ -208,9 +202,20 @@ void main(int argc, char *argv[])
                if(IN_KeyDown(66))      //f8\r
                {\r
 //                     modexDrawSprite(mv[0].page, 16, 16, &p);\r
-                       modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
+//                     modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
+                       switch(i)\r
+                       {\r
+                               case 11:\r
+                                       i=0;\r
+                                       player[0].ent->spri->x = 0;\r
+                               default:\r
+                                       i++;\r
+                                       player[0].ent->spri->delay = 1; animate_spri((player[0].ent->spri), &gvar); player[0].ent->spri->x += 20;\r
+                               break;\r
+                       }\r
                }\r
-               //TODO fmemtest into page\r
+               FUNCTIONKEYFUNCTIONS;\r
+               // fmemtest into page\r
                /*if(IN_KeyDown(4+1))   //4\r
                {\r
                        pg=1;\r
@@ -221,8 +226,9 @@ void main(int argc, char *argv[])
                //9\r
 #ifdef FADE\r
                if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-               //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
 #endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
                if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
                player[0].hp = 0;\r
        }\r