1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00
Commit Graph

270 Commits

Author SHA1 Message Date
Hielke Morsink
8c1ed596ce Apply review changes
- Print warning/error code in log message
- Remove attribute from Object::SetSourceGame which has a FIXME comment already instead
2018-06-06 21:03:11 +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
Michał Janiszewski
debb6cd46c Remove declarations of unimplemented functions (#7615) 2018-06-02 13:51:23 +02:00
Ted John
376b6d04d8 Fix Linux builds 2018-05-29 18:39:13 +01:00
Ted John
3a708ea112 Refactor parallelism to re-usable method 2018-05-29 18:39:12 +01:00
Ted John
1766abde91 Multi-thread object loading 2018-05-29 18:39:12 +01:00
Ted John
fbe0f5d04f Throw object load exception if unable to load any objects 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
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
58241d33fc Use constant for max ride categories 2018-05-15 12:08:44 +01:00
Ted John
6f00e6aafe Make ObjectRepositoryItem C++ 2018-05-15 00:36:35 +01:00
Ted John
f8271e93b0 Refactor code base to allow easy addition of new object types 2018-05-15 00:32:36 +01:00
Michael Steenbeek
fcf507e051 Spin off shop item stuff to separate files 2018-05-14 19:21:43 +02:00
Aaron van Geffen
8c3766288b Address clang 6.0 compilation errors. 2018-05-13 23:22:40 +02:00
Ted John
4e86d18dad Support loading images from zip 2018-05-13 12:04:45 +01:00
Ted John
0f0bb021d6 Add support for raw images 2018-05-13 11:36:35 +01:00
Ted John
73a4d1400d Read images with offsets 2018-05-13 11:36:35 +01:00
Ted John
580f1baff2 Get basic relative .png loading 2018-05-13 11:36:35 +01:00
Ted John
9aef466b9b Fix bugs with zip and object manager changes 2018-05-13 11:36:35 +01:00
Ted John
23efe7f339 Load JSON from file or zip 2018-05-13 11:36:35 +01:00
Ted John
d7e93cec27 Prevent use of Context during ~Context 2018-05-13 00:43:56 +01:00
Ted John
529c744276 Use unique_ptr and shared_ptr for services in Context 2018-05-13 00:43:50 +01:00
Ted John
302fe00805 Always pass shared_ptr by reference 2018-05-11 20:39:00 +01:00
Ted John
d1cbf998a0 Do not return shared_ptr for LocalisationService
GetLocalisationService is currently used a lot, so remove overhead of shared_ptr copy.
2018-05-11 20:39:00 +01:00
Ted John
7075f6ca25 Use correct language for scan-objects 2018-05-11 20:39:00 +01:00
Ted John
35df72e61f Remove use of gCurrentLanguage 2018-05-11 20:39:00 +01:00
Ted John
7dc170ef85 Use shared_ptr for long-life objects
Use unique_ptr and shared_ptr for IContext, IPlatformEnvironment, IUiContext, and IAudioContext.
2018-05-11 20:37:48 +01:00
Michał Janiszewski
0a92e74ced Minor fixes 2018-05-11 15:38:30 +02:00
Michael Steenbeek
907d318e1c Make Ride Groups more C++-like 2018-05-07 20:18:06 +02:00
Hielke Morsink
8d10bfb5a1 Add namespace closing comments 2018-05-04 22:54:43 +02:00
Gymnasiast
350b777fe9 Fix includes 2018-05-01 20:38:57 +02:00
Ted John
2ef549b055 Fix #7450: Only 3 standard entertainer costumes can be chosen
String value rather than string arrays were not being processed for enterainer costumes in object json files.
2018-04-26 22:00:48 +01: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
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
duncanspumpkin
e954865b49 Fix waypoints for json changes 2018-04-11 18:16:16 +01:00
duncanspumpkin
376c40f1d4 Make peep loading positions nicer
Change name to waypoints. Rework
2018-04-11 18:15:28 +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
Michael Steenbeek
92ba2dfb01 Make seatsInPairs default to true 2018-04-09 16:05:21 +02:00
Ted John
dea5d2754b Search ObjData recursively
Enable recursive searching ObjData for Windows and non-Windows. This allows players to continue using sub directories for their official objects, e.g. WW and TT. There will be a slight performance hit if all objects are in a sub directory as a search is done for each official object that is loaded.
2018-04-08 19:03:33 +01:00
Ted John
9dba4a87cc Fix #7389: Path items cannot be placed on sloped paths
Handle isAllowedOnQueue and isAllowedOnSlope separately
2018-04-08 18:46:01 +01:00
Duncan
0ab3d0955c Merge pull request #7310 from OpenRCT2/json-objects
Add support for new JSON object format
2018-04-08 10:45:55 +01:00
Hielke Morsink
a51462b0fd Include necessary files for compiling headers
This commits works towards #7289. It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
2018-03-31 23:07:14 +02:00
Ted John
63e9275b60 Protect against unknown ride types 2018-03-30 16:58:12 +01:00
Ted John
375deb0c9f Include string not cstring 2018-03-30 16:53:55 +01:00
Ted John
bb5b531f0c Use resize instead of push_back 2018-03-29 17:59:49 +01:00
Michael Steenbeek
855baadd4c Remove incorrect sujeonggwa spelling 2018-03-29 14:31:17 +02:00
Michael Steenbeek
cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00