p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

diff --git a/src/0.c b/src/0.c
index b35486206887c1c214e97c0cccd90ed0c5488319..fb3d0fc908ebf8c2f972324c5fc6aefbe603ed68 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -111,7 +111,7 @@ int main(int argc,char **argv)
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
 \r
        /* setup camera and screen~ */\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
        ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);\r
 \r

diff --git a/src/bakapi.h b/src/bakapi.h
index ec7091cda4c09feec913e34f36dacc20dbdefd4c..cb5b30b76d8021d1eff6e25ea0cb4689dfcf60fa 100755 (executable)
--- a/src/bakapi.h
+++ b/src/bakapi.h
@@ -35,8 +35,8 @@
 #define DOFSS  BDOFSCONV (gvar.video.DOFS)//gvar.video.ofs.displayofs\r
 \r
 #define SETUPPAGEBAKAPI \\r
-gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video); \\r
-gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
+       PALPROGRAMSNEWPAGE \\r
+       gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
 \r
 #ifdef BAKAFIZZUNSIGNED\r
 #define FIZZFADEFUN baka_FizzleFade (BOFSS, DOFSS, gvar.video.page[0].width, gvar.video.page[0].height, 70, true, &gvar);\r

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 5c24d89ba633716da36fc9bfaab9897deb099985..62c01aa44980ce3401d2f35c2639d8282667d3c1 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -22,8 +22,6 @@
 \r
 #include "src/lib/16_spri.h"\r
 \r
-struct glob_game_vars  *ggvv;\r
-\r
 char* get_curr_anim_name(struct sprite *spri)\r
 {\r
        // Retrive animation name list\r
@@ -103,6 +101,7 @@ void animate_spri(entity_t *enti, video_t *video)
 #define INC_PER_FRAME if(enti->q&1) enti->persist_aniframe++; if(enti->persist_aniframe>4) enti->persist_aniframe = 1;\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
+       static struct glob_game_vars *ggvv;\r
        VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
 \r
        x=enti->spri.x;\r

diff --git a/src/lib/16_spri.h b/src/lib/16_spri.h
index bb633d279f8d0a17d21672dd1900ad5ee2e10213..0e29ebebc4a78778aedd12e9fbf49881077d380a 100755 (executable)
--- a/src/lib/16_spri.h
+++ b/src/lib/16_spri.h
@@ -23,9 +23,7 @@
 #define __16_SPRI__\r
 \r
 #include "src/lib/16_vrs.h"\r
-#ifndef OLDOLDOLDOLDSCROLLEXE\r
 #include "src/lib/scroll16.h"\r
-#endif\r
 \r
 //moved to 16_tdef.h\r
 // struct sprite\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index bc5ee4dd7f3286475bf0432a7e492afa41f35d01..db066c727762adb2565e5968dd2e9af2512b28b2 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -398,7 +398,7 @@ modexDefaultPage(page_t *p)
 }\r
 #endif\r
 page_t\r
-modexDefaultPage(page_t *p, video_t *v)\r
+modexDefaultPage(page_t *p, global_game_variables_t *gvar)\r
 {\r
        page_t page;\r
 \r
@@ -412,7 +412,7 @@ modexDefaultPage(page_t *p, video_t *v)
        page.sh = p->sh;\r
        page.width = p->sw;\r
        page.height = p->sh;\r
-       if(v->curr_mode == 1)\r
+       if(gvar->video.curr_mode == 1)\r
 {      page.width += TILEWHD;\r
        page.height += TILEWHD; }\r
        page.ti.tw = page.sw/TILEWH;\r
@@ -513,38 +513,38 @@ void VL_Initofs(video_t *video)
        }\r
 }\r
 \r
