summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2008-01-24 10:47:44 +0000
committerpeter1138 <peter1138@openttd.org>2008-01-24 10:47:44 +0000
commit697b07c99c970ace193eb15fed49ae9de79031e1 (patch)
treecc0c41718a8b741964a2d843daea8ce4fadaedb8
parent9c65bcea7d41900b49d2b9ee7580018da9ee785a (diff)
downloadopenttd-697b07c99c970ace193eb15fed49ae9de79031e1.tar.xz
(svn r11971) -Codechange: use of FOR_ALL_ENGINES/ENGINEIDS_OF_TYPE instead of for-loops
-rw-r--r--src/elrail.cpp6
-rw-r--r--src/engine.cpp5
-rw-r--r--src/oldloader.cpp3
3 files changed, 7 insertions, 7 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp
index d2a6fcba9..600909c4c 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -475,7 +475,6 @@ void DrawCatenary(const TileInfo *ti)
int32 SettingsDisableElrail(int32 p1)
{
- EngineID e_id;
Vehicle *v;
Player *p;
bool disable = (p1 != 0);
@@ -485,8 +484,9 @@ int32 SettingsDisableElrail(int32 p1)
const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC;
/* walk through all train engines */
- for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) {
- RailVehicleInfo *rv_info = &_rail_vehicle_info[e_id];
+ EngineID eid;
+ FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_TRAIN) {
+ RailVehicleInfo *rv_info = &_rail_vehicle_info[eid];
/* if it is an electric rail engine and its railtype is the wrong one */
if (rv_info->engclass == 2 && rv_info->railtype == old_railtype) {
/* change it to the proper one */
diff --git a/src/engine.cpp b/src/engine.cpp
index 74e581588..9ef09432d 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -342,10 +342,9 @@ static void NewVehicleAvailable(Engine *e)
void EnginesMonthlyLoop()
{
- Engine *e;
-
if (_cur_year < YEAR_ENGINE_AGING_STOPS) {
- for (e = _engines; e != endof(_engines); e++) {
+ Engine *e;
+ FOR_ALL_ENGINES(e) {
/* Age the vehicle */
if (e->flags & ENGINE_AVAILABLE && e->age != 0xFFFF) {
e->age++;
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index 190824503..68a07ca2a 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -1636,7 +1636,8 @@ static bool LoadOldMain(LoadgameState *ls)
/* Make sure the available engines are really available, otherwise
* we will get a "new vehicle"-spree. */
- for (Engine *e = _engines; e != endof(_engines); e++) {
+ Engine *e;
+ FOR_ALL_ENGINES(e) {
if (_date >= (e->intro_date + 365)) {
e->flags = (e->flags & ~ENGINE_EXCLUSIVE_PREVIEW) | ENGINE_AVAILABLE;
e->player_avail = (byte)-1;