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

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
This commit is contained in:
Jonathan G Rennison
2019-08-29 01:01:45 +01:00
parent f825d4695e df2c6d48a8
commit ba9d1a0390
17 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vehicle.cpp
View File

@@ -59,6 +59,7 @@
#include "tbtr_template_vehicle_func.h"
#include "string_func.h"
#include "scope_info.h"
#include "debug_settings.h"
#include "3rdparty/cpp-btree/btree_set.h"
#include "table/strings.h"
@@ -1273,7 +1274,7 @@ void CallVehicleTicks()
FOR_ALL_STATIONS(st) LoadUnloadStation(st);
}
if (!_tick_caches_valid) RebuildVehicleTickCaches();
if (!_tick_caches_valid || HasChickenBit(DCBF_VEH_TICK_CACHE)) RebuildVehicleTickCaches();
Vehicle *v = nullptr;
SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v));