summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--industry.h2
-rw-r--r--industry_cmd.c5
-rw-r--r--town.h2
-rw-r--r--town_cmd.c5
4 files changed, 8 insertions, 6 deletions
diff --git a/industry.h b/industry.h
index 65da9bd0e..e0620f35b 100644
--- a/industry.h
+++ b/industry.h
@@ -99,7 +99,7 @@ static inline IndustryID GetMaxIndustryIndex(void)
* _really_ returns the highest index. Now it just returns
* the next safe value we are sure about everything is below.
*/
- return _total_industries - 1;
+ return GetIndustryPoolSize() - 1;
}
static inline uint GetNumIndustries(void)
diff --git a/industry_cmd.c b/industry_cmd.c
index ec4693304..e360cad95 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -110,6 +110,7 @@ void DestroyIndustry(Industry *i)
}
_industry_sort_dirty = true;
+ _total_industries--;
DeleteSubsidyWithIndustry(i->index);
DeleteWindowById(WC_INDUSTRY_VIEW, i->index);
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
@@ -1361,7 +1362,7 @@ static Industry *AllocateIndustry(void)
if (IsValidIndustry(i)) continue;
- if (i->index >= _total_industries) _total_industries = i->index + 1;
+ _total_industries++;
memset(i, 0, sizeof(*i));
i->index = index;
@@ -1917,7 +1918,7 @@ static void Load_INDY(void)
i = GetIndustry(index);
SlObject(i, _industry_desc);
- if (index >= _total_industries) _total_industries = index + 1;
+ _total_industries++;
}
}
diff --git a/town.h b/town.h
index 50a47c14b..edf6b38d0 100644
--- a/town.h
+++ b/town.h
@@ -171,7 +171,7 @@ static inline TownID GetMaxTownIndex(void)
* _really_ returns the highest index. Now it just returns
* the next safe value we are sure about everything is below.
*/
- return _total_towns - 1;
+ return GetTownPoolSize() - 1;
}
static inline uint GetNumTowns(void)
diff --git a/town_cmd.c b/town_cmd.c
index c56e01b98..98a563e89 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -54,6 +54,7 @@ void DestroyTown(Town *t)
* and remove from list of sorted towns */
DeleteWindowById(WC_TOWN_VIEW, t->index);
_town_sort_dirty = true;
+ _total_towns--;
/* Delete all industries belonging to the town */
FOR_ALL_INDUSTRIES(i) if (i->town == t) DeleteIndustry(i);
@@ -983,7 +984,7 @@ static Town *AllocateTown(void)
if (!IsValidTown(t)) {
TownID index = t->index;
- if (t->index >= _total_towns) _total_towns = t->index + 1;
+ _total_towns++;
memset(t, 0, sizeof(Town));
t->index = index;
@@ -1932,7 +1933,7 @@ static void Load_TOWN(void)
t = GetTown(index);
SlObject(t, _town_desc);
- if ((uint)index >= _total_towns) _total_towns = index + 1;
+ _total_towns++;
}
/* This is to ensure all pointers are within the limits of