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

Fix #2681: minimap buttons don't do anything

Browse source 
Regression from commit ecc0dca665.
This commit is contained in:
Jyrki Vesterinen 2018-03-18 16:46:47 +02:00
parent b6702d616f
commit 5fa0581bc0
3 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.md
View file

@ -1,4 +1,6 @@
## Version 1.13.12+dev
### Miscellaneous and bug fixes
* Fixed minimap buttons not doing anything (bug #2681)
## Version 1.13.12
### Security fixes

3
players_changelog.md
View file

@ -3,7 +3,8 @@ changes may be omitted). For a complete list of changes, see the main
changelog: https://github.com/wesnoth/wesnoth/blob/1.14/changelog.md
## Version 1.13.13+dev
### Miscellaneous and bug fixes
* Fixed minimap buttons not doing anything (bug #2681)
## Version 1.13.12
### Security fixes

41
src/hotkey/command_executor.cpp
View file

@ -357,6 +357,26 @@ bool command_executor::do_execute_command(const hotkey_command& cmd, int /*inde
case HOTKEY_SURRENDER:
surrender_game();
break;
case HOTKEY_MINIMAP_DRAW_TERRAIN:
preferences::toggle_minimap_draw_terrain();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_CODING_TERRAIN:
preferences::toggle_minimap_terrain_coding();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_CODING_UNIT:
preferences::toggle_minimap_movement_coding();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_DRAW_UNITS:
preferences::toggle_minimap_draw_units();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_DRAW_VILLAGES:
preferences::toggle_minimap_draw_villages();
recalculate_minimap();
break;
default:
return false;
}
@ -571,27 +591,6 @@ void command_executor::execute_command(const SDL_Event& event, int index)
}
switch (command.id) {
case HOTKEY_MINIMAP_DRAW_TERRAIN:
preferences::toggle_minimap_draw_terrain();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_CODING_TERRAIN:
preferences::toggle_minimap_terrain_coding();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_CODING_UNIT:
preferences::toggle_minimap_movement_coding();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_DRAW_UNITS:
preferences::toggle_minimap_draw_units();
recalculate_minimap();
break;
case HOTKEY_MINIMAP_DRAW_VILLAGES:
preferences::toggle_minimap_draw_villages();
recalculate_minimap();
break;
case HOTKEY_FULLSCREEN:
CVideo::get_singleton().toggle_fullscreen();
break;