1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Commit Graph

12771 Commits

Author SHA1 Message Date
Michał Janiszewski
07dbdfbd34 Make GameActionResult destructor virtual to ensure proper teardown 2017-10-06 07:31:40 +02:00
OpenRCT2 git bot
e5fe681793 Merge Localisation/master into OpenRCT2/develop. 2017-10-06 04:00:24 +00:00
ζeh Matt
0423397c34 Fix #6376: RideCreateAction::Query ignores valid secondary colour input 2017-10-05 20:46:50 +02:00
Michael Steenbeek
f2195b4300 Use constants and proper formatting in colour.[ch] 2017-10-05 15:55:57 +02:00
Aaron van Geffen
af3fa4b0ff Options window: fix background colour for some dropdowns 2017-10-05 14:11:37 +02:00
Michał Janiszewski
1089bd2d56 Increase network version 2017-10-05 10:42:44 +02:00
Oli414
d39c80da42 Fix code style. Fix error text 2017-10-05 10:42:44 +02:00
Oli414
59eae9defa Add missing include 2017-10-05 10:42:44 +02:00
Olivier Wervers
4bdfb31fcb Remove changes from libopenrct2.vcxproj 2017-10-05 10:42:44 +02:00
Oli414
857faec100 Tabs to spaces 2017-10-05 10:42:44 +02:00
Oli414
0760ea6aa8 Renamed duplicate region 2017-10-05 10:42:44 +02:00
Oli414
8fa82493cb Move set_staff_name game command functionality to game action 2017-10-05 10:42:44 +02:00
Oli414
14f59c3d9b Move set_guest_name game command functionality to game action 2017-10-05 10:42:44 +02:00
ZehMatt
3f93af11d6 Fix game actions executing wrong callbacks. 2017-10-05 10:42:44 +02:00
Michał Janiszewski
9ff0e22aee Whitespace fixes 2017-10-05 10:42:44 +02:00
ZehMatt
d8d7d97f74 Fix references on deprecated GAME_COMMAND_DEMOLISH_RIDE 2017-10-05 10:42:44 +02:00
Michał Janiszewski
aba3c270bb Game actions fixes 2017-10-05 10:42:44 +02:00
Michał Janiszewski
540f306809 Provide default values for various scalar fields 2017-10-05 10:42:44 +02:00
Michał Janiszewski
4841e2c6f3 Improve verifying validty of new game action 2017-10-05 10:42:44 +02:00
ZehMatt
1dd5d3a3f5 Verify there is an empty slot for a new ride 2017-10-05 10:42:44 +02:00
Michał Janiszewski
fe636b5ef4 Rebase fixes 2017-10-05 10:42:44 +02:00
Michał Janiszewski
23bfb9b306 Remove superfluous move 2017-10-05 10:42:44 +02:00
Michał Janiszewski
b70dd97234 Fix rebase errors 2017-10-05 10:42:44 +02:00
Michał Janiszewski
05e7ef7791 Add missed forward declarations 2017-10-05 10:42:44 +02:00
ZehMatt
bf0bc77dfc Refactor SetParkEntranceFeeAction to use constructor for parameters.
Add RideSetNameAction.
Support of string serialisation.
Check requested status for ride in Query.
Add RideDemolishAction.
2017-10-05 10:42:44 +02:00
ZehMatt
995c0d0a6b Refactor SetParkEntranceFeeAction to use constructor for parameters.
Add RideSetNameAction.
Support of string serialisation.
2017-10-05 10:42:44 +02:00
ZehMatt
ce54b41aba Fix single player pre-designed rides not working.
Move ride_create_command into GameActionCompat
Refactor GameActions to return the GA_FLAGS instead of using the const value.
Refactor passing params to GameActions over constructor.
2017-10-05 10:42:44 +02:00
ZehMatt
89c020d3fe RideCreateAction takes the colours now as input.
Add ride_get_entry_index, same code is used at multiple spots.
Rename variable 'rei' to 'rideEntryIndex'
2017-10-05 10:42:44 +02:00
ZehMatt
e78e972de5 Moved some of RideCreateAction checks into the Query member. 2017-10-05 10:42:44 +02:00
Michał Janiszewski
cb7c0d1df4 Use std::move for RideCreateAction::Execute
Fixes compilation with ICC and Xcode 8
2017-10-05 10:42:44 +02:00
Marijn van der Werf
eba0054c0b Update Xcode project 2017-10-05 10:42:44 +02:00
Michał Janiszewski
bdf8c001e4 Remove unused function 2017-10-05 10:42:44 +02:00
Michał Janiszewski
6ddac382be Fix copyright dates 2017-10-05 10:42:44 +02:00
Michał Janiszewski
5e523c723f Lift -Wsuggest-final-X for game actions 2017-10-05 10:42:44 +02:00
Ted John
d97123073c Backport fixes to ride_create 2017-10-05 10:42:44 +02:00
Ted John
4e765a81b1 Tabs to spaces
[ci skip]
2017-10-05 10:42:44 +02:00
Ted John
ed133df13f Fix build errors 2017-10-05 10:42:43 +02:00
Ted John
4ac8f1dc35 Make the game action callback type safe 2017-10-05 10:42:43 +02:00
Ted John
aa30859ab7 Merge IGameAction into GameAction 2017-10-05 10:42:43 +02:00
Ted John
2b57d36174 Tabs to spaces 2017-10-05 10:42:43 +02:00
Ted John
02b77af646 More styling fixes 2017-10-05 10:42:43 +02:00
Ted John
ac1e889014 Tabs to spaces 2017-10-05 10:42:43 +02:00
Ted John
675b1b8cf4 Do style fixes 2017-10-05 10:42:43 +02:00
Ted John
b068331db2 Move contents of IGameAction.h into GameAction.h 2017-10-05 10:42:43 +02:00
Ted John
84f55c75aa Revert change to libopenrct2.vcxproj 2017-10-05 10:42:43 +02:00
ZehMatt
072ecadd48 Fix leaking memory creating game actions.
Specialized class use for game action results.
2017-10-05 10:42:43 +02:00
ZehMatt
97504b45ae Add network stubs for no network builds. 2017-10-05 10:42:43 +02:00
ZehMatt
5283804b37 Remove unnecessary type conversation.
Add override attributes.
Changed GameActionResult data storage to union, happy compilers.
2017-10-05 10:42:43 +02:00
ZehMatt
c73665a003 Add deprecation warnings in old game_command functions.
Removed line that didn't belong there.
2017-10-05 10:42:43 +02:00
ZehMatt
22750a95e4 Fix using rct_xy8 incorrect. 2017-10-05 10:42:43 +02:00