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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
This commit is contained in:
Jonathan G Rennison
2018-11-05 12:53:36 +00:00
parent 83a063f51c ccd9d77b94
commit e735c1a51a
208 changed files with 1329 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/town_cmd.cpp
View File

@@ -884,7 +884,7 @@ void UpdateTownCargoTotal(Town *t)
static void UpdateTownCargoes(Town *t, TileIndex start, bool update_total = true)
{
CargoArray accepted, produced;
CargoTypes dummy;
CargoTypes dummy = 0;
/* Gather acceptance for all houses in an area around the start tile.
* The area is composed of the square the tile is in, extended one square in all
@@ -3401,7 +3401,7 @@ static void UpdateTownRating(Town *t)
/**
* Updates town grow counter after growth rate change.
* Preserves relative house builting progress whenever it can.
* @param town The town to calculate grow counter for
* @param t The town to calculate grow counter for
* @param prev_growth_rate Town growth rate before it changed (one that was used with grow counter to be updated)
*/
static void UpdateTownGrowCounter(Town *t, uint16 prev_growth_rate)
@@ -3416,7 +3416,7 @@ static void UpdateTownGrowCounter(Town *t, uint16 prev_growth_rate)
/**
* Calculates amount of active stations in the range of town (HZB_TOWN_EDGE).
* @param town The town to calculate stations for
* @param t The town to calculate stations for
* @returns Amount of active stations
*/
static int CountActiveStations(Town *t)
@@ -3436,7 +3436,7 @@ static int CountActiveStations(Town *t)
/**
* Calculates town growth rate in normal conditions (custom growth rate not set).
* If town growth speed is set to None(0) returns the same rate as if it was Normal(2).
* @param town The town to calculate growth rate for
* @param t The town to calculate growth rate for
* @returns Calculated growth rate
*/
static uint GetNormalGrowthRate(Town *t)
@@ -3486,7 +3486,7 @@ static uint GetNormalGrowthRate(Town *t)
/**
* Updates town growth rate.
* @param town The town to update growth rate for
* @param t The town to update growth rate for
*/
static void UpdateTownGrowthRate(Town *t)
{
@@ -3499,7 +3499,7 @@ static void UpdateTownGrowthRate(Town *t)
/**
* Updates town growth state (whether it is growing or not).
* @param town The town to update growth for
* @param t The town to update growth for
*/
static void UpdateTownGrowth(Town *t)
{