summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-02-26 18:25:03 +0000
committerrubidium <rubidium@openttd.org>2007-02-26 18:25:03 +0000
commitaaeeef3d88333098f2630f2975dfeadcbfa08cbb (patch)
treef70c9827974b8185b970e536e680f84c5c744faf
parentf3f966e61674cf69b52a9e729de51da220b44c30 (diff)
downloadopenttd-aaeeef3d88333098f2630f2975dfeadcbfa08cbb.tar.xz
(svn r8908) -Codechange: declaration of DrawBridgeMiddle does not belong in a map accessors header.
-rw-r--r--src/bridge.h2
-rw-r--r--src/bridge_map.h3
-rw-r--r--src/clear_cmd.cpp1
-rw-r--r--src/rail_cmd.cpp1
-rw-r--r--src/road_cmd.cpp1
-rw-r--r--src/unmovable_cmd.cpp2
-rw-r--r--src/water_cmd.cpp1
7 files changed, 7 insertions, 4 deletions
diff --git a/src/bridge.h b/src/bridge.h
index bf622804d..6690988a5 100644
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -35,4 +35,6 @@ static inline const Bridge *GetBridge(uint i)
return &_bridge[i];
}
+void DrawBridgeMiddle(const TileInfo* ti);
+
#endif /* BRIDGE_H */
diff --git a/src/bridge_map.h b/src/bridge_map.h
index b4ab3a68a..52943a2b5 100644
--- a/src/bridge_map.h
+++ b/src/bridge_map.h
@@ -13,9 +13,6 @@
#include "tile.h"
-void DrawBridgeMiddle(const TileInfo* ti); // XXX
-
-
static inline bool IsBridge(TileIndex t)
{
assert(IsTileType(t, MP_TUNNELBRIDGE));
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index 44e735add..d80876554 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -15,6 +15,7 @@
#include "command.h"
#include "tunnel_map.h"
#include "bridge_map.h"
+#include "bridge.h"
#include "variables.h"
#include "table/sprites.h"
#include "unmovable_map.h"
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index cb4d08c80..549ef4062 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -3,6 +3,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "bridge_map.h"
+#include "bridge.h"
#include "cmd_helper.h"
#include "debug.h"
#include "functions.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index caf24eb29..6266428d5 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -3,6 +3,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "bridge_map.h"
+#include "bridge.h"
#include "cmd_helper.h"
#include "rail_map.h"
#include "road_map.h"
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index b67a1a0a2..49d872576 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -2,7 +2,6 @@
#include "stdafx.h"
#include "openttd.h"
-#include "bridge_map.h"
#include "table/strings.h"
#include "table/sprites.h"
#include "functions.h"
@@ -20,6 +19,7 @@
#include "variables.h"
#include "table/unmovable_land.h"
#include "genworld.h"
+#include "bridge.h"
/** Destroy a HQ.
* During normal gameplay you can only implicitely destroy a HQ when you are
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 61db28030..fb6ea8090 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -3,6 +3,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "bridge_map.h"
+#include "bridge.h"
#include "cmd_helper.h"
#include "station_map.h"
#include "table/sprites.h"