summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/newgrf.cpp14
-rw-r--r--src/table/town_land.h4
-rw-r--r--src/town.h4
-rw-r--r--src/town_cmd.cpp2
4 files changed, 12 insertions, 12 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index c74ef7a24..a3de39f51 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1404,7 +1404,7 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in
* date before 1930, as this breaks the build date stuff.
* @see FinaliseHouseArray() for more details.
*/
- if (housespec->min_date < 1930) housespec->min_date = 1930;
+ if (housespec->min_year < 1930) housespec->min_year = 1930;
_loaded_newgrf_features.has_newhouses = true;
} break;
@@ -1415,8 +1415,8 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in
case 0x0A: { // Availability years
uint16 years = grf_load_word(&buf);
- housespec->min_date = GB(years, 0, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 0, 8);
- housespec->max_date = GB(years, 8, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 8, 8);
+ housespec->min_year = GB(years, 0, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 0, 8);
+ housespec->max_year = GB(years, 8, 8) > 150 ? MAX_YEAR : ORIGINAL_BASE_YEAR + GB(years, 8, 8);
} break;
case 0x0B: // Population
@@ -5585,7 +5585,7 @@ static void FinaliseHouseArray()
* On the other hand, why 1930? Just 'fix' the houses with the lowest
* minimum introduction date to 0.
*/
- Year min_date = MAX_YEAR;
+ Year min_year = MAX_YEAR;
for (GRFFile *file = _first_grffile; file != NULL; file = file->next) {
if (file->housespec == NULL) continue;
@@ -5594,16 +5594,16 @@ static void FinaliseHouseArray()
HouseSpec *hs = file->housespec[i];
if (hs != NULL) {
_house_mngr.SetEntitySpec(hs);
- if (hs->min_date < min_date) min_date = hs->min_date;
+ if (hs->min_year < min_year) min_year = hs->min_year;
}
}
}
- if (min_date != 0) {
+ if (min_year != 0) {
for (int i = 0; i < HOUSE_MAX; i++) {
HouseSpec *hs = GetHouseSpecs(i);
- if (hs->enabled && hs->min_date == min_date) hs->min_date = 0;
+ if (hs->enabled && hs->min_year == min_year) hs->min_year = 0;
}
}
}
diff --git a/src/table/town_land.h b/src/table/town_land.h
index 3c1980dd8..b3399e873 100644
--- a/src/table/town_land.h
+++ b/src/table/town_land.h
@@ -1809,8 +1809,8 @@ static const HouseSpec _original_house_specs[] = {
/**
* remove_rating_decrease
* | mail_generation
- * min_date | | 1st CargoID acceptance
- * | max_date | | | 2nd CargoID acceptance
+ * min_year | | 1st CargoID acceptance
+ * | max_year | | | 2nd CargoID acceptance
* | | population | | | | 3th CargoID acceptance
* | | | removal_cost | | | | |
* | | | | building_name | | | | |
diff --git a/src/town.h b/src/town.h
index 53de13ce5..89246f5aa 100644
--- a/src/town.h
+++ b/src/town.h
@@ -212,8 +212,8 @@ inline TownLayout Town::GetActiveLayout() const
struct HouseSpec {
/* Standard properties */
- Year min_date; ///< introduction year of the house
- Year max_date; ///< last year it can be built
+ Year min_year; ///< introduction year of the house
+ Year max_year; ///< last year it can be built
byte population; ///< population (Zero on other tiles in multi tile house.)
byte removal_cost; ///< cost multiplier for removing it
StringID building_name; ///< building name
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 2967e11da..5314803ec 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -1931,7 +1931,7 @@ static bool BuildTownHouse(Town *t, TileIndex tile)
}
}
- if (_cur_year < hs->min_date || _cur_year > hs->max_date) continue;
+ if (_cur_year < hs->min_year || _cur_year > hs->max_year) continue;
/* Special houses that there can be only one of. */
uint oneof = 0;