OSDN Git Service

p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...
[proj16/16.git] / src / lib / 16_vl.c
index 2e5fa42..882dd3d 100755 (executable)
@@ -30,10 +30,179 @@ byte far* VGA=(byte far*) 0xA0000000;   /* this points to video memory. */
 static void fadePalette(sbyte fade, sbyte start, word iter, byte *palette);\r
 static byte tmppal[PAL_SIZE];\r
 \r
+//===========================================================================\r
+\r
+/*\r
+=======================\r
+=\r
+= VL_Startup\r
+=\r
+=======================\r
+*/\r
+\r
+void   VL_Startup (global_game_variables_t *gvar)\r
+{\r
+       __asm   cld;\r
+\r
+       VGAmodeX(1/*TODO other modes*/, 1, gvar);\r
+       VL_LoadPalFileCore(gvar->video.palette, gvar);\r
+       //Quit ("Improper video card!  If you really have a VGA card that I am not\ndetecting it!", gvar);\r
+}\r
+\r
+\r
+\r
+/*\r
+=======================\r
+=\r
+= VL_Shutdown\r
+=\r
+=======================\r
+*/\r
+\r
+void   VL_Shutdown (global_game_variables_t *gvar)\r
+{\r
+       VGAmodeX(0, 1, gvar);\r
+}\r
+\r
+/*\r
+=======================\r
+=\r
+= VL_SetVGAPlaneMode\r
+=\r
+=======================\r
+*/\r
+#if 0\r
+void   VL_SetVGAPlaneMode (global_game_variables_t *gvar)\r
+{\r
+       VL_vgaSetMode(VGA_256_COLOR_MODE);\r
+       VL_DePlaneVGA ();\r
+       VGAMAPMASK(15);\r
+       VL_SetLineWidth (40, &gvar->video.ofs);\r
+}\r
+#endif\r
+\r
+//===========================================================================\r
+\r
+/*\r
+=================\r
+=\r
+= VL_ClearVideo\r
+=\r
+= Fill the entire video buffer with a given color\r
+=\r
+=================\r
+*/\r
+\r
+void VL_ClearVideo (byte color)\r
+{\r
+       __asm {\r
+               mov     dx,GC_INDEX\r
+               mov     al,GC_MODE\r
+               out     dx,al\r
+               inc     dx\r
+               in      al,dx\r
+               and     al,0xfc                         // write mode 0 to store directly to video\r
+               out     dx,al\r
+\r
+               mov     dx,SC_INDEX\r
+               mov     ax,SC_MAPMASK+15*256\r
+               out     dx,ax                           // write through all four planes\r
+\r
+               mov     ax,SCREENSEG\r
+               mov     es,ax\r
+               mov     al,[color]\r
+               mov     ah,al\r
+               mov     cx,0x8000                       // 0x8000 words, clearing 8 video bytes/word\r
+               xor     di,di\r
+               rep     stosw\r
+       }\r
+}\r
+\r
+/*\r
+=============================================================================\r
+\r
+                       VGA REGISTER MANAGEMENT ROUTINES\r
+\r
+=============================================================================\r
+*/\r
+\r
+\r
+/*\r
+=================\r
+=\r
+= VL_DePlaneVGA\r
+=\r
+=================\r
+*/\r
+#if 0\r
+void VL_DePlaneVGA (void)\r
+{\r
+\r
+//\r
+// change CPU addressing to non linear mode\r
+//\r
+\r
+//\r
+// turn off chain 4 and odd/even\r
+//\r
+       outportb (SC_INDEX,SC_MEMMODE);\r
+       outportb (SC_INDEX+1,(inportb(SC_INDEX+1)&~8)|4);\r
+\r
+       outportb (SC_INDEX,SC_MAPMASK);         // leave this set throughought\r
+\r
+//\r
+// turn off odd/even and set write mode 0\r
+//\r
+       outportb (GC_INDEX,GC_MODE);\r
+       outportb (GC_INDEX+1,inportb(GC_INDEX+1)&~0x13);\r
+\r
+//\r
+// turn off chain\r
+//\r
+       outportb (GC_INDEX,GC_MISCELLANEOUS);\r
+       outportb (GC_INDEX+1,inportb(GC_INDEX+1)&~2);\r
+\r
+//\r
+// clear the entire buffer space, because int 10h only did 16 k / plane\r
+//\r
+       VL_ClearVideo (0);\r
+\r
+//\r
+// change CRTC scanning from doubleword to byte mode, allowing >64k scans\r
+//\r
+       outportb (CRTC_INDEX,CRTC_UNDERLINE);\r
+       outportb (CRTC_INDEX+1,inportb(CRTC_INDEX+1)&~0x40);\r
+\r
+       outportb (CRTC_INDEX,CRTC_MODE);\r
+       outportb (CRTC_INDEX+1,inportb(CRTC_INDEX+1)|0x40);\r
+}\r
+#endif\r
+//===========================================================================\r
+\r
+/*\r
+====================\r
+=\r
+= VL_SetSplitScreen\r
+=\r
+====================\r
+*/\r
+\r
+void VL_SetSplitScreen (int linenum)\r
+{\r
+       VL_WaitVBL (1);\r
+       linenum=linenum*2-1;\r
+       outportb (CRTC_INDEX,CRTC_LINECOMPARE);\r
+       outportb (CRTC_INDEX+1,linenum % 256);\r
+       outportb (CRTC_INDEX,CRTC_OVERFLOW);\r
+       outportb (CRTC_INDEX+1, 1+16*(linenum/256));\r
+       outportb (CRTC_INDEX,CRTC_MAXSCANLINE);\r
+       outportb (CRTC_INDEX+1,inportb(CRTC_INDEX+1) & (255-64));\r
+}\r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
-//                                                                                                                                                                                                                                             //\r
-// setvideo() - This function Manages the video modes                                                                                          //\r
-//                                                                                                                                                                                                                                             //\r
+//                                                                                                                     //\r
+// setvideo() - This function Manages the video modes                                          //\r
+//                                                                                                                     //\r
 /////////////////////////////////////////////////////////////////////////////\r
 void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)\r
 {\r
@@ -43,31 +212,43 @@ void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv)
        {\r
                case 0: // deinit the video\r
                        // change to the video mode we were in before we switched to mode 13h\r
-                       modexLeave();\r
-                       in.h.ah = 0x00;\r
-                       in.h.al = gv->video.old_mode;\r
-                       int86(0x10, &in, &out);\r
+                       if(gv->video.VL_Started)\r
+                       {\r
+                               modexLeave();\r
+                               in.h.ah = 0x00;\r
+                               in.h.al = gv->video.old_mode;\r
+                               int86(0x10, &in, &out);\r
+                       }\r
+                       gv->video.VL_Started=0;\r
                break;\r
                default: // init the video\r
+                       if(gv->video.VL_Started)\r
+                               return;\r
+                       if(!gv->video.VL_Initiated)\r
+                               TL_VidInit(gv);\r
                        // get old video mode\r
                        //in.h.ah = 0xf;\r
                        //int86(0x10, &in, &out);\r
-                       gv->video.old_mode = vgaGetMode();//out.h.al;\r
+                       gv->video.old_mode = VL_vgaGetMode();//out.h.al;\r
                        // enter mode\r
                        modexEnter(vq, cmem, gv);\r
                break;\r
        }\r
 }\r
 \r
