mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r20319) -Codechange: Align comments, add indent to a function call.

This commit is contained in:
alberth 2010-08-02 20:37:32 +00:00
parent 5556955960
commit 4781f1fa92
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/company_base.h
View File

@ -35,18 +35,18 @@ extern CompanyPool _company_pool;
/** Statically loadable part of Company pool item */ /** Statically loadable part of Company pool item */
struct CompanyProperties { struct CompanyProperties {
uint32 name_2; ///< Parameter of #name_1. uint32 name_2; ///< Parameter of #name_1.
uint16 name_1; ///< Name of the company uint16 name_1; ///< Name of the company
char *name; ///< Name of the company if the user changed it. char *name; ///< Name of the company if the user changed it.
uint16 president_name_1; ///< Name of the president. uint16 president_name_1; ///< Name of the president.
uint32 president_name_2; ///< Parameter of #president_name_1 uint32 president_name_2; ///< Parameter of #president_name_1
char *president_name; ///< Name of the president if the user changed it. char *president_name; ///< Name of the president if the user changed it.
CompanyManagerFace face; ///< Face description of the president. CompanyManagerFace face; ///< Face description of the president.
Money money; ///< Money owned by the company. Money money; ///< Money owned by the company.
byte money_fraction; ///< Fraction of money of the company, too small to represent in \a money. byte money_fraction; ///< Fraction of money of the company, too small to represent in \a money.
Money current_loan; ///< Amount of money borrowed from the bank. Money current_loan; ///< Amount of money borrowed from the bank.
byte colour; ///< Company colour. byte colour; ///< Company colour.
@ -55,17 +55,17 @@ struct CompanyProperties {
byte block_preview; ///< Number of months that the company is not allowed to get new exclusive engine previews. byte block_preview; ///< Number of months that the company is not allowed to get new exclusive engine previews.
uint32 cargo_types; ///< which cargo types were transported the last year uint32 cargo_types; ///< which cargo types were transported the last year
TileIndex location_of_HQ; ///< northern tile of HQ; INVALID_TILE when there is none TileIndex location_of_HQ; ///< northern tile of HQ; INVALID_TILE when there is none
TileIndex last_build_coordinate; ///< Coordinate of the last build thing by this company. TileIndex last_build_coordinate; ///< Coordinate of the last build thing by this company.
OwnerByte share_owners[4]; ///< Owners of the 4 shares of the company. #INVALID_OWNER if nobody has bought them yet. OwnerByte share_owners[4]; ///< Owners of the 4 shares of the company. #INVALID_OWNER if nobody has bought them yet.
Year inaugurated_year; ///< Year of starting the company. Year inaugurated_year; ///< Year of starting the company.
byte quarters_of_bankruptcy; ///< Number of quarters (a quarter is 3 months) that the company has a negative balance. byte quarters_of_bankruptcy; ///< Number of quarters (a quarter is 3 months) that the company has a negative balance.
CompanyMask bankrupt_asked; ///< which companies were asked about buying it? CompanyMask bankrupt_asked; ///< which companies were asked about buying it?
int16 bankrupt_timeout; ///< If bigger than \c 0, amount of time to wait for an answer on an offer to buy this company. int16 bankrupt_timeout; ///< If bigger than \c 0, amount of time to wait for an answer on an offer to buy this company.
Money bankrupt_value; Money bankrupt_value;

10
src/economy.cpp
View File

@ -1084,11 +1084,11 @@ void CargoPayment::PayFinalDelivery(const CargoPacket *cp, uint count)
Money CargoPayment::PayTransfer(const CargoPacket *cp, uint count) Money CargoPayment::PayTransfer(const CargoPacket *cp, uint count)
{ {
Money profit = GetTransportedGoodsIncome( Money profit = GetTransportedGoodsIncome(
count, count,
/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */ /* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
DistanceManhattan(cp->LoadedAtXY(), Station::Get(this->current_station)->xy), DistanceManhattan(cp->LoadedAtXY(), Station::Get(this->current_station)->xy),
cp->DaysInTransit(), cp->DaysInTransit(),
this->ct); this->ct);
profit = profit * _settings_game.economy.feeder_payment_share / 100; profit = profit * _settings_game.economy.feeder_payment_share / 100;