cpp/openttd-patchpack/source Changeset - r20824:947e971df341

Changeset - r20824:947e971df341

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

planetmaker - 11 years ago 2013-10-16 19:11:34
planetmaker@openttd.org

(svn r25868) -Fix (r25650): Initialization of default objects swapped costs and dates

2 files changed with 5 insertions and 2 deletions:

src/newgrf_object.h

src/table/object_land.h

0 comments (0 inline, 0 general)

src/newgrf_object.h

➞

Show inline comments

@@ @@ -49,13 +49,16 @@ enum ObjectClassID { @@
 	OBJECT_CLASS_MAX     = 0xFF, ///< Maximum number of classes.
 	INVALID_OBJECT_CLASS = 0xFF, ///< Class for the less fortunate.
 };
 /** 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
 	ObjectClassID cls_id;         ///< The class to which this spec belongs.
 	StringID name;                ///< The name for this object.

src/table/object_land.h

➞

Show inline comments

@@ @@ -120,13 +120,13 @@ static const DrawTileSprites _object_hq[ @@
 	TILE_SPRITE_LINE(SPR_HUGEHQ_EAST_GROUND,   _object_hq_huge_east)
 	TILE_SPRITE_LINE(SPR_HUGEHQ_SOUTH,         _object_nothing)
 };
 #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[] = {
 	M(STR_LAI_OBJECT_DESCRIPTION_TRANSMITTER,          0x11,   0,   0, 10, OBJECT_FLAG_CANNOT_REMOVE | OBJECT_FLAG_ONLY_IN_SCENEDIT),
 	M(STR_LAI_OBJECT_DESCRIPTION_LIGHTHOUSE,           0x11,   0,   0,  8, OBJECT_FLAG_CANNOT_REMOVE | OBJECT_FLAG_ONLY_IN_SCENEDIT),
 	M(STR_TOWN_BUILDING_NAME_STATUE_1,                 0x11,   0,   0,  5, OBJECT_FLAG_CANNOT_REMOVE | OBJECT_FLAG_ONLY_IN_GAME | OBJECT_FLAG_ONLY_IN_SCENEDIT), // Yes, we disallow building this everywhere. Happens in "special" case!

0 comments (0 inline, 0 general)