summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-03-05 11:18:34 +0000
committertron <tron@openttd.org>2006-03-05 11:18:34 +0000
commitebec656110fc5f868421f76a6acbc800c5dc77c6 (patch)
tree66502e0eb8bf313576d857e61b7b5801120b0570
parentcc4f5b4e6f8c99eb94dfb5513b4dc807440adf09 (diff)
downloadopenttd-ebec656110fc5f868421f76a6acbc800c5dc77c6.tar.xz
(svn r3765) Fix some naming glitches in r3763 and add missing svn properties
-rw-r--r--clear_map.h4
-rw-r--r--road_map.h4
-rw-r--r--tree_map.h4
-rw-r--r--void_map.h5
4 files changed, 11 insertions, 6 deletions
diff --git a/clear_map.h b/clear_map.h
index 819527d95..69941f209 100644
--- a/clear_map.h
+++ b/clear_map.h
@@ -1,7 +1,7 @@
/* $Id$ */
-#ifndef CLEAR_H
-#define CLEAR_H
+#ifndef CLEAR_MAP_H
+#define CLEAR_MAP_H
#include "macros.h"
#include "tile.h"
diff --git a/road_map.h b/road_map.h
index 7ad38d90c..ec9cd33cc 100644
--- a/road_map.h
+++ b/road_map.h
@@ -1,7 +1,7 @@
/* $Id$ */
-#ifndef ROAD_H
-#define ROAD_H
+#ifndef ROAD_MAP_H
+#define ROAD_MAP_H
#include "macros.h"
#include "rail.h"
diff --git a/tree_map.h b/tree_map.h
index 10ca11f05..c53ad05e8 100644
--- a/tree_map.h
+++ b/tree_map.h
@@ -1,7 +1,7 @@
/* $Id$ */
-#ifndef TREE_H
-#define TREE_H
+#ifndef TREE_MAP_H
+#define TREE_MAP_H
#include "macros.h"
diff --git a/void_map.h b/void_map.h
index 22043399a..f1fe9b6fd 100644
--- a/void_map.h
+++ b/void_map.h
@@ -1,5 +1,8 @@
/* $Id$ */
+#ifndef VOID_MAP_H
+#define VOID_MAP_H
+
static inline void MakeVoid(TileIndex t)
{
SetTileType(t, MP_VOID);
@@ -11,3 +14,5 @@ static inline void MakeVoid(TileIndex t)
_m[t].m5 = 0;
_m[t].extra = 0;
}
+
+#endif