forked from mirror/OpenTTD
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
-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:
@@ -1051,7 +1051,7 @@ static void UpdateExclusiveRights(void)
|
||||
Town *t;
|
||||
|
||||
FOR_ALL_TOWNS(t) {
|
||||
if (t->xy != 0) t->exclusivity = (byte)-1;
|
||||
t->exclusivity = (byte)-1;
|
||||
}
|
||||
|
||||
/* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete)
|
||||
@@ -1356,7 +1356,7 @@ bool AfterLoadGame(void)
|
||||
Waypoint *wp;
|
||||
|
||||
FOR_ALL_WAYPOINTS(wp) {
|
||||
if (wp->xy != 0 && wp->deleted == 0) {
|
||||
if (wp->deleted == 0) {
|
||||
const StationSpec *statspec = NULL;
|
||||
|
||||
if (HASBIT(_m[wp->xy].m3, 4))
|
||||
@@ -1482,7 +1482,6 @@ bool AfterLoadGame(void)
|
||||
FOR_ALL_INDUSTRIES(i) {
|
||||
uint j;
|
||||
|
||||
if (i->xy == 0) continue;
|
||||
if (i->type == IT_FARM || i->type == IT_FARM_2) {
|
||||
for (j = 0; j != 50; j++) PlantRandomFarmField(i);
|
||||
}
|
||||
|
Reference in New Issue
Block a user