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 5f4d03262..9bafa6515 100644 Binary files a/Laptop/mercs Files.cpp and b/Laptop/mercs Files.cpp differ