still broken

diff --git a/src/0.c b/src/0.c
index fc9b2e927a62d7692e95da1e3ceeabcb46951f50..28d5ff052871dd9d7c2ff40a7e80c9abfd985809 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -107,8 +107,8 @@ int main(int argc,char **argv)
 \r
        /* setup camera and screen~ */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&MVVAR, &map, &gvar);\r
-       ZC_ShowMV(&MVVAR, gvar.video.sp, 0);\r
+       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
+       ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
 \r
 //     VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
        VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);\r
@@ -151,7 +151,7 @@ int main(int argc,char **argv)
                        }\r
                        if(IN_KeyDown(sc_R)){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
-                               MVVAR[0].tx = MVVAR[0].ty = MVVAR[1].tx = MVVAR[1].ty = INITTNUM;\r
+                               gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;\r
                                VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);\r
                                gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2;\r
                                x=y=0;\r
@@ -217,7 +217,7 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 \r
 //===========================================================================//\r
 \r
-       ZC_ShowMV(&MVVAR, 0, 0);\r
+       ZC_ShowMV(&gvar.mv, 0, 0);\r
 if(!noanim) {\r
        /* another handy "demo" effect using VGA write mode 1.\r
         * we can take what's on screen and vertically squash it like an old analog TV set turning off. */\r
@@ -312,7 +312,7 @@ if(!noanim) {
        printf("\nProject 16 0.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        //SCROLLEXITMESG;\r
-       printf("mv 0\n- tx=%d   ty=%d   dx=%d   dy=%d\n", MVVAR[0].tx, MVVAR[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);\r
-       printf("mv 1\n- tx=%d   ty=%d   dx=%d   dy=%d\n", MVVAR[1].tx, MVVAR[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);\r
+       printf("mv 0\n- tx=%d   ty=%d   dx=%d   dy=%d\n", gvar.mv[0].tx, gvar.mv[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);\r
+       printf("mv 1\n- tx=%d   ty=%d   dx=%d   dy=%d\n", gvar.mv[1].tx, gvar.mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);\r
        return 0;\r
 }\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 1810975445684d330c1339da7592b50a6f24bd39..f6b73ff4f360aa0b4c1e791b34ba4ac990ffbf8b 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -33,8 +33,6 @@
 #include "src/lib/16_vl.h"\r
 #include "src/lib/testpatt.h"\r
 \r
-#define MVVAR gvar.mv\r
-\r
 #define TAIL_FUNCTIONKEYFUNCTIONS \\r
        if(IN_KeyDown(88)){ panswitch=!panswitch;                                                       IN_UserInput(1); } \\r
        TAIL_FUNCTIONKEYFUNCTIONS0EXE\r
@@ -45,8 +43,8 @@
        if(IN_KeyDown(68/*sc_F10*/)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;         IN_UserInput(1); } \\r
        if(IN_KeyDown(sc_F9)){ pagenorendermap=!pagenorendermap;                                IN_UserInput(1); } \\r
        if(IN_KeyDown(sc_F8)){ gvar.video.bgps=!gvar.video.bgps;                                        IN_UserInput(1); } \\r
-       if(IN_KeyDown(sc_F7)){ ZC_ShowMV(&MVVAR, 0, 1);                                         IN_UserInput(1); } \\r
-       if(IN_KeyDown(sc_F6)){ ZC_ShowMV(&MVVAR, 0, 0);                                         IN_UserInput(1); } \\r
+       if(IN_KeyDown(sc_F7)){ ZC_ShowMV(&gvar.mv, 0, 1);                                               IN_UserInput(1); } \\r
+       if(IN_KeyDown(sc_F6)){ ZC_ShowMV(&gvar.mv, 0, 0);                                               IN_UserInput(1); } \\r
        if(IN_KeyDown(sc_T)){ gvar.video.rss=!gvar.video.rss;                                           IN_UserInput(1); } \\r
        if(IN_KeyDown(sc_P)){ modexpdump(&gvar.video.page[0]);                                  IN_UserInput(1); }\r
 \r
@@ -55,13 +53,13 @@
        TAIL_FUNCTIONKEYDRAWJUNK\r
 \r
 #define TAIL_PANKEYFUNZC \\r
-       ZC_panPageManual(&MVVAR, &gvar.player, 0);\r
+       ZC_panPageManual(&gvar.mv, &gvar.player, 0);\r
 \r
 #define FUNCTIONKEYSHOWMV \\r
-       if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&MVVAR, 0, 0); } \\r
-       if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&MVVAR, 0, 0); } \\r
-       if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&MVVAR, 0, 1); } \\r
-       if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&MVVAR, 0, 1); }\r
+       if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
+       if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
+       if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \\r
+       if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }\r
 \r
 #define TAIL_FUNCTIONKEYDRAWJUNK \\r
        FUNCTIONKEYSHOWMV \\r

