going to work on bg draw today!

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

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 59ce49aa30117061d9f2ecff29346c9829efd15b..31a76ce66feb8b61b552abdfa2b0b88e9e63b7f7 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -162,12 +162,12 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
                break;\r
        }\r
 \r
-//     gv->video.page[0].tw = gv->video.page[0].sw/TILEWH;\r
-//     gv->video.page[0].th = gv->video.page[0].sh/TILEWH;\r
+//     gv->video.page[0].ti.tw = gv->video.page[0].sw/TILEWH;\r
+//     gv->video.page[0].ti.th = gv->video.page[0].sh/TILEWH;\r
 \r
        //TODO MAKE FLEXIBLE~\r
-//     gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;\r
-//     gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;\r
+//     gv->video.page[0].ti.tilemidposscreenx = gv->video.page[0].ti.tilesw;\r
+//     gv->video.page[0].ti.tilemidposscreeny = (gv->video.page[0].ti.tilesh/2)+1;\r
 }\r
 \r
 void\r
@@ -191,12 +191,12 @@ modexDefaultPage(page_t *p)
        page.sh = p->sh;\r
        page.width = p->sw+TILEWHD;\r
        page.height = p->sh+TILEWHD;\r
-       page.tw = page.sw/TILEWH;\r
-       page.th = page.sh/TILEWH;\r
-       page.tilesw=page.width/TILEWH;\r
-       page.tilesh=page.height/TILEWH;\r
-       page.tilemidposscreenx = page.tw/2;\r
-       page.tilemidposscreeny = (page.th/2)+1;\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
@@ -219,10 +219,10 @@ modexNextPage(page_t *p) {
        result.sh = p->sh;\r
        result.width = p->width;\r
        result.height = p->height;\r
-       result.tw = p->tw;\r
-       result.th = p->th;\r
-       result.tilesw = p->tilesw;\r
-       result.tilesh = p->tilesh;\r
+       result.ti.tw = p->ti.tw;\r
+       result.ti.th = p->ti.th;\r
+       result.ti.tilesw = p->ti.tilesw;\r
+       result.ti.tilesh = p->ti.tilesh;\r
        result.stridew=p->stridew;\r
        result.pagesize = p->pagesize;\r
        result.pi=result.width*4;\r
@@ -244,10 +244,10 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
        result.sh = y;\r
        result.width = x;\r
        result.height = y;\r
-       result.tw = result.sw/TILEWH;\r
-       result.th = result.sh/TILEWH;\r
-       result.tilesw=result.width/TILEWH;\r
-       result.tilesh=result.height/TILEWH;\r
+       result.ti.tw = result.sw/TILEWH;\r
+       result.ti.th = result.sh/TILEWH;\r
+       result.ti.tilesw=result.width/TILEWH;\r
+       result.ti.tilesh=result.height/TILEWH;\r
        result.id = p->id+1;\r
        result.stridew=result.width/4;//p->sw/4;\r
        result.pagesize = (word)(result.stridew)*result.height;\r
@@ -1256,7 +1256,7 @@ void modexcls(page_t *page, byte color, byte *Where)
        /* set map mask to all 4 planes */\r
        outpw(SC_INDEX, 0xff02);\r
        //_fmemset(VGA, color, 16000);\r
-       _fmemset(Where, color, page->width*(page->height)/4);\r
+       _fmemset(Where, color, page->stridew*page->height);\r
 }\r
 \r
 //\r
@@ -1330,8 +1330,8 @@ void VL_PrintmodexmemInfo(video_t *v)
 //     printf("========================================\n");\r
        printf("VL_PrintmodexmemInfo:\n");\r
 //     printf("========================================\n");\r
-       printf("  Virtual Screen: %dx", v->page[0].width);      printf("%d      ", v->page[0].height);  printf("Tile: %dx", v->page[0].tilesw);         printf("%d", v->page[0].tilesh);        printf("=((Virtual Screen)/16)\n");\r
-       printf("        Screen: %dx", v->page[0].sw);           printf("%d      ", v->page[0].sh);              printf("Tile: %dx", v->page[0].tw);                     printf("%d", v->page[0].th);            printf("=((Screen)/16)\n");\r
+       printf("  Virtual Screen: %dx", v->page[0].width);      printf("%d      ", v->page[0].height);  printf("Tile: %dx", v->page[0].ti.tilesw);              printf("%d", v->page[0].ti.tilesh);     printf("=((Virtual Screen)/16)\n");\r
+       printf("        Screen: %dx", v->page[0].sw);           printf("%d      ", v->page[0].sh);              printf("Tile: %dx", v->page[0].ti.tw);                  printf("%d", v->page[0].ti.th);         printf("=((Screen)/16)\n");\r
 \r
        printf("  Free Video Memory: %u\n", v->vmem_remain);\r
        printf("  page");\r