mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity
24,540 Commits 8 Branches 59 Tags
049164c400a8e990b8a56be6d0c0ac312a8846d5
Commit Graph

68 Commits

Author SHA1 Message Date
Michael Steenbeek
049164c400 Pass dpi as ref when drawing object preview 2023-03-13 16:52:49 +01:00
Michael Steenbeek
dd624f9bff Replace remaining usages of money16, money32 (#19469) 
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-03-02 21:55:42 +00:00
Michael Steenbeek
be52b55980 Remove some unused stuff (#19474) 
* Remove unused symbols

* Remove unused SceneryObject.cpp

* Remove GetScgWallsHeader() and GetScgPiratHeader()
 2023-02-23 22:27:21 +00:00
Duncan
d811c9a9ba Add Object Entry Manager (#19332) 
* Add object entry manager

Port over wall and banner

* Port over small scenery to ObjectEntryManager

Clang format files

Actually make things safe

Fix build
 2023-02-12 20:43:11 +00:00
Duncan
9deed6d98a Replace snakes in Class names OpenRCT2/N*-P* (#19227) 
* Replace snakes in Class names OpenRCT2/N*-P*

* Rename PODDate (and TimeOfDay for good measure)

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2023-01-20 05:24:44 +00:00
Duncan
859b071ddc Rename classes with snakes OpenRCT2/A*-F* (#19215) 
* Rename classes with snakes OpenRCT2/A*-F*

* Clang format files
 2023-01-19 08:16:44 +00:00
Michael Steenbeek
b4480b344e Rename snake_case functions from localisation folder 2023-01-16 23:12:35 +00:00
Duncan
8504c8d05e Finish Removing snake_case from Drawing Methods 2023-01-16 22:31:34 +00:00
Duncan
7f5934cc95 Remove snake_case from second chunk of Drawing (#19166) 2023-01-16 18:52:17 +00:00
James103
73738bbdc8 Replace 2022 with 2023 in copyright headers 
Replace all instances of the year 2022 with 2023 in all copyright headers
 2023-01-01 11:58:01 +01:00
Gymnasiast
713a05f203 Remove obsolete object hacks 2022-11-23 18:18:20 +01:00
73
8c3ff1bfa8 Replace Transparancy with Transparency 2022-10-04 18:28:15 +02:00
73
b9e677945d Replace 20XX with 2022 (#18158) 
* Replace 2020 with 2022

Replace all 2020 headers with 2022

* replace other years with 2022

add missing years
 2022-10-01 08:42:14 +01:00
Michael Steenbeek
2765ed45d2 Remove now-unnecessary object patches (#17674) 
These 5 objects are now part of the game and all fixes have been integrated.
 2022-08-02 21:53:17 +02:00
Tulio Leao
0e607ed0a3 Fix #13857: Removal price underflowing (#16858) 2022-03-23 21:14:03 +00:00
Duncan
ba8690d970 Move *10 on removal/price to the object load function (#16846) 
This simplifies the code and ensures that money32/16 is at the same base for all users of these objects
 2022-03-22 21:35:44 +00:00
Ted John
793acf67ae Implement small scenery ternary colours 2022-03-20 18:53:11 +00:00
Ted John
a324bfab63 Add image manager plugin API (#16144) 2021-12-07 20:55:27 +00:00
Gymnasiast
a7f8a79313 Fix crash when drawing small scenery glass preview 2021-12-04 11:55:34 +01:00
Gymnasiast
cbdb2c03cd Use new ImageId in most object previews 2021-12-04 11:55:33 +01:00
Michael Steenbeek
25cfa06830 Fix #16063: Broken Object Selection preview for glass 2021-11-29 22:27:54 +01:00
IntelOrca
34128dc262 Add new .park save format 
Co-authored-by: Gymnasiast <Gymnasiast@users.noreply.github.com>
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
Co-authored-by: ZehMatt <Zehmatt@users.noreply.github.com>
Co-authored-by: Broxzier <Broxzier@users.noreply.github.com>
 2021-11-21 22:43:22 +01:00
Hielke Morsink
1d62a902e7 Make scenery_small_entry_has_flag a member function (#15509) 2021-10-01 16:50:05 -03:00
Duncan
69f0020a62 Fix #8601: Revert fix to TT’s base blocks, for support blocker usage 2021-07-31 14:10:00 +02:00
Basssiiie
15423acf4a Move ToonTowner mine roofs to mine theme instead of pirate theme 2021-07-31 11:00:41 +02:00
Duncan
12c5484f44 Refactor SmallSceneryEntry (#14815) 2021-06-03 22:14:41 -03:00
Michael Steenbeek
f0dc28e9fc Update objects to v1.0.21 2021-03-12 11:04:04 +01:00
skdltmxn
b0a8ebc808 Refactor to use push_back more efficient (#13726) 2021-01-08 20:59:55 +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
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
Simon Jarrett
9c5e9f8dbc Replace includes of Json.hpp in header files with json_fwd.hpp 2020-10-02 11:31:20 +01:00
Simon Jarrett
0c58dfa1b3 Refactor objects to use new JSON library 2020-09-16 20:18:53 +01:00
Łukasz Pękalski
bfdc1f6d2a Close #12430: Refactor OBJ_STRING_ID to use strong enum (#12796) 2020-08-28 23:36:58 -03:00
Matt
83355e35cc Move IStream, MemoryStream, FileStream into OpenRCT2 namespace 2020-08-05 16:29:36 +02:00
TomasZilinek
9d965ccfb6 Part of #12017 - create gfx_draw_sprite overload (#12026) 
* Part of #12017 - create gfx_draw_sprite overload

Part 1. Creates the overload and replaces about a half of the calls since there are too many for one PR.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-23 18:32:34 -03:00
Ted John
46d69126ea Split identifier and legacyIdentifier on Object 2020-05-08 15:28:48 +01:00
Michael Steenbeek
d86dce17e8 Prepare object indices for uint16_t (part 2) (#10966) 2020-03-18 21:27:53 +01:00
Michael Steenbeek
68aa5122fa Fix #6006: Objects higher than 6 metres are considered trees 2019-03-18 22:56:14 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Linus Unnebäck
fd07be587a Remove Math::Clamp in favour of std::clamp 2018-08-12 16:47:12 +01: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
fdc6e52da1 Correct formatting in files from network to paint 2018-07-23 16:00:15 +02:00
clang-format
a6a12af1ec clang-format object 2018-07-23 16:00:06 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek
ec3a1e575e Replace Math::Min and Max with std variants 2018-06-20 17:11:35 +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
Ted John
83ce94fd9e Search for object file, case insensitive 2018-03-26 21:38:09 +02:00
Ted John
85f9f3ad09 Read a shape property instead of individual flags 2018-03-26 21:37:23 +02:00
Ted John
a03b58501b Add JSON loading for small scenery 2018-03-26 21:37:23 +02:00