From 22d27976037411c844fb055fea13d2a91c1d3089 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 16 Sep 2006 07:44:38 +0000
Subject: [PATCH] Auto save: Externalized the auto save feature (see
 GameSettings.cpp). No more need to create a file named "AutoSave.pls" in your
 JA2 root directory. But there is one bug in the game: The game always crashes
 after loading a "normal" savegame after an auto savegame was loaded. The
 error occurs, because the game tries to remove a mouse region that does not
 exists. I could not fix the bug, so I did not make an entry for auto save in
 the ja2_options.ini. Auto save is always false in the game, until this bug is
 fixed.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp       |  13 ++++++++++---
 GameSettings.h         |   2 ++
 JA2.suo                | Bin 100352 -> 102400 bytes
 SaveLoadScreen.cpp     |   7 +++----
 Tactical/Handle UI.cpp |   6 +++++-
 Utils/message.cpp      |  14 +++++++-------
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index 5fbbe525..6ab331ec 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -467,10 +467,17 @@ void LoadGameExternalOptions()
 	// WANNE: Drop Items
 	gGameExternalOptions.ubEnemiesItemDrop					= iniReader.ReadInteger("JA2 Gameplay Settings","ENEMIES_ITEM_DROP", 0);
 
+	// WANNE: Auto save: I did not set USE_AUTO_SAVE in the ja2_options.ini, because
+	// the game always crashes after a "normal" savegame is loaded after loading an autosave
+	// So for now USE_AUTO_SAVE is always false.
+	// The game crashes when removing mouse region that are not set
+	// After we fix that bug, we can make the entry USE_AUTO_SAVE in the ja2_options.ini
+	gGameExternalOptions.gfUseAutoSave						= iniReader.ReadBoolean("JA2 Gameplay Settings","USE_AUTO_SAVE",FALSE);
+
 	// Militia settings
-	gGameExternalOptions.gfAllowMilitiaGroups				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",0);
-	gGameExternalOptions.gfAllowReinforcements				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",0);
-	gGameExternalOptions.gfAllowReinforcementsOnlyInCity	= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",0);
+	gGameExternalOptions.gfAllowMilitiaGroups				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",FALSE);
+	gGameExternalOptions.gfAllowReinforcements				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",FALSE);
+	gGameExternalOptions.gfAllowReinforcementsOnlyInCity	= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",FALSE);
 	gGameExternalOptions.guiBaseQueenPoolIncrement			= iniReader.ReadInteger("JA2 Gameplay Settings","QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL",60);
 	
 	gGameExternalOptions.guiCreateEachNHours				= iniReader.ReadInteger("JA2 Gameplay Settings","CREATE_EACH_N_HOURS",24);
diff --git a/GameSettings.h b/GameSettings.h
index b4a46bf2..65c96224 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -309,6 +309,8 @@ typedef struct
 	// WANNE
 	INT32 ubEnemiesItemDrop;
 
+	BOOLEAN gfUseAutoSave;
+
 	//Merc Assignment settings
 	INT32 ubAssignmentUnitsPerDay;
 	INT32 ubMinutesForAssignmentToCount;