diff --git a/src/test.c b/src/test.c
index cfbd462c73653d240a79b8ff0a35f44b0ef2564e..a4a7f4891991fbcbd4d56185476cd2f494c9d350 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -122,7 +122,7 @@ void main(int argc, char *argv[])
 \r
        /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&MVVAR, &map, &gvar);\r
+       ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
        /* fill the page with one color, but with a black border */\r
        /*modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);\r
@@ -150,7 +150,7 @@ void main(int argc, char *argv[])
        while(!IN_KeyDown(sc_Escape))\r
        {\r
                IN_ReadControl(&gvar.player[0]);\r
-               ZC_panPageManual(&MVVAR, &gvar.player, 0);\r
+               ZC_panPageManual(&gvar.mv, &gvar.player, 0);\r
 //                     if(IN_KeyDown(sc_5)){ modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45); }\r
 //                     if(IN_KeyDown(sc_4)){\r
 //                             modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
@@ -174,7 +174,7 @@ void main(int argc, char *argv[])
                if(IN_KeyDown(sc_I)){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1); }//i\r
                if(IN_KeyDown(sc_O)){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1); }//o\r
                //VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);\r
-               ZC_ShowMV(&MVVAR, 0, 0);\r
+               ZC_ShowMV(&gvar.mv, 0, 0);\r
        }\r
 \r
        endclk = *clockw;\r
@@ -187,7 +187,7 @@ void main(int argc, char *argv[])
        printf("Project 16 test.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        VL_PrintmodexmemInfo(&gvar.video);\r
-       printf("tx=%d   ", MVVAR[gvar.video.sp].tx); printf("ty=%d      ", MVVAR[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);\r
+       printf("tx=%d   ", gvar.mv[gvar.video.sp].tx); printf("ty=%d    ", gvar.mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);\r
        printf("\n====\n");\r
        printf("0       paloffset=      %d\n", paloffset/3);\r
        printf("====\n\n");\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 0f57d4c725435a0ea0a28c6caaca3826d7b22d9f..0cdfadfe7b499f1936d5f1e9fbe48006d4412b5d 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -74,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
@@ -118,13 +118,13 @@ void main(int argc, char *argv[])
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
-       ZC_MVSetup(&MVVAR, &map, &gvar);\r
+       ZC_MVSetup(&gvar.mv, &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(&MVVAR, 0, 0);\r
+       mapGoTo(&gvar.mv, 0, 0);\r
 \r
-       ZC_PlayerXYpos(0, 0, &gvar.player, &MVVAR, 0, 1);\r
+       ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 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
@@ -139,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=MVVAR[0].tx*TILEWH;\r
-       gvar.video.page[0].tly=MVVAR[0].ty*TILEWH;\r
+       gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
+       gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
        shinku(&gvar);\r
-//modexpdump(MVVAR[0].page);\r
+//modexpdump(gvar.mv[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=MVVAR[0].tx*TILEWH;\r
-               gvar.video.page[0].tly=MVVAR[0].ty*TILEWH;\r
+               gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
+               gvar.video.page[0].tly=gvar.mv[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
@@ -159,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(&MVVAR, &gvar.player, 0);\r
+                       ZC_walk(&gvar.mv, &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
@@ -167,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(((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
+               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
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -179,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(MVVAR[0].page); IN_UserInput(1); } //o\r
+               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1); } //o\r
                if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
 \r
                TAIL_FUNCTIONKEYFUNCTIONS\r