Commit Graph

8772 Commits

Author SHA1 Message Date
Broxzier c6e3ecd5ed Better widget behaviour and fixes
- Inset text for disabled labels and values
- Spinners can be held down

Other fixes:

- Use correct types for widget indices
- Use WINDOW_MAPGEN_PAGE_COUNT for arrays (when a new page is added in the
  future, the compiler will warn about all the arrays having an invalid
  size)
- Sort code so that related arrays are placed near each other
2017-04-24 23:19:51 +02:00
Broxzier 55c1787a13 Add heightmap smoothing
Fixed underflow error that was visible for non-tilable maps.
Reordered widgets to reflect the same order of the algorithm.
Always regenerate the map when a setting is changed.
2017-04-24 23:19:51 +02:00
Broxzier 26989ea8f6 Add smoothing height map option 2017-04-24 23:19:51 +02:00
Broxzier edfe997e78 Add option to normalize height map 2017-04-24 23:19:51 +02:00
Broxzier fda415cd44 Add settings to heightmap tab 2017-04-24 23:19:51 +02:00
Broxzier d2113514a0 Add tile_smooth function to smooth generated map 2017-04-24 23:19:51 +02:00
Broxzier 702d99e1e3 Initial prototype of loading heightmaps
Adds new strings and string ids for some future commits too.
2017-04-24 23:19:51 +02:00
Michał Janiszewski 73efe0755d Validate water image id while loading palette 2017-04-24 22:56:37 +02:00
Michał Janiszewski ee7ad17a30 Align field assignments in S6Importer.cpp 2017-04-24 22:40:22 +02:00
Michał Janiszewski ad7ecc0d85 Format S6Exporter.cpp
Pretty much just align field assignments
2017-04-24 22:40:22 +02:00
Michał Janiszewski a83dd095d6 Fix mismatched allocator/deallocater for S6 2017-04-24 22:40:21 +02:00
Michał Janiszewski f4b1c010e1 Fix uninitialised variable 2017-04-24 21:59:01 +02:00
Michał Janiszewski ea26ae9866 Explicitly initialise globals in entrance.cpp 2017-04-24 21:47:33 +02:00
Michał Janiszewski 92aefb477f Fix compilation with GCC7 2017-04-24 11:34:56 +02:00
Richard Jenkins 0219da2468 Use localised strings for 'rides set mode' command help, fix off-by-one error: RIDES_MODE_COUNT 2017-04-23 22:18:59 +02:00
Richard Jenkins 5984fd8ed7 Add user-facing help for 'rides set mode' command 2017-04-23 22:18:59 +02:00
Richard Jenkins cbf689d4ec Reduce command array size in 'rides set type' 2017-04-23 22:18:59 +02:00
Richard Jenkins 7a50a52582 Harden console command error checking, reduce command array sizes 2017-04-23 22:18:59 +02:00
Richard Jenkins e51ee316b9 Invalidate test results after changing ride mode from console 2017-04-23 22:18:59 +02:00
Richard Jenkins c564659aa4 Implement #5370: add ability to change ride operating mode from console 2017-04-23 22:18:59 +02:00
Richard Jenkins a90e5a2492 Fix typos in 'rides set' help in console 2017-04-23 22:18:59 +02:00
Raphael Setin 984ff6dc47 Read until first dot when converting track file name to in-game name, fixes #5077
This commit addresses the bug of Goliath.1 track. The track name will be everything that is written in the file name of that track, until the first dot.
2017-04-23 16:42:08 +02:00
Michał Janiszewski 0414ba7f6b Verify access to sprites 2017-04-20 13:20:11 +02:00
Hielke Morsink 9314b8b793 Fix #5375: Use mask for fetching large scenery id, fix picking banner elements 2017-04-19 07:56:46 +02:00
Michał Janiszewski d53f276207 Fix scenery eye dropper interaction with footpaths 2017-04-18 22:49:33 +02:00
Richard Jenkins 8f59b04d32 Fix #5377: Saved game keeps crashing shortly after loading
Guard against null pointers in banner_paint() (#5379)
2017-04-17 18:37:37 +01:00
Gymnasiast 34540b6439 Rename edi to something more descriptive 2017-04-17 13:39:44 +02:00
Michael Steenbeek e0764e3ac2 Add booster sprites for the Junior roller coaster 2017-04-17 12:35:38 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
duncanspumpkin 8243501680 Fix #5373. Prevent towers from being shown on car ride special list.
Mistake made during implementation. Not sure how this one was accidentally done as I expect the original list was computer generated. This bug has been in the game since June 2015.
2017-04-16 13:41:54 +01:00
duncanspumpkin 8dcf6b43f1 Fix #5371. Custom currency now correctly saves to config.
Mistake made during refactoring. Failed to account for the custom currency when saving the current currency.
2017-04-16 13:09:40 +01:00
Michał Janiszewski 0d4dd5849a Remove workaround for mingw bug, now fixed upstream 2017-04-16 08:44:37 +02:00
Michael Steenbeek 299e6c8974 Merge pull request #5349 from marcotc/detect-locale
Auto-detect locale on first run
2017-04-14 23:44:47 +02:00
Ted John d06208a521 Fix scenery window height and list calculation 2017-04-14 18:59:21 +01:00
Michał Janiszewski b87a8095d1 Make input buffers' sizes consistent 2017-04-14 19:17:38 +02:00
Michał Janiszewski f3ad6de014 Update gTextBoxInput size to be at least CHAT_INPUT_SIZE large
Fixes #5365
2017-04-14 17:58:42 +02:00
Ted John bc3acd4373 Merge pull request #5361 from Broxzier/fix_sprite_commands
Fix sprite commands
2017-04-13 23:13:33 +01:00
Gymnasiast 264e758ac6 Bump network version 2017-04-13 22:27:46 +02:00
Michael Steenbeek 400a2cc9c7 Merge pull request #5354 from rwjuk/fix5350
Make boosters on Twister and Giga Coaster more practical (#5350)
2017-04-13 22:19:25 +02:00
Richard Jenkins 194afc7b49 Halve Junior RC booster values, and update construction window to match 2017-04-13 21:05:52 +01:00
Gymnasiast 18aa462f9a Fix booster speed when right-clicking a part 2017-04-13 21:37:14 +02:00
Richard Jenkins 2ca500ad1e Adjust track build window for Giga Coaster to reflect doubled boost speed 2017-04-13 20:16:36 +01:00
Gymnasiast 9947532103 Multiply Giga Coaster booster values by 2 2017-04-13 20:24:12 +02:00
Ted John ff350f3769 Fix #5338: Scenery eyedropper hides the third colour picker 2017-04-13 17:01:44 +01:00
Broxzier ff765b29cf Add missing sprite commands to the list, sorted 2017-04-13 17:20:53 +02:00
Broxzier 6e36c00eca Fix unability to use of 'sprite exportall'
This also fixes an issue when the given path does not end with a
separator, in which case it would export to one folder higher.
2017-04-13 17:14:23 +02:00
duncanspumpkin 9257645cb7 Correctly loop. Add typedef for easter egg functions 2017-04-12 20:44:44 +01:00
duncanspumpkin 1b98c0b1cb Increment network 2017-04-12 20:34:57 +01:00
duncanspumpkin 509afe74cd Refactor easter egg peep functions. Fix #5357 2017-04-12 20:34:12 +01:00
Gymnasiast c8ecd98737 Check for both csg1.1 and csg1.dat when looking for RCT1 graphics 2017-04-12 20:08:31 +02:00
Gymnasiast cc92300e3a Load CSG1 booster sprites for the Looping and Corkscrew RC 2017-04-11 22:38:09 +02:00
Gymnasiast 99617de70a Add method to determine if CSG1 is loaded 2017-04-11 22:38:09 +02:00
Richard Jenkins 7b940abeb0 Reduce booster acceleration of Junior RC very slightly 2017-04-11 18:40:39 +01:00
Richard Jenkins c8155e1703 Align acceleration values for Vertical RC with Twister, reduce booster acceleration of Twister, Giga and Vertical by half 2017-04-11 18:18:35 +01:00
Richard Jenkins faceb68338 Increment network version 2017-04-11 17:31:47 +01:00
Richard Jenkins 34e895936c Multiply booster_acceleration value for Twister and Giga Coaster by 8 to replicate RCT1 performance 2017-04-11 16:53:12 +01:00
Richard Jenkins 62eb3176a5 Use booster_acceleration where appropriate 2017-04-11 16:43:14 +01:00
Richard Jenkins 3e3611c6da Core implementation for rct_ride_properties->booster_acceleration (not used yet) 2017-04-11 16:40:54 +01:00
Richard Jenkins f99956aa86 Rename rct_ride_properties->acceleration to powered_lift_acceleration 2017-04-11 16:29:32 +01:00
Michael Steenbeek bc3e5f1057 Update network version 2017-04-11 14:27:26 +02:00
wolfreak99 8846d3da44 convert max(x,min(y,z)) to clamp 2017-04-11 14:26:37 +02:00
wolfreak99 782b376352 return after initial if 2017-04-11 14:26:36 +02:00
wolfreak99 fcafd9576a Replace FALSE/TRUE with 0/1 2017-04-11 14:26:36 +02:00
wolfreak99 d22ad8abb5 Sync "Set guest generation higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 d6dfb3e079 Sync "Set park rating higher difficult level" 2017-04-11 14:26:35 +02:00
wolfreak99 8f56f60841 Sync "Set forbid high construction" 2017-04-11 14:26:35 +02:00
wolfreak99 9ae00d92a0 Sync "Set forbid landscape changes" 2017-04-11 14:26:35 +02:00
wolfreak99 bc8cf81ff1 Sync "Set forbid tree removal" 2017-04-11 14:26:34 +02:00
wolfreak99 44c4328b36 Sync "Set pay for park or rides" 2017-04-11 14:26:34 +02:00
wolfreak99 527cce062f Sync "Raise / lower park entry fee" 2017-04-11 14:26:34 +02:00
wolfreak99 e5fac3c765 Sync "Raise / lower cost to buy construction rights" 2017-04-11 14:26:33 +02:00
wolfreak99 5616b1f260 Sync "Raise / lower cost to buy land" 2017-04-11 14:26:33 +02:00
wolfreak99 8b3f0a4df8 Sync "Set guests prefer less/more intense rides" 2017-04-11 14:26:33 +02:00
wolfreak99 33bc414bab Sync "Raise / lower initial guest thirst" 2017-04-11 14:26:33 +02:00
wolfreak99 6baf971eba Sync "Raise / lower guest initial hunger" 2017-04-11 14:26:32 +02:00
wolfreak99 48ad60308e Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 c0dc1718a4 Sync "Raise / lower guest initial happiness" 2017-04-11 14:26:32 +02:00
wolfreak99 d21d500b4a Sync "Set forbid marketing campaigns" 2017-04-11 14:26:32 +02:00
wolfreak99 2a8481bd48 Sync "Raise / lower interest rate" 2017-04-11 14:26:31 +02:00
wolfreak99 8c07613eed Sync "Raise / lower maximum loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 e096314f89 Sync "Raise / lower initial loan size" 2017-04-11 14:26:31 +02:00
wolfreak99 0932854f7c Sync "Raise / lower initial cash" 2017-04-11 14:26:30 +02:00
wolfreak99 a3b1175ed6 Sync "Set no money" 2017-04-11 14:26:30 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
Michał Janiszewski a7e6c6ab24 Update network version to 15 2017-04-11 10:23:37 +02:00
wolfreak99 fb62ed8ae2 Add "Quick demolish mode" to the Rides List
Taken from the "Quick fire mode" on the Staff List
2017-04-11 10:16:44 +02:00
Gymnasiast b595fea770 Fix Z-sorting issues with Giga Coaster boosters 2017-04-10 21:11:52 +02:00
Gymnasiast 3ad6af679a Draw booster sprites on Steel Twister, Vertical RC and Giga Coaster, fixes #5351 2017-04-10 20:31:47 +02:00
Martin Müller ae0c85f009 Add tooltip to the label and warn that restart is required 2017-04-10 14:10:54 +02:00
Martin Müller 3409da9aa1 Only load csg1 if necessary 2017-04-10 14:09:01 +02:00
Martin Müller da1f618732 If path to RCT1 is available, load "css50" from there 2017-04-10 14:09:01 +02:00
Martin Müller b1bd899fb8 Add menu option for path to RCT 1 2017-04-10 14:08:58 +02:00
Marco Costa 6f0232431e Replace comment with STUB macro 2017-04-09 17:05:48 -04:00
Marco Costa e8136aa950 Remove unused include 2017-04-08 23:23:17 -04:00
Marco Costa 04ec93b038 Move stub implementation to posix.c 2017-04-08 23:10:16 -04:00
Marco Costa 8ed51d46ff Add import for date format 2017-04-08 22:58:45 -04:00
Marco Costa 8d2d430de0 Default implementation of date format 2017-04-08 22:50:34 -04:00
Marco Costa f1a1639c8c Auto-detect locale on first run 2017-04-08 22:39:19 -04:00
Marco Benzi Tobar 67b4d919b4 Update the window size when using maximise on macOS 2017-04-07 17:09:11 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
Richard Jenkins 1cfc1b003b Fix scenery eyedropper not picking up selected item's rotation (referenced in #5339) (#5344) 2017-04-05 12:33:59 +01:00
Michał Janiszewski 07d943575d Fix invalid array size in platform_open_directory_browser 2017-04-04 22:10:23 +02:00
Michał Janiszewski 8cd704eca7 Guard array access in platform_open_directory_browser 2017-04-04 22:07:50 +02:00
duncanspumpkin d305925cde Fix #5334. Make signs save text in the correct order.
Mistake made during refactoring that would cause the sign text to be in the wrong order. If the text was less than 12 characters sign would be blank.
2017-04-04 20:05:10 +01:00
Ted John 9c4c7e7b23 Merge pull request #5319 from IntelOrca/refactor/fountain-cpp
Refactor fountain to C++
2017-04-03 21:53:33 +01:00
Michał Janiszewski f0b8a514fa Update network version to 13 2017-04-02 23:00:00 +02:00
GrahamRCT 29db1389ce Relative value bonus for new rides
This prevents, for instance, charging $6 for any new ride, regardless of its quality.
2017-04-02 22:52:59 +02:00
Michael Steenbeek c9c3025e2e Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool
Add scenery eyedropper tool
2017-04-02 22:45:28 +02:00
Gymnasiast 9efbf9c60e Only show 'Force breakdown' when not in network mode, fixes #5199 2017-04-02 19:35:25 +02:00
Michał Janiszewski cf87760b60 Fix #5325: Crash from invalid ride type in research_finish_item 2017-04-02 15:35:27 +02:00
Margen67 10d1e8a538 Disable clearance checks for underwater and underground walls
Also update network version.
2017-03-31 09:38:03 +02:00
Gymnasiast ea7f1f03e7 Raise limit of objects per tab to 256 2017-03-29 23:04:30 +02:00
David CARLIER d50a1592fa Prevent double allocations of string allocated config values
Prevent double allocations of string allocated config values since they can be set by default and then set again by reading the config file.
2017-03-28 10:32:22 +02:00
Richard Jenkins 5b685d5cad Don't apply peep_make_passing_peeps_sick() to peeps in a queue, fixes #1992 2017-03-28 09:24:42 +02:00
Richard Jenkins d58f761721 Improve algorithm for determining zoom level in track previews, fixes #3502 2017-03-28 09:23:46 +02:00
Michał Janiszewski 1f78afead9 Prevent dereferencing null map element in footpath_remove_real
No network version increase as the client would simply crash if it were
NULL.
2017-03-27 22:09:46 +02:00
zaxcav 071c8135ba Update ride_find_closest_mechanic() to search using the station exit location, fixes #5284 2017-03-27 20:00:50 +02:00
Richard Jenkins 2ce4b51528 Do not return money when demolishing a ghost footpath, fixes #5318 2017-03-27 15:04:12 +02:00
Gymnasiast b5b602d5a0 Fix import of SV4 scenario ticks, fixes #5004 2017-03-26 18:13:54 +02:00
Richard Jenkins ccce7b0432 Pass selected colour to the create banner command, fixes #5316 2017-03-26 15:31:21 +02:00
Gymnasiast e85c627bd5 Fix importing SV4 walls in pause mode 2017-03-25 21:57:31 +01:00
GrahamRCT 6ea78d6c01 Remove duplicate ride penalty for closed rides
The game reduces the 'value' of a ride, which decides how much guests will pay for it, when multiple rides of the same type exists within a park. Currently, the rides' status is not taken into account.

This PR ensures a ride with status "closed" will no longer attract the penalty. Only open or broken rides will do so.

In other words, this PR removes ill-deserved punishment for players who:

- Use (partial) rides as scenery
- Build replacement rides while keeping the originals open

Also refactored the code slightly to decrease average-case runtime.
2017-03-24 08:13:04 +01:00
Michał Janiszewski de6e493049 Catch exceptions using const-reference rather than value 2017-03-23 22:21:17 +01:00
Michał Janiszewski 2df1f87662 Include SDL.h in twitch.cpp for SDL_GetTicks() 2017-03-23 21:06:37 +01:00
Ted John f9f516c372 Format Fountain as C++ 2017-03-23 18:36:20 +00:00
Ted John 7fb653d1a7 Remove platform include from game.h 2017-03-23 18:34:32 +00:00
Ted John 9e4efb67b1 Move fountain files to C++ 2017-03-23 17:58:01 +00:00
Ted John 481f5d706f Fix compilation and refactor GetFrameImage 2017-03-23 17:37:25 +00:00
Ted John cd54503bdb Refactor duck to member functions 2017-03-23 17:37:25 +00:00
Ted John 3f53f8cb5d Refactor duck to C++ 2017-03-23 17:37:25 +00:00
Michał Janiszewski 92d3e219d2 Add parentheses to enforce order of evaluation in input.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski fa65fd1481 Reduce scope of variables in input.c, rect.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski 0471d4ccf6 Guard access to ride_type field in ride.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski 4a51ebdf1f Remove unused variable 2017-03-18 23:23:23 +01:00
Michał Janiszewski 4df0a5ee7d Reduce scope of variable in Imaging.cpp 2017-03-18 23:23:23 +01:00
Michał Janiszewski ddc2a708d4 Don't test unsigned value for being negative 2017-03-18 23:23:23 +01:00
Duncan 1c526ddb98 Merge pull request #5291 from duncanspumpkin/refactor_banner
Refactor Banner Map Element Functions
2017-03-16 22:20:31 +00:00
Nelson Chen dc848bb8e3 macOS Sierra (10.12): Disallow Automatic Window Tabbing
Automatic Window Tabbing in macOS Sierra causes a menu item called "Show
Tab Bar" to appear under the Window menu in the menu bar. Selecting this
option causes a double-title bar effect as there is no option in OpenRCT2
to make new tabbed "documents". This double-title bar can be untoggled
by selecting "Hide Tab Bar".

I don't think OpenRCT2 is going to become a tabbed document-oriented
themepark simulator anytime soon. Thanks, but no thanks Sierra.

References:
* https://codereview.chromium.org/2325313002/
* https://hg.mozilla.org/releases/mozilla-aurora/rev/385b9ea08ff7

* Use better Obj-C styling for macos_disallow_automatic_window_tabbing()
2017-03-13 23:03:29 +01:00
Michael Steenbeek 2bafea9551 Merge pull request #5303 from Broxzier/use-widget-defines
Replace hardcoded values in window files
2017-03-13 23:01:47 +01:00
duncanspumpkin 132721128e Create function for map_can_build_at 2017-03-13 21:47:43 +00:00
Ted John 6429ccd9df Implement scenery eye dropper 2017-03-13 19:27:20 +00:00
Ted John 6e7c5b7031 Add scenery eyedropper button 2017-03-13 18:05:13 +00:00
duncanspumpkin 6878341214 Make review changes 2017-03-13 17:41:27 +00:00
duncanspumpkin 5dbc82ab99 Apply cpp coding style
Fix warning

Fix xcode

Use math min, use correct caseing for non windows

Fix more warnings

Fix warning
2017-03-13 17:41:27 +00:00
duncanspumpkin afafdba0b7 Refactor of game commands 2017-03-13 17:41:25 +00:00
duncanspumpkin 9087170cf1 Move functions into banner.cpp 2017-03-13 17:41:24 +00:00
LRFLEW d24961640a Update Xcode Project
Fix warning

Fix warning
2017-03-13 17:33:51 +00:00
duncanspumpkin 60fb821675 More refactoring 2017-03-13 17:33:50 +00:00
duncanspumpkin b2bab06235 Apply cpp style 2017-03-13 17:33:49 +00:00
duncanspumpkin 652cf510e5 Continue refactor. Fix bug with provisional tracks.
Note this might bring back #4728.
2017-03-13 17:33:48 +00:00
duncanspumpkin 9725e6b647 Apply the cpp style guide 2017-03-13 17:33:47 +00:00
duncanspumpkin ffeb1fa527 Initial refactor of entrance 2017-03-13 17:33:46 +00:00
Ted John 934db3705b Fix thunder initialisation 2017-03-12 12:29:20 +00:00
Ted John bcc0bfa485 Rename climate.h to Climate.h 2017-03-11 22:59:33 +00:00
Ted John 04a3c73c59 Refactor climate.h structs 2017-03-11 22:59:32 +00:00
Ted John 0d722d55e1 Refactor climate to C++ 2017-03-11 22:59:32 +00:00
Broxzier 06c195dd3c Fix error in setting pressed tab 2017-03-11 23:49:39 +01:00
Broxzier c0962a56a8 Use widget index in new ride window 2017-03-11 23:49:38 +01:00
Broxzier f688a2c9db Add and use widget index for exit and option button 2017-03-11 23:49:37 +01:00
Broxzier 4cd39babbb Replace hardcoded value in various windows 2017-03-11 23:49:32 +01:00
Broxzier f9e2a74c4d Replace hardcode value and better readibility in ride.c 2017-03-11 23:42:33 +01:00
wolfreak99 56a1dbb54c Replace magic values for enabled widgets in Ride window (#5278) 2017-03-11 22:29:39 +01:00
Michał Janiszewski 2f66ac2c11 Fix errorneous access to sound params in vehicle_update_sound_params 2017-03-11 22:14:38 +01:00
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Ted John c0ce8ef3c1 Merge pull request #5298 from IntelOrca/refactor/balloon
Refactor balloon to C++
2017-03-11 13:14:18 +00:00
Ted John e4c960b7d9 Separate out game_command_balloon_press 2017-03-11 12:57:46 +00:00
Ted John 2d063ef545 Add comment to balloon press logic 2017-03-11 12:57:45 +00:00
Ted John 8148c86f6b Use balloon for create_balloon 2017-03-11 12:57:45 +00:00
Ted John dfc140158e Use member functions for balloon 2017-03-11 12:57:45 +00:00
Michał Janiszewski 00b6fb53c6 Fix #5299: Scenario editor crash when placing peep spawn 2017-03-10 23:02:04 +01:00
Ted John ce13b551cb Refactor balloon to C++ 2017-03-10 17:26:08 +00:00
Ted John 20a43227e0 Rename balloon.c to balloon.cpp 2017-03-10 17:12:29 +00:00
Ted John 812a37d5fb Merge pull request #4790 from IntelOrca/add/uri-protocol-handler
Add uri protocol handler
2017-03-10 10:46:28 +00:00
Ted John cdffd6116d Fix non-network builds 2017-03-08 20:45:49 +00:00
Ted John e960da95e2 Add a workaround for MINGW 2017-03-08 20:39:45 +00:00
duncanspumpkin 76c154a567 Fix #5285. Config file not read correctly.
When the hashing function finds a collision such as on play_intro and auto_staff_placement it has to do a string compare to find out if two map entries are different. Due to a mistype this comparison would always return true. This meant that the auto_staff_placement value would overwrite the play_intro value. Mistake caused when fixing previous bug
2017-03-08 20:32:21 +00:00
Ted John e81094ee60 Fix loading parks by command line with non standard extensions 2017-03-08 19:06:42 +00:00
Ted John 0ec43e3611 Improve String::Split and add tests 2017-03-08 19:06:42 +00:00
Ted John 7ccce750a6 Use std::string instead of char * for UriHandler 2017-03-08 19:06:42 +00:00
Ted John 925d64249f Add openrct2:// uri scheme support
This sets up a URI scheme for openrct2 for Windows by adding the necessary registry keys. This is done on startup every time to keep the binary location up to date. URI handling currently supports joining a server.
2017-03-08 19:06:42 +00:00
Ted John 5a850cd155 Add some useful string functions 2017-03-08 19:06:42 +00:00
Michał Janiszewski 8087fc6a17 Bump network version as a result of 5bd44a6d3f 2017-03-07 22:49:33 +01:00
duncanspumpkin 5bd44a6d3f Fix #5265. Queue TV's now correctly detected.
Due to a mistake when implementing only ghost queue TV's were used for increasing peep happiness
2017-03-07 21:13:45 +00:00
duncanspumpkin 8bd374f9dd Fix #5275. Door animations now play correctly.
Mistake caused when refactoring. I did some copy paste coding and forgot to test it. On top of that mistakenly thought 0x30 >> 3 = 12 when it equals 6.
2017-03-07 19:44:14 +00:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace
[ci skip]
2017-03-07 20:38:11 +01:00
Duncan bb938054c7 Merge pull request #5274 from IntelOrca/refactor/wall-cpp
Clean up wall.cpp
2017-03-07 19:10:22 +00:00
LRFLEW 8e55b6ef22 Make the INI keys case insensitive 2017-03-06 09:22:44 -06:00
Ted John c5a999415c Clean up wall.cpp
* Trim trailing spaces
* Tab to space
* Conform more to C++ code style
2017-03-04 12:13:24 +00:00
wolfreak99 1549467c6c Fix "allow more peep spawns" 2017-03-03 16:48:35 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
wolfreak99 c6b5053261 Add cooldowns to help prevent mass demolishing 2017-02-28 09:31:26 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor
Refactor fence to wall
2017-02-28 06:56:06 +00:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Ted John 4442b936de Merge pull request #5256 from chfast/memory-fixes
Small memory fixes
2017-02-27 17:24:08 +00:00
Hielke Morsink 4ea29bbf80 Close conflicting windows in main menu
* The main buttons close the other main windows in the main menu

* Only close other windows if the next is not open already
2017-02-26 13:24:35 +01:00
duncanspumpkin ece3be303c Fix formating 2017-02-26 09:04:32 +00:00
duncanspumpkin adab7f7a6d Add set animation frame function 2017-02-25 09:36:28 +00:00
duncanspumpkin 7691dc3c10 Use functions to set and get secondary colour 2017-02-25 09:19:31 +00:00
Ted John af7af61536 Merge pull request #5240 from IntelOrca/refactor/config-cpp-2
Refactor config
2017-02-25 01:35:03 +00:00
Michał Janiszewski 3b3f0b2e6b Return actual instead of default value in IniReader::GetString 2017-02-24 23:39:01 +01:00
Ted John 3b341de835 Fix String::Trim and add test 2017-02-24 21:48:06 +00:00
duncanspumpkin 12ba104485 Add force commands for ratings.
Note these do not save and will reset if the rating is recalculated
2017-02-24 20:48:04 +00:00
Michał Janiszewski 58da1cde84 Make IniReader not throw while parsing invalid values 2017-02-24 20:26:49 +01:00
Paweł Bylica 7360d06592
Silently fallback to sorfware rendering
If accelerated rendered cannot be created by SDL, fallback to software rendering. The config option is not changed.
2017-02-24 20:14:37 +01:00
Paweł Bylica 660373cf38
Fix unmatched memory free
Before the memory of size 1 was deleted, more allocated.
2017-02-24 00:15:56 +01:00
Michał Janiszewski 1784543e14 Set default first section to true 2017-02-23 23:26:39 +01:00
Michał Janiszewski 9c32cb3a62 Don't break on too short INI streams 2017-02-23 23:26:39 +01:00
duncanspumpkin 7c17cef89c Remove test code 2017-02-23 20:18:34 +00:00
Duncan 3bb7398649 Add static keyword to static functions 2017-02-23 12:48:41 +00:00
duncanspumpkin 84a0060090 Enforce the bracket and line width rule 2017-02-22 18:18:23 +00:00
Ted John 9ba51f221b Add summary comments 2017-02-22 18:00:19 +00:00
Ted John 40eb2c55fd Reduce duplicated code in IniReader 2017-02-22 17:58:50 +00:00
Ted John d72ced4ea9 Remove final from struct 2017-02-22 17:54:37 +00:00
Ted John 4dc792bc1d Use IStream for IniReader and IniWriter 2017-02-22 17:52:33 +00:00
Ted John 6e9d22e99d Use hpp for header files
...as they contain C++ implementation code.
2017-02-22 17:46:10 +00:00
duncanspumpkin c5e9698f0c Fix remaining wall fence issue 2017-02-21 21:17:10 +00:00
duncanspumpkin 4db8f05515 Replace tabs with spaces. Use coding style for var names 2017-02-21 20:45:59 +00:00
duncanspumpkin 69af723972 Remove more fences 2017-02-21 20:22:03 +00:00
Ted John a9ffe5bf6d Convert tabs to spaces in KeyboardShortcuts.cpp 2017-02-21 12:11:19 +00:00
LRFLEW f9c2d83393 Include new config header in macos.m 2017-02-21 01:51:35 -06:00
duncanspumpkin 810bf301f3 Rename map element fence to wall 2017-02-20 21:10:49 +00:00
duncanspumpkin f54c71b61c Rename functions to wall. Refactor game commands 2017-02-20 21:02:19 +00:00
duncanspumpkin 72d97371b1 Rename to wall.cpp 2017-02-20 20:15:43 +00:00
duncanspumpkin 735f1d42b9 Move fence functions into fence.cpp 2017-02-20 20:09:40 +00:00
Ted John 8ba5db0697 Fix build for some configurations 2017-02-20 20:05:59 +00:00
Ted John 80c4e4309d Remove duplicate entries and in wrong enum 2017-02-20 20:04:05 +00:00
Michał Janiszewski f6f6d27b4f Make default "User" group not have "passwordless login" permission 2017-02-19 23:28:23 +01:00
Michał Janiszewski 0f40930ec9 Clamp values in vehicle.c to prevent signed overflow 2017-02-19 22:48:27 +01:00
Ted John a473740efd Fix build errors 2017-02-19 21:41:36 +00:00
Ted John 87be032adc Space out sections when writing config.ini 2017-02-19 21:37:06 +00:00
Ted John 8d3bf515ed Fix trim function 2017-02-19 21:33:14 +00:00
Ted John f73aebe51d Fix #5238: RCT1 import: Rides are initially free when placing them 2017-02-19 11:19:29 +00:00
duncanspumpkin 133266deb0 Label fence offsets 2017-02-19 11:03:05 +00:00
Ted John fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00
Ted John 4457749b35 Move keyboard shortcut loading to C++ 2017-02-18 15:30:54 +00:00
Ted John 6bda8eba0f Move remaining config functions to C++ 2017-02-18 15:16:19 +00:00
Ted John 87e3a8f8b0 Move config enums to more suitable places 2017-02-18 14:51:35 +00:00
Michael Steenbeek c233eedafe Multiply SV4 park value objectives by 10, fixes #5218 2017-02-18 13:40:10 +01:00
Ted John 6a2b7b1200 Start moving config definitions over to C++ 2017-02-18 10:54:13 +00:00
Ted John bd6d31fed6 Write config fields 2017-02-18 10:17:26 +00:00
Ted John 23fef54b14 Implement IniWriter 2017-02-18 10:17:26 +00:00
Ted John 2fc5012670 Fix build errors 2017-02-18 10:17:26 +00:00
Ted John 0542338d4d Use interface for config enum 2017-02-18 10:17:26 +00:00
Ted John d8fae61e0c Add remaining config reading 2017-02-18 10:17:26 +00:00
Ted John aee1222829 Read more config 2017-02-18 10:17:26 +00:00
Ted John 6f15fc2cee Refactor config reading to different files 2017-02-18 10:17:26 +00:00
Ted John a582cc0cca Add support for config enums 2017-02-18 10:17:26 +00:00
Ted John 3255a1b88c Support reading quoted strings 2017-02-18 10:17:26 +00:00
Ted John f8f60a69a7 Implement reading of config values 2017-02-18 10:17:26 +00:00