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

[16.git] / src / lib / 16_vl.c

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