summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-05-18 11:18:13 +0200
committerErich Eckner <git@eckner.net>2022-01-16 21:58:17 +0100
commit858aafddb2fa7e3763a310c3cb2890f48a0a2e50 (patch)
tree84adbbe5774c5b43439d04ad0d3d849d06c4d721
parentb7c2e2311529c06d2c79fe7f715db817f1a52b41 (diff)
downloadopenttd-858aafddb2fa7e3763a310c3cb2890f48a0a2e50.tar.xz
fix c++11 problem - hopefully without breaking anything :-)
-rw-r--r--src/map_func.h3
-rw-r--r--src/saveload/map_sl.cpp1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map_func.h b/src/map_func.h
index e00251243..d4993b94b 100644
--- a/src/map_func.h
+++ b/src/map_func.h
@@ -151,13 +151,14 @@ static inline uint LayerMaxY()
return LayerSizeY() - 1;
}
+extern uint _layer_count;
+
/**
* Get the layer counts
* @return the number of layers
*/
static inline uint LayerCount()
{
- extern uint _layer_count;
return _layer_count;
}
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index 29ef2f083..b86328de8 100644
--- a/src/saveload/map_sl.cpp
+++ b/src/saveload/map_sl.cpp
@@ -22,7 +22,6 @@
static uint32 _map_dim_x;
static uint32 _map_dim_y;
-static uint32 _layer_count;
static const SaveLoad _map_desc[] = {
SLEG_CONDVAR("dim_x", _map_dim_x, SLE_UINT32, SLV_6, SL_MAX_VERSION),