From 2d53c283423155ce79f75adeefe743d582a7d014 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 12 Jan 2016 22:59:29 +0100 Subject: [PATCH] Use CMD for default shortcuts on OS X --- src/config.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/config.c b/src/config.c index 0dc2392771..02c8729e2c 100644 --- a/src/config.c +++ b/src/config.c @@ -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