summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-10-23 17:13:44 +0000
committerrubidium <rubidium@openttd.org>2014-10-23 17:13:44 +0000
commit8739a7b7d0d069130abd291bf4a23d30d3559da9 (patch)
tree60610c8827f0ac97c11dd59c6df259216e36d385
parent1d27ae9bdaa056b37de19233354ee76b43f0aad4 (diff)
downloadopenttd-8739a7b7d0d069130abd291bf4a23d30d3559da9.tar.xz
(svn r27037) -Fix [FS#6150] (r26878): m6 was moved from Tile To TileExtended, but it wasn't properly removed from Tile (patch by Juanjo)
-rw-r--r--src/clear_map.h2
-rw-r--r--src/map_type.h1
-rw-r--r--src/misc_gui.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/clear_map.h b/src/clear_map.h
index bd48c079a..76b1e82d0 100644
--- a/src/clear_map.h
+++ b/src/clear_map.h
@@ -267,7 +267,7 @@ static inline void MakeClear(TileIndex t, ClearGround g, uint density)
_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;
}
diff --git a/src/map_type.h b/src/map_type.h
index 327f6d28f..9ac1c2b09 100644
--- a/src/map_type.h
+++ b/src/map_type.h
@@ -24,7 +24,6 @@ struct Tile {
byte m3; ///< General purpose
byte m4; ///< General purpose
byte m5; ///< General purpose
- byte m6; ///< General purpose
};
/**
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 49e375d65..1ed7444bc 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -130,7 +130,7 @@ public:
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
}