openttd-mini: comparison economy.c

equal deleted inserted replaced

-:c092add72215
+:544f374ee392
 	if (new_player == 255) {
 		Subsidy *s;
 		for(s=_subsidies; s != endof(_subsidies); s++) {
 			if (s->cargo_type != 0xff && s->age >= 12) {
-				Station *st = DEREF_STATION(s->to);
+				Station *st = GetStation(s->to);
 				if (st->owner == old_player)
 					s->cargo_type = 0xff;
 			}
 		}
 	}
 	SetDParam(0, _cargoc.names_s[s->cargo_type] + (mode?0:32));
 	if (s->age < 12) {
 		if (!(s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL)) {
 			SetDParam(1, STR_2029);
-			i = DEREF_INDUSTRY(s->from);
+			i = GetIndustry(s->from);
 			tile = i->xy;
 			SetDParam(2, i->town->townnametype);
 			SetDParam(3, i->town->townnameparts);
 			SetDParam(4, i->type + STR_4802_COAL_MINE);
 			if (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD) {
 				SetDParam(5, STR_2029);
-				i = DEREF_INDUSTRY(s->to);
+				i = GetIndustry(s->to);
 				tile2 = i->xy;
 				SetDParam(8, i->type + STR_4802_COAL_MINE);
 				SetDParam(6, i->town->townnametype);
 				SetDParam(7, i->town->townnameparts);
 			} else {
-				t = DEREF_TOWN(s->to);
+				t = GetTown(s->to);
 				tile2 = t->xy;
 				SetDParam(5, t->townnametype);
 				SetDParam(6, t->townnameparts);
 			}
 		} else {
-			t = DEREF_TOWN(s->from);
+			t = GetTown(s->from);
 			tile = t->xy;
 			SetDParam(1, t->townnametype);
 			SetDParam(2, t->townnameparts);
-			t = DEREF_TOWN(s->to);
+			t = GetTown(s->to);
 			tile2 = t->xy;
 			SetDParam(3, t->townnametype);
 			SetDParam(4, t->townnameparts);
 		}
 	} else {
-		st = DEREF_STATION(s->from);
+		st = GetStation(s->from);
 		tile = st->xy;
 		SetDParam(1, st->index);
-		st = DEREF_STATION(s->to);
+		st = GetStation(s->to);
 		tile2 = st->xy;
 		SetDParam(2, st->index);
 	}
 	tp.a = tile;
 {
 	Town *from,*to;
 	fr->distance = (uint)-1;
-	fr->from = from = DEREF_TOWN(RandomRange(_total_towns));
+	fr->from = from = GetTown(RandomRange(_total_towns));
 	if (from->xy == 0 || from->population < 400)
 		return;
-	fr->to = to = DEREF_TOWN(RandomRange(_total_towns));
+	fr->to = to = GetTown(RandomRange(_total_towns));
 	if (from==to || to->xy == 0 || to->population < 400 || to->pct_pass_transported > 42)
 		return;
 	fr->distance = GetTileDist(from->xy, to->xy);
 }
 	int trans, total;
 	byte cargo;
 	fr->distance = (uint)-1;
-	fr->from = i = DEREF_INDUSTRY(RandomRange(_total_industries));
+	fr->from = i = GetIndustry(RandomRange(_total_industries));
 	if (i->xy == 0)
 		return;
 	// Randomize cargo type
 	if (Random()&1 && i->produced_cargo[1] != 0xFF) {
 	fr->cargo = cargo;
 	if (cargo == CT_GOODS || cargo == CT_FOOD) {
 		// The destination is a town
-		Town *t = DEREF_TOWN(RandomRange(_total_towns));
+		Town *t = GetTown(RandomRange(_total_towns));
 		// Only want big towns
 		if (t->xy == 0 || t->population < 900)
 			return;
 		fr->distance = GetTileDist(i->xy, t->xy);
 		fr->to = t;
 	} else {
 		// The destination is an industry
-		Industry *i2 = DEREF_INDUSTRY(RandomRange(_total_industries));
+		Industry *i2 = GetIndustry(RandomRange(_total_industries));
 		// The industry must accept the cargo
 		if (i == i2 || i2->xy == 0 ||
 				(cargo != i2->accepts_cargo[0] &&
 				cargo != i2->accepts_cargo[1] &&
 			pair = SetupSubsidyDecodeParam(s, 1);
 			AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
 			s->cargo_type = 0xFF;
 			modified = true;
 		} else if (s->age == 2*12-1) {
-			st = DEREF_STATION(s->to);
+			st = GetStation(s->to);
 			if (st->owner == _local_player) {
 				pair = SetupSubsidyDecodeParam(s, 1);
 				AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b);
 			}
 			s->cargo_type = 0xFF;
 				goto add_subsidy;
 			}
 			FindSubsidyCargoRoute(&fr);
 			if (fr.distance <= 70) {
 				s->cargo_type = fr.cargo;
-				s->from = (Industry*)fr.from - _industries;
+				s->from = ((Industry*)fr.from)->index;
-				s->to = (fr.cargo == CT_GOODS || fr.cargo == CT_FOOD) ? ((Town*)fr.to)->index : (Industry*)fr.to - _industries;
+				s->to = (fr.cargo == CT_GOODS || fr.cargo == CT_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);
 	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) {
-				xy = DEREF_TOWN(s->from)->xy;
+				xy = GetTown(s->from)->xy;
 			} else {
-				xy = (DEREF_INDUSTRY(s->from))->xy;
+				xy = (GetIndustry(s->from))->xy;
 			}
 			if (GetTileDist1D(xy, from->xy) > 9)
 				continue;
 			/* Check distance from dest */
 			if (cargo_type == CT_PASSENGERS || cargo_type == CT_MAIL || cargo_type == CT_GOODS || cargo_type == CT_FOOD) {
-				xy = DEREF_TOWN(s->to)->xy;
+				xy = GetTown(s->to)->xy;
 			} else {
-				xy = (DEREF_INDUSTRY(s->to))->xy;
+				xy = (GetIndustry(s->to))->xy;
 			}
 			if (GetTileDist1D(xy, to->xy) > 9)
 				continue;
 		p->cur_economy.delivered_cargo += num_pieces;
 		SETBIT(p->cargo_types, cargo_type);
 	}
 	// Get station pointers.
-	s_from = DEREF_STATION(source);
+	s_from = GetStation(source);
-	s_to = DEREF_STATION(dest);
+	s_to = GetStation(dest);
 	// Check if a subsidy applies.
 	subsidised = CheckSubsidised(s_from, s_to, cargo_type);
 	// Increase town's counter for some special goods types
 	v->cur_speed = 0;
 	old_player = _current_player;
 	_current_player = v->owner;
-	st = DEREF_STATION(last_visited = v->last_station_visited);
+	st = GetStation(last_visited = v->last_station_visited);
 	for (; v != NULL; v = v->next) {
 		if (v->cargo_cap == 0) continue;
 		ge = &st->goods[v->cargo_type];

changeset 919	544f374ee392
parent 863	6a1444534f62
child 930	ab42e283749d