1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Commit Graph

21100 Commits

Author SHA1 Message Date
Michael Steenbeek
7344b7fbfd Use 16-bit ride_id_t thoughout and raise RIDE_ID_NULL (#14411)
* Replace RIDE_ENTRY_INDEX_NULL with OBJECT_ENTRY_INDEX_NULL

Ride entries are objects like any other, so there is little point having separate constants.

* Use ride_id_t in many more places

* Change RIDE_ID_NULL to 0xFFFF

* Increment network version

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2021-04-01 16:02:57 +01:00
Michael Steenbeek
cbefc4fe38 Fix #14412: NPE in vehicle_create_car() 2021-04-01 11:26:14 +02:00
OpenRCT2 git bot
7c33a31d3a Merge Localisation/master into OpenRCT2/develop 2021-04-01 04:02:31 +00:00
Michael Steenbeek
9ee3c81768 Merge pull request #14397 from Gymnasiast/refactor/hardcoded-terrain-constants
Remove hardcoded terrain style constants from RCT1 and MapGen
2021-03-31 20:18:12 +02:00
Gymnasiast
d7809c26f5 Use string_view instead of const char* 2021-03-31 19:22:09 +02:00
Gymnasiast
b627dbd3a4 Apply review requests 2021-03-31 19:15:33 +02:00
Gymnasiast
69f7ad35fc en-GB: Use real multiplication sign instead of x 2021-03-31 14:37:35 +02:00
Gymnasiast
d7d402747e Add Vietnamese language 2021-03-31 14:26:31 +02:00
Tulio Leao
465bcf768c Merge pull request #14394 from tupaschoal/coords1
Use more ScreenCoordsXY on openrct2-ui
2021-03-30 19:49:51 -03:00
Michael Steenbeek
4014fbe861 Add missing call to gfx_unload_csg() 2021-03-30 22:49:00 +02:00
OpenRCT2 git bot
6bff0fb1a1 Merge Localisation/master into OpenRCT2/develop 2021-03-30 04:02:43 +00:00
Tulio Leao
7e78061e16 Use ScreenCoordsXY on InGameConsole 2021-03-29 09:34:11 -03:00
Tulio Leao
bb8c275df6 Remove raw coords gfx_fill_rect_inset overload 2021-03-29 09:34:11 -03:00
Tulio Leao
08e182fba2 Use ScreenCoordsXY on Graph methods 2021-03-29 09:34:11 -03:00
Tulio Leao
eab297f9ff Use ScreenCoordsXY on Graph::Draw 2021-03-29 09:34:11 -03:00
Tulio Leao
d34dc3c924 Increase usage of ScreenRect' gfx_fill_rect_inset on Finances 2021-03-29 09:34:09 -03:00
Tulio Leao
090aadb647 Use ScreenCoordsXY on window_guest_stats_bars_paint 2021-03-29 09:31:05 -03:00
Tulio Leao
aa88c8d181 Increase usage of gfx_fill_rect_inset that uses ScreenRect 2021-03-29 09:31:05 -03:00
Tulio Leao
d5b5c10e80 Use ScreenCoordsXY for window_game_bottom_toolbar_draw_park_rating 2021-03-29 09:31:04 -03:00
Tulio Leao
2f608c32ab Use ScreenCoordsXY for window_ride_maintenance_draw_bar 2021-03-29 09:31:04 -03:00
Michał Janiszewski
ed40badcb1 Initialise variable to fix Launchpad ppc64el builds
`src/openrct2-ui/windows/TopToolbar.cpp:2112:13: error: ‘side’ may be used uninitialized in this function [-Werror=maybe-uninitialized]`
2021-03-29 09:52:52 +02:00
OpenRCT2 git bot
dd7258eb33 Merge Localisation/master into OpenRCT2/develop 2021-03-29 04:04:12 +00:00
Duncan
ee03ab71d7 Reorganise EntityImport for S4 to follow S6/park style (#14398) 2021-03-28 21:35:53 +01:00
OpenRCT2 git bot
7c78a2b8c3 Merge Localisation/master into OpenRCT2/develop 2021-03-28 04:03:42 +00:00
Gymnasiast
b3bbdcbfd5 Remove hardcoded terrain style constants from RCT1 and MapGen 2021-03-27 17:34:10 +01:00
Michael Steenbeek
7a29350688 Merge pull request #14019 from kimjcalvin/good_first_issue
Display where a track design is located inside the track selector
2021-03-27 16:13:06 +01:00
Gymnasiast
22ba7a2bc1 Fix drawing; fix formatting 2021-03-27 15:56:01 +01:00
calvin
6342fd3d9a Display track file path in track selector 2021-03-27 15:11:08 +01:00
Geoff B
6c8493cb69 Close #14253: Replace font size tokens with adjusted DrawText calls 2021-03-27 14:40:17 +01:00
Michael Steenbeek
713410ab6c Apply changed strings from the new-save-format branch 2021-03-27 14:31:13 +01:00
Tulio Leao
2d1557e48e Merge pull request #13444 from tupaschoal/extract-ifdefed-functions
Extract ifdefed functions
2021-03-27 10:00:01 -03:00
Duncan
619b2afc15 Compute checksum by entity type (#14383)
* Compute checksum by entity type

* Copy only the entity size

* Update replays and network version
2021-03-27 09:36:41 +00:00
OpenRCT2 git bot
e8e30e9c6a Merge Localisation/master into OpenRCT2/develop 2021-03-27 04:02:43 +00:00
Tulio Leao
e23eaa164b Extract RequireNewWindow to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao
62fc4c8034 Extract ResolveCasing to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao
c7ae064a4c Extract ShouldIgnoreCase to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao
9a071aef76 Extract GetAbsolutePath to Platform 2021-03-26 23:17:01 -03:00
Duncan
177b5e1b08 Add plugin hook for guest generation (#14107)
* Add plugin hook for guest generation

* Update api version and add ts entry
2021-03-26 05:49:24 +00:00
Duncan
a4a08ea8b4 Reorg entity import to follow export design (#14177)
* Add CreateEntityAt

* Reorg entity import to follow export design

* Move definitions just because gcc refuses to fix bugs

* Use CreateEntityAt

* Fix freeid allocation

* Streamline freeId reset and add statics
2021-03-26 05:48:38 +00:00
Tulio Leao
f15bbd220a Extract IsPathSeparator to Platform 2021-03-25 23:45:01 -03:00
Duncan
0a47d2157a Use more specific types where appropriate (#14388)
It takes marginally more time to get a Peep than a Guest/Staff so may as well go straight to the correct type
2021-03-25 08:44:25 +00:00
Duncan
1be7457e30 Use entity list rather than MAX_ENTITIES loop (#14384)
* Use entity list rather than MAX_ENTITIES loop

* Use guest for variable names
2021-03-25 08:08:26 +00:00
TELK
040a3eb144 Fix part of #7489: Shortcuts work incorrectly for vertical tracks 2021-03-24 20:32:03 +01:00
Michael Steenbeek
19b1958822 Merge pull request #14332 from DKarandikar/develop
Close #13749: Move Banner window to new framework
2021-03-24 20:30:42 +01:00
Duncan
977d05ba29 Entity type5: Remove peep assigned type (#14380)
* Remove users of AssignedPeepType

* Remove AssignedPeepType

Field no longer required due to changes to EntityType

* Move enum to the RCT12 header

* Increment network version

* Update replays
2021-03-24 08:54:05 +00:00
Michael Steenbeek
a5a63f839a Allow passing ImageId into gfx_draw_sprite() 2021-03-23 11:58:09 +01:00
Duncan
ccfa22c230 Entity type4: Remove MiscEntityType and add FountainType (#14344)
* Move jumpingfountain type out of misc entity type

* Remove SubType for MiscEntities as it is no longer required

* Update replays

* Apply review comments

* Increment network version
2021-03-22 21:24:50 +00:00
Daniel Karandikar
d4efbdf531 Refactor InitTileElement
Break loop when going to go outside of Tile
2021-03-22 19:23:36 +00:00
Daniel Karandikar
5ef750a879 Tidy up BannerWindow::Initialise 2021-03-22 19:23:34 +00:00
Daniel Karandikar
4c1d35478c Tidy Window.cpp 2021-03-22 19:23:31 +00:00