Files
@ r5258:3db190a590f0
Branch filter:
Location: cpp/openttd-patchpack/source/town_map.h - annotation
r5258:3db190a590f0
4.7 KiB
text/x-c
(svn r7388) -Fix (r7384 / r7368 / r3757): When adding a new news item for the first time (_latest_news
is INVALID_NEWS), make it the value of _oldest_news, not zero as DeleteVehicleNews can
change _oldest_news. Also remove the (i == INVALID_NEWS) return 0; guard from increaseIndex
as it's only used in 2 places, nowhere else.
is INVALID_NEWS), make it the value of _oldest_news, not zero as DeleteVehicleNews can
change _oldest_news. Also remove the (i == INVALID_NEWS) return 0; guard from increaseIndex
as it's only used in 2 places, nowhere else.
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 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 | r3319:82a855f31227 r3319:82a855f31227 r3432:2032d27d90cf r3432:2032d27d90cf r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3319:82a855f31227 r3319:82a855f31227 r3377:dd7adcd8c8fd r3377:dd7adcd8c8fd r3377:dd7adcd8c8fd r3377:dd7adcd8c8fd r3377:dd7adcd8c8fd r3319:82a855f31227 r3432:2032d27d90cf r3319:82a855f31227 r3369:c4df9e1f62cd r3319:82a855f31227 r3319:82a855f31227 r3319:82a855f31227 r3432:2032d27d90cf r3983:b2c269b85722 r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3983:b2c269b85722 r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3426:24da0f786db6 r3319:82a855f31227 r3319:82a855f31227 r3319:82a855f31227 r3319:82a855f31227 r3382:3f2a31c8cfb5 r3983:b2c269b85722 r3983:b2c269b85722 r3983:b2c269b85722 r3983:b2c269b85722 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3382:3f2a31c8cfb5 r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf r3432:2032d27d90cf | /* $Id$ */
/** @file town_map.h Accessors for towns */
#ifndef TOWN_MAP_H
#define TOWN_MAP_H
#include "town.h"
static inline int GetHouseType(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
return _m[t].m4;
}
static inline TownID GetTownIndex(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE) || IsTileType(t, MP_STREET)); // XXX incomplete
return _m[t].m2;
}
/**
* Set the town index for a road or house tile.
* @param tile the tile
* @param index the index of the town
*/
static inline void SetTownIndex(TileIndex t, TownID index)
{
assert(IsTileType(t, MP_STREET) || IsTileType(t, MP_HOUSE));
_m[t].m2 = index;
}
static inline bool LiftHasDestination(TileIndex t)
{
return HASBIT(_m[t].m5, 7);
}
static inline void SetLiftDestination(TileIndex t, byte dest)
{
SB(_m[t].m5, 0, 6, dest);
SETBIT(_m[t].m1, 7); /* Start moving */
}
static inline byte GetLiftDestination(TileIndex t)
{
return GB(_m[t].m5, 0, 6);
}
static inline bool IsLiftMoving(TileIndex t)
{
return HASBIT(_m[t].m1, 7);
}
static inline void BeginLiftMovement(TileIndex t)
{
SETBIT(_m[t].m5, 7);
}
static inline void HaltLift(TileIndex t)
{
CLRBIT(_m[t].m1, 7);
CLRBIT(_m[t].m5, 7);
SB(_m[t].m5, 0, 6, 0);
DeleteAnimatedTile(t);
}
static inline byte GetLiftPosition(TileIndex t)
{
return GB(_m[t].m1, 0, 7);
}
static inline void SetLiftPosition(TileIndex t, byte pos)
{
SB(_m[t].m1, 0, 7, pos);
}
static inline Town* GetTownByTile(TileIndex t)
{
return GetTown(GetTownIndex(t));
}
Town* CalcClosestTownFromTile(TileIndex tile, uint threshold);
static inline void MakeHouseTile(TileIndex t, TownID tid, byte counter, byte stage, byte type)
{
assert(IsTileType(t, MP_CLEAR));
SetTileType(t, MP_HOUSE);
_m[t].m1 = 0;
_m[t].m2 = tid;
SB(_m[t].m3, 6, 2, stage);
_m[t].m4 = type;
SB(_m[t].m5, 0, 2, counter);
MarkTileDirtyByTile(t);
}
enum {
TWO_BY_TWO_BIT = 2, ///< House is two tiles in X and Y directions
ONE_BY_TWO_BIT = 1, ///< House is two tiles in Y direction
TWO_BY_ONE_BIT = 0, ///< House is two tiles in X direction
};
static inline void MakeTownHouse(TileIndex t, TownID tid, byte counter, byte stage, byte size, byte type)
{
MakeHouseTile(t, tid, counter, stage, type);
if (HASBIT(size, TWO_BY_TWO_BIT) || HASBIT(size, ONE_BY_TWO_BIT)) MakeHouseTile(t + TileDiffXY(0, 1), tid, counter, stage, ++type);
if (HASBIT(size, TWO_BY_TWO_BIT) || HASBIT(size, TWO_BY_ONE_BIT)) MakeHouseTile(t + TileDiffXY(1, 0), tid, counter, stage, ++type);
if (HASBIT(size, TWO_BY_TWO_BIT)) MakeHouseTile(t + TileDiffXY(1, 1), tid, counter, stage, ++type);
}
/**
* House Construction Scheme.
* Construction counter, for buildings under construction. Incremented on every
* periodic tile processing.
* On wraparound, the stage of building in is increased.
* (Get|Set|Inc)HouseBuildingStage are taking care of the real stages,
* (as the sprite for the next phase of house building)
* (Get|Set|Inc)HouseConstructionTick is simply a tick counter between the
* different stages
*/
/**
* Gets the building stage of a house
* @param tile the tile of the house to get the building stage of
* @pre IsTileType(t, MP_HOUSE)
* @return the building stage of the house
*/
static inline byte GetHouseBuildingStage(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
return GB(_m[t].m3, 6, 2);
}
/**
* Sets the building stage of a house
* @param tile the tile of the house to set the building stage of
* @param stage the new stage
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void SetHouseBuildingStage(TileIndex t, byte stage)
{
assert(IsTileType(t, MP_HOUSE));
SB(_m[t].m3, 6, 2, stage);
}
/**
* Increments the building stage of a house
* @param tile the tile of the house to increment the building stage of
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void IncHouseBuildingStage( TileIndex t )
{
assert(IsTileType(t, MP_HOUSE));
AB(_m[t].m3, 6, 2, 1);
}
/**
* Gets the construction stage of a house
* @param tile the tile of the house to get the construction stage of
* @pre IsTileType(t, MP_HOUSE)
* @return the construction stage of the house
*/
static inline byte GetHouseConstructionTick(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
return GB(_m[t].m5, 0, 3);
}
/**
* Sets the construction stage of a house
* @param tile the tile of the house to set the construction stage of
* @param stage the new stage
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void SetHouseConstructionTick(TileIndex t, byte stage)
{
assert(IsTileType(t, MP_HOUSE));
SB(_m[t].m5, 0, 3, stage);
}
/**
* Sets the increment stage of a house
* @param tile the tile of the house to increment the construction stage of
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void IncHouseConstructionTick(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
AB(_m[t].m5, 0, 3, 1);
}
#endif /* TOWN_MAP_H */
|