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 7d8a0b258b928acce07db96f797ae80a812f341a..88a153cb8bc2e7bb26ed365904bff0a2b3be664e 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -282,7 +282,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        switch(vq)\r
        {\r
                case 1:\r
-               case 8: //320x240 no buffer\r
+//             case 8: //320x240 no buffer\r
                        //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);\r
                        /*for(i=0; i<CRTParmCount; i++) {\r
                                outpw(CRTC_INDEX, ModeX_320x240regs[i]);\r
@@ -320,15 +320,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                case 2: // TODO: 160x120 according to ModeX_160x120regs\r
                        return;\r
                case 3: // TODO: 160x120 according to ModeX_320x200regs\r
-                       gv->video.page[0].sw = vga_state.vga_width = 300; // VGA lib currently does not update this\r
-                       gv->video.page[0].sh = vga_state.vga_height = 200; // VGA lib currently does not update this\r
-                       // virtual width and height. match screen, at first //\r
-                       gv->video.page[0].height = gv->video.page[0].sh;\r
-                       gv->video.page[0].width = gv->video.page[0].sw;\r
-\r
-                       cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2)\r
-                       //return;\r
-               break;\r
+                       return;\r
                case 4: // TODO: 160x120 according to ModeX_192x144regs\r
                        return;\r
                case 5: // TODO: 160x120 according to ModeX_256x192regs\r
@@ -362,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
@@ -372,7 +364,6 @@ void modexLeave(void)
        VL_vgaSetMode(TEXT_MODE);\r
 }\r
 \r
-#if 0\r
 page_t\r
 modexDefaultPage(page_t *p)\r
 {\r
@@ -399,15 +390,9 @@ modexDefaultPage(page_t *p)
        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
-\r
        return page;\r
 }\r
-#endif\r
+#if 0\r
 page_t\r
 modexDefaultPage(page_t *p, video_t *v)\r
 {\r
@@ -439,7 +424,7 @@ modexDefaultPage(page_t *p, video_t *v)
 \r
        return page;\r
 }\r
-\r
+#endif\r
 /* returns the next page in contiguous memory\r
  * the next page will be the same size as p, by default\r
  */\r
@@ -528,7 +513,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