dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not...

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index ec44168e3258e2b33cbd74d4187792daf99fab0f..9e3c0b58192374c638cbcbf2117222a2c9a09342 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -100,7 +100,10 @@ void main(int argc, char *argv[])
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&mv, &map, &gvar);\r
-       player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
+\r
+       //renderswitch\r
+       gvar.video.rs=0;\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
@@ -108,8 +111,11 @@ void main(int argc, char *argv[])
 \r
        playerXYpos(0, 0, &player, &mv, 0);\r
        IN_initplayer(&player, 0);\r
+       player[0].ent->spri->x = player[0].enti.x-4;\r
+       player[0].ent->spri->y = player[0].enti.y-16;\r
+       player[0].ent->spri->delay = 0;\r
 \r
-       i = set_anim_by_id(player[0].ent->spri, 11);\r
+       i = set_anim_by_id(player[0].ent->spri, 31);\r
        print_anim_ids(player[0].ent->spri);\r
        if (i == -1)\r
        {\r
@@ -121,7 +127,7 @@ void main(int argc, char *argv[])
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
-       animate_spri((player[0].ent->spri), &gvar);\r
+       animate_spri((player[0].ent->spri), &gvar.video);\r
 \r
        VL_ShowPage(mv[0].page, 0, 0);//modexShowPage(mv[0].page);//!(gvar.video.p)\r
 #ifdef FADE\r
@@ -130,7 +136,7 @@ void main(int argc, char *argv[])
        /*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
-       while(!IN_KeyDown(sc_Escape))// && player[0].hp>0)\r
+       while(!IN_KeyDown(sc_Escape))// && player[0].enti.hp>0)\r
        {\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
@@ -154,7 +160,7 @@ void main(int argc, char *argv[])
                        }\r
                        nosound();\r
                }\r
-               if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }\r
+               if(player[0].enti.q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].enti.hp--; }\r
 */             //debugging binds!\r
                if(IN_KeyDown(2)){ modexShowPage(mv[0].page); gvar.video.panp=0; }\r
                if(IN_KeyDown(25)){ modexpdump(mv[0].page);\r
@@ -188,10 +194,10 @@ void main(int argc, char *argv[])
                        {\r
                                case 11:\r
                                        i=0;\r
-                                       player[0].ent->spri->x = 0;\r
+                                       player[0].ent->spri->x = TILEWH;\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
+                                       player[0].ent->spri->delay = 0; animate_spri((player[0].ent->spri), &gvar.video);// player[0].ent->spri->x += 16;\r
                                break;\r
                        }\r
                }\r
@@ -203,8 +209,8 @@ void main(int argc, char *argv[])
 #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
+               if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break; //incase things go out of sync!\r
+               player[0].enti.hp = 0;\r
        }\r
 \r
        /* fade back to text mode */\r