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

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2016-09-07 22:02:57 +01:00
parent 315db4874a a3d0fc5817
commit 5e67582a64
39 changed files with 777 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network_gui.cpp
View File

@@ -1193,17 +1193,17 @@ struct NetworkStartServerWindow : public Window {
case WID_NSS_LOAD_GAME:
_is_network_server = true;
ShowSaveLoadDialog(SLD_LOAD_GAME);
ShowSaveLoadDialog(FT_SAVEGAME, SLO_LOAD);
break;
case WID_NSS_PLAY_SCENARIO:
_is_network_server = true;
ShowSaveLoadDialog(SLD_LOAD_SCENARIO);
ShowSaveLoadDialog(FT_SCENARIO, SLO_LOAD);
break;
case WID_NSS_PLAY_HEIGHTMAP:
_is_network_server = true;
ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP);
ShowSaveLoadDialog(FT_HEIGHTMAP,SLO_LOAD);
break;
}
}