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

Merge branches 'crashlog_improvements', 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	Makefile.src.in
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/core/smallstack_type.hpp
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/misc.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2019-04-09 19:06:26 +01:00
parent 070160af40 d5ee9d34da 7f80884047
commit 361758b516
60 changed files with 541 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/table/sprites.h
View File

@@ -435,8 +435,11 @@ static const SpriteID SPR_MONO_SINGLE_SOUTH = 1090;
static const SpriteID SPR_MONO_SINGLE_EAST = 1091;
static const SpriteID SPR_MONO_SINGLE_WEST = 1092;
static const SpriteID SPR_MONO_TRACK_Y = 1093;
static const SpriteID SPR_MONO_TRACK_X = 1094;
static const SpriteID SPR_MONO_TRACK_BASE = 1100;
static const SpriteID SPR_MONO_TRACK_N_S = 1117;
static const SpriteID SPR_MONO_TRACK_Y_SNOW = 1119;
static const SpriteID SPR_MONO_TRACK_X_SNOW = 1120;
static const SpriteID SPR_MGLV_SINGLE_X = 1169;
static const SpriteID SPR_MGLV_SINGLE_Y = 1170;
static const SpriteID SPR_MGLV_SINGLE_NORTH = 1171;
@@ -444,7 +447,10 @@ static const SpriteID SPR_MGLV_SINGLE_SOUTH = 1172;
static const SpriteID SPR_MGLV_SINGLE_EAST = 1173;
static const SpriteID SPR_MGLV_SINGLE_WEST = 1174;
static const SpriteID SPR_MGLV_TRACK_Y = 1175;
static const SpriteID SPR_MGLV_TRACK_X = 1176;
static const SpriteID SPR_MGLV_TRACK_BASE = 1182;
static const SpriteID SPR_MGLV_TRACK_Y_SNOW = 1184;
static const SpriteID SPR_MGLV_TRACK_X_SNOW = 1185;
static const SpriteID SPR_MGLV_TRACK_N_S = 1199;
static const SpriteID SPR_WAYPOINT_X_1 = SPR_OPENTTD_BASE + 78;
static const SpriteID SPR_WAYPOINT_X_2 = SPR_OPENTTD_BASE + 79;