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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	src/saveload/town_sl.cpp
#	src/screenshot.h
#	src/script/api/ai/ai_date.hpp.sq
#	src/script/api/ai/ai_marine.hpp.sq
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_date.hpp.sq
#	src/script/api/game/game_marine.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/game/game_window.hpp.sq
#	src/script/api/script_window.hpp
#	src/script/api/template/template_window.hpp.sq
#	src/signal.cpp
#	src/statusbar_gui.cpp
#	src/toolbar_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2020-08-27 18:31:09 +01:00
parent e4581b4cd8 9340fe9c7c
commit 5b78090a61
295 changed files with 1567 additions and 15574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/signal.cpp
View File

@@ -300,10 +300,10 @@ static SigInfo ExploreSegment(Owner owner)
{
SigInfo info;
TileIndex tile;
DiagDirection enterdir;
TileIndex tile = INVALID_TILE; // Stop GCC from complaining about a possibly uninitialized variable (issue #8280).
DiagDirection enterdir = INVALID_DIAGDIR;
while (_tbdset.Get(&tile, &enterdir)) {
while (_tbdset.Get(&tile, &enterdir)) { // tile and enterdir are initialized here, unless I'm mistaken.
TileIndex oldtile = tile; // tile we are leaving
DiagDirection exitdir = enterdir == INVALID_DIAGDIR ? INVALID_DIAGDIR : ReverseDiagDir(enterdir); // expected new exit direction (for straight line)
@@ -511,9 +511,9 @@ static SigInfo ExploreSegment(Owner owner)
*/
static void UpdateSignalsAroundSegment(SigInfo info)
{
TileIndex tile;
Trackdir trackdir;
Track track;
TileIndex tile = INVALID_TILE; // Stop GCC from complaining about a possibly uninitialized variable (issue #8280).
Trackdir trackdir = INVALID_TRACKDIR;
Track track = INVALID_TRACK;
while (_tbuset.Get(&tile, &trackdir)) {
if (IsTileType(tile, MP_TUNNELBRIDGE) && IsTunnelBridgeSignalSimulationExit(tile)) {
@@ -614,8 +614,8 @@ static SigSegState UpdateSignalsInBuffer(Owner owner)
SigSegState state = SIGSEG_FREE; // value to return
_num_signals_evaluated = 0;
TileIndex tile;
DiagDirection dir;
TileIndex tile = INVALID_TILE; // Stop GCC from complaining about a possibly uninitialized variable (issue #8280).
DiagDirection dir = INVALID_DIAGDIR;
while (_globset.Get(&tile, &dir)) {
assert(_tbuset.IsEmpty());