-void modexHiganbanaPageSetup(video_t *video)\r
+void modexHiganbanaPageSetup(global_game_variables_t *gvar)\r
 {\r
-       video->vmem_remain=65535U;\r
-       video->num_of_pages=0;\r
-       (video->page[0]) = modexDefaultPage(&(video->page[0]), video);  video->num_of_pages++;  //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);\r
-       (video->page[1]) = modexNextPage(&(video->page[0]));    video->num_of_pages++;\r
-//0000 (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4);              video->num_of_pages++;\r
-//0000 (video->page[3]) = (video->page[2]);            video->num_of_pages++;\r
-////   (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4);            video->num_of_pages++;\r
-////   (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208);        video->num_of_pages++;\r
-       (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 96);      video->num_of_pages++;\r
-       (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width, 96);      video->num_of_pages++;\r
-       modexCalcVmemRemain(video);\r
-\r
-       video->sp=video->p =    0;      //showpage\r
-       video->dorender =       1;                      //render\r
-       video->vh=video->page[0].height+video->page[1].height+video->page[2].height+video->page[3].height;\r
-\r
-       VL_Initofs(video);\r
+       gvar->video.vmem_remain=65535U;\r
+       gvar->video.num_of_pages=0;\r
+       (gvar->video.page[0]) = modexDefaultPage(&(gvar->video.page[0]), gvar); gvar->video.num_of_pages++;     //gvar->video.page[0].width += (TILEWHD); gvar->video.page[0].height += (TILEWHD);\r
+       (gvar->video.page[1]) = modexNextPage(&(gvar->video.page[0]));  gvar->video.num_of_pages++;\r
+//0000 (gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), (gvar->video.page[0]).width, TILEWH*4);               gvar->video.num_of_pages++;\r
+//0000 (gvar->video.page[3]) = (gvar->video.page[2]);          gvar->video.num_of_pages++;\r
+////   (gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), TILEWH*4, TILEWH*4);          gvar->video.num_of_pages++;\r
+////   (gvar->video.page[3]) = modexNextPageFlexibleSize(&(gvar->video.page[2]), gvar->video.page[0].sw, 208); gvar->video.num_of_pages++;\r
+       (gvar->video.page[2]) = modexNextPageFlexibleSize(&(gvar->video.page[1]), gvar->video.page[0].width, 96);       gvar->video.num_of_pages++;\r
+       (gvar->video.page[3]) = modexNextPageFlexibleSize(&(gvar->video.page[2]), gvar->video.page[0].width, 96);       gvar->video.num_of_pages++;\r
+       modexCalcVmemRemain(&gvar->video);\r
+\r
+       gvar->video.sp=gvar->video.p =  0;      //showpage\r
+       gvar->video.dorender =  1;                      //render\r
+       gvar->video.vh=gvar->video.page[0].height+gvar->video.page[1].height+gvar->video.page[2].height+gvar->video.page[3].height;\r
+\r
+       VL_Initofs(&gvar->video);\r
        //doslib origi var\r
-       video->vga_state.omemptr=                       vga_state.vga_graphics_ram;\r
-       video->vga_state.vga_draw_stride=       vga_state.vga_draw_stride;\r
-       video->vga_state.vga_draw_stride_limit= vga_state.vga_draw_stride_limit;\r
+       gvar->video.vga_state.omemptr=                  vga_state.vga_graphics_ram;\r
+       gvar->video.vga_state.vga_draw_stride=  vga_state.vga_draw_stride;\r
+       gvar->video.vga_state.vga_draw_stride_limit=    vga_state.vga_draw_stride_limit;\r
        //sprite render switch and bgpreservation switch\r
-       video->vga_state.rss=   1;\r
-       video->vga_state.bgps=  1;\r
+       gvar->video.vga_state.rss=      1;\r
+       gvar->video.vga_state.bgps=     1;\r
 \r
        //setup the buffersize\r
-       video->page[0].dx=video->page[0].dy=\r
-               video->page[1].dx=video->page[1].dy=TILEWH;     // 1 tile size buffer\r
-       video->page[2].dx=video->page[2].dy=\r
-               video->page[3].dx=video->page[3].dy=0;          // cache pages are buffer wwww\r
+       gvar->video.page[0].dx=gvar->video.page[0].dy=\r
+               gvar->video.page[1].dx=gvar->video.page[1].dy=TILEWH;   // 1 tile size buffer\r
+       gvar->video.page[2].dx=gvar->video.page[2].dy=\r
+               gvar->video.page[3].dx=gvar->video.page[3].dy=0;                // cache pages are buffer wwww\r
 }\r
 \r
 //\r

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 535b36aaa87f67915a5e563a491e467a247a5cf1..9ad8238440d1eb367fc43f1d5750993155e1baa6 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -158,7 +158,7 @@ void        VGAWRITEMODE(byte x),
 \r
 #define VW_Hlin(x,z,y,c,q)     VL_Hlin(x,y,(z)-(x)+1,c,q)\r
 #define VW_Vlin(y,z,x,c,q)     VL_Vlin(x,y,(z)-(y)+1,c,q)\r
