ww

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

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index e7085e6345eb5c8e06b3b890fd01c4d7a9d2ed2c..a32bd964393616e9d0e793f73e871bdef95979af 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -155,7 +155,6 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
        //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.num_of_pages=0;\r
 }\r
 \r
 void\r
@@ -185,7 +184,7 @@ modexDefaultPage(page_t *p)
        page.tilesh=page.height/TILEWH;\r
        page.tilemidposscreenx = page.tw/2;\r
        page.tilemidposscreeny = (page.th/2)+1;\r
-       page.pagesize = (sdiword)page.width*page.height;\r
+       page.pagesize = (sdiword)(page.width/4)*page.height;\r
        page.id = 0;\r
 \r
     return page;\r
@@ -198,7 +197,7 @@ page_t
 modexNextPage(page_t *p) {\r
     page_t result;\r
 \r
-    result.data = p->data + (byte)(p->width/4)*p->height;\r
+    result.data = p->data + (p->pagesize);\r
     result.dx = 0;\r
     result.dy = 0;\r
     result.width = p->width;\r
@@ -219,7 +218,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 {\r
        page_t result;\r
 \r
-       result.data = p->data + (byte)(p->width/4)*p->height;  /* compute the offset */\r
+       result.data = p->data + (p->pagesize);  /* compute the offset */\r
        result.dx = 0;\r
        result.dy = 0;\r
        result.width = x;\r
@@ -229,7 +228,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
        result.tilesw=result.width/TILEWH;\r
        result.tilesh=result.height/TILEWH;\r
        result.id = p->id+1;\r
-       result.pagesize = (sdiword)result.width*result.height;\r
+       result.pagesize = (sdiword)(result.width/4)*result.height;\r
 \r
        return result;\r
 }\r
@@ -249,11 +248,12 @@ void modexCalcVmemRemain(video_t *video)
 void modexHiganbanaPageSetup(video_t *video)\r
 {\r
        video->vmem_remain=262144L;\r
+       video->num_of_pages=0;\r
        (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++;\r
        //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);\r
        (video->page[1]) = modexNextPage(&(video->page[0]));    video->num_of_pages++;\r
-       (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40);    video->num_of_pages++;\r
-       (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);        video->num_of_pages++;\r
+       //(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40);  video->num_of_pages++;\r
+       //(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);      video->num_of_pages++;\r
        modexCalcVmemRemain(video);\r
        video->p=0;\r
 }\r