diff options
| author | rubidium <rubidium@openttd.org> | 2008-01-15 13:19:49 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-01-15 13:19:49 +0000 |
| commit | 26c621945d36e18cce2e86e0edbac9e525ba77db (patch) | |
| tree | 674e51d7f086d490a4dcb2fded3e60d9f94042d3 /src/town.h | |
| parent | 0078fd1699fc594b46827d3680b31fd79f0d9bd2 (diff) | |
| download | openttd-26c621945d36e18cce2e86e0edbac9e525ba77db.tar.xz | |
(svn r11862) -Fix [FS#1559]: when two NewGRFs 'fight' to define the same cargo it could happen that the strings are defined by one cargo and the 'action2' by another and when one assumes that both come from the same NewGRF... So store the GRF ID with the strings. To be extra sure add the same protection mechanism to industries and towns too.
Diffstat (limited to 'src/town.h')
| -rw-r--r-- | src/town.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/town.h b/src/town.h index c80fa9a13..084e19bff 100644 --- a/src/town.h +++ b/src/town.h @@ -12,7 +12,7 @@ #include "date_type.h" #include "town_type.h" #include "player_type.h" -#include "strings_type.h" +#include "newgrf_string_type.h" enum { HOUSE_NO_CLASS = 0, @@ -170,7 +170,7 @@ struct HouseSpec { Year max_date; ///< 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 + GRFMappedStringID building_name; ///< building name uint16 remove_rating_decrease; ///< rating decrease if removed byte mail_generation; ///< mail generation multiplier (tile based, as the acceptances below) byte cargo_acceptance[3]; ///< acceptance level for the cargo slots |