izzy/OpenRCT2-Unity
0
0
Fork 0
mirror of https://github.com/izzy2lost/OpenRCT2-Unity.git synced 2026-03-10 12:38:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error (#21257)

Browse Source
This commit is contained in:
Michael Steenbeek
2024-01-24 12:00:41 +01:00
committed by GitHub
parent 42336915cd
commit b200ce02ef
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1514,7 +1514,6 @@ bool Guest::DecideAndBuyItem(Ride& ride, const ShopItem shopItem, money64 price)
}
auto& gameState = GetGameState();
if ((shopItem == ShopItem::Sunglasses || shopItem == ShopItem::IceCream) && gameState.ClimateCurrent.Temperature < 12)
{
return false;
@@ -1695,7 +1694,6 @@ bool Guest::DecideAndBuyItem(Ride& ride, const ShopItem shopItem, money64 price)
expenditure = ExpenditureType::FoodDrinkStock;
}
auto& gameState = GetGameState();
if (!(gameState.ParkFlags & PARK_FLAGS_NO_MONEY))
FinancePayment(shopItemDescriptor.Cost, expenditure);