--- xmil/win9x/xmil.cpp 2004/08/04 15:18:26 1.5 +++ xmil/win9x/xmil.cpp 2004/08/05 11:30:12 1.7 @@ -22,8 +22,7 @@ #include "z80core.h" #include "pccore.h" -#include "x1_io.h" -#include "x1_crtc.h" +#include "iocore.h" #include "timing.h" #include "draw.h" #include "fdd_ini.h" @@ -259,15 +258,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT break; case IDM_WIDTH80: - crtc.TXT_XL = 80; - crtc.GRP_XL = 640; + crtc.s.TXT_XL = 80; + crtc.s.GRP_XL = 640; vrambank_patch(); scrnallflash = 1; break; case IDM_WIDTH40: - crtc.TXT_XL = 40; - crtc.GRP_XL = 320; + crtc.s.TXT_XL = 40; + crtc.s.GRP_XL = 320; vrambank_patch(); scrnallflash = 1; break; @@ -726,7 +725,7 @@ int WINAPI WinMain(HINSTANCE hInstance, juliet_load(); juliet_prepare(); - juliet2_reset(); +// juliet2_reset(); if (soundmng_initialize() == SUCCESS) { soundmng_pcmload(SOUND_PCMSEEK, OEMTEXT("fddseek.wav"), 0); soundmng_pcmload(SOUND_PCMSEEK1, OEMTEXT("fddseek1.wav"), 0); @@ -775,12 +774,12 @@ int WINAPI WinMain(HINSTANCE hInstance, timing_setcount(0); joymng_sync(); mousemng_sync(); - juliet2_sync(25); +// juliet2_sync(25); x1r_exec(); x1f_sync(); } soundmng_sync(); - juliet2_exec(); +// juliet2_exec(); } } else {