diff --git a/JA2.suo b/JA2.suo
index 1e3ba24dd8af935395e5f623c43a6cf5e827935f..116de0a15e0c94aa2a6e5b94d25af7acff975309 100644
GIT binary patch
delta 1741
zcmcJPUrbw79LImZ+e=$mxfEJxVViEt!s<F2{uC0BE$yIYFgC~jn1#ipwO~bSA$3_8
z>qcEnUE&LJG{^X0T;iL$fH#pnEp86ni!qw`pbty-WMY;WqEUlN{hnJkz&}eg*=;`e
zob&sg{?6~;x%p{({$2ZQS~sS<ynV@U7THEb`B%+JeUbI88j;y+&ufo6Aq{~P9itIS
zgCw2Cdl>5kox$uVNYN;bQHD-od>XqAkTr|W&oq&)=$dg&XdxDpt_#|w^X9V4$u1i)
zV~_O+!>B7?!18OLi)zCoBF0%gSVtsY7PaClW4AY`EDqqrahyJeH&IY*ukv>XU6`JL
za1_qHq{KCN9mh`P=P2F@C?Hk_VsLxZGLTgwbGT|+w>uE4PZ!Ic3w+W%>y@?<CnR>T
zQY;oLF_wc0unD+;k{cMSfE!eU8sGt5Pz&mS5BNbnXaJkR7NGvWGM9LbKWdn0*1mO`
zll?=9U>P*OAOpVwwPP9MZ{T<EhmwIJAdST3>-DDpgX2eSQHq&kD}5SYm3NpQm9t^q
zBfme$p*K%+L}m)SQ^Xf`aIU1yS8?EDjdia56n1U`b<hIFMKymt@tur&*(={--XY@-
z)@3(yL4KlhWNNL*2nM^e>&o6l`%wH5nm}$>i@#3$e;OzNI~!U~PL=U>d4qYMY>sl5
z?9$;_cZ8j?UuXCINaZ_reuk4WVQ`NeDrf)vkduF|=CS#~2Hx5}f9VKMhUF1A2RJPU
z+xTEhsfh>BR0*r8lU8ISh$n>R8Mj*P4oagQHExqF)hzfu_3uMgsykx{Jc)o+Z<g-C
z0T|1`TpH^P0$DQ^D_KG-5*?Ovn>bjx)}~SFlS>8m$!8t>wwS&dmRB5z6=n3k_-|M4
zpQ|x$MR5j)G=jg@>YjFE-BvwQgWx@$NLlHQ4qI{`b=tn*3bbIcQ6trc>Y06EuXZcF
zS5s?;x`}ui_#CxSD@CQ-&Cjh*RL6fw)ZNuH?y_{JI3wegJS^g6UU{*=ugEtF5Fsy(
zO!8ELcZs>5V!j;pQxqqM@Lf`+%c7{yQ%)|0_{piKP@pWn5Tyd$D@cxVbdGwd83k#<
zpWCU2I;e^EBZPM9#4HR=7`i5`_Cwc<SsQ*GmcA9o^{8M$E1gI9Ev;=~T>Z6l?XuFf
z*~-n|^QF-i7Wp3s9^`y#>S4IK!O6e_Yigrj7TcZ}z<1=!UiPTV_Xy@o7daI_L4Ehz
j`(d~#2Az-jXLKS7>a8pieg1y9=7(z^-i9(TvpfGM_f}uA

delta 788
zcmaJ<&ref95dP-%@d_3mR4NwY4?@%fRYNhL{4zjP0#U4r7i<jlM@+T!)fS9^fpWow
z6LAyv;sMVZLwJdJGLQ&*Gcob(pWsbR#Xe_SqMY31+nJr2oqRjr=2nf|vay!b&Co+v
z_x6_^aslXFuxIog(hH8`*q4l))}?c_n{f|=m_!^C2qA$e9$*S-T;oWJy|eqW7Az!j
z3rX84|Dbi;$2eLMMwY`<$ne!T8hN)6V=s(Sz7dZQ<TgQ^<5+|%6T<OKYwHj*m2;Xl
zYv(J=sS+Rp2J01sY1UP&GPRcsukf0+qSu_(J#~Os5QoHPv-zaQ<lI$ekY@50?|_G!
z;5Hu<%rdJ2qNds(@El}!ge#-PRFu7>N~#8znQEfgAfrNdta@2DcA1D9B40a4x;^ca
zE-Kh`>Km;$JZ{m3-1f}S=y*WQ@dp?FWGFw+_7~&#-nqcmVL*d;u~l#TUya;!#nEM3
zg+Yx4c_O~PACO}{^2rsQnq+Q?blIuXqP**-BQk7I(;JO+5^4XgZ0Vy;`PSg%rcS-{
z7Bg1wYh?UiJ>VGEq;Z{*<}sy;s!rkzF7mrmEDhi*R{Z+|C6zh2Z)GvS0w;J{!?5Ih
z8Ewf;gZ!d<`-*(-rbvHTsW?_Nhtc8sL<e{P&T$Ru_o=mZr$_r3?$Ojx+)64QO^9as
z3kA^{#mXYRlM$2p<!A-@H%80pyO$<5ZZy!*wyM{AO_V*oF+NOB+vHdk#r|&XGGkD?
YOfAv{CUrvAEYYO8Bl-g8pEYm(0WYYxXaE2J

diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp
index 3c5c2fc1..e553e225 100644
--- a/SaveLoadScreen.cpp
+++ b/SaveLoadScreen.cpp
@@ -714,7 +714,6 @@ void			ExitSaveLoadScreen()
 {
 	INT8	i;
 
-
 	gfLoadGameUponEntry = FALSE;
 
 	if( !gfSaveLoadScreenButtonsCreated )
@@ -738,7 +737,7 @@ void			ExitSaveLoadScreen()
 
 	for(i=0; i<NUM_SAVE_GAMES; i++)
 	{
-	  MSYS_RemoveRegion( &gSelectedSaveRegion[i]);
+		MSYS_RemoveRegion( &gSelectedSaveRegion[i]);
 	}
 
 	DeleteVideoObjectFromIndex( guiSlgBackGroundImage );
@@ -847,14 +846,14 @@ void		GetSaveLoadScreenUserInput()
 	}
 
 
-	if( gfKeyState[ ALT ] )
+	/*if( gfKeyState[ ALT ] )
 	{
 		DisplayOnScreenNumber( FALSE );
 	}
 	else
 	{
 		DisplayOnScreenNumber( TRUE );
-	}
+	}*/
 
 	if( gfKeyState[ CTRL ] || fWasCtrlHeldDownLastFrame )
 	{
diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp
index 34ad800a..a7d1da6d 100644
--- a/Tactical/Handle UI.cpp	
+++ b/Tactical/Handle UI.cpp	
@@ -1172,7 +1172,11 @@ UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent )
 	}
 	else
 	{
-		if( FileExists( "..\\AutoSave.pls" ) && CanGameBeSaved() )
+		// WANNE: Changed the auto save depending from AutoSave.pls
+		// to an option setting.
+		// So no more need to have a file AutoSave.pls in you ja2 root directory
+		//if( FileExists( "..\\AutoSave.pls" ) && CanGameBeSaved() )
+		if (gGameExternalOptions.gfUseAutoSave == TRUE && CanGameBeSaved() )
 		{
 			//Save the game
 			guiPreviousOptionScreen = guiCurrentScreen;
diff --git a/Utils/message.cpp b/Utils/message.cpp
index 3ba15fff..67f78d44 100644
--- a/Utils/message.cpp
+++ b/Utils/message.cpp
@@ -573,8 +573,8 @@ void UnHideMessagesDuringNPCDialogue( void )
 
 void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...)
 {
-	__try
-	{
+	//__try
+	//{
 		wchar_t	DestString[512];
 		va_list argptr;
 
@@ -648,11 +648,11 @@ void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...)
 		}
 
 		return;
-	}
-	__except(filter(GetExceptionCode(), GetExceptionInformation()))
-	{
-		return;
-	}
+	//}
+	//__except(filter(GetExceptionCode(), GetExceptionInformation()))
+	//{
+	//	return;
+	//}
 }
 
 void ClearWrappedStrings( WRAPPED_STRING *pStringWrapperHead )