Don't mark tile dirty when setting animation frame to its current value
See: https://github.com/OpenTTD/OpenTTD/issues/10192
This commit is contained in:
@@ -70,9 +70,9 @@ static void UpdateAnimatedTileSpeed(TileIndex tile, AnimatedTileInfo &info)
|
||||
* on that table yet). Also increases the size of the table if necessary.
|
||||
* @param tile the tile to make animated
|
||||
*/
|
||||
void AddAnimatedTile(TileIndex tile)
|
||||
void AddAnimatedTile(TileIndex tile, bool mark_dirty)
|
||||
{
|
||||
MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE);
|
||||
if (mark_dirty) MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE);
|
||||
AnimatedTileInfo &info = _animated_tiles[tile];
|
||||
UpdateAnimatedTileSpeed(tile, info);
|
||||
info.pending_deletion = false;
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "tile_type.h"
|
||||
|
||||
void AddAnimatedTile(TileIndex tile);
|
||||
void AddAnimatedTile(TileIndex tile, bool mark_dirty = true);
|
||||
void DeleteAnimatedTile(TileIndex tile);
|
||||
void AnimateAnimatedTiles();
|
||||
void UpdateAllAnimatedTileSpeeds();
|
||||
|
@@ -211,11 +211,11 @@ struct BaseStation : StationPool::PoolItem<&_station_pool> {
|
||||
}
|
||||
|
||||
private:
|
||||
void SetRoadStopTileData(TileIndex tile, byte data, byte offset);
|
||||
bool SetRoadStopTileData(TileIndex tile, byte data, byte offset);
|
||||
|
||||
public:
|
||||
inline void SetRoadStopRandomBits(TileIndex tile, byte random_bits) { this->SetRoadStopTileData(tile, random_bits, 0); }
|
||||
inline void SetRoadStopAnimationFrame(TileIndex tile, byte frame) { this->SetRoadStopTileData(tile, frame, 8); }
|
||||
inline bool SetRoadStopAnimationFrame(TileIndex tile, byte frame) { return this->SetRoadStopTileData(tile, frame, 8); }
|
||||
void RemoveRoadStopTileData(TileIndex tile);
|
||||
|
||||
static void PostDestructor(size_t index);
|
||||
|
@@ -20,7 +20,16 @@
|
||||
template <typename Tobj>
|
||||
struct TileAnimationFrameAnimationHelper {
|
||||
static byte Get(Tobj *obj, TileIndex tile) { return GetAnimationFrame(tile); }
|
||||
static void Set(Tobj *obj, TileIndex tile, byte frame) { SetAnimationFrame(tile, frame); }
|
||||
static bool Set(Tobj *obj, TileIndex tile, byte frame)
|
||||
{
|
||||
byte prev = GetAnimationFrame(tile);
|
||||
if (frame != prev) {
|
||||
SetAnimationFrame(tile, frame);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -105,9 +114,10 @@ struct AnimationBase {
|
||||
}
|
||||
}
|
||||
|
||||
Tframehelper::Set(obj, tile, frame);
|
||||
if (Tframehelper::Set(obj, tile, frame)) {
|
||||
MarkTileDirtyByTile(tile, VMDF_NOT_MAP_MODE);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check a callback to determine what the next animation step is and
|
||||
@@ -128,11 +138,11 @@ struct AnimationBase {
|
||||
|
||||
switch (callback & 0xFF) {
|
||||
case 0xFD: /* Do nothing. */ break;
|
||||
case 0xFE: AddAnimatedTile(tile); break;
|
||||
case 0xFE: AddAnimatedTile(tile, false); break;
|
||||
case 0xFF: DeleteAnimatedTile(tile); break;
|
||||
default:
|
||||
Tframehelper::Set(obj, tile, callback);
|
||||
AddAnimatedTile(tile);
|
||||
bool changed = Tframehelper::Set(obj, tile, callback);
|
||||
AddAnimatedTile(tile, changed);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@@ -333,7 +333,7 @@ uint16 GetAnimRoadStopCallback(CallbackID callback, uint32 param1, uint32 param2
|
||||
|
||||
struct RoadStopAnimationFrameAnimationHelper {
|
||||
static byte Get(BaseStation *st, TileIndex tile) { return st->GetRoadStopAnimationFrame(tile); }
|
||||
static void Set(BaseStation *st, TileIndex tile, byte frame) { st->SetRoadStopAnimationFrame(tile, frame); }
|
||||
static bool Set(BaseStation *st, TileIndex tile, byte frame) { return st->SetRoadStopAnimationFrame(tile, frame); }
|
||||
};
|
||||
|
||||
/** Helper class for animation control. */
|
||||
|
@@ -183,16 +183,18 @@ void BaseStation::PostDestructor(size_t index)
|
||||
InvalidateWindowData(WC_SELECT_STATION, 0, 0);
|
||||
}
|
||||
|
||||
void BaseStation::SetRoadStopTileData(TileIndex tile, byte data, byte offset)
|
||||
bool BaseStation::SetRoadStopTileData(TileIndex tile, byte data, byte offset)
|
||||
{
|
||||
for (size_t i = 0; i < this->custom_road_stop_tiles.size(); i++) {
|
||||
if (this->custom_road_stop_tiles[i] == tile) {
|
||||
if (GB(this->custom_road_stop_data[i], offset, 8) == data) return false;
|
||||
SB(this->custom_road_stop_data[i], offset, 8, data);
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
this->custom_road_stop_tiles.push_back(tile);
|
||||
this->custom_road_stop_data.push_back(((uint)data) << offset);
|
||||
return data != 0;
|
||||
}
|
||||
|
||||
void BaseStation::RemoveRoadStopTileData(TileIndex tile)
|
||||
|
@@ -2631,7 +2631,7 @@ static inline void ClearMakeHouseTile(TileIndex tile, Town *t, byte counter, byt
|
||||
|
||||
IncreaseBuildingCount(t, type);
|
||||
MakeHouseTile(tile, t->index, counter, stage, type, random_bits);
|
||||
if (HouseSpec::Get(type)->building_flags & BUILDING_IS_ANIMATED) AddAnimatedTile(tile);
|
||||
if (HouseSpec::Get(type)->building_flags & BUILDING_IS_ANIMATED) AddAnimatedTile(tile, false);
|
||||
|
||||
MarkTileDirtyByTile(tile);
|
||||
}
|
||||
|
Reference in New Issue
Block a user