dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.

Browse Source
This commit is contained in:
frosch
2008-07-26 16:14:10 +00:00
parent c64e3b4882
commit 6684bc12d5
12 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/industry_map.h
View File

@@ -7,7 +7,7 @@
#include "industry.h"
#include "tile_map.h"
#include "water_map.h"
/**
@@ -154,6 +154,17 @@ static inline void SetIndustryGfx(TileIndex t, IndustryGfx gfx)
SB(_m[t].m6, 2, 1, GB(gfx, 8, 1));
}
/**
* Tests if the industry tile was built on water.
* @param t the industry tile
* @return true iff on water
*/
static inline bool IsIndustryTileOnWater(TileIndex t)
{
assert(IsTileType(t, MP_INDUSTRY));
return (GetWaterClass(t) != WATER_CLASS_INVALID);
}
/**
* Make the given tile an industry tile
* @param t the tile to make an industry tile
@@ -161,7 +172,7 @@ static inline void SetIndustryGfx(TileIndex t, IndustryGfx gfx)
* @param gfx the graphics to use for the tile
* @param random the random value
*/
static inline void MakeIndustry(TileIndex t, IndustryID index, IndustryGfx gfx, uint8 random)
static inline void MakeIndustry(TileIndex t, IndustryID index, IndustryGfx gfx, uint8 random, WaterClass wc)
{
SetTileType(t, MP_INDUSTRY);
_m[t].m1 = 0;
@@ -170,6 +181,7 @@ static inline void MakeIndustry(TileIndex t, IndustryID index, IndustryGfx gfx,
_m[t].m4 = 0;
SetIndustryGfx(t, gfx);
_me[t].m7 = random;
SetWaterClass(t, wc);
}
/**