1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Commit Graph

421 Commits

Author SHA1 Message Date
Łukasz Pękalski
3de233c796 Close #12395: Refactor PeepItem to use strong enum (#13311)
* refactor: integrated PEEP_ITEM into SHOP_ITEM

* refactor: converted merged enum to flag

Only former occurrences of PEEP_ITEM

* cleanUp: code cleaned after merging

* refactor: converted ShopItem to strong enum

code reformatting

* refactor: ShopItem enum items renamed

code formatted

* refactor: new getter and setter functions for Item...Flags

* refactor: replaced all occurrences of ItemStandardFlags

with appropriate getter and setter functions.
COMPARE_FIELD macro needs to be commented out or the flag has to stay public.

* refactor: all occurrences of ItemExtraFlags replaced

with proper function calls. COMPARE_FIELD macro issue not resolved.

* refactor: introduced new variable for unified item flags

* refactor: adapted accessor functions

accessor functions were modified to accommodate both standard and extra ShopItem flags

* refactor: ItemExtraFlags accessor functions are replaced

with general functions

* refactor: reverted to original uint32_t flag variables

* refactor: implemented suggested changes

* refactor: integrate additional comments

* refactor: incorporated requested changes

* refactor: incorporated requested changes

added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-03 21:15:59 -03:00
Ted John
8ce924bd64 Fix Docker CI, explicit copy constructor 2020-12-03 22:05:24 +00:00
Gymnasiast
596aa71093 Create ObjectEntryDescriptor to properly handle mixed DAT and JSON 2020-12-02 17:17:25 +01:00
Ted John
3d1c1b7e65 Fix writing of objects.idx (#13438)
Use WriteString instead of WriteValue for std::string.
2020-11-22 16:35:02 +00:00
Michael Steenbeek
1f55720bb5 Remove obsolete object fixes
These fixes have since been incorporated into JSON objects.
2020-11-13 10:44:28 +01:00
Łukasz Pękalski
fc4ad82ac1 resolve: integrated changes from comments 2020-11-11 16:08:39 +01:00
Łukasz Pękalski
7648feeba2 Close #12427: Refactor OBJECT_TYPE to use strong enum 2020-11-11 16:07:01 +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
Hielke Morsink
f0c1ea1d37 Split declarations and definitions to improve compile times when editing (#13332)
* Split FileStream declarations and definitions

* Split JobPool declarations and definitions

* Split StringBuilder declarations and definitions

* Split StringReader declarations and definitions

* Split ZoomLevel declarations and definitions

* Fix missing include in FileClassifier.cpp

* Remove pragma once from source files

* Fix missing include in StringBuilder.h

* Update Xcode project

* Fix compilation of tests

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-11-07 12:42:04 +00:00
Gymnasiast
880a267252 Implement @ZehMatt's suggestions 2020-11-06 14:33:16 +01:00
Gymnasiast
ce15e20c94 Use plain std::string_view instead of const & 2020-11-06 11:40:52 +01:00
Gymnasiast
6df36127b4 Replace calls to LoadObjectLegacy() with new IDs 2020-11-05 21:33:13 +01:00
Gymnasiast
bafafa6805 Create functions to load objects by JSON id 2020-11-05 21:24:43 +01:00
Gymnasiast
656cdda399 Add JSON identifier to object repository 2020-11-05 20:56:58 +01:00
Michael Steenbeek
6c687f576d Merge pull request #13230 from Gymnasiast/refactor/get-source-game-to-method
Refactor legacy GetSourceGame() to method
2020-10-18 17:48:31 +02:00
Aaron van Geffen
1c1b7c8d28 Merge pull request #13209 from X123M3-256/hybrid_fix
Fix hybrid coaster
2020-10-18 17:16:31 +02:00
Gymnasiast
b47163c06c Remove orphaned declaration of object_entry_get_type() 2020-10-17 22:46:52 +02:00
Gymnasiast
13fb0b43da Refactor legacy GetSourceGame() to method 2020-10-17 22:45:12 +02:00
Haven Kim
8a4df108ba Close #12428: Refactor OBJECT_SOURCE_GAME to use strong enum 2020-10-17 22:27:02 +02:00
X7123M3-256
6ca16e0a06 Make JSON objects able to use hybrid track 2020-10-15 20:27:33 +01:00
ζeh Matt
92e7b6244b Fix #13192: Crash because of objects not properly loading (#13197) 2020-10-14 21:54:22 -03:00
Vinicius Sa
711dd00cde Close #13000: Refactor ObjectFactory to use unique_ptr
Employs the smart pointer unique_ptr for safer memory management.

Classes involved:
 - ObjectRepository
 - ObjectManager
2020-10-14 21:56:48 +02:00
Julia Pinheiro
cba1d48226 Close #12408: Refactor CURSOR_ID to use strong enum 2020-10-11 18:01:14 +02:00
Julia Pinheiro
b628bba704 Close #12429: Refactor OBJECT_ERROR to use strong enum and typo fix in build.sh (#13145)
* Close #12429: Refactor OBJECT_ERROR to use strong enum

* Typo Fix in build.sh: Unknown
2020-10-10 16:21:07 +01:00
ζeh Matt
61b510db66 Merge pull request #13073 from ZehMatt/refactor/audio-cleanup
Minor cleanup around audio code
2020-10-07 21:18:59 +03:00
Matt
091145037e Move the audio code into OpenRCT2 namespace 2020-10-07 00:34:42 +03:00
Vinicius Sa
8e73dfd440 Fix possible memory leak in CreateObjectFromJson
As reported by PVS-Studio. Warning: V773.

Fix 1/7.

Issue: 12523
2020-10-06 18:20:37 -03:00
Aaron van Geffen
797fe48b0f Merge pull request #13068 from mwnciau/json-compilation-performance
Fix #13055: Replace includes of Json.hpp in header files with json_fwd.hpp
2020-10-06 01:09:41 +02:00
Simon Jarrett
134371f03c Change includes of nlohmann/json_fwd.hpp to new core/JsonFwd.hpp 2020-10-06 00:16:21 +02:00
Michael Steenbeek
8e60ecc022 Do not output error if the sourceGame parameter is omitted (#13079)
Since >90% of objects in the wild are custom objects, it make sense if this
parameter can be safely omitted. Only warn if this field contains garbage.
2020-10-03 14:41:52 -03:00
Simon Jarrett
9c5e9f8dbc Replace includes of Json.hpp in header files with json_fwd.hpp 2020-10-02 11:31:20 +01:00
Richard Fine
4030d9050e Fix #12974: unable to build fences on slopes (#12975)
Fix the casing of 'isAllowedOnSlope' to match the way it is cased in the JSON files, which causes the flag to be read correctly and re-enables building on slopes for the scenery pieces which have it specified.
2020-09-20 06:54:01 +01:00
Simon Jarrett
0c58dfa1b3 Refactor objects to use new JSON library 2020-09-16 20:18:53 +01:00
Simon Jarrett
97b44a7181 Refactor ObjectFactory to use new JSON library
- Removed a few try-catch blocks as this is now handled in Json::Read[...]
2020-09-16 20:18:53 +01:00
Simon Jarrett
5f17554c25 Refactor ObjectJsonHelpers
Move functions in ObjectJsonHelpers to their relevant namespaces and classes
- Move ParseColour to Colour::FromString
- Move ParseCursor to Cursor::FromString
- Move LoadStrings to StringTable::ReadJson
- Move LoadImages to ImageTable::ReadJson
- Move ParseObjectEntry to Object::ParseObjectEntry
- Move GetString, etc. to Json::GetString, etc.
- Delete ObjectJsonHelpers .cpp and .h files
2020-09-16 20:18:53 +01:00
Jacob Schwartz
fe71ce437d Close #12434: Refactor ENTERTAINER_COSTUME to use strong enum (#12865) 2020-09-08 16:29:18 -03:00
Łukasz Pękalski
bfdc1f6d2a Close #12430: Refactor OBJ_STRING_ID to use strong enum (#12796) 2020-08-28 23:36:58 -03:00
Tom Parsons
c4ae579a84 Feature #11817: Show authors field in object selection (#12591)
* Feature #11817: Show authors field in object selection

- authors field in JSON shows as last line in bottom right on object selection
- authors field added to Object class
- ObjectFileIndex version bump as authors is serialised

* fix sign comparison warning

* Start object selection corner text higher to avoid overlap

* Use references to reduce unneccessary copies

* make GetAuthors const

* Clip drawing of authors string so it doesn't cross widgets

At max length the leftmost aligns exactly with description left

* Add a changelog message

* make SetAuthors use an rvalue reference

* remove unnecessary nullptr check
2020-08-09 06:23:28 +01:00
Matt
0dc43d66e4 Remove the use of INTERFACE macro and macro its self 2020-08-05 16:30:44 +02:00
Matt
83355e35cc Move IStream, MemoryStream, FileStream into OpenRCT2 namespace 2020-08-05 16:29:36 +02:00
Matt
30376085cf Include missing headers 2020-08-05 16:29:29 +02:00
Gymnasiast
682add27dd Change ObjectEntryIndex null value to 0xFFFF 2020-07-23 12:45:42 +02:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Michael Steenbeek
33898936b0 Merge pull request #12007 from Gymnasiast/refactor/remove-ride-groups
Close #11971: Replace ride groups with new ride types
2020-07-17 12:35:30 +02:00
frutiemax
77d02c5e2b Close #12290: Refactor of object_manager_unload_objects (#12291) 2020-07-17 05:25:35 +01:00
Gymnasiast
742ae947c7 Add null checks throughout 2020-07-17 00:32:47 +02:00
Gymnasiast
cf664c8340 Close #11971: Replace ride groups with new ride types 2020-07-17 00:19:49 +02:00