summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2010-07-10 12:45:34 +0000
committeralberth <alberth@openttd.org>2010-07-10 12:45:34 +0000
commit7e0e7fb0e58ab6c1cc2e6763e69f175f876575bf (patch)
treeb067aa7dfb26c7949e8a2824cc631d323c22163c
parent9060a7ac00075e506a9745356a674e55c0b53c2b (diff)
downloadopenttd-7e0e7fb0e58ab6c1cc2e6763e69f175f876575bf.tar.xz
(svn r20109) -Codechange: Make GetFloodingBehaviour() globally usable.
-rw-r--r--src/water.h12
-rw-r--r--src/water_cmd.cpp12
2 files changed, 13 insertions, 11 deletions
diff --git a/src/water.h b/src/water.h
index 62cfc37e2..db52600ee 100644
--- a/src/water.h
+++ b/src/water.h
@@ -16,6 +16,18 @@
#include "company_type.h"
#include "slope_type.h"
+/**
+ * Describes the behaviour of a tile during flooding.
+ */
+enum FloodingBehaviour {
+ FLOOD_NONE, ///< The tile does not flood neighboured tiles.
+ FLOOD_ACTIVE, ///< The tile floods neighboured tiles.
+ FLOOD_PASSIVE, ///< The tile does not actively flood neighboured tiles, but it prevents them from drying up.
+ FLOOD_DRYUP, ///< The tile drys up if it is not constantly flooded from neighboured tiles.
+};
+
+FloodingBehaviour GetFloodingBehaviour(TileIndex tile);
+
void TileLoop_Water(TileIndex tile);
bool FloodHalftile(TileIndex t);
void DoFloodTile(TileIndex target);
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index a83c1aa56..36ec19ca2 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -41,16 +41,6 @@
#include "table/strings.h"
/**
- * Describes the behaviour of a tile during flooding.
- */
-enum FloodingBehaviour {
- FLOOD_NONE, ///< The tile does not flood neighboured tiles.
- FLOOD_ACTIVE, ///< The tile floods neighboured tiles.
- FLOOD_PASSIVE, ///< The tile does not actively flood neighboured tiles, but it prevents them from drying up.
- FLOOD_DRYUP, ///< The tile drys up if it is not constantly flooded from neighboured tiles.
-};
-
-/**
* Describes from which directions a specific slope can be flooded (if the tile is floodable at all).
*/
static const uint8 _flood_from_dirs[] = {
@@ -839,7 +829,7 @@ static void FloodVehicle(Vehicle *v)
*
* @return Behaviour of the tile
*/
-static FloodingBehaviour GetFloodingBehaviour(TileIndex tile)
+FloodingBehaviour GetFloodingBehaviour(TileIndex tile)
{
/* FLOOD_ACTIVE: 'single-corner-raised'-coast, sea, sea-shipdepots, sea-buoys, sea-docks (water part), rail with flooded halftile, sea-water-industries, sea-oilrigs
* FLOOD_DRYUP: coast with more than one corner raised, coast with rail-track, coast with trees