mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into new-save-format

Browse Source
This commit is contained in:
ζeh Matt
2021-09-27 23:13:49 +03:00
parent 1d788030ca 6fcd224efd
commit d8ce486fa4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/paint/Paint.cpp
View File

@@ -218,17 +218,17 @@ template<uint8_t direction> void PaintSessionGenerateRotate(paint_session* sessi
for (; numVerticalTiles > 0; --numVerticalTiles)
{
tile_element_paint_setup(session, mapTile);
sprite_paint_setup(session, mapTile.x, mapTile.y);
sprite_paint_setup(session, mapTile);
auto loc1 = mapTile + adjacentTiles[0];
sprite_paint_setup(session, loc1.x, loc1.y);
const auto loc1 = mapTile + adjacentTiles[0];
sprite_paint_setup(session, loc1);
auto loc2 = mapTile + adjacentTiles[1];
const auto loc2 = mapTile + adjacentTiles[1];
tile_element_paint_setup(session, loc2);
sprite_paint_setup(session, loc2.x, loc2.y);
sprite_paint_setup(session, loc2);
auto loc3 = mapTile + adjacentTiles[2];
sprite_paint_setup(session, loc3.x, loc3.y);
const auto loc3 = mapTile + adjacentTiles[2];
sprite_paint_setup(session, loc3);
mapTile += nextVerticalTile;
}

4
src/openrct2/paint/sprite/Paint.Sprite.cpp
View File

@@ -32,7 +32,7 @@
* Paint Quadrant
* rct2: 0x0069E8B0
*/
void sprite_paint_setup(paint_session* session, int32_t x, int32_t y)
void sprite_paint_setup(paint_session* session, const CoordsXY& pos)
{
if (gTrackDesignSaveMode || (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_SPRITES))
{
@@ -47,7 +47,7 @@ void sprite_paint_setup(paint_session* session, int32_t x, int32_t y)
const bool highlightPathIssues = (session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES);
for (const auto* spr : EntityTileList({ x, y }))
for (const auto* spr : EntityTileList(pos))
{
if (highlightPathIssues)
{

3
src/openrct2/paint/sprite/Paint.Sprite.h
View File

@@ -12,8 +12,9 @@
#include "../../common.h"
struct paint_session;
struct CoordsXY;
void sprite_paint_setup(paint_session* session, int32_t x, int32_t y);
void sprite_paint_setup(paint_session* session, const CoordsXY& pos);
template<typename T> void PaintEntity(paint_session* session, const T* entity, int32_t imageDirection);