Changeset - r15423:017c9c6c9204
[Not reviewed]
master
0 1 0
yexo - 14 years ago 2010-07-04 12:06:33
yexo@openttd.org
(svn r20076) -Fix (r20073): hotkeys for the road toolbar were not stored in hotkeys.cfg
1 file changed with 6 insertions and 4 deletions:
0 comments (0 inline, 0 general)
src/hotkeys.cpp
Show inline comments
 
@@ -235,20 +235,21 @@ void SaveLoadHotkeyGroup(IniGroup *group
 
	} else {
 
		LoadHotkeyGroup(group, hotkey_list);
 
	}
 
}
 

	
 
struct MainWindow;
 
struct MainToolbarWindow;
 
struct ScenarioEditorToolbarWindow;
 
struct TerraformToolbarWindow;
 
struct ScenarioEditorLandscapeGenerationWindow;
 
struct OrdersWindow;
 
struct BuildAirToolbarWindow;
 
struct BuildDocksToolbarWindow;
 
struct MainToolbarWindow;
 
struct ScenarioEditorToolbarWindow;
 
struct BuildRailToolbarWindow;
 
struct BuildRoadToolbarWindow;
 

	
 
static void SaveLoadHotkeys(bool save)
 
{
 
	IniFile *ini = new IniFile();
 
	ini->LoadFromDisk(_hotkeys_file);
 

	
 
@@ -257,20 +258,21 @@ static void SaveLoadHotkeys(bool save)
 
#define SL_HOTKEYS(name, window_name) \
 
	extern Hotkey<window_name> *_##name##_hotkeys;\
 
	group = ini->GetGroup(#name);\
 
	SaveLoadHotkeyGroup(group, _##name##_hotkeys, save);
 

	
 
	SL_HOTKEYS(global, MainWindow);
 
	SL_HOTKEYS(maintoolbar, MainToolbarWindow);
 
	SL_HOTKEYS(scenedit_maintoolbar, ScenarioEditorToolbarWindow);
 
	SL_HOTKEYS(terraform, TerraformToolbarWindow);
 
	SL_HOTKEYS(terraform_editor, ScenarioEditorLandscapeGenerationWindow);
 
	SL_HOTKEYS(order, OrdersWindow);
 
	SL_HOTKEYS(airtoolbar, BuildAirToolbarWindow);
 
	SL_HOTKEYS(dockstoolbar, BuildDocksToolbarWindow);
 
	SL_HOTKEYS(maintoolbar, MainToolbarWindow);
 
	SL_HOTKEYS(railtoolbar, BuildRailToolbarWindow);
 
	SL_HOTKEYS(scenedit_maintoolbar, ScenarioEditorToolbarWindow);
 
	SL_HOTKEYS(roadtoolbar, BuildRoadToolbarWindow);
 

	
 

	
 
#undef SL_HOTKEYS
 
	if (save) ini->SaveToDisk(_hotkeys_file);
 
	delete ini;
 
}
0 comments (0 inline, 0 general)