broken

[16.git] / src / zcroll.c

diff --git a/src/zcroll.c b/src/zcroll.c
index 716cc876a063448e1fd475f2c7f1d3fcfa932cdf..0f57d4c725435a0ea0a28c6caaca3826d7b22d9f 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -27,6 +27,7 @@
 \r
 #define FADE\r
 \r
+//map_view_t mv[4];\r
 static map_t map;\r
 float t;\r
 \r
@@ -73,7 +74,7 @@ void main(int argc, char *argv[])
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
        //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
        //gvar.player[0].enti.spri = malloc(sizeof(struct sprite));\r
-       gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
+       //gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
 //     fprintf(stderr, "testing map load~      ");\r
@@ -117,13 +118,13 @@ void main(int argc, char *argv[])
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
+       ZC_MVSetup(&MVVAR, &map, &gvar);\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
-       mapGoTo(&gvar.mv, 0, 0);\r
+       mapGoTo(&MVVAR, 0, 0);\r
 \r
-       ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);\r
+       ZC_PlayerXYpos(0, 0, &gvar.player, &MVVAR, 0, 1);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
        //print_anim_ids(gvar.player[0].enti.spri);\r
        if (gvar.video.sprifilei == -1)\r
@@ -138,17 +139,17 @@ void main(int argc, char *argv[])
        }\r
 \r
 //     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
-       gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
-       gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+       gvar.video.page[0].tlx=MVVAR[0].tx*TILEWH;\r
+       gvar.video.page[0].tly=MVVAR[0].ty*TILEWH;\r
        shinku(&gvar);\r
-//modexpdump(gvar.mv[0].page);\r
+//modexpdump(MVVAR[0].page);\r
 #ifdef FADE\r
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
        while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)\r
        {\r
-               gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
-               gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+               gvar.video.page[0].tlx=MVVAR[0].tx*TILEWH;\r
+               gvar.video.page[0].tly=MVVAR[0].ty*TILEWH;\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
                //to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction\r
@@ -158,7 +159,7 @@ void main(int argc, char *argv[])
                IN_ReadControl(&gvar.player[0]);\r
                if(!panswitch){\r
                        //ZC_walk2(gvar.player[0].ent, mv);\r
-                       ZC_walk(&gvar.mv, &gvar.player, 0);\r
+                       ZC_walk(&MVVAR, &gvar.player, 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
@@ -166,7 +167,7 @@ void main(int argc, char *argv[])
 \r
                //the scripting stuff....\r
                //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
-               if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+               if(((MVVAR[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -178,7 +179,7 @@ void main(int argc, char *argv[])
                if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
                //debugging binds!\r
 \r
-               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1); } //o\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(MVVAR[0].page); IN_UserInput(1); } //o\r
                if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
 \r
                TAIL_FUNCTIONKEYFUNCTIONS\r