Files
@ r3478:523ece58cb16
Branch filter:
Location: cpp/openttd-patchpack/source/clear_map.h - annotation
r3478:523ece58cb16
2.8 KiB
text/x-c
(svn r4323) -Regression: Clear the slot assignments of all vehicles heading twoards a road stop if that road stop gets removed
This issue was fixed in r2210 and reintroduced in r4259 when the multistop handling was overhauled.
This issue was fixed in r2210 and reintroduced in r4259 when the multistop handling was overhauled.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | r3144:5b175fed4b0b r3144:5b175fed4b0b r3145:90ae47e0a047 r3145:90ae47e0a047 r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3447:1cf4fdb2e0fa r3447:1cf4fdb2e0fa r3447:1cf4fdb2e0fa r3447:1cf4fdb2e0fa r3447:1cf4fdb2e0fa r3447:1cf4fdb2e0fa r3144:5b175fed4b0b r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3369:c4df9e1f62cd r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3447:1cf4fdb2e0fa r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3447:1cf4fdb2e0fa r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3369:c4df9e1f62cd r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3291:61565778b538 r3447:1cf4fdb2e0fa r3144:5b175fed4b0b r3144:5b175fed4b0b r3144:5b175fed4b0b | /* $Id$ */
#ifndef CLEAR_MAP_H
#define CLEAR_MAP_H
#include "macros.h"
#include "tile.h"
/* ground type, m5 bits 2...4
* valid densities (bits 0...1) in comments after the enum
*/
typedef enum ClearGround {
CLEAR_GRASS = 0, // 0-3
CLEAR_ROUGH = 1, // 3
CLEAR_ROCKS = 2, // 3
CLEAR_FIELDS = 3, // 3
CLEAR_SNOW = 4, // 0-3
CLEAR_DESERT = 5 // 1,3
} ClearGround;
static inline ClearGround GetClearGround(TileIndex t)
{
assert(IsTileType(t, MP_CLEAR));
return GB(_m[t].m5, 2, 3);
}
static inline bool IsClearGround(TileIndex t, ClearGround ct)
{
return GetClearGround(t) == ct;
}
static inline uint GetClearDensity(TileIndex t)
{
assert(IsTileType(t, MP_CLEAR));
return GB(_m[t].m5, 0, 2);
}
static inline void AddClearDensity(TileIndex t, int d)
{
assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
_m[t].m5 += d;
}
static inline uint GetClearCounter(TileIndex t)
{
assert(IsTileType(t, MP_CLEAR));
return GB(_m[t].m5, 5, 3);
}
static inline void AddClearCounter(TileIndex t, int c)
{
assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
_m[t].m5 += c << 5;
}
static inline void SetClearCounter(TileIndex t, uint c)
{
assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
SB(_m[t].m5, 5, 3, c);
}
/* Sets type and density in one go, also sets the counter to 0 */
static inline void SetClearGroundDensity(TileIndex t, ClearGround type, uint density)
{
assert(IsTileType(t, MP_CLEAR)); // XXX incomplete
_m[t].m5 = 0 << 5 | type << 2 | density;
}
static inline uint GetFieldType(TileIndex t)
{
assert(GetClearGround(t) == CLEAR_FIELDS);
return GB(_m[t].m3, 0, 4);
}
static inline void SetFieldType(TileIndex t, uint f)
{
assert(GetClearGround(t) == CLEAR_FIELDS); // XXX incomplete
SB(_m[t].m3, 0, 4, f);
}
/* Is used by tree tiles, too */
static inline uint GetFenceSE(TileIndex t)
{
assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES));
return GB(_m[t].m4, 2, 3);
}
static inline void SetFenceSE(TileIndex t, uint h)
{
assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)); // XXX incomplete
SB(_m[t].m4, 2, 3, h);
}
static inline uint GetFenceSW(TileIndex t)
{
assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES));
return GB(_m[t].m4, 5, 3);
}
static inline void SetFenceSW(TileIndex t, uint h)
{
assert(IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)); // XXX incomplete
SB(_m[t].m4, 5, 3, h);
}
static inline void MakeClear(TileIndex t, ClearGround g, uint density)
{
SetTileType(t, MP_CLEAR);
SetTileOwner(t, OWNER_NONE);
_m[t].m2 = 0;
_m[t].m3 = 0;
_m[t].m4 = 0 << 5 | 0 << 2;
SetClearGroundDensity(t, g, density);
}
static inline void MakeField(TileIndex t, uint field_type)
{
SetTileType(t, MP_CLEAR);
SetTileOwner(t, OWNER_NONE);
_m[t].m2 = 0;
_m[t].m3 = field_type;
_m[t].m4 = 0 << 5 | 0 << 2;
SetClearGroundDensity(t, CLEAR_FIELDS, 3);
}
#endif
|