mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity
17,001 Commits 8 Branches 59 Tags
a863c7ae507f6291e409f1f87b671fe2bce884ee
Commit Graph

171 Commits

Author SHA1 Message Date
Ted John
a863c7ae50 Remove rest of FOR_ALL_RIDES instances 2019-08-04 16:44:17 +01:00
Ted John
414b53b56d Remove ride classifications 2019-08-04 16:43:50 +01:00
Ted John
6fff2079f9 Refactor ride name to dynamic args and std::string 2019-07-29 19:18:16 +01:00
Duncan
ab5f5b20cd Use enum class for RCT2_SOUND (#9618) 
* Use enum class for RCT2_SOUND

* Fix formatting. Fix mistaken declaration.

* Change name of enum to SoundId

* Fix clang format
 2019-07-22 19:02:45 +01:00
Matt
df30d5d9bc Fix MarketingCampaignFlags::FIRST_WEEK not being imported/exported with sv6 2019-06-19 03:20:19 +02:00
Filip Gawin
6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
Michael Steenbeek
c8df801e66 Create ShopItemDescriptor 2019-04-26 20:25:11 +02:00
duncanspumpkin
356a0e5e91 Rework flags 2019-04-04 19:23:44 +01:00
Michael Steenbeek
1c570c8eec Move some ride functions to struct methods 2019-03-20 20:05:25 +01:00
Aaron van Geffen
2af13904c5 Update copyright notices for 2019. (#8903) 2019-03-17 07:16:15 +00:00
Ted John
cdec457abd Refactor peep struct 2019-02-28 20:28:58 +01:00
Duncan
6a0cff2676 Fix being unable to refund when in negative money 2019-02-24 17:31:43 +01:00
Duncan
9a746c4fc1 Merge pull request #8733 from duncanspumpkin/fix_pause 
Fix pause
 2019-02-20 19:41:56 +00:00
duncanspumpkin
3467941310 Fix #8732 GameActions not working when in negative money. 
Related to the simplification to the finance code
 2019-02-20 19:14:10 +00:00
Ted John
440511afc5 Use uint16_t for marketing probability 2019-02-20 16:51:19 +00:00
Ted John
4013479094 Refactor marketing to be a single vector 2019-02-20 16:49:02 +00:00
Matt
a6c6d6ddc3 Update checks for when money is required. 2019-02-18 17:19:44 +01:00
Matt
914bf3a0c6 Add finance_check_money_required and finance_check_affordability helper functions. 2019-02-18 17:19:44 +01:00
Michał Janiszewski
8a395e3706 Fix misaligned access (#8665) 
Platforms like ARM are very sensitive to unaligned access. This change
makes sure the addresses obey the C++ standard and are properly aligned.
 2019-02-04 23:15:14 +01:00
Tom Lankhorst
0233795add Fix #8642: Likely mistake in entrance fee check 2019-01-28 11:15:49 +01:00
Ted John
8701286772 Use new ride_id_t typedef (#8561) 2019-01-12 10:11:55 +00:00
Michael Steenbeek
31298bd772 Merge pull request #8543 from IntelOrca/refactor-ride 
Refactor ride structure
 2019-01-02 22:38:20 +01:00
Matt
fafd2081e3 Result NewsItem when adding to queue. 2019-01-02 05:03:42 +01:00
Ted John
38f632074b Merge ride track colour arrays into one 2019-01-01 21:25:34 +00:00
Ted John
08b02943d3 Use std::string for scenario name, details etc. 2018-12-16 19:01:14 +00:00
Hielke Morsink
354d973a48 Use std::size instead of Util::CountOf 2018-11-23 21:59:08 +01: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
472320d8f3 Correct formatting up to the management folder 
I went over the commits ab7f22f..8726712 (bulk format commits for game actions to management inclusive) and corrected all mistakes I found. Most of them have to do with arrays missing trailing commas, making clang-format indent the entire array or not add breaks between the values.
 2018-07-23 16:00:15 +02:00
clang-format
f514c223cb clang-format management 2018-07-23 16:00:05 +02:00
Matthew Beaudin
183411aa54 Fix #7773: Once research has been completed, player is still charged for research 2018-07-17 21:54:42 +02:00
Michael Steenbeek
1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +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
aad1e69d7e Add parentheses to macro arguments (#7686) 
This adds parentheses around macro arguments that are either negative or used for calculations inside the macro itself. Doing this avoids getting errors in code that may look right.
 2018-06-15 10:54:05 +02:00
Andy Ford
ea371144e7 Fix #7643: No Money scenarios can have funding set to zero 
If research funding is set to no funding and scenario money is turned
off, then update research at the normal rate.
 2018-06-14 13:17:09 +02:00
Michał Janiszewski
1d28826b79 Fix -Wdocumentation and add it to default warnings 2018-06-11 09:52:54 +02:00
Hielke Morsink
6c65c3d64d Merge pull request #6774 from janisozaur/fixes 
Various code improvements
 2018-05-15 14:38:43 +02:00
Michael Steenbeek
fcf507e051 Spin off shop item stuff to separate files 2018-05-14 19:21:43 +02:00
Michał Janiszewski
0a92e74ced Minor fixes 2018-05-11 15:38:30 +02:00
Tomas Dittmann
cb162edcfe Fix #7331: Invention list crashes upon removing previously-enabled ride/stall entries 2018-05-11 13:28:56 +02:00
Michael Steenbeek
907d318e1c Make Ride Groups more C++-like 2018-05-07 20:18:06 +02:00
Olivier Wervers
7713cdac4d Replace month count magic numbers 2018-04-29 20:46:46 +02: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
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
Michael Steenbeek
695d3762e5 Remove last usages of SEPARATE_RIDE flag 2018-03-26 20:36:16 +02:00
Michael Steenbeek
919533d7c2 Show ride and vehicle names in research list 2018-03-21 22:04:10 +01:00
Ted John
708843b526 Implement game action for park marketing 2018-03-20 09:31:39 +01:00
Ted John
5a803d2551 Implement game action for park set research funding 2018-03-20 09:31:39 +01:00
Ted John
16a7e21ffa Implement game action for park set loan 2018-03-20 09:31:39 +01:00