diff --git a/bin/History.txt b/bin/History.txt index f352bc73..0f0070f1 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -9,6 +9,20 @@ https://github.com/AppleWin/AppleWin/issues/new Tom Charlesworth +1.29.7.0 - 20 Dec 2019 +---------------------- +. [Change #726] Disk II card: supported in slot 5 via '-s5 diskii' command line. + - use in conjunction with -s5d1 <pathname>. + - NB. No support via Configuration GUI for insert/ejecting images. +. [Change #737] Debugger: Changed 'cycles' to show the cycle delta since the step/breakpoint etc. + - NB. Since 1.29.3.0 this has been the absolute cumulative cycle count. +. [Bug #740] Debugger: gr/hgr/dgr/dhgr commands will honour the state of the MIXED mode. +. [Bug #733] Fixed WOZ 'Wasteland' and also NIB 'Wasteland'. +. [Bug #451] Debugger: fix for BPM[R|W] triggering on control-flow instructions' target address. +. [Bug #355] For first-time installs of AppleWin, soundtype now defaults to WAVE (was NONE). +. [PR #730] Speed-up for 'Color (RGB Monitor)' video mode. + + 1.29.6.0 - 18 Nov 2019 ---------------------- . [Bug #724] Fixed so that 6502 interrupt is delayed by 1 opcode when interrupt occurs on last cycle of opcode. diff --git a/help/CommandLine.html b/help/CommandLine.html index 831b7cf9..0eee1bc7 100644 --- a/help/CommandLine.html +++ b/help/CommandLine.html @@ -12,9 +12,15 @@ follows: </p> -d1 <pathname><br> - Start with a floppy disk in drive-1 (and auto power-on the Apple II)<br><br> + Start with a floppy disk in slot 6 drive-1 (and auto power-on the Apple II).<br> + NB. -s6d1 has the meaning same as -d1.<br><br> -d2 <pathname><br> - Start with a floppy disk in drive-2<br><br> + Start with a floppy disk in slot 6 drive-2.<br> + NB. -s6d2 has the meaning same as -d2.<br><br> + -s5d1 <pathname><br> + Start with a floppy disk in slot 5 drive-1 (must be used with '-s5 diskii').<br><br> + -s5d2 <pathname><br> + Start with a floppy disk in slot 5 drive-2 (must be used with '-s5 diskii').<br><br> -h1 <pathname><br> Start with hard disk 1 plugged-in (and auto power-on the Apple II). NB. Hard disk controller card gets enabled.<br><br> -h2 <pathname><br> @@ -35,6 +41,8 @@ Remove the SSC card from slot 2.<br><br> -s3 empty<br> Remove the Uthernet card from slot 3.<br><br> + -s5 diskii<br> + Insert a 2nd Disk II controller card into slot 5.<br><br> -s6 empty<br> Remove the Disk II controller card from slot 6.<br><br> -s7 empty<br> @@ -46,7 +54,7 @@ Emulate a RamWorks III card with 1 to 127 pages (each page is 64K, giving a max of 8MB) in the auxiliary slot in an Apple //e machine.<br><br> -load-state <savestate><br> Load a save-state file<br> - NB. This takes precedent over the -d1,d2,h1,h2,s0,s7 and -r switches.<br><br> + NB. This takes precedent over the -d1, -d2, -d#s#, -h1, -h2, s0-7, -model and -r switches.<br><br> -f<br> Start in full-screen mode<br><br> -fs-height=<best|nnnn><br> diff --git a/resource/version.h b/resource/version.h index 6a4218b6..76aaa5ea 100644 --- a/resource/version.h +++ b/resource/version.h @@ -1,4 +1,4 @@ -#define APPLEWIN_VERSION 1,29,6,0 +#define APPLEWIN_VERSION 1,29,7,0 #define xstr(a) str(a) #define str(a) #a diff --git a/source/SaveState.cpp b/source/SaveState.cpp index 0e88bc2f..e279f77b 100644 --- a/source/SaveState.cpp +++ b/source/SaveState.cpp @@ -455,7 +455,8 @@ static void Snapshot_LoadState_v2(void) SetMouseCardInstalled( g_CardMgr.IsMouseCardInstalled() ); DebugReset(); - DebugDisplay(TRUE); + if (g_nAppMode == MODE_DEBUG) + DebugDisplay(TRUE); } catch(std::string szMessage) {