1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00

Use CMD for default shortcuts on OS X

This commit is contained in:
Marijn van der Werf
2016-01-12 22:59:29 +01:00
parent 623952d966
commit 2d53c28342

View File

@@ -894,6 +894,7 @@ void config_apply_to_old_addresses()
#define SHIFT 0x100
#define CTRL 0x200
#define ALT 0x400
#define CMD 0x800
// Current keyboard shortcuts
uint16 gShortcutKeys[SHORTCUT_COUNT];
@@ -932,19 +933,31 @@ static const uint16 _defaultShortcutKeys[SHORTCUT_COUNT] = {
SDL_SCANCODE_S, // SHORTCUT_SHOW_STAFF_LIST
SDL_SCANCODE_M, // SHORTCUT_SHOW_RECENT_MESSAGES
SDL_SCANCODE_TAB, // SHORTCUT_SHOW_MAP
#if defined(__APPLE__) && defined(__MACH__)
CMD | SDL_SCANCODE_S, // SHORTCUT_SCREENSHOT
#else
CTRL | SDL_SCANCODE_S, // SHORTCUT_SCREENSHOT
#endif
// New
SDL_SCANCODE_MINUS, // SHORTCUT_REDUCE_GAME_SPEED,
SDL_SCANCODE_EQUALS, // SHORTCUT_INCREASE_GAME_SPEED,
#if defined(__APPLE__) && defined(__MACH__)
CMD | ALT | SDL_SCANCODE_C, // SHORTCUT_OPEN_CHEAT_WINDOW,
#else
CTRL | ALT | SDL_SCANCODE_C, // SHORTCUT_OPEN_CHEAT_WINDOW,
#endif
SDL_SCANCODE_T, // SHORTCUT_REMOVE_TOP_BOTTOM_TOOLBAR_TOGGLE,
SDL_SCANCODE_UP, // SHORTCUT_SCROLL_MAP_UP
SDL_SCANCODE_LEFT, // SHORTCUT_SCROLL_MAP_LEFT
SDL_SCANCODE_DOWN, // SHORTCUT_SCROLL_MAP_DOWN
SDL_SCANCODE_RIGHT, // SHORTCUT_SCROLL_MAP_RIGHT
SDL_SCANCODE_C, // SHORTCUT_OPEN_CHAT_WINDOW
#if defined(__APPLE__) && defined(__MACH__)
CMD | SDL_SCANCODE_F10, // SHORTCUT_QUICK_SAVE_GAME
#else
CTRL | SDL_SCANCODE_F10, // SHORTCUT_QUICK_SAVE_GAME
#endif
};
#define SHORTCUT_FILE_VERSION 1