#include "editor.h"
#include "files.h"
#include "tape.h"
-#include "joystick.h"
#include "network.h"
/* values for key_status */
int i;
KeyboardAutoRepeatOn();
- old_joystick_status = joystick_status;
- joystick_status = JOYSTICK_OFF;
+ old_joystick_status = joystick.status;
+ joystick.status = JOYSTICK_NOT_AVAILABLE;
/* simulate key release events for still pressed keys */
key_joystick_mapping = 0;
KeyboardAutoRepeatOff();
}
if (old_joystick_status != -1)
- joystick_status = old_joystick_status;
+ joystick.status = old_joystick_status;
}
}
}
/* allow quick escape to the main menu with the Escape key */
- if (key == KSYM_Escape && game_status != MAINMENU)
+ if (key == KSYM_Escape &&
+ game_status != MAINMENU && game_status != LEVELED)
{
- CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
game_status = MAINMENU;
DrawMainMenu();
return;
break;
case LEVELED:
- if (!anyTextGadgetActiveOrJustFinished)
+ if (!anyTextGadgetActiveOrJustFinished || key == KSYM_Escape)
HandleLevelEditorKeyInput(key);
break;