From b53eec588d435db8b44d4d356472f8bc729cd695 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 6 Nov 2006 21:09:37 +0000
Subject: [PATCH] - reseted IMP activation text box after creating an IMP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp         |   4 ++--
 JA2.suo                 | Bin 197632 -> 197632 bytes
 JA2.vcproj              |   4 ++--
 Laptop/IMP Confirm.cpp  |   3 +++
 Laptop/IMP HomePage.cpp |  22 +++++++++++++++++++++-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index b50c0c20..8b0214f7 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION  
-	INT16		zVersionLabel[256]		= { L"Release v1.13.614" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.620" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.11.02" };
+INT8		czVersionNumber[16]	= { "Build 06.11.06" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.suo b/JA2.suo
index 4d3380e1408462e86968b80d3660f9c520f7bcd9..06ec7029cfbd2a3e658fa4cbe0fda9e12766b4a7 100644
GIT binary patch
delta 3377
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

delta 1936
zcma)7Yitx%6u#f=Y<JsEce~r&Qd$ZdsH9>cKrn(5T(Ab)EPW&eNv!liTLhQ3mQ~w=
zu!bMSM3dSHJsJ!t4QkW^l}%jY1F%|&Pzo5-f<=lkgg3?3s1T^<&J->DVv;j=?z!Lj
z&f}hYC%i=qZ_zrlmDmYFh&v-ABOZN;GRYdpv-HSI$}Kp2!^M{;;SemW3Wp<&YOV@3
z(rw>pNe~X!Nkg_9(Ovcos{|=}gSJU|JQBI7+2Ird5aJw<=UK+<E=N-A(s4pO$MTk(
z>3&Cp`bDx3`s=zkNeGLbIo60WF`LJ2Qh)AUFAr(bS%CGmA|z_~%_=?7nKD03<Ikn6
zTrGlPom9K|Rm8}ZhH@o;1*KXNJS{31Ckg7LDpKJr;XKm$Te95ELmze*Xr58Uf67o&
zfu8M|83RQKo6v72<!TA{VXTR)Q1u4SdL-$8dh+zA+Ggn?Z-J)X2aF7RHN`3mekX#d
zx6q#IXrJb8&s6lmR4t;-4?2`~HPV=ySEfo(r00{}DO}uQePQ=vUF}ZQ7j)P2e4m_e
z^`lg;J3d$6c-x^5_$Edwz8kP;GHlnVSGhNO=y1Lf&hX*m8gGS=p-PZkj0_*q=3uS9
zqua}@8zd|FfzN4C2LjYN9S*(uMU{GYVK(J<U|FkzENs=MmrudwXrTfN9+F}H%#?jB
zr&vz2{KC@Da)#wsmOF2kHBnm!wnNa3gP0QSQZdIuJFh9p<e!Tc>C;0i9!5Jg?@@Z9
zJ$4MBRl_s(c(%S9Y&4|dO;AfLiav{n0_u%LN;K7hmN+W)KqWO50qmf{RP2f?=kAkF
zIa;gGO4kyRO9S5{Ioh9!7?u1#DD??fc|+wR$0}Or#2E>hnXqTnR*ovcYwD9}uwTiF
zR!_o$SjzO`Z`wH?#nkLXHswBos_4hl@BygvFiPp8+eqPBub1b7A33^d)@mk_nMQYK
z;e4ZB_iZMf>_W25YNELM^Y%^)BiiyIs#OZ7bI8|bv5U4x;g0UxjrZcIYd`8q*^5K^
zAM+>BS68@p`Iq6g`NR_L?`ra$M-UGB^dctm2G(A|S!3Pm6AMKS&FsOmbaW6-I8Dd~
z6Oz@0%rqaLof`3~s5YrYrSORyo>hq&3J>9VIyQ&|B$|eu(SZTXLwbO{mh+h^V`&iC
zJcd{nv8)r7(rkvSn5QorhqOWzbEXflL5eb_CX2av4`9=UF*ft4r4WAd_2DtvWLIM0
zGQ(a(;Xa&l=5UmiVl5|F#8KDM{x4BNXNNdFw~1R})Wuc6SydX@gxDg;89mvAbh>yG
zB}g)m${Oes`va771Mkr9GvM|XFiu`UlE0G67h*4qX?u)PMrVe&@*dMehgraQSsO`S
z!<)A!3FGLEAr#SpOB{<=A}8y<{#=9JRU=+u#yar=zsvYO^HJ$ll+hEn7@KUc(yAZP
zVOzzk?3->BFvYQ6ZlL_@h-GS{D?F{eSWf=0kpfWR6-=hTuHq-zV^gK?Wpwl(j#4qf
zexqJCdF|GUAO#1plJfgtH;Za90;J7-Y=7{5WXZxTi#uW22L6wXjHqMi4^F>JpL3n*
zt!B8E(>QH(H*t5n?=z1vF_$mlH_CItN9zZ<GOvxWxy@KoGN6Yq1gP*N8f`^flzI^w
z)8cjmgwZX}zqfd@HG_yXAq!-dhp71*Xtw3t{Q*%zCpPmA-<waIiJoKB#A*P?xQjPq
r%7)%{GJp;8uO{!!3_5TG%jGR<D;9a8Ks@#TVQR{_fM~`Ar9bUoe_D2K

diff --git a/JA2.vcproj b/JA2.vcproj
index 0114d6ab..1538560e 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_609.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_620.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_614.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_620.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp
index da1af34a..ac21fe3d 100644
--- a/Laptop/IMP Confirm.cpp	
+++ b/Laptop/IMP Confirm.cpp	
@@ -811,6 +811,9 @@ BOOLEAN LoadImpCharacter( STR nickName )
 	}
 	else
 	{
+		// close file
+		FileClose(hFile);
+
 		// You cannot have more than 3 I.M.P characters with the same gender on your team.
 		DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 9 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
 		return FALSE;
diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp
index eb62a09c..6a8fbeaf 100644
--- a/Laptop/IMP HomePage.cpp	
+++ b/Laptop/IMP HomePage.cpp	
@@ -48,6 +48,8 @@ INT32 GlowColorsList[][3] ={
 // btn callbacks
 void BtnIMPAboutUsCallback(GUI_BUTTON *btn,INT32 reason);
 
+void ResetActivationStringTextBox(void);
+
 // position defines
 #define IMP_PLAYER_ACTIVATION_STRING_X LAPTOP_SCREEN_UL_X + 261
 #define IMP_PLAYER_ACTIVATION_STRING_Y LAPTOP_SCREEN_WEB_UL_Y + 336
@@ -306,7 +308,6 @@ void HandleTextEvent( UINT32 uiKey )
 {
    // this function checks to see if a letter or a backspace was pressed, if so, either put char to screen
 	 // or delete it
-
   switch( uiKey )
 	{
 	  case ( BACKSPACE ): 
@@ -430,6 +431,9 @@ void ProcessPlayerInputActivationString( void )
 		{
 			if (LoadImpCharacter( IMP_MERC_FILENAME ) == TRUE)
 			{
+				// Reset activation text box
+				ResetActivationStringTextBox();
+
 				//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
 				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId );
 			}
@@ -453,6 +457,9 @@ void ProcessPlayerInputActivationString( void )
 		{
 			if (LoadImpCharacter( charPlayerActivationString ) == TRUE)
 			{
+				// Reset activation text box
+				ResetActivationStringTextBox();
+				
 				//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
 				AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId );
 			}
@@ -477,7 +484,20 @@ void ProcessPlayerInputActivationString( void )
 	return;
 }
 
+void ResetActivationStringTextBox(void)
+{
+	// Reset activation text box
+	for (int i = 0; i < iStringPos; i++)
+	{
+		pPlayerActivationString[i] = 0;
+	}
 
+	iStringPos = 0;
+	
+	uiCursorPosition = StringPixLength( pPlayerActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
+	DisplayPlayerActivationString();
+	DisplayActivationStringCursor();
+}
 
 void CreateIMPHomePageButtons( void )
 {