cpp/openttd-patchpack/source Changeset - r21883:c259ee5de9bc

Changeset - r21883:c259ee5de9bc

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 10 years ago 2014-10-23 17:13:44
rubidium@openttd.org

(svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo)

3 files changed with 2 insertions and 3 deletions:

src/clear_map.h

src/map_type.h

src/misc_gui.cpp

0 comments (0 inline, 0 general)

src/clear_map.h

➞

Show inline comments

@@ @@ -264,13 +264,13 @@ static inline void MakeClear(TileIndex t @@
 	_m[t].m1 = 0;
 	SetTileOwner(t, OWNER_NONE);
 	_m[t].m2 = 0;
 	_m[t].m3 = 0;
 	_m[t].m4 = 0 << 5 | 0 << 2;
 	SetClearGroundDensity(t, g, density); // Sets m5
-	_m[t].m6 = 0;
+	_me[t].m6 = 0;
 	_me[t].m7 = 0;
+}
 /**
  * Make a (farm) field tile.

src/map_type.h

➞

Show inline comments

@@ @@ -21,13 +21,12 @@ struct Tile { @@
 	byte   height;      ///< The height of the northern corner.
 	byte   m1;          ///< Primarily used for ownership information
 	uint16 m2;          ///< Primarily used for indices to towns, industries and stations
 	byte   m3;          ///< General purpose
 	byte   m4;          ///< General purpose
 	byte   m5;          ///< General purpose
 	byte   m6;          ///< General purpose
 };
 /**
  * Data that is stored per tile. Also used Tile for this.
  * Look at docs/landscape.html for the exact meaning of the members.
  */

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -127,13 +127,13 @@ public: @@
 		DEBUG(misc, LANDINFOD_LEVEL, "height = %#x", _m[tile].height);
 		DEBUG(misc, LANDINFOD_LEVEL, "m1     = %#x", _m[tile].m1);
 		DEBUG(misc, LANDINFOD_LEVEL, "m2     = %#x", _m[tile].m2);
 		DEBUG(misc, LANDINFOD_LEVEL, "m3     = %#x", _m[tile].m3);
 		DEBUG(misc, LANDINFOD_LEVEL, "m4     = %#x", _m[tile].m4);
 		DEBUG(misc, LANDINFOD_LEVEL, "m5     = %#x", _m[tile].m5);
-		DEBUG(misc, LANDINFOD_LEVEL, "m6     = %#x", _m[tile].m6);
+		DEBUG(misc, LANDINFOD_LEVEL, "m6     = %#x", _me[tile].m6);
 		DEBUG(misc, LANDINFOD_LEVEL, "m7     = %#x", _me[tile].m7);
 #undef LANDINFOD_LEVEL
+	}
 	virtual void OnInit()
+	{

0 comments (0 inline, 0 general)