-#define PALPROGRAMSNEWPAGE gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video);// modexFadeOn(4, &gvar.video.palette);\r
+#define PALPROGRAMSNEWPAGE gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar);// modexFadeOn(4, &gvar.video.palette);\r
 \r
 /* -============================ Functions =============================- */\r
 /* mode switching, page, and plane functions */\r
@@ -174,12 +174,12 @@ byte VL_vgaGetMode(void);
 extern void TL_VidInit(global_game_variables_t *gvar);\r
 void modexLeave(void);\r
 void modexsetBaseXMode();\r
-page_t modexDefaultPage(page_t *p, video_t *v);\r
+page_t modexDefaultPage(page_t *p, global_game_variables_t *gvar);\r
 page_t modexNextPage(page_t *p);\r
 page_t modexNextPageFlexibleSize(page_t *p, word x, word y);\r
 void modexCalcVmemRemain(video_t *video);\r
 void VL_Initofs(video_t *video);\r
-void modexHiganbanaPageSetup(video_t *video);\r
+void modexHiganbanaPageSetup(global_game_variables_t *gvar);\r
 //void modexShowPage(page_t *page);\r
 void VL_ShowPage(page_t *page, boolean vsync, boolean sr);\r
 void modexPanPage(page_t *page, int dx, int dy);\r

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 3236d8d3876586f5fda9f769a0b53a77fef725bc..52786282e35aa8106c33b919b4abfa5b6af8b871 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -22,7 +22,6 @@
 \r
 #include "src/lib/bakapee.h"\r
 \r
-struct glob_game_vars  *ggvv;\r
 //static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 char global_temp_status_text[512];\r
 char global_temp_status_text2[512];\r

diff --git a/src/vidtest.c b/src/vidtest.c
index 69d0ec3a47374ed921eaf7d67eccbcee77a93163..8995f1d857b224a49a5f19aa357a309e0fa62997 100755 (executable)
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -121,7 +121,7 @@ void main(int argc, char *argv[])
        //modexPalOverscan(44+1);\r
 \r
        /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
        /* fill the page with one color, but with a black border */\r

diff --git a/src/vrstest.c b/src/vrstest.c
index 517d2c823abe76e710f623034950cf954648e67d..2e6a90bbc128d74aa1dc897616ad731d00e02c4e 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -107,7 +107,7 @@ void main()
        if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/\r
 \r
        VGAmodeX(1, 1, &gvar);\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        VL_ShowPage(&gvar.video.page[0], 1, 0);\r
 \r
        /* non sprite comparison */\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 891f15cd5d5cd285a088dcd6d9d3012dacd5488a..542301c18ef91e8f7fbe5c3fdbfdb6c046aa441a 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -52,7 +52,7 @@ memptr pal;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       struct glob_game_vars   *ggvv;\r
+       struct glob_game_vars *ggvv;\r
 //     sword bakapee;\r
 //     if(argv[1]) bakapee = atoi(argv[1]);\r
 //     else bakapee = 1;\r
@@ -129,7 +129,7 @@ void main(int argc, char *argv[])
 #endif\r
 \r
        // setup camera and screen~\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
 #ifdef FADE\r