0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Second batch of renaming and sorting of the hotkey enumeration.

Browse source
This commit is contained in:
fendrin 2013-12-27 15:19:57 +01:00
parent c8f861cee4
commit 2cbeb506d1
6 changed files with 77 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/editor/editor_controller.cpp
View file

@ -346,9 +346,9 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
std::string dummy;
return context_manager_->modified_maps(dummy) > 1;
}
case HOTKEY_EDITOR_SWITCH_MAP:
case HOTKEY_EDITOR_MAP_SWITCH:
case HOTKEY_EDITOR_PLAYLIST:
case HOTKEY_EDITOR_CLOSE_MAP:
case HOTKEY_EDITOR_MAP_CLOSE:
return true;
case HOTKEY_EDITOR_MAP_REVERT:
return !context_manager_->get_map_context().get_filename().empty()
@ -377,33 +377,33 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
case HOTKEY_EDITOR_SELECTION_EXPORT:
case HOTKEY_EDITOR_AREA_SAVE:
case HOTKEY_EDITOR_CUT:
case HOTKEY_EDITOR_COPY:
case HOTKEY_EDITOR_SELECTION_CUT:
case HOTKEY_EDITOR_SELECTION_COPY:
case HOTKEY_EDITOR_SELECTION_FILL:
return !context_manager_->get_map().selection().empty()
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_PASTE);
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE);
case HOTKEY_EDITOR_SELECTION_RANDOMIZE:
return (context_manager_->get_map().selection().size() > 1
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_PASTE));
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE));
case HOTKEY_EDITOR_SELECTION_ROTATE:
case HOTKEY_EDITOR_SELECTION_FLIP:
case HOTKEY_EDITOR_SELECTION_GENERATE:
return false; //not implemented
case HOTKEY_EDITOR_PASTE:
case HOTKEY_EDITOR_CLIPBOARD_PASTE:
return !context_manager_->clipboard_empty();
case HOTKEY_EDITOR_CLIPBOARD_ROTATE_CW:
case HOTKEY_EDITOR_CLIPBOARD_ROTATE_CCW:
case HOTKEY_EDITOR_CLIPBOARD_FLIP_HORIZONTAL:
case HOTKEY_EDITOR_CLIPBOARD_FLIP_VERTICAL:
return !context_manager_->clipboard_empty()
&& toolkit_->is_mouse_action_set(HOTKEY_EDITOR_PASTE);
&& toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE);
case HOTKEY_EDITOR_SELECT_ALL:
case HOTKEY_EDITOR_SELECT_NONE:
return !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_PASTE);
return !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE);
case HOTKEY_EDITOR_SELECT_INVERSE:
return !context_manager_->get_map_context().get_map().selection().empty()
&& !context_manager_->get_map_context().get_map().everything_selected()
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_PASTE);
&& !toolkit_->is_mouse_action_set(HOTKEY_EDITOR_CLIPBOARD_PASTE);
case HOTKEY_EDITOR_MAP_RESIZE:
case HOTKEY_EDITOR_MAP_GENERATE:
case HOTKEY_EDITOR_MAP_APPLY_MASK:
@ -414,8 +414,8 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
case HOTKEY_EDITOR_PARTIAL_UPDATE_TRANSITIONS:
case HOTKEY_EDITOR_NO_UPDATE_TRANSITIONS:
case HOTKEY_EDITOR_REFRESH_IMAGE_CACHE:
case HOTKEY_MINIMAP_TERRAIN_CODING:
case HOTKEY_MINIMAP_UNIT_CODING:
case HOTKEY_MINIMAP_CODING_TERRAIN:
case HOTKEY_MINIMAP_CODING_UNIT:
case HOTKEY_MINIMAP_DRAW_UNITS:
case HOTKEY_MINIMAP_DRAW_TERRAIN:
case HOTKEY_MINIMAP_DRAW_VILLAGES:
@ -486,7 +486,7 @@ hotkey::ACTION_STATE editor_controller::get_action_state(hotkey::HOTKEY_COMMAND
case HOTKEY_EDITOR_TOOL_LABEL:
case HOTKEY_EDITOR_TOOL_PAINT:
case HOTKEY_EDITOR_TOOL_SELECT:
case HOTKEY_EDITOR_PASTE:
case HOTKEY_EDITOR_CLIPBOARD_PASTE:
case HOTKEY_EDITOR_TOOL_STARTING_POSITION:
case HOTKEY_EDITOR_TOOL_UNIT:
case HOTKEY_EDITOR_TOOL_VILLAGE:
@ -499,9 +499,9 @@ hotkey::ACTION_STATE editor_controller::get_action_state(hotkey::HOTKEY_COMMAND
case HOTKEY_MINIMAP_DRAW_VILLAGES:
return (preferences::minimap_draw_villages()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case HOTKEY_MINIMAP_UNIT_CODING:
case HOTKEY_MINIMAP_CODING_UNIT:
return (preferences::minimap_movement_coding()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case HOTKEY_MINIMAP_TERRAIN_CODING:
case HOTKEY_MINIMAP_CODING_TERRAIN:
return (preferences::minimap_terrain_coding()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case HOTKEY_MINIMAP_DRAW_UNITS:
return (preferences::minimap_draw_units()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
@ -747,7 +747,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
perform_delete(new editor_action_unit_delete(loc));
}
return true;
case HOTKEY_EDITOR_PASTE: //paste is somewhat different as it might be "one action then revert to previous mode"
case HOTKEY_EDITOR_CLIPBOARD_PASTE: //paste is somewhat different as it might be "one action then revert to previous mode"
toolkit_->hotkey_set_mouse_action(command);
return true;
@ -789,10 +789,10 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
toolkit_->set_brush("brush-sw-ne");
return true;
case HOTKEY_EDITOR_COPY:
case HOTKEY_EDITOR_SELECTION_COPY:
copy_selection();
return true;
case HOTKEY_EDITOR_CUT:
case HOTKEY_EDITOR_SELECTION_CUT:
cut_selection();
return true;
case HOTKEY_EDITOR_AREA_RENAME:
@ -833,7 +833,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
return true;
// map specific
case HOTKEY_EDITOR_CLOSE_MAP:
case HOTKEY_EDITOR_MAP_CLOSE:
context_manager_->close_current_context();
return true;
case HOTKEY_EDITOR_MAP_LOAD:

2
src/editor/toolkit/editor_toolkit.cpp
View file

@ -85,7 +85,7 @@ void editor_toolkit::init_mouse_actions(const config& game_config, context_manag
new mouse_action_unit(key_, *palette_manager_->unit_palette_.get())));
mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_TOOL_VILLAGE,
new mouse_action_village(key_, *palette_manager_->empty_palette_.get())));
mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_PASTE,
mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_CLIPBOARD_PASTE,
new mouse_action_paste(cmanager.get_clipboard(), key_, *palette_manager_->empty_palette_.get())));
mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_TOOL_ITEM,
new mouse_action_item(key_, *palette_manager_->item_palette_.get())));

