still broken

diff --git a/src/lib/16_spri.h b/src/lib/16_spri.h
index 5d1de10dea1f125f74ad840b369bb3c7b5d3a628..0e29ebebc4a78778aedd12e9fbf49881077d380a 100755 (executable)
--- a/src/lib/16_spri.h
+++ b/src/lib/16_spri.h
@@ -25,6 +25,27 @@
 #include "src/lib/16_vrs.h"\r
 #include "src/lib/scroll16.h"\r
 \r
+//moved to 16_tdef.h\r
+// struct sprite\r
+// {\r
+//     // VRS container from which we will extract animation and image data\r
+//     struct vrs_container *spritesheet;\r
+//     // Container for a vrl sprite\r
+//     struct vrl_container *sprite_vrl_cont;\r
+//     // Current sprite id\r
+//     int curr_spri_id;\r
+//     // Index of a current sprite in an animation sequence\r
+//     int curr_anim_spri;\r
+//     // Current animation sequence\r
+//     struct vrs_animation_list_entry_t *curr_anim_list;\r
+//     // Index of current animation in relevant VRS offsets table\r
+//     int curr_anim;\r
+//     // Delay in time units untill we should change sprite\r
+//     int delay;\r
+//     // Position of sprite on screen\r
+//     int x, y;\r
+// };\r
+\r
 /* Retrive current animation name of sprite\r
 * In:\r
 * + struct sprite *spri - sprite to retrive current animation sequence name from\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index f6b73ff4f360aa0b4c1e791b34ba4ac990ffbf8b..6bd889fddd4b1b77447c0b72b4f51ccdb932380b 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -70,7 +70,7 @@
        if(IN_KeyDown(sc_S)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); \\r
 \\r
        if(IN_KeyDown(sc_Z)){ DRAWCORNERBOXES } \\r
-       if(IN_KeyDown(sc_X)){ TESTBG12 }\\r
+       if(IN_KeyDown(sc_X)){ TESTBG12 } \\r
        if(IN_KeyDown(sc_C)){ TESTBG34 } \\r
        if(IN_KeyDown(sc_V)) VL_PatternDraw(&gvar.video, 0, 1, 1); \\r
        if(IN_KeyDown(sc_I)){ dbg_maptext=!dbg_maptext; IN_UserInput(1); }\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index f2c1c846538ad929f0e9c62ac24a13abab0c8ccf..b2a5dc8e0a76510db258d8733044eaafa1633d8b 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -26,7 +26,7 @@ void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){
 void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar)\r
 {\r
        //memptr        big buffer;\r
-       static struct vrs_container vrsss;      //vrs spritesheet\r
+       static struct vrs_container vrs;        //vrs spritesheet\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
@@ -46,10 +46,10 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        }\r
 \r
        // Insert sanity cheks later\r
-       vrsss.buffer = gvar->ca.spribuff;\r
-       vrsss.data_size = size - sizeof(struct vrl1_vgax_header);\r
+       vrs.buffer = gvar->ca.spribuff;\r
+       vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
        num_of_vrl = 0;\r
-       vrl_id_iter = (uint16_t far *)(vrsss.buffer + vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+       vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
        while(vrl_id_iter[num_of_vrl]){\r
                num_of_vrl++;\r
        }\r
@@ -58,10 +58,10 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
 //++++ MM_GetPtr((memptr)(vrl_line_offsets), sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
 \r
-       vrl_headers_offsets = (uint32_t far *)(vrsss.buffer + vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+       vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
        // Calculate line offsets for each vrl\r
        for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header far *)(vrsss.buffer + vrl_headers_offsets[i]);\r
+               curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);\r
 \r
                // Calc. vrl size as (next_offset - curr_offset)\r
                if (i != num_of_vrl - 1){\r
@@ -69,14 +69,14 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
                }\r
                // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)\r
                else{\r
-                       vrl_size = vrsss.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
+                       vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);\r
                }\r
                vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);\r
        }\r
-       vrsss.vrl_line_offsets = vrl_line_offsets;\r
+       vrs.vrl_line_offsets = vrl_line_offsets;\r
        free(vrl_line_offsets);\r
 \r
-       enti->spri.spritesheet = &vrsss;\r
+       enti->spri.spritesheet = &vrs;\r
        enti->spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));\r
 //++++ MM_GetPtr((memptr)(enti->spri.sprite_vrl_cont), sizeof(struct vrl_container), gvar);\r
 }\r

diff --git a/src/scroll.c b/src/scroll.c
index c166a3ba85f7b3abd6a8ac142b5cc951f3e6ea9e..500cafc9448f913161ff56a98d89b2b6d7a5965c 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -106,16 +106,16 @@ 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
        //renderswitch\r
        gvar.video.rss=1;\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_gvar.playerXYpos(0, 0, &gvar.player, &MVVAR, 0, 1);\r
+       ZC_gvar.playerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);\r
        EN_initgvar.player(&gvar.player, 0, &gvar.video);\r
        if (gvar.video.sprifilei == -1)\r
        {\r
@@ -129,19 +129,19 @@ void main(int argc, char *argv[])
        }\r
 \r
 #ifndef        SPRITE\r
-       modexClearRegion(MVVAR[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);\r
+       modexClearRegion(gvar.mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);\r
 #else\r
        modexDrawSpriteRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 64, 16, 32, PCXBMPPTR);\r
 #endif\r
 \r
        //if(!pageflipflop)\r
-               VL_ShowPage(MVVAR[1].page, 0, 0);//modexShowPage(MVVAR[1].page);\r
-       //else                  ZC_ShowMV(&MVVAR, 0, 0);//modexShowPage(MVVAR[0].page);//!(gvar.video.p)\r
+               VL_ShowPage(gvar.mv[1].page, 0, 0);//modexShowPage(gvar.mv[1].page);\r
+       //else                  ZC_ShowMV(&gvar.mv, 0, 0);//modexShowPage(gvar.mv[0].page);//!(gvar.video.p)\r
 \r
        //modexDrawBmp(&gvar.video.page[0], 16, 16, PCXBMPPTR);\r
        /* buffer pages */\r
