1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Commit Graph

25516 Commits

Author SHA1 Message Date
Severin Paul Höfer
704333344e Fix #21291: Wrong conditions for hungry guests warning
In `PeepProblemWarningsUpdate()`, when determining the number of hungry guests that need help (in order to check whether the threshold for showing the warning about hungry guests is reached), guests that are heading towards any flat ride (checked using the `RIDE_TYPE_FLAG_FLAT_RIDE` on the ride the guest is heading to (if any)) are discarded.  
For thirsty guests (and those needing to go to the toilet) on the other hand, the more specific `RIDE_TYPE_FLAG_SELLS_DRINKS` (or `RIDE_TYPE_FLAG_IS_TOILET`) is used. (So, a guest that becomes thirsty while on its way to the merry-go-round would count for the threshold here.)

This PR makes the function use the more specific `RIDE_TYPE_FLAG_SELLS_FOOD` for hungry guests, so it's consistent with the other cases.
2024-01-28 23:35:17 +00:00
HtotheTML
be9970b274 Fix additional missing land/construction rights tiles in WW's Inca Lost City & Renovation 2024-01-28 23:46:50 +01:00
Harry Hopkinson
11ae8247bd Move gNumGuestsInPark to GameState_t (#21295)
* Move gNumGuestsInPark to GameState_t

* Replace GetGameState() with gameState
2024-01-28 19:17:43 -03:00
Michael Steenbeek
396af1f34c Fix #19494: RCT1 sloped gates not imported correctly 2024-01-28 14:56:38 +01:00
Michael Steenbeek
8dd5014bc4 Move gStaff* globals to GameState_t (#21285) 2024-01-28 07:58:02 -03:00
Michael Steenbeek
22e73325d9 Remove bionic CI (#21284)
It recently starting failing on every commit. Bionic is also out of support, so not much point in keeping it around anyway.
2024-01-28 07:30:13 -03:00
Harry Hopkinson
01eecbaeba Move gNumGuestsHeadingForPark to GameState_t (#21277)
* Move gNumGuestsHeadingForPark to GameState_t

* Format code

* Remove change to contributors list

* Revert new line addition
2024-01-28 07:26:22 -03:00
Harry Hopkinson
a14d471530 Add RCTC Booster offsets into sprites.json
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
2024-01-26 09:37:00 +01:00
Michael Steenbeek
73183f6736 Merge pull request #21268 from pfroud/use-STR_OFF_EDGE_OF_MAP
Change error messages to `STR_OFF_EDGE_OF_MAP` when `!LocationValid()`
2024-01-26 09:34:33 +01:00
Michael Steenbeek
32aa3f56b4 Move gScenarioRand to GameState_t 2024-01-26 09:19:45 +01:00
Michael Steenbeek
3f83cad03a Close #21184: Draw selection square on water 2024-01-25 18:57:46 +00:00
Matt
bf4f82da07 Merge pull request #21276 from ZehMatt/fix-21188
Fix using iterators that are deleted by the plugin
2024-01-25 18:46:51 +02:00
Hielke Morsink
f9870ece7a Merge pull request #21271 from Broxzier/refactor/global-park-value
#21193: Move gParkValue and gParkValueHistory to GameState_t
2024-01-25 16:14:23 +01:00
ζeh Matt
cc64a17642 Skip intervals that are deleted within callbacks 2024-01-25 17:13:25 +02:00
Matt
faccd5f14a Merge pull request #21272 from Broxzier/refactor/global-park-entrances
#21193: Move ParkEntrances to GameState_t
2024-01-25 17:07:19 +02:00
ζeh Matt
84213efde2 Fix using iterators that are deleted by the plugin 2024-01-25 17:01:00 +02:00
Matt
49ff5a1826 Merge pull request #21275 from ZehMatt/fix-21274
Fix #21274: Collision of PeepId when importing SV4
2024-01-25 16:58:51 +02:00
ζeh Matt
e5a10c1514 Fix #21274: Collision of PeepId when importing SV4 2024-01-25 16:34:00 +02:00
Michael Steenbeek
3827d1770b Move banners to GameState_t 2024-01-25 15:32:16 +01:00
Matt
6e14f6540a Merge pull request #21269 from Harry-Hopkinson/gNextGuestNumber-to-GameState_t
Move gNextGuestNumber to Gamestate_t
2024-01-25 16:19:05 +02:00
Hielke Morsink
1f8b7950bc Get size of WeeklyProfitHistory in compile time 2024-01-25 15:10:17 +01:00
Hielke Morsink
99e1746eda #21193: Move gParkValueHistory to GameState_t 2024-01-25 14:30:47 +01:00
Hielke Morsink
0c10435b7e #21193: Move gParkValue to GameState_t 2024-01-25 14:30:44 +01:00
Hielke Morsink
ad4bc0dd10 Fix formatting 2024-01-25 14:27:40 +01:00
Hielke Morsink
74d61369be #21193: Move ParkEntrances to GameState_t 2024-01-25 12:52:56 +01:00
Peter Froud
ce45cb3360 Use descriptive error strings for two GameAction::Results
- Fix error when setting brake speed outside park
- Fix error when pasting but reached tile limit
2024-01-25 11:37:02 +01:00
ZeeMaji
ff03844b35 Raise lift speeds for RCT1 parity 2024-01-25 11:24:38 +01:00
Harry Hopkinson
8816aa607c Move gNextGuestNumber to Gamestate_t 2024-01-25 09:34:47 +00:00
Peter Froud
010e43e6ff Format code 2024-01-24 23:51:40 -08:00
Peter Froud
4c18d322c6 Split if statements to return different errors 2024-01-24 23:28:16 -08:00
Peter Froud
afe3b02a24 Use STR_OFF_EDGE_OF_MAP when !LocationValid() 2024-01-24 23:27:34 -08:00
Harry Hopkinson
f8fa43f578 Move gClimateUpdateTimer to GameState_t 2024-01-24 23:58:37 +01:00
Michael Steenbeek
115e7389a9 Move most gScenario* globals to GameState_t 2024-01-24 22:17:32 +01:00
Matt
d4b0c2e115 Merge pull request #21236 from zzril/fix-21227-entrance-dropdown-sorting
Close #21227: Sort entrance styles in dropdown
2024-01-24 17:03:17 +02:00
Michael Steenbeek
71c20a04d7 Move gWeekly* globals to GameState_t 2024-01-24 15:03:46 +01:00
Hielke Morsink
422df650b6 #21193: Move gParkSize to GameState_t (#21260) 2024-01-24 14:18:46 +01:00
Hielke Morsink
fb420f6516 #21193: Move gParkEntranceFee to GameState_t (#21256) 2024-01-24 13:45:01 +01:00
Michael Steenbeek
b200ce02ef Fix merge error (#21257) 2024-01-24 12:00:41 +01:00
Harry Hopkinson
42336915cd Move gClimateCurrent to GameState_t 2024-01-24 11:18:54 +01:00
Hielke Morsink
ab80a9b007 Merge pull request #21250 from Broxzier/refactor/global-gParkRating
#21193: Move gParkRating to GameState_t
2024-01-24 11:03:10 +01:00
Severin Paul Höfer
d0aae46a75 Refactor existing structs to use u8string_view 2024-01-23 22:54:06 +01:00
Severin Paul Höfer
576caaa094 Use u8string_view for LabelString 2024-01-23 22:43:45 +01:00
Severin Paul Höfer
fb41a5764c Refactor existing structs to use TitleCase 2024-01-23 21:49:43 +01:00
Severin Paul Höfer
2136706129 Use TitleCase for members of EntranceTypeLabel 2024-01-23 21:46:31 +01:00
Severin Paul Höfer
794ee9be78 Update changelog.txt 2024-01-23 21:42:30 +01:00
Severin Paul Höfer
e8b05c4afd Sort entrance styles alphabetically 2024-01-23 21:42:30 +01:00
Severin Paul Höfer
e27a20f800 Sort entries in entrance style dropdown 2024-01-23 21:42:30 +01:00
OpenRCT2 git bot
db2a8af3cb Merge Localisation/master into OpenRCT2/develop 2024-01-23 04:01:46 +00:00
Hielke Morsink
f85cac627d #21193: Move gParkRating to GameState_t 2024-01-23 00:11:34 +01:00
Michael Steenbeek
b5786c2a86 Move gGuestInitial* to GameState 2024-01-22 22:28:16 +00:00