openttd: src/economy.cpp annotate

annotate src/economy.cpp @ 7165:c3b231638b80 draft

(svn r10439) -Codechange: initial steps for customized industry productions.

author	rubidium <rubidium@openttd.org>
date	Wed, 04 Jul 2007 18:27:21 +0000
parents	198ce784f799
children	bf9443176c10

rev	line source
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1 /* $Id$ */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	2
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	3 /** @file economy.cpp */
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	4
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	5 #include "stdafx.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	6 #include "openttd.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	7 #include "currency.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	8 #include "functions.h"
6453 666fc3ef3174 (svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist. maedhros <maedhros@openttd.org> parents: 6432 diff changeset	9 #include "landscape.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	10 #include "strings.h" // XXX InjectDParam()
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	11 #include "table/strings.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	12 #include "table/sprites.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	13 #include "map.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	14 #include "news.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	15 #include "player.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	16 #include "station.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	17 #include "vehicle.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	18 #include "window.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	19 #include "gfx.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	20 #include "command.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	21 #include "saveload.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	22 #include "economy.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	23 #include "industry.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	24 #include "town.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	25 #include "network/network.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	26 #include "sound.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	27 #include "engine.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	28 #include "network/network_data.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	29 #include "variables.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	30 #include "vehicle_gui.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	31 #include "ai/ai.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	32 #include "train.h"
6857 0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6844 diff changeset	33 #include "roadveh.h"
5854 b52317eb405c (svn r8428) -Codechange: Add proper names to aircraft subtypes instead of magic numbers and add a function IsNormalAircraft() which tells us whether the aircraft is in fact some flying device or a rotor/shadow. Darkvater <Darkvater@openttd.org> parents: 5683 diff changeset	34 #include "aircraft.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	35 #include "newgrf_engine.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	36 #include "newgrf_sound.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	37 #include "newgrf_callbacks.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	38 #include "unmovable.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	39 #include "date.h"
6091 17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	40 #include "cargotype.h"
6190 f9ef22413f22 (svn r8969) -Codechange: rework of the player face bits. rubidium <rubidium@openttd.org> parents: 6175 diff changeset	41 #include "player_face.h"
6643 18d58b36b9b3 (svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13. rubidium <rubidium@openttd.org> parents: 6639 diff changeset	42 #include "group.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	43
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	44 /* Score info */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	45 const ScoreInfo _score_info[] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	46 { SCORE_VEHICLES, 120, 100 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	47 { SCORE_STATIONS, 80, 100 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	48 { SCORE_MIN_PROFIT, 10000, 100 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	49 { SCORE_MIN_INCOME, 50000, 50 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	50 { SCORE_MAX_INCOME, 100000, 100 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	51 { SCORE_DELIVERED, 40000, 400 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	52 { SCORE_CARGO, 8, 50 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	53 { SCORE_MONEY, 10000000, 50 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	54 { SCORE_LOAN, 250000, 50 },
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	55 { SCORE_TOTAL, 0, 0 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	56 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	57
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	58 int _score_part[MAX_PLAYERS][SCORE_END];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	59
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	60 Money CalculateCompanyValue(const Player* p)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	61 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	62 PlayerID owner = p->index;
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	63 /* Do a little nasty by using CommandCost, so we can use the "overflow" protection of CommandCost */
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	64 CommandCost value;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	65
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	66 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	67 Station *st;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	68 uint num = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	69
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	70 FOR_ALL_STATIONS(st) {
6879 40060446b4a0 (svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops. maedhros <maedhros@openttd.org> parents: 6876 diff changeset	71 if (st->owner == owner) num += CountBitsSet(st->facilities);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	72 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	73
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	74 value.AddCost(num * _price.station_value * 25);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	75 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	76
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	77 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	78 Vehicle *v;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	79
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	80 FOR_ALL_VEHICLES(v) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	81 if (v->owner != owner) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	82
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	83 if (v->type == VEH_TRAIN \|\|
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	84 v->type == VEH_ROAD \|\|
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	85 (v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) \|\|
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	86 v->type == VEH_SHIP) {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	87 value.AddCost(v->value * 3 >> 1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	88 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	89 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	90 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	91
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	92 /* Add real money value */
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	93 value.AddCost(-p->current_loan);
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	94 value.AddCost(p->player_money);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	95
6955 8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	96 return max(value.GetCost(), 1LL);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	97 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	98
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	99 /** if update is set to true, the economy is updated with this score
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	100 * (also the house is updated, should only be true in the on-tick event)
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	101 * @param update the economy with calculated score
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	102 * @param p player been evaluated
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	103 * @return actual score of this player
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	104 * */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	105 int UpdateCompanyRatingAndValue(Player *p, bool update)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	106 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	107 byte owner = p->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	108 int score = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	109
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	110 memset(_score_part[owner], 0, sizeof(_score_part[owner]));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	111
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	112 /* Count vehicles */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	113 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	114 Vehicle *v;
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	115 Money min_profit = 0;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	116 bool min_profit_first = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	117 uint num = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	118
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	119 FOR_ALL_VEHICLES(v) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	120 if (v->owner != owner) continue;
6773 746c984c2dfe (svn r10009) -Codechange: Add and use Vehicle::IsPrimaryVehicle to replace individual checks depending on the vehicle type. maedhros <maedhros@openttd.org> parents: 6698 diff changeset	121 if (IsPlayerBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	122 num++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	123 if (v->age > 730) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	124 /* Find the vehicle with the lowest amount of profit */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	125 if (min_profit_first == true) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	126 min_profit = v->profit_last_year;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	127 min_profit_first = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	128 } else if (min_profit > v->profit_last_year) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	129 min_profit = v->profit_last_year;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	130 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	131 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	132 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	133 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	134
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	135 _score_part[owner][SCORE_VEHICLES] = num;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	136 /* Don't allow negative min_profit to show */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	137 if (min_profit > 0)
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	138 _score_part[owner][SCORE_MIN_PROFIT] = ClampToI32(min_profit);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	139 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	140
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	141 /* Count stations */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	142 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	143 uint num = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	144 const Station* st;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	145
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	146 FOR_ALL_STATIONS(st) {
6879 40060446b4a0 (svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops. maedhros <maedhros@openttd.org> parents: 6876 diff changeset	147 if (st->owner == owner) num += CountBitsSet(st->facilities);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	148 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	149 _score_part[owner][SCORE_STATIONS] = num;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	150 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	151
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	152 /* Generate statistics depending on recent income statistics */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	153 {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	154 int numec = min(p->num_valid_stat_ent, 12);
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	155 if (numec != 0) {
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	156 const PlayerEconomyEntry *pee = p->old_economy;
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	157 Money min_income = pee->income + pee->expenses;
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	158 Money max_income = pee->income + pee->expenses;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	159
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	160 do {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	161 min_income = min(min_income, pee->income + pee->expenses);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	162 max_income = max(max_income, pee->income + pee->expenses);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	163 } while (++pee,--numec);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	164
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	165 if (min_income > 0)
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	166 _score_part[owner][SCORE_MIN_INCOME] = ClampToI32(min_income);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	167
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	168 _score_part[owner][SCORE_MAX_INCOME] = ClampToI32(max_income);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	169 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	170 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	171
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	172 /* Generate score depending on amount of transported cargo */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	173 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	174 const PlayerEconomyEntry* pee;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	175 int numec;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	176 uint32 total_delivered;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	177
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	178 numec = min(p->num_valid_stat_ent, 4);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	179 if (numec != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	180 pee = p->old_economy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	181 total_delivered = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	182 do {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	183 total_delivered += pee->delivered_cargo;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	184 } while (++pee,--numec);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	185
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	186 _score_part[owner][SCORE_DELIVERED] = total_delivered;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	187 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	188 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	189
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	190 /* Generate score for variety of cargo */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	191 {
6879 40060446b4a0 (svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops. maedhros <maedhros@openttd.org> parents: 6876 diff changeset	192 uint num = CountBitsSet(p->cargo_types);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	193 _score_part[owner][SCORE_CARGO] = num;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	194 if (update) p->cargo_types = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	195 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	196
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	197 /* Generate score for player money */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	198 {
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	199 if (p->player_money > 0) {
a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	200 _score_part[owner][SCORE_MONEY] = ClampToI32(p->player_money);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	201 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	202 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	203
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	204 /* Generate score for loan */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	205 {
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	206 _score_part[owner][SCORE_LOAN] = ClampToI32(_score_info[SCORE_LOAN].needed - p->current_loan);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	207 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	208
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	209 /* Now we calculate the score for each item.. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	210 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	211 int total_score = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	212 int s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	213 score = 0;
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	214 for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	215 /* Skip the total */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	216 if (i == SCORE_TOTAL) continue;
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	217 /* Check the score */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	218 s = (_score_part[owner][i] >= _score_info[i].needed) ?
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	219 _score_info[i].score :
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	220 _score_part[owner][i] * _score_info[i].score / _score_info[i].needed;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	221 if (s < 0) s = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	222 score += s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	223 total_score += _score_info[i].score;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	224 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	225
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	226 _score_part[owner][SCORE_TOTAL] = score;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	227
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	228 /* We always want the score scaled to SCORE_MAX (1000) */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	229 if (total_score != SCORE_MAX) score = score * SCORE_MAX / total_score;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	230 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	231
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	232 if (update) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	233 p->old_economy[0].performance_history = score;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	234 UpdateCompanyHQ(p, score);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	235 p->old_economy[0].company_value = CalculateCompanyValue(p);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	236 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	237
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	238 InvalidateWindow(WC_PERFORMANCE_DETAIL, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	239 return score;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	240 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	241
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	242 /* use PLAYER_SPECTATOR as new_player to delete the player. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	243 void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	244 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	245 Town *t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	246 PlayerID old = _current_player;
6403 8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	247
6405 3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	248 assert(old_player != new_player);
3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	249
6403 8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	250 {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	251 Player *p;
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	252 uint i;
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	253
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	254 /* See if the old_player had shares in other companies */
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	255 _current_player = old_player;
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	256 FOR_ALL_PLAYERS(p) {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	257 for (i = 0; i < 4; i++) {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	258 if (p->share_owners[i] == old_player) {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	259 /* Sell his shares */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	260 CommandCost res = DoCommand(0, p->index, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
6403 8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	261 /* Because we are in a DoCommand, we can't just execute an other one and
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	262 * expect the money to be removed. We need to do it ourself! */
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	263 SubtractMoneyFromPlayer(res);
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	264 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	265 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	266 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	267
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	268 /* Sell all the shares that people have on this company */
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	269 p = GetPlayer(old_player);
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	270 for (i = 0; i < 4; i++) {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	271 _current_player = p->share_owners[i];
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	272 if (_current_player != PLAYER_SPECTATOR) {
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	273 /* Sell the shares */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	274 CommandCost res = DoCommand(0, old_player, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
6403 8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	275 /* Because we are in a DoCommand, we can't just execute an other one and
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	276 * expect the money to be removed. We need to do it ourself! */
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	277 SubtractMoneyFromPlayer(res);
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	278 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	279 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	280 }
8c022dabd50e (svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company. truelight <truelight@openttd.org> parents: 6369 diff changeset	281
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	282 _current_player = old_player;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	283
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	284 /* Temporarily increase the player's money, to be sure that
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	285 * removing his/her property doesn't fail because of lack of money.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	286 * Not too drastically though, because it could overflow */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	287 if (new_player == PLAYER_SPECTATOR) {
6952 752d9adbb23a (svn r10207) -Codechange: remove the redundant player_money in favour of the money64, which is now renamed to player_money. rubidium <rubidium@openttd.org> parents: 6950 diff changeset	288 GetPlayer(old_player)->player_money = MAX_UVALUE(uint64) >> 2; // jackpot ;p
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	289 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	290
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	291 if (new_player == PLAYER_SPECTATOR) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	292 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	293
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	294 for (s = _subsidies; s != endof(_subsidies); s++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	295 if (s->cargo_type != CT_INVALID && s->age >= 12) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	296 if (GetStation(s->to)->owner == old_player) s->cargo_type = CT_INVALID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	297 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	298 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	299 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	300
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	301 /* Take care of rating in towns */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	302 FOR_ALL_TOWNS(t) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	303 /* If a player takes over, give the ratings to that player. */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	304 if (new_player != PLAYER_SPECTATOR) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	305 if (HASBIT(t->have_ratings, old_player)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	306 if (HASBIT(t->have_ratings, new_player)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	307 // use max of the two ratings.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	308 t->ratings[new_player] = max(t->ratings[new_player], t->ratings[old_player]);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	309 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	310 SETBIT(t->have_ratings, new_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	311 t->ratings[new_player] = t->ratings[old_player];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	312 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	313 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	314 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	315
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	316 /* Reset the ratings for the old player */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	317 t->ratings[old_player] = 500;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	318 CLRBIT(t->have_ratings, old_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	319 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	320
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	321 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	322 int num_train = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	323 int num_road = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	324 int num_ship = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	325 int num_aircraft = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	326 Vehicle *v;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	327
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	328 /* Determine Ids for the new vehicles */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	329 FOR_ALL_VEHICLES(v) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	330 if (v->owner == new_player) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	331 switch (v->type) {
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	332 case VEH_TRAIN: if (IsFrontEngine(v)) num_train++; break;
6857 0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6844 diff changeset	333 case VEH_ROAD: if (IsRoadVehFront(v)) num_road++; break;
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	334 case VEH_SHIP: num_ship++; break;
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	335 case VEH_AIRCRAFT: if (IsNormalAircraft(v)) num_aircraft++; break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	336 default: break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	337 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	338 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	339 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	340
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	341 FOR_ALL_VEHICLES(v) {
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	342 if (v->owner == old_player && IS_BYTE_INSIDE(v->type, VEH_TRAIN, VEH_AIRCRAFT + 1)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	343 if (new_player == PLAYER_SPECTATOR) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	344 DeleteWindowById(WC_VEHICLE_VIEW, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	345 DeleteWindowById(WC_VEHICLE_DETAILS, v->index);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	346 DeleteWindowById(WC_VEHICLE_ORDERS, v->index);
6876 d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	347
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	348 if (v->IsPrimaryVehicle() \|\| (v->type == VEH_TRAIN && IsFreeWagon(v))) {
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	349 switch (v->type) {
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	350 default: NOT_REACHED();
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	351
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	352 case VEH_TRAIN: {
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	353 Vehicle *u = v;
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	354 do {
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	355 Vehicle *next = GetNextVehicle(u);
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	356 DeleteVehicle(u);
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	357 u = next;
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	358 } while (u != NULL);
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	359 } break;
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	360
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	361 case VEH_ROAD:
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	362 case VEH_SHIP:
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	363 DeleteVehicle(v);
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	364 break;
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	365
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	366 case VEH_AIRCRAFT:
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	367 DeleteVehicleChain(v);
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	368 break;
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	369 }
d73e7573898d (svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as maedhros <maedhros@openttd.org> parents: 6857 diff changeset	370 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	371 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	372 v->owner = new_player;
6643 18d58b36b9b3 (svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13. rubidium <rubidium@openttd.org> parents: 6639 diff changeset	373 v->group_id = DEFAULT_GROUP;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	374 if (IsEngineCountable(v)) GetPlayer(new_player)->num_engines[v->engine_type]++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	375 switch (v->type) {
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	376 case VEH_TRAIN: if (IsFrontEngine(v)) v->unitnumber = ++num_train; break;
6857 0005a9ed1903 (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for maedhros <maedhros@openttd.org> parents: 6844 diff changeset	377 case VEH_ROAD: if (IsRoadVehFront(v)) v->unitnumber = ++num_road; break;
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	378 case VEH_SHIP: v->unitnumber = ++num_ship; break;
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	379 case VEH_AIRCRAFT: if (IsNormalAircraft(v)) v->unitnumber = ++num_aircraft; break;
6621 c751437b3bac (svn r9841) -Codechange: add a little more type strictness to the vehicle types. rubidium <rubidium@openttd.org> parents: 6620 diff changeset	380 default: NOT_REACHED();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	381 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	382 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	383 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	384 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	385 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	386
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	387 /* Change ownership of tiles */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	388 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	389 TileIndex tile = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	390 do {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	391 ChangeTileOwner(tile, old_player, new_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	392 } while (++tile != MapSize());
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	393 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	394
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	395 /* Change color of existing windows */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	396 if (new_player != PLAYER_SPECTATOR) ChangeWindowOwner(old_player, new_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	397
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	398 _current_player = old;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	399
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	400 MarkWholeScreenDirty();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	401 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	402
6262 a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	403 static void ChangeNetworkOwner(PlayerID current_player, PlayerID new_player)
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	404 {
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	405 #ifdef ENABLE_NETWORK
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	406 if (!_networking) return;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	407
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	408 if (current_player == _local_player) {
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	409 _network_playas = new_player;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	410 SetLocalPlayer(new_player);
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	411 }
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	412
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	413 if (!_network_server) return;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	414
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	415 /* The server has to handle all administrative issues, for example
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	416 * updating and notifying all clients of what has happened */
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	417 NetworkTCPSocketHandler *cs;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	418 NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	419
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	420 /* The server has just changed from player */
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	421 if (current_player == ci->client_playas) {
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	422 ci->client_playas = new_player;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	423 NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	424 }
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	425
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	426 /* Find all clients that were in control of this company, and mark them as new_player */
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	427 FOR_ALL_CLIENTS(cs) {
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	428 ci = DEREF_CLIENT_INFO(cs);
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	429 if (current_player == ci->client_playas) {
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	430 ci->client_playas = new_player;
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	431 NetworkUpdateClientInfo(ci->client_index);
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	432 }
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	433 }
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	434 #endif /* ENABLE_NETWORK */
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	435 }
a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	436
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	437 static void PlayersCheckBankrupt(Player *p)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	438 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	439 PlayerID owner;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	440
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	441 /* If the player has money again, it does not go bankrupt */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	442 if (p->player_money >= 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	443 p->quarters_of_bankrupcy = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	444 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	445 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	446
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	447 p->quarters_of_bankrupcy++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	448
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	449 owner = p->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	450
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	451 switch (p->quarters_of_bankrupcy) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	452 case 2:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	453 AddNewsItem( (StringID)(owner \| NB_BTROUBLE),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	454 NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	455 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	456 case 3: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	457 /* XXX - In multiplayer, should we ask other players if it wants to take
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	458 over when it is a human company? -- TrueLight */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	459 if (IsHumanPlayer(owner)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	460 AddNewsItem( (StringID)(owner \| NB_BTROUBLE),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	461 NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	462 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	463 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	464
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	465 /* Check if the company has any value.. if not, declare it bankrupt
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	466 * right now */
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	467 Money val = CalculateCompanyValue(p);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	468 if (val > 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	469 p->bankrupt_value = val;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	470 p->bankrupt_asked = 1 << owner; // Don't ask the owner
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	471 p->bankrupt_timeout = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	472 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	473 }
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	474 /* Else, falltrue to case 4... */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	475 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	476 case 4: {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	477 /* Close everything the owner has open */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	478 DeletePlayerWindows(owner);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	479
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	480 /* Show bankrupt news */
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	481 SetDParam(0, p->index);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	482 AddNewsItem( (StringID)(owner \| NB_BBANKRUPT), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	483
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	484 if (IsHumanPlayer(owner)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	485 /* XXX - If we are in offline mode, leave the player playing. Eg. there
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	486 * is no THE-END, otherwise mark the player as spectator to make sure
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	487 * he/she is no long in control of this company */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	488 if (!_networking) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	489 p->bankrupt_asked = 0xFF;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	490 p->bankrupt_timeout = 0x456;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	491 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	492 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	493
6262 a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	494 ChangeNetworkOwner(owner, PLAYER_SPECTATOR);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	495 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	496
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	497 /* Remove the player */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	498 ChangeOwnershipOfPlayerItems(owner, PLAYER_SPECTATOR);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	499 /* Register the player as not-active */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	500 p->is_active = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	501
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	502 if (!IsHumanPlayer(owner) && (!_networking \|\| _network_server) && _ai.enabled)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	503 AI_PlayerDied(owner);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	504 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	505 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	506 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	507
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	508 void DrawNewsBankrupcy(Window *w)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	509 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	510 Player *p;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	511
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	512 DrawNewsBorder(w);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	513
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	514 p = GetPlayer((PlayerID)GB(WP(w,news_d).ni->string_id, 0, 4));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	515 DrawPlayerFace(p->face, p->player_color, 2, 23);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5665 diff changeset	516 GfxFillRect(3, 23, 3 + 91, 23 + 118, PALETTE_TO_STRUCT_GREY \| (1 << USE_COLORTABLE));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	517
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	518 SetDParam(0, p->index);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	519
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	520 DrawStringMultiCenter(49, 148, STR_7058_PRESIDENT, 94);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	521
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	522 switch (WP(w,news_d).ni->string_id & 0xF0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	523 case NB_BTROUBLE:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	524 DrawStringCentered(w->width>>1, 1, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	525
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	526 SetDParam(0, p->index);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	527
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	528 DrawStringMultiCenter(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	529 ((w->width - 101) >> 1) + 98,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	530 90,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	531 STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	532 w->width - 101);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	533 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	534
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	535 case NB_BMERGER: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	536 int32 price;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	537
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	538 DrawStringCentered(w->width>>1, 1, STR_7059_TRANSPORT_COMPANY_MERGER, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	539 COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2);
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	540 SetDParam(2, p->index);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	541 price = WP(w,news_d).ni->params[2];
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	542 SetDParam(3, price);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	543 DrawStringMultiCenter(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	544 ((w->width - 101) >> 1) + 98,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	545 90,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	546 price==0 ? STR_707F_HAS_BEEN_TAKEN_OVER_BY : STR_705A_HAS_BEEN_SOLD_TO_FOR,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	547 w->width - 101);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	548 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	549 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	550
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	551 case NB_BBANKRUPT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	552 DrawStringCentered(w->width>>1, 1, STR_705C_BANKRUPT, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	553 COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	554 DrawStringMultiCenter(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	555 ((w->width - 101) >> 1) + 98,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	556 90,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	557 STR_705D_HAS_BEEN_CLOSED_DOWN_BY,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	558 w->width - 101);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	559 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	560
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	561 case NB_BNEWCOMPANY:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	562 DrawStringCentered(w->width>>1, 1, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED, 0);
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	563 SetDParam(0, p->index);
74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	564 COPY_IN_DPARAM(1,WP(w,news_d).ni->params, 2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	565 DrawStringMultiCenter(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	566 ((w->width - 101) >> 1) + 98,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	567 90,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	568 STR_705F_STARTS_CONSTRUCTION_NEAR,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	569 w->width - 101);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	570 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	571
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	572 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	573 NOT_REACHED();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	574 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	575 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	576
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	577 StringID GetNewsStringBankrupcy(const NewsItem *ni)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	578 {
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	579 const Player *p = GetPlayer((PlayerID)GB(ni->string_id, 0, 4));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	580
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	581 switch (ni->string_id & 0xF0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	582 case NB_BTROUBLE:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	583 SetDParam(0, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	584 SetDParam(1, STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED);
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	585 SetDParam(2, p->index);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	586 return STR_02B6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	587 case NB_BMERGER:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	588 SetDParam(0, STR_7059_TRANSPORT_COMPANY_MERGER);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	589 SetDParam(1, STR_705A_HAS_BEEN_SOLD_TO_FOR);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	590 COPY_IN_DPARAM(2,ni->params, 2);
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	591 SetDParam(4, p->index);
74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	592 COPY_IN_DPARAM(5,ni->params + 2, 1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	593 return STR_02B6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	594 case NB_BBANKRUPT:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	595 SetDParam(0, STR_705C_BANKRUPT);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	596 SetDParam(1, STR_705D_HAS_BEEN_CLOSED_DOWN_BY);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	597 COPY_IN_DPARAM(2,ni->params, 2);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	598 return STR_02B6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	599 case NB_BNEWCOMPANY:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	600 SetDParam(0, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	601 SetDParam(1, STR_705F_STARTS_CONSTRUCTION_NEAR);
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	602 SetDParam(2, p->index);
74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	603 COPY_IN_DPARAM(3,ni->params, 2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	604 return STR_02B6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	605 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	606 NOT_REACHED();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	607 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	608
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	609 /* useless, but avoids compiler warning this way */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	610 return 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	611 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	612
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	613 static void PlayersGenStatistics()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	614 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	615 Station *st;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	616 Player *p;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	617
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	618 FOR_ALL_STATIONS(st) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	619 _current_player = st->owner;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	620 SET_EXPENSES_TYPE(EXPENSES_PROPERTY);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	621 SubtractMoneyFromPlayer(_price.station_value >> 1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	622 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	623
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	624 if (!HASBIT(1<<0\|1<<3\|1<<6\|1<<9, _cur_month))
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	625 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	626
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	627 FOR_ALL_PLAYERS(p) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	628 if (p->is_active) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	629 memmove(&p->old_economy[1], &p->old_economy[0], sizeof(p->old_economy) - sizeof(p->old_economy[0]));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	630 p->old_economy[0] = p->cur_economy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	631 memset(&p->cur_economy, 0, sizeof(p->cur_economy));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	632
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	633 if (p->num_valid_stat_ent != 24) p->num_valid_stat_ent++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	634
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	635 UpdateCompanyRatingAndValue(p, true);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	636 PlayersCheckBankrupt(p);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	637
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	638 if (p->block_preview != 0) p->block_preview--;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	639 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	640 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	641
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	642 InvalidateWindow(WC_INCOME_GRAPH, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	643 InvalidateWindow(WC_OPERATING_PROFIT, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	644 InvalidateWindow(WC_DELIVERED_CARGO, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	645 InvalidateWindow(WC_PERFORMANCE_HISTORY, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	646 InvalidateWindow(WC_COMPANY_VALUE, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	647 InvalidateWindow(WC_COMPANY_LEAGUE, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	648 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	649
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	650 static void AddSingleInflation(Money value, uint16 frac, int32 amt)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	651 {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	652 /* Is it safe to add inflation ? */
6957 d2ef90986630 (svn r10212) -Fix [FS#723]: money overflow bugs in many locations. rubidium <rubidium@openttd.org> parents: 6955 diff changeset	653 if ((INT64_MAX / amt) < (*value + 1)) {
d2ef90986630 (svn r10212) -Fix [FS#723]: money overflow bugs in many locations. rubidium <rubidium@openttd.org> parents: 6955 diff changeset	654 *value = INT64_MAX / amt;
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	655 *frac = 0;
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	656 } else {
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	657 int64 tmp = (int64)value amt + *frac;
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	658 *frac = GB(tmp, 0, 16);
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	659 *value += tmp >> 16;
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	660 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	661 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	662
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	663 static void AddInflation()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	664 {
6119 f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	665 /* Approximation for (100 + infl_amount)% ** (1 / 12) - 100%
f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	666 * scaled by 65536
f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	667 * 12 -> months per year
f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	668 * This is only a good approxiamtion for small values
f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	669 */
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	670 Money inf = _economy.infl_amount * 54;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	671
6119 f319793f0549 (svn r8855) -Fix tron <tron@openttd.org> parents: 6111 diff changeset	672 for (uint i = 0; i != NUM_PRICES; i++) {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	673 AddSingleInflation((Money*)&_price + i, _price_frac + i, inf);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	674 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	675
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	676 _economy.max_loan_unround += BIGMULUS(_economy.max_loan_unround, inf, 16);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	677
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	678 if (_economy.max_loan + 50000 <= _economy.max_loan_unround)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	679 _economy.max_loan += 50000;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	680
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	681 inf = _economy.infl_amount_pr * 54;
6350 8132258640be (svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops. peter1138 <peter1138@openttd.org> parents: 6315 diff changeset	682 for (CargoID i = 0; i < NUM_CARGO; i++) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	683 AddSingleInflation(
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	684 (Money*)_cargo_payment_rates + i,
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	685 _cargo_payment_rates_frac + i,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	686 inf
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	687 );
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	688 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	689
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	690 InvalidateWindowClasses(WC_BUILD_VEHICLE);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	691 InvalidateWindowClasses(WC_REPLACE_VEHICLE);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	692 InvalidateWindowClasses(WC_VEHICLE_DETAILS);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	693 InvalidateWindow(WC_PAYMENT_RATES, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	694 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	695
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	696 static void PlayersPayInterest()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	697 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	698 const Player* p;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	699 int interest = _economy.interest_rate * 54;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	700
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	701 FOR_ALL_PLAYERS(p) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	702 if (!p->is_active) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	703
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	704 _current_player = p->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	705 SET_EXPENSES_TYPE(EXPENSES_LOAN_INT);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	706
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	707 SubtractMoneyFromPlayer(CommandCost((Money)BIGMULUS(p->current_loan, interest, 16)));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	708
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	709 SET_EXPENSES_TYPE(EXPENSES_OTHER);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	710 SubtractMoneyFromPlayer(_price.station_value >> 2);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	711 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	712 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	713
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	714 static void HandleEconomyFluctuations()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	715 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	716 if (_opt.diff.economy == 0) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	717
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	718 if (--_economy.fluct == 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	719 _economy.fluct = -(int)GB(Random(), 0, 2);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	720 AddNewsItem(STR_7073_WORLD_RECESSION_FINANCIAL, NEWS_FLAGS(NM_NORMAL,0,NT_ECONOMY,0), 0, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	721 } else if (_economy.fluct == -12) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	722 _economy.fluct = GB(Random(), 0, 8) + 312;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	723 AddNewsItem(STR_7074_RECESSION_OVER_UPTURN_IN, NEWS_FLAGS(NM_NORMAL,0,NT_ECONOMY,0), 0, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	724 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	725 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	726
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	727 static byte _price_category[NUM_PRICES] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	728 0, 2, 2, 2, 2, 2, 2, 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	729 2, 2, 2, 2, 2, 2, 2, 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	730 2, 2, 2, 2, 2, 2, 2, 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	731 2, 2, 2, 2, 2, 2, 2, 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	732 2, 2, 2, 2, 2, 2, 2, 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	733 2, 2, 1, 1, 1, 1, 1, 1,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	734 2,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	735 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	736
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	737 static const Money _price_base[NUM_PRICES] = {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	738 100, ///< station_value
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	739 100, ///< build_rail
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	740 95, ///< build_road
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	741 65, ///< build_signals
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	742 275, ///< build_bridge
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	743 600, ///< build_train_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	744 500, ///< build_road_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	745 700, ///< build_ship_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	746 450, ///< build_tunnel
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	747 200, ///< train_station_track
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	748 180, ///< train_station_length
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	749 600, ///< build_airport
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	750 200, ///< build_bus_station
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	751 200, ///< build_truck_station
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	752 350, ///< build_dock
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	753 400000, ///< build_railvehicle
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	754 2000, ///< build_railwagon
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	755 700000, ///< aircraft_base
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	756 14000, ///< roadveh_base
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	757 65000, ///< ship_base
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	758 20, ///< build_trees
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	759 250, ///< terraform
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	760 20, ///< clear_1
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	761 40, ///< purchase_land
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	762 200, ///< clear_2
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	763 500, ///< clear_3
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	764 20, ///< remove_trees
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	765 -70, ///< remove_rail
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	766 10, ///< remove_signals
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	767 50, ///< clear_bridge
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	768 80, ///< remove_train_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	769 80, ///< remove_road_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	770 90, ///< remove_ship_depot
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	771 30, ///< clear_tunnel
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	772 10000, ///< clear_water
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	773 50, ///< remove_rail_station
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	774 30, ///< remove_airport
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	775 50, ///< remove_bus_station
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	776 50, ///< remove_truck_station
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	777 55, ///< remove_dock
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	778 1600, ///< remove_house
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	779 40, ///< remove_road
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	780 5600, ///< running_rail[0] railroad
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	781 5200, ///< running_rail[1] monorail
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	782 4800, ///< running_rail[2] maglev
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	783 9600, ///< aircraft_running
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	784 1600, ///< roadveh_running
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	785 5600, ///< ship_running
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	786 1000000, ///< build_industry
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	787 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	788
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	789 static byte price_base_multiplier[NUM_PRICES];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	790
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	791 /**
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	792 * Reset changes to the price base multipliers.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	793 */
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	794 void ResetPriceBaseMultipliers()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	795 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	796 uint i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	797
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	798 /* 8 means no multiplier. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	799 for (i = 0; i < NUM_PRICES; i++)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	800 price_base_multiplier[i] = 8;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	801 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	802
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	803 /**
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	804 * Change a price base by the given factor.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	805 * The price base is altered by factors of two, with an offset of 8.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	806 * NewBaseCost = OldBaseCost * 2^(n-8)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	807 * @param price Index of price base to change.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	808 * @param factor Amount to change by.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	809 */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	810 void SetPriceBaseMultiplier(uint price, byte factor)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	811 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	812 assert(price < NUM_PRICES);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	813 price_base_multiplier[price] = factor;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	814 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	815
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	816 void StartupEconomy()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	817 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	818 int i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	819
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	820 assert(sizeof(_price) == NUM_PRICES * sizeof(Money));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	821
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	822 for (i = 0; i != NUM_PRICES; i++) {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	823 Money price = _price_base[i];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	824 if (_price_category[i] != 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	825 uint mod = _price_category[i] == 1 ? _opt.diff.vehicle_costs : _opt.diff.construction_cost;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	826 if (mod < 1) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	827 price = price * 3 >> 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	828 } else if (mod > 1) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	829 price = price * 9 >> 3;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	830 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	831 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	832 if (price_base_multiplier[i] > 8) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	833 price <<= price_base_multiplier[i] - 8;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	834 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	835 price >>= 8 - price_base_multiplier[i];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	836 }
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	837 ((Money*)&_price)[i] = price;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	838 _price_frac[i] = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	839 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	840
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	841 _economy.interest_rate = _opt.diff.initial_interest;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	842 _economy.infl_amount = _opt.diff.initial_interest;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	843 _economy.infl_amount_pr = max(0, _opt.diff.initial_interest - 1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	844 _economy.max_loan_unround = _economy.max_loan = _opt.diff.max_loan * 1000;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	845 _economy.fluct = GB(Random(), 0, 8) + 168;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	846 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	847
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	848 Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	849 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	850 TileIndex tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	851 TileIndex tile2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	852 Pair tp;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	853
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	854 /* if mode is false, use the singular form */
6091 17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	855 const CargoSpec *cs = GetCargo(s->cargo_type);
17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	856 SetDParam(0, mode ? cs->name_plural : cs->name);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	857
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	858 if (s->age < 12) {
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	859 if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	860 SetDParam(1, STR_INDUSTRY);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	861 SetDParam(2, s->from);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	862 tile = GetIndustry(s->from)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	863
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	864 if (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	865 SetDParam(4, STR_INDUSTRY);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	866 SetDParam(5, s->to);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	867 tile2 = GetIndustry(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	868 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	869 SetDParam(4, STR_TOWN);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	870 SetDParam(5, s->to);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	871 tile2 = GetTown(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	872 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	873 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	874 SetDParam(1, STR_TOWN);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	875 SetDParam(2, s->from);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	876 tile = GetTown(s->from)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	877
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	878 SetDParam(4, STR_TOWN);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	879 SetDParam(5, s->to);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	880 tile2 = GetTown(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	881 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	882 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	883 SetDParam(1, s->from);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	884 tile = GetStation(s->from)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	885
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	886 SetDParam(2, s->to);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	887 tile2 = GetStation(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	888 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	889
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	890 tp.a = tile;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	891 tp.b = tile2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	892
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	893 return tp;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	894 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	895
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	896 void DeleteSubsidyWithTown(TownID index)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	897 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	898 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	899
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	900 for (s = _subsidies; s != endof(_subsidies); s++) {
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	901 if (s->cargo_type != CT_INVALID && s->age < 12) {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	902 const CargoSpec *cs = GetCargo(s->cargo_type);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	903 if (((cs->town_effect == TE_PASSENGERS \|\| cs->town_effect == TE_MAIL) && (index == s->from \|\| index == s->to)) \|\|
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	904 ((cs->town_effect == TE_GOODS \|\| cs->town_effect == TE_FOOD) && index == s->to)) {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	905 s->cargo_type = CT_INVALID;
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	906 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	907 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	908 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	909 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	910
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	911 void DeleteSubsidyWithIndustry(IndustryID index)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	912 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	913 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	914
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	915 for (s = _subsidies; s != endof(_subsidies); s++) {
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	916 if (s->cargo_type != CT_INVALID && s->age < 12) {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	917 const CargoSpec *cs = GetCargo(s->cargo_type);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	918 if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL &&
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	919 (index == s->from \|\| (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD && index == s->to))) {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	920 s->cargo_type = CT_INVALID;
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	921 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	922 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	923 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	924 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	925
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	926 void DeleteSubsidyWithStation(StationID index)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	927 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	928 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	929 bool dirty = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	930
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	931 for (s = _subsidies; s != endof(_subsidies); s++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	932 if (s->cargo_type != CT_INVALID && s->age >= 12 &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	933 (s->from == index \|\| s->to == index)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	934 s->cargo_type = CT_INVALID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	935 dirty = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	936 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	937 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	938
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	939 if (dirty)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	940 InvalidateWindow(WC_SUBSIDIES_LIST, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	941 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	942
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6247 diff changeset	943 struct FoundRoute {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	944 uint distance;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	945 CargoID cargo;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	946 void *from;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	947 void *to;
6248 0789677a15a0 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium <rubidium@openttd.org> parents: 6247 diff changeset	948 };
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	949
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	950 static void FindSubsidyPassengerRoute(FoundRoute *fr)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	951 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	952 Town from,to;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	953
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	954 fr->distance = (uint)-1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	955
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	956 fr->from = from = GetRandomTown();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	957 if (from == NULL \|\| from->population < 400) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	958
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	959 fr->to = to = GetRandomTown();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	960 if (from == to \|\| to == NULL \|\| to->population < 400 \|\| to->pct_pass_transported > 42)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	961 return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	962
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	963 fr->distance = DistanceManhattan(from->xy, to->xy);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	964 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	965
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	966 static void FindSubsidyCargoRoute(FoundRoute *fr)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	967 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	968 Industry *i;
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	969 const IndustrySpec *ind;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	970 int trans, total;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	971 CargoID cargo;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	972
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	973 fr->distance = (uint)-1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	974
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	975 fr->from = i = GetRandomIndustry();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	976 if (i == NULL) return;
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	977 ind = GetIndustrySpec(i->type);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	978
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	979 /* Randomize cargo type */
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	980 if (HASBIT(Random(), 0) && ind->produced_cargo[1] != CT_INVALID) {
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	981 cargo = ind->produced_cargo[1];
6819 ffc184231f4a (svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month). rubidium <rubidium@openttd.org> parents: 6773 diff changeset	982 trans = i->last_month_pct_transported[1];
ffc184231f4a (svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month). rubidium <rubidium@openttd.org> parents: 6773 diff changeset	983 total = i->last_month_production[1];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	984 } else {
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	985 cargo = ind->produced_cargo[0];
6819 ffc184231f4a (svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month). rubidium <rubidium@openttd.org> parents: 6773 diff changeset	986 trans = i->last_month_pct_transported[0];
ffc184231f4a (svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month). rubidium <rubidium@openttd.org> parents: 6773 diff changeset	987 total = i->last_month_production[0];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	988 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	989
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	990 /* Quit if no production in this industry
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	991 * or if the cargo type is passengers
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	992 * or if the pct transported is already large enough */
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	993 if (total == 0 \|\| trans > 42 \|\| cargo == CT_INVALID) return;
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	994
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	995 const CargoSpec *cs = GetCargo(cargo);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	996 if (cs->town_effect == TE_PASSENGERS) return;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	997
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	998 fr->cargo = cargo;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	999
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1000 if (cs->town_effect == TE_GOODS \|\| cs->town_effect == TE_FOOD) {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1001 /* The destination is a town */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1002 Town *t = GetRandomTown();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1003
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1004 /* Only want big towns */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1005 if (t == NULL \|\| t->population < 900) return;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1006
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1007 fr->distance = DistanceManhattan(i->xy, t->xy);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1008 fr->to = t;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1009 } else {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1010 /* The destination is an industry */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1011 Industry *i2 = GetRandomIndustry();
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1012 if (i2 == NULL) {
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1013 return;
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1014 }
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1015
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1016 ind = GetIndustrySpec(i2->type);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1017
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1018 /* The industry must accept the cargo */
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1019 if (i == i2 \|\|
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1020 (cargo != ind->accepts_cargo[0] &&
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1021 cargo != ind->accepts_cargo[1] &&
03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1022 cargo != ind->accepts_cargo[2])) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1023 return;
6636 03f0effaab7b (svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead. belugas <belugas@openttd.org> parents: 6635 diff changeset	1024 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1025 fr->distance = DistanceManhattan(i->xy, i2->xy);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1026 fr->to = i2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1027 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1028 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1029
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1030 static bool CheckSubsidyDuplicate(Subsidy *s)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1031 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1032 const Subsidy* ss;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1033
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1034 for (ss = _subsidies; ss != endof(_subsidies); ss++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1035 if (s != ss &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1036 ss->from == s->from &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1037 ss->to == s->to &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1038 ss->cargo_type == s->cargo_type) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1039 s->cargo_type = CT_INVALID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1040 return true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1041 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1042 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1043 return false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1044 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1045
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1046
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1047 static void SubsidyMonthlyHandler()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1048 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1049 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1050 Pair pair;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1051 Station *st;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1052 uint n;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1053 FoundRoute fr;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1054 bool modified = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1055
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1056 for (s = _subsidies; s != endof(_subsidies); s++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1057 if (s->cargo_type == CT_INVALID) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1058
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1059 if (s->age == 12-1) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1060 pair = SetupSubsidyDecodeParam(s, 1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1061 AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1062 s->cargo_type = CT_INVALID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1063 modified = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1064 } else if (s->age == 2*12-1) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1065 st = GetStation(s->to);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1066 if (st->owner == _local_player) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1067 pair = SetupSubsidyDecodeParam(s, 1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1068 AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1069 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1070 s->cargo_type = CT_INVALID;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1071 modified = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1072 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1073 s->age++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1074 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1075 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1076
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1077 /* 25% chance to go on */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1078 if (CHANCE16(1,4)) {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1079 /* Find a free slot*/
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1080 s = _subsidies;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1081 while (s->cargo_type != CT_INVALID) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1082 if (++s == endof(_subsidies))
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1083 goto no_add;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1084 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1085
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1086 n = 1000;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1087 do {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1088 FindSubsidyPassengerRoute(&fr);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1089 if (fr.distance <= 70) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1090 s->cargo_type = CT_PASSENGERS;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1091 s->from = ((Town*)fr.from)->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1092 s->to = ((Town*)fr.to)->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1093 goto add_subsidy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1094 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1095 FindSubsidyCargoRoute(&fr);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1096 if (fr.distance <= 70) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1097 s->cargo_type = fr.cargo;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1098 s->from = ((Industry*)fr.from)->index;
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1099 {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1100 const CargoSpec *cs = GetCargo(fr.cargo);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1101 s->to = (cs->town_effect == TE_GOODS \|\| cs->town_effect == TE_FOOD) ? ((Town)fr.to)->index : ((Industry)fr.to)->index;
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1102 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1103 add_subsidy:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1104 if (!CheckSubsidyDuplicate(s)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1105 s->age = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1106 pair = SetupSubsidyDecodeParam(s, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1107 AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1108 modified = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1109 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1110 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1111 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1112 } while (n--);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1113 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1114 no_add:;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1115 if (modified)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1116 InvalidateWindow(WC_SUBSIDIES_LIST, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1117 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1118
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1119 static const SaveLoad _subsidies_desc[] = {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1120 SLE_VAR(Subsidy, cargo_type, SLE_UINT8),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1121 SLE_VAR(Subsidy, age, SLE_UINT8),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1122 SLE_CONDVAR(Subsidy, from, SLE_FILE_U8 \| SLE_VAR_U16, 0, 4),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1123 SLE_CONDVAR(Subsidy, from, SLE_UINT16, 5, SL_MAX_VERSION),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1124 SLE_CONDVAR(Subsidy, to, SLE_FILE_U8 \| SLE_VAR_U16, 0, 4),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1125 SLE_CONDVAR(Subsidy, to, SLE_UINT16, 5, SL_MAX_VERSION),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1126 SLE_END()
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1127 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1128
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1129 static void Save_SUBS()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1130 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1131 int i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1132 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1133
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1134 for (i = 0; i != lengthof(_subsidies); i++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1135 s = &_subsidies[i];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1136 if (s->cargo_type != CT_INVALID) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1137 SlSetArrayIndex(i);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1138 SlObject(s, _subsidies_desc);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1139 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1140 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1141 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1142
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1143 static void Load_SUBS()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1144 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1145 int index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1146 while ((index = SlIterateArray()) != -1)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1147 SlObject(&_subsidies[index], _subsidies_desc);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1148 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1149
6954 3aa54e38394f (svn r10209) -Fix/Codechange: forgot a few changes of int32 -> Money in the previous commit rubidium <rubidium@openttd.org> parents: 6953 diff changeset	1150 Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1151 {
6091 17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	1152 const CargoSpec *cs = GetCargo(cargo_type);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1153 byte f;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1154
6458 57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1155 /* Use callback to calculate cargo profit, if available */
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1156 if (HASBIT(cs->callback_mask, CBM_CARGO_PROFIT_CALC)) {
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1157 uint32 var18 = min(dist, 0xFFFF) \| (min(num_pieces, 0xFF) << 16) \| (transit_days << 24);
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1158 uint16 callback = GetCargoCallback(CBID_CARGO_PROFIT_CALC, 0, var18, cs);
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1159 if (callback != CALLBACK_FAILED) {
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1160 int result = GB(callback, 0, 14);
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1161
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1162 /* Simulate a 15 bit signed value */
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1163 if (HASBIT(callback, 14)) result = 0x4000 - result;
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1164
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1165 /* "The result should be a signed multiplier that gets multiplied
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1166 * by the amount of cargo moved and the price factor, then gets
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1167 * divided by 8192." */
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1168 return result * num_pieces * _cargo_payment_rates[cargo_type] / 8192;
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1169 }
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1170 }
57cfff4ac608 (svn r9617) -Codechange: Implement callback for cargo profit calculation peter1138 <peter1138@openttd.org> parents: 6453 diff changeset	1171
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1172 /* zero the distance if it's the bank and very short transport. */
6357 96b1652c6011 (svn r9400) -Codechange: Use some more representative enum names for landscape types. belugas <belugas@openttd.org> parents: 6350 diff changeset	1173 if (_opt.landscape == LT_TEMPERATE && cs->label == 'VALU' && dist < 10)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1174 dist = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1175
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1176 f = 255;
6091 17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	1177 if (transit_days > cs->transit_days[0]) {
17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	1178 transit_days -= cs->transit_days[0];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1179 f -= transit_days;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1180
6091 17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	1181 if (transit_days > cs->transit_days[1]) {
17ebeb5a2c37 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 <peter1138@openttd.org> parents: 5998 diff changeset	1182 transit_days -= cs->transit_days[1];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1183
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1184 if (f < transit_days) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1185 f = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1186 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1187 f -= transit_days;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1188 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1189 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1190 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1191 if (f < 31) f = 31;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1192
6369 f2e57687adb4 (svn r9427) -Codechange: remove redundant variable peter1138 <peter1138@openttd.org> parents: 6357 diff changeset	1193 return BIGMULSS(dist * f * num_pieces, _cargo_payment_rates[cargo_type], 21);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1194 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1195
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1196 static void DeliverGoodsToIndustry(TileIndex xy, CargoID cargo_type, int num_pieces)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1197 {
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1198 Industry *best = NULL;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1199 Industry *ind;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1200 const IndustrySpec *indspec;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1201 uint best_dist;
6639 0333109c382d (svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct belugas <belugas@openttd.org> parents: 6636 diff changeset	1202 uint accepted_cargo_index = 0; ///< unlikely value, just for warning removing
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1203
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1204 /* Check if there's an industry close to the station that accepts the cargo
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1205 * XXX - Think of something better to
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1206 * 1) Only deliver to industries which are withing the catchment radius
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1207 * 2) Distribute between industries if more then one is present */
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1208 best_dist = (_patches.station_spread + 8) * 2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1209 FOR_ALL_INDUSTRIES(ind) {
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1210 indspec = GetIndustrySpec(ind->type);
6639 0333109c382d (svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct belugas <belugas@openttd.org> parents: 6636 diff changeset	1211 uint i;
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1212
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1213 if (indspec->produced_cargo[0] == CT_INVALID) continue;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1214
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1215 for (i = 0; i < lengthof(indspec->accepts_cargo); i++) {
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1216 if (cargo_type == indspec->accepts_cargo[i] &&
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1217 (indspec->input_cargo_multiplier[i][0] != 0 \|\| indspec->input_cargo_multiplier[i][1] != 0)) {
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1218 break;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1219 }
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1220 }
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1221
6639 0333109c382d (svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct belugas <belugas@openttd.org> parents: 6636 diff changeset	1222 /* Check if matching cargo has been found */
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1223 if (i == lengthof(indspec->accepts_cargo)) continue;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1224
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1225 uint dist = DistanceManhattan(ind->xy, xy);
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1226
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1227 if (dist < best_dist) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1228 best = ind;
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1229 best_dist = dist;
5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1230 accepted_cargo_index = i;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1231 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1232 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1233
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1234 /* Found one? */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1235 if (best != NULL) {
6635 5b5c06df5899 (svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later. rubidium <rubidium@openttd.org> parents: 6621 diff changeset	1236 indspec = GetIndustrySpec(best->type);
7165 c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1237 uint16 callback = indspec->callback_flags;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1238 best->was_cargo_delivered = true;
7165 c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1239
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1240 if (callback & (CBM_IND_PRODUCTION_CARGO_ARRIVAL \| CBM_IND_PRODUCTION_256_TICKS)) {
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1241 best->incoming_cargo_waiting[accepted_cargo_index] = min(num_pieces + best->incoming_cargo_waiting[accepted_cargo_index], 0xFFFF);
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1242 if (callback & CBM_IND_PRODUCTION_CARGO_ARRIVAL) {
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1243 /** @todo Perform some magic */
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1244 }
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1245 } else {
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1246 best->produced_cargo_waiting[0] = min(best->produced_cargo_waiting[0] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][0] / 256), 0xFFFF);
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1247 best->produced_cargo_waiting[1] = min(best->produced_cargo_waiting[1] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][1] / 256), 0xFFFF);
c3b231638b80 (svn r10439) -Codechange: initial steps for customized industry productions. rubidium <rubidium@openttd.org> parents: 7124 diff changeset	1248 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1249 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1250 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1251
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1252 static bool CheckSubsidised(Station from, Station to, CargoID cargo_type)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1253 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1254 Subsidy *s;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1255 TileIndex xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1256 Pair pair;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1257
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1258 /* check if there is an already existing subsidy that applies to us */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1259 for (s = _subsidies; s != endof(_subsidies); s++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1260 if (s->cargo_type == cargo_type &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1261 s->age >= 12 &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1262 s->from == from->index &&
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1263 s->to == to->index) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1264 return true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1265 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1266 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1267
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1268 /* check if there's a new subsidy that applies.. */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1269 for (s = _subsidies; s != endof(_subsidies); s++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1270 if (s->cargo_type == cargo_type && s->age < 12) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1271 /* Check distance from source */
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1272 const CargoSpec *cs = GetCargo(cargo_type);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1273 if (cs->town_effect == TE_PASSENGERS \|\| cs->town_effect == TE_MAIL) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1274 xy = GetTown(s->from)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1275 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1276 xy = (GetIndustry(s->from))->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1277 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1278 if (DistanceMax(xy, from->xy) > 9) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1279
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1280 /* Check distance from dest */
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1281 switch (cs->town_effect) {
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1282 case TE_PASSENGERS:
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1283 case TE_MAIL:
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1284 case TE_GOODS:
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1285 case TE_FOOD:
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1286 xy = GetTown(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1287 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1288
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1289 default:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1290 xy = GetIndustry(s->to)->xy;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1291 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1292 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1293 if (DistanceMax(xy, to->xy) > 9) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1294
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1295 /* Found a subsidy, change the values to indicate that it's in use */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1296 s->age = 12;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1297 s->from = from->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1298 s->to = to->index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1299
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1300 /* Add a news item */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1301 pair = SetupSubsidyDecodeParam(s, 0);
7124 198ce784f799 (svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference. peter1138 <peter1138@openttd.org> parents: 7067 diff changeset	1302 InjectDParam(1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1303
7124 198ce784f799 (svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference. peter1138 <peter1138@openttd.org> parents: 7067 diff changeset	1304 SetDParam(0, _current_player);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1305 AddNewsItem(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1306 STR_2031_SERVICE_SUBSIDY_AWARDED + _opt.diff.subsidy_multiplier,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1307 NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0),
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1308 pair.a, pair.b
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1309 );
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1310
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1311 InvalidateWindow(WC_SUBSIDIES_LIST, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1312 return true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1313 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1314 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1315 return false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1316 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1317
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	1318 static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, TileIndex source_tile, byte days_in_transit)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1319 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1320 bool subsidised;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1321 Station s_from, s_to;
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	1322 Money profit;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1323
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1324 assert(num_pieces > 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1325
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1326 /* Update player statistics */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1327 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1328 Player *p = GetPlayer(_current_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1329 p->cur_economy.delivered_cargo += num_pieces;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1330 SETBIT(p->cargo_types, cargo_type);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1331 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1332
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1333 /* Get station pointers. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1334 s_from = GetStation(source);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1335 s_to = GetStation(dest);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1336
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1337 /* Check if a subsidy applies. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1338 subsidised = CheckSubsidised(s_from, s_to, cargo_type);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1339
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1340 /* Increase town's counter for some special goods types */
6315 6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1341 const CargoSpec *cs = GetCargo(cargo_type);
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1342 if (cs->town_effect == TE_FOOD) s_to->town->new_act_food += num_pieces;
6089c21d196c (svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type. peter1138 <peter1138@openttd.org> parents: 6262 diff changeset	1343 if (cs->town_effect == TE_WATER) s_to->town->new_act_water += num_pieces;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1344
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1345 /* Give the goods to the industry. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1346 DeliverGoodsToIndustry(s_to->xy, cargo_type, num_pieces);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1347
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1348 /* Determine profit */
5683 809a5610092f (svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing) celestar <celestar@openttd.org> parents: 5668 diff changeset	1349 profit = GetTransportedGoodsIncome(num_pieces, DistanceManhattan(source_tile, s_to->xy), days_in_transit, cargo_type);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1350
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1351 /* Modify profit if a subsidy is in effect */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1352 if (subsidised) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1353 switch (_opt.diff.subsidy_multiplier) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1354 case 0: profit += profit >> 1; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1355 case 1: profit *= 2; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1356 case 2: profit *= 3; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1357 default: profit *= 4; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1358 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1359 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1360
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1361 return profit;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1362 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1363
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1364 /**
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1365 * Performs the vehicle payment _and_ marks the vehicle to be unloaded.
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1366 * @param front_v the vehicle to be unloaded
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1367 */
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1368 void VehiclePayment(Vehicle *front_v)
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1369 {
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1370 int result = 0;
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1371
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1372 Money vehicle_profit = 0; // Money paid to the train
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1373 Money route_profit = 0; // The grand total amount for the route. A-D of transfer chain A-B-C-D
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1374 Money virtual_profit = 0; // The virtual profit for entire vehicle chain
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1375
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1376 StationID last_visited = front_v->last_station_visited;
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1377 Station *st = GetStation(last_visited);
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1378
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1379 /* The owner of the train wants to be paid */
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1380 PlayerID old_player = _current_player;
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1381 _current_player = front_v->owner;
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1382
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1383 /* At this moment loading cannot be finished */
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1384 CLRBIT(front_v->vehicle_flags, VF_LOADING_FINISHED);
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1385
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1386 /* Start unloading in at the first possible moment */
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1387 front_v->load_unload_time_rem = 1;
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1388
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1389 for (Vehicle *v = front_v; v != NULL; v = v->next) {
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1390 /* No cargo to unload */
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1391 if (v->cargo_cap == 0 \|\| v->cargo.Empty()) continue;
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1392
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1393 /* All cargo has already been paid for, no need to pay again */
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1394 if (!v->cargo.UnpaidCargo()) {
6882 7a26a3a8edfe (svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly. rubidium <rubidium@openttd.org> parents: 6879 diff changeset	1395 SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING);
7a26a3a8edfe (svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly. rubidium <rubidium@openttd.org> parents: 6879 diff changeset	1396 continue;
7a26a3a8edfe (svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly. rubidium <rubidium@openttd.org> parents: 6879 diff changeset	1397 }
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1398
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1399 GoodsEntry *ge = &st->goods[v->cargo_type];
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1400 const CargoList::List *cargos = v->cargo.Packets();
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1401
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1402 for (CargoList::List::const_iterator it = cargos->begin(); it != cargos->end(); it++) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1403 CargoPacket cp = it;
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1404 if (!cp->paid_for &&
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1405 cp->source != last_visited &&
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1406 ge->acceptance &&
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1407 (front_v->current_order.flags & OF_TRANSFER) == 0) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1408 /* Deliver goods to the station */
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1409 st->time_since_unload = 0;
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1410
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1411 /* handle end of route payment */
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1412 Money profit = DeliverGoods(cp->count, v->cargo_type, cp->source, last_visited, cp->source_xy, cp->days_in_transit);
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1413 cp->paid_for = true;
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1414 route_profit += profit - cp->feeder_share; // display amount paid for final route delivery, A-D of a chain A-B-C-D
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1415 vehicle_profit += profit; // whole vehicle is not payed for transfers picked up earlier
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1416
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1417 result \|= 1;
6882 7a26a3a8edfe (svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly. rubidium <rubidium@openttd.org> parents: 6879 diff changeset	1418
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1419 SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING);
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1420 } else if (front_v->current_order.flags & (OF_UNLOAD \| OF_TRANSFER)) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1421 if (!cp->paid_for && (front_v->current_order.flags & OF_TRANSFER) != 0) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1422 Money profit = GetTransportedGoodsIncome(
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1423 cp->count,
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1424 /* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1425 DistanceManhattan(cp->loaded_at_xy, GetStation(last_visited)->xy),
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1426 cp->days_in_transit,
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1427 v->cargo_type);
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1428
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1429 front_v->profit_this_year += profit;
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1430 virtual_profit += profit; // accumulate transfer profits for whole vehicle
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1431 cp->feeder_share += profit; // account for the (virtual) profit already made for the cargo packet
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1432 cp->paid_for = true; // record that the cargo has been paid for to eliminate double counting
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1433 }
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1434 result \|= 2;
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1435
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1436 SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING);
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1437 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1438 }
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1439 v->cargo.InvalidateCache();
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1440 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1441
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1442 if (virtual_profit > 0) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1443 ShowFeederIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, virtual_profit);
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1444 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1445
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1446 if (route_profit != 0) {
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1447 front_v->profit_this_year += vehicle_profit;
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1448 SubtractMoneyFromPlayer(-route_profit);
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1449
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1450 if (IsLocalPlayer() && !PlayVehicleSound(front_v, VSE_LOAD_UNLOAD)) {
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1451 SndPlayVehicleFx(SND_14_CASHTILL, front_v);
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1452 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1453
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1454 ShowCostOrIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, -vehicle_profit);
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1455 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1456
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1457 _current_player = old_player;
6559 b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1458 }
b680e3433ca2 (svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle. rubidium <rubidium@openttd.org> parents: 6500 diff changeset	1459
6580 e1cdf0b1265b (svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle. rubidium <rubidium@openttd.org> parents: 6565 diff changeset	1460 /**
e1cdf0b1265b (svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle. rubidium <rubidium@openttd.org> parents: 6565 diff changeset	1461 * Loads/unload the vehicle if possible.
e1cdf0b1265b (svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle. rubidium <rubidium@openttd.org> parents: 6565 diff changeset	1462 * @param v the vehicle to be (un)loaded
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1463 * @param cargo_left the amount of each cargo type that is
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1464 * virtually left on the platform to be
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1465 * picked up by another vehicle when all
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1466 * previous vehicles have loaded.
6580 e1cdf0b1265b (svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle. rubidium <rubidium@openttd.org> parents: 6565 diff changeset	1467 */
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1468 static void LoadUnloadVehicle(Vehicle v, int cargo_left)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1469 {
6616 ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1470 assert(v->current_order.type == OT_LOADING);
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1471
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1472 /* We have not waited enough time till the next round of loading/unloading */
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1473 if (--v->load_unload_time_rem != 0) {
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1474 if (_patches.improved_load && HASBIT(v->current_order.flags, OFB_FULL_LOAD)) {
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1475 /* 'Reserve' this cargo for this vehicle, because we were first. */
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1476 for (; v != NULL; v = v->next) {
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1477 if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo.Count();
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1478 }
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1479 }
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1480 return;
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1481 }
6616 ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1482
6844 70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1483 if (v->type == VEH_TRAIN && !IsTileType(v->tile, MP_STATION)) {
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1484 /* The train reversed in the station. Take the "easy" way
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1485 * out and let the train just leave as it always did. */
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1486 SETBIT(v->vehicle_flags, VF_LOADING_FINISHED);
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1487 return;
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1488 }
70d60b0104c1 (svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed. rubidium <rubidium@openttd.org> parents: 6823 diff changeset	1489
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1490 int unloading_time = 0;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1491 Vehicle *u = v;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1492 int result = 0;
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1493 uint cap;
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1494
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1495 bool completely_empty = true;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1496 bool anything_unloaded = false;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1497 bool anything_loaded = false;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1498 uint32 cargo_not_full = 0;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1499 uint32 cargo_full = 0;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1500
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1501 v->cur_speed = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1502
6198 a2cdd211d091 (svn r8978) -Feature: Rewrite of transfer system. richk <richk@openttd.org> parents: 6190 diff changeset	1503 StationID last_visited = v->last_station_visited;
a2cdd211d091 (svn r8978) -Feature: Rewrite of transfer system. richk <richk@openttd.org> parents: 6190 diff changeset	1504 Station *st = GetStation(last_visited);
a2cdd211d091 (svn r8978) -Feature: Rewrite of transfer system. richk <richk@openttd.org> parents: 6190 diff changeset	1505
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1506 for (; v != NULL; v = v->next) {
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1507 if (v->cargo_cap == 0) continue;
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1508
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1509 byte load_amount = EngInfo(v->engine_type)->load_amount;
6227 2f3e0f04a033 (svn r9029) -Fix (r7326): Only call the gradual loading amount callback if the bit for it is set in the vehicle's callbackmask. maedhros <maedhros@openttd.org> parents: 6199 diff changeset	1510 if (_patches.gradual_loading && HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_LOAD_AMOUNT)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1511 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1512 if (cb_load_amount != CALLBACK_FAILED) load_amount = cb_load_amount & 0xFF;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1513 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1514
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1515 GoodsEntry *ge = &st->goods[v->cargo_type];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1516
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1517 if (HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING)) {
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1518 uint cargo_count = v->cargo.Count();
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1519 uint amount_unloaded = _patches.gradual_loading ? min(cargo_count, load_amount) : cargo_count;
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1520 bool remaining; // Are there cargo entities in this vehicle that can still be unloaded here?
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1521
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1522 if (ge->acceptance && !(u->current_order.flags & OF_TRANSFER)) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1523 /* The cargo has reached it's final destination, the packets may now be destroyed */
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1524 remaining = v->cargo.MoveTo(NULL, amount_unloaded, CargoList::MTA_FINAL_DELIVERY, last_visited);
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1525
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1526 result \|= 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1527 } else if (u->current_order.flags & (OF_UNLOAD \| OF_TRANSFER)) {
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1528 remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded);
6198 a2cdd211d091 (svn r8978) -Feature: Rewrite of transfer system. richk <richk@openttd.org> parents: 6190 diff changeset	1529
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1530 result \|= 2;
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1531 } else {
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1532 /* The order changed while unloading (unset unload/transfer) or the
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1533 * station does not accept goods anymore. */
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1534 CLRBIT(v->vehicle_flags, VF_CARGO_UNLOADING);
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1535 continue;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1536 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1537
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1538 /* Deliver goods to the station */
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1539 st->time_since_unload = 0;
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1540
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1541 unloading_time += amount_unloaded;
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1542
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1543 anything_unloaded = true;
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1544 if (_patches.gradual_loading && remaining) {
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1545 completely_empty = false;
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1546 } else {
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1547 /* We have finished unloading (cargo count == 0) */
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1548 CLRBIT(v->vehicle_flags, VF_CARGO_UNLOADING);
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1549 }
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1550
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1551 continue;
e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1552 }
5888 11683122ef51 (svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once. maedhros <maedhros@openttd.org> parents: 5854 diff changeset	1553
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1554 /* Do not pick up goods that we unloaded */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1555 if (u->current_order.flags & OF_UNLOAD) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1556
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1557 /* update stats */
6609 e78f5516e040 (svn r9829) -Codechange: more refactoring of the unloading algorithm. rubidium <rubidium@openttd.org> parents: 6601 diff changeset	1558 int t;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1559 switch (u->type) {
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	1560 case VEH_TRAIN: t = u->u.rail.cached_max_speed; break;
4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	1561 case VEH_ROAD: t = u->max_speed / 2; break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1562 default: t = u->max_speed; break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1563 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1564
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1565 /* if last speed is 0, we treat that as if no vehicle has ever visited the station. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1566 ge->last_speed = min(t, 255);
6990 a19700261804 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. rubidium <rubidium@openttd.org> parents: 6957 diff changeset	1567 ge->last_age = _cur_year - u->build_year;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1568
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1569 /* If there's goods waiting at the station, and the vehicle
46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1570 * has capacity for it, load it on the vehicle. */
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1571 if (!ge->cargo.Empty() &&
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1572 (cap = v->cargo_cap - v->cargo.Count()) != 0) {
f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1573 uint count = ge->cargo.Count();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1574
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1575 /* Skip loading this vehicle if another train/vehicle is already handling
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1576 * the same cargo type at this station */
6698 956093bebe56 (svn r9930) -Fix (r9838): obiwan could cause vehicles to way a long time (2.5 years) at stations. rubidium <rubidium@openttd.org> parents: 6643 diff changeset	1577 if (_patches.improved_load && cargo_left[v->cargo_type] <= 0) {
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1578 SETBIT(cargo_not_full, v->cargo_type);
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1579 continue;
547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1580 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1581
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1582 if (cap > count) cap = count;
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1583 if (_patches.gradual_loading) cap = min(cap, load_amount);
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1584 if (_patches.improved_load) {
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1585 /* Don't load stuff that is already 'reserved' for other vehicles */
7023 1997a5b53cec (svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler... rubidium <rubidium@openttd.org> parents: 7014 diff changeset	1586 cap = min((uint)cargo_left[v->cargo_type], cap);
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1587 cargo_left[v->cargo_type] -= cap;
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1588 }
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1589
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1590 if (v->cargo.Empty()) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO);
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1591
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1592 /* TODO: Regarding this, when we do gradual loading, we
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1593 * should first unload all vehicles and then start
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1594 * loading them. Since this will cause
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1595 * VEHICLE_TRIGGER_EMPTY to be called at the time when
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1596 * the whole vehicle chain is really totally empty, the
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1597 * completely_empty assignment can then be safely
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1598 * removed; that's how TTDPatch behaves too. --pasky */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1599 completely_empty = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1600 anything_loaded = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1601
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1602 ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, st->xy);
7067 1576a93e83c6 (svn r10332) -Fix [FS#940]: ratings where also shown on drop-off stations. rubidium <rubidium@openttd.org> parents: 7058 diff changeset	1603 ge->days_since_pickup = 0;
6198 a2cdd211d091 (svn r8978) -Feature: Rewrite of transfer system. richk <richk@openttd.org> parents: 6190 diff changeset	1604
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1605 unloading_time += cap;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1606 st->time_since_load = 0;
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1607 st->last_vehicle_type = v->type;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1608
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1609 result \|= 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1610 }
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1611
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1612 if (v->cargo.Count() == v->cargo_cap) {
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1613 SETBIT(cargo_full, v->cargo_type);
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1614 } else {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1615 SETBIT(cargo_not_full, v->cargo_type);
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1616 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1617 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1618
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1619 /* We update these variables here, so gradual loading still fills
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1620 * all wagons at the same time instead of using the same 'improved'
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1621 * loading algorithm for the wagons (only fill wagon when there is
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1622 * enough to fill the previous wagons) */
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1623 if (_patches.improved_load && HASBIT(u->current_order.flags, OFB_FULL_LOAD)) {
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1624 /* Update left cargo */
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1625 for (v = u; v != NULL; v = v->next) {
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1626 if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo.Count();
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1627 }
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1628 }
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1629
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1630 v = u;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1631
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1632 if (anything_loaded \|\| anything_unloaded) {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1633 if (_patches.gradual_loading) {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1634 /* The time it takes to load one 'slice' of cargo or passengers depends
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1635 * on the vehicle type - the values here are those found in TTDPatch */
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1636 const uint gradual_loading_wait_time[] = { 40, 20, 10, 20 };
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1637
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1638 unloading_time = gradual_loading_wait_time[v->type];
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1639 }
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1640 } else {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1641 bool finished_loading = true;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1642 if (HASBIT(v->current_order.flags, OFB_FULL_LOAD)) {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1643 if (_patches.full_load_any) {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1644 /* if the aircraft carries passengers and is NOT full, then
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1645 * continue loading, no matter how much mail is in */
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1646 if ((v->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS) && v->cargo_cap != v->cargo.Count()) \|\|
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1647 (cargo_not_full && (cargo_full & ~cargo_not_full) == 0)) { // There are stull non-full cargos
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1648 finished_loading = false;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1649 }
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1650 } else if (cargo_not_full != 0) {
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1651 finished_loading = false;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1652 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1653 }
6611 461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1654 unloading_time = 20;
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1655
461107df1c8f (svn r9831) -Codechange: more refactoring of the loading/unloading. rubidium <rubidium@openttd.org> parents: 6609 diff changeset	1656 SB(v->vehicle_flags, VF_LOADING_FINISHED, 1, finished_loading);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1657 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1658
6259 4a39d6291d58 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). rubidium <rubidium@openttd.org> parents: 6248 diff changeset	1659 if (v->type == VEH_TRAIN) {
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1660 /* Each platform tile is worth 2 rail vehicles. */
5998 bec0f8d9440b (svn r8709) -Fix/Codechange: Rename the function GetStationPlatforms into GetPlatformLength because that is what it really does. Overload it because there is already a GetPlatformLength (one gives the length of the whole platform, the other gives the remaining length in a given direction). Turned both functions into methods of Station. While messing around with it, fix a problem where loading times for overhanging trains are miscomputed. celestar <celestar@openttd.org> parents: 5955 diff changeset	1661 int overhang = v->u.rail.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1662 if (overhang > 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1663 unloading_time <<= 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1664 unloading_time += (overhang * unloading_time) / 8;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1665 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1666 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1667
6998 13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1668 /* Calculate the loading indicator fill percent and display */
13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1669 if (_patches.loading_indicators && _game_mode != GM_MENU && v->owner == _local_player) {
7014 d03670858cef (svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading truelight <truelight@openttd.org> parents: 7010 diff changeset	1670 StringID percent_up_down = STR_NULL;
d03670858cef (svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading truelight <truelight@openttd.org> parents: 7010 diff changeset	1671 int percent = CalcPercentVehicleFilled(v, &percent_up_down);
6998 13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1672 if (v->fill_percent_te_id == INVALID_TE_ID) {
7014 d03670858cef (svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading truelight <truelight@openttd.org> parents: 7010 diff changeset	1673 v->fill_percent_te_id = ShowFillingPercent(v->x_pos, v->y_pos, v->z_pos + 20, percent, percent_up_down);
6998 13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1674 } else {
7014 d03670858cef (svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading truelight <truelight@openttd.org> parents: 7010 diff changeset	1675 UpdateFillingPercent(v->fill_percent_te_id, percent, percent_up_down);
6998 13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1676 }
13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1677 }
13ea0d5f8acf (svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh) truelight <truelight@openttd.org> parents: 6991 diff changeset	1678
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1679 v->load_unload_time_rem = unloading_time;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1680
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1681 if (completely_empty) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1682 TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1683 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1684
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1685 if (result != 0) {
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1686 InvalidateWindow(v->GetVehicleListWindowClass(), v->owner);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1687 InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1688
6823 afa9c0a81fda (svn r10062) -Codechange: Don't redraw all station tiles when cargo is added or removed if the station has no custom graphics. peter1138 <peter1138@openttd.org> parents: 6819 diff changeset	1689 st->MarkTilesDirty(true);
6565 547b0171c3a9 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. rubidium <rubidium@openttd.org> parents: 6559 diff changeset	1690 v->MarkDirty();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1691
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1692 if (result & 2) InvalidateWindow(WC_STATION_VIEW, last_visited);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1693 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1694 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1695
6616 ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1696 /**
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1697 * Load/unload the vehicles in this station according to the order
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1698 * they entered.
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1699 * @param st the station to do the loading/unloading for
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1700 */
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1701 void LoadUnloadStation(Station *st)
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1702 {
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1703 int cargo_left[NUM_CARGO];
a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1704
7010 f0f87c5a431e (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. rubidium <rubidium@openttd.org> parents: 7002 diff changeset	1705 for (uint i = 0; i < NUM_CARGO; i++) cargo_left[i] = st->goods[i].cargo.Count();
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1706
6616 ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1707 std::list<Vehicle *>::iterator iter;
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1708 for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end(); ++iter) {
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1709 Vehicle v = iter;
6618 a0ebb1506656 (svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time: rubidium <rubidium@openttd.org> parents: 6616 diff changeset	1710 if (!(v->vehstatus & (VS_STOPPED \| VS_CRASHED))) LoadUnloadVehicle(v, cargo_left);
6616 ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1711 }
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1712 }
ce5601a32593 (svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading. rubidium <rubidium@openttd.org> parents: 6611 diff changeset	1713
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1714 void PlayersMonthlyLoop()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1715 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1716 PlayersGenStatistics();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1717 if (_patches.inflation && _cur_year < MAX_YEAR)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1718 AddInflation();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1719 PlayersPayInterest();
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1720 /* Reset the _current_player flag */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1721 _current_player = OWNER_NONE;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1722 HandleEconomyFluctuations();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1723 SubsidyMonthlyHandler();
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1724 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1725
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1726 static void DoAcquireCompany(Player *p)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1727 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1728 Player *owner;
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1729 int i;
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1730 Money value;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1731
7058 74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	1732 SetDParam(0, p->index);
74d401c66902 (svn r10323) -Codechange: reference company name, number and player (president) name peter1138 <peter1138@openttd.org> parents: 7023 diff changeset	1733 SetDParam(1, p->bankrupt_value);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1734 AddNewsItem( (StringID)(_current_player \| NB_BMERGER), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1735
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1736 /* original code does this a little bit differently */
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1737 PlayerID pi = p->index;
6262 a457647cd27d (svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI truelight <truelight@openttd.org> parents: 6259 diff changeset	1738 ChangeNetworkOwner(pi, _current_player);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1739 ChangeOwnershipOfPlayerItems(pi, _current_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1740
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1741 if (p->bankrupt_value == 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1742 owner = GetPlayer(_current_player);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1743 owner->current_loan += p->current_loan;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1744 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1745
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1746 value = CalculateCompanyValue(p) >> 2;
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1747 PlayerID old_player = _current_player;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1748 for (i = 0; i != 4; i++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1749 if (p->share_owners[i] != PLAYER_SPECTATOR) {
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1750 SET_EXPENSES_TYPE(EXPENSES_OTHER);
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1751 _current_player = p->share_owners[i];
41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1752 SubtractMoneyFromPlayer(CommandCost(-value));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1753 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1754 }
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1755 _current_player = old_player;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1756
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1757 p->is_active = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1758
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1759 DeletePlayerWindows(pi);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1760 RebuildVehicleLists(); //Updates the open windows to add the newly acquired vehicles to the lists
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1761 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1762
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1763 extern int GetAmountOwnedBy(const Player *p, PlayerID owner);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1764
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1765 /** Acquire shares in an opposing company.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1766 * @param tile unused
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6405 diff changeset	1767 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1768 * @param p1 player to buy the shares from
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1769 * @param p2 unused
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1770 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	1771 CommandCost CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1772 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1773 Player *p;
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	1774 CommandCost cost;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1775
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1776 /* Check if buying shares is allowed (protection against modified clients */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1777 if (!IsValidPlayer((PlayerID)p1) \|\| !_patches.allow_shares) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1778
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1779 SET_EXPENSES_TYPE(EXPENSES_OTHER);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1780 p = GetPlayer((PlayerID)p1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1781
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1782 /* Protect new companies from hostile takeovers */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1783 if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1784
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1785 /* Those lines are here for network-protection (clients can be slow) */
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	1786 if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 0) return cost;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1787
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1788 /* We can not buy out a real player (temporarily). TODO: well, enable it obviously */
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	1789 if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 1 && !p->is_ai) return cost;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1790
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	1791 cost.AddCost(CalculateCompanyValue(p) >> 2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1792 if (flags & DC_EXEC) {
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1793 PlayerByte* b = p->share_owners;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1794 int i;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1795
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1796 while (b != PLAYER_SPECTATOR) b++; / share owners is guaranteed to contain at least one PLAYER_SPECTATOR */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1797 *b = _current_player;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1798
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1799 for (i = 0; p->share_owners[i] == _current_player;) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1800 if (++i == 4) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1801 p->bankrupt_value = 0;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1802 DoAcquireCompany(p);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1803 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1804 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1805 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1806 InvalidateWindow(WC_COMPANY, p1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1807 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1808 return cost;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1809 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1810
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1811 /** Sell shares in an opposing company.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1812 * @param tile unused
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6405 diff changeset	1813 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1814 * @param p1 player to sell the shares from
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1815 * @param p2 unused
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1816 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	1817 CommandCost CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1818 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1819 Player *p;
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1820 Money cost;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1821
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1822 /* Check if buying shares is allowed (protection against modified clients */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1823 if (!IsValidPlayer((PlayerID)p1) \|\| !_patches.allow_shares) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1824
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1825 SET_EXPENSES_TYPE(EXPENSES_OTHER);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1826 p = GetPlayer((PlayerID)p1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1827
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1828 /* Those lines are here for network-protection (clients can be slow) */
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	1829 if (GetAmountOwnedBy(p, _current_player) == 0) return CommandCost();
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1830
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1831 /* adjust it a little to make it less profitable to sell and buy */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1832 cost = CalculateCompanyValue(p) >> 2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1833 cost = -(cost - (cost >> 7));
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1834
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1835 if (flags & DC_EXEC) {
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1836 PlayerByte* b = p->share_owners;
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1837 while (*b != _current_player) b++; // share owners is guaranteed to contain player
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1838 *b = PLAYER_SPECTATOR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1839 InvalidateWindow(WC_COMPANY, p1);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1840 }
6953 41fd36025784 (svn r10208) -Codechange: replace int32 with Money where appropriate. rubidium <rubidium@openttd.org> parents: 6952 diff changeset	1841 return CommandCost(cost);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1842 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1843
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1844 /** Buy up another company.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1845 * When a competing company is gone bankrupt you get the chance to purchase
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1846 * that company.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1847 * @todo currently this only works for AI players
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1848 * @param tile unused
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6405 diff changeset	1849 * @param flags type of operation
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1850 * @param p1 player/company to buy up
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1851 * @param p2 unused
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1852 */
6943 fd42cb9816c6 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. rubidium <rubidium@openttd.org> parents: 6882 diff changeset	1853 CommandCost CmdBuyCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1854 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1855 Player *p;
6405 3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1856 PlayerID pid = (PlayerID)p1;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1857
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1858 /* Disable takeovers in multiplayer games */
6405 3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1859 if (!IsValidPlayer(pid) \|\| _networking) return CMD_ERROR;
3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1860
3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1861 /* Do not allow players to take over themselves */
3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1862 if (pid == _current_player) return CMD_ERROR;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1863
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1864 SET_EXPENSES_TYPE(EXPENSES_OTHER);
6405 3f3b30a14c26 (svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities celestar <celestar@openttd.org> parents: 6403 diff changeset	1865 p = GetPlayer(pid);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1866
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1867 if (!p->is_ai) return CMD_ERROR;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1868
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1869 if (flags & DC_EXEC) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1870 DoAcquireCompany(p);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1871 }
6950 d2846442a133 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. rubidium <rubidium@openttd.org> parents: 6943 diff changeset	1872 return CommandCost(p->bankrupt_value);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1873 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1874
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1875 /** Prices */
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1876 static void SaveLoad_PRIC()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1877 {
6955 8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1878 int vt = CheckSavegameVersion(65) ? (SLE_FILE_I32 \| SLE_VAR_I64) : SLE_INT64;
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1879 SlArray(&_price, NUM_PRICES, vt);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1880 SlArray(&_price_frac, NUM_PRICES, SLE_UINT16);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1881 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1882
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1883 /** Cargo payment rates */
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1884 static void SaveLoad_CAPR()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1885 {
6463 0315af802158 (svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader. peter1138 <peter1138@openttd.org> parents: 6458 diff changeset	1886 uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO;
6955 8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1887 int vt = CheckSavegameVersion(65) ? (SLE_FILE_I32 \| SLE_VAR_I64) : SLE_INT64;
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1888 SlArray(&_cargo_payment_rates, num_cargo, vt);
6463 0315af802158 (svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader. peter1138 <peter1138@openttd.org> parents: 6458 diff changeset	1889 SlArray(&_cargo_payment_rates_frac, num_cargo, SLE_UINT16);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1890 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1891
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1892 static const SaveLoad _economy_desc[] = {
6955 8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1893 SLE_CONDVAR(Economy, max_loan, SLE_FILE_I32 \| SLE_VAR_I64, 0, 64),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1894 SLE_CONDVAR(Economy, max_loan, SLE_INT64, 65, SL_MAX_VERSION),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1895 SLE_CONDVAR(Economy, max_loan_unround, SLE_FILE_I32 \| SLE_VAR_I64, 0, 64),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1896 SLE_CONDVAR(Economy, max_loan_unround, SLE_INT64, 65, SL_MAX_VERSION),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1897 SLE_VAR(Economy, fluct, SLE_FILE_I16 \| SLE_VAR_I32),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1898 SLE_VAR(Economy, interest_rate, SLE_UINT8),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1899 SLE_VAR(Economy, infl_amount, SLE_UINT8),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1900 SLE_VAR(Economy, infl_amount_pr, SLE_UINT8),
8eca8406026b (svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder. rubidium <rubidium@openttd.org> parents: 6954 diff changeset	1901 SLE_END()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1902 };
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1903
6125 46d001ebacf6 (svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style. belugas <belugas@openttd.org> parents: 6119 diff changeset	1904 /** Economy variables */
6247 57363e064324 (svn r9050) -Codechange: Foo(void) -> Foo() rubidium <rubidium@openttd.org> parents: 6227 diff changeset	1905 static void SaveLoad_ECMY()
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1906 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1907 SlObject(&_economy, _economy_desc);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1908 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1909
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	1910 extern const ChunkHandler _economy_chunk_handlers[] = {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1911 { 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, CH_RIFF \| CH_AUTO_LENGTH},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1912 { 'CAPR', SaveLoad_CAPR, SaveLoad_CAPR, CH_RIFF \| CH_AUTO_LENGTH},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1913 { 'SUBS', Save_SUBS, Load_SUBS, CH_ARRAY},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1914 { 'ECMY', SaveLoad_ECMY, SaveLoad_ECMY, CH_RIFF \| CH_LAST},
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1915 };

Mercurial > hg > openttd

annotate src/economy.cpp @ 7165:c3b231638b80 draft