mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Add PLATFORM_MODIFIER as alias for CMD/CTRL

Browse Source
This commit is contained in:
Marijn van der Werf
2016-01-13 11:06:25 +01:00
parent df9880247a
commit 138f0139c8
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/config.c
View File

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