1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Hotkey 'ENTER' hiring screen fix to exclude conditions for dead mercs in AIM & MERC & when MERC accounts are suspended (by Buggler)

Browse Source 
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:
Wanne
2012-01-02 10:20:44 +00:00
parent 1e1363c6ad
commit 8da8548db2
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+9 -6
View File
@@ -5057,14 +5057,17 @@ void HandleAimMemberKeyBoardInput()
gfRedrawScreen = TRUE; gfRedrawScreen = TRUE;
break; break;
case ENTER: case ENTER:
// contact // contact only if merc alive
if( !gubVideoConferencingMode) if( !IsMercDead( gbCurrentSoldier ) )
{ {
gubVideoConferencingMode = AIM_VIDEO_POPUP_MODE; if( !gubVideoConferencingMode)
//gubVideoConferencingMode = AIM_VIDEO_INIT_MODE; {
gfFirstTimeInContactScreen = TRUE; 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; break;
#ifdef JA2TESTVERSION #ifdef JA2TESTVERSION
case SPACE: case SPACE:
Laptop/mercs Files.cpp
BIN
View File
Binary file not shown.