Merged from revision: 6989

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
+31
View File
@@ -15,6 +15,8 @@
#include "strategic.h"
#include "strategicmap.h"
#include "PostalService.h"
#include "input.h"
#include "english.h"
#endif
@@ -116,6 +118,7 @@ extern CPostalService gPostalService;
extern vector<PShipmentStruct> gShipmentTable;
extern UINT32 guiGoldArrowImages;
extern UINT32 guiBobbyROrderGrid;
void HandleBobbyRShipmentsKeyBoardInput();
//
// Function
//
@@ -275,6 +278,8 @@ void HandleBobbyRShipments()
RenderBobbyRShipments();
}
HandleBobbyRShipmentsKeyBoardInput();
}
void RenderBobbyRShipments()
@@ -599,3 +604,29 @@ INT32 CountNumberValidShipmentForTheShipmentsPage()
}
*/
void HandleBobbyRShipmentsKeyBoardInput()
{
InputAtom InputEvent;
BOOLEAN fCtrl, fAlt;
fCtrl = _KeyDown( CTRL );
fAlt = _KeyDown( ALT );
//while (DequeueSpecificEvent(&InputEvent, KEY_DOWN |KEY_REPEAT) == TRUE)
while (DequeueEvent(&InputEvent) == TRUE)
{
if( InputEvent.usEvent == KEY_DOWN )
{
switch (InputEvent.usParam)
{
case BACKSPACE:
case 'q':
guiCurrentLaptopMode = LAPTOP_MODE_BOBBY_R_MAILORDER;
break;
default:
HandleKeyBoardShortCutsForLapTop( InputEvent.usEvent, InputEvent.usParam, InputEvent.usKeyState );
break;
}
}
}
}