dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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.

Browse Source
This commit is contained in:
rubidium
2008-01-15 13:19:49 +00:00
parent 0078fd1699
commit 26c621945d
8 changed files with 102 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cargotype.h
View File

@@ -7,7 +7,7 @@
#include "cargo_type.h"
#include "gfx_type.h"
#include "strings_type.h"
#include "newgrf_string_type.h"
typedef uint32 CargoLabel;
@@ -36,11 +36,11 @@ struct CargoSpec {
uint16 multipliertowngrowth;
uint8 callback_mask;
StringID name;
StringID name_single;
StringID units_volume;
StringID quantifier;
StringID abbrev;
GRFMappedStringID name;
GRFMappedStringID name_single;
GRFMappedStringID units_volume;
GRFMappedStringID quantifier;
GRFMappedStringID abbrev;
SpriteID sprite;