diff options
| author | planetmaker <planetmaker@openttd.org> | 2013-10-16 19:11:34 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2013-10-16 19:11:34 +0000 |
| commit | f5e408fa1c9a8de586e532d517d4e6da10ef09cb (patch) | |
| tree | 5386e852cf8ea2597fc7e3aaf8385b4754652334 | |
| parent | 5ab204c8a170e692835e126daa00987c5f0217b6 (diff) | |
| download | openttd-f5e408fa1c9a8de586e532d517d4e6da10ef09cb.tar.xz | |
(svn r25868) -Fix (r25650): Initialization of default objects swapped costs and dates
| -rw-r--r-- | src/newgrf_object.h | 5 | ||||
| -rw-r--r-- | src/table/object_land.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/newgrf_object.h b/src/newgrf_object.h index 2d9fe5665..2c01b42d4 100644 --- a/src/newgrf_object.h +++ b/src/newgrf_object.h @@ -52,7 +52,10 @@ enum ObjectClassID { /** Allow incrementing of ObjectClassID variables */ DECLARE_POSTFIX_INCREMENT(ObjectClassID) -/** An object that isn't use for transport, industries or houses. */ +/** An object that isn't use for transport, industries or houses. + * @note If you change this struct, adopt the initialization of + * default objects in table/object_land.h + */ struct ObjectSpec { /* 2 because of the "normal" and "buy" sprite stacks. */ GRFFilePropsBase<2> grf_prop; ///< Properties related the the grf file diff --git a/src/table/object_land.h b/src/table/object_land.h index ed15a11bf..685178ef7 100644 --- a/src/table/object_land.h +++ b/src/table/object_land.h @@ -123,7 +123,7 @@ static const DrawTileSprites _object_hq[] = { #undef TILE_SPRITE_LINE -#define M(name, size, build_cost_multiplier, clear_cost_multiplier, height, flags) { GRFFilePropsBase<2>(), INVALID_OBJECT_CLASS, name, 0xF, size, 0, 0, build_cost_multiplier, clear_cost_multiplier, flags, {0, 0, 0, 0}, 0, height, 1, true } +#define M(name, size, build_cost_multiplier, clear_cost_multiplier, height, flags) { GRFFilePropsBase<2>(), INVALID_OBJECT_CLASS, name, 0xF, size, build_cost_multiplier, clear_cost_multiplier, 0, 0, flags, {0, 0, 0, 0}, 0, height, 1, true } /** Specification of the original object structures. */ extern const ObjectSpec _original_objects[] = { |