summaryrefslogtreecommitdiff
path: root/signs.h
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
committertruelight <truelight@openttd.org>2006-08-22 18:15:17 +0000
commitb23f719ab91a34be3e9d44d1165c789edd4df513 (patch)
tree8fdd9f9cb1552a9d33e7f6c2bbdeccff776cfc62 /signs.h
parent1331b4aa9a525bb87c76c38bbc42d33d099bd026 (diff)
downloadopenttd-b23f719ab91a34be3e9d44d1165c789edd4df513.tar.xz
(svn r6053) -Codechange: renamed all IsXXXIndex to IsValidXXXID
-Codechange: IsValidXXXID now also checks if XXX is really valid, not if the number is within range Both changes again in preperation of the new mem-pool system, which requires this. IsValidXXXID is not a bit less pretty, but that will be cleaned up after the new mem-pool system
Diffstat (limited to 'signs.h')
-rw-r--r--signs.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/signs.h b/signs.h
index 78d1e32e4..ce74cd38b 100644
--- a/signs.h
+++ b/signs.h
@@ -34,11 +34,6 @@ static inline uint16 GetSignPoolSize(void)
return _sign_pool.total_items;
}
-static inline bool IsSignIndex(uint index)
-{
- return index < GetSignPoolSize();
-}
-
/**
* Check if a Sign really exists.
*/
@@ -47,6 +42,11 @@ static inline bool IsValidSign(const Sign *si)
return si->str != STR_NULL;
}
+static inline bool IsValidSignID(uint index)
+{
+ return index < GetSignPoolSize() && IsValidSign(GetSign(index));
+}
+
#define FOR_ALL_SIGNS_FROM(ss, start) for (ss = GetSign(start); ss != NULL; ss = (ss->index + 1 < GetSignPoolSize()) ? GetSign(ss->index + 1) : NULL) if (IsValidSign(ss))
#define FOR_ALL_SIGNS(ss) FOR_ALL_SIGNS_FROM(ss, 0)