|
@@ -483,26 +483,28 @@ void OpenRaider::run() {
|
483
|
483
|
void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
|
484
|
484
|
if ((keyBindings[menu] == key) && pressed) {
|
485
|
485
|
mMenu->setVisible(!mMenu->isVisible());
|
486
|
|
- }
|
487
|
|
-
|
488
|
|
- if (keyBindings[console] == key) {
|
|
486
|
+ } else if (!mMenu->isVisible()) {
|
|
487
|
+ if (keyBindings[console] == key) {
|
489
|
488
|
|
490
|
|
- } else if (keyBindings[forward] == key) {
|
|
489
|
+ } else if (keyBindings[forward] == key) {
|
491
|
490
|
|
492
|
|
- } else if (keyBindings[backward] == key) {
|
|
491
|
+ } else if (keyBindings[backward] == key) {
|
493
|
492
|
|
494
|
|
- } else if (keyBindings[left] == key) {
|
|
493
|
+ } else if (keyBindings[left] == key) {
|
495
|
494
|
|
496
|
|
- } else if (keyBindings[right] == key) {
|
|
495
|
+ } else if (keyBindings[right] == key) {
|
497
|
496
|
|
498
|
|
- } else if (keyBindings[jump] == key) {
|
|
497
|
+ } else if (keyBindings[jump] == key) {
|
499
|
498
|
|
500
|
|
- } else if (keyBindings[crouch] == key) {
|
|
499
|
+ } else if (keyBindings[crouch] == key) {
|
501
|
500
|
|
502
|
|
- } else if (keyBindings[use] == key) {
|
|
501
|
+ } else if (keyBindings[use] == key) {
|
503
|
502
|
|
504
|
|
- } else if (keyBindings[holster] == key) {
|
|
503
|
+ } else if (keyBindings[holster] == key) {
|
505
|
504
|
|
|
505
|
+ }
|
|
506
|
+ } else {
|
|
507
|
+ mMenu->handleKeyboard(key, pressed);
|
506
|
508
|
}
|
507
|
509
|
}
|
508
|
510
|
|