mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity
22,025 Commits 8 Branches 59 Tags
7da85c9925909c8774945fc682cc32ae605985f4
Commit Graph

81 Commits

Author SHA1 Message Date
Gymnasiast
eb14c426fd Rename research_remove() to ResearchRemove() 2021-10-15 17:01:04 +02:00
Gymnasiast
5cf4a53b66 Make research_remove take const ref 2021-10-15 16:21:14 +02:00
Hielke Morsink
4b4b3333d6 Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
Gymnasiast
bdab3219cb Modify object loading for JSON-only objects 2021-09-15 11:28:39 +02:00
ZehMatt
ca605d6f82 Refactor object selection to use RideManager 2021-09-10 19:10:12 +03:00
Gymnasiast
4cc717ccdb Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Ted John
5f853df1fd Remove gS6Info 2021-08-02 20:38:02 +02:00
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
Duncan
6ec379cd0e Split Entity Lists by Entity type (#14326) 
* Make initial changes to add entity type

* Make further corrections

* Revert header changes

* Fix mistakes
 2021-03-16 11:18:06 +00:00
Michael Steenbeek
f0dc28e9fc Update objects to v1.0.21 2021-03-12 11:04:04 +01:00
Michael Steenbeek
28c680f97f Merge pull request #14163 from Gymnasiast/refactor/get-rtd 
Use GetRideTypeDescriptor() in more places
 2021-02-26 10:46:38 +01:00
Gymnasiast
44d0e77afb Make all access to RTD table use the bounds checking function 2021-02-26 10:01:00 +01:00
Gymnasiast
62f8796677 Replace more flag checking 2021-02-26 09:51:17 +01:00
Gymnasiast
f118b2ede4 Replace ride_type_has_flag() with retrieving RTD 2021-02-26 09:49:09 +01:00
Michał Janiszewski
6baff43f52 Reduce inclusion of Sprite.h 2021-02-25 10:56:27 +01:00
Michael Steenbeek
6e20f41d3c Fix #13688: invalid access to _objectSelectionFlags 2021-02-12 23:06:05 +01:00
Duncan
fe8b8280e8 Fix #7772. Check for vehicles using an object when setting inuse (#14056) 
* Fix #7772. Check for vehicles using an object when setting inuse

* Update changelog
 2021-02-10 18:14:23 +00:00
Basssiiie
813b111710 Fix #11912: Update active palette on selection 2021-01-18 21:25:57 +01:00
Tulio Leao
221aa8cece Close #12453: Refactor RCT2_EDITOR_STEP to strong enum 2020-12-23 20:07:53 -03:00
Richard Qian
8bdfdad26c Refactor track designer object setup function to use UpperCamelCase 2020-12-20 13:08:36 -06:00
Richard Qian
84d5fde6bb Remove the max limit of 4 rides from the Track Designer 2020-12-20 13:08:36 -06:00
Richard Qian
904af2cc4f Enhance the track designer with ability to add scenery and footpaths 
This brings feature parity with Rollercoaster Tycoon Classic (RCTC)

Includes:
* Re-enabled buttons: Ride List, Map, Scenery, Path, Clear Scenery
* Add all standard footpaths and core scenery objects to the object selection

The max limit of 4 rides has not changed; other object types can have more than 4
Only a minimum set of scenery is enabled, as the full set cannot be included
 2020-12-20 13:08:36 -06:00
Gymnasiast
596aa71093 Create ObjectEntryDescriptor to properly handle mixed DAT and JSON 2020-12-02 17:17:25 +01:00
Łukasz Pękalski
dc93cacbee bugHunt: correcting code to compile 
code does not compile yet
 2020-11-11 16:07:01 +01:00
Łukasz Pękalski
832fd69822 refactor: changed ObjectType enum to strong enum 
code does not compile yet
 2020-11-11 16:07:01 +01:00
Łukasz Pękalski
6e5105ab3b refactor: ObjectType to use strong enum 
enum renaming complete
 2020-11-11 16:07:01 +01:00
Michael Steenbeek
d8a7219c86 Use new identifier for default objects 2020-11-07 20:28:01 +01:00
Gymnasiast
a3aef90637 Replace loose usages of 0xFF 2020-11-07 12:58:32 +01:00
Duncan
4a235e3bb6 Refactor ResearchItem Type to an enum class (#12346) 
* Change type of ResearchItem.type to enum class

This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.

* Specifiy a size for the type

Also remove the static cast where not required

* Apply review comments
 2020-07-22 14:25:05 +01:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
frutiemax
77d02c5e2b Close #12290: Refactor of object_manager_unload_objects (#12291) 2020-07-17 05:25:35 +01:00
rdbaris
a2493af9ce Part of #11159 (purge malloc() & free()) (#11893) 
* Used smart pointers

* Changed functions to take vector as input
 2020-07-16 22:35:30 +01:00
Gymnasiast
cc65564521 Use (RCT12)ObjectEntryIndex in more places 2020-05-01 22:06:13 +02:00
Breno Rodrigues Guimarães
a0619d04cf Replace usage of set_format_arg by Formatter::Common() (#11412) 2020-04-25 18:44:14 -03:00
WantDiscussion
37e9270c00 Close #6024: Closing object selection now advances to next step 
In the scenario editor and track designer X button in object selector
will now close the object selector window and advance to the next stage
instead of closing the scenario editor and track editor entirely and
returning to the main menu.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-04-24 17:19:06 +02:00
ifimfree
fb6dd4bfad Create constants for a few flags 2020-04-20 10:39:26 +02:00
Tulio Leao
c17127f65b Use named casts on openrct2 root folder (#11139) 2020-04-17 21:36:25 +02:00
Gymnasiast
edd31d9f16 Move flags to RideTypeDescriptors 2020-04-17 17:03:33 +02:00
Michael Steenbeek
c519512cfe Create ObjectEntryIndex (#10980) 2020-03-20 19:28:39 +01:00
Michael Steenbeek
18ebe73dfa Replace object_entry_get_type() with method (#10937) 2020-03-15 12:07:04 +01:00
Gymnasiast
57a40c0657 Extend PathElement 2020-03-04 21:57:42 +01:00
Ted John
15767c3be3 Fix output result of remove_unused_objects (#10029) 2019-10-01 22:30:11 +02:00
Gymnasiast
c3fdb728d1 Rename rct_research_item to ResearchItem 2019-08-23 22:41:43 +02:00
Ted John
e23638548a Reduce use of MAX_RIDES and RIDE_TYPE_NULL 2019-08-04 16:44:17 +01:00
Ted John
5c07c53faf Refactor get banner 2019-07-25 22:21:19 +01:00
Ted John
85543bd1c8 Separate RCT2 and OpenRCT2 banner struct 2019-07-25 22:21:19 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Ted John
cce979f96b Remove logic for required objects (#8718) 
This allows TARMAC to be removed when `remove_unused_objects` is called.
 2019-02-19 11:55:43 +00:00
Michael Steenbeek
b5317ee9e9 Split drawing of path and railing 2019-01-02 19:52:53 +01:00
Ted John
153ab15428 Fix #8493: Remove_unused_scenery removes map data 
Do not try to remove (unused) terrain surfaces, edges and stations.
 2018-12-30 23:40:22 +00:00