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

9845 Commits

Author SHA1 Message Date
Michał Janiszewski b55f966a87 Compile keyboard_shortcut as C++ 2017-10-11 11:30:33 +02:00
Daniel Trujillo Viedma 39ecd37d27 Fix fault in #6401: append extensions only when saving 2017-10-11 09:43:49 +02:00
Michael Steenbeek 17557569d0 Turn 'unlock all prices' into a regular option 
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
 2017-10-11 08:33:17 +02:00
Duncan f97068d0b6 Fix #6420: Demolishing rides refunds twice as much as the ride costs to build 2017-10-11 07:58:49 +02:00
LRFLEW 0868902f11 Rework OpenGL API declarations 2017-10-10 22:26:35 +02:00
Michael Steenbeek 64da0e8f8d Fix some formatting in peep.c 
JENKINS!!
 2017-10-10 15:17:39 +02:00
Michał Janiszewski 89fb6b2144 Fix android builds 
[ci skip]
 2017-10-10 14:53:33 +02:00
Michał Janiszewski 16bd2c6439 Fix #6430: endless vomiting 
Mistake during refactor
 2017-10-10 14:02:50 +02:00
duncanspumpkin 665aac7394 Fix #6413: Draw Maze previews correctly. 
Mistake made during refactoring. Apply flag was not being passed to the game command and this meant that only the query to check if a maze element could be placed was called.
 2017-10-10 12:43:54 +02:00
Michael Steenbeek 6621faf27a Fix #6196: Guest's energy underflows and never decreases 
Issue caused by using max where min was intended.
This also reverts an earlier change in capping the energy target, since it seems to max out at 255, unlike energy itself.
 2017-10-10 10:06:56 +02:00
Daniel Trujillo Viedma 9dc04ed07a Fix #3510: Auto append file extension when not specified on save 2017-10-10 09:55:40 +02:00
Michael Steenbeek 5cc5761a25 Fix #6414: raise maximum launch speed of the Corkscrew to 96 km/h 2017-10-10 09:53:36 +02:00
Michael Steenbeek 3c8184dfa1 Handle Polish in the RCT2-to-Unicode conversion 
Also removed the misidentified A_MINUSCULE and CENT.
 2017-10-10 09:22:38 +02:00
Michael Steenbeek 71686e88b5 Render Polish with the sprite font 
Fixes the sprite lookup table for the Polish characters.
Switches the font settings for Polish from TTF to sprite.
 2017-10-10 09:22:38 +02:00
Michał Janiszewski c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Michał Janiszewski b05bdf28fc Fix compilation with older clang 
Older clang would expand the macros and spot that clamping unsigned
values to [0, MAX] is a tautological operation and produce an error.

As these are tautological operations, no network version change should
be needed.
 2017-10-09 17:34:37 +02:00
