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

258 Commits

Author SHA1 Message Date
Peter Froud
40a7fa70fc Fix empty error messages (#21351)
* Add `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE`

* Add `STR_ERR_TRACK_ON_THIS_TILE_NEEDS_WATER`

* Return existing `GameAction::Result`

* Add `STR_ERR_ACTION_INVALID_FOR_THAT_STAFF_TYPE`

I am open to suggestions for a different message!
Originally this was going to be STR_ERR_WRONG_STAFF_TYPE
but I thought that was confusing because the game
action arguments do not specify a staff type. We
want it to mean "the staff ID you specified is the
wrong StaffType for this game action".

* Refactor `StaffSetColour()` to return `Result`

* Remove unnecessary arguments when `Status` is `Ok`

* Refactor `SwapTileElements()` to return `Result`

Also add STR_ERR_CANT_SWAP_TILE_ELEMENT_WITH_ITSELF

* Format code

* Use `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE` in title

* Format code using Github web editor

* Format indentation
2024-02-19 20:58:04 -03:00
Harry Hopkinson
ad5ef31a97 Move gTotalIncomeFromAdmissions to GameState_t (#21348) 2024-02-07 19:13:04 -03:00
Harry Hopkinson
3eb9cf2264 Move gTotalAdmissions to GameState_t (#21341)
Part of #21193.
2024-02-06 21:42:05 +01:00
Harry Hopkinson
fd17842291 Move gNumGuestsInParkLastWeek to GameState_t. 2024-02-05 09:50:58 +00:00
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
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
8dd5014bc4 Move gStaff* globals to GameState_t (#21285) 2024-01-28 07:58:02 -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
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
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
Harry Hopkinson
8816aa607c Move gNextGuestNumber to Gamestate_t 2024-01-25 09:34:47 +00: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
Michael Steenbeek
b5786c2a86 Move gGuestInitial* to GameState 2024-01-22 22:28:16 +00:00
Hielke Morsink
13351d996e #21193: Move gParkFlags to GameState_t, refactor uses
Also changed a few instances where GetGameState was called inside the same function.
The change in Peep.cpp is needed because of a function conflict. FormatStringID exists both in the global and in the OpenRCT2 namespace.
2024-01-22 16:31:35 +01:00
Matt
7141fb4574 Merge pull request #21225 from ZehMatt/raise-mix-limit
Raise maximum allowed misc entities to 1600
2024-01-20 17:02:42 +02:00
ζeh Matt
c839a1746d Resolve some odd type clash, remove using namespace for now 2024-01-19 16:32:19 +02:00
ζeh Matt
a5dde0f8dc Replace gCurrentTicks with the one in GameState_t 2024-01-19 16:32:19 +02:00
ζeh Matt
6b9de0bb2f Raise maximum allowed misc entities to 1600 2024-01-19 12:50:27 +02:00
ζeh Matt
3dc2a25121 Fix overflow calculating maximum free slots for misc entities 2024-01-12 17:48:39 +02:00
Michael Steenbeek
adadaafdb0 Check station flags instead of hardcoded legacy IDs
PR #20483 introduced a check for covered stations, but incorrectly checked the RCT2 IDs.
This commit replaces this check with a proper flag check, which will work for any station style, including custom ones.
2024-01-06 14:46:17 +01:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
mrmbernardi
98a52efb7e Fix #5677: Balloons pass through the ground and objects (#20483) 2023-12-26 08:28:19 -03:00
Matt
2147b69104 Update the money effect even when the game is paused (#21102)
* Update the money effect even when the game is paused

* Update changelog.txt
2023-12-23 11:04:25 -03:00
Duncan
4349688de4 These function names have not reflected their use for a while (#20656) 2023-08-01 20:19:33 +01:00
Matthias Moninger
3ef6003671 Replace openrct2_assert with Guard::Assert, remove openrct2_assert 2023-07-02 16:42:46 +02:00
Matthias Moninger
379287ed0f Remove legacy stuff in common.h (#20523)
* Remove old interop macro

* Remove legacy string macro things

* Unbreak the posix/linux/unix builds

* Add String::IEquals and use it for case insensitive compare

* Add missing include for posix

* Replace _strnicmp with String::StartsWith

* Add LoByte and HiByte into Util.h, swap macros

* Fix android build

* Hopefully last of the string things

* Replace STUB directly with the warning
2023-07-02 12:59:20 +03:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
ζeh Matt
68485e20d0 Revert #20286 2023-05-31 18:21:33 +03:00
Matthias Moninger
d189008747 Merge pull request #20291 from ZehMatt/guest-refactor
Small Guest refactor
2023-05-26 20:40:12 +03:00
Tiago A. Reul
93c1a9724e Remove flag RIDE_TYPE_FLAG_HAS_NO_TRACK (#20239) (#20249)
* Remove flag RIDE_TYPE_FLAG_HAS_NO_TRACK (#20239)

* Fix a couple of logical conditions in entity/Staff.cpp

* Bump NETWORK_STREAM_VERSION and add myself to contributors.md
2023-05-26 14:08:28 +03:00
ζeh Matt
12bc9777d3 Cleanup calls to GetShopItemDescriptor in Guest::DecideAndBuyItem 2023-05-25 17:50:09 +03:00
ζeh Matt
454c5aa819 Use unsigned type for ScenarioRand 2023-05-25 17:46:27 +03:00
ζeh Matt
b3606566c4 Fix #20285: Workaround to disable tweening when updated from UI 2023-05-24 01:02:11 +03:00
ζeh Matt
65b582afb0 Add a way to invalidate entity tweening 2023-05-24 00:43:23 +03:00
Michael Steenbeek
58baa85a27 Small path additions cleanup (#20076)
* Split off path addition paint calls

* Replace occurences of “path bit” with “path addition”

* Replace occurences of “footpath item“ with “path addition”
2023-05-09 20:08:25 +01:00
Duncan
cdccb21dd5 Refactor of colours (#19998)
* Move dropdown functions to dropdown code

* Use a map for the colour tip

* Keep dropdownidx and colour seperated

* Allow number of rows to match vanilla

* Apply review comment

* Bump network version
2023-04-22 08:58:13 +00:00
kyphii
6dfc6225e2 "Reversed Trains" Option (#19305)
* Initial commit for backwards-facing trains

* Allow persistence for reversed cars across save/load

* Make log flume turntable compatible with new reversal implementation

* Style fixes + Better implementation of inverted bank angles

* Further Style Fixes

* Code cleanup from PR feedback

* Fix GetBankRotationForDrawing function declaration

* Use update flag for reversed state

* Replace modulo operation with bit mask

* Correct guest pathing destination when entering reversed cars

* More style fixes

* Add plugin support for reversed vehicles

* Fix formatting error

* Derive reversal from ride mode for car spawning

* Formatting

* Rename function to GetPaintBankRotation

* Add reversed trains modes to Multi Dimension Coaster

* Change name of isReversed plugin API parameter for consistency

* Replace reversal operating modes with separate ride setting

* Add ALLOW_REVERSED_TRAINS flag to more ride types

* Make clang-format happy

* More Formatting

* Fix ALLOW_REVERSED_TRAINS flag on a couple rides

* Exclude flat rides from Reverse Trains tickbox when cheats are enabled

* Formatting

* Use Disable Vehicle Limits cheat for checkbox appearance condition

* Use correct swinging sprites when cars are reversed

* Update changelog and Plugin/Network/Park version numbers

* Formatting

* Add separate error String ID for clarity

* Add name to contributors.md

* Fix ride vehicle preview window with reversed trains for RCT1 train types

* Bump version numbers again

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-21 19:22:33 +03:00
Gymnasiast
0139c8d19e Use dpi ref in everything outside the drawing folder 2023-04-11 22:57:25 +01:00
Duncan
9493af44dd Fix rand colours missing final colour (#19901) 2023-04-11 18:27:45 -03:00
Matthias Moninger
3d5cb20ca6 Merge pull request #19874 from ZehMatt/cleanup-entity
Move sprite related info into its own structure
2023-04-09 23:21:38 +03:00
Matthias Moninger
59198a5126 Merge pull request #19838 from ZehMatt/refactor-tile-access
Refactor tile access
2023-04-08 15:00:19 +03:00
ζeh Matt
8f82aa95b3 Move Direction out and rename it to Orientation to avoid name conflict 2023-04-07 22:46:25 +03:00
ζeh Matt
679f5aac2e Rename members of EntitySpriteData 2023-04-07 19:47:26 +03:00
ζeh Matt
dce21bc8ec Split move sprite specific data into EntitySpriteData 2023-04-07 19:37:47 +03:00
kyphii
39790779bb Extend color selection dropdown with more colors (#19446)
* Setup for extended palette

* Define order for color picker cells

* Init G2 Palettes in ColoursInitMaps

* Add Glass Palettes

* Use special sprite for Invisible color

* Set up new cheat for special colors

* Add glass palettes to palette_to_g1_offset

* Add entries for new colors in TranslucentWindowPalettes

* Finish implementation of special colors cheat

* Some cleanup

* New colors almost work

* Correct g2 palette loading indices

* Invisible color sprite displays properly

* Repaint works with large scenery and walls

* Prevent random shop items from overflowing to junk palettes

* More cleanup

* Fix glass palettes

* Add mapping of new colors to original colors for UI themes

* Fix junk palettes for random shop items

* Fix missing highlight color in software renderer

* Convert small scenery support flag to allow use of new colors

* Progress on displaying new colors in software renderer

* Fix invisible color scheme sprite

* Formatting cleanup

* Resolve comparison of integer expressions of different signedness

* Index g2 palette maps to fix visible chain lift

* Progress on fixing new colors in software renderer

* Fix station and support colors

* Fix dropdown selected index

* Get invisible color (mostly) working in software renderer

* Use forceBmp for palette resources

* Remove test function definition left in by mistake

* Remove some obsolete range checks for original color values

* Add changelog entry

* Reorder color dropdown based on NE user feedback

* Some cleanup

* Further cleanup

* Formatting

* Add include for GetPaletteMapIndexForColour

* Fix a couple things I broke

* Fix function placement

* Revert "Add include for GetPaletteMapIndexForColour"

This reverts commit 0af9611e6656d792adb7a36efe7dbf3387a4a759.

* Use color constants for color order list

* Make remappable colors contiguous

* turn off clang format for ordered color list

* Appease clang

* Use all colors for random shop item animation

* Improvements to palette map resources

* Fix chain lifts again + adjustments to a few colors

* Update changelog and contributors.md

* Revert changes to S4 and S6 importers which are no longer needed

* Bump network, plugin, and minimum park versions

* Revert "Progress on displaying new colors in software renderer"

This reverts commit 337602e4a7.

* Remove unnecessary comment

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-06 08:36:07 +01:00
ζeh Matt
c248ac58ed Make passing of CoordsXY explicit 2023-04-05 23:23:19 +03:00
ζeh Matt
0c3c2ebcd2 Refactor MapGetSurfaceElementAt to accept TileCoordsXY 2023-04-05 23:13:47 +03:00
ζeh Matt
be45b20de8 Fix parameter deduction for TileElementsView 2023-04-05 22:56:00 +03:00