petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.

Browse Source 
See clear.h for details
This commit is contained in:
tron
2006-02-01 15:31:21 +00:00
parent 2b98509692
commit ac4f4e30d5
7 changed files with 197 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
smallmap_gui.c
View File

@@ -2,6 +2,7 @@
#include "stdafx.h"
#include "openttd.h"
#include "clear.h"
#include "functions.h"
#include "spritecache.h"
#include "table/strings.h"
@@ -458,12 +459,8 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
}
static const uint32 _vegetation_clear_bits[4 + 7] = {
MKCOLOR(0x37373737), ///< bare land
MKCOLOR(0x37373737), ///< 1/3 grass
MKCOLOR(0x37373737), ///< 2/3 grass
static const uint32 _vegetation_clear_bits[] = {
MKCOLOR(0x54545454), ///< full grass
MKCOLOR(0x52525252), ///< rough land
MKCOLOR(0x0A0A0A0A), ///< rocks
MKCOLOR(0x25252525), ///< fields
@@ -476,14 +473,15 @@ static const uint32 _vegetation_clear_bits[4 + 7] = {
static inline uint32 GetSmallMapVegetationPixels(TileIndex tile)
{
TileType t = GetEffectiveTileType(tile);
int i;
uint32 bits;
switch (t) {
case MP_CLEAR:
i = (_m[tile].m5 & 0x1F) - 4;
if (i >= 0) i >>= 2;
bits = _vegetation_clear_bits[i + 4];
if (IsClearGround(tile, CL_GRASS) && GetClearDensity(tile) < 3) {
bits = MKCOLOR(0x37373737);
} else {
bits = _vegetation_clear_bits[GetClearGround(tile)];
}
break;
case MP_INDUSTRY: