openttd-ottdgrfs: comparison src/economy.cpp

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
 			if (v->owner != owner) continue;
-			if (v->type == VEH_Train ||
+			if (v->type == VEH_TRAIN ||
-					v->type == VEH_Road ||
+					v->type == VEH_ROAD ||
-					(v->type == VEH_Aircraft && IsNormalAircraft(v)) ||
+					(v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) ||
-					v->type == VEH_Ship) {
+					v->type == VEH_SHIP) {
 				value += v->value * 3 >> 1;
 			}
 		}
 	}
 		bool min_profit_first = true;
 		uint num = 0;
 		FOR_ALL_VEHICLES(v) {
 			if (v->owner != owner) continue;
-			if ((v->type == VEH_Train && IsFrontEngine(v)) ||
+			if ((v->type == VEH_TRAIN && IsFrontEngine(v)) ||
-					 v->type == VEH_Road ||
+					 v->type == VEH_ROAD ||
-					(v->type == VEH_Aircraft && IsNormalAircraft(v)) ||
+					(v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) ||
-					 v->type == VEH_Ship) {
+					 v->type == VEH_SHIP) {
 				num++;
 				if (v->age > 730) {
 					/* Find the vehicle with the lowest amount of profit */
 					if (min_profit_first == true) {
 						min_profit = v->profit_last_year;
 		/*  Determine Ids for the new vehicles */
 		FOR_ALL_VEHICLES(v) {
 			if (v->owner == new_player) {
 				switch (v->type) {
-					case VEH_Train:    if (IsFrontEngine(v)) num_train++; break;
+					case VEH_TRAIN:    if (IsFrontEngine(v)) num_train++; break;
-					case VEH_Road:     num_road++; break;
+					case VEH_ROAD:     num_road++; break;
-					case VEH_Ship:     num_ship++; break;
+					case VEH_SHIP:     num_ship++; break;
-					case VEH_Aircraft: if (IsNormalAircraft(v)) num_aircraft++; break;
+					case VEH_AIRCRAFT: if (IsNormalAircraft(v)) num_aircraft++; break;
 					default: break;
 				}
 			}
 		}
 		FOR_ALL_VEHICLES(v) {
-			if (v->owner == old_player && IS_BYTE_INSIDE(v->type, VEH_Train, VEH_Aircraft + 1)) {
+			if (v->owner == old_player && IS_BYTE_INSIDE(v->type, VEH_TRAIN, VEH_AIRCRAFT + 1)) {
 				if (new_player == PLAYER_SPECTATOR) {
 					DeleteWindowById(WC_VEHICLE_VIEW, v->index);
 					DeleteWindowById(WC_VEHICLE_DETAILS, v->index);
 					DeleteWindowById(WC_VEHICLE_ORDERS, v->index);
 					DeleteVehicle(v);
 				} else {
 					v->owner = new_player;
 					if (IsEngineCountable(v)) GetPlayer(new_player)->num_engines[v->engine_type]++;
 					switch (v->type) {
-						case VEH_Train:    if (IsFrontEngine(v)) v->unitnumber = ++num_train; break;
+						case VEH_TRAIN:    if (IsFrontEngine(v)) v->unitnumber = ++num_train; break;
-						case VEH_Road:     v->unitnumber = ++num_road; break;
+						case VEH_ROAD:     v->unitnumber = ++num_road; break;
-						case VEH_Ship:     v->unitnumber = ++num_ship; break;
+						case VEH_SHIP:     v->unitnumber = ++num_ship; break;
-						case VEH_Aircraft: if (IsNormalAircraft(v)) v->unitnumber = ++num_aircraft; break;
+						case VEH_AIRCRAFT: if (IsNormalAircraft(v)) v->unitnumber = ++num_aircraft; break;
 					}
 				}
 			}
 		}
 	}
 	}
 	_current_player = old;
 	MarkWholeScreenDirty();
+}
+static void ChangeNetworkOwner(PlayerID current_player, PlayerID new_player)
+{
+#ifdef ENABLE_NETWORK
+	if (!_networking) return;
+	if (current_player == _local_player) {
+		_network_playas = new_player;
+		SetLocalPlayer(new_player);
+	}
+	if (!_network_server) return;
+	/* The server has to handle all administrative issues, for example
+	* updating and notifying all clients of what has happened */
+	NetworkTCPSocketHandler *cs;
+	NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
+	/* The server has just changed from player */
+	if (current_player == ci->client_playas) {
+		ci->client_playas = new_player;
+		NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
+	}
+	/* Find all clients that were in control of this company, and mark them as new_player */
+	FOR_ALL_CLIENTS(cs) {
+		ci = DEREF_CLIENT_INFO(cs);
+		if (current_player == ci->client_playas) {
+			ci->client_playas = new_player;
+			NetworkUpdateClientInfo(ci->client_index);
+		}
+	}
+#endif /* ENABLE_NETWORK */
 }
 static void PlayersCheckBankrupt(Player *p)
 {
 	PlayerID owner;
 				 * he/she is no long in control of this company */
 				if (!_networking) {
 					p->bankrupt_asked = 0xFF;
 					p->bankrupt_timeout = 0x456;
 					break;
-				} else if (owner == _local_player) {
-					_network_playas = PLAYER_SPECTATOR;
-					SetLocalPlayer(PLAYER_SPECTATOR);
 				}
-#ifdef ENABLE_NETWORK
+				ChangeNetworkOwner(owner, PLAYER_SPECTATOR);
-				/* The server has to handle all administrative issues, for example
-				 * updating and notifying all clients of what has happened */
-				if (_network_server) {
-					NetworkTCPSocketHandler *cs;
-					NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
-					/* The server has just gone belly-up, mark it as spectator */
-					if (owner == ci->client_playas) {
-						ci->client_playas = PLAYER_SPECTATOR;
-						NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
-					}
-					/* Find all clients that were in control of this company,
-					 * and mark them as spectator; broadcast this message to everyone */
-					FOR_ALL_CLIENTS(cs) {
-						ci = DEREF_CLIENT_INFO(cs);
-						if (ci->client_playas == owner) {
-							ci->client_playas = PLAYER_SPECTATOR;
-							NetworkUpdateClientInfo(ci->client_index);
-						}
-					}
-				}
-#endif /* ENABLE_NETWORK */
 			}
 			/* Remove the player */
 			ChangeOwnershipOfPlayerItems(owner, PLAYER_SPECTATOR);
 			/* Register the player as not-active */
 	/* useless, but avoids compiler warning this way */
 	return 0;
 }
-static void PlayersGenStatistics(void)
+static void PlayersGenStatistics()
 {
 	Station *st;
 	Player *p;
 	FOR_ALL_STATIONS(st) {
 	int64 tmp = (int64)*value * amt + *frac;
 	*frac   = GB(tmp, 0, 16);
 	*value += tmp >> 16;
 }
-static void AddInflation(void)
+static void AddInflation()
 {
 	/* Approximation for (100 + infl_amount)% ** (1 / 12) - 100%
 	 * scaled by 65536
 	 * 12 -> months per year
 	 * This is only a good approxiamtion for small values
 	InvalidateWindowClasses(WC_REPLACE_VEHICLE);
 	InvalidateWindowClasses(WC_VEHICLE_DETAILS);
 	InvalidateWindow(WC_PAYMENT_RATES, 0);
 }
-static void PlayersPayInterest(void)
+static void PlayersPayInterest()
 {
 	const Player* p;
 	int interest = _economy.interest_rate * 54;
 	FOR_ALL_PLAYERS(p) {
 		SET_EXPENSES_TYPE(EXPENSES_OTHER);
 		SubtractMoneyFromPlayer(_price.station_value >> 2);
 	}
 }
-static void HandleEconomyFluctuations(void)
+static void HandleEconomyFluctuations()
 {
 	if (_opt.diff.economy == 0) return;
 	if (--_economy.fluct == 0) {
 		_economy.fluct = -(int)GB(Random(), 0, 2);
 static byte price_base_multiplier[NUM_PRICES];
 /**
 * Reset changes to the price base multipliers.
 */
-void ResetPriceBaseMultipliers(void)
+void ResetPriceBaseMultipliers()
 {
 	uint i;
 	/* 8 means no multiplier. */
 	for (i = 0; i < NUM_PRICES; i++)
 {
 	assert(price < NUM_PRICES);
 	price_base_multiplier[price] = factor;
 }
-void StartupEconomy(void)
+void StartupEconomy()
 {
 	int i;
 	assert(sizeof(_price) == NUM_PRICES * sizeof(int32));
 	/* if mode is false, use the singular form */
 	const CargoSpec *cs = GetCargo(s->cargo_type);
 	SetDParam(0, mode ? cs->name_plural : cs->name);
 	if (s->age < 12) {
-		if (s->cargo_type != CT_PASSENGERS && s->cargo_type != CT_MAIL) {
+		if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) {
 			SetDParam(1, STR_INDUSTRY);
 			SetDParam(2, s->from);
 			tile = GetIndustry(s->from)->xy;
-			if (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD) {
+			if (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD) {
 				SetDParam(4, STR_INDUSTRY);
 				SetDParam(5, s->to);
 				tile2 = GetIndustry(s->to)->xy;
 			} else {
 				SetDParam(4, STR_TOWN);
 void DeleteSubsidyWithTown(TownID index)
 {
 	Subsidy *s;
 	for (s = _subsidies; s != endof(_subsidies); s++) {
-		if (s->cargo_type != CT_INVALID && s->age < 12 &&
+		if (s->cargo_type != CT_INVALID && s->age < 12) {
-				(((s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL) && (index == s->from || index == s->to)) ||
+			const CargoSpec *cs = GetCargo(s->cargo_type);
-				((s->cargo_type == CT_GOODS || s->cargo_type == CT_FOOD) && index == s->to))) {
+			if (((cs->town_effect == TE_PASSENGERS || cs->town_effect == TE_MAIL) && (index == s->from || index == s->to)) ||
-			s->cargo_type = CT_INVALID;
+				((cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) && index == s->to)) {
+				s->cargo_type = CT_INVALID;
+			}
 		}
 	}
 }
 void DeleteSubsidyWithIndustry(IndustryID index)
 {
 	Subsidy *s;
 	for (s = _subsidies; s != endof(_subsidies); s++) {
-		if (s->cargo_type != CT_INVALID && s->age < 12 &&
+		if (s->cargo_type != CT_INVALID && s->age < 12) {
-				s->cargo_type != CT_PASSENGERS && s->cargo_type != CT_MAIL &&
+			const CargoSpec *cs = GetCargo(s->cargo_type);
-				(index == s->from || (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD && index == s->to))) {
+			if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL &&
-			s->cargo_type = CT_INVALID;
+				(index == s->from || (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD && index == s->to))) {
+				s->cargo_type = CT_INVALID;
+			}
 		}
 	}
 }
 void DeleteSubsidyWithStation(StationID index)
 	if (dirty)
 		InvalidateWindow(WC_SUBSIDIES_LIST, 0);
 }
-typedef struct FoundRoute {
+struct FoundRoute {
 	uint distance;
 	CargoID cargo;
 	void *from;
 	void *to;
-} FoundRoute;
+};
 static void FindSubsidyPassengerRoute(FoundRoute *fr)
 {
 	Town *from,*to;
 	}
 	/* Quit if no production in this industry
 	 * or if the cargo type is passengers
 	 * or if the pct transported is already large enough */
-	if (total == 0 || trans > 42 || cargo == CT_INVALID || cargo == CT_PASSENGERS)
+	if (total == 0 || trans > 42 || cargo == CT_INVALID) return;
-		return;
+	const CargoSpec *cs = GetCargo(cargo);
+	if (cs->town_effect == TE_PASSENGERS) return;
 	fr->cargo = cargo;
-	if (cargo == CT_GOODS || cargo == CT_FOOD) {
+	if (cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) {
 		/*  The destination is a town */
 		Town *t = GetRandomTown();
 		/* Only want big towns */
 		if (t == NULL || t->population < 900) return;
 	}
 	return false;
 }
-static void SubsidyMonthlyHandler(void)
+static void SubsidyMonthlyHandler()
 {
 	Subsidy *s;
 	Pair pair;
 	Station *st;
 	uint n;
 			}
 			FindSubsidyCargoRoute(&fr);
 			if (fr.distance <= 70) {
 				s->cargo_type = fr.cargo;
 				s->from = ((Industry*)fr.from)->index;
-				s->to = (fr.cargo == CT_GOODS || fr.cargo == CT_FOOD) ? ((Town*)fr.to)->index : ((Industry*)fr.to)->index;
+				{
+					const CargoSpec *cs = GetCargo(fr.cargo);
+					s->to = (cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) ? ((Town*)fr.to)->index : ((Industry*)fr.to)->index;
+				}
 	add_subsidy:
 				if (!CheckSubsidyDuplicate(s)) {
 					s->age = 0;
 					pair = SetupSubsidyDecodeParam(s, 0);
 					AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
 	SLE_CONDVAR(Subsidy, to,         SLE_FILE_U8 | SLE_VAR_U16, 0, 4),
 	SLE_CONDVAR(Subsidy, to,         SLE_UINT16,                5, SL_MAX_VERSION),
 	SLE_END()
 };
-static void Save_SUBS(void)
+static void Save_SUBS()
 {
 	int i;
 	Subsidy *s;
 	for (i = 0; i != lengthof(_subsidies); i++) {
 			SlObject(s, _subsidies_desc);
 		}
 	}
 }
-static void Load_SUBS(void)
+static void Load_SUBS()
 {
 	int index;
 	while ((index = SlIterateArray()) != -1)
 		SlObject(&_subsidies[index], _subsidies_desc);
 }
 	CargoID cargo = cargo_type;
 	const CargoSpec *cs = GetCargo(cargo_type);
 	byte f;
 	/* zero the distance if it's the bank and very short transport. */
-	if (_opt.landscape == LT_NORMAL && cargo == CT_VALUABLES && dist < 10)
+	if (_opt.landscape == LT_NORMAL && cs->label == 'VALU' && dist < 10)
 		dist = 0;
 	f = 255;
 	if (transit_days > cs->transit_days[0]) {
 		transit_days -= cs->transit_days[0];
 	/* check if there's a new subsidy that applies.. */
 	for (s = _subsidies; s != endof(_subsidies); s++) {
 		if (s->cargo_type == cargo_type && s->age < 12) {
 			/* Check distance from source */
-			if (cargo_type == CT_PASSENGERS || cargo_type == CT_MAIL) {
+			const CargoSpec *cs = GetCargo(cargo_type);
+			if (cs->town_effect == TE_PASSENGERS || cs->town_effect == TE_MAIL) {
 				xy = GetTown(s->from)->xy;
 			} else {
 				xy = (GetIndustry(s->from))->xy;
 			}
 			if (DistanceMax(xy, from->xy) > 9) continue;
 			/* Check distance from dest */
-			switch (cargo_type) {
+			switch (cs->town_effect) {
-				case CT_PASSENGERS:
+				case TE_PASSENGERS:
-				case CT_MAIL:
+				case TE_MAIL:
-				case CT_GOODS:
+				case TE_GOODS:
-				case CT_FOOD:
+				case TE_FOOD:
 					xy = GetTown(s->to)->xy;
 					break;
 				default:
 					xy = GetIndustry(s->to)->xy;
 	/* Check if a subsidy applies. */
 	subsidised = CheckSubsidised(s_from, s_to, cargo_type);
 	/* Increase town's counter for some special goods types */
-	if (cargo_type == CT_FOOD) s_to->town->new_act_food += num_pieces;
+	const CargoSpec *cs = GetCargo(cargo_type);
-	if (cargo_type == CT_WATER)  s_to->town->new_act_water += num_pieces;
+	if (cs->town_effect == TE_FOOD) s_to->town->new_act_food += num_pieces;
+	if (cs->town_effect == TE_WATER) s_to->town->new_act_water += num_pieces;
 	/* Give the goods to the industry. */
 	DeliverGoodsToIndustry(s_to->xy, cargo_type, num_pieces);
 	/* Determine profit */
 			has_any_cargo = true;
 		}
 	}
 	FOR_ALL_VEHICLES(x) {
-		if ((x->type != VEH_Train || IsFrontEngine(x)) && // for all locs
+		if ((x->type != VEH_TRAIN || IsFrontEngine(x)) && // for all locs
 				u->last_station_visited == x->last_station_visited && // at the same station
 				!(x->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed
 				x->current_order.type == OT_LOADING && // loading
 				u != x) { // not itself
 			bool other_has_any_cargo = false;
 	int all_vehicles_cargo_feeder_share = v->cargo_feeder_share; // used to hold transfer value of complete vehicle chain - used by trains
 	for (; v != NULL; v = v->next) {
 		GoodsEntry* ge;
 		load_amount = EngInfo(v->engine_type)->load_amount;
-		if (_patches.gradual_loading) {
+		if (_patches.gradual_loading && HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_LOAD_AMOUNT)) {
 			uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v);
 			if (cb_load_amount != CALLBACK_FAILED) load_amount = cb_load_amount & 0xFF;
 		}
 		if (v->cargo_cap == 0) continue;
 		if (u->current_order.flags & OF_UNLOAD) continue;
 		/* update stats */
 		ge->days_since_pickup = 0;
 		switch (u->type) {
-			case VEH_Train: t = u->u.rail.cached_max_speed; break;
+			case VEH_TRAIN: t = u->u.rail.cached_max_speed; break;
-			case VEH_Road:  t = u->max_speed / 2;           break;
+			case VEH_ROAD:  t = u->max_speed / 2;           break;
 			default:        t = u->max_speed;               break;
 		}
 		/* if last speed is 0, we treat that as if no vehicle has ever visited the station. */
 		ge->last_speed = min(t, 255);
 	if (virtual_profit_total > 0) {
 		ShowFeederIncomeAnimation(v->x_pos, v->y_pos, v->z_pos, virtual_profit_total);
 	}
-	if (v->type == VEH_Train) {
+	if (v->type == VEH_TRAIN) {
 		/* Each platform tile is worth 2 rail vehicles. */
 		int overhang = v->u.rail.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE;
 		if (overhang > 0) {
 			unloading_time <<= 1;
 			unloading_time += (overhang * unloading_time) / 8;
 	_current_player = old_player;
 	return result;
 }
-void PlayersMonthlyLoop(void)
+void PlayersMonthlyLoop()
 {
 	PlayersGenStatistics();
 	if (_patches.inflation && _cur_year < MAX_YEAR)
 		AddInflation();
 	PlayersPayInterest();
 	SetDParam(2, p->bankrupt_value);
 	AddNewsItem( (StringID)(_current_player | NB_BMERGER), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0);
 	/* original code does this a little bit differently */
 	PlayerID pi = p->index;
+	ChangeNetworkOwner(pi, _current_player);
 	ChangeOwnershipOfPlayerItems(pi, _current_player);
 	if (p->bankrupt_value == 0) {
 		owner = GetPlayer(_current_player);
 		owner->current_loan += p->current_loan;
 	}
 	return p->bankrupt_value;
 }
 /** Prices */
-static void SaveLoad_PRIC(void)
+static void SaveLoad_PRIC()
 {
 	SlArray(&_price,      NUM_PRICES, SLE_INT32);
 	SlArray(&_price_frac, NUM_PRICES, SLE_UINT16);
 }
 /** Cargo payment rates */
-static void SaveLoad_CAPR(void)
+static void SaveLoad_CAPR()
 {
 	SlArray(&_cargo_payment_rates,      NUM_CARGO, SLE_INT32);
 	SlArray(&_cargo_payment_rates_frac, NUM_CARGO, SLE_UINT16);
 }
 	SLE_VAR(Economy, infl_amount_pr,   SLE_UINT8),
 	SLE_END()
 };
 /** Economy variables */
-static void SaveLoad_ECMY(void)
+static void SaveLoad_ECMY()
 {
 	SlObject(&_economy, _economy_desc);
 }
 extern const ChunkHandler _economy_chunk_handlers[] = {

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6525	52bebe2b485e
child 9901	a922f277ebfd