The apple key works a shortcut modifier again (bug #10586).
Tested by BenUrban.
This commit is contained in:
parent
fc064a8519
commit
94a26c6aa4
3 changed files with 18 additions and 1 deletions
|
@ -1,6 +1,8 @@
|
|||
Version 1.3.13+svn:
|
||||
* language and i18n:
|
||||
* updated translations:
|
||||
* user interface
|
||||
* the apple key works a shortcut modifier again (bug #10586)
|
||||
|
||||
Version 1.3.13:
|
||||
* campaigns:
|
||||
|
|
|
@ -5,7 +5,8 @@ changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
|
|||
Version 1.3.13+svn:
|
||||
* Language and translations
|
||||
* Updated translations:
|
||||
|
||||
* User interface
|
||||
* The apple key works a shortcut modifier again.
|
||||
|
||||
Version 1.3.13:
|
||||
* Campaigns
|
||||
|
|
14
src/game.cpp
14
src/game.cpp
|
@ -417,8 +417,22 @@ bool game_controller::init_config()
|
|||
//everything.
|
||||
old_defines_map_.clear();
|
||||
|
||||
// Since the call to reset_game_cfg() is gone APPLE is no longer defined added
|
||||
// this work around, but it needs a review -- Mordante
|
||||
//reset_game_cfg();
|
||||
defines_map_.clear();
|
||||
|
||||
#if defined(__APPLE__)
|
||||
defines_map_["APPLE"] = preproc_define();
|
||||
#endif
|
||||
|
||||
#ifdef USE_TINY_GUI
|
||||
defines_map_["TINY"] = preproc_define();
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_PYTHON
|
||||
defines_map_["PYTHON"] = preproc_define();
|
||||
#endif
|
||||
game_config_.clear();
|
||||
read_game_cfg(defines_map_, game_config_, use_caching_);
|
||||
game_config::load_config(game_config_.child("game_config"));
|
||||
|
|
Loading…
Add table
Reference in a new issue