mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity
25,671 Commits 8 Branches 59 Tags
523bd0ae36e9d6927690924b61baed74e04d3eb8
Commit Graph

1393 Commits

Author SHA1 Message Date
Gymnasiast
731275613a Create flag to allow building track segment partly underground 2024-02-20 19:14:01 +01:00
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
Martin Mizzi
f5a9846ea2 Move gBankLoan and gBankLoanInterestRate to GameState_t 2024-02-19 04:42:44 -05:00
Harry Hopkinson
1c285dbf9f Move gMaxBankLoan to GameState 2024-02-13 21:36:35 +01:00
Harry-Hopkinson
b755c873e5 Move gMapSize to GameState_t 2024-02-12 21:32:08 +00:00
Gymnasiast
8208afe5f6 Move gResearch* globals to GameState_t 2024-01-29 21:36:04 +01:00
Matt
fc1b580074 Merge pull request #21244 from pfroud/add-error-strings 
Add error strings to reduce how many `GameActions::Result`s have `STR_NONE, STR_NONE`
 2024-01-29 18:02:37 +02:00
Peter Froud
a382e4be8a Use VALUE_OUF_OF_RANGE for spriteId checks 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:50:52 -08:00
Peter Froud
21bda5e5e4 Use TILE_ELEMENT_NOT_FOUND 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:17:56 -08:00
Peter Froud
01d9eeb266 INVALID_PARAMETER for GHOST_ELEMENT_NOT_FOUND 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-29 02:15:53 -08:00
Peter Froud
704c779bf2 Format code which was committed on github.com 2024-01-29 02:15:27 -08:00
Peter Froud
7bb8fd7131 Add INVALID_PARAMETER for GHOST_ELEMENT_NOT_FOUND 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2024-01-28 21:27:35 -08:00
Michael Steenbeek
2059b50f44 Small change to error message 2024-01-28 00:06:54 +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
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
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
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
Michael Steenbeek
115e7389a9 Move most gScenario* globals to GameState_t 2024-01-24 22:17:32 +01:00
Hielke Morsink
fb420f6516 #21193: Move gParkEntranceFee to GameState_t (#21256) 2024-01-24 13:45:01 +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
tanzimchowdh
cba53fd3ce Fix #20196: New scenarios start with an incorrect temperature 2024-01-22 20:18:31 +01:00
Aaron van Geffen
dcd1f60f4f Move wall edge definitions from header to compilation unit 2024-01-22 19:45:51 +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
Peter Froud
f272b57a88 Fix 'break' will never be executed compile error 2024-01-22 02:55:20 -08:00
Peter Froud
4145f851da Run clang-format 2024-01-22 02:29:08 -08:00
Peter Froud
7903845eae Add "element" to STR_ERR_GHOST_NOT_FOUND 2024-01-22 01:45:29 -08:00
Peter Froud
32c880ef89 Add strings for value outside pre-defined range 2024-01-22 01:42:11 -08:00
Peter Froud
9299a80a58 Add descriptive error strings for null checks 2024-01-22 01:21:14 -08:00
Harry Hopkinson
0f283dc2a9 Move gClimate to GameState_t 2024-01-21 21:05:22 +00:00
ζeh Matt
25c807edbd Small cleanup 2024-01-20 19:34:27 +02: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
a5dde0f8dc Replace gCurrentTicks with the one in GameState_t 2024-01-19 16:32:19 +02:00
Gymnasiast
95c1adc813 Rename TrackBank to TrackRoll 2024-01-17 23:34:36 +01:00
Gymnasiast
cffc55e165 Rename fields of TrackDefinition 2024-01-17 23:33:19 +01:00
Gymnasiast
b832eb5f72 Make TrackBank into an enum class 2024-01-17 23:33:19 +01:00
Gymnasiast
7df3b22e14 Move conversion of station object to TD4/6 import/export 2024-01-03 21:14:04 +01:00
Gymnasiast
cfff3c53f9 Do not use RCT1/2 limits in TrackDesign.h 
Some unrelated files seemingly relied on TrackDesign.h to import RCT2.h for them.
 2024-01-03 21:12:53 +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
Max
895095acb9 Fix #12299 Placing ride entrances/exits ignores the Disable Clearance Checks cheat (#21096) 2023-12-21 20:38:20 +01:00
KawkMob
135c8b9f9b Fix #20747: handle staff speed permanency/serialization/apply for new staff (#20756) 2023-11-12 08:06:51 -03:00
Gymnasiast
6d87e3e56d Make remove_park_fences multiplayer-safe 2023-11-02 22:40:11 +01:00
Matt
c2fe9ef96a Filter certain game actions from being used in the replay system (#20886) 2023-10-15 07:22:00 +01:00
Matt
f773adc508 Merge pull request #19919 from spacek531/track/diagonal-brakes 
Diagonal brakes and block brakes
 2023-10-10 02:39:09 +03:00