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

76 Commits

Author SHA1 Message Date
Michael Steenbeek
a663ab6cd2 Add extra NULL checks 2017-11-13 21:14:39 +01:00
Michael Steenbeek
2ebac91a2e Add method to look up source game 2017-11-13 21:14:39 +01:00
Michael Steenbeek
11f2d60041 Automatically add all path bits and signs to the designated group 2017-11-13 21:14:39 +01:00
Michael Steenbeek
8d7d53de29 Correct Steel twister capacity 2017-11-13 20:37:13 +01:00
Michael Steenbeek
f073ec33fa Fix #6646: Max cars/train increase for RCT1 parity 2017-11-13 17:37:39 +01:00
Michael Steenbeek
5eed8cecd4 Fix typo in 'multiplier' 2017-11-13 16:22:36 +01:00
Christian F. Coors
06afeeda9a Apply some refactoring 2017-11-02 12:22:28 +01:00
Michał Janiszewski
ed5b655b09 Fix StringTable::Sort comparator
Previously, it explicitly compared to -1, while _strcmpi can return
all integers.
2017-10-30 22:46:57 +01:00
Ted John
8d1710d798 Fix #6460: Crash when reading corrupt object files
- Move sawyer coding functions to SawyerChunkReader.
- Replace assertions with exceptions to prevent crash on invalid chunks.
2017-10-22 16:21:13 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +02:00
Tomas Dittmann
e393ff1f22 Stop using (void*)-1 for invalid pointers 2017-10-15 15:53:16 +02:00
Michael Steenbeek
4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Gymnasiast
6c9e73bff2 Allow loading objects from RCTC
These are technically same as those from RCT2, but with a .POB extension, rather than .DAT
2017-09-28 21:42:58 +02:00
Michael Steenbeek
fa5ec031f1 Clean up ride naming 2017-09-20 21:19:55 +02:00
Michał Janiszewski
00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michael Steenbeek
6ab0f2f905 Name some rct_ride_entry_vehicle properties 2017-09-15 18:25:28 +02:00
Michael Steenbeek
a4802983c2 Make var_02/_03 calculation methods private and static 2017-09-14 14:30:09 +02:00
Michael Steenbeek
9cba5436e5 Split off frame calculations; don't set var_02 and _03 2017-09-14 14:07:55 +02:00
Michael Steenbeek
98e15f1cd9 Rewrite confusing if statement 2017-09-14 13:48:14 +02:00
Michael Steenbeek
8c33240c38 Slightly refactor loading of vehicle entries 2017-09-13 10:45:28 +02:00
Ted John
50735c0f68 Do not log 0 conflicts 2017-08-31 18:02:39 +01:00
Ted John
f371d5c65f Remove unnecessary fields in ObjectRepository 2017-08-30 22:05:12 +01:00
Ted John
f2cd0b2f3b Refactor ObjectRepository to use FileIndex 2017-08-30 21:58:43 +01:00
Michał Janiszewski
d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
Gymnasiast
8eec684545 Use more constants, isolate SV6 limits further 2017-08-14 19:56:29 +02:00
Michał Janiszewski
32407868cc Fix C mangling 2017-08-10 13:42:27 +02:00
Michał Janiszewski
7872380bc1 Initialise rct_object_entry with empty struct 2017-08-01 07:54:04 +02:00
Michael Steenbeek
9c7c553ccc Clean up vehicle flags (#6058) 2017-07-31 11:27:04 +01:00
Ted John
8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
Duncan
9a49490a0a Refactor of scenery elements (#5308)
Label scenery flags, vars and refactor small scenery into cpp file.
2017-07-25 22:26:43 +01:00
Michael Steenbeek
367efa2020 Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places 2017-07-20 20:56:29 +02:00
Ted John
2eb9657781 Fix premature deletion of dependencies (#5952)
In particular, the object repository can potentially be deleted before the object manager is deleted. This causes a crash when the object manager is deleted because it requires the object repository within the destructor.
2017-07-20 17:44:31 +01:00
Gymnasiast
260f342d73 Fix typos in (unused) defines and comment 2017-07-20 16:18:36 +02:00
Richard Jenkins
fab8efbe2a Implement #5855: Display source game in missing obj window 2017-07-19 11:04:00 +02:00
Gymnasiast
34073e10ae Fix Junior RC data files to disable steep inclines, fixes #5902 2017-07-15 10:52:35 +02:00
rwjuk
68c819c01f Log to console when invalid objects found during check 2017-07-05 07:28:46 +02:00
Ted John
ddb96ec267 Refactor load park result
Use a C++ struct and pass that to C.
2017-07-01 01:29:35 +01:00
rwjuk
214bf3988b Implement 'missing objects' window
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
2017-07-01 01:28:51 +01:00
Ted John
f515314a2d Only warn if object export can not fix checksum 2017-06-30 22:25:27 +01:00
Ted John
4f1cfb4631 Don't load graphics for headless 2017-06-25 23:19:24 +01:00
Ted John
b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Ted John
3003393c87 Allow re-creation of object manager
Removing lazy initialisation of it.
2017-06-24 09:56:51 +02:00
Gymnasiast
55977997fd Fix #1705: Time Twister's Medieval entrance has incorrect scrolling 2017-06-23 23:17:22 +02:00
Gymnasiast
db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast
234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Michał Janiszewski
9903c15e2a Remove various trailing whitespaces
[ci skip]
2017-06-17 13:41:40 +02:00
Gymnasiast
4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek
96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
2017-06-14 13:31:27 +02:00
Ted John
0d8f9d6618 Refactor IPlatformEnvironment (#5590) 2017-06-11 12:53:37 +01:00