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

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

Browse Source 
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:54:11 +01:00
parent 20e2f363f1 44d3c84a11
commit 7ed93f9211
110 changed files with 3527 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/saveload.cpp
View File

@@ -456,6 +456,7 @@ extern const ChunkHandler _object_chunk_handlers[];
extern const ChunkHandler _persistent_storage_chunk_handlers[];
extern const ChunkHandler _trace_restrict_chunk_handlers[];
extern const ChunkHandler _signal_chunk_handlers[];
extern const ChunkHandler _plan_chunk_handlers[];
/** Array of all chunks in a savegame, \c NULL terminated. */
static const ChunkHandler * const _chunk_handlers[] = {
@@ -495,6 +496,7 @@ static const ChunkHandler * const _chunk_handlers[] = {
_persistent_storage_chunk_handlers,
_trace_restrict_chunk_handlers,
_signal_chunk_handlers,
_plan_chunk_handlers,
NULL,
};