mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Testpaint

This commit is contained in:
Gymnasiast 2018-09-13 19:40:07 +02:00
parent a31176b7e7
commit d0f4b45bd2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/ride/TrackDesignSave.cpp
View File

@ -291,7 +291,7 @@ static void track_design_save_push_tile_element_desc(
static void track_design_save_add_scenery(int32_t x, int32_t y, rct_tile_element* tileElement)
{
SmallSceneryElement * sceneryElement = tileElement->AsSmallScenery();
SmallSceneryElement* sceneryElement = tileElement->AsSmallScenery();
int32_t entryType = sceneryElement->GetEntryIndex();
auto entry = object_entry_get_entry(OBJECT_TYPE_SMALL_SCENERY, entryType);

2
src/openrct2/world/MapGen.cpp
View File

@ -247,7 +247,7 @@ static void mapgen_place_tree(int32_t type, int32_t x, int32_t y)
tileElement->clearance_height = surfaceZ + (sceneryEntry->small_scenery.height >> 3);
tileElement->type = TILE_ELEMENT_TYPE_SMALL_SCENERY | (util_rand() & 3);
SmallSceneryElement * sceneryElement = tileElement->AsSmallScenery();
SmallSceneryElement* sceneryElement = tileElement->AsSmallScenery();
sceneryElement->SetEntryIndex(type);
sceneryElement->SetAge(0);
sceneryElement->SetPrimaryColour(COLOUR_YELLOW);

4
test/testpaint/Compat.cpp
View File

@ -154,12 +154,12 @@ rct_sprite* get_sprite(size_t sprite_idx)
return &sprite_list[sprite_idx];
}
bool rct_tile_element::IsLastForTile() const
bool TileElementBase::IsLastForTile() const
{
return (this->flags & TILE_ELEMENT_FLAG_LAST_TILE) != 0;
}
uint8_t rct_tile_element::GetType() const
uint8_t TileElementBase::GetType() const
{
return this->type & TILE_ELEMENT_TYPE_MASK;
}