From 8da8548db23619e31853633c8686e49b5957861a Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 2 Jan 2012 10:20:44 +0000
Subject: [PATCH] - Bugfix: Hotkey 'ENTER' hiring screen fix to exclude
 conditions for dead mercs in AIM & MERC & when MERC accounts are suspended
 (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/AimMembers.cpp  |  15 +++++++++------
 Laptop/mercs Files.cpp | Bin 66834 -> 67750 bytes
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
index dbf17f1ce..eac6912b5 100644
--- a/Laptop/AimMembers.cpp
+++ b/Laptop/AimMembers.cpp
@@ -5057,14 +5057,17 @@ void HandleAimMemberKeyBoardInput()
 					gfRedrawScreen = TRUE;
 				break;
 				case ENTER:
-					// contact
-					if( !gubVideoConferencingMode)
+					// contact only if merc alive
+					if( !IsMercDead( gbCurrentSoldier ) )
 					{
-						gubVideoConferencingMode = AIM_VIDEO_POPUP_MODE;
-						//gubVideoConferencingMode = AIM_VIDEO_INIT_MODE;
-						gfFirstTimeInContactScreen = TRUE;
+						if( !gubVideoConferencingMode)
+						{
+							gubVideoConferencingMode = AIM_VIDEO_POPUP_MODE;
+							//gubVideoConferencingMode = AIM_VIDEO_INIT_MODE;
+							gfFirstTimeInContactScreen = TRUE;
+						}
+						InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
 					}
-					InitCreateDeleteAimPopUpBox(AIM_POPUP_DELETE, NULL, NULL, 0, 0, 0);
 				break;
 #ifdef JA2TESTVERSION
 				case SPACE:
diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index 5f4d0326237a12c375c180f7fc063e960cb6c4dc..9bafa65151c0e88c4f6d50f42f3d0b3656603abb 100644
GIT binary patch
delta 346
zcmbQ##j<Q7%Z7~K!D$Tn3`GnI40%9W0m{w<^2!(z8FCmh8B&0vxeTd5HOW9$B9Kf5
zswxGlC}Ge6ill(`fpnKJWB}FYF{Dp6{4T!vMdUTc$#ed58FDhfATI+KoDCAw2SRMx
z7yeV0R{$GU1hg3Bs63!kDuJv_hBUAva;8sYVicXctx9Ne-YmY!7QH-^FGM5&t&^Ip
zbX{n2LixVQ0e@H~2mM(x`O6=X$tNn}CL8=?nVk0b+*A?92JTu0xKk$QSGiC6&oX&S
z)x60IfHabFkkZK}HD*&!F!D^j#JFgB5hJ7BWS3g6sS_AkrvGAOT(^B06Qc$rGbcms
P<c0rax8GrAG-Ct+BH?D#

delta 177
zcmZ2Bk!4aB%Z7~KoC*vX44Di?45^bJeiELncAal>LixVQ8~(FQcKFUQdEft8lh6GV
zn!MpF%XB?v#uyM|vR37h$!orHP0o2;G+ly;QDpLmPb`zGs%$2k{S%vfqN;1U05c;C
zx;8eD^2xXUaZMLsVYHe2;2+EMAQr|sV8#~~MvListc*TjUIQ!RitSo#jB1S2WtbTG
LwimE7nlS<ZvWQBb