From: sparky4 <sparky4@cock.li>
Date: Mon, 4 Apr 2016 20:59:58 +0000 (-0500)
Subject: wwww initiation of conversion ww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=8e9c24c25f7496303be4d3e8e3c6aac38a652e99;p=16.git

wwww initiation of conversion ww
---

diff --git a/makefile b/makefile
index 8818c9d4..df7edd64 100755
--- a/makefile
+++ b/makefile
@@ -77,7 +77,7 @@ VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
 
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS)
 
 DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
 
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 85989b49..cb4c5312 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -93,18 +93,34 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv)
 	int CRTParmCount;
 	/* common mode X initiation stuff~ */
 	modexsetBaseXMode(gv->video.page);
+	vga_enable_256color_modex(); // VGA mode X
+	update_state_from_vga();
 
 	switch(vq)
 	{
 		case 1:
-			CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
+			//CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]);
 			/* width and height */
-			gv->video.page[0].sw=320;
-			gv->video.page[0].sh=240;
+			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
 
 			/* send the CRTParms */
-			for(i=0; i<CRTParmCount; i++) {
+			/*for(i=0; i<CRTParmCount; i++) {
 				outpw(CRTC_INDEX, ModeX_320x240regs[i]);
+			}*/
+			{
+			struct vga_mode_params cm;
+			vga_read_crtc_mode(&cm);
+
+			// 320x240 mode 60Hz
+			cm.vertical_total = 525;
+			cm.vertical_start_retrace = 0x1EA;
+			cm.vertical_end_retrace = 0x1EC;
+			cm.vertical_display_end = 480;
+			cm.vertical_blank_start = 489;
+			cm.vertical_blank_end = 517;
+
+			vga_write_crtc_mode(&cm,0);
 			}
 		break;
 		case 2:
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 463104c6..312912c6 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -37,6 +37,11 @@
 #include "src/lib/modex16/192x144_.h"
 #include "src/lib/modex16/160x120.h"
 
+#include <hw/cpu/cpu.h>
+#include <hw/dos/dos.h>
+#include <hw/vga/vga.h>
+#include <hw/vga/vrl.h>
+
 //TODO dos lib vga implementation ^^
 //#define DOSLIBVGA