From f0edab9b486fd97c4c7dcf1f329d95e356cbc026 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 9 Feb 2009 19:23:10 +0000 Subject: [PATCH] Bugfix: Bug #137: Open IMP page in laptop and then close laptop using key ESC. You will see button for closing window on strategic map... if you press this button you will have CTD. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2588 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/IMP Begin Screen.cpp | 1 + Laptop/IMP HomePage.cpp | 1 + Laptop/laptop.h | 1 + 3 files changed, 3 insertions(+) diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index da2dafb7..84a53abc 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -512,6 +512,7 @@ void GetPlayerKeyBoardInputForIMPBeginScreen( void ) fNewCharInString = TRUE; break; case (( ESC )): + HandleLapTopESCKey(); // WANNE: Fix for proper closing of the IMP laptop page LeaveLapTopScreen( ); break; case (( TAB )): diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index e077e032..f29909fa 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -296,6 +296,7 @@ void GetPlayerKeyBoardInputForIMPHomePage( void ) } break; case (( ESC )): + HandleLapTopESCKey(); // WANNE: Fix for proper closing of the IMP laptop page LeaveLapTopScreen( ); break; default: diff --git a/Laptop/laptop.h b/Laptop/laptop.h index 159c42d9..b0898a47 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -40,6 +40,7 @@ BOOLEAN DoLapTopSystemMessageBox( UINT8 ubStyle, STR16 zString, UINT32 uiExitSc BOOLEAN RemoveBookMark( INT32 iBookId ); void CreateFileAndNewEmailIconFastHelpText( UINT32 uiHelpTextID, BOOLEAN fClearHelpText ); BOOLEAN InitLaptopAndLaptopScreens(); +void HandleLapTopESCKey( void ); // clear out all tempf iles from laptop void ClearOutTempLaptopFiles( void );