mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,672 Commits 7 Branches 39 Tags 349 MiB
Commit Graph

18672 Commits

Author SHA1 Message Date
Gymnasiast 2e3a4d41ce
Clean up some ride construction variables 2020-04-26 11:07:19 +02:00
Gymnasiast 8d0854804e
Replace missed check for coasters with vertical towers 2020-04-26 11:05:11 +02:00
Duncan 8936ce60f6
Merge pull request #11464 from brenoguim/set_format_arg_3 
Replay set_format_arg calls in favor of using Formatter
 2020-04-26 07:27:00 +01:00
OpenRCT2 git bot 6d0e29543b Merge Localisation/master into OpenRCT2/develop. 2020-04-26 04:01:48 +00:00
Breno Guimaraes 2019fa4655 Replay set_format_arg calls in favor of using Formatter 2020-04-25 19:35:49 -03:00
Breno Rodrigues Guimarães a0619d04cf
Replace usage of set_format_arg by Formatter::Common() (#11412) 2020-04-25 18:44:14 -03:00
Tulio Leao d0aa3c3921
Merge pull request #11290 from brenoguim/fix_peep_forced_to_pay 
Avoid fast-forwarding peep to ride as it may not have funds to pay
 2020-04-25 18:42:32 -03:00
duncanspumpkin 5e1b58df0c Use updated replay 2020-04-25 18:27:39 -03:00
Breno Rodrigues Guimarães ab53ddf59f Avoid fast-forwarding peep into the ride 
The code being removed in the patch tries to fast forward a peep into the ride when it is the second peep for a vehicle that is used in pairs. Problem is that funds checking does not happen, so it happens that a peep may pay against its will.
Lets say a rich peep enters in line and a poor peep enters in line right after.
If the price of the ride is such that the rich peep can pay and the poor peep can't, it will be dragged into the ride because funds checking only happened for the first.
The second part of the patch just adjusts we consider the vehicle a full car if the second position is filled.

Add test to verify that a peep is not dragged into a ride it can't pay

This test puts two peeps in a Ferris Wheel. The first peep is rich and the second peep is poor. When they are both in line, the ride price is raised so that the poor peep can't pay.
Make sure the poor peep turns back and leaves the ride.

During development, a mistake in the logic would have broken all rides other than ferris wheels in a way that multiple guests could enter the same car.
Also add a test to make sure that is never broken.
 2020-04-25 18:27:33 -03:00
Breno Guimaraes 38ffc4f577 Use a pointer instead of reference as a member. 
This allows the assignment operator for the iterator to be generated
automatically by the compiler.
 2020-04-25 17:51:26 -03:00
Michael Steenbeek c5d877f644
Rephrase STR_6037 2020-04-25 15:39:08 +02:00
Michael Steenbeek 0ecc64f781
Fix #11407: Setting an RCT1 path needs better error messages (#11418) 2020-04-25 15:36:44 +02:00
Michael Steenbeek b417da7905
Fix drawing of walls with incorrect scrolling modes (#11453) 2020-04-25 10:19:13 +01:00
OpenRCT2 git bot 6ebd918cde Merge Localisation/master into OpenRCT2/develop. 2020-04-25 04:01:46 +00:00
Kevin Strehl 5456899afc
Close #10572: Add cheat to allow building at invalid heights 2020-04-25 01:07:36 +02:00
Michael Steenbeek b89130e0f3
Use ObjectEntryIndex in more places (#11440) 2020-04-25 00:10:47 +02:00
Michael Stowe f281aa1a80
Fix #8571: Redundant comparison in Station.cpp 2020-04-25 00:08:04 +02:00
Michael Steenbeek 2a95a9c2af
Merge pull request #11441 from Gymnasiast/refactor/nodiscard 
Mark getters in audio layer as [[nodiscard]]
 2020-04-24 23:18:27 +02:00
Tom Lankhorst da0c586fad
Mark getters in audio layer as [[nodiscard]] 2020-04-24 18:38:11 +02:00
WantDiscussion 37e9270c00
Close #6024: Closing object selection now advances to next step 
In the scenario editor and track designer X button in object selector
will now close the object selector window and advance to the next stage
instead of closing the scenario editor and track editor entirely and
returning to the main menu.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-04-24 17:19:06 +02:00
Michał Janiszewski 295a98028e
Disable warnings around incompatible function pointer cast (#9543) 
This addresses a compilation issue with newer (8+) mingw.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-04-24 16:03:03 +02:00
Umdlye 76c10d1806
en-GB: Fix capitals after hyphens 
Co-authored-by: pizza2004 <pizza2004@users.noreply.github.com>
 2020-04-24 15:32:38 +02:00
Michael Steenbeek baf6f1587a
Add #11390 to changelog 2020-04-24 13:27:25 +02:00
FlukiestEmperor 23d295924d
Fix Android filesystem compilation error when using NDK revision 19+ 
When attemping to build with ndk 19+ I get the following error: error: undefined reference to 'std::__ndk1::__fs::filesystem::path::__extension() const'

Looking at this issue here https://github.com/android/ndk/issues/609 and https://android.googlesource.com/platform/ndk/+/master/docs/Roadmap.md#package-management it's stated that the ndk does not support std::filesystem.
 2020-04-24 13:08:44 +02:00
Michał Janiszewski b9671b0353
Merge pull request #11433 from FlukiestEmperor/android-cleanup 
Android cleanup
 2020-04-24 09:27:52 +02:00
OpenRCT2 git bot 2fd8e7a9ff Merge Localisation/master into OpenRCT2/develop. 2020-04-24 04:02:05 +00:00
FlukiestEmperor 944e61d446 Add missing nullable annotations 2020-04-23 22:23:51 -05:00
FlukiestEmperor 512d77e011 Remove unreachable code 
Since the compile sdk is 19, the if check is always true since it's checking 19 >= 17. This also removes the need for the success boolean which would always be true.
 2020-04-23 22:21:28 -05:00
Michael Steenbeek 44f62a97c2
Move PhotoItem to RTD (#11415) 2020-04-24 04:47:40 +02:00
Michael Steenbeek 144d312ead
Fix RCT1 import importing too many vehicle types (#11419) 2020-04-24 04:00:41 +02:00
Michael Steenbeek f5e2efac77
Close #11390: Write OpenRCT2 build hash to screenshot metadata (#11423) 2020-04-24 04:00:17 +02:00
Michael Steenbeek 619b06254e
en-GB: Change "plug-in objects" to "custom objects" (#11421) 
This change is to avoid confusion with the upcoming plug-in system. Additionally, "custom objects" is what most people would call these anyway.
 2020-04-23 23:38:25 +02:00
ifimfree aaaae16d15
Close #11209: Show a warning when the user is running OpenRCT2 in Wine (#11395) 2020-04-23 19:12:54 +02:00
Michael Steenbeek 092b9c0086
Update changelog for #11405 
[skip-ci]
 2020-04-23 14:51:02 +02:00
Michael Steenbeek 62482312fb
Bump network version 2020-04-23 14:44:23 +02:00
Michael Steenbeek d0f2ade778
Fix #11405: Building path through walls does not always remove them (#11416) 2020-04-23 14:35:54 +02:00
Tulio Leao dd64295ba7
Rename and improve documentation on MAX_STR_COUNT (#11409) 2020-04-23 12:29:02 +02:00
Breno Rodrigues Guimarães c0d0c7de16
Part of #11389: Replace set_format_arg by Formatter::Common() (#11388) 2020-04-22 21:41:20 -03:00
Breno Rodrigues Guimarães ef8fd20c99
Let Ride::FormatStatusTo return the number of written bytes (#11411) 2020-04-22 21:24:51 -03:00
Mustapha Elghoul b138cb46ba
Name Flags in PeepThoughtToActionMap 2020-04-22 18:50:53 +02:00
Michał Janiszewski 2323cc1596
Use named casts instead of old-style casts 
Change prepared with clang-tidy and google-readability-casting check
 2020-04-22 17:09:29 +02:00
Duncan cfd94d4fa5
Merge pull request #11382 from mustaphaelghoul/eecs481 
Create 5 Vehicle::CableLiftUpdate... member functions from cable_lift_update_... (#9473)
 2020-04-21 22:10:16 +01:00
Mustapha Elghoul 38630eeb59 Update dist_x and dist_y to camelCase. (1 >> 1) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_1, and (1 >> 0) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION 2020-04-21 16:51:00 -04:00
Breno Rodrigues Guimarães 568e60b13c
Remove duplicated code due to merge issue (#11392) 2020-04-21 17:10:05 +02:00
Michał Janiszewski e716250dec
Merge pull request #11366 from janisozaur/super-duper-warnings 
Super duper warnings
 2020-04-21 13:45:38 +02:00
Michał Janiszewski 777541afeb Disable null-dereference warning for MinGW 
Error messages produced by MinGW look like:
```
In file included from ../src/openrct2/world/Banner.cpp:10:0:
../src/openrct2/world/Banner.h:29:8: error: potential null pointer dereference [-Werror=null-dereference]
 struct Banner
        ^~~~~~
```
 2020-04-21 13:31:01 +02:00
Michał Janiszewski c4b6897635 Address possible nullptr dereferences 2020-04-21 13:31:01 +02:00
Michał Janiszewski 5f97637d5e Only suggest final when using non-LTO builds 
In LTO builds GCC issues the suggestion-warning from linking stage,
when pragmas are already gone and do nothing.
 2020-04-21 13:31:01 +02:00
Michał Janiszewski 4f85810c14 Fix setting extended warning options 2020-04-21 13:31:01 +02:00
Michał Janiszewski eeef01f34b Remove redundant function declaration 2020-04-21 13:31:01 +02:00