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

118 Commits

Author SHA1 Message Date
Harry Hopkinson
6deac11916 Move gTotalRideValueForMoney to GameState_t 2024-02-08 09:39:28 +00:00
Harry Hopkinson
ad5ef31a97 Move gTotalIncomeFromAdmissions to GameState_t (#21348) 2024-02-07 19:13:04 -03:00
Hielke Morsink
c9fe19e0d9 Part of #21193: Move gParkRatingHistory to GameState_t 2024-02-07 11:04:10 +01: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
Gymnasiast
8208afe5f6 Move gResearch* globals to GameState_t 2024-01-29 21:36:04 +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
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
Michael Steenbeek
32aa3f56b4 Move gScenarioRand to GameState_t 2024-01-26 09:19:45 +01: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
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
Harry Hopkinson
8816aa607c Move gNextGuestNumber to Gamestate_t 2024-01-25 09:34:47 +00: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
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
Harry Hopkinson
42336915cd Move gClimateCurrent to GameState_t 2024-01-24 11:18:54 +01: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
Hielke Morsink
ece4b7327e Merge pull request #21246 from Broxzier/refactor/global-park-vars 2024-01-22 21:05:01 +01:00
Severin Paul Höfer
2c26799ca4 Fix #20845: Outdated message box in case of save failure 2024-01-22 19:44:20 +01: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
Harry Hopkinson
0f283dc2a9 Move gClimate to GameState_t 2024-01-21 21:05:22 +00:00
Harry Hopkinson
7ca5b1cd65 Move gClimateNext to GameState_t (#21231) 2024-01-21 18:22:57 +01:00
ζeh Matt
c493e22b9b #21193: Move gInitialCash to GameState_t, refactor uses 2024-01-20 17:13:57 +02:00
ζeh Matt
3518a638bb #21193: Move gCash to GameState_t, refactor uses 2024-01-20 15:46:35 +02:00
ζeh Matt
9b2a79faf1 Adjust the import/export code to have the game state passed 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
ζeh Matt
3d5e6ea932 Replace Equals with IEquals where appropriate 2023-07-05 23:14:05 +03:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
Spacek531
ba5627c544 load brake from parkfile 2023-04-11 19:28:26 -07: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
1dafb8e56e Fix small scenery repainting (#19826)
Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-05 06:27:51 +02:00
Duncan
c0bd64f778 Split of Needs supports changes from OpenRCT2/OpenRCT2#19446 (#19759) 2023-04-04 07:52:07 +00:00
Michael Steenbeek
fd80b4c822 Refactor and clean up date handling (#19666)
* Refactor and clean up date handling

* Remove gDate, remove direct access to days_in_month

* Adjust the MultiLaunch test

* Bump network version

---------

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2023-04-02 09:25:41 +01:00
ζeh Matt
436c881f95 Rename Vertical to GuestPurchase, this better reflects actual use 2023-03-22 22:28:14 +02:00
ζeh Matt
72a76a0ea5 Refactor import/export to support multiple ride rating update states 2023-03-22 21:51:52 +02:00
Duncan
a018cb1ca5 Fix import of ride value (#19541)
The ride value undefined constant was changed causing all imports of the undefined value to be incorrect. We can fix the broken imports but can't fix the users of the broken value (gParkValue and its history)
2023-03-03 08:45:32 +00: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
Michał Janiszewski
7459ba0efe GCC 13 fixes (#19519)
This addresses issues when compiling with GCC 13
2023-02-28 21:04:52 +02:00
Matthias Moninger
777fea6c8c Avoid triggering an assert when saving the park 2023-02-24 12:45:24 +01:00
ζeh Matt
063d97f4f2 Use fixed size storage for Rides, cleanup interface a bit 2023-02-21 23:20:48 +02:00
Matthias Moninger
7b61c6352a Desnake some stuff, small string passing cleanup (#19388)
* Rename scenario_index_entry to ScenarioIndexEntry

* Desnake members of ScenarioIndexEntry

* Pass const u8string& instead of utf8 pointer
2023-02-13 20:30:16 +00:00
spacek531
df0edc92d0 Vehicle/rename update flags (#19363)
* rename VEHICLE_UPDATE_FLAG_ON_LIFT_HILL

* rename VEHICLE_UPDATE_FLAG_COLLISION_DISABLED

* rename VEHICLE_UPDATE_FLAG_WAIT_ON_ADJACENT

* rename VEHICLE_UPDATE_FLAG_REVERSING_SHUTTLE

* rename VEHICLE_UPDATE_FLAG_READY_DEPART

* rename VEHICLE_UPDATE_FLAG_TESTING

* rename VEHICLE_UPDATE_FLAG_6

* rename VEHICLE_UPDATE_FLAG_ZERO_VELOCITY

* rename VEHICLE_UPDATE_FLAG_BROKEN_CAR

* rename VEHICLE_UPDATE_FLAG_BROKEN_TRAIN

* rename VEHICLE_UPDATE_FLAG_ON_BRAKE_FOR_DROP

* rename VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES

* rename VEHICLE_UPDATE_FLAG_12

* rename VEHICLE_UPDATE_FLAG_ROTATION_OFF_WILD_MOUSE

* rename VEHICLE_UPDATE_FLAG_SINGLE_CAR_POSITION

* rename VEHICLE_UPDATE_FLAG_CRASHED

* name flag 12 to Reverse Incline Completed Lap

* name flag 6 to Currently Colliding

* fix formatting

* rename has/clear/set update flag

* fix formatting again

* move to namespace constexpr

* fix formatting

* the one that got away
2023-02-12 22:32:16 +00:00