X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=6a5b27994f5549b8c1e80e141fab486627389662;hb=ab7178cd4cfa5f75d0388d0322db7512bc9a6f20;hp=97870192fb8962f794f4bfdec984afb9ab86da50;hpb=51714bd13b5cec5a5eb3ac5aa6091162924cacb0;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 97870192..6a5b2799 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -155,6 +155,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	//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.num_of_pages=0;
 }
 
 void
@@ -169,7 +170,9 @@ 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;
@@ -182,7 +185,7 @@ modexDefaultPage(page_t *p)
 	page.tilesh=page.height/TILEWH;
 	page.tilemidposscreenx = page.tw/2;
 	page.tilemidposscreeny = (page.th/2)+1;
-	page.pagesize = (sdiword)page.width*page.height;
+	page.pagesize = (sdiword)(page.width/4)*page.height;
 	page.id = 0;
 
     return page;
@@ -195,7 +198,7 @@ page_t
 modexNextPage(page_t *p) {
     page_t result;
 
-    result.data = p->data + (byte)(p->width/4)*p->height;
+    result.data = p->data + (p->pagesize);
     result.dx = 0;
     result.dy = 0;
     result.width = p->width;
@@ -216,7 +219,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 {
 	page_t result;
 
-	result.data = p->data + (byte)(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;
@@ -226,7 +229,7 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 	result.tilesw=result.width/TILEWH;
 	result.tilesh=result.height/TILEWH;
 	result.id = p->id+1;
-	result.pagesize = (sdiword)result.width*result.height;
+	result.pagesize = (sdiword)(result.width/4)*result.height;
 
 	return result;
 }
@@ -234,12 +237,12 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
 void modexCalcVmemRemain(video_t *video)
 {
 	byte i;
-	printf("\n\n	1st vmem_remain=%ld\n", video->vmem_remain);
+	//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);
+		//printf("		[%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize);
+		//printf("		[%u], vmem_remain=%ld\n", i, video->vmem_remain);
 	}
 }
 
@@ -249,8 +252,8 @@ void modexHiganbanaPageSetup(video_t *video)
 	(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++;
+	//(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;
 }
@@ -321,6 +324,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
     }
 
     __asm {
+	    PUSHF
+	    PUSH ES
+	    PUSH AX
+	    PUSH BX
+	    PUSH CX
+	    PUSH DX
+	    PUSH SI
+	    PUSH DI
 		MOV AX, SCREEN_SEG      ; go to the VGA memory
 		MOV ES, AX
 		MOV DI, poffset	 ; go to the first pixel
@@ -354,6 +365,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 		ADD DI, nextRow	 ; go to the next row
 		DEC h
 		JNZ SCAN_START
+	    POP DI
+	    POP SI
+	    POP DX
+	    POP CX
+	    POP BX
+	    POP AX
+	    POP ES
+	    POPF
     }
 }