1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 6989

Browse Source 
Bugfix (by Buggler)
- Fixed incorrect shipping costs in BobbyR Shipment page
- Duplicate laptop webpage hotkeys (e -> Enter, q -> BACKSPACE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-02-27 15:46:37 +00:00
parent 9e393cd5e3
commit 8a9857c26e
9 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+2
View File
@@ -5198,6 +5198,7 @@ void HandleAimMemberKeyBoardInput()
gfRedrawScreen = TRUE;
break;
case ENTER:
case 'e':
// contact only if merc alive & no popup box
if( !IsMercDead( gbCurrentSoldier ) && gubPopUpBoxAction != AIM_POPUP_DISPLAY )
{
@@ -5211,6 +5212,7 @@ void HandleAimMemberKeyBoardInput()
}
break;
case BACKSPACE:
case 'q':
if( gubPopUpBoxAction != AIM_POPUP_DISPLAY )
{
if( gubVideoConferencingMode != AIM_VIDEO_NOT_DISPLAYED_MODE )