petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones

Browse Source 
-Codechange: use IsValidXXX where ever possible
  Note: both changes to prepare for new pool system, which needs those changes.
  For every pool there are 2 ugly lines, which will be removed when done
  implementing new pool system.
  Based on FS#13 by blathijs, partly implemented.
This commit is contained in:
truelight
2006-08-22 15:33:35 +00:00
parent 4c2abf1de5
commit 0461d89612
38 changed files with 331 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
disaster_cmd.c
View File

@@ -724,7 +724,7 @@ static void Disaster0_Init(void)
x = TileX(Random()) * TILE_SIZE + TILE_SIZE / 2;
FOR_ALL_STATIONS(st) {
if (st->xy && st->airport_tile != 0 &&
if (st->airport_tile != 0 &&
st->airport_type <= 1 &&
IS_HUMAN_PLAYER(st->owner)) {
x = (TileX(st->xy) + 2) * TILE_SIZE;
@@ -774,8 +774,7 @@ static void Disaster2_Init(void)
found = NULL;
FOR_ALL_INDUSTRIES(i) {
if (i->xy != 0 &&
i->type == IT_OIL_REFINERY &&
if (i->type == IT_OIL_REFINERY &&
(found == NULL || CHANCE16(1, 2))) {
found = i;
}
@@ -808,8 +807,7 @@ static void Disaster3_Init(void)
found = NULL;
FOR_ALL_INDUSTRIES(i) {
if (i->xy != 0 &&
i->type == IT_FACTORY &&
if (i->type == IT_FACTORY &&
(found==NULL || CHANCE16(1,2))) {
found = i;
}
@@ -919,7 +917,7 @@ static void Disaster7_Init(void)
const Industry* i;
FOR_ALL_INDUSTRIES(i) {
if (i->xy != 0 && i->type == IT_COAL_MINE && --index < 0) {
if (i->type == IT_COAL_MINE && --index < 0) {
SetDParam(0, i->town->index);
AddNewsItem(STR_B005_COAL_MINE_SUBSIDENCE_LEAVES,
NEWS_FLAGS(NM_THIN,NF_VIEWPORT|NF_TILE,NT_ACCIDENT,0), i->xy + TileDiffXY(1, 1), 0);