(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.

1 files changed, 3 insertions, 3 deletions

diff --git a/strings.c b/strings.c
index 6945d9443..041a40ac1 100644
--- a/strings.c
+++ b/strings.c
@@ -673,7 +673,7 @@ static char *FormatString(char *buff, const char *str, const int32 *argv, uint c
 				int32 args[2];
 
 				// industry not valid anymore?
-				if (i->xy == 0) break;
+				if (!IsValidIndustry(i)) break;
 
 				// First print the town name and the industry type name
 				// The string STR_INDUSTRY_PATTERN controls the formatting
@@ -829,7 +829,7 @@ static char *FormatString(char *buff, const char *str, const int32 *argv, uint c
 			const Station* st = GetStation(GetInt32(&argv));
 			int32 temp[2];
 
-			if (st->xy == 0) { // station doesn't exist anymore
+			if (!IsValidStation(st)) { // station doesn't exist anymore
 				buff = GetStringWithArgs(buff, STR_UNKNOWN_DESTINATION, NULL);
 				break;
 			}
@@ -842,7 +842,7 @@ static char *FormatString(char *buff, const char *str, const int32 *argv, uint c
 			const Town* t = GetTown(GetInt32(&argv));
 			int32 temp[1];
 
-			assert(t->xy != 0);
+			assert(IsValidTown(t));
 
 			temp[0] = t->townnameparts;
 			buff = GetStringWithArgs(buff, t->townnametype, temp);