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

1951 Commits

Author SHA1 Message Date
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 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
Michael Steenbeek 950ab0062f Unify "separate ride" and "separate ride name" flags 
They're always set together, and only setting one will probably cause undefined behaviour. Deprecate the "separate ride name" flag and instead check the "separate ride" flag in all places.
 2017-09-28 17:37:07 +02:00
Michael Steenbeek 289e154fe4 Fix #6315: Not all researched items in S4 are available 2017-09-28 16:24:44 +02:00
ZehMatt 5187946bc9 Fix #6309: Lightfx being enabled with incompatible drawing engine. 2017-09-28 08:01:25 +02:00
TELK 40b026a4f1 Switch to utf8_remove_formatting() in Twitch integration to support non-latin characters 2017-09-26 15:54:24 +02:00
Martin Müller e38a77da2a Set gScenarioFileName when loading an RCT1 park 
This fixes bugs when completing an RCT1 scenario, where the highscore
would be saved for the wrong park because gScenarioFileName hasn't been updated on load.
 2017-09-26 15:53:06 +02:00
ZehMatt c238265834 Minor performance improvements 2017-09-26 15:52:04 +02:00
Marijn van der Werf 09517caa88 Fix #6300: Saving track triggers assertion 2017-09-25 22:14:50 +02:00
Marijn van der Werf 8a47308786 Check whether intent data is set before accessing 2017-09-24 22:41:49 +02:00
Marijn van der Werf efa87bf931 Try different opaque pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9d80f7efed Apply recommended fixes 2017-09-24 22:41:49 +02:00
Marijn van der Werf 7795ec35dd Add assertions to Intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf 34ee3df318 Refactor intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf 6df955dd27 Add missing window initializers 2017-09-24 22:41:49 +02:00
Marijn van der Werf 162eea0924 [fixup] Cast pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf 7ede9a3f58 Add extra casts 2017-09-24 22:41:49 +02:00
Marijn van der Werf b7164c5eac Rename intent extra keys 2017-09-24 22:41:49 +02:00
Marijn van der Werf 619733ba05 Move track design windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf d18e59ff17 Move loadsave dialog 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9b1b2b5c62 WIP window moving 2017-09-24 22:41:49 +02:00
Marijn van der Werf 59e1a8ac25 Trying to use intents 2017-09-24 22:41:49 +02:00
Marijn van der Werf 700a82e200 Make more data and functions static 2017-09-24 22:41:49 +02:00
Marijn van der Werf ac910a5979 Move Error, Campaign and Ride Demolition windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf a49a777047 Move Banner, Player and Sign windows 2017-09-24 22:41:49 +02:00
Marijn van der Werf 8503b8e204 Move Finances and Park windows 2017-09-24 22:41:49 +02:00
Michał Janiszewski cbeeea2a49
Remove workaround for mingw 
We have udapted MinGW-64 in use, so the workaround should not be needed
anymore
 2017-09-22 23:26:02 +02:00
Michael Steenbeek 1fd1d8c26b Move editor to C++; add defines for object limits 2017-09-22 07:56:24 +02:00
Michael Steenbeek 5c2870c0e0 Name RCT2_LANGUAGE_ID_8 (Japanese) 2017-09-21 10:34:31 +02:00
Michael Steenbeek c8d6cf12e3 Add experimental Arabic language support 2017-09-21 09:24:06 +02:00
Michael Steenbeek fa5ec031f1 Clean up ride naming 2017-09-20 21:19:55 +02:00
Michał Janiszewski 00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michael Steenbeek 6ab0f2f905 Name some rct_ride_entry_vehicle properties 2017-09-15 18:25:28 +02:00
Michael Steenbeek c4a89e4192 Merge pull request #6269 from Gymnasiast/small-cleanup 
Slightly refactor loading of vehicle entries
 2017-09-14 15:17:04 +02:00
