summaryrefslogtreecommitdiff
path: root/economy.c
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-01-19 19:15:03 +0000
committerbjarni <bjarni@openttd.org>2005-01-19 19:15:03 +0000
commit2fd3553d78d6b93fb85d97ae8e98beef5418a9c4 (patch)
tree2bf58365c54d2375ef13ac173631a7846771dc03 /economy.c
parente4a3d284b21a5bbd4ff5c0ad920be28cd4701e8a (diff)
downloadopenttd-2fd3553d78d6b93fb85d97ae8e98beef5418a9c4.tar.xz
(svn r1568) made an enum of train subtypes to make the code more readable
Diffstat (limited to 'economy.c')
-rw-r--r--economy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/economy.c b/economy.c
index f98d3f487..d5ad30114 100644
--- a/economy.c
+++ b/economy.c
@@ -128,7 +128,7 @@ int UpdateCompanyRatingAndValue(Player *p, bool update)
FOR_ALL_VEHICLES(v) {
if (v->owner != owner)
continue;
- if ((v->type == VEH_Train && v->subtype == 0) ||
+ if ((v->type == VEH_Train && v->subtype == TS_Front_Engine) ||
v->type == VEH_Road ||
(v->type == VEH_Aircraft && v->subtype<=2) ||
v->type == VEH_Ship) {
@@ -310,7 +310,7 @@ void ChangeOwnershipOfPlayerItems(byte old_player, byte new_player)
// Determine Ids for the new vehicles
FOR_ALL_VEHICLES(v) {
if (v->owner == new_player) {
- if (v->type == VEH_Train && v->subtype == 0)
+ if (v->type == VEH_Train && v->subtype == TS_Front_Engine)
num_train++;
else if (v->type == VEH_Road)
num_road++;
@@ -330,7 +330,7 @@ void ChangeOwnershipOfPlayerItems(byte old_player, byte new_player)
DeleteVehicle(v);
} else {
v->owner = new_player;
- if (v->type == VEH_Train && v->subtype == 0)
+ if (v->type == VEH_Train && v->subtype == TS_Front_Engine)
v->unitnumber = ++num_train;
else if (v->type == VEH_Road)
v->unitnumber = ++num_road;
@@ -1297,7 +1297,7 @@ static bool LoadWait(const Vehicle *v, const Vehicle *u) {
}
FOR_ALL_VEHICLES(x) {
- if ((x->type != VEH_Train || x->subtype == 0) && // for all locs
+ if ((x->type != VEH_Train || x->subtype == TS_Front_Engine) && // for all locs
u->last_station_visited == x->last_station_visited && // at the same station
!(x->vehstatus & VS_STOPPED) && // not stopped
x->current_order.type == OT_LOADING && // loading