(svn r16332) -Codechange: replace some -1 + 1 with 'nothing' or <= .. - 1 with < .. - 1 (both caused due to wrapper functions)

5 files changed, 6 insertions, 7 deletions

diff --git a/src/ai/api/ai_sign.cpp b/src/ai/api/ai_sign.cpp
index 8876bbeec..349bf42a1 100644
--- a/src/ai/api/ai_sign.cpp
+++ b/src/ai/api/ai_sign.cpp
@@ -15,7 +15,7 @@
 
 /* static */ SignID AISign::GetMaxSignID()
 {
-	return ::GetMaxSignIndex();
+	return ::Sign::GetPoolSize() - 1;
 }
 
 /* static */ bool AISign::IsValidSign(SignID sign_id)
diff --git a/src/date.cpp b/src/date.cpp
index 129460795..858c65119 100644
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -184,10 +184,9 @@ static const Month _autosave_months[] = {
  */
 static void RunVehicleDayProc(uint daytick)
 {
-	uint total = GetMaxVehicleIndex() + 1;
-	uint i;
+	uint total = Vehicle::GetPoolSize();
 
-	for (i = daytick; i < total; i += DAY_TICKS) {
+	for (uint i = daytick; i < total; i += DAY_TICKS) {
 		Vehicle *v = Vehicle::Get(i);
 
 		if (v->IsValid()) {
diff --git a/src/industry.h b/src/industry.h
index a36fb5ca0..c0f632cf1 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -337,7 +337,7 @@ static inline Industry *GetRandomIndustry()
 		/* Make sure we have a valid industry */
 		while (!Industry::IsValidID(index)) {
 			index++;
-			assert(index <= GetMaxIndustryIndex());
+			assert(index < Industry::GetPoolSize());
 		}
 	}
 
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 17e17e32c..9f896c185 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -318,7 +318,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
 		/* Then, try townnames
 		 * Not that the following assumes all town indices are adjacent, ie no
 		 * towns have been deleted. */
-		if (*item <= (uint)MAX_CLIENT_SLOTS + GetMaxTownIndex()) {
+		if (*item < (uint)MAX_CLIENT_SLOTS + Town::GetPoolSize()) {
 			const Town *t;
 
 			FOR_ALL_TOWNS_FROM(t, *item - MAX_CLIENT_SLOTS) {
diff --git a/src/town.h b/src/town.h
index 3ad04d22e..059040f2f 100644
--- a/src/town.h
+++ b/src/town.h
@@ -327,7 +327,7 @@ static inline Town *GetRandomTown()
 		/* Make sure we have a valid town */
 		while (!Town::IsValidID(index)) {
 			index++;
-			assert(index <= GetMaxTownIndex());
+			assert(index < Town::GetPoolSize());
 		}
 	}