4
src/hotkey/command_executor.cpp
View file

@ -587,11 +587,11 @@ void execute_command(display& disp, const hotkey_command& command, command_execu
preferences::toggle_minimap_draw_terrain();
disp.recalculate_minimap();
break;
case HOTKEY_MINIMAP_TERRAIN_CODING:
case HOTKEY_MINIMAP_CODING_TERRAIN:
preferences::toggle_minimap_terrain_coding();
disp.recalculate_minimap();
break;
case HOTKEY_MINIMAP_UNIT_CODING:
case HOTKEY_MINIMAP_CODING_UNIT:
preferences::toggle_minimap_movement_coding();
disp.recalculate_minimap();
break;

14
src/hotkey/hotkey_command.cpp
View file

@ -115,12 +115,12 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_WB_SUPPOSE_DEAD, "wbsupposedead", N_("whiteboard^Suppose Dead"), false, hotkey::SCOPE_GAME, "" },
{ hotkey::HOTKEY_EDITOR_QUIT_TO_DESKTOP, "editor-quit-to-desktop", N_("Quit to Desktop"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_CLOSE_MAP, "editor-close-map", N_("Close Map"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_MAP_CLOSE, "editor-close-map", N_("Close Map"), false, hotkey::SCOPE_EDITOR, "" },
// These are not really hotkey items but menu entries to get expanded.
// They need to have their own hotkey to control their active state.
{ hotkey::HOTKEY_EDITOR_PLAYLIST, "editor-playlist", N_("Switch Time of Day"), true, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_SWITCH_MAP, "editor-switch-map", N_("Switch Map"), true, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_MAP_SWITCH, "editor-switch-map", N_("Switch Map"), true, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_LOCAL_TIME, "menu-editor-local-time", N_("Assign Local Time"), true, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_CUSTOM_TODS, "editor-custom-tods", N_("Custom Time of Day Creator"), false, hotkey::SCOPE_EDITOR, "" },
@ -159,8 +159,8 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_EDITOR_UNIT_CHANGE_ID, "editor-change-unitid", N_("Change Unit ID"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_UNIT_TOGGLE_LOYAL, "editor-unit-toggle-loyal", N_("Loyal"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_MINIMAP_UNIT_CODING, "minimap-unit-coding", N_("Toggle Minimap Unit Coding"), false, hotkey::SCOPE_GENERAL, "" },
{ hotkey::HOTKEY_MINIMAP_TERRAIN_CODING, "minimap-terrain-coding", N_("Toggle Minimap Terrain Coding"), false, hotkey::SCOPE_GENERAL, "" },
{ hotkey::HOTKEY_MINIMAP_CODING_UNIT, "minimap-unit-coding", N_("Toggle Minimap Unit Coding"), false, hotkey::SCOPE_GENERAL, "" },
{ hotkey::HOTKEY_MINIMAP_CODING_TERRAIN, "minimap-terrain-coding", N_("Toggle Minimap Terrain Coding"), false, hotkey::SCOPE_GENERAL, "" },
{ hotkey::HOTKEY_MINIMAP_DRAW_UNITS, "minimap-draw-units", N_("Toggle Minimap Unit Drawing"), false, hotkey::SCOPE_GENERAL, "" },
{ hotkey::HOTKEY_MINIMAP_DRAW_VILLAGES, "minimap-draw-villages", N_("Toggle Minimap Village Drawing"), false, hotkey::SCOPE_GENERAL, "" },
@ -174,9 +174,9 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_EDITOR_BRUSH_NW_SE, "editor-brush-nw-se", N_("Brush NW-SE"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_BRUSH_SW_NE, "editor-brush-sw-ne", N_("Brush SW-NE"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_CUT, "editor-cut", N_("Cut"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_COPY, "editor-copy", N_("Copy"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_PASTE, "editor-paste", N_("Paste"), false, hotkey::SCOPE_EDITOR, N_("Left mouse button pastes from the clipboard, right brings up a context menu.") },
{ hotkey::HOTKEY_EDITOR_SELECTION_CUT, "editor-cut", N_("Cut"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_SELECTION_COPY, "editor-copy", N_("Copy"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_CLIPBOARD_PASTE, "editor-paste", N_("Paste"), false, hotkey::SCOPE_EDITOR, N_("Left mouse button pastes from the clipboard, right brings up a context menu.") },
{ hotkey::HOTKEY_EDITOR_SELECTION_EXPORT, "editor-export-selection-coords", N_("Export Selected Coordinates to System Clipboard"), true, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_SELECT_ALL, "editor-select-all", N_("Select All"), false, hotkey::SCOPE_EDITOR, "" },
{ hotkey::HOTKEY_EDITOR_SELECT_INVERSE, "editor-select-inverse", N_("Select Inverse"), false, hotkey::SCOPE_EDITOR, "" },

89
src/hotkey/hotkey_command.hpp
View file

@ -36,7 +36,7 @@ enum scope {
};
enum HOTKEY_COMMAND {
HOTKEY_CYCLE_UNITS,HOTKEY_CYCLE_BACK_UNITS,
HOTKEY_CYCLE_UNITS, HOTKEY_CYCLE_BACK_UNITS,
HOTKEY_UNIT_HOLD_POSITION,
HOTKEY_END_UNIT_TURN, HOTKEY_LEADER,
HOTKEY_UNDO, HOTKEY_REDO,
@ -63,32 +63,50 @@ enum HOTKEY_COMMAND {
// Controls
HOTKEY_SELECT_HEX, HOTKEY_DESELECT_HEX,
HOTKEY_MOVE_ACTION, HOTKEY_SELECT_AND_ACTION,
// Dialog control
HOTKEY_CANCEL, HOTKEY_OKAY,
// Whiteboard commands
HOTKEY_WB_TOGGLE,
HOTKEY_WB_EXECUTE_ACTION,
HOTKEY_WB_EXECUTE_ALL_ACTIONS,
HOTKEY_WB_EXECUTE_ACTION, HOTKEY_WB_EXECUTE_ALL_ACTIONS,
HOTKEY_WB_DELETE_ACTION,
HOTKEY_WB_BUMP_UP_ACTION,
HOTKEY_WB_BUMP_DOWN_ACTION,
HOTKEY_WB_BUMP_UP_ACTION, HOTKEY_WB_BUMP_DOWN_ACTION,
HOTKEY_WB_SUPPOSE_DEAD,
// Editor commands
// Misc.
HOTKEY_USER_CMD,
HOTKEY_CUSTOM_CMD,
HOTKEY_AI_FORMULA,
HOTKEY_CLEAR_MSG,
// Minimap
HOTKEY_MINIMAP_CODING_TERRAIN, HOTKEY_MINIMAP_CODING_UNIT,
HOTKEY_MINIMAP_DRAW_UNITS, HOTKEY_MINIMAP_DRAW_VILLAGES, HOTKEY_MINIMAP_DRAW_TERRAIN,
/* Gui2 specific hotkeys. */
TITLE_SCREEN__RELOAD_WML,
TITLE_SCREEN__NEXT_TIP,
TITLE_SCREEN__PREVIOUS_TIP,
TITLE_SCREEN__TUTORIAL,
TITLE_SCREEN__CAMPAIGN,
TITLE_SCREEN__MULTIPLAYER,
TITLE_SCREEN__ADDONS,
TITLE_SCREEN__EDITOR,
TITLE_SCREEN__CREDITS,
GLOBAL__HELPTIP,
HOTKEY_WML,
/* Editor commands */
HOTKEY_EDITOR_QUIT_TO_DESKTOP,
HOTKEY_EDITOR_CLOSE_MAP,
HOTKEY_EDITOR_SWITCH_MAP,
HOTKEY_EDITOR_SWITCH_,
HOTKEY_EDITOR_CUSTOM_TODS,
HOTKEY_EDITOR_PARTIAL_UNDO,
HOTKEY_EDITOR_SCENARIO_NEW,
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
HOTKEY_EDITOR_MAP_SAVE_AS, HOTKEY_EDITOR_MAP_SAVE_ALL,
HOTKEY_EDITOR_SCENARIO_SAVE_AS,
HOTKEY_EDITOR_MAP_REVERT, HOTKEY_EDITOR_MAP_INFO,
// Palette
HOTKEY_EDITOR_PALETTE_ITEM_SWAP,
HOTKEY_EDITOR_PALETTE_GROUPS, HOTKEY_EDITOR_PALETTE_UPSCROLL, HOTKEY_EDITOR_PALETTE_DOWNSCROLL,
HOTKEY_EDITOR_TOOL_NEXT,
HOTKEY_EDITOR_PLAYLIST,
HOTKEY_EDITOR_LOCAL_TIME,
@ -96,30 +114,35 @@ enum HOTKEY_COMMAND {
HOTKEY_EDITOR_UNIT_TOGGLE_CANRECRUIT, HOTKEY_EDITOR_UNIT_TOGGLE_RENAMEABLE,
HOTKEY_EDITOR_UNIT_CHANGE_ID, HOTKEY_EDITOR_UNIT_TOGGLE_LOYAL,
// HOTKEY_EDITOR_SWITCH_TIME,
// Brushes
HOTKEY_EDITOR_BRUSH_NEXT, HOTKEY_EDITOR_BRUSH_DEFAULT,
HOTKEY_EDITOR_BRUSH_1, HOTKEY_EDITOR_BRUSH_2, HOTKEY_EDITOR_BRUSH_3, HOTKEY_EDITOR_BRUSH_SW_NE, HOTKEY_EDITOR_BRUSH_NW_SE,
// Tools
HOTKEY_EDITOR_TOOL_NEXT,
HOTKEY_EDITOR_TOOL_PAINT, HOTKEY_EDITOR_TOOL_FILL,
HOTKEY_EDITOR_TOOL_SELECT, HOTKEY_EDITOR_TOOL_STARTING_POSITION, HOTKEY_EDITOR_TOOL_LABEL,
HOTKEY_EDITOR_TOOL_UNIT, HOTKEY_EDITOR_TOOL_VILLAGE, HOTKEY_EDITOR_TOOL_ITEM, HOTKEY_EDITOR_TOOL_SOUNDSOURCE,
// Select
HOTKEY_EDITOR_SELECT_ALL, HOTKEY_EDITOR_SELECT_INVERSE, HOTKEY_EDITOR_SELECT_NONE,
HOTKEY_EDITOR_CUT, HOTKEY_EDITOR_COPY, HOTKEY_EDITOR_PASTE,
// Clipboard
HOTKEY_EDITOR_CLIPBOARD_PASTE,
HOTKEY_EDITOR_CLIPBOARD_ROTATE_CW, HOTKEY_EDITOR_CLIPBOARD_ROTATE_CCW,
HOTKEY_EDITOR_CLIPBOARD_FLIP_HORIZONTAL, HOTKEY_EDITOR_CLIPBOARD_FLIP_VERTICAL,
// Selection
HOTKEY_EDITOR_SELECTION_CUT, HOTKEY_EDITOR_SELECTION_COPY,
HOTKEY_EDITOR_SELECTION_ROTATE, HOTKEY_EDITOR_SELECTION_FLIP,
HOTKEY_EDITOR_SELECTION_FILL,
HOTKEY_EDITOR_SELECTION_EXPORT,
HOTKEY_EDITOR_SELECTION_GENERATE, HOTKEY_EDITOR_SELECTION_RANDOMIZE,
// Map
HOTKEY_EDITOR_MAP_NEW, HOTKEY_EDITOR_MAP_LOAD, HOTKEY_EDITOR_MAP_SAVE,
HOTKEY_EDITOR_MAP_SAVE_AS, HOTKEY_EDITOR_MAP_SAVE_ALL,
HOTKEY_EDITOR_MAP_REVERT, HOTKEY_EDITOR_MAP_INFO,
HOTKEY_EDITOR_MAP_CLOSE,
HOTKEY_EDITOR_MAP_SWITCH,
HOTKEY_EDITOR_MAP_RESIZE, HOTKEY_EDITOR_MAP_ROTATE,
HOTKEY_EDITOR_MAP_GENERATE, HOTKEY_EDITOR_MAP_APPLY_MASK,
HOTKEY_EDITOR_MAP_CREATE_MASK_TO,
@ -148,34 +171,10 @@ enum HOTKEY_COMMAND {
// Scenario
HOTKEY_EDITOR_SCENARIO_EDIT,
HOTKEY_EDITOR_SCENARIO_NEW,
HOTKEY_EDITOR_SCENARIO_SAVE_AS,
// Misc.
HOTKEY_USER_CMD,
HOTKEY_CUSTOM_CMD,
HOTKEY_AI_FORMULA,
HOTKEY_CLEAR_MSG,
// Minimap
HOTKEY_MINIMAP_TERRAIN_CODING,
HOTKEY_MINIMAP_UNIT_CODING,
HOTKEY_MINIMAP_DRAW_UNITS,
HOTKEY_MINIMAP_DRAW_VILLAGES,
HOTKEY_MINIMAP_DRAW_TERRAIN,
/* Gui2 specific hotkeys. */
TITLE_SCREEN__RELOAD_WML,
TITLE_SCREEN__NEXT_TIP,
TITLE_SCREEN__PREVIOUS_TIP,
TITLE_SCREEN__TUTORIAL,
TITLE_SCREEN__CAMPAIGN,
TITLE_SCREEN__MULTIPLAYER,
TITLE_SCREEN__ADDONS,
TITLE_SCREEN__EDITOR,
TITLE_SCREEN__CREDITS,
GLOBAL__HELPTIP,
HOTKEY_WML,
/* This item must stay at the end since it is used as terminator for iterating. */
HOTKEY_NULL
};

8
src/play_controller.cpp
View file

@ -896,8 +896,8 @@ bool play_controller::can_execute_command(const hotkey::hotkey_command& cmd, int
case hotkey::HOTKEY_DESELECT_HEX:
case hotkey::HOTKEY_MOVE_ACTION:
case hotkey::HOTKEY_SELECT_AND_ACTION:
case hotkey::HOTKEY_MINIMAP_TERRAIN_CODING:
case hotkey::HOTKEY_MINIMAP_UNIT_CODING:
case hotkey::HOTKEY_MINIMAP_CODING_TERRAIN:
case hotkey::HOTKEY_MINIMAP_CODING_UNIT:
case hotkey::HOTKEY_MINIMAP_DRAW_UNITS:
case hotkey::HOTKEY_MINIMAP_DRAW_TERRAIN:
case hotkey::HOTKEY_MINIMAP_DRAW_VILLAGES:
@ -1313,9 +1313,9 @@ hotkey::ACTION_STATE play_controller::get_action_state(hotkey::HOTKEY_COMMAND co
case hotkey::HOTKEY_MINIMAP_DRAW_VILLAGES:
return (preferences::minimap_draw_villages()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case hotkey::HOTKEY_MINIMAP_UNIT_CODING:
case hotkey::HOTKEY_MINIMAP_CODING_UNIT:
return (preferences::minimap_movement_coding()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case hotkey::HOTKEY_MINIMAP_TERRAIN_CODING:
case hotkey::HOTKEY_MINIMAP_CODING_TERRAIN:
return (preferences::minimap_terrain_coding()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;
case hotkey::HOTKEY_MINIMAP_DRAW_UNITS:
return (preferences::minimap_draw_units()) ? hotkey::ACTION_ON : hotkey::ACTION_OFF;