mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r20109) -Codechange: Make GetFloodingBehaviour() globally usable.

This commit is contained in:
alberth 2010-07-10 12:45:34 +00:00
parent 9060a7ac00
commit 7e0e7fb0e5
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/water.h
View File

@ -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);

12
src/water_cmd.cpp
View File

@ -40,16 +40,6 @@
#include "table/sprites.h"
#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).
*/
@ -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