mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity
25,573 Commits 8 Branches 59 Tags
3eb9cf2264fa7a050b07c74717ab43a2e00eae7e
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
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
ζ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
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
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
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
Gymnasiast
0139c8d19e Use dpi ref in everything outside the drawing folder 2023-04-11 22:57:25 +01: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
ζ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
ζeh Matt
0c3c2ebcd2 Refactor MapGetSurfaceElementAt to accept TileCoordsXY 2023-04-05 23:13:47 +03:00
Michael Steenbeek
dd624f9bff Replace remaining usages of money16, money32 (#19469) 
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-03-02 21:55:42 +00:00
Duncan
b56748bc82 ObjectEntry Cleanup. FootpathItem, SceneryGroup, Water, LargeScenery (#19385) 
* Move footpathitem entry into new getter

* Move scenery group entry into new getter

* Move water entry into new getter

* Move large scenery entry into new getter

* Remove unused header includes

* Fix compile issue

* Include missing header from vcxproj
 2023-02-15 21:35:16 +00:00
Duncan
d811c9a9ba Add Object Entry Manager (#19332) 
* Add object entry manager

Port over wall and banner

* Port over small scenery to ObjectEntryManager

Clang format files

Actually make things safe

Fix build
 2023-02-12 20:43:11 +00:00
ζeh Matt
2f8e208a9d Refactor sprite_index to Id 2023-01-27 19:21:57 +02:00
ζeh Matt
17ce2d759f Rename Id to Id to PeepId to avoid conflicts with entity id 2023-01-27 19:11:04 +02:00
Wirlie
538b87e94c Fix: A queuing guest can ignore the next guest in the queue in certain circumstances (RCT2 bug) (#19068) 
* Use PeepDirection instead of sprite_direction to update queue position

* Align guests to the centre of the first queue tile.

* Bump network version

* Update changelog

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-01-24 09:35:12 +00:00
Duncan
e09f27df3c Rename snake_case Class names (Remaining Bits) (#19237) 
* Rename snake_case Class names

* Clang format

* Fix build issues
 2023-01-21 19:57:17 +00:00
Duncan
9deed6d98a Replace snakes in Class names OpenRCT2/N*-P* (#19227) 
* Replace snakes in Class names OpenRCT2/N*-P*

* Rename PODDate (and TimeOfDay for good measure)

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2023-01-20 05:24:44 +00:00
Michael Steenbeek
448c8fafd0 Rename base_height, clearance_height and owner 2023-01-19 20:36:30 +01:00
Duncan
859b071ddc Rename classes with snakes OpenRCT2/A*-F* (#19215) 
* Rename classes with snakes OpenRCT2/A*-F*

* Clang format files
 2023-01-19 08:16:44 +00:00
Hielke Morsink
0762fcb601 Rename snake_case functions in OpenRCT2/util folder 2023-01-18 22:44:13 +01:00
Duncan
09611cd9a5 Remove snake_case from OpenRCT2/entity folder 2023-01-17 21:16:36 +00:00
Michael Steenbeek
12874f2af7 Replace format_string(4) with OpenRCT2::FormatStringLegacy() (#19190) 
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-01-17 21:56:30 +01:00
Michael Steenbeek
d6f58c2f1f Merge pull request #19194 from Gymnasiast/refactor/sub-loc 
Rename sub_ and loc_ functions
 2023-01-17 21:29:04 +01:00
Michael Steenbeek
bb55c6ce66 Remove loadsasnakes (#19192) 
* Rename snake_case methods in scenario folder

* Rename snake_case methods in title folder

* Rename snake_case methods in object folder

* Rename snake_case methods in platform folder

* Rename snake_case methods in windows folder

* Rename tile_inspector.h to TileInspectorGlobals.h

* Rename snake_case methods in ui/windows folder
 2023-01-17 19:46:55 +00:00
Gymnasiast
3cc2d94b1b Rename sub_ and loc_ functions 2023-01-17 19:05:14 +01:00
Hielke Morsink
6b7dc8fcdb Rename snake_case functions in openrct2/src folder 
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-01-17 13:24:51 +01:00
Michael Steenbeek
bf5f7e8e71 Rename format_string(2) and is_user_string_id() (#19178) 
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-01-17 08:59:07 +00:00
Stephan Spengler
76b918e7ed Change openrct2/ride methods to UpperCamelCase, part 1 2023-01-17 01:32:54 +01:00
Duncan
8504c8d05e Finish Removing snake_case from Drawing Methods 2023-01-16 22:31:34 +00:00
Hielke Morsink
6dafbbfb65 Rename global window functions to TitleCase (#19167) 2023-01-16 20:13:42 +00:00
Duncan
8a8d3105f3 Remove snake_case from first chunk of Drawing (#19164) 
* Remove snake_case from first chunk of Drawing

* Address formatting
 2023-01-16 13:50:43 +00:00
Michael Steenbeek
412bf8f8be Use ride references instead of pointers 2023-01-07 14:02:18 +01:00
James103
73738bbdc8 Replace 2022 with 2023 in copyright headers 
Replace all instances of the year 2022 with 2023 in all copyright headers
 2023-01-01 11:58:01 +01:00
frutiemax
76faa77f6b Part of #16152: Use BoundBoxXYZ for PaintAddImageAsChild 2022-11-27 18:33:11 +00:00
Duncan
482971710d Apply code style to context functions 2022-11-06 21:49:07 +01:00
Rik Smeets
6faddd94f5 Fix slow guests don't get across level crossing in time (#18453) 2022-10-31 19:57:50 +01:00