(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme

19 files changed, 18 insertions, 18 deletions

diff --git a/ai/default/default.c b/ai/default/default.c
index 0c874f05e..b0e0f0cc9 100644
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -4,7 +4,7 @@
 #include "../../openttd.h"
 #include "../../functions.h"
 #include "../../map.h"
-#include "../../road.h"
+#include "../../road_map.h"
 #include "../../tile.h"
 #include "../../player.h"
 #include "../../vehicle.h"
diff --git a/ai/trolly/trolly.c b/ai/trolly/trolly.c
index 30eda929e..8e39a7660 100644
--- a/ai/trolly/trolly.c
+++ b/ai/trolly/trolly.c
@@ -21,7 +21,7 @@
 #include "../../openttd.h"
 #include "../../debug.h"
 #include "../../functions.h"
-#include "../../road.h"
+#include "../../road_map.h"
 #include "../../table/strings.h"
 #include "../../map.h"
 #include "../../tile.h"
diff --git a/clear_cmd.c b/clear_cmd.c
index 8577761be..c3ac7c73e 100644
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "table/strings.h"
 #include "functions.h"
 #include "map.h"
diff --git a/clear.h b/clear_map.h
index 819527d95..819527d95 100644
--- a/clear.h
+++ b/clear_map.h
diff --git a/industry_cmd.c b/industry_cmd.c
index ed9ed8f66..c8100e304 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "functions.h"
diff --git a/landscape.c b/landscape.c
index 3e4a312f9..a63c4b866 100644
--- a/landscape.c
+++ b/landscape.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "functions.h"
 #include "map.h"
 #include "player.h"
@@ -14,7 +14,7 @@
 #include "command.h"
 #include "vehicle.h"
 #include "variables.h"
-#include "void.h"
+#include "void_map.h"
 #include "water_map.h"
 
 extern const TileTypeProcs
diff --git a/openttd.c b/openttd.c
index c40555ee6..d1bb13c76 100644
--- a/openttd.c
+++ b/openttd.c
@@ -9,7 +9,7 @@
 #include "strings.h"
 #include "map.h"
 #include "tile.h"
-#include "void.h"
+#include "void_map.h"
 
 #define VARDEF
 #include "openttd.h"
diff --git a/order_gui.c b/order_gui.c
index c1b842617..cf65b2288 100644
--- a/order_gui.c
+++ b/order_gui.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
diff --git a/rail_cmd.c b/rail_cmd.c
index 5a76eed5d..4ce161bb0 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -5,7 +5,7 @@
 #include "debug.h"
 #include "functions.h"
 #include "rail_map.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
diff --git a/road_cmd.c b/road_cmd.c
index 3c2fd26a6..f2eb1f04f 100644
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -3,7 +3,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "rail_map.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
diff --git a/road.h b/road_map.h
index 7ad38d90c..7ad38d90c 100644
--- a/road.h
+++ b/road_map.h
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index d4b485709..f74257a47 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -4,7 +4,7 @@
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
diff --git a/smallmap_gui.c b/smallmap_gui.c
index 03f99eaa3..1820845ca 100644
--- a/smallmap_gui.c
+++ b/smallmap_gui.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "functions.h"
 #include "spritecache.h"
 #include "table/strings.h"
@@ -10,7 +10,7 @@
 #include "map.h"
 #include "tile.h"
 #include "gui.h"
-#include "tree.h"
+#include "tree_map.h"
 #include "window.h"
 #include "gfx.h"
 #include "viewport.h"
diff --git a/terraform_gui.c b/terraform_gui.c
index eeda59bed..b7570c159 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -2,7 +2,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
diff --git a/town_cmd.c b/town_cmd.c
index 1d957a39e..da586af45 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -4,7 +4,7 @@
 #include "openttd.h"
 #include "functions.h"
 #include "strings.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "map.h"
diff --git a/tree_cmd.c b/tree_cmd.c
index 0aeef3db0..5742f916e 100644
--- a/tree_cmd.c
+++ b/tree_cmd.c
@@ -2,14 +2,14 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "clear.h"
+#include "clear_map.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/tree_land.h"
 #include "functions.h"
 #include "map.h"
 #include "tile.h"
-#include "tree.h"
+#include "tree_map.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"
diff --git a/tree.h b/tree_map.h
index 10ca11f05..10ca11f05 100644
--- a/tree.h
+++ b/tree_map.h
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 5f9a9beba..28b92b245 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -7,7 +7,7 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "road.h"
+#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
diff --git a/void.h b/void_map.h
index 22043399a..22043399a 100644
--- a/void.h
+++ b/void_map.h