X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=8776d0aa3ef080ff52e220940e4fb5ca804a1ac3;hb=40391c09eb16ee6d6261bca1e37ba08a3de2af9c;hp=3c80c4e7ec4979b763b5693129f5eeede5f1d405;hpb=60e187ff7505d37fe9125ddf384883fbe88811bf;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 3c80c4e7..8776d0aa 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -148,11 +148,14 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 		}
 		break;
 	}
-	gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH;
-	gv->video.page[0].tilesh = gv->video.page[0].sh/TILEWH;
+
+//	gv->video.page[0].tw = gv->video.page[0].sw/TILEWH;
+//	gv->video.page[0].th = gv->video.page[0].sh/TILEWH;
+
 	//TODO MAKE FLEXIBLE~
-	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
-	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
+//	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
+//	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
+	gv->video.num_of_pages=0;
 }
 
 void
@@ -172,15 +175,15 @@ modexDefaultPage(page_t *p)
     page.dy = 0;
 	page.sw = p->sw;
 	page.sh = p->sh;
-	page.width = p->sw;
-	page.height = p->sh;
+	page.width = p->sw+TILEWHD;
+	page.height = p->sh+TILEWHD;
 	page.tw = page.sw/TILEWH;
 	page.th = page.sh/TILEWH;
+	page.tilesw=page.width/TILEWH;
+	page.tilesh=page.height/TILEWH;
 	page.tilemidposscreenx = page.tw/2;
 	page.tilemidposscreeny = (page.th/2)+1;
-	page.tilesw=p->tilesw;
-	page.tilesh=p->tilesh;
-	page.pagesize = page.width*page.height;
+	page.pagesize = (sdiword)page.width*page.height;
 	page.id = 0;
 
     return page;
@@ -193,13 +196,15 @@ page_t
 modexNextPage(page_t *p) {
     page_t result;
 
-    result.data = p->data + (p->width/4)*p->height;
+    result.data = p->data + (byte)(p->width/4)*p->height;
     result.dx = 0;
     result.dy = 0;
     result.width = p->width;
     result.height = p->height;
-	result.tw = p->width/TILEWH;
-	result.th = p->height/TILEWH;
+	result.tw = p->tw;
+	result.th = p->th;
+	result.tilesw = p->tilesw;
+	result.tilesh = p->tilesh;
 	result.id = p->id+1;
 	result.pagesize = p->pagesize;
 
@@ -212,15 +217,17 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 {
 	page_t result;
 
-	result.data = p->data + (p->width/4)*p->height;  /* compute the offset */
+	result.data = p->data + (byte)(p->width/4)*p->height;  /* compute the offset */
 	result.dx = 0;
 	result.dy = 0;
 	result.width = x;
 	result.height = y;
-	result.tw = p->width/TILEWH;
-	result.th = p->height/TILEWH;
+	result.tw = result.sw/TILEWH;
+	result.th = result.sh/TILEWH;
+	result.tilesw=result.width/TILEWH;
+	result.tilesh=result.height/TILEWH;
 	result.id = p->id+1;
-	result.pagesize = result.width*result.height;
+	result.pagesize = (sdiword)result.width*result.height;
 
 	return result;
 }
@@ -228,25 +235,27 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 void modexCalcVmemRemain(video_t *video)
 {
 	byte i;
-	video->vmem_remain=262144;
-	for(i=0; i<=video->num_of_pages; i++)
+	//printf("\n\n	1st vmem_remain=%ld\n", video->vmem_remain);
+	for(i=0; i<=video->num_of_pages-1; i++)
 	{
 		video->vmem_remain-=video->page[i].pagesize;
+		//printf("		[%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize);
+		//printf("		[%u], vmem_remain=%ld\n", i, video->vmem_remain);
 	}
 }
 
 void modexHiganbanaPageSetup(video_t *video)
 {
+	video->vmem_remain=262144L;
 	(video->page[0]) = modexDefaultPage(&(video->page[0]));	video->num_of_pages++;
-	video->page[0].width += (TILEWH*2); video->page[0].height += (TILEWH*2);
+	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
 	(video->page[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
-	(video->page[2]) = modexNextPage(&(video->page[1]));	video->num_of_pages++;
-	//(352*176)+1024 is the remaining amount of memory left wwww
+	(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40);	video->num_of_pages++;
+	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);	video->num_of_pages++;
 	modexCalcVmemRemain(video);
-//	(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 92);	video->num_of_pages++;
-//	modexCalcVmemRemain(video);
-	//gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
+	video->p=0;
 }
+
 void
 modexShowPage(page_t *page) {
     word high_address;
@@ -363,7 +372,7 @@ modexCopyPageRegion(page_t *dest, page_t *src,
 {
     word doffset = (word)dest->data + dy*(dest->width/4) + dx/4;
     word soffset = (word)src->data + sy*(src->width/4) + sx/4;
-    word scans   = width/4;
+    word scans   = vga_state.vga_stride;
     word nextSrcRow = src->width/4 - scans - 1;
     word nextDestRow = dest->width/4 - scans - 1;
     byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08};  /* clips for rectangles not on 4s */