Commit graph

42 commits

Author SHA1 Message Date
Ted John
4852633a1b Fix #5966: Issue with Ride Time 2017-07-22 09:24:51 +01:00
Michael Steenbeek
343e436e45 Import rides in SV6 files per ride and per field 2017-07-19 22:00:48 +02:00
Ted John
c33a9f06d9 Remove subsitute_path and refactor gScenarioFilename 2017-07-16 23:25:11 +01:00
Michał Janiszewski
12500dd802 Fixup the disjoint null sprites 2017-07-07 00:14:45 +02:00
rwjuk
247d72b1aa Implement sprite cycle checking 2017-07-06 19:57:37 +02:00
Michał Janiszewski
ec7bcfce34 Revert "Fix #5795: Implement sprite cycle checking" 2017-07-06 11:13:12 +02:00
rwjuk
22f88f80b0 Implement sprite cycle checking 2017-07-05 23:34:47 +01: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
ab38c07fb9 Make object window work with S4s and scenarios 2017-07-01 01:29:34 +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
b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Michael Steenbeek
e725672d23 Clean up alternative track pieces and types, remove remnants of researched track pieces 2017-05-16 19:11:51 +02:00
Michał Janiszewski
ee7ad17a30 Align field assignments in S6Importer.cpp 2017-04-24 22:40:22 +02:00
duncanspumpkin
ffeb1fa527 Initial refactor of entrance 2017-03-13 17:33:46 +00:00
Ted John
bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John
fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00
Ted John
5e812d5315 Merge pull request #5209 from IntelOrca/refactor/remove-c-rwops
Refactor and remove RWops from C code
2017-02-12 10:48:51 +00:00
Ted John
5e483b3288 Merge pull request #5153 from wolfreak99/refactor_peep_spawns_park_entrances
Refactor park entrance to a struct
2017-02-11 21:14:59 +00:00
wolfreak99
e9726a8121 Include compatibility comment 2017-02-11 15:33:22 -05:00
wolfreak99
e41f8108b7 Remove tabs 2017-02-11 14:07:05 -05:00
Ted John
fb7f0a21d2 Remove game_load_sv6 that uses RWops 2017-02-11 12:03:03 +00:00
wolfreak99
f85dc8ced0 Code fixups 2017-02-08 21:46:54 -05:00
Ted John
410376356d Remove scenario_load_rw, no longer used 2017-02-08 22:06:27 +00:00
Ted John
d124f4fad0 Use streams for network load and save 2017-02-08 18:16:33 +00:00
wolfreak99
b0cc772990 Replace gParkEntranceX/Y/Z/Direction with rct_xyzd16 gParkEntrance 2017-02-08 09:39:04 -05:00
Ted John
2518362112 Use streams for SV6 export 2017-02-05 15:45:23 +00:00
Ted John
7ab2723936 Create a reader class for sawyer encoded chunks. 2017-02-05 02:40:50 +00:00
Ted John
601a8e633c Fix #5171: Latest build doesn't allow server connection
Network park streams do not have checksums so do not try to validate.
2017-02-04 11:05:25 +00:00
Ted John
afc8943e34 Fix #5169: Parks containing packed objects fail to open
Regression from 3b02b05dc6. Forgot to implement reading packed objects with IStream.
2017-02-04 00:34:14 +00:00
Ted John
44120b2e7e Fix build issues 2017-02-02 22:00:01 +00:00
Ted John
bb62bbebb3 Re-introduce checksum validation 2017-02-02 22:00:01 +00:00
Ted John
fed4c248e3 Remove use of SDL RWOps from title sequence player 2017-02-02 22:00:01 +00:00
Ted John
5d7a712672 Use new S6 importer for title screen and fix issues 2017-02-02 22:00:01 +00:00
Ted John
8998b2ae18 Refactor S6 importer to use IParkImporter interface 2017-02-02 22:00:01 +00:00
Ted John
3379143011 Improve S4 / S6 import initialisation 2017-01-23 13:00:46 +00:00
Ted John
8d959fa519 Merge pull request #5085 from IntelOrca/refactor/structs/various
Create new OpenRCT2 news item struct
2017-01-22 16:15:42 +00:00
Michał Janiszewski
64fc76009a Strip ghost flag from elements on loading
Ghost elements are notoriously a reason of network desyncs, because they
don't get transferred over network. They are meant to be local only and
disregarded by any logic, but it is not yet the case in many places.

Upon saving, we *remove* all the ghost elements (by calling
`scenario_fix_ghosts`), based on assumption they can only be caused by
local interaction. Testing has shown there are `sv6`s in the wild that
have elements marked as ghosts and this could lead to a situation where
we strip away parts of the park. This also causes network desyncs for
reason stated above.

As we strip elements with ghost flag from saves anyway, it should be
safe to assume none of our saves introduce ghosts and this issue is
limited to hacked parks only. One example of such park is [Cocopa
Bay](http://www.nedesigns.com/park/3473/cocopa-bay/).

This change removes the flag on all map elements while importing. This
is much less invasive than removing all ghost elements on importing, as
they may contain some actual data. This ~~fixes~~ hides the desync that
could be seen in the Cocopa Bay park.

As this doesn't change any in-game logic, no network version update is
necessary.

#5094
2017-01-21 00:21:10 +00:00
Ted John
71f83cd7a7 Dissociate rct_news_item from RCT2 2017-01-17 12:51:02 +00:00
Ted John
f6dee8c58d Unify rct1_award and rct2_award 2017-01-16 18:41:16 +00:00
Ted John
5efd23dbe5 Create new OpenRCT2 award struct 2017-01-16 18:00:04 +00:00
Broxzier
60603ae10a Use types from common.h 2017-01-14 12:37:31 +01:00
Ted John
25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00
Renamed from src/rct2/S6Importer.cpp (Browse further)