mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- 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
This commit is contained in:
@@ -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:
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user