Gymnasiast
7f4bb206af
Correct identification of 'Utopia Park'
...
Utopia Park is the only scenario in RCT1 that uses different names in the scenario list and for the park. Since we use the former to identify scenarios, correct it.
Also add an alias to keep the very popular pack by Crappage working.
2018-08-03 18:41:33 +02:00
clang-format
b02dfdbc93
Binpack function arguments together
...
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:22 +02:00
clang-format
95ce592579
Enforce not breaking before assignments and function names
...
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2018-07-23 16:00:19 +02:00
Hielke Morsink
9cf4ea675f
Correct formatting for source files up to the rct2 folder
2018-07-23 16:00:16 +02:00
clang-format
506d4221d3
clang-format rct1/2/12
2018-07-23 16:00:07 +02:00
Michael Steenbeek
1b08fb4e69
Replace our own integer types with standard ones
2018-06-20 17:30:40 +02:00
Michael Steenbeek
c4cae83335
Fix AddRange to avoid duplicates in EntryList
2018-06-15 23:36:13 +02:00
Hielke Morsink
0cf256ac9e
Ready copyright notice for clang-format
...
Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier.
I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).
2018-06-15 14:07:34 +02:00
Michael Steenbeek
d28e8a6126
Introduce calls to check for research markers
2018-06-15 12:11:03 +02:00
Hielke Morsink
204dd4439b
Mark unused arguments in the libopenrct2 project
...
For dummy classes and functions with empty bodies I've only commented out the arguments, for all others I used C++17's [[maybe_unused]].
2018-06-06 21:03:11 +02:00
Hielke Morsink
5d0022a5cb
Remove argument list from zero-initializers with zero/false/nullptr value
2018-06-04 19:50:46 +02:00
Ted John
9d617958cf
Return date and park by reference from game state
2018-05-30 13:12:19 +01:00
Ted John
1e7560e7da
Do not include GameState.h in Context.h
2018-05-30 12:50:25 +01:00
Aaron van Geffen
dcff6895b5
Refactor game_init_all into GameState::InitAll.
2018-05-30 11:53:32 +02:00
Ted John
f1ee5cad83
Call Park from GameState.
2018-05-30 11:53:32 +02:00
Ted John
376b6d04d8
Fix Linux builds
2018-05-29 18:39:13 +01:00
Ted John
f5e77a9e15
Load objects for title editor and scenario editor
2018-05-29 18:39:12 +01:00
Ted John
6af0cb2b88
Fix import of S4 and S6
2018-05-29 18:39:12 +01:00
Ted John
96a0a22cd1
Make start on loading objects only once
2018-05-29 18:39:12 +01:00
Michael Steenbeek
b573bd49b3
Replace all occurrences of tile_element_is_last_for_tile()
2018-05-24 11:44:53 +02:00
Aaron van Geffen
bfa5bf6ecc
Refactor procedural park methods into Park calls.
2018-05-19 20:21:18 +02:00
Aaron van Geffen
829ac11bec
Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep
...
Refactor code around object types
2018-05-15 15:10:16 +02:00
Hielke Morsink
6c65c3d64d
Merge pull request #6774 from janisozaur/fixes
...
Various code improvements
2018-05-15 14:38:43 +02:00
Ted John
f8271e93b0
Refactor code base to allow easy addition of new object types
2018-05-15 00:32:36 +01:00
Ted John
3f71be51cc
Fix CreateS4, return new instance not nullptr
2018-05-13 01:30:02 +01:00
Ted John
529c744276
Use unique_ptr and shared_ptr for services in Context
2018-05-13 00:43:50 +01:00
Michał Janiszewski
0a92e74ced
Minor fixes
2018-05-11 15:38:30 +02:00
Michael Steenbeek
83b4bcb068
Prepare tunnel door support
2018-05-10 09:39:33 +02:00
duncanspumpkin
5d7da79702
Label next_var_29. Add accessor functions.
...
Removed unused flag (1<<4). Not set in any save. Possibly left over from RCT1
2018-05-05 11:42:15 +01:00
duncanspumpkin
80006cd4a0
Continue
2018-05-05 11:04:50 +01:00
Hielke Morsink
8d10bfb5a1
Add namespace closing comments
2018-05-04 22:54:43 +02:00
Michael Steenbeek
5f9d40be7a
Replace tile_element_get_type() with struct method
2018-05-02 19:27:04 +02:00
oli414
3bff12c081
Seperate surface tile element
2018-05-01 16:33:16 +02:00
Ted John
42f46d15e3
Merge pull request #7414 from OpenRCT2/refactor/string-conversions
...
Refactor string conversion between RCT2 and UTF8
2018-04-25 10:14:39 +01:00
Ted John
41b3a33af4
Merge pull request #7430 from IntelOrca/fix/scan-objects
...
Fix scan objects and run before tests
2018-04-22 22:11:03 +01:00
Hielke Morsink
30063984e6
Delete unused function arguments or mark them so ( #7426 )
...
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).
I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
2018-04-20 13:56:37 +02:00
Ted John
edb9dc39ab
Pass object repository as a dependency when loading objects
2018-04-19 23:51:05 +01:00
Ted John
deaa60f8f1
Refactor string conversion between RCT2 and UTF8
...
Use Win32 API for conversion on Windows for non-1252 code pages instead of built-in tables.
2018-04-18 13:16:20 +02:00
Gymnasiast
60b864441a
Fix encoding of scenario index names
2018-04-12 13:13:14 +02:00
duncanspumpkin
e4e514c743
Fix travis errors. Revert mistaken rename.
...
Use enum where known
Remove unused cases
2018-04-11 18:16:23 +01:00
duncanspumpkin
765500adfa
Label offsets and functions
...
Actually save before commiting
Label more peep vars.
Remove unread var
Further refactoring
Fix mistake in map element type
2018-04-11 18:16:09 +01:00
Hielke Morsink
dc673a64d8
Give context the ownership of repositories and the object manager ( #7340 )
...
This makes them no longer a singleton, which fixes annoying behaviour when launching multiple contexts in one game session.
2018-04-10 13:19:23 +01:00
Michał Janiszewski
cd065d4f41
Reduce includes in common header
2018-03-20 00:27:58 +01:00
Michał Janiszewski
764520076f
Reduce header inclusion
...
* Update includes in PlatformEnvironment.cpp
* Update includes in ParkImporter.h
* Update includes of OpenRCT2.h
* Update includes in Intro.h
* Remove unused include from Input.cpp
* Update includes of Imaging.h
* Update includes in Game.h
* Update includes in Editor.h
* Update includes of Context.cpp
* Update includes in Cheats.cpp, CmdlineSprite.cpp
* Update includes of some source files
* Update includes in some cpp files
* Update includes in some cpp files
* Update includes in TextureCache.h
* Fix tests
* Update includes in Font.cpp
* Update includes in LightFX files
* Update some includes
* Fix GCC builds
* Update some includes
* Update some includes
* Update includes in FontsFamilies.*
* Update includes of Console.h
* Improve includes in Window.h
* Improve headers in Viewport.h/Window.h
* Fix MSVC build
* Fix network-less builds
* Reduce inclusion of Map.h
2018-03-13 13:14:02 +01:00
Michał Janiszewski
4b2881b48e
Improve declaration of deleter type in S4Importer.cpp
2018-03-09 21:34:24 +01:00
Michael Steenbeek
5411c77358
Clean up more direct access to tile elements
2018-03-09 19:40:16 +01:00
Michael Steenbeek
1fa2fa8f80
Refactor ride->entrances and ride->exits
2018-03-07 19:10:50 +01:00
Michael Steenbeek
2de6529cf5
Use big coordinates for PeepSpawn's Z coordinate
2018-02-21 09:50:07 +01:00
Michael Steenbeek
ea0566a3f5
Split PeepSpawn and rct12_peep_spawn
2018-02-21 09:50:07 +01:00
Michael Steenbeek
3e7161650c
Replace LocationXYZD8
2018-02-15 22:26:50 +01:00
Hielke Morsink
55979a3fff
Remove and replace C typedefs
...
`typedef struct/union/enum name { ... } name_again;` is not needed whe compiling C++, moving the name at the back to be in front of the object and removing `typedef` makes it usable the very same way.
This also replaces typedefs with the using keyword. They have better readability, especially for function pointer types, and would allow more flexibility when used with templates.
2018-02-14 09:42:26 +01:00
Michał Janiszewski
86ca1581f7
Fix mismatched deallocators in S4Importer.cpp
2018-02-10 19:55:54 +01:00
Gymnasiast
b1ab852fb7
Add object_entry_get_type()
2018-02-09 13:47:15 +01:00
Gymnasiast
ba7548089c
Fix warnings when converting RCT1 research
2018-02-05 19:06:10 +01:00
Gymnasiast
34a6b5ef92
Remove __cplusplus ifdefs
2018-02-05 16:20:15 +01:00
Gymnasiast
778ba466c5
Remove almost every extern C block
2018-02-05 16:20:15 +01:00
Ted John
0c71855769
Replace Memory::Copy with std::copy
2018-02-04 12:40:24 +00:00
Ted John
7851446a6f
Replace Memory::Set with std::fill or similar
2018-02-04 12:35:02 +00:00
Gymnasiast
ca12a4336b
Fix custom SV4 files crashing the game
2018-02-03 18:48:57 +01:00
Gymnasiast
d91fd1364d
Create passageways in European Extravaganza
2018-02-01 13:52:28 +01:00
duncanspumpkin
5401e69b50
Name vehicle animation offsets
2018-01-30 12:53:50 +00:00
duncanspumpkin
93d1b7a233
Label vehicle sound2 flags
2018-01-30 12:53:50 +00:00
duncanspumpkin
f9d6203200
Refactor vehicle spinning.
...
Fix bug in R8_SPIN and LR_SPIN that would cause vehicles to spin in wrong direction on certain track elements.
Name parameters
Name flag for additional vehicle spinning sprites
Add comments to code to make function easier to understand.
2018-01-30 12:53:50 +00:00
Gymnasiast
2dc56f4393
Fix renamed define
2018-01-29 14:08:08 +01:00
Gymnasiast
e8b2a3df0d
Slight research refactor
2018-01-29 12:52:12 +01:00
rwjuk
f2792688ea
Fix #7084 : SC4 scenario completion not marked correctly
2018-01-28 21:38:37 +01:00
Gymnasiast
0e606c4b8c
Fix research and guest references in RCT1 news items
2018-01-28 21:36:42 +01:00
Gymnasiast
b7ff54480c
Import more RCT1 fields
2018-01-28 21:36:42 +01:00
Gymnasiast
68516fc2bb
Import RCT1 research progress
2018-01-28 19:03:33 +01:00
Gymnasiast
4780ae6e3d
Import RCT1 parks with an interest rate of 1%
2018-01-28 15:38:09 +01:00
Gymnasiast
658131bfec
Fix import of RCT1 vintage cars
...
They only had one colour in RCT1.
2018-01-28 14:38:11 +01:00
Richard Jenkins
1fc32182af
Fix #6314 : SV4s do not mark corresponding scenario as completed
2018-01-23 18:42:00 +01:00
Gymnasiast
9a362a8aa3
Import RCT1 gardens correctly
2018-01-22 20:25:29 +01:00
Michał Janiszewski
3ba0cc3dae
Add missed constexprs
2018-01-14 16:13:37 +01:00
Ted John
742690b4f4
Add enums for weather effect and rain level
2018-01-14 01:06:47 +00:00
Ted John
83cdd56825
Unify current and next climate state into common struct
2018-01-14 01:06:47 +00:00
Michael Steenbeek
037b236d8f
Add the RCT1 edge styles
2018-01-13 15:39:22 +01:00
Michael Steenbeek
cd5a1ba888
Compile files in world folder as C++
2018-01-11 13:25:09 +01:00
Michał Janiszewski
469e142c7b
Change casing of header files
2018-01-11 09:30:09 +01:00
Michał Janiszewski
5a8cfb16c8
Clang-format guards for static data
...
This guards most of the hardcoded data from clang-format.
[ci skip]
2018-01-11 09:19:56 +01:00
Michael Steenbeek
0995ab9910
Fold gResearchNextCategory into gResearchNextItem
2018-01-10 15:31:47 +01:00
Michael Steenbeek
0ae5d7d476
Remove research_remove_non_separate_vehicle_types()
...
This removes more usages of the SEPARATE_RIDE flag.
2018-01-09 21:35:10 +01:00
Michael Steenbeek
e15c8f8b3b
Import broken vehicle and car from S4
2018-01-09 14:06:11 +01:00
Michael Steenbeek
f508402317
Fix RCT1 research naming to match RCT2's
2018-01-09 13:51:54 +01:00
Michael Steenbeek
6a88d6e04d
Move and rename RCT{1,2,12}.h
2018-01-09 13:36:41 +01:00
Michael Steenbeek
0296608623
Name/fix various RCT1/RCT2 limits
2018-01-09 13:36:41 +01:00
Michael Steenbeek
857e64590d
Name some rct(1)_peep fields
2018-01-09 10:35:07 +01:00
Michael Steenbeek
7d5de63484
Refactor rct_research_item, refactor access to rct_research_item
...
This takes away a lot of the bitshift and bit mask trickery previously used.
2018-01-07 15:33:44 +01:00
Ted John
c3eab7ead6
Refactor window.c to C++
2018-01-07 12:39:58 +01:00
Ted John
630a5065db
Refactor colour.c to C++
2018-01-07 12:39:58 +01:00
Michael Steenbeek
755add6c9a
Compile localisation folder as C++
2018-01-06 18:32:25 +01:00
Ted John
02c58a6c5a
Remove custom base Exception class
2018-01-05 18:11:47 +00:00
Duncan
12dde3a589
Refactor of Vehicle Sound Functions ( #6907 )
...
* Refactor vehicle_update_sound_params
Named known params.
Changed function structure to use more return statements to prevent multiple nested ifs.
Used core memory functions instead of hand rolled version.
Added more comments.
Named sub_6BC2F3.
Added comment on likely source of corruption of sound.
* Refactor vehicle_sounds_update
Split the function up into multiple functions.
Rework code to remove GoTos.
* Label params. Refactor slightly the restraint code to use bools
2018-01-04 21:38:27 +00:00
Hielke Morsink
eb4a8924d1
Refactor and clean up footpath-related code
...
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
2018-01-03 10:57:37 +01:00
Michael Steenbeek
347ff702d0
Refactor objects
2018-01-03 10:16:51 +01:00
Gymnasiast
1626f86acc
Compile park.c as C++
2018-01-01 01:18:12 +01:00
Gymnasiast
6f7dfb00aa
Fix duplicated line
2018-01-01 01:01:12 +01:00
Gymnasiast
2a6f2c1763
Fix #6114 : Crash when using a non-LL CSG1.DAT
...
The game will now check for the number of entries in CSG1.DAT. If it's too few, it will now no longer try using its sprites, but print out a warning instead.
2017-12-31 21:03:40 +01:00
Gymnasiast
23d70a4ac9
Compile ride.c as C++
2017-12-31 20:43:17 +01:00
Gymnasiast
559a5c662a
Fix import of RCT1 mazes
2017-12-31 19:54:50 +01:00
Gymnasiast
a435fd7434
Fix #6833 : shops and maze in corrupted file not imported correctly
2017-12-31 18:56:17 +01:00
Robert Jordan
92fc010b9a
Feature: "Load Scenario" title sequence command
...
New command goes by LOADSC in script files and in the enumeration.
Scenarios are stored using the internal also used for localisation.
Scenarios selected can only be scenarios to originally come with one of
the games or expansions.
Modified Scenario Select window to have a mode just for title editor
scenario selection.
2017-12-31 12:42:40 +01:00
Hielke Morsink
628039dd8a
Use range-based for loops in libopenrct2
2017-12-21 23:47:30 +01:00
Gymnasiast
44651defa7
Fix #6447 : Rename friction to mass
2017-12-17 20:11:55 +01:00
Michael Steenbeek
c4f44e5e7a
Compile files in paint folder as C++
2017-12-17 17:24:36 +01:00
Michael Steenbeek
1a9975d683
Compile util and cheats as C++
2017-12-14 10:03:21 +01:00
Michael Steenbeek
6dc49d643a
Compile files in base dir as C++
2017-12-13 08:03:48 +01:00
Michael Steenbeek
171271215e
Change some ride type names for clarity, fix Americanism
2017-12-08 07:59:44 +01:00
Michael Steenbeek
3868b100df
Stop encrypting money
...
It serves no purpose any more. Of course, we still need the ENCRYPT_MONEY() and DECRYPT_MONEY() functions for importing and exporting S6 files.
2017-12-07 23:22:24 +01:00
Michael Steenbeek
0ffa2b541a
Use more consistent terminology and remove some Americanisms
2017-12-05 10:23:36 +01:00
Michael Steenbeek
60d8865efb
Compile game.c and game.h as C++
2017-12-05 09:10:27 +01:00
Michael Steenbeek
b0aaf13cec
Clean up and future-proof peep spawn import
2017-11-30 23:08:59 +01:00
duncanspumpkin
b6ce5ce4a5
Simplify fountain code. Name sprite fields. Fix warning
...
Fountain jumping code has been sped up slightly so that the code can be simplified and not require rolling over a unsigned int. Also removed setting direction of the fountain as the field was not used.
2017-11-25 09:30:38 +00:00
Michael Steenbeek
1011d6172d
Clean up string IDs
2017-11-23 15:52:06 +01:00
Michael Steenbeek
dd8464f907
Refactor small, large and wall scenery
2017-11-20 14:40:56 +01:00
Michael Steenbeek
bf69b2e682
Make terminology use more consistent
2017-11-20 11:20:04 +01:00
platipo
789b47b7bb
Refactor slope flags and path type flag
2017-11-18 12:58:27 +01:00
Michael Steenbeek
bb483b0c5f
Replace direct access to large scenery colour with helper functions
2017-11-17 22:54:54 +01:00
Michael Steenbeek
3bd68947b9
Create functions for getting large scenery type and sequence
2017-11-17 12:56:08 +01:00
Michael Steenbeek
f448d16707
Add methods for getting and setting track element type
2017-11-17 12:54:47 +01:00
Michael Steenbeek
ab3f42f1f9
Add getters and setters for ride index and maze entry
2017-11-17 12:54:47 +01:00
Christian F. Coors
58e8ef5de4
Fix build in clang
2017-11-14 21:01:11 +01:00
Michael Steenbeek
5409dedb7e
Remove unused C transfer functions in Tables.cpp
2017-11-14 11:55:53 +01:00
Michael Steenbeek
9d686db86c
Fix typo in 'tolerance'
2017-11-13 16:23:19 +01:00
Michael Steenbeek
af845beb61
Replace mapElement with tileElement
2017-10-31 19:59:06 +01:00
Michael Steenbeek
ce8d9cc71b
Rename map_element to tile_element
2017-10-31 19:59:06 +01:00
Michał Janiszewski
b12dad5bd9
Remove duplicate assignment in S4Importer.cpp
2017-10-30 22:51:35 +01:00
Gymnasiast
bc3b579b92
Fix import of RCT1's inverted coaster train
2017-10-28 19:02:58 +02:00
Michael Steenbeek
ce4899c60c
Compile station.c as C++
2017-10-23 14:47:12 +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
7f9c25a7a9
Use constant for LOCATION_NULL, split off location stuff to Location.h
2017-10-13 22:23:07 +02:00
Michał Janiszewski
ab3835719a
Compile peep and staff logic as C++
2017-10-13 10:06:36 +02:00
Michael Steenbeek
3a9dc3f491
Ensure that get_ride_entry returns NULL on invalid ride entries
2017-10-12 21:07:35 +02:00
Michael Steenbeek
3a2aeda398
Refactor expenditure table and history graph
2017-10-12 20:35:59 +02:00
Michael Steenbeek
d342272dda
Fix usage of RIDE_ID_NULL
2017-10-12 13:35:04 +02:00
Robert Jordan
559a4c0953
Fix #6445 : set favourite ride to N/A when importing from RCT1/AA
2017-10-12 12:40:57 +02:00
Michael Steenbeek
42d6a10952
Compile management as C++
2017-10-11 21:38:26 +02:00
Michael Steenbeek
17557569d0
Turn 'unlock all prices' into a regular option
...
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.
Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
Michał Janiszewski
c4538496c5
Make sure variables are either static or declared externally
2017-10-09 22:59:40 +02:00
Michael Steenbeek
31e1ad43a8
Compile finance.c as C++, clean up
2017-10-07 16:28:35 +02:00
Michael Steenbeek
7cb464af6e
Clean up animated object limit and import
2017-10-06 11:33:55 +02:00
Gymnasiast
e6faf6b7c4
Fix #6201 , #6250 : custom RCT1 scenarios cause empty scenario list entry
...
The scenario repository did not correctly handle custom RCT1 scenarios.
They were not listed, but if they existed, an empty entry would appear in the scenario list.
This fixes both issues, and also prints a warning message, should this ever happen again.
2017-10-03 07:48:02 +02:00
Michał Janiszewski
5ab9f938a7
Update files missed in the great extern "C" cleanup of 2017
2017-09-28 23:29:16 +02:00
Michael Steenbeek
289e154fe4
Fix #6315 : Not all researched items in S4 are available
2017-09-28 16:24:44 +02:00
Martin Müller
e38a77da2a
Set gScenarioFileName when loading an RCT1 park
...
This fixes bugs when completing an RCT1 scenario, where the highscore
would be saved for the wrong park because gScenarioFileName hasn't been updated on load.
2017-09-26 15:53:06 +02:00
Michael Steenbeek
1fd1d8c26b
Move editor to C++; add defines for object limits
2017-09-22 07:56:24 +02:00
Gymnasiast
a28509e24c
Split Ride and rct2_ride
2017-09-12 11:16:57 +02:00
muemart
e5bfd241ea
Import staff patrol areas from RCT1 save files and fix #5445
2017-09-10 12:54:57 +02:00
Richard Jenkins
71e580a58f
Refactor game load functions, resolves #6011
2017-08-23 08:04:36 +02:00
Gymnasiast
8eec684545
Use more constants, isolate SV6 limits further
2017-08-14 19:56:29 +02:00
duncanspumpkin
18d082053e
Rename cpp files to use TitleCase
2017-08-04 18:12:54 +02:00
Gymnasiast
2b540b9da1
Remove direct access to small scenery's colour_1 and _2 fields
2017-07-27 21:37:34 +02:00
Gymnasiast
db438a27b7
Use map_element_get_direction in more places, create map_element_get_direction_with_offset()
2017-07-27 21:23:26 +02:00
Michael Steenbeek
434325ea22
Move vehicle preference to RideGroupManager
2017-07-27 21:03:26 +02:00
Gymnasiast
db56c7e3b3
Change growth_rate to target, fix cheats to use them
2017-07-26 16:49:42 +02:00
CharlesLove
88290337f6
Fix #5881 : gCheatsUnlockAllPrices persists when loading new scenarios
2017-07-22 22:20:52 +02:00
Gymnasiast
f5923dbe99
Create find_first_non_null_station_index()
2017-07-19 08:52:33 +02:00
Gymnasiast
c96ef96edb
Clean up rct_ride and rct1_ride structs and usage
2017-07-18 10:50:28 +02:00
Gymnasiast
7b8248cca7
Change ride->exit into an rct_xy8, cleanup
2017-07-17 20:41:03 +02:00
Gymnasiast
c12113475b
Turn ride->entrances into an rct_xy8
2017-07-17 19:27:38 +02:00
rwjuk
cc95aa0433
Fix visual corruption caused by zero sprite dimensions
...
Sprite corruption issue highlight
Fix already bugged saves
Fix visual corruption caused by zero sprite dimensions
2017-07-06 13:22:24 +01:00
rwjuk
68c819c01f
Log to console when invalid objects found during check
2017-07-05 07:28:46 +02:00
Richard Jenkins
048c543fe2
Fix needless double invocation of Memory::Set
...
Memory::Set() invocations moved to InitialiseEntryMaps() function.
2017-07-03 23:59:19 +01:00
Richard Jenkins
aec214c684
Fix #5767 : Importing AA/LL SC4s causes a crash
2017-07-03 17:32:05 +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
Ted John
c3356d457e
Fix S4s never loading if no object errors
2017-07-01 01:29:34 +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
Gymnasiast
6206fbda80
Do not reuse _parkValueConversionFactor of previous S4
2017-06-30 16:02:57 +02:00
Gymnasiast
50a7c40fbd
Fix #5253 : RCT1 park value conversion factor too high
2017-06-29 20:08:59 +02:00
Gymnasiast
2f3b5d1c7a
Add IDs for null sound IDs
2017-06-25 20:45:38 +02:00
Gymnasiast
5db6e5afa1
Use constants for number of marketing campaigns and expenditure table
2017-06-19 22:17:05 +02:00
Gymnasiast
9f5d1cf40a
Fix ride naming in S4 import, cleanup
2017-06-17 19:10:53 +02:00
Richard Jenkins
312adaf8e7
Merge pull request #5644 from Gymnasiast/max-stations
...
Add define for number of colour schemes, correct several cases of max stations per ride
2017-06-17 14:32:36 +01:00
Gymnasiast
631f4d8907
Add a constant for RIDE_ENTRY_INDEX_NULL
2017-06-17 14:32:15 +02:00
Gymnasiast
ed905f3c68
Add define for number of colour schemes, correct several cases of max stations per ride
2017-06-17 14:31:48 +02:00
Ted John
1e9f9790ae
Fix #5496 : Attempting to log into servers results in crash
...
Caused by the user not having the required 'official' objects. This was because the network was being closed during a network update. Disposed memory would then be accessed later in the update loop.
To fix this, a lock has been added to Close() so that it can be deferred to the end of Update(). This isn't particularly nice, but the whole of network will need redesigning to fix this properly for all potentical scenarios where Close() can be called.
2017-06-06 20:05:47 +01:00
Michał Janiszewski
79d76759bb
Fix #5516 : Update copyrights for 2017
...
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
duncanspumpkin
69d8794260
Use snake case for peep fields
2017-05-16 20:12:18 +01:00
Richard Jenkins
6472c0e6c3
Allow ride names to duplicate existing user strings, fixes #5211
2017-05-12 23:43:48 +02:00
Richard Jenkins
d6b32591ae
Implement guard function for decrementing guest counts
...
* Implement guard function for decrementing guest counts
* Implement separate functions for incr/decr of peep count globals
* assert() on attempt to increment guest counts over UINT16_MAX
* Increase network version
2017-05-11 18:31:29 +02:00
Michael Steenbeek
a53b01d5b9
Remove magic numbers and Americanisms
2017-05-08 23:54:38 +02:00
Richard Jenkins
563cd78ef7
Fix #5449 : Underflow of gNumGuestsHeadingForPark in SC4 import
2017-05-08 23:49:02 +02:00
CraigCraig
e0b875398b
Tons of spelling fixes ( #5413 )
...
[ci skip]
2017-04-30 06:39:24 +02:00
Michał Janiszewski
92aefb477f
Fix compilation with GCC7
2017-04-24 11:34:56 +02:00
Gymnasiast
b5b602d5a0
Fix import of SV4 scenario ticks, fixes #5004
2017-03-26 18:13:54 +02:00
Gymnasiast
e85c627bd5
Fix importing SV4 walls in pause mode
2017-03-25 21:57:31 +01: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
Duncan
1654ba4fe4
Merge pull request #5236 from duncanspumpkin/refactor
...
Refactor fence to wall
2017-02-28 06:56:06 +00:00
duncanspumpkin
810bf301f3
Rename map element fence to wall
2017-02-20 21:10:49 +00:00
duncanspumpkin
f54c71b61c
Rename functions to wall. Refactor game commands
2017-02-20 21:02:19 +00:00
duncanspumpkin
133266deb0
Label fence offsets
2017-02-19 11:03:05 +00:00
Michael Steenbeek
c233eedafe
Multiply SV4 park value objectives by 10, fixes #5218
2017-02-18 13:40:10 +01:00
wolfreak99
f85dc8ced0
Code fixups
2017-02-08 21:46:54 -05:00
wolfreak99
b0cc772990
Replace gParkEntranceX/Y/Z/Direction with rct_xyzd16 gParkEntrance
2017-02-08 09:39:04 -05:00
Michael Steenbeek
528843184c
Fix RCT1 research import, fixes #5014
2017-02-05 20:54:01 +01:00
Ted John
fed4c248e3
Remove use of SDL RWOps from title sequence player
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
5c1f2f4c43
Replace IS4Importer with IParkImporter
2017-02-02 22:00:01 +00:00
Ted John
2b045ddb9b
Use streams for reading parks in S4 importer
2017-02-02 22:00:01 +00:00
Ted John
f30a3b315c
Add common load method for S4 importer
2017-02-02 22:00:01 +00:00
Michał Janiszewski
04a2734593
Merge pull request #5162 from duncanspumpkin/refactor
...
Small refactor of world files
2017-02-02 22:53:37 +01:00
Michael Steenbeek
695f7c33bf
Fix all known incorrect land ownership in RCT1
2017-02-02 22:21:05 +01:00
duncanspumpkin
e749285e48
Label PARK_FLAGS_18 and adjust SCENARIO_NO_MONEY comment
2017-02-02 17:59:23 +00:00
Gymnasiast
2381bd5cfb
Fix RCT1 Splash Boats import
2017-02-02 15:47:08 +01:00
Ted John
612e268e5f
Allow SC4s to be loaded by title seq player
2017-01-31 17:54:39 +00:00
Ted John
a8e329ef99
Implement getting sc entries from SC4s
2017-01-31 17:54:39 +00:00
wolfreak99
99c68439b1
define MAX_PEEP_SPAWNS and MAX_PARK_ENTRANCES ( #5119 )
2017-01-29 22:27:14 +01:00
Michał Janiszewski
834cee311b
Fix typos in RCT1-related code
2017-01-27 22:13:49 +01:00
Gymnasiast
24b546b789
Fix import of peep sprites
2017-01-27 00:50:49 +01:00
Ted John
e115227c08
Sort includes
2017-01-26 23:36:33 +00:00
Ted John
b5505c9fc9
Improve function names
2017-01-26 23:36:21 +00:00
Ted John
f019aa5db5
Remove commented out code
2017-01-26 23:35:01 +00:00
Ted John
f3fc09cb9a
Fix switch brace syntax
2017-01-26 23:32:46 +00:00
Gymnasiast
2da90b9808
Fix erroneous messages about stalling
2017-01-26 23:30:16 +00:00
Ted John
c24127bafe
Fix loading scenario details from SV4
2017-01-26 23:30:16 +00:00
Gymnasiast
c92792a973
Also import news items in S4 files correctly
2017-01-26 23:30:16 +00:00
Gymnasiast
6d8a617712
Count block sections when importing an SC4/SV4 file
2017-01-26 23:30:16 +00:00
Gymnasiast
a7e91ad556
Use the actual scenario number in the S4 file rather than the file name
2017-01-26 23:30:16 +00:00
Gymnasiast
bd68624c92
Fix unbuyable land tiles in Katie's Dreamland
2017-01-26 23:30:16 +00:00
Gymnasiast
84754ec30f
Correctly import Heide-Parks Compact Inverted Coaster
2017-01-26 23:30:16 +00:00
Gymnasiast
585e28b67f
Temporarily fix non-ascii import
2017-01-26 23:30:16 +00:00
Gymnasiast
e621cd37cc
Fix mechanics facing the wrong direction
2017-01-26 23:30:16 +00:00
Ted John
1cb6dbbe1f
Convert RCT1 strings to UTF-8
2017-01-26 23:30:16 +00:00
Ted John
67b668c54e
Use spite_move when importing misc sprites
2017-01-26 23:30:16 +00:00
Ted John
1a5bec7846
Fix and refactor sprite index mapping
2017-01-26 23:30:16 +00:00
Gymnasiast
79f9cf611d
Guard better against incorrect subtypes
2017-01-26 23:30:16 +00:00
Gymnasiast
91c3b5c592
Fix lifecycle flags import
2017-01-26 23:30:16 +00:00
Gymnasiast
d476176d73
Import more fields, name mechanic flags, fix booster behaviour
2017-01-26 23:30:16 +00:00
Gymnasiast
39d413b781
Fix Megaworld Park crashing on opening, fix some colour schemes
2017-01-26 23:30:16 +00:00
Gymnasiast
476f1fad2b
Use constants for null sprite location and maximum vehicles
2017-01-26 23:30:16 +00:00
Gymnasiast
02da9caf5d
Fix formatting and remove warning silencer
2017-01-26 23:30:16 +00:00
Gymnasiast
803c4ddfe5
Fix minigolf import
2017-01-26 23:30:16 +00:00
Gymnasiast
653be68b98
Don't assert on incorrect colour or sprite type
2017-01-26 23:30:16 +00:00
Gymnasiast
69a79fd00a
Import water colour
2017-01-26 23:30:16 +00:00
Gymnasiast
3d0c357fbf
Fix vehicle direction
2017-01-26 23:30:16 +00:00
Gymnasiast
54c4f0f1f3
Fix import of more vehicles, fix some colours
2017-01-26 23:30:16 +00:00
Gymnasiast
cc4576b72a
Fix colour lookup for vehicle sprites
2017-01-26 23:30:16 +00:00
Gymnasiast
51c812458e
Extract colour lookup functions
2017-01-26 23:30:16 +00:00
Gymnasiast
d077cd1341
Create table for converting colour schemes, fix some vehicles, fix river rapids
2017-01-26 23:30:16 +00:00
Gymnasiast
63d639db5d
Fix negative queue lengths, fix monorail, fix chairlift crashes
2017-01-26 23:30:16 +00:00
Ted John
c1d532be01
Fix colour conversion out of range
2017-01-26 23:30:16 +00:00
duncanspumpkin
e3e435c9f7
Fix trains splitting up into multiple vehicles
2017-01-26 23:30:16 +00:00
Gymnasiast
dacfba9eda
Import more fields, correct more vehicles
2017-01-26 23:30:16 +00:00
Gymnasiast
fc7b03747e
Import ride measurements (with bugs)
2017-01-26 23:30:16 +00:00
Gymnasiast
e3d197e856
Import Corkscrew train correctly, import colours
2017-01-26 23:30:16 +00:00
Gymnasiast
f7f744f59b
Use a map to convert vehicle subentry and restore seat rotation
2017-01-26 23:30:16 +00:00
Gymnasiast
8646f5d4ee
Use speed, friction from source vehicle
2017-01-26 23:30:16 +00:00
Ted John
6c339787ee
Fix peep links in vehicles
2017-01-26 23:30:16 +00:00
Gymnasiast
748d82f517
Import peeps in vehicles as well
2017-01-26 23:30:16 +00:00
Ted John
390a03a540
Remove seat rotation from RCT1 vehicle struct
2017-01-26 23:30:16 +00:00
Ted John
f52286a442
Import and fix vehicle links
2017-01-26 23:30:16 +00:00
Ted John
604e17007f
Copy over some properties
2017-01-26 23:30:16 +00:00
Ted John
7a4ca989ba
Add beginnings of vehicle importing
2017-01-26 23:30:16 +00:00
duncanspumpkin
d951c500c5
Refactor of peep data and label known addresses
...
Fixes #4545 . Incorrect sprite image for chicken and juice
2017-01-26 19:51:30 +00:00
Ted John
3379143011
Improve S4 / S6 import initialisation
2017-01-23 13:00:46 +00:00
Ted John
abac2ca614
Consolidate game initialisation into single method
2017-01-23 12:44:27 +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
Gymnasiast
0a83bb8b15
Fix importing custom peep/staff names, fix formatting
2017-01-22 16:54:58 +01: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
b80b71cf81
Fixed typos and warnings after rebase
2017-01-14 14:31:06 +01:00
Broxzier
60603ae10a
Use types from common.h
2017-01-14 12:37:31 +01:00
Michał Janiszewski
0a36af19e4
Mark classes as final to help devirtualisation
2017-01-13 12:12:50 +01:00
Michał Janiszewski
411d1fff18
Make GCC suggest final, override keywords
2017-01-13 11:44:14 +01:00
Ted John
b79af110c7
Fix more warnings
2017-01-12 18:02:28 +00:00
Gymnasiast
7767f506be
Fix balloon stall
2017-01-11 22:59:45 +01:00
Ted John
acba8ee63f
Fix code style
2017-01-08 23:51:22 +00:00
Gymnasiast
9521911719
Import money effect
2017-01-08 23:35:30 +00:00
Gymnasiast
8c1926e41c
Import jumping fountain water
2017-01-08 23:35:30 +00:00
Gymnasiast
5a51f28ba0
Fix balloons, import balloons, ducks and steam particles
2017-01-08 23:35:29 +00:00
Gymnasiast
70f6f638ca
Fix negative queue lengths, fix guests thoughts, import litter, import more fields, fix monorail, fix chairlift crashes
2017-01-08 23:35:26 +00:00
Ted John
9c11b051ee
Add some max constants for RCT1
2017-01-08 23:34:49 +00:00
Michał Janiszewski
3f8f513a47
Verify access to RCT1 fields
2017-01-07 11:19:04 +00:00
Ted John
e7a7704efb
Fix RCT1 (original) imported parks having no ride music
2017-01-06 21:48:27 +00:00
Ted John
4fbecc2f60
Replace magic numbers with constant SPRITE_INDEX_NULL
2017-01-05 12:49:42 +00:00
Ted John
25bc798ff8
Move contents of src into project sub directory
2017-01-04 17:44:12 +00:00