-//     modexClearRegion(MVVAR[2].page, 0, 0, MVVAR[2].page->width, MVVAR[2].page->height, 47);\r
-//     modexClearRegion(MVVAR[3].page, 0, 0, MVVAR[3].page->width, MVVAR[3].page->height, 45);\r
+//     modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 47);\r
+//     modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 45);\r
 //     {\r
 //             unsigned int k,j,o;\r
 //             /* fill screen with a distinctive pattern */\r
@@ -152,7 +152,7 @@ void main(int argc, char *argv[])
 //                                     vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!\r
 //             }\r
 //     }\r
-       modexClearRegion(MVVAR[3].page, 0, 128, 24, 36, 15);\r
+       modexClearRegion(gvar.mv[3].page, 0, 128, 24, 36, 15);\r
 \r
 #ifdef MODEX\r
 #ifdef FADE\r
@@ -169,15 +169,15 @@ void main(int argc, char *argv[])
        //gvar.player movement\r
                IN_ReadControl(0, &gvar.player);\r
        if(!panswitch){\r
-               ZC_walk(&MVVAR, &gvar.player, 0);\r
+               ZC_walk(&gvar.mv, &gvar.player, 0);\r
        }else{\r
-               PANKEYFUNZC;//panPageManual(&MVVAR, &gvar.player, 0);\r
+               PANKEYFUNZC;//panPageManual(&gvar.mv, &gvar.player, 0);\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
        }\r
 \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
@@ -190,13 +190,13 @@ void main(int argc, char *argv[])
        //debugging binds!\r
 #ifdef MODEX\r
 #ifdef FADE\r
-       if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(MVVAR[0].page); modexpdump(MVVAR[1].page);  IN_UserInput(1); } //p\r
+       if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);  IN_UserInput(1); } //p\r
        /*if(IN_KeyDown(22)){\r
        paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("2paloffset      =       %d\n", paloffset/3);\r
-        modexpdump(MVVAR[0].page); modexpdump(MVVAR[1].page);\r
+        modexpdump(gvar.mv[0].page); modexpdump(gvar.mv[1].page);\r
                IN_UserInput(1);\r
        }*/\r
 #endif\r
@@ -204,10 +204,10 @@ void main(int argc, char *argv[])
        //pan switch\r
        if(IN_KeyDown(62))      //f3\r
        {\r
-               modexClearRegion(MVVAR[1].page, 0, 0, MVVAR[1].page->width, MVVAR[1].page->height, 2);\r
-               modexClearRegion(MVVAR[2].page, 0, 0, MVVAR[2].page->width, MVVAR[2].page->height, 3);\r
-               modexClearRegion(MVVAR[3].page, 0, 0, MVVAR[3].page->width, MVVAR[3].page->height, 4);\r
-               modexClearRegion(MVVAR[3].page, 0, 0, 20, 36, 15);\r
+               modexClearRegion(gvar.mv[1].page, 0, 0, gvar.mv[1].page->width, gvar.mv[1].page->height, 2);\r
+               modexClearRegion(gvar.mv[2].page, 0, 0, gvar.mv[2].page->width, gvar.mv[2].page->height, 3);\r
+               modexClearRegion(gvar.mv[3].page, 0, 0, gvar.mv[3].page->width, gvar.mv[3].page->height, 4);\r
+               modexClearRegion(gvar.mv[3].page, 0, 0, 20, 36, 15);\r
                //IN_UserInput(1);\r
        }\r
 \r