mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
- Queue patch (by tazpn)
o Cleanup saveload and laptop screen event queue processing git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5140 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
+1
-25
@@ -714,33 +714,9 @@ GetLaptopKeyboardInput()
|
|||||||
|
|
||||||
fTabHandled = FALSE;
|
fTabHandled = FALSE;
|
||||||
|
|
||||||
while (DequeueEvent(&InputEvent) == TRUE)
|
while (DequeueSpecificEvent(&InputEvent, KEY_DOWN|KEY_UP|KEY_REPEAT))
|
||||||
{
|
{
|
||||||
// HOOK INTO MOUSE HOOKS
|
|
||||||
switch(InputEvent.usEvent)
|
|
||||||
{
|
|
||||||
case LEFT_BUTTON_DOWN:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_DOWN, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case LEFT_BUTTON_UP:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_UP, (INT16)MousePos.x, (INT16)MousePos.y ,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_DOWN:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_DOWN, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_UP:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_UP, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_REPEAT:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_REPEAT, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case LEFT_BUTTON_REPEAT:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_REPEAT, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
HandleKeyBoardShortCutsForLapTop( InputEvent.usEvent, InputEvent.usParam, InputEvent.usKeyState );
|
HandleKeyBoardShortCutsForLapTop( InputEvent.usEvent, InputEvent.usParam, InputEvent.usKeyState );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-24
@@ -991,31 +991,8 @@ void GetSaveLoadScreenUserInput()
|
|||||||
|
|
||||||
fWasCtrlHeldDownLastFrame = gfKeyState[ CTRL ];
|
fWasCtrlHeldDownLastFrame = gfKeyState[ CTRL ];
|
||||||
|
|
||||||
while( DequeueEvent( &Event ) )
|
while (DequeueSpecificEvent(&Event, KEY_DOWN|KEY_UP|KEY_REPEAT))
|
||||||
{
|
{
|
||||||
// HOOK INTO MOUSE HOOKS
|
|
||||||
switch( Event.usEvent)
|
|
||||||
{
|
|
||||||
case LEFT_BUTTON_DOWN:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_DOWN, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case LEFT_BUTTON_UP:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_UP, (INT16)MousePos.x, (INT16)MousePos.y ,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_DOWN:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_DOWN, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_UP:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_UP, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case RIGHT_BUTTON_REPEAT:
|
|
||||||
MouseSystemHook(RIGHT_BUTTON_REPEAT, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
case LEFT_BUTTON_REPEAT:
|
|
||||||
MouseSystemHook(LEFT_BUTTON_REPEAT, (INT16)MousePos.x, (INT16)MousePos.y,_LeftButtonDown, _RightButtonDown);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !HandleTextInput( &Event ) && Event.usEvent == KEY_DOWN )
|
if( !HandleTextInput( &Event ) && Event.usEvent == KEY_DOWN )
|
||||||
{
|
{
|
||||||
switch( Event.usParam )
|
switch( Event.usParam )
|
||||||
|
|||||||
Reference in New Issue
Block a user