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

diff --git a/src/bakapi.h b/src/bakapi.h
index 484646d79bbbb51981d4be0d27743ed4a42f364a..ec7091cda4c09feec913e34f36dacc20dbdefd4c 100755 (executable)
--- a/src/bakapi.h
+++ b/src/bakapi.h
@@ -35,7 +35,7 @@
 #define DOFSS  BDOFSCONV (gvar.video.DOFS)//gvar.video.ofs.displayofs\r
 \r
 #define SETUPPAGEBAKAPI \\r
-gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); \\r
+gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0], &gvar.video); \\r
 gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
 \r
 #ifdef BAKAFIZZUNSIGNED\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 882dd3d2f21f37d6650a7735fa16d3e1da606f83..bc5ee4dd7f3286475bf0432a7e492afa41f35d01 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -354,7 +354,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 //--   VL_SetLineWidth (cm.offset, gv);\r
        //gv->video.ofs.displayofs = 0;\r
        //gv->video.ofs.bufferofs = gv->video.page[0].width*gv->video.page[0].height;//gvar->video.page[0].pagesize;\r
-//     gv->video.curr_mode=vq;\r
+       gv->video.curr_mode=vq;\r
        gv->video.VL_Started=1;\r
 }\r
 \r
@@ -364,11 +364,11 @@ void modexLeave(void)
        VL_vgaSetMode(TEXT_MODE);\r
 }\r
 \r
+#if 0\r
 page_t\r
 modexDefaultPage(page_t *p)\r
 {\r
        page_t page;\r
-\r
        /* default page values */\r
        //page.data = VGA;\r
        //page.data = (byte far *)(vga_state.vga_graphics_ram);\r
@@ -389,10 +389,14 @@ modexDefaultPage(page_t *p)
        page.pagesize = (word)(page.stridew)*page.height;\r
        page.pi=page.width*4;\r
        page.id = 0;\r
-\r
+       if(ggvv->video.curr_mode = 1)\r
+       {\r
+               page.width += TILEWHD;\r
+               page.height += TILEWHD;\r
+       }\r
        return page;\r
 }\r
-#if 0\r
+#endif\r
 page_t\r
 modexDefaultPage(page_t *p, video_t *v)\r
 {\r
@@ -424,7 +428,7 @@ modexDefaultPage(page_t *p, video_t *v)
 \r
        return page;\r
 }\r
-#endif\r
+\r
 /* returns the next page in contiguous memory\r
  * the next page will be the same size as p, by default\r
  */\r
@@ -513,7 +517,7 @@ void modexHiganbanaPageSetup(video_t *video)
 {\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[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

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index 6437e1b91c3e15bd60ba6f43c861be96c22ba05a..535b36aaa87f67915a5e563a491e467a247a5cf1 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -158,6 +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
 \r
 /* -============================ Functions =============================- */\r
 /* mode switching, page, and plane functions */\r
@@ -173,7 +174,7 @@ 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, video_t *v);\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

diff --git a/src/palbomb.c b/src/palbomb.c
index 643d714849f0eb7ff90fda80a539e9188fda300c..fbfa7251c7df07b878e17a85c1ee0d7d7ce94b43 100755 (executable)
--- a/src/palbomb.c
+++ b/src/palbomb.c
@@ -26,7 +26,7 @@ void main(int argc, char *argv[]) {
 \r
        TL_VidInit(&gvar);      VGAmodeX(1, 0, &gvar);\r
 \r
-       gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);\r
+       PALPROGRAMSNEWPAGE\r
        VL_ShowPage(&gvar.video.page[0], 1, 0);\r
        modexpdump(&gvar.video.page[0]);\r
        while(!kbhit()){ VL_modexPalScramble(&gvar.video.palette); }\r

diff --git a/src/palettec.c b/src/palettec.c
index 6607aebb39931e17a182b646cbc5381dba490186..1e55aca51a6cec568742e991ed9f4f962b5e3917 100755 (executable)
--- a/src/palettec.c
+++ b/src/palettec.c
@@ -26,7 +26,7 @@ void main(int argc, char *argv[]) {
 \r
        TL_VidInit(&gvar);      VGAmodeX(1, 0, &gvar);\r
        modexSavePalFile(bakapee, &gvar.video.palette);\r
-       gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette);\r
+       PALPROGRAMSNEWPAGE\r
        VL_ShowPage(&gvar.video.page[0], 1, 0);\r
        modexpdump(&gvar.video.page[0]);\r
        while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }\r

diff --git a/src/palettel.c b/src/palettel.c
index 7ef2c526a831775cfd621cfc855659ce41c6482f..7f5489341fa37d1c3225a18291b0dcaa56e19e6b 100755 (executable)
--- a/src/palettel.c
+++ b/src/palettel.c
@@ -27,7 +27,7 @@ void main(int argc, char *argv[])
 \r
        TL_VidInit(&gvar);      VGAmodeX(1, 0, &gvar);\r
        VL_LoadPalFile(bakapee, &gvar.video.palette, &gvar);            //modexLoadPalFile(bakapee, &(gvar.video.palette));\r
-       gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]/*, &gvar.video*/);// modexFadeOn(4, &gvar.video.palette);\r
+       PALPROGRAMSNEWPAGE\r
        VL_ShowPage(&gvar.video.page[0], 1, 0);\r
        modexpdump(&gvar.video.page[0]);\r
        while(!kbhit()){ /*VL_modexPalScramble(&gvar.video.palette);*/ }\r