Michael Steenbeek a4802983c2 Make var_02/_03 calculation methods private and static 2017-09-14 14:30:09 +02:00
Michael Steenbeek 4164d3aedd Clarify comment 
[ci skip]
 2017-09-14 14:12:13 +02:00
Michael Steenbeek 8954303d99 Add comment about special_frames 
[ci skip]
 2017-09-14 14:10:35 +02:00
Michael Steenbeek 9cba5436e5 Split off frame calculations; don't set var_02 and _03 2017-09-14 14:07:55 +02:00
Michael Steenbeek 98e15f1cd9 Rewrite confusing if statement 2017-09-14 13:48:14 +02:00
Michael Steenbeek 735b96ac18 Bump network version for the 'Enable all drawable elements' cheat 2017-09-13 22:51:01 +02:00
Michael Steenbeek d4cc97165c Clean up brake speed in ride construction window, fix #6271 2017-09-13 21:57:36 +02:00
Ted John 8677793624 Fix #6267: Ride count is 255 for clients that join a server 
For S6 export and import, unused ride slots were not set to RIDE_TYPE_NULL.
 2017-09-13 20:04:55 +01:00
Michael Steenbeek 597d40b25b Add cheat to show all drawable track elements 2017-09-13 19:38:30 +02:00
Michael Steenbeek 671a7bcbe1 Improve and extend constant usage 2017-09-13 18:13:38 +02:00
Michael Steenbeek 8c33240c38 Slightly refactor loading of vehicle entries 2017-09-13 10:45:28 +02:00
Marijn van der Werf dfbce1ad4c Fix Cmake compilation on macOS 10.12.6 2017-09-12 21:19:56 +02:00
Ted John 3a9cafd2f0 Remove gTrackColours macro (#6266) 2017-09-12 19:48:18 +01:00
Gymnasiast f174530ace Add comment to the Ride struct about Testpaint 
[ci skip]
 2017-09-12 14:03:46 +02:00
Gymnasiast 3a65ef79a7 Use field-wise assignments for rides in S6Exporter 
Also fixes some limit constant usage
 2017-09-12 14:00:56 +02:00
Gymnasiast 654ee4c95e Add missing pragma pack(pop) 2017-09-12 11:42:47 +02:00
Gymnasiast a28509e24c Split Ride and rct2_ride 2017-09-12 11:16:57 +02:00
Gymnasiast 179e4dd368 Do not disable ride modes in select-by-track-type mode 
The idea of a ride group is to have the ride group determine stuff like this, not the vehicle itself
 2017-09-12 10:40:19 +02:00
wolfreak99 e1f40352b6 Fix various currently loaded map marker issues 
* create gCurrentLoadedPath for Load/Save dialog

* Clear gCurrentLoadedPath upon quitting game/loading titlescreen

* Mark loaded landscapes in load dialog
 2017-09-12 08:09:54 +02:00
Gymnasiast 74961118bb Add drawing routines for inverted helices on the Lay-down RC, fixes #4991 2017-09-11 21:05:40 +02:00
Chris Guillott 5944d5be4d remove redundant line 2017-09-10 21:21:49 +02:00
Chris Guillott 5991c25919 trap getaddrinfo return codes 2017-09-10 21:21:49 +02:00
muemart e5bfd241ea Import staff patrol areas from RCT1 save files and fix #5445 2017-09-10 12:54:57 +02:00
Michał Janiszewski 45de7ebd22 Remove superfluous argument 2017-09-08 11:57:24 +02:00
Michał Janiszewski a8ba58ab9a Update wrong method name 2017-09-08 11:57:24 +02:00
Ted John 1eb3d07b3d Reduce static access and call from anonymous function 2017-09-08 11:57:24 +02:00
Michał Janiszewski 100a63a743 Pass context object as argument, don't use singleton 2017-09-08 11:57:24 +02:00
Michał Janiszewski 23ec1d29e7 Don't report elevated process on Emscripten 2017-09-08 11:57:24 +02:00
Michał Janiszewski 56ab344603 Add Emscripten platform and architecture defines 2017-09-08 11:57:24 +02:00
Michał Janiszewski 7a0a344014 Don't use unavailable fts.h for Emscripten 2017-09-08 11:57:24 +02:00
Michał Janiszewski 2577e92860 Adapt Context to Emscripten 2017-09-08 11:57:24 +02:00
Michał Janiszewski a13c30795d Add fcntl.h include to POSIX platform 
Required for `open()`, etc.
 2017-09-03 14:48:50 +02:00
Michał Janiszewski 5d3c58611a Report path of failed directory creation 2017-09-03 14:48:50 +02:00
Ted John 11d0639d5e Merge pull request #6244 from IntelOrca/paint/use-paint-session-tracks 
Pass paint session to remaining functions
 2017-09-03 10:19:18 +01:00
Duncan 04e217a04c Remove unused global palette pointer (#6247) 
Moved one use of the palette pointer into a parameter
 2017-09-03 10:16:51 +01:00
Ted John 43c6f7fda0 Pass paint session to ps functions 2017-09-03 02:27:07 +01:00
Ted John f6dbf560a2 Pass paint session to ps rotated helpers 2017-09-03 02:18:01 +01:00
Ted John 3880134b40 Change gTrackColours to use session 2017-09-03 02:01:29 +01:00
Ted John f2b8cf181e Pass paint session to remaining support functions 2017-09-03 01:56:56 +01:00
Ted John 1cc82d1cb5 Pass paint session to tunnel functions 2017-09-03 01:51:59 +01:00
Ted John 972a3bf111 Pass paint session to track_paint helpers 2017-09-03 01:42:08 +01:00
Ted John dce007feaa Pass paint session to support functions 2017-09-03 01:04:23 +01:00
Ted John 0f9784a423 Pass paint session to many specific track helpers 2017-09-03 00:34:33 +01:00
Ted John 90f4478f48 Pass paint session to all track functions 2017-09-03 00:19:17 +01:00
Ted John f81ee49015 Pass paint session to remaining non-track called functions 2017-09-02 23:41:02 +01:00
Ted John 2980be0667 Pass paint session to more ps functions 2017-09-02 23:22:19 +01:00
Ted John ae6c820662 Pass paint session to all vehicle paint functions 2017-09-02 23:13:10 +01:00
Ted John 6a9cd63874 Pass paint session to some vehicle paint functions 2017-09-02 23:05:58 +01:00
Ted John 3b9a86500a Pass paint session to sprite_paint_setup 2017-09-02 22:56:15 +01:00
Ted John a60a33e665 Pass paint session to track_paint 2017-09-02 22:47:07 +01:00
Ted John 6b3f3ddb70 Pass paint session to scenery_paint 2017-09-02 22:44:39 +01:00
Ted John 8456639b47 Pass paint session to entrance_paint 2017-09-02 22:43:45 +01:00
Ted John 1f6f83163a Pass paint session to fence_paint 2017-09-02 22:41:36 +01:00
Ted John 00cde34b39 Pass paint session to scenery_multiple_paint 2017-09-02 22:40:19 +01:00
Ted John 5c8700d054 Pass paint session to banner_paint 2017-09-02 22:38:26 +01:00
Ted John 4c78827c45 Pass paint session to path_paint 2017-09-02 22:31:39 +01:00
Ted John 47521335fa Pass paint session to surface_paint 2017-09-02 22:25:45 +01:00
Ted John f9414d1d82 Pass paint session to viewport functions 2017-09-02 22:15:09 +01:00
Ted John bf60fdcc7e Create alloc and free functions for paint_session 2017-09-02 20:56:52 +01:00
Ted John 46c2e52b5c Pass paint_session to more functions 2017-09-02 20:25:03 +01:00
Michał Janiszewski 450029a29e Export sprite BBox comparator to its own function 2017-09-02 21:14:48 +02:00
Michał Janiszewski 941607053a Expose paint_arrange_structs_helper for testing 2017-09-02 21:14:48 +02:00
Ted John b314cc4d74 Redirect gTrackColours to gPaintSession 2017-09-02 17:11:59 +01:00
Ted John a0f5f1243f Remove more map element paint globals 2017-09-02 17:11:59 +01:00
Ted John 6c1d1c43e5 Remove tunnel globals 2017-09-02 17:11:59 +01:00
Ted John eb7b1e7b7e Remove global, gPaintMapPosition 2017-09-02 17:11:59 +01:00
Ted John 5730a36555 Simplify gPaintMapPosition to rct_xy16 2017-09-02 17:11:59 +01:00
Ted John d794057f8c Remove gWoodenSupportsPrependTo global 2017-09-02 17:11:59 +01:00
Ted John 1d04f334e3 Change more paint globals to use gPaintSession 2017-09-02 17:11:58 +01:00
Ted John cb09357bba Create paint_session to replace paint globals 2017-09-02 17:11:58 +01:00
ζeh Matt 1f3ccae8b1 Refactor remaining image flag constants to defined G1_* flags. (#6217) 
Refactor gUnk9DE568 and gUnk9DE56C to be type of rct_xy16 called gPaintSpritePosition
Rename unk_9ABDA4 to gCurrentColourPalette.
Rename gUnkEDF81C to gCurrentImageType.
Rename sub_679236_679662_679B0D_679FF1 to pixel_is_present.
Remove unused variables _unk9ABDAE, _unk9AC149, unk_9E3CE4, only ever assigned but never read.
Remove unreferenced variable unk_9E3CDC.
Clean up some parts in sub_679236_679662_679B0D_679FF1.
Remove function sub_68371D and references, it assigns variables that are never used.
Add assert determine if unused code.
 2017-09-02 14:01:08 +01:00
Michael Steenbeek ddb557a0fe Fix TD4 vehicle colour import, move track_design to C++ 2017-09-01 13:38:21 +02:00
Ted John c40b73d5a4 Merge pull request #6235 from IntelOrca/feature/dirty-visuals 
Add drawing debug option for showing visuals when and where blocks of the screen are painted.
This will currently only work in hardware display drawing engine.
 2017-09-01 11:30:32 +01:00
Ted John 87c8204602 Merge pull request #6218 from IntelOrca/feature/cache-scenario-repo 
Create index file for scenario repository and refactor object repository and track design repository to share the same code for creating index files.
 2017-09-01 11:29:49 +01:00
Ted John 3f1991804a Add debug option to show dirty blocks 2017-08-31 22:36:15 +01:00
Michał Janiszewski 4708af474d Fix MinGW builds in release mode 2017-08-31 23:24:47 +02:00
Ted John c8169758d3 Re-implement scan-objects command line tool 2017-08-31 18:34:21 +01:00
Ted John 50735c0f68 Do not log 0 conflicts 2017-08-31 18:02:39 +01:00
Ted John 0df10cc41d Log exception messages 2017-08-31 18:02:39 +01:00
Ted John dcb78b18d9 Add HeaderSize to FileIndexHeader to increase rebuild chance when alignment changes 2017-08-31 18:02:39 +01:00
Gymnasiast dba7d6053e Clarify elevated permissions warning, insert line break in data files message, fixes #6215 2017-08-31 10:55:33 +02:00
Ted John f371d5c65f Remove unnecessary fields in ObjectRepository 2017-08-30 22:05:12 +01:00
Ted John f2cd0b2f3b Refactor ObjectRepository to use FileIndex 2017-08-30 21:58:43 +01:00
Ted John 8808444562 Refactor TrackDesignRepository to use FileIndex 2017-08-30 21:01:07 +01:00
Ted John 92b17b149c Remove old index code from ScenarioRepository 2017-08-30 19:35:43 +01:00
Ted John a118b09e79 Rebuild index if language has changed 2017-08-30 19:32:28 +01:00
Ted John ed8483f5c3 Time index building and handle bad files 2017-08-30 19:27:25 +01:00
Ted John ff6f257a87 Clean up mega park import 2017-08-30 19:11:39 +01:00
Ted John c5760a22bd Add more logging and comments 2017-08-30 18:57:11 +01:00
Ted John e417d2f8b0 Fix all errors 2017-08-30 18:40:42 +01:00
Ted John 4f3669f279 Start work on new FileIndex base class 
[ci skip]
 2017-08-29 19:18:13 +01:00
Ted John 2646ac3f56 Create index file for scenario repository 
Speeds up load time for game and scenario select window.
 2017-08-29 17:58:35 +01:00
Michał Janiszewski 2b64615c3a Don't access mainWindow in headless mode 2017-08-27 22:47:38 +02:00
wolfreak99 8e93c69e47 Implement console scrolling by pageup and pagedown 2017-08-26 18:19:03 +02:00
Michał Janiszewski 90ea8eee88 Include time.h for time_t 2017-08-24 17:10:08 +02:00
Michał Janiszewski 99d6bcf811 Only include fontconfig when TTF is enabled 2017-08-24 08:49:25 +02:00
Richard Jenkins 71e580a58f Refactor game load functions, resolves #6011 2017-08-23 08:04:36 +02:00
Michael Steenbeek 5089dbe0c9 Add comment about rand() range 
[ci skip]
 2017-08-22 13:42:19 +02:00
rwjuk c2b862ee51 Clean up and improve UI of track install window 
Clean up and improve UI of track install window

Cleanup window def

Clean up and improve track install window

Name track_list.var_484

Format widget definitions

Use get_friendly_track_type_name()

Guard against NULL
 2017-08-22 11:52:26 +02:00
rwjuk 5bda207c2c Fix #5417: Crooked House tracked rides do not dispatch vehicles 2017-08-22 11:52:01 +02:00
Tomas Dittmann 7d8695394c Add guards for nullptr and (-1) pointer accesses 2017-08-22 10:20:59 +02:00
Bernd Buschinski 0bb0c3b60f Initialize result pointer 
This fixes a crash in case getaddrinfo returns an error.
 2017-08-20 23:05:16 +02:00
Keatzee b89e01de8b Fix #5788: Empty scenario name becomes invisible list entry (#6197) 2017-08-19 07:49:35 +02:00
Philip Goto 6547116401 Fix #6193: All rings in Space Rings use the same secondary colour (#6194) 
The Space Rings attraction used the secondary colour of the first ring no matter if the colours are set to all the same or different per ring. Now it uses the right colour for each ring.
 2017-08-17 20:06:08 +02:00
wolfreak99 50d38eea2e Refresh loadsave on browse dialog cancel 2017-08-17 10:47:57 +02:00
jensj12 c3a5ffbe04 Implement #3994: Show bottom toolbar with map tooltip 2017-08-16 22:27:20 +02:00
Philip Goto c75be48653 Replace util_rand with built-in rand 2017-08-16 14:11:38 +02:00
Tomas Dittmann 35e7e6cbc0 Fix #6115: Random title screen music not random on launch 
The parity of the first random value is predictable (always even).
 2017-08-16 12:55:56 +02:00
Michał Janiszewski cff7080c51 Initialise pointer variable with nullptr, not 0 2017-08-15 11:51:56 +02:00
Michał Janiszewski d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
Michał Janiszewski 44c8c84b7c Convert integers acting as bools to bools (#6177) 
Also fixes MSVC2015 according to AppVeyor
 2017-08-15 09:03:10 +01:00
Marijn van der Werf 294cef3c9b Move additional windows to UI project 2017-08-14 23:53:28 +02:00
Tomas Dittmann 14f92bef80 Remove unnecessary cast 2017-08-14 20:58:33 +02:00
rwjuk 1a64fde0af Fix #6138: 'Too low' error when placing at lowest Z 2017-08-14 19:59:15 +02:00
Gymnasiast 38e6b174bd Replace memmove calls for downtime and customer history with loops 2017-08-14 19:56:29 +02:00
Gymnasiast 8eec684545 Use more constants, isolate SV6 limits further 2017-08-14 19:56:29 +02:00
Richard Jenkins 8e92351a2b Fix #6101: Rides remain in ride list briefly after demolition (#6165) 2017-08-12 13:00:43 +01:00
linkinpark9812 63fbd131ff Fix #6131: Icon for suspended vehicles aligned too low 2017-08-10 23:48:11 +02:00
duncanspumpkin df742b70b6 Fix infinite loop when removing scenery elements with >127 height 
Bug introduced when refactoring. Type mismatch not picked up by compiler
 2017-08-10 23:43:28 +02:00
duncanspumpkin fb2809cabc Fix #816. Correctly reset flash filter by considering all peeps. 
This is an original bug likely introduced by trying to save processing
time by assuming that since the display list can not be drawn that it
can stop processing. But as this loop also handles reseting flashing
peeps it will leave peeps un processed
 2017-08-10 23:41:42 +02:00
Keatzee 96a3f6a861 Resolve #5909: Import mp.dat from RCT1 installation 2017-08-10 21:46:15 +02:00
Marijn van der Werf 247fdc2f5d Fix formatting of C includes 2017-08-10 13:42:27 +02:00
duncanspumpkin 1920d161fb Fix rct2 address, convert double cast to literal value, add cast to make vs build 2017-08-10 13:42:27 +02:00
Marijn van der Werf 28c78faa57 Make more window variables and functions static 2017-08-10 13:42:27 +02:00
Marijn van der Werf 4d90940d21 Move windows to UI project 2017-08-10 13:42:27 +02:00
Ted John f3ef92edcb Fix MSVC build errors and warnings 2017-08-10 13:42:27 +02:00
Marijn van der Werf 2e89525888 fix TopToolbar include 2017-08-10 13:42:27 +02:00
Marijn van der Werf a53a7ab706 Convert remaining dialogs 2017-08-10 13:42:27 +02:00
duncanspumpkin 10643b03d8 Rename files to sentance case 2017-08-10 13:42:27 +02:00
Michał Janiszewski 32407868cc Fix C mangling 2017-08-10 13:42:27 +02:00
Michał Janiszewski edbd55a8bd GCC fixes 2017-08-10 13:42:27 +02:00
Marijn van der Werf d19727afc7 Use size_t for array iteration 2017-08-10 13:42:27 +02:00
Marijn van der Werf dc7f4bcf89 Convert most dialogs to C++ 2017-08-10 13:42:27 +02:00
Michał Janiszewski 1f9ae4d4ec Start v0.1.2 2017-08-10 00:17:26 +02:00
Michał Janiszewski 1df22c889d Update minimum required CMake version to 3.1 2017-08-09 23:30:18 +02:00
Michał Janiszewski d2ec1f0057 Fix CMakeLists.txt to allow static libopenrct2 
This allows using CMake-standard `BUILD_SHARED_LIBS` flag to dynamically
set how libopenrct2 should be built.

`cmake -DBUILD_SHARED_LIBS=OFF` will result in `openrct2` statically
linked with `libopenrct2`

Fixes #5918.
 2017-08-09 23:30:18 +02:00
Matthias Moninger d5f116b3e5 Fix compilation error on VS2015 2017-08-09 11:28:58 +02:00
Richard Jenkins 727d3270b4 Fix android build post 6110 2017-08-08 23:50:41 +01:00
rwjuk 18791fa85b Fix doc path resolution 2017-08-08 00:10:42 +02:00
rwjuk b70c748ff6 Fix changelog resolution on linux 2017-08-08 00:10:42 +02:00
rwjuk 4132b85c02 Implement platform-specific changelog path funcs 2017-08-08 00:10:42 +02:00
Richard Jenkins 972120e35a Fix #6106: Changelog file cannot be loaded on macOS 2017-08-08 00:10:42 +02:00
ZehMatt 304a7f3f45 Fix #3852: Desync constructing path with scenery in its way. 2017-08-06 22:58:08 +02:00
Ted John 6b48f4344e Fix #6100: Paths don't connect to exit 
Regression from db438a27b7, % does not work on negative numbers.
 2017-08-06 00:18:32 +01:00
Ted John 4db0ceaccd Merge pull request #6094 from janisozaur/track-design 
Track design from #5931 now costs 7 274 money to build, instead of -214 740.60.

Also prevents reading memory out of bounds at the end of the TD6 buffer.
 2017-08-05 17:14:36 +01:00
duncanspumpkin 18d082053e Rename cpp files to use TitleCase 2017-08-04 18:12:54 +02:00
jensj12 1faa2726c7 Update all windows after changing colour scheme 2017-08-04 13:18:29 +02:00
Gymnasiast ca77c75a56 Improve tabs, alignment, remove now-unnecessary information and strings 
Removes RCT2 version string, Infogrames credits and logo, removes strings for aforementioned info.
Moves OpenRCT2 version string to under the Changelog... button, rewords and fixes some of the strings
 2017-08-04 08:41:46 +02:00
wolfreak99 ffc1dc6376 Add OpenRCT2 information and changelog to About window 2017-08-04 08:38:35 +02:00
Gymnasiast 12354e1f2a Fix #6113: track list preview shows incorrect heighest drop height 2017-08-03 11:58:00 +02:00
Michał Janiszewski cc24978ea5 Fix broken assert in decode_chunk_repeat 2017-08-03 08:41:34 +02:00
Michał Janiszewski e9e37d2aac Validate more inputs to SawyerChunk handlers 2017-08-03 00:29:56 +02:00
Richard Jenkins dabc52b036 Merge pull request #6088 from Chaosmeister/develop 
prevent infinite loop while fixing invalid research items
 2017-08-02 23:10:44 +01:00
Michał Janiszewski c956ccc4d4 Reset the string builder rather than overwrite it 2017-08-02 23:54:49 +02:00
Michał Janiszewski 6ee9bf6799 Free listen_address when releasing config 2017-08-02 23:16:00 +02:00
Ted John bdf8993c48 Fix #6111: Mute button always visible in editor 2017-08-02 21:28:23 +01:00
Tomas Dittmann b330c4032f ensure validity instead of asserting invalidity. 2017-08-01 21:45:04 +02:00
Michael Steenbeek 2f3a30f22b Fix cast to bool in map element functions 2017-08-01 13:42:50 +02:00
Michał Janiszewski ee443818a8 Verify size of objects sent/requested (#6076) 2017-08-01 12:29:16 +01:00
Michał Janiszewski 754666d4e9 Remove superfluous check from track_design_save.c 2017-08-01 08:45:07 +02:00
Michał Janiszewski 15ba00d570 Remove superfluous checks from track_design.c 2017-08-01 08:44:20 +02:00
Michał Janiszewski 7872380bc1 Initialise rct_object_entry with empty struct 2017-08-01 07:54:04 +02:00
Michał Janiszewski 9e8a644fcc Fix #5931: Money overflow when placing track design 2017-08-01 07:36:19 +02:00
Michał Janiszewski 12067cb558 Fix #4697: Ensure track designs are saved and read properly 
Previous code only set one byte as an end marker, but read and compared
to 4 bytes, which could cause track design to become malformed.
 2017-08-01 07:36:19 +02:00
Michał Janiszewski 1fed4f0b2d Check validity of dropdown indices (#6087) 
Happens e.g. in server list browser
 2017-07-31 23:56:52 +01:00
Tomas Dittmann a5df985a05 prevent infinite loop while fixing invalid research items 
research_remove() does not expect any items between RESEARCHED_ITEMS_END & RESEARCHED_ITEMS_END_2, so make sure, the next item is RESEARCHED_ITEMS_END_2
fix infinite loop while loading the save file RR_60glitch.zip from #5311
 2017-08-01 00:20:37 +02:00
Michał Janiszewski 0fe60663bf Verify decoded SawyerChunks 2017-07-31 23:19:48 +02:00
Brian Callahan 9ef629a47d Reduce strength of an OpenBSD-specific comment 
[ci skip]
Change "must" to "may have to," pointed out by a user.
 2017-07-31 22:43:41 +02:00
Richard Jenkins 84eebb19aa Fix #6050: Crash on placing scenery clusters on water near map edge (#6053) 
Guard against null map elements when placing small scenery.
 2017-07-31 12:34:30 +01:00
Michael Steenbeek 9c7c553ccc Clean up vehicle flags (#6058) 2017-07-31 11:27:04 +01:00
Ted John 6699d0885b Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c 
Move remaining functions out rct2.c
 2017-07-30 18:09:26 +01:00
wolfreak99 675028d173 Bump network version 2017-07-30 19:00:30 +02:00
wolfreak99 6f7ce9300e Format game_command_demolish_ride 2017-07-30 19:00:30 +02:00
wolfreak99 ef74f56335 Fix #6071: quick demolish can delete protected ride 2017-07-30 19:00:30 +02:00
Michał Janiszewski 4c6412d4fd Delete ParkLoadResult after it's been used 2017-07-30 17:41:55 +02:00
Michał Janiszewski 427009e9bb Ensure DummyUiContext deletes allocated resources 2017-07-30 17:27:45 +02:00
Michał Janiszewski a90dce018d Properly dispose of TitleSequencePlayer to plug memleak 2017-07-30 16:46:56 +02:00
Michał Janiszewski 1ea5a902df Initialise various fields and variables 2017-07-30 15:28:16 +02:00
Ted John 0d52030b4e Merge pull request #6070 from jensj12/landscaping-v4 
Implement #2225: Change mountain tool to ignore higher surrounding tiles
 2017-07-29 23:07:29 +01:00
jensj12 b0f93a08d9 Use sint32 instead of int 2017-07-29 23:13:13 +02:00
ζeh Matt 7a5f9e8300 Refactored openrct2_assert to not rely on inlining. (#6061) 2017-07-29 20:31:54 +01:00
Ted John 8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
Ted John e6e503a853 Move path related functions to Context.cpp 
- rct2_init_directories
- get_file_path
 2017-07-29 20:29:26 +01:00
Ted John 8bc4e52ae9 Move rct2_quit to Context 2017-07-29 20:28:18 +01:00
Ted John 0d1d4960c1 Move get_file_extension_type to FileClassifier.h 2017-07-29 20:28:18 +01:00
Ted John 2ec0df1f3d Fix #6047: Scrolling in spin boxes does not work any more 
Regression from #5775.
 2017-07-29 16:43:19 +01:00
Ted John e839a46c67 Fix #6069: Title screen is black when there are no title sequences 
No palette was loaded, so load it in game_init_all.
 2017-07-29 15:54:38 +01:00
Richard Jenkins 06d1f49d61 Display a warning dialog if user runs program elevated (#6063) 2017-07-29 15:21:33 +01:00
jensj12 7db8162a44 Bugfix 2017-07-29 12:04:17 +02:00
jensj12 0eb8f632b0 Fix cases where land would not be smoothed properly 2017-07-29 12:04:17 +02:00