mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11971) -Codechange: use of FOR_ALL_ENGINES/ENGINEIDS_OF_TYPE instead of for-loops

release/0.6
peter1138 2008-01-24 10:47:44 +00:00
parent 9c65bcea7d
commit 697b07c99c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/elrail.cpp
View File

@ -475,7 +475,6 @@ void DrawCatenary(const TileInfo *ti)
int32 SettingsDisableElrail(int32 p1) int32 SettingsDisableElrail(int32 p1)
{ {
EngineID e_id;
Vehicle *v; Vehicle *v;
Player *p; Player *p;
bool disable = (p1 != 0); bool disable = (p1 != 0);
@ -485,8 +484,9 @@ int32 SettingsDisableElrail(int32 p1)
const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC; const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC;
/* walk through all train engines */ /* walk through all train engines */
for (e_id = 0; e_id < NUM_TRAIN_ENGINES; e_id++) { EngineID eid;
RailVehicleInfo *rv_info = &_rail_vehicle_info[e_id]; 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 it is an electric rail engine and its railtype is the wrong one */
if (rv_info->engclass == 2 && rv_info->railtype == old_railtype) { if (rv_info->engclass == 2 && rv_info->railtype == old_railtype) {
/* change it to the proper one */ /* change it to the proper one */

5
src/engine.cpp
View File

@ -342,10 +342,9 @@ static void NewVehicleAvailable(Engine *e)
void EnginesMonthlyLoop() void EnginesMonthlyLoop()
{ {
Engine *e;
if (_cur_year < YEAR_ENGINE_AGING_STOPS) { if (_cur_year < YEAR_ENGINE_AGING_STOPS) {
for (e = _engines; e != endof(_engines); e++) { Engine *e;
FOR_ALL_ENGINES(e) {
/* Age the vehicle */ /* Age the vehicle */
if (e->flags & ENGINE_AVAILABLE && e->age != 0xFFFF) { if (e->flags & ENGINE_AVAILABLE && e->age != 0xFFFF) {
e->age++; e->age++;

3
src/oldloader.cpp
View File

@ -1636,7 +1636,8 @@ static bool LoadOldMain(LoadgameState *ls)
/* Make sure the available engines are really available, otherwise /* Make sure the available engines are really available, otherwise
* we will get a "new vehicle"-spree. */ * 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)) { if (_date >= (e->intro_date + 365)) {
e->flags = (e->flags & ~ENGINE_EXCLUSIVE_PREVIEW) | ENGINE_AVAILABLE; e->flags = (e->flags & ~ENGINE_EXCLUSIVE_PREVIEW) | ENGINE_AVAILABLE;
e->player_avail = (byte)-1; e->player_avail = (byte)-1;