dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'vehicle_group_info' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:02:22 +01:00
parent 85c7c4b307 e4aacee627
commit 83091f55da
12 changed files with 163 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotkeys.cpp
View File

@@ -313,7 +313,7 @@ int HotkeyList::CheckMatch(uint16 keycode, bool global_only) const
static void SaveLoadHotkeys(bool save)
{
IniFile *ini = new IniFile();
ini->LoadFromDisk(_hotkeys_file, BASE_DIR);
ini->LoadFromDisk(_hotkeys_file, NO_DIRECTORY);
for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) {
if (save) {