empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.26.1.1: Fix #382 - CTRL+RESET not re-init'ing correct 40/80 text rendering routine when in mixed mode

Browse source
This commit is contained in:
tomcw 2017-02-17 14:26:03 +00:00
parent decbb401f9
commit a6bfe4cfe9
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/History.txt
View file

@ -9,12 +9,15 @@ https://github.com/AppleWin/AppleWin/issues/new
Tom Charlesworth
1.26.1.0 - 11 Feb 2017
1.26.1.1 - 17 Feb 2017
----------------------
Fixes:
. [Bug #371] Flickery video when using GR from CP/M. (A regression at 1.26.0.x)
. [Bug #363] Debugger: Screen not updating when running in single-stepping debugger mode. (A regression at 1.26.0.x)
. Save-state: Fix for loading state when TEXT40 changes to TEXT80 or v.v.
. Save-state: Fix for loading state when TEXT40 changes to TEXT80 or vice versa
Fixes since 1.26.1.0 (11 Feb 2017):
. [Bug #382] Reset not resetting the 40/80-col text mode for mixed-mode NTSC rendering
1.26.0.6 - 16 Oct 2016

8
resource/Applewin.rc
View file

@ -251,8 +251,8 @@ DISK_ICON ICON "DISK.ICO"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,1,0
PRODUCTVERSION 1,26,1,0
FILEVERSION 1,26,1,1
PRODUCTVERSION 1,26,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -270,12 +270,12 @@ BEGIN
VALUE "Comments", "https://github.com/AppleWin"
VALUE "CompanyName", "AppleWin"
VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", "1, 26, 1, 0"
VALUE "FileVersion", "1, 26, 1, 1"
VALUE "InternalName", "APPLEWIN"
VALUE "LegalCopyright", " 1994-2017 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
VALUE "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", "1, 26, 1, 0"
VALUE "ProductVersion", "1, 26, 1, 1"
END
END
BLOCK "VarFileInfo"

4
source/Frame.cpp
View file

@ -2086,13 +2086,13 @@ void ResetMachineState ()
void CtrlReset()
{
// Ctrl+Reset - TODO: This is a terrible place for this code!
if (!IS_APPLE2)
if (!IS_APPLE2) // TODO: Why not for A][ & A][+ too?
MemResetPaging();
PravetsReset();
DiskReset();
KeybReset();
if (!IS_APPLE2)
if (!IS_APPLE2) // TODO: Why not for A][ & A][+ too?
VideoResetState(); // Switch Alternate char set off
sg_SSC.CommReset();
MB_Reset();

4
source/Video.cpp
View file

@ -1278,6 +1278,10 @@ void VideoResetState ()
{
g_nAltCharSetOffset = 0;
g_uVideoMode = VF_TEXT;
NTSC_SetVideoTextMode( 40 );
NTSC_SetVideoMode( g_uVideoMode );
g_VideoForceFullRedraw = 1;
}