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

made hotkeys work again

Browse source
This commit is contained in:
uid68803 2003-12-29 17:38:01 +00:00
parent fbbf7a44ad
commit f23f61511c
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/editor/editor.cpp
View file

@ -77,8 +77,9 @@ int main(int argc, char** argv)
display::unit_map u_map;
config dummy_cfg("");
config dummy_theme;
display disp(u_map,video,gamemap(dummy_cfg,"1"),gamestatus(dummy_cfg,0),
std::vector<team>());
std::vector<team>(), dummy_theme);
std::vector<std::string> files;
get_files_in_dir(path,&files);
@ -120,8 +121,9 @@ int main(int argc, char** argv)
gamestatus status(cfg,0);
std::vector<team> teams;
config dummy_theme;
std::map<gamemap::location,unit> units;
display gui(units,video,map,status,teams);
display gui(units,video,map,status,teams,dummy_theme);
std::vector<std::string> terrain_names;
const std::vector<gamemap::TERRAIN> terrains = map.get_terrain_precedence();

2
src/hotkeys.cpp
View file

@ -182,7 +182,7 @@ void save_hotkeys(config& cfg)
config* item = cfg.find_child("hotkey","command",action_name);
if(item == NULL)
item = &cfg.add_child("command");
item = &cfg.add_child("hotkey");
(*item)["command"] = action_name;
(*item)["key"] = i->keycode;

2
src/hotkeys.hpp
View file

@ -53,8 +53,6 @@ struct hotkey_item {
//[/hotkey]
//where 'cmd' is a command name, and 'k' is a key. see hotkeys.cpp for the
//valid command names.
void add_hotkeys(config& cfg);
void add_hotkeys(config& cfg, bool overwrite);
void change_hotkey(hotkey_item& item);