Duncan 6e1521caec Reintroduce error messages when trying to open invalid rides (#6381) 
* Reintroduce error messages when trying to open invalid rides

Mistake made during action refactor. I've added the ability to specify the error title and error args as well in the result constructor. In addition the set status will now perform a query to check if it is valid preventing error messages hitting the server.

* Bring error message setting into the function

This prevents any other function corrupting the message args. Looking at you update ride window.

* Increment network version for error message fix on set status

* Reintroduce the error title to set ride name

* Try not to introduce bugs due to inverting logic
 2017-10-09 15:50:49 +01:00
Michael Steenbeek 9effe3a599 Merge pull request #6417 from janisozaur/rides-as-cpp 
Compile rides as C++
 2017-10-09 15:56:38 +02:00
Michael Steenbeek e25d6b807d Fix refactor error in MiniGolf.cpp 2017-10-09 15:33:34 +02:00
Michael Steenbeek 2fd4d39456 Fix compilation in Visual Studio 2017-10-09 15:24:51 +02:00
Michael Steenbeek f9c2d16eb0 Rename ride paint header files 2017-10-09 15:24:24 +02:00
Michał Janiszewski 7bdcc3345f Rename files to C++ convention 2017-10-09 15:24:22 +02:00
Michał Janiszewski a9dafef0f4 Apply C++ formatting 2017-10-09 15:24:21 +02:00
Michał Janiszewski a8c8f726ee Compile ride drawing code as C++ 2017-10-09 15:24:20 +02:00
Aaron van Geffen bfc999aac9 Order language list by native name 2017-10-09 10:53:09 +02:00
duncanspumpkin 79f34c6fa3 Add remove park fences console command 2017-10-09 10:49:06 +02:00
Marijn van der Werf ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
vector-of-bool 57a8bbac23 Respect POSIX path separators on Windows (#6356) 2017-10-08 21:28:38 +02:00
Christian F. Coors e737b3108c Add status messages to server list window 2017-10-08 11:51:22 +02:00
Aaron van Geffen 34685b07a0 Fix #6407: Load/Save window theme is not applied 2017-10-07 23:56:47 +02:00
Marijn van der Werf d02976695d Move new ride and research windows 2017-10-07 22:24:14 +02:00
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
Aaron van Geffen 86031410c6 Clear IME buffer after committing composed text. 2017-10-07 20:12: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
Aaron van Geffen 0217734c4e Fix #6383: macOS deprecation errors when compiling. 2017-10-06 11:23:16 +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
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
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
ZehM4tt f29dc3ff34 Fixed base class serialise not being called. 
Implemented RideSetStatus game action.
 2017-10-05 10:42:43 +02:00
ZehM4tt 3657122b3b Moved ride create command to new game action system. 2017-10-05 10:42:43 +02:00
ZehM4tt fbd793083c Put action files in headers instead of cpps. 
Added callbacks for GameActions and network support for them.
Refactored GameAction registration due static library issues.
Moved all C functions into a single file.
 2017-10-05 10:42:43 +02:00
ZehM4tt 1b2a61c6ba Separated out byte swapping into its own header. 
Simplified data serialisation of game actions.
Moved the flags away from parameters.
GameAction base now serialises mandatory data such as flags and player.
Split some functions from network in order to move command processing to the end of tick.
 2017-10-05 10:42:43 +02:00
Michał Janiszewski 60e72e6dbc Mark GameAction methods as overriding 2017-10-05 10:42:43 +02:00
Michał Janiszewski 2aa7924b30 Add required virtual destructor to IGameAction 2017-10-05 10:42:43 +02:00
ZehM4tt f20a6863cd Simplified registration of game actions and avoid duplicate code. 2017-10-05 10:42:43 +02:00
duncanspumpkin 149a854c51 Make changes to match @ZehMatt code 2017-10-05 10:42:39 +02:00
duncanspumpkin a7d1cbee9e Add deep copy to GameCommand 2017-10-05 10:42:39 +02:00
Michał Janiszewski 634683d891 Mark GameActions::Register as static 2017-10-05 10:42:39 +02:00
duncanspumpkin fd00096b3b Fix tabs spaces 2017-10-05 10:42:39 +02:00
duncanspumpkin 205a1c9e12 Depreciate game command. Fix error messages 2017-10-05 10:42:39 +02:00
Michał Janiszewski 5103113740 Mark Factory variables as maybe_unused 2017-10-05 10:42:38 +02:00
duncanspumpkin 1d3076a2af Initial attempt at getting place entrance into game action 2017-10-05 10:42:38 +02:00
duncanspumpkin 8adcbd6e35 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin feef3d98da Refactor packet handling 2017-10-05 10:42:38 +02:00
Duncan f8241b7bb0 Fix no network builds 2017-10-05 10:42:38 +02:00
duncanspumpkin df5ea16026 Change function declarations. Move network code into network 2017-10-05 10:42:38 +02:00
Ted John 8f362cef8c Fix spaces / tabs for network.h and network.cpp 2017-10-05 10:42:38 +02:00
Ted John fae45d6989 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin 254041985f Make servers work 2017-10-05 10:42:38 +02:00
duncanspumpkin ae24ded8bf Make client work 2017-10-05 10:42:38 +02:00
duncanspumpkin 351b0df76b Initial try at adding networking 2017-10-05 10:42:38 +02:00
duncanspumpkin e7c66bb208 Start adding network code 2017-10-05 10:42:38 +02:00
Ted John c483c319fc Make dummy global static 2017-10-05 10:42:38 +02:00
Ted John bb4a482bfc Start writing new game action execution 2017-10-05 10:42:38 +02:00
Ted John 33397005b0 Add tag and flags to game action 2017-10-05 10:42:38 +02:00
Ted John c89a00badd Write initial new game action infrastructure 2017-10-05 10:42:38 +02:00
Olivier Wervers a75d727685 Implement #5826: Add command to show map data counts and limits 2017-10-05 10:00:32 +02:00
ZehMatt 5aa8ae5c6e Fix viewport coordinates being set too late. 
Fix headless always sending 0,0 viewport coordinates.
 2017-10-05 09:57:08 +02:00
Jeroen D Stout e2523a3d8d Make sprite export start at 0 to correspond with in-game sprite id 2017-10-04 19:49:25 +02:00
Michael Steenbeek 05b274a239 Fix #5609: Vehicle switching may cause '0 cars per train' to be set 2017-10-04 19:42:44 +02:00
Michael Steenbeek 055ecccf36 Clean up more track flags 2017-10-04 17:14:53 +02:00
Olivier Wervers d47f758b0e Fix #6118, #6245, #6366: Tracked animated vehicles not animating 2017-10-04 14:51:48 +02:00
Tyler Ruckinger d33803b5d0 Ensure title sequence user data path exists 2017-10-03 09:32:11 +02:00
Gymnasiast e6faf6b7c4 Fix #6201, #6250: custom RCT1 scenarios cause empty scenario list entry 
The scenario repository did not correctly handle custom RCT1 scenarios.
They were not listed, but if they existed, an empty entry would appear in the scenario list.
This fixes both issues, and also prints a warning message, should this ever happen again.
 2017-10-03 07:48:02 +02:00
ZehMatt 5f076e8103 Compile paint code as cpp. 
Style fixes.
 2017-10-02 21:42:11 +02:00
Michael Steenbeek 0fb5f186ee Do not hardcode music length 2017-10-02 21:40:49 +02:00
Olivier Wervers 45944cb037 Fix #6202: Avoid breaking occupied benches 2017-10-02 17:18:51 +02:00
Michael Steenbeek ccefc98491 RCT1 theme: make Options and Shortcut windows brown 2017-10-02 11:45:28 +02:00
LRFLEW 11cdcea72b Fix RCTC g1.dat rendering issues 2017-09-30 19:18:31 -05:00
Olivier Wervers 1de4b2650b Fix #6229: Scenery costs nothing in track designs 2017-09-30 00:11:14 +02:00
Michael Steenbeek 0c4d184a9a Use constants for map elements and the scenery window 2017-09-29 20:25:17 +02:00
Olivier Wervers f2c9fc58d5 Implement #1329: Add remove-unused-objects command (#6324) 2017-09-29 16:32:30 +02:00
LRFLEW e177811115 Add RCTC g1.dat support 2017-09-29 10:44:23 +02:00
Michael Steenbeek b2968ce8b0 Fix #6320: Crash when CSS1.DAT is absent 2017-09-29 10:43:47 +02:00
Michael Steenbeek eea40edf0a Use more constants 2017-09-29 10:06:05 +02:00
Michał Janiszewski 5ab9f938a7 Update files missed in the great extern "C" cleanup of 2017 2017-09-28 23:29:16 +02:00
Gymnasiast 6c9e73bff2 Allow loading objects from RCTC 
These are technically same as those from RCT2, but with a .POB extension, rather than .DAT
 2017-09-28 21:42:58 +02:00
Jeroen D Stout 71317c5f7a Adapt to coding convention 2017-09-28 17:37:48 +02:00
Jeroen D Stout 35b9038807 Refactor adjacency distance constant + loop fix 2017-09-28 17:37:48 +02:00
Jeroen D Stout 3b7ec7daa1 Alllow check_for_adjacent_station to check farther 2017-09-28 17:37:48 +02:00
Jeroen D Stout a6993bdb9f Introduce constant for max adjacency distance 2017-09-28 17:37:48 +02:00
Jeroen D Stout 202bea59c8 Increased network stream version 2017-09-28 17:37:48 +02:00
Jeroen D Stout b032aaacac Deal with map size / multiple stations 2017-09-28 17:37:48 +02:00
Jeroen D Stout 015d95749c Increase ride synchronisation range 2017-09-28 17:37:48 +02:00