Commit Graph

1738 Commits

Author SHA1 Message Date
Marijn van der Werf eef3bd9af5 Move staff and guest windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf 8569a7fe2f Move map window 2017-10-07 22:24:14 +02:00
Christian F. Coors f98a240c5a Fix Intent string retrieval 2017-10-07 21:53:00 +02:00
Christian F. Coors 84086a2465 Fix http_request_t 2017-10-07 20:15:39 +02:00
ZehMatt 6fd2eb91a2 Fix demolishing rides causing errors. 2017-10-07 20:15:01 +02:00
ZehMatt 19f9a9b755 Fix #6394: RideCreateAction not working with empty colour presets. 2017-10-07 20:13:05 +02:00
Christian F. Coors 72b3896fec Fix strings in Intent 2017-10-07 19:21:56 +02:00
Michael Steenbeek 31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
Michael Steenbeek 25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Michał Janiszewski 10def2a31b Provide default values to fix mingw build 2017-10-06 13:42:37 +02:00
Michael Steenbeek 7cb464af6e Clean up animated object limit and import 2017-10-06 11:33:55 +02:00
Michael Steenbeek 4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Christian F. Coors ecc6bf5120 Fix scrolling with mouse wheel 2017-10-06 10:17:43 +02:00
Michał Janiszewski 07dbdfbd34 Make GameActionResult destructor virtual to ensure proper teardown 2017-10-06 07:31:40 +02: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
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
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