X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=cab1376675720d225ca62f6d01f1204c020a5ce4;hb=cb4574433d1faa6a5345362d66211108f9aaaa3c;hp=c1c8eb5df107301c38b3ef77789d5925a213185b;hpb=4e6ef52609a4ff0d863c43c0e2702a6f3ed271c5;p=16.git

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index c1c8eb5d..cab13766 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -80,7 +80,6 @@ vgaGetMode()
 void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 {
 	word i;
-	dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;      /* used for faster screen clearing */
 	struct vga_mode_params cm;
 	int CRTParmCount;
 
@@ -94,9 +93,12 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 		case 1:
 			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
 			/* 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
+			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
 
+			// mode X BYTE mode
+			cm.word_mode = 0;
+			cm.dword_mode = 0;
 			// 320x240 mode 60Hz
 			cm.horizontal_total=0x5f + 5; /* CRTC[0]             -5 */
 			cm.horizontal_display_end=0x4f + 1; /* CRTC[1]       -1 */
@@ -115,6 +117,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 			cm.clock_select = 0; /* misc register = 0xE3  25MHz */
 			cm.vsync_neg = 1;
 			cm.hsync_neg = 1;
+			cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2)
 			break;
 		case 2: // TODO: 160x120 according to ModeX_160x120regs
 			return;
@@ -128,15 +131,18 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 			return;
 	}
 
+	vga_state.vga_stride = cm.offset * 2;
 	vga_write_crtc_mode(&cm,0);
 
 	/* clear video memory */
 	switch (cmem)
 	{
-		case 1:
-		/* clear video memory */
-		vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);
-		for(i=0; i<0x8000; i++) ptr[i] = 0x0000;
+		case 1: {
+			/* clear video memory */
+			dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA;      /* used for faster screen clearing */
+			vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/);
+			for(i = 0;i < 0x4000; i++) ptr[i] = 0x0000; // 0x4000 x dword = 64KB
+		}
 		break;
 	}
 	gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH;
@@ -871,23 +877,11 @@ byte modexgetPixel(page_t *page, int x, int y)
 
 }
 
-void modexhlin(page_t *page, word xl, word xh, word y, word color)
-{
-	word x;
-	word yy=0;
-
-	for(x=0;x<xh*4;x+=4)
-	{
-		if(x+4>=page[0].sw-1){ x=0; yy+=4; }
-		modexClearRegion(page, x+xl, y+yy, 4, 4, color);
-	}
-	//modexputPixel(page, x+xl, y, color);
-}
-
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q)
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
 {
 	word s, o, w;
 	word addr = (word) romFontsData.l;
+	word addrq = (page->width/4) * y + (x / 4) + ((word)page->data);
 	byte c;
 
 	s=romFonts[t].seg;
@@ -924,7 +918,8 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 		JNZ L1
 	}
 //TODO: OPTIMIZE THIS!!!!
-		modexDrawCharPBuf(page, x, y, t, col, bgcol, q);
+		modexDrawCharPBuf(page, x/*for mode X planar use*/, y/*redunant, remove*/, t, col, bgcol, addrq);
+		addrq += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */
 
 		//if(!q) getch();
 	}