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/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
This commit is contained in:
Jonathan G Rennison
2023-07-02 12:02:36 +01:00
parent 1ad82c200a 90fdf17e39
commit ead18b2af2
133 changed files with 11298 additions and 7389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/subsidy.cpp
View File

@@ -20,6 +20,7 @@
#include "subsidy_func.h"
#include "core/pool_func.hpp"
#include "core/random_func.hpp"
#include "core/container_func.hpp"
#include "game/game.hpp"
#include "command_func.h"
#include "string_func.h"
@@ -329,7 +330,7 @@ bool FindSubsidyTownCargoRoute()
if (src_town->cache.population < SUBSIDY_CARGO_MIN_POPULATION) return false;
/* Calculate the produced cargo of houses around town center. */
CargoArray town_cargo_produced;
CargoArray town_cargo_produced{};
TileArea ta = TileArea(src_town->xy, 1, 1).Expand(SUBSIDY_TOWN_CARGO_RADIUS);
for (TileIndex tile : ta) {
if (IsTileType(tile, MP_HOUSE)) {
@@ -340,10 +341,7 @@ bool FindSubsidyTownCargoRoute()
/* Passenger subsidies are not handled here. */
town_cargo_produced[CT_PASSENGERS] = 0;
uint8 cargo_count = 0;
for (CargoID i = 0; i < NUM_CARGO; i++) {
if (town_cargo_produced[i] > 0) cargo_count++;
}
uint8 cargo_count = town_cargo_produced.GetCount();
/* No cargo produced at all? */
if (cargo_count == 0) return false;
@@ -440,7 +438,7 @@ bool FindSubsidyCargoDestination(CargoID cid, SourceType src_type, SourceID src)
const Town *dst_town = Town::GetRandom();
/* Calculate cargo acceptance of houses around town center. */
CargoArray town_cargo_accepted;
CargoArray town_cargo_accepted{};
TileArea ta = TileArea(dst_town->xy, 1, 1).Expand(SUBSIDY_TOWN_CARGO_RADIUS);
for (TileIndex tile : ta) {
if (IsTileType(tile, MP_HOUSE)) {
@@ -461,8 +459,7 @@ bool FindSubsidyCargoDestination(CargoID cid, SourceType src_type, SourceID src)
if (dst_ind == nullptr) return false;
/* The industry must accept the cargo */
bool valid = std::find(dst_ind->accepts_cargo, endof(dst_ind->accepts_cargo), cid) != endof(dst_ind->accepts_cargo);
if (!valid) return false;
if (!dst_ind->IsCargoAccepted(cid)) return false;
dst = dst_ind->index;
break;