Mercurial Mercurial > openttd-mini / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
authortron
Sat, 29 Jan 2005 12:19:05 +0000
changeset 1209 2e00193652b2
parent 1208 11d5223ecbcc
child 1210 981b36779dd7
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
ai.c file | annotate | diff | comparison | revisions
ai_build.c file | annotate | diff | comparison | revisions
ai_new.c file | annotate | diff | comparison | revisions
ai_pathfinder.c file | annotate | diff | comparison | revisions
aircraft_cmd.c file | annotate | diff | comparison | revisions
aircraft_gui.c file | annotate | diff | comparison | revisions
clear_cmd.c file | annotate | diff | comparison | revisions
disaster_cmd.c file | annotate | diff | comparison | revisions
industry_cmd.c file | annotate | diff | comparison | revisions
landscape.c file | annotate | diff | comparison | revisions
main_gui.c file | annotate | diff | comparison | revisions
map.h file | annotate | diff | comparison | revisions
oldloader.c file | annotate | diff | comparison | revisions
order_gui.c file | annotate | diff | comparison | revisions
pathfind.c file | annotate | diff | comparison | revisions
rail_cmd.c file | annotate | diff | comparison | revisions
rail_gui.c file | annotate | diff | comparison | revisions
road_cmd.c file | annotate | diff | comparison | revisions
road_gui.c file | annotate | diff | comparison | revisions
roadveh_cmd.c file | annotate | diff | comparison | revisions
ship_cmd.c file | annotate | diff | comparison | revisions
smallmap_gui.c file | annotate | diff | comparison | revisions
station_cmd.c file | annotate | diff | comparison | revisions
tile.h file | annotate | diff | comparison | revisions
town_cmd.c file | annotate | diff | comparison | revisions
train_cmd.c file | annotate | diff | comparison | revisions
tree_cmd.c file | annotate | diff | comparison | revisions
ttd.c file | annotate | diff | comparison | revisions
tunnelbridge_cmd.c file | annotate | diff | comparison | revisions
unmovable_cmd.c file | annotate | diff | comparison | revisions
vehicle.c file | annotate | diff | comparison | revisions
water_cmd.c file | annotate | diff | comparison | revisions 
--- a/ai.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ai.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "map.h"
+#include "tile.h"
 #include "player.h"
 #include "vehicle.h"
 #include "engine.h"
--- a/ai_build.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ai_build.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "map.h"
+#include "tile.h"
 #include "command.h"
 #include "ai.h"
 #include "engine.h"
--- a/ai_new.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ai_new.c	Sat Jan 29 12:19:05 2005 +0000
@@ -17,6 +17,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "command.h"
 #include "ai.h"
 #include "town.h"
--- a/ai_pathfinder.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ai_pathfinder.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "map.h"
+#include "tile.h"
 #include "command.h"
 #include "ai.h"
 
--- a/aircraft_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/aircraft_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
--- a/aircraft_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/aircraft_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "window.h"
 #include "gui.h"
 #include "vehicle.h"
--- a/clear_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/clear_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "viewport.h"
 #include "command.h"
 
--- a/disaster_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/disaster_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "command.h"
 #include "news.h"
--- a/industry_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/industry_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "viewport.h"
 #include "command.h"
 #include "industry.h"
--- a/landscape.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/landscape.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "map.h"
+#include "tile.h"
 #include <stdarg.h>
 #include "gfx.h"
 #include "viewport.h"
--- a/main_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/main_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/map.h	Sat Jan 29 12:01:36 2005 +0000
+++ b/map.h	Sat Jan 29 12:19:05 2005 +0000
@@ -76,42 +76,4 @@
 	return ToTileIndexDiff(_tileoffs_by_dir[dir]);
 }
 
-
-static inline uint TileHeight(TileIndex tile)
-{
-	assert(tile < MapSize());
-	return _map_type_and_height[tile] & 0xf;
-}
-
-static inline void SetTileHeight(TileIndex tile, uint height)
-{
-	assert(tile < MapSize());
-	assert(height < 16);
-	_map_type_and_height[tile] &= ~0x0F;
-	_map_type_and_height[tile] |= height;
-}
-
-static inline uint TilePixelHeight(TileIndex tile)
-{
-	return TileHeight(tile) * 8;
-}
-
-static inline int TileType(TileIndex tile)
-{
-	assert(tile < MapSize());
-	return _map_type_and_height[tile] >> 4;
-}
-
-static inline void SetTileType(TileIndex tile, uint type)
-{
-	assert(tile < MapSize());
-	_map_type_and_height[tile] &= ~0xF0;
-	_map_type_and_height[tile] |= type << 4;
-}
-
-static inline bool IsTileType(TileIndex tile, int type)
-{
-	return TileType(tile) == type;
-}
-
 #endif
--- a/oldloader.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/oldloader.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "town.h"
 #include "industry.h"
 #include "station.h"
--- a/order_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/order_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
--- a/pathfind.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/pathfind.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "map.h"
+#include "tile.h"
 #include "pathfind.h"
 
 // remember which tiles we have already visited so we don't visit them again.
--- a/rail_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/rail_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -3,6 +3,7 @@
 #include "table/strings.h"
 #include "gfx.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/rail_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/rail_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/road_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/road_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/road_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/road_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/roadveh_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/roadveh_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
--- a/ship_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ship_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
--- a/smallmap_gui.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/smallmap_gui.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "gui.h"
 #include "window.h"
 #include "gfx.h"
--- a/station_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/station_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "station.h"
 #include "gfx.h"
 #include "window.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tile.h	Sat Jan 29 12:19:05 2005 +0000
@@ -0,0 +1,43 @@
+#ifndef TILE_H
+#define TILE_H
+
+#include "map.h"
+
+static inline uint TileHeight(TileIndex tile)
+{
+	assert(tile < MapSize());
+	return _map_type_and_height[tile] & 0xf;
+}
+
+static inline void SetTileHeight(TileIndex tile, uint height)
+{
+	assert(tile < MapSize());
+	assert(height < 16);
+	_map_type_and_height[tile] &= ~0x0F;
+	_map_type_and_height[tile] |= height;
+}
+
+static inline uint TilePixelHeight(TileIndex tile)
+{
+	return TileHeight(tile) * 8;
+}
+
+static inline int TileType(TileIndex tile)
+{
+	assert(tile < MapSize());
+	return _map_type_and_height[tile] >> 4;
+}
+
+static inline void SetTileType(TileIndex tile, uint type)
+{
+	assert(tile < MapSize());
+	_map_type_and_height[tile] &= ~0xF0;
+	_map_type_and_height[tile] |= type << 4;
+}
+
+static inline bool IsTileType(TileIndex tile, int type)
+{
+	return TileType(tile) == type;
+}
+
+#endif
--- a/town_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/town_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "viewport.h"
 #include "town.h"
 #include "command.h"
--- a/train_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/train_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
--- a/tree_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/tree_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"
--- a/ttd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/ttd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 
 #define VARDEF
 #include "ttd.h"
--- a/tunnelbridge_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/tunnelbridge_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/unmovable_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/unmovable_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "command.h"
 #include "viewport.h"
 #include "player.h"
--- a/vehicle.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/vehicle.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "gfx.h"
 #include "viewport.h"
--- a/water_cmd.c	Sat Jan 29 12:01:36 2005 +0000
+++ b/water_cmd.c	Sat Jan 29 12:19:05 2005 +0000
@@ -2,6 +2,7 @@
 #include "ttd.h"
 #include "table/strings.h"
 #include "map.h"
+#include "tile.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
openttd-mini