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

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

diff --git a/src/lib/16render.c b/src/lib/16render.c
index 091775b7ba1ce88a0bf82eb80e6805bd308943a3..d159c2a312d3bddc853a714e51c4d192b272b09d 100755 (executable)
--- a/src/lib/16render.c
+++ b/src/lib/16render.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -33,8 +33,8 @@ void modexDrawPBufRegion      (page_t *page, int x, int y, int rx, int ry, int rw, in
 {\r
        word plane;\r
        int i;\r
-       const int px=x+page->dx;\r
-       const int py=y+page->dy;\r
+       const int px=x+page[0].dx;\r
+       const int py=y+page[0].dy;\r
        const int prw = rw/4;\r
        int prh;\r
 \r
@@ -72,8 +72,8 @@ modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
        sword plane;\r
        int i;\r
 //     byte near *buff;\r
-       const int px=x+page->dx;\r
-       const int py=y+page->dy;\r
+       const int px=x+page[0].dx;\r
+       const int py=y+page[0].dy;\r
        x=px;\r
        y=py;\r
 //     buff = _nmalloc(p->pwidth+1);\r
@@ -100,7 +100,7 @@ modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
                                //printf("%02X ", (int) p->plane[plane][i++]);\r
 //                             _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
 //                             printf("buff %u==%s\n", y, *buff);\r
-//                             _fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), buff, p->pwidth);\r
+//                             _fmemcpy(page->data + (((page->width/4) * (y+page[0].dy)) + ((x+page[0].dx) / 4)), buff, p->pwidth);\r
                                _fmemcpy(page->data + (((page->width/4) * y) + (x / 4)), &(p->plane[plane][i+=p->pwidth]), p->pwidth);\r
                        //}\r
                }\r
@@ -142,7 +142,7 @@ modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp) {
 void\r
 modexDrawBmpRegion(page_t *page, int x, int y,\r
                   int rx, int ry, int rw, int rh, bitmap_t *bmp) {\r
-       word poffset = (word) page->data  + y*(page->width/4) + x/4;\r
+       word poffset = (word)page->data + y*(page->width/4) + x/4;\r
        byte *data = bmp->data;//+bmp->offset;\r
        word bmpOffset = (word) data + ry * bmp->width + rx;\r
        word width = rw;\r
@@ -151,7 +151,7 @@ modexDrawBmpRegion(page_t *page, int x, int y,
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r
        word nextBmpRow = (word) bmp->width - width;\r
-       word rowCounter;\r
+       word rowCounter=0;\r
        byte planeCounter = 4;\r
 \r
     __asm {\r
@@ -159,7 +159,7 @@ modexDrawBmpRegion(page_t *page, int x, int y,
                MOV ES, AX\r
 \r
                MOV DX, SC_INDEX        ; point at the map mask register\r
-               MOV AL, MAP_MASK        ;\r
+               MOV AL, SC_MAPMASK      ;\r
                OUT DX, AL            ;\r
 \r
        PLANE_LOOP:\r
@@ -218,7 +218,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r
        word nextBmpRow = (word) bmp->width - width;\r
-       word rowCounter;\r
+       word rowCounter=0;\r
        byte planeCounter = 4;\r
 \r
     __asm {\r
@@ -226,7 +226,7 @@ modexDrawSpriteRegion(page_t *page, int x, int y,
                MOV ES, AX\r
 \r
                MOV DX, SC_INDEX        ; point at the map mask register\r
-               MOV AL, MAP_MASK        ;\r
+               MOV AL, SC_MAPMASK      ;\r
                OUT DX, AL            ;\r
 \r
        PLANE_LOOP:\r
@@ -297,7 +297,7 @@ modexDrawBmpPBufRegion(page_t *page, int x, int y,
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r
        word nextBmpRow = (word) bmp->width - width;\r
-       word rowCounter;\r
+       word rowCounter=0;\r
        byte planeCounter = 4;\r
 \r
     __asm {\r
@@ -305,7 +305,7 @@ modexDrawBmpPBufRegion(page_t *page, int x, int y,
                MOV ES, AX\r
 \r
                MOV DX, SC_INDEX        ; point at the map mask register\r
-               MOV AL, MAP_MASK        ;\r
+               MOV AL, SC_MAPMASK      ;\r
                OUT DX, AL            ;\r
 \r
        PLANE_LOOP:\r
@@ -375,7 +375,7 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
        word scanCount = width/4 + (width%4 ? 1 :0);\r
        word nextPageRow = page->width/4 - scanCount;\r
        word nextBmpRow = (word) bmp->width - width;\r
-       word rowCounter;\r
+       word rowCounter=0;\r
        byte planeCounter = 4;\r
 \r
     __asm {\r
@@ -383,7 +383,7 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
                MOV ES, AX\r
 \r
                MOV DX, SC_INDEX        ; point at the map mask register\r
-               MOV AL, MAP_MASK        ;\r
+               MOV AL, SC_MAPMASK      ;\r
                OUT DX, AL            ;\r
 \r
        PLANE_LOOP:\r
@@ -434,40 +434,3 @@ modexDrawSpritePBufRegion(page_t *page, int x, int y,
                JNZ PLANE_LOOP    ; do all 4 planes\r
     }\r
 }\r
-\r
-void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, word col, word bgcol, word addr)\r
-{\r
-       /* vertical drawing routine by joncampbell123.\r
-        *\r
-        * optimize for VGA mode X planar memory to minimize the number of times we do I/O write to map mask register.\r
-        * so, we enumerate over columns (not rows!) to draw every 4th pixel. bit masks are used because of the font bitmap.\r
-        *\r
-        * NTS: addr defines what VGA memory address we use, "x" is redundant except to specify which of the 4 pixels we select in the map mask register. */\r
-       word rows = romFonts[t].charSize;\r
-       word drawaddr;\r
-       word colm, row;\r
-       byte fontbyte;\r
-       byte plane;\r
-       byte m1,m2;\r
-\r
-       plane = x & 3;\r
-       m1 = 0x80; // left half\r
-       m2 = 0x08; // right half\r
-       for (colm=0;colm < 4;colm++) {\r
-               drawaddr = addr;\r
-               modexSelectPlane(PLANE(plane));\r
-               for (row=0;row < rows;row++) {\r
-                       fontbyte = romFontsData.l[row];\r
-                       vga_state.vga_graphics_ram[drawaddr  ] = (fontbyte & m1) ? col : bgcol;\r
-                       vga_state.vga_graphics_ram[drawaddr+1] = (fontbyte & m2) ? col : bgcol;\r
-                       drawaddr += page->width >> 2;\r
-               }\r
-\r
-               m1 >>= 1;\r
-               m2 >>= 1;\r
-               if ((++plane) == 4) {\r
-                       addr++;\r
-                       plane = 0;\r
-               }\r
-       }\r
-}\r