Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2020-06-30 21:43:04 +01:00
45 changed files with 222 additions and 371 deletions

View File

@@ -1443,7 +1443,7 @@ void CallVehicleTicks()
if (!IsLocalCompany()) continue;
if (res.Succeeded()) {
if (res.Succeeded() && res.GetCost() != 0) {
ShowCostOrIncomeAnimation(x, y, z, res.GetCost());
continue;
}