-static void\r
-vgaSetMode(byte mode)\r
+//---------------------------------------------------\r
+//\r
+// Use the bios to set the current video mode\r
+//\r
+\r
+/*static */void\r
+VL_vgaSetMode(byte mode)\r
 {\r
        union REGS regs;\r
 \r
        regs.h.ah = SET_MODE;\r
        regs.h.al = mode;\r
        int86(VIDEO_INT, &regs, &regs);\r
-  //int10_setmode(mode);\r
 }\r
 \r
 //---------------------------------------------------\r
@@ -75,8 +256,8 @@ vgaSetMode(byte mode)
 // Use the bios to get the current video mode\r
 //\r
 \r
-byte/*FIXME: why long? "long" is 32-bit datatype, VGA modes are 8-bit numbers. */\r
-vgaGetMode()\r
+byte\r
+VL_vgaGetMode(void)\r
 {\r
        return int10_getmode();\r
 }\r
@@ -84,11 +265,11 @@ vgaGetMode()
 /* -========================= Entry  Points ==========================- */\r
 void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)\r
 {\r
-       word i;\r
+       //word i;\r
        struct vga_mode_params cm;\r
        //int CRTParmCount;\r
 \r
-       vgaSetMode(VGA_256_COLOR_MODE);\r
+       VL_vgaSetMode(VGA_256_COLOR_MODE);\r
        vga_enable_256color_modex();\r
 \r
        update_state_from_vga();\r
@@ -101,14 +282,15 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        switch(vq)\r
        {\r
                case 1:\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
                        }*/\r
-                       /* width and height */\r
+                       // width and height //\r
                        gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this\r
                        gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this\r
-                       /* virtual width and height. match screen, at first */\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
@@ -150,25 +332,36 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        vga_state.vga_stride = cm.offset * 2;\r
        vga_write_crtc_mode(&cm,0);\r
 \r
-       /* clear video memory */\r
+       // clear video memory //\r
        switch (cmem)\r
        {\r
-               case 1: {\r
-                       /* clear video memory */\r
-                       dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;       /* used for faster screen clearing */\r
+               case 1:\r
+               {\r
+#if 0\r
+                       dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;       // used for faster screen clearing //\r
                        vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);\r
                        for(i = 0;i < 0x4000; i++) ptr[i] = 0x0000; // 0x4000 x dword = 64KB\r
-                       /* fix up the palette and everything */\r
-                       modexPalBlack();        //reset the palette~\r
+                       // fix up the palette and everything //\r
+                       modexPalBlack();        //reset the palette~//\r
+#endif\r
+                       //\r
+                       // clear the entire buffer space, because int 10h only did 16 k / plane\r
+                       //\r
+                       VL_ClearVideo (0);\r
                }\r
                break;\r
        }\r
+//--   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.VL_Started=1;\r
 }\r
 \r
-void\r
-modexLeave() {\r
-       /* VGAmodeX restores original mode and palette */\r
-       vgaSetMode(TEXT_MODE);\r
+void modexLeave(void)\r
+{\r
+       // VGAmodeX restores original mode and palette\r
+       VL_vgaSetMode(TEXT_MODE);\r
 }\r
 \r
 page_t\r
@@ -184,8 +377,8 @@ modexDefaultPage(page_t *p)
        page.dy = 0;\r
        page.sw = p->sw;\r
        page.sh = p->sh;\r
-       page.width = p->sw+TILEWHD;\r
-       page.height = p->sh+TILEWHD;\r
+       page.width = p->sw;\r
+       page.height = p->sh;\r
        page.ti.tw = page.sw/TILEWH;\r
        page.ti.th = page.sh/TILEWH;\r
        page.ti.tilesw=page.width/TILEWH;\r
@@ -199,7 +392,39 @@ modexDefaultPage(page_t *p)
 \r
        return page;\r
 }\r
+#if 0\r
+page_t\r
+modexDefaultPage(page_t *p, video_t *v)\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
+       page.data = (vga_state.vga_graphics_ram);\r
+       page.dx = 0;\r
+       page.dy = 0;\r
+       page.sw = p->sw;\r
+       page.sh = p->sh;\r
+       page.width = p->sw;\r
+       page.height = p->sh;\r
+       if(v->curr_mode == 1)\r
+{      page.width += TILEWHD;\r
+       page.height += TILEWHD; }\r
+       page.ti.tw = page.sw/TILEWH;\r
+       page.ti.th = page.sh/TILEWH;\r
+       page.ti.tilesw=page.width/TILEWH;\r
+       page.ti.tilesh=page.height/TILEWH;\r
+       page.ti.tilemidposscreenx = page.ti.tw/2;\r
+       page.ti.tilemidposscreeny = (page.ti.th/2)+1;\r
+       page.stridew=page.width/4;\r
+       page.pagesize = (word)(page.stridew)*page.height;\r
+       page.pi=page.width*4;\r
+       page.id = 0;\r
+\r
+       return page;\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
@@ -274,7 +499,7 @@ void modexCalcVmemRemain(video_t *video)
 \r
 void VL_Initofs(video_t *video)\r
 {\r
-       if(!video->bgps)\r
+       if(!video->vga_state.bgps)\r
        {\r
                video->ofs.offscreen_ofs =      video->page[0].pagesize+video->page[1].pagesize;//(vga_state.vga_stride * vga_state.vga_height);\r
                video->ofs.pattern_ofs =        (uint16_t)video->page[2].data;\r
@@ -288,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->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
@@ -304,12 +529,12 @@ void modexHiganbanaPageSetup(video_t *video)
 \r
        VL_Initofs(video);\r
        //doslib origi var\r
-       video->omemptr=                 vga_state.vga_graphics_ram;\r
-       video->vga_draw_stride= vga_state.vga_draw_stride;\r
-       video->vga_draw_stride_limit=   vga_state.vga_draw_stride_limit;\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
        //sprite render switch and bgpreservation switch\r
-       video->rss=             1;\r
-       video->bgps=    1;\r
+       video->vga_state.rss=   1;\r
+       video->vga_state.bgps=  1;\r
 \r
        //setup the buffersize\r
        video->page[0].dx=video->page[0].dy=\r
@@ -354,7 +579,8 @@ modexShowPage(page_t *page) {
 \r
 //args: page, vertical sync switch, screen resolution switch, page0 switch\r
 void\r
-VL_ShowPage(page_t *page, boolean vsync, boolean sr) {\r
+VL_ShowPage(page_t *page, boolean vsync, boolean sr)\r
+{\r
        word high_address, low_address, offset;\r
        byte crtcOffset;\r
 \r
@@ -392,6 +618,7 @@ VL_ShowPage(page_t *page, boolean vsync, boolean sr) {
        outp(AC_INDEX, 0x33);\r
        outp(AC_INDEX, (page->dx & 0x03) << 1);\r
        vga_state.vga_graphics_ram = (VGA_RAM_PTR)page->data;\r
+       vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = page->stridew;\r
 }\r
 \r
 //=============================================================================\r
@@ -404,25 +631,25 @@ modexPanPage(page_t *page, int dx, int dy) {
 \r
 void\r
 modexSelectPlane(byte plane) {\r
-       outp(SC_INDEX, MAP_MASK);         /* select plane */\r
+       outp(SC_INDEX, SC_MAPMASK);       /* select plane */\r
        outp(SC_DATA,  plane);\r
 }\r
 \r
 void\r
-modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {\r
+modexClearRegion(page_t *page, int x, int y, int w, int h, byte color)\r
+{\r
        word pageOff = (word) page->data;\r
-       word xoff=x/4;     /* xoffset that begins each row */\r
-       word scanCount=w/4;  /* number of iterations per row (excluding right clip)*/\r
-       word poffset = pageOff + y*(page->stridew) + xoff; /* starting offset */\r
-       word nextRow = page->stridew-scanCount-1;  /* loc of next row */\r
-       byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */\r
-       byte rclip[] = {0x00, 0x01, 0x03, 0x07};\r
+       word xoff=(x>>2);                                                       // xoffset that begins each row\r
+       word poffset = pageOff + y*(page->stridew) + xoff;      // starting offset\r
+       word scanCount=w>>2;                                            // number of iterations per row (excluding right clip)\r
+       word nextRow = page->stridew-scanCount-1;               // loc of next row\r
+       LRCLIPDEF\r
        byte left = lclip[x&0x03];\r
        byte right = rclip[(x+w)&0x03];\r
 \r
-       /* handle the case which requires an extra group */\r
+       // handle the case which requires an extra group\r
        if((x & 0x03) && !((x+w) & 0x03)) {\r
-         right=0x0f;\r
+               right=0x0f;\r
        }\r
 \r
        //printf("modexClearRegion(x=%u, y=%u, w=%u, h=%u, left=%u, right=%u)\n", x, y, w, h, left, right);\r
@@ -440,7 +667,7 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
                MOV ES, AX\r
                MOV DI, poffset  ; go to the first pixel\r
                MOV DX, SC_INDEX        ; point to the map mask\r
-               MOV AL, MAP_MASK\r
+               MOV AL, SC_MAPMASK\r
                OUT DX, AL\r
                INC DX\r
                MOV AL, color      ; get ready to write colors\r
@@ -492,17 +719,16 @@ modexCopyPageRegion(page_t *dest, page_t *src,
                        word dx, word dy,\r
                        word width, word height)\r
 {\r
-       word doffset = (word)dest->data + dy*(dest->stridew) + dx/4;\r
-       word soffset = (word)src->data + sy*(src->stridew) + sx/4;\r
-       word scans   = vga_state.vga_stride;                            //++++0000 the quick and dirty fix of the major issue with p16 video display wwww\r
+       word doffset = (word)dest->data + dy*(dest->stridew) + (dx>>2);\r
+       word soffset = (word)src->data + sy*(src->stridew) + (sx>>2);\r
+       word scans      = vga_state.vga_stride+8;                               //++++0000 the quick and dirty fix of the major issue with p16 video display wwww\r
        word nextSrcRow = src->stridew - scans - 1;\r
        word nextDestRow = dest->stridew - scans - 1;\r
-       byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */\r
-       byte rclip[] = {0x00, 0x01, 0x03, 0x07};\r
+       LRCLIPDEF\r
        byte left = lclip[sx&0x03];\r
        byte right = rclip[(sx+width)&0x03];\r
 \r
-       /* handle the case which requires an extra group */\r
+       // handle the case which requires an extra group\r
        if((sx & 0x03) && !((sx+width) & 0x03)) {\r
                right=0x0f;\r
        }\r
@@ -530,7 +756,7 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 \r
                MOV AX, SC_INDEX        ; point to the mask register\r
                MOV DX, AX                ;\r
-               MOV AL, MAP_MASK        ;\r
+               MOV AL, SC_MAPMASK      ;\r
                OUT DX, AL                ;\r
                INC DX            ;\r
 \r
@@ -579,6 +805,7 @@ modexCopyPageRegion(page_t *dest, page_t *src,
        }\r
 }\r
 \r
+//check 16_vl_1.c\r
 \r
 /* fade and flash */\r
 void\r
@@ -632,14 +859,15 @@ fadePalette(sbyte fade, sbyte start, word iter, byte *palette) {
 }\r
 \r
 \r
-/* save and load */\r
-void\r
-modexPalSave(byte *palette) {\r
+// save and load\r
+void modexPalSave(byte *palette)\r
+{\r
        int  i;\r
 \r
-       outp(PAL_READ_REG, 0);    /* start at palette entry 0 */\r
-       for(i=0; i<PAL_SIZE; i++) {\r
-       palette[i] = inp(PAL_DATA_REG); /* read the palette data */\r
+       outp(PAL_READ_REG, 0);                  // start at palette entry 0\r
+       for(i=0; i<PAL_SIZE; i++)\r
+       {\r
+               palette[i] = inp(PAL_DATA_REG); // read the palette data\r
        }\r
 }\r
 \r
@@ -684,13 +912,18 @@ modexLoadPalFile(byte *filename, byte *palette) {
        fclose(file);\r
 }\r
 \r
+void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)\r
+{\r
+       VL_LoadPalFilewithoffset(filename, palette, 9, gvar);\r
+//     VL_LoadPalFileCore(palette);\r
+}\r
 \r
-void VL_LoadPalFile(const char *filename, byte *palette)\r
+void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar)\r
 {\r
-       VL_LoadPalFilewithoffset(filename, palette, 0);\r
+       VL_LoadPalFilewithoffset("data/16.pal", palette, 0, gvar);\r
 }\r
 \r
-void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o)\r
+void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, global_game_variables_t *gvar)\r
 {\r
        int fd;\r
 \r
@@ -699,15 +932,24 @@ void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o)
                read(fd,palette,        PAL_SIZE);\r
                close(fd);\r
 \r
-               VL_UpdatePaletteWrite(palette, o);\r
+               VL_UpdatePaletteWrite(palette, o, gvar);\r
        }\r
 }\r
 \r
-void VL_UpdatePaletteWrite(byte *palette, word o)\r
+void VL_UpdatePaletteWrite(byte *palette, word o, global_game_variables_t *gvar)\r
 {\r
        word i;\r
        vga_palette_lseek(/*1+*/o);\r
-       for (i=o;i < 256-o;i++) vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);\r
+       //for (i=o;i < 256-o;i++)\r
+       for (i=0;i < 256-o;i++)\r
+               vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);\r
+\r
+       VL_PaletteSync(gvar);\r
+}\r
+\r
+void VL_PaletteSync(global_game_variables_t *gvar)\r
+{\r
+       modexPalSave(&gvar->video.palette);\r
 }\r
 \r
 void\r
@@ -763,7 +1005,8 @@ modexPalUpdate(byte *p)
 }\r
 \r
 void\r
-modexPalUpdate0(byte *p)\r
+//modexPalUpdate0(byte *p)\r
+VL_modexPalScramble(byte *p)\r
 {\r
        int i;\r
        //modexWaitBorder();\r
@@ -781,15 +1024,18 @@ modexPalUpdate0(byte *p)
        }\r
 }\r
 \r
-void\r
+word\r
 modexPalOverscan(word col)\r
 {\r
        //modexWaitBorder();\r
        vga_wait_for_vsync();\r
        outp(PAL_WRITE_REG, 0);  /* start at the beginning of palette */\r
        outp(PAL_DATA_REG, col);\r
+       return col;\r
 }\r
 \r
+//check 16_vl_1.c\r
+\r
 void modexputPixel(page_t *page, int x, int y, byte color)\r
 {\r
        word pageOff = (word) page->data;\r
@@ -857,7 +1103,7 @@ void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, wor
        }\r
 }\r
 \r
-void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, const byte *str)\r
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, boolean sw, const byte *str)\r
 {\r
        word s, o, w;\r
        word x_draw;\r
@@ -866,38 +1112,46 @@ void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col,
        word addrr;\r
        byte c;\r
 \r
-       if(tlsw){ x-=page->tlx; y-=page->tly; }\r
-       x_draw = x/4;\r
-       addrq = (page->stridew) * y + (word)(x_draw) +\r
-               ((word)page->data);\r
-       addrr = addrq;\r
-       s=romFonts[t].seg;\r
-       o=romFonts[t].off;\r
-       w=romFonts[t].charSize;\r
-       romFontsData.chw=0;\r
-\r
-       for(; *str != '\0'; str++)\r
+       switch(sw)\r
        {\r
-               c = (*str);\r
-               if(c=='\n')\r
-               {\r
-                       x = x_draw;\r
-                       romFontsData.chw = 0;\r
-                       addrq += (page->stridew) * 8;\r
+               case 0:\r
+                       printf("%s\n", str);\r
+               break;\r
+               case 1:\r
+                       if(tlsw){ x-=page->tlx; y-=page->tly; }\r
+                       x_draw = x/4;\r
+                       addrq = (page->stridew) * y + (word)(x_draw) +\r
+                               ((word)page->data);\r
                        addrr = addrq;\r
-                       y += 8;\r
-                       continue;\r
-               }\r
+                       s=romFonts[t].seg;\r
+                       o=romFonts[t].off;\r
+                       w=romFonts[t].charSize;\r
+                       romFontsData.chw=0;\r
 \r
-       // load the character into romFontsData.l\r
-       // no need for inline assembly!\r
-       // NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.\r
-               _fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);\r
-               modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);\r
-               x_draw += 8; /* track X for edge of screen */\r
-               addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */\r
+                       for(; *str != '\0'; str++)\r
+                       {\r
+                               c = (*str);\r
+                               if(c=='\n')\r
+                               {\r
+                                       x = x_draw;\r
+                                       romFontsData.chw = 0;\r
+                                       addrq += (page->stridew) * 8;\r
+                                       addrr = addrq;\r
+                                       y += 8;\r
+                                       continue;\r
+                               }\r
+\r
+                       // load the character into romFontsData.l\r
+                       // no need for inline assembly!\r
+                       // NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.\r
+                               _fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);\r
+                               modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);\r
+                               x_draw += 8; /* track X for edge of screen */\r
+                               addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */\r
+                       }\r
+                       //printf("print xy:%dx%d        tlxy:%dx%d\n", x, y, page->tlx, page->tly);\r
+               break;\r
        }\r
-       //printf("print xy:%dx%d        tlxy:%dx%d\n", x, y, page->tlx, page->tly);\r
 }\r
 \r
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)\r
@@ -1007,7 +1261,7 @@ void modexpdump(page_t *pee)
                }\r
        }\r
 }\r
-\r
+#if 0\r
 /////////////////////////////////////////////////////////////////////////////\r
 //                                                                                                                                              //\r
 // cls() - This clears the screen to the specified color, on the VGA or on //\r
@@ -1022,7 +1276,7 @@ void modexcls(page_t *page, byte color, byte *Where)
        //_fmemset(VGA, color, 16000);\r
        _fmemset(Where, color, page->stridew*page->height);\r
 }\r
-\r
+#endif\r
 //\r
 // pattern filler from joncampbell123's code\r
 //\r
@@ -1102,6 +1356,8 @@ modexWaitBorder_end()
 \r
 }\r
 \r
+//===========================================================================\r
+\r
 //\r
 // printings of video memory information\r
 //\r