cpp/openttd-patchpack/source Changeset - r14833:2e2caf9b1a19

Changeset - r14833:2e2caf9b1a19

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-03-16 16:04:35
yexo@openttd.org

(svn r19435) -Fix: when loading a savegame created with a house newgrf without that newgrf available all houses became tall office blocks

3 files changed with 3 insertions and 3 deletions:

src/newgrf_commons.cpp

src/newgrf_commons.h

src/saveload/town_sl.cpp

0 comments (0 inline, 0 general)

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -136,7 +136,7 @@ uint16 OverrideManagerBase::AddEntityID( @@
  * @param entity_id of the entity being queried
  * @return mapped id
  */
-uint16 OverrideManagerBase::GetSubstituteID(byte entity_id)
+uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id)
+{
 	return mapping_ID[entity_id].substitute_id;
+}

src/newgrf_commons.h

➞

Show inline comments

@@ @@ -57,7 +57,7 @@ public: @@
 	void Add(uint8 local_id, uint32 grfid, uint entity_type);
 	virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
-	uint16 GetSubstituteID(byte entity_id);
+	uint16 GetSubstituteID(uint16 entity_id);
 	virtual uint16 GetID(uint8 grf_local_id, uint32 grfid);
 	inline uint16 GetMaxMapping() { return max_new_entities; }

src/saveload/town_sl.cpp

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ void UpdateHousesAndTowns() @@
 		if (!IsTileType(t, MP_HOUSE)) continue;
-		house_id = GetHouseType(t);
+		house_id = GetCleanHouseType(t);
 		if (!HouseSpec::Get(house_id)->enabled && house_id >= NEW_HOUSE_OFFSET) {
 			/* The specs for this type of house are not available any more, so
 			 * replace it with the substitute original house type. */

0 comments (0 inline, 0 general)