mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix build failure

Browse Source
This commit is contained in:
Ted John
2022-03-03 23:01:08 +00:00
parent b83e21a953
commit ba2fea88fd
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/Transparency.cpp
View File

@@ -19,10 +19,10 @@
#include <openrct2/actions/ParkSetDateAction.h>
#include <openrct2/actions/SetCheatAction.h>
#include <openrct2/config/Config.h>
#include <openrct2/entity/Staff.h>
#include <openrct2/localisation/Date.h>
#include <openrct2/localisation/Localisation.h>
#include <openrct2/network/network.h>
#include <openrct2/peep/Staff.h>
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>
#include <openrct2/world/Climate.h>
@@ -93,12 +93,6 @@ public:
void OnOpen() override
{
widgets = window_transparency_main_widgets;
enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_SEE_THROUGH_RIDES) | (1ULL << WIDX_SEE_THROUGH_VEHICLES)
| (1ULL << WIDX_SEE_THROUGH_SCENERY) | (1ULL << WIDX_SEE_THROUGH_TREES) | (1ULL << WIDX_SEE_THROUGH_PATHS)
| (1ULL << WIDX_INVISIBLE_RIDES) | (1ULL << WIDX_INVISIBLE_VEHICLES) | (1ULL << WIDX_INVISIBLE_SCENERY)
| (1ULL << WIDX_INVISIBLE_TREES) | (1ULL << WIDX_INVISIBLE_PATHS) | (1ULL << WIDX_INVISIBLE_SUPPORTS)
| (1ULL << WIDX_INVISIBLE_GUESTS) | (1ULL << WIDX_INVISIBLE_STAFF) | (1ULL << WIDX_SEE_THROUGH_SUPPORTS);
window_push_others_below(this);
auto* w = window_get_main();

2
src/openrct2/entity/Peep.cpp
View File

@@ -2757,7 +2757,7 @@ void Peep::Paint(paint_session& session, int32_t imageDirection) const
uint32_t imageId = baseImageId | TshirtColour << 19 | TrousersColour << 24 | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
auto* guest = As<Staff>();
auto* guest = As<Guest>();
if (guest != nullptr)
{
if (baseImageId >= 10717 && baseImageId < 10749)

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

@@ -2195,7 +2195,7 @@ void PaintTrack(paint_session& session, Direction direction, int32_t height, con
return;
}
if ((session->ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES) && (session->ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES))
if ((session.ViewFlags & VIEWPORT_FLAG_SEETHROUGH_RIDES) && (session.ViewFlags & VIEWPORT_FLAG_INVISIBLE_RIDES))
return;
if ((!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex)