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

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2016-02-14 17:55:51 +00:00
parent 1f5535c0b1 99509acd1d
commit 580b2f7584
54 changed files with 4946 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network_command.cpp
View File

@@ -52,6 +52,10 @@ static CommandCallback * const _callback_table[] = {
/* 0x1A */ CcGame,
/* 0x1B */ CcAddVehicleNewGroup,
/* 0x1C */ CcAddPlan,
/* 0x1D */ CcSetVirtualTrain,
/* 0x1E */ CcVirtualTrainWaggonsMoved,
/* 0x1F */ CcDeleteVirtualTrain,
/* 0x20 */ CcAddVirtualEngine,
};
/**