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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/crashlog.h
#	src/date_type.h
#	src/depot_type.h
#	src/landscape.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/script/api/script_infrastructure.cpp
#	src/stdafx.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/pathfinding_settings.ini
#	src/tests/CMakeLists.txt
This commit is contained in:
Jonathan G Rennison
2023-11-13 19:08:22 +00:00
parent cb9e088399 b0d7cfaa3d
commit fc1c47cbd2
154 changed files with 1004 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/script/api/script_infrastructure.cpp
View File

@@ -41,24 +41,14 @@
::Company *c = ::Company::Get((::CompanyID)company);
switch (infra_type) {
case INFRASTRUCTURE_RAIL: {
uint32 count = 0;
for (::RailType rt = ::RAILTYPE_BEGIN; rt != ::RAILTYPE_END; rt++) {
count += c->infrastructure.rail[rt];
}
return count;
}
case INFRASTRUCTURE_RAIL:
return c->infrastructure.GetRailTotal();
case INFRASTRUCTURE_SIGNALS:
return c->infrastructure.signal;
case INFRASTRUCTURE_ROAD: {
uint32 count = 0;
for (::RoadType rt = ::ROADTYPE_BEGIN; rt != ::ROADTYPE_END; rt++) {
count += c->infrastructure.road[rt];
}
return count;
}
case INFRASTRUCTURE_ROAD:
return c->infrastructure.GetRoadTotal() + c->infrastructure.GetTramTotal();
case INFRASTRUCTURE_CANAL:
return c->infrastructure.water;