X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=a32bd964393616e9d0e793f73e871bdef95979af;hb=c60a37b1fcd07f11b76d699e20c5d203e6636bd0;hp=20c468e2372a2750bd37b33a977ce93b26eecd9c;hpb=9b04963a6305b545154a2e962e89e7a80de28752;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 20c468e2..a32bd964 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -95,6 +95,9 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 			/* width and height */
 			gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this
 			gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this
+			/* virtual width and height. match screen, at first */
+			gv->video.page[0].height = gv->video.page[0].sh;
+			gv->video.page[0].width = gv->video.page[0].sw;
 
 			// mode X BYTE mode
 			cm.word_mode = 0;
@@ -145,17 +148,18 @@ 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;
-	#define PAGE_SIZE		(word)(gv->video.page[0].sw/4 * gv->video.page[0].sh)
+//	gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw;
+//	gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1;
 }
 
 void
 modexLeave() {
-	/* TODO restore original mode and palette */
+	/* VGAmodeX restores original mode and palette */
 	vgaSetMode(TEXT_MODE);
 }
 
@@ -165,20 +169,22 @@ modexDefaultPage(page_t *p)
     page_t page;
 
     /* default page values */
-    page.data = vga_state.vga_graphics_ram;//VGA;
+	//page.data = VGA;
+	//page.data = (byte far *)(vga_state.vga_graphics_ram);
+	page.data = (vga_state.vga_graphics_ram);
     page.dx = 0;
     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;
-	//pageSize = p->sw*p->sh;
+	page.pagesize = (sdiword)(page.width/4)*page.height;
 	page.id = 0;
 
     return page;
@@ -191,17 +197,19 @@ page_t
 modexNextPage(page_t *p) {
     page_t result;
 
-    result.data = p->data + (p->width/4)*p->height;
+    result.data = p->data + (p->pagesize);
     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;
 
 	return result;
-// 	return modexNextPageFlexibleSize(&p, p->width, p->height);
 }
 
 //next page with defined dimentions~
@@ -210,18 +218,45 @@ 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 + (p->pagesize);  /* 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 = (sdiword)(result.width/4)*result.height;
 
 	return result;
 }
 
+void modexCalcVmemRemain(video_t *video)
+{
+	byte 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->num_of_pages=0;
+	(video->page[0]) = modexDefaultPage(&(video->page[0]));	video->num_of_pages++;
+	//video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);
+	(video->page[1]) = modexNextPage(&(video->page[0]));	video->num_of_pages++;
+	//(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->p=0;
+}
 
 void
 modexShowPage(page_t *page) {
@@ -339,7 +374,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 */
@@ -907,7 +942,7 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 	// load the character into romFontsData.l
 	// no need for inline assembly!
 	// NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C.
-		_fmemcpy(romFontsData.l,MK_FP(s,o)/*ROM font location*/,w/*char size*/);
+		_fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/);
 		modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr);
 		x_draw += 8; /* track X for edge of screen */
 		addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */