Commit Graph

9772 Commits

Author SHA1 Message Date
Gymnasiast 38c504685e Define constants for max energy and happiness, cap energy to 128 instead of 255 2017-07-27 21:44:46 +02:00
Gymnasiast 2b540b9da1 Remove direct access to small scenery's colour_1 and _2 fields 2017-07-27 21:37:34 +02:00
Gymnasiast db438a27b7 Use map_element_get_direction in more places, create map_element_get_direction_with_offset() 2017-07-27 21:23:26 +02:00
rwjuk 3bd45397aa Fix #6021: Unable to colour vehicles individually 2017-07-27 21:21:09 +02:00
Michael Steenbeek 434325ea22 Move vehicle preference to RideGroupManager 2017-07-27 21:03:26 +02:00
Keatzee 6e068d893d Move autosaves to a subfolder of /save, closes #3209 2017-07-27 19:16:31 +02:00
Ted John 6f2020e7f4 Fix #5998: Staff not getting paid / no loan interest
Ensure gDateMonthTicks is always a multiple of 4 so that it does not skip weekly checks.
2017-07-27 17:33:23 +01:00
Michael Steenbeek ad6f725d37 Fix refactor error 2017-07-27 17:50:01 +02:00
Michael Steenbeek 46de90df86 Create map_get_water_height() 2017-07-27 17:15:56 +02:00
Michael Steenbeek 41b5e8bbca Remove direct usage of map element track sequence field 2017-07-27 16:19:01 +02:00
Richard Jenkins 7e8aa5f655 Merge pull request #6031 from ZehM4tt/assert-refactor
Refactored asserts always calling the function regardless of expression.
2017-07-27 14:47:30 +01:00
Gymnasiast d936b23072 Get and set map element station index via helper functions 2017-07-27 14:13:16 +02:00
ZehMatt f7b7b18b4a Refactored asserts always calling the function regardless of expression. 2017-07-27 05:12:50 +02:00
wolfreak99 30b907f0e8 Fix #6017: ride type spinner not working in multiplayer 2017-07-26 23:15:33 +02:00
Kuriibo 59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Kuriibo d0db59e196 Keyboard Shortcut for Scenery Remover - #5835
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
2017-07-26 17:23:47 +01:00
Gymnasiast 0092fee1ce Fix what was likely a refactoring error 2017-07-26 16:49:42 +02:00
Gymnasiast db56c7e3b3 Change growth_rate to target, fix cheats to use them 2017-07-26 16:49:42 +02:00
Gymnasiast 3f345c60c6 Fix underflow in sub_68F41A() 2017-07-26 14:51:43 +02:00
Gymnasiast 603735f86d Make doors work with every vehicle, closes #5951 2017-07-26 14:41:44 +02:00
Gymnasiast e9e8068dff Change MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT_MASK to MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT 2017-07-26 14:41:04 +02:00
Gymnasiast 894d010439 Name map element track sequence flags and use them 2017-07-26 14:41:04 +02:00
Gymnasiast a67b248956 Update references to sub_688217() 2017-07-26 14:40:28 +02:00
Richard Jenkins a2f8720143 Fix #5981: Ride list doesn't update after using quick demolish 2017-07-26 11:07:12 +02:00
rwjuk 11711fe4c4 Fix #6010: Assert triggered when loading SC6 via file assoc 2017-07-26 11:03:46 +02:00
Gymnasiast 271e6837e9 Refactor byte_F4414E into separate local bools 2017-07-26 09:17:43 +02:00
Duncan 9a49490a0a Refactor of scenery elements (#5308)
Label scenery flags, vars and refactor small scenery into cpp file.
2017-07-25 22:26:43 +01:00
Christian F. Coors 32da66aa79 Fix build errors 2017-07-25 22:50:19 +02:00
wolfreak99 6ec89fa78b Implement dropdown/spinner combo for changing ride type 2017-07-25 13:25:31 +02:00
Michael Steenbeek ef6aea98e4 Implement #4135: Rename RC Designer to Track designer and allow more ride types 2017-07-25 12:16:37 +02:00
Gymnasiast 274abcb071 Clean up track designs a bit 2017-07-25 11:04:40 +02:00
wolfreak99 77035b0993 Move braces onto their own line 2017-07-25 10:45:38 +02:00
wolfreak99 7c6e260f77 Revise dividing by zero guards 2017-07-25 10:45:38 +02:00
wolfreak99 150cc90f89 fix empty dropdowns 2017-07-25 10:45:38 +02:00
zsilencer 424f2fcef5 Fix #5984: Allow socket binding to same port after crash 2017-07-25 08:35:35 +02:00
ZehMatt fabf7f9fb5 Refactored window flags only being updated every 1000ms. 2017-07-25 08:33:57 +02:00
Michał Janiszewski 5811a9e08e Lift C4548 for FD_SET
Others encountered that as well:
https://github.com/deflomu/cryptlib/blob/master/io/tcp.h#L572-L588

Nothing we can do about it ourselves.
2017-07-24 22:04:40 +02:00
Gymnasiast 3c3094fa83 Raise dropdown limit to 128 2017-07-24 21:49:24 +02:00
ζeh Matt d45044239e Fix #5977: Custom music files not showing up in music list 2017-07-24 17:08:10 +02:00
Gymnasiast 346c9e1359 Fix #5985: Entertainer custome dropdown has no checked item 2017-07-24 14:10:23 +02:00
Gymnasiast 8473a40bc4 Make gDropdownItemsChecked and gDropdownItemsDisabled static 2017-07-24 14:10:23 +02:00
Gymnasiast 1e3b6a2ea5 Change _countof to countof 2017-07-24 12:45:34 +02:00
ZehMatt 917bba777e Fix ride previews going out of bounds. 2017-07-24 12:45:34 +02:00
Gymnasiast 50ba63df0e Clean up dropdowns
Uses constants in more places.
Most of the changes were taken from a PR by @wolfreak99
2017-07-24 10:33:46 +02:00
Gymnasiast c929311518 Make entrance/exit position list use MAX_STATIONS 2017-07-23 22:16:53 +02:00
Michael Steenbeek 2c52ef71a4 Replace SPR_METAL_PLATE with SPR_STATION_BASE_D and use it throughout (#5978) 2017-07-23 17:20:13 +01:00
Ted John 34096627ac Fix #5973: Headless Servers lost the ability to load Scenarios 2017-07-23 11:14:57 +01:00
wolfreak99 47a89c4cf3 Add "Ignore research status" cheat 2017-07-23 12:09:29 +02:00
wolfreak99 ed69983354 Overflow dropdowns with 32+items into columns
After about 32+ items, lists can sometimes go off screen. This commit
modifies the text based dropdowns loosely based off the code from the
image dropdowns. I've also added _dropdown_list_vertically to allow text
lists to continue to remain in an up-to-down format and images to remain
in a left-to-right format.
2017-07-23 11:56:42 +02:00
wolfreak99 32fbf31777 Define DROPDOWN_ITEMS_MAX_SIZE
This defines the current limitation of dropdown items.
2017-07-23 11:56:42 +02:00
Ted John bc88cb9c2b Make TitleScreen a class (#5971) 2017-07-22 23:42:14 +01:00
Gymnasiast 2a4c0ebe20 Allow on-ride photo segments on Bobsleighs 2017-07-22 22:47:34 +02:00
CharlesLove 88290337f6 Fix #5881: gCheatsUnlockAllPrices persists when loading new scenarios 2017-07-22 22:20:52 +02:00
ζeh Matt 6a56c8c716 Refactored some variables around paint_arrange_structs. (#5876) 2017-07-22 14:18:58 +01:00
Tomas Dittmann 32ffc194b9 Fix #4455: Crash in window_sign_invalidate due to original bug (#5969)
Add missing `& MAP_ELEMENT_LARGE_TYPE_MASK`
2017-07-22 14:15:13 +01:00
Ted John 354a26a9d2 Use std::string for player name
Removes memory leak.
2017-07-22 09:48:34 +01:00
Keatzee ea87e87750 Fix #4301: Remove leading/trailing space from playername 2017-07-22 09:43:24 +01:00
Ted John 3b12ab7795 Fix #5880: Leaving bumper cars without building causes assertion
Protect vehicle_update_sound against invalid ride type.
2017-07-22 09:40:26 +01:00
Ted John 4852633a1b Fix #5966: Issue with Ride Time 2017-07-22 09:24:51 +01:00
Christian F. Coors 9b7e943fab Fix newline for sprite command (#5965) 2017-07-21 16:45:26 +01:00
Gymnasiast 4d23845d4b Fix rides not breaking down 2017-07-20 21:55:29 +02:00
Gymnasiast 636cd5468a Fix RIDE_INITIAL_RELIABILITY 2017-07-20 21:35:11 +02:00
Michael Steenbeek 367efa2020 Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places 2017-07-20 20:56:29 +02:00
Michał Janiszewski ee07695cce Manually hoist consts before the loop
It is optimised in release builds, but it will help in debug mode
2017-07-20 19:36:37 +02:00
Michał Janiszewski 8c9da63aa5 Make drawing loop only depend on loop counter (#5954) 2017-07-20 18:09:22 +01:00
Ted John 2eb9657781 Fix premature deletion of dependencies (#5952)
In particular, the object repository can potentially be deleted before the object manager is deleted. This causes a crash when the object manager is deleted because it requires the object repository within the destructor.
2017-07-20 17:44:31 +01:00
Gymnasiast 260f342d73 Fix typos in (unused) defines and comment 2017-07-20 16:18:36 +02:00
Michael Steenbeek bb09019d9b Name and fix vehicle entry and tertiary colour flags 2017-07-20 12:57:37 +02:00
Michael Steenbeek 343e436e45 Import rides in SV6 files per ride and per field 2017-07-19 22:00:48 +02:00
Gymnasiast fc28c0c014 Fix incorrect use of defines 2017-07-19 21:56:11 +02:00
Ted John 957c8b6d2b Merge pull request #5925 from jansegre/develop
Fix: don't show " (DEBUG)" if DEBUG is set but is 0.
2017-07-19 20:41:25 +01:00
Michael Steenbeek 70f1e94ce9 Fix #5946: assertion hit when building new ride 2017-07-19 13:41:24 +02:00
Richard Jenkins fab8efbe2a Implement #5855: Display source game in missing obj window 2017-07-19 11:04:00 +02:00
Gymnasiast f5923dbe99 Create find_first_non_null_station_index() 2017-07-19 08:52:33 +02:00
Michael Steenbeek 72d2c58931 Clean up some rct_xy8 usage; formatting (#5941) 2017-07-18 23:18:19 +01:00
Michał Janiszewski fc59fc7573 Cache last visited node in paint_arrange_structs
This commit caches the last visited node in paint_arrange_structs and
in paint_arrange_structs_helper, which allows skipping iterating over
long linked lists that don't work well with modern CPU caches.

This is especially useful, if the list is walked just to be discarded in
the end.

This improves performance across the board, the busier the park, the
higher performance improvement.

I have verified this producing pixel-perfect results with ones before
this change by dumping giant screenshot on various parks in all zooms,
all rotations.

Results collected running before and after this change with `benchgfx`
command (https://github.com/OpenRCT2/OpenRCT2/pull/5655) on current
title sequence, YMMV.

**Park**|**Before**|**After**|**Delta**
:-----:|:-----:|:-----:|:-----:
Maian\_SOSDragon.sv6|2.80|2.43|-13.2%
Maian\_SOSFrosty.sv6|3.53|3.02|-14.4%
Maian\_SOSParabola.sv6|4.16|3.45|-17.1%
MrB.sv6|5.52|4.52|-18.1%
SpacekKing.sv6|8.53|6.52|-23.6%
SpacekMaple.sv6|7.18|5.75|-19.9%
SpacekMission.sv6|4.41|3.43|-22.2%
SpacekParadise.sv6|9.01|6.36|-29.4%
SpacekSwimmers.sv6|4.11|2.97|-27.7%
Stosky.sv6|3.34|2.36|-29.3%
 | | | 
**Average**|**5.26**|**4.08**|**-21.5%**
2017-07-18 23:01:00 +02:00
Ted John eeeebe5525 Fix #5939: Crash when importing 'Six Flags Santa Fe'
Protect fix_invalid_vehicle_sprite_sizes from invalid vehicle chains.
2017-07-18 17:34:05 +01:00
Gymnasiast 6dddd5b76c Clean up enabledPieces usage 2017-07-18 18:13:00 +02:00
Michael Steenbeek 7a4e7e17a1 Fix incorrect terminology 2017-07-18 18:07:43 +02:00
ZehM4tt ad4eaff323 Fix game not allowing to catch up if rendering is slow.
Refactored game_update to use the given parameters from context.
2017-07-18 15:14:21 +02:00
wolfreak99 c11e925f40 Change CHEATS_MONEY_DEFAULT, CHEATS_MONEY_INCREMENT 2017-07-18 14:57:53 +02:00
wolfreak99 5d1ffd76b5 Move windows/cheats.c/MONEY_DIGITS to localisation.h/MONEY_STRING_MAXLENGTH 2017-07-18 14:57:53 +02:00
wolfreak99 adeaaa8560 Remove extra CHEATS_MONEY_INCREMENT, prefix MONEY_DEFAULT/etc with CHEATS_ 2017-07-18 14:57:53 +02:00
Gymnasiast d51dad91c5 Make ride_entrance_exit_is_reachable() accept an rct_xy8 2017-07-18 13:12:34 +02:00
Gymnasiast 50b993386a Change station_starts to an rct_xy8 2017-07-18 13:12:34 +02:00
Michael Steenbeek ec55224f38 Change ride->overallview to an rct_xy8 2017-07-18 12:22:39 +02:00
Ted John d5732fdf38 Merge pull request #5906 from IntelOrca/refactor/rct2
Move functions out of rct2.c
2017-07-18 09:55:02 +01:00
Michael Steenbeek c0d06498b3 Increase network version because of reliability fixes 2017-07-18 10:51:30 +02:00
Gymnasiast c96ef96edb Clean up rct_ride and rct1_ride structs and usage 2017-07-18 10:50:28 +02:00
Jan Segre 9a2ba06da3 Fix #5924: don't show " (DEBUG)" if DEBUG is set but is 0.
Signed-off-by: Jan Segre <jan@segre.in>
2017-07-17 23:18:20 -03:00
Richard Jenkins 2cfe2e323c Fix #5849: Missing object window cannot be closed with KB shortcut (#5929) 2017-07-17 22:29:28 +01:00
Gymnasiast 7b8248cca7 Change ride->exit into an rct_xy8, cleanup 2017-07-17 20:41:03 +02:00
Gymnasiast c12113475b Turn ride->entrances into an rct_xy8 2017-07-17 19:27:38 +02:00
Hielke Morsink 489c74518c Fix #5920: set correct next peep spawn index 2017-07-17 15:15:31 +02:00
Ted John 01b0047675 Invert Painter dependency
Make painter call into the drawing engine, rather than the drawing engine create and call the painter.
2017-07-16 23:25:11 +01:00
Ted John ac6da51dbb Use IPlatformEnvironment for loading g1.dat 2017-07-16 23:25:11 +01:00
Ted John 33fd31d802 Remove path char arrays which are no longer used 2017-07-16 23:25:11 +01:00
Ted John c33a9f06d9 Remove subsitute_path and refactor gScenarioFilename 2017-07-16 23:25:11 +01:00
Ted John cb884dad11 Refactor rct2_draw to a new Painter class
Right now this is created for each drawing engine, but should eventually be a dependency into them.
2017-07-16 23:25:11 +01:00
Ted John 5614e55f84 Remove more redundant platform functions 2017-07-16 23:25:11 +01:00
Ted John 1394512df6 Remove startup checks 2017-07-16 23:25:11 +01:00
Ted John edcbfdf097 Move rct2_open_file to Context 2017-07-16 23:25:11 +01:00
Ted John f7dff37708 Move copying of user files to Context.cpp 2017-07-16 23:25:11 +01:00
Ted John 73ef6d54a7 Move rct2_init and rct2_dispose into Context 2017-07-16 23:25:11 +01:00
Ted John 7fbcf1ab0b Move rct2_update into Context 2017-07-16 23:25:11 +01:00
Gymnasiast 587d354717 Fix #5895: Publisher credits window scrolls too far 2017-07-15 14:26:21 +02:00
Ted John 1e71618921 Merge pull request #5775 from wolfreak99/land_tool_holdable
Make the land tool holdable
2017-07-15 12:55:44 +01:00
zaxcav 5f150e3893 Increase sync station limit
Increased SYNCHRONISED_VEHICLE_COUNT to 16 to permit duelling coasters with more coasters. Otherwise no changes to the game logic. Feature requested in the forums: https://openrct2.org/forums/topic/2544-synchronized-stations-dont-work-passed-8-stations/

This will impact network games which already have duelling coasters built with more than 8 adjacent stations, so a new network version is necessary.
2017-07-15 13:18:24 +02:00
wolfreak99 68756498f8 Fixed rebase 2017-07-15 12:02:51 +02:00
wolfreak99 7d09486744 Make land tool size holdable 2017-07-15 12:02:51 +02:00
wolfreak99 15cc2a0230 Rename some small scenery flags, tidy up sub_6E1F34 2017-07-15 11:55:20 +02:00
Gymnasiast 34073e10ae Fix Junior RC data files to disable steep inclines, fixes #5902 2017-07-15 10:52:35 +02:00
Sjors Gielen 553e16144b Fix null pointer dereference when cancelling an RCT1 location dialog on Mac OS X.
To reproduce, run openrct2 on OSX, go to the options dialog, then to the bottom
of the misc tab, select an RCT1 location. Then, cancel that dialog. This would
trigger a null pointer dereference by returning std::string(nullptr).
2017-07-14 13:33:54 +02:00
Ted John a808da910c Merge pull request #5885 from willox/gltransparency
Fix regression in OpenGL DrawImageCommand flags
2017-07-13 19:17:59 +01:00
William Wallace ae110a9159 Allow switching between OpenGL and other renderers without restarting 2017-07-13 19:04:37 +01:00
William Wallace ab39262ccf Remove incorrect/unnecessary OpenGL API calls 2017-07-13 19:04:37 +01:00
Tomas Dittmann c1b8230eef Wrap the FileStream creation in try-catch. (#5840) 2017-07-13 18:56:33 +01:00
Ted John fb10a1460d Fix #5858: crash when using custom ride
Add protection against ride objects with no colour presets. Default to black colours.
2017-07-13 18:24:46 +01:00
William Wallace fbb424ba21 Add enums for DrawImageInstance flags 2017-07-13 18:10:14 +01:00
William Wallace 110d01f863 Fix regression in OpenGL DrawImageCommand flags
Flag 1 isn't supposed to be set when flag 3 is set.
2017-07-13 15:42:46 +01:00
ZehM4tt 5f1bc914af Fix copying commands to draw image instances. 2017-07-13 10:17:23 +02:00
Tomas Dittmann 77a6207100 add invalid entry pointer guards.
update the changelog
2017-07-13 10:16:34 +02:00
wolfreak99 e7bacc6d84 Apply new mousedown event parameters to windows 2017-07-13 10:15:34 +02:00
wolfreak99 2155aa26fa Begin reorder of "mouse_down" window event parameters 2017-07-13 10:15:34 +02:00
Michał Janiszewski 3d487541d7 Reset network version for 0.1.1 2017-07-12 23:24:33 +02:00
Michał Janiszewski 859861eddb Start 0.1.1 2017-07-12 23:06:29 +02:00
Michał Janiszewski 6d1f732ed6
Release v0.1.0
- Feature: [#1399 (partial), #5177] Add window that displays any missing/corrupt objects when loading a park
- Feature: [#5056] Add cheat to own all land.
- Feature: [#5133] Add option to display guest expenditure (as seen in RCTC).
- Feature: [#5196] Add cheat to disable ride ageing.
- Feature: [#5504] Group vehicles into ride groups
- Feature: [#5576] Add a persistent 'display real names of guests' setting.
- Feature: [#5611] Add support for Android
- Feature: [#5706] Add support for OpenBSD
- Feature: OpenRCT2 now starts up on the display it was last shown on.
- Feature: Park entrance fee can now be set to amounts up to £200.
- Improved: Construction rights can now be placed on park entrances.
- Improved: Mouse can now be dragged to select scenery when saving track designs
- Fix: [#259] Money making glitch involving swamps (original bug)
- Fix: [#441] Construction rights over entrance path erased (original bug)
- Fix: [#578] Ride ghosts show up in ride list during construction (original bug)
- Fix: [#597] 'Finish 5 roller coasters' goal not properly checked (original bug)
- Fix: [#667] Incorrect banner limit calculation (original bug)
- Fix: [#739] Crocodile Ride (Log Flume) never allows more than five boats (original bug)
- Fix: [#837] Can't move windows on title screen to where the toolbar would be (original bug)
- Fix: [#1705] Time Twister's Medieval entrance has incorrect scrolling (original bug)
- Fix: [#3178, #5456] Paths with non-ASCII characters not handled properly on macOS.
- Fix: [#3346] Crash when extra long train breaks down at the back
- Fix: [#3479] Building in pause mode creates too many floating numbers, crashing the game
- Fix: [#3565] Multiplayer server crash
- Fix: [#3681] Steel Twister rollercoaster always shows all track designs
- Fix: [#3846, #5749] Crash when testing coaster with a diagonal lift in block brake mode
- Fix: [#4054] Sorting rides by track type: Misleading research messages
- Fix: [#4055] Sort rides by track type: Sorting rule is not really clear (inconsistent?)
- Fix: [#4512] Invisible map edge tiles corrupted
- Fix: [#5009] Ride rating calculations can overflow
- Fix: [#5253] RCT1 park value conversion factor too high
- Fix: [#5400] New Ride window does not focus properly on newly invented ride.
- Fix: [#5489] Sprite index crash for car view on car ride.
- Fix: [#5730] Unable to uncheck 'No money' in the Scenario Editor.
- Fix: [#5750] Game freezes when ride queue linked list is corrupted.
- Fix: [#5819] Vertical multi-dimension coaster tunnels drawn incorrectly
- Fix: Non-invented vehicles can be used via track designs in select-by-track-type mode.
- Fix: Track components added by OpenRCT2 are now usable in older scenarios.
- Technical: [#5047] Add ride ratings tests
- Technical: [#5458] Begin offering headless build with reduced compile- and run-time dependencies
- Technical: [#5755] Title sequence wait periods use milliseconds
- Technical: Fix many desync sources
2017-07-12 22:12:47 +02:00
Tomas Dittmann 90bb6320e5 Guard against invalid sprite access crashes (#5867)
ride->num_vehicles not matching ride->vehicles[] in
ride_prepare_breakdown() and window_ride_maintenance_dropdown().
2017-07-12 21:23:50 +02:00
ζeh Matt d7f1f13d0c Fix #5866: Don't tween sprites that did not move. (#5875) 2017-07-12 13:23:10 +01:00
Michael Steenbeek da17ac9781 Bump network version 2017-07-12 12:10:21 +02:00
ZehM4tt f000e885d3 Fix desync with "Disable clearance check" while placing rides with footpaths.
Refactored single constant to named flags.
2017-07-12 11:32:27 +02:00
ZehM4tt 250a66c45f Fix game advancing too fast when game was paused/frozen.
Regression from #5848
Added braces.
2017-07-11 21:45:37 +02:00
X123M3-256 a2545d7050 Fix potentially uninitialized variable 2017-07-11 19:57:30 +02:00
X123M3-256 b73c954362 Prevent booster pieces from toggling spinning 2017-07-11 15:55:06 +02:00
Michał Janiszewski ae282f782e Fix #5803: Null map element in onridephoto (#5852) 2017-07-11 12:34:11 +01:00
ζeh Matt ec236f0bf5 Fix platform_get_ticks resolution to match other platforms. (#5843) 2017-07-10 21:46:11 +02:00
ζeh Matt a8af3c7670 Refactor game loop to use a semi-fixed timestep. (#5848)
Fix headless game being jumpy/stuttering.
Bump up network version.
2017-07-10 21:43:20 +02:00
Duncan 454a5d9411 Fix diagonal steep slope support drawing. (#5844)
Mistake during original implementation. Fixes #5148
2017-07-10 08:16:33 +02:00
Richard Jenkins fff3e55e6b Merge pull request #5854 from Chaosmeister/backwardsmotionnullguard
Guard against null in vehicle_update_track_motion_backwards_get_new_track()
2017-07-09 22:17:29 +01:00
Tomas Dittmann e31c4d83db Guard against null in vehicle_update_track_motion_backwards_get_new_track() 2017-07-09 22:52:03 +02:00
Michał Janiszewski ce24a6fb85 Prevent overflowing tunnel count (#5853) 2017-07-09 22:48:21 +02:00
Michał Janiszewski 23882ae7a6 Merge pull request #5814 from rwjuk/spriteguardnull
Guard against NULL in fix_invalid_vehicle_sprite_sizes()
2017-07-09 21:19:49 +02:00
Michał Janiszewski f89e56bbc4 Update exit condition to prevent endless loop 2017-07-09 21:13:37 +02:00
Tomas Dittmann cf1f907138 continue instead of return 2017-07-09 20:42:42 +02:00
Tomas Dittmann a163c2b1b3 prevent crash with hacked spiral slides 2017-07-09 20:42:42 +02:00
duncanspumpkin 540763ad0c Fix tunnel portal drawing for multidim inverted track.
Mistake made from generated code. Missed in #5087. Fixes #5819.
2017-07-09 12:10:04 +02:00
Duncan 7b47438f49 Fix windows x86 debug builds (#5845) 2017-07-09 09:51:02 +01:00
Tomas Dittmann bec1538f48 Improve the error console output. (#5839) 2017-07-09 00:09:46 +01:00
wolfreak99 ac81072597 Fix hold down speed 2017-07-08 10:36:28 +02:00
spacek531 c73e17f02b move the zoom case up to handle it as it was 2017-07-07 17:35:33 +01:00
spacek531 7ecf049e87 add janisozar suggestion
[ci skip]
2017-07-07 17:35:33 +01:00
spacek531 668366bf6b Revert "upgrade save format from uint16 to uint32"
This reverts commit 85757d9fefbacf8b7d07cec9cd9714e2f70f2faa.
2017-07-07 17:35:33 +01:00
spacek531 78ab94b12a upgrade save format from uint16 to uint32 2017-07-07 17:35:33 +01:00
spacek531 bec8b73506 fix saving of milliseconds, loading still beyond knowledge
[ci skip]
2017-07-07 17:35:32 +01:00
spacek531 97bf67e605 add missing curly bracket 2017-07-07 17:35:32 +01:00
spacek531 16167d84f0 clarified comments, changed TITLE_COMMAND_ORDER command to uint16 2017-07-07 17:35:32 +01:00
spacek531 78e25e381c modify saving, add comments
[ci skip]
2017-07-07 17:35:32 +01:00
spacek531 a3acfb4312 Increase digits from 4 to 5
I'm not used to string lengths that are one shorter
2017-07-07 17:35:32 +01:00
spacek531 c1ac654916 fix order of rotate, zoom in clamping 2017-07-07 17:35:32 +01:00
spacek531 c302bec47a fix rotate being able to be set to 0 2017-07-07 17:35:32 +01:00
spacek531 fc71361a9e increase digits for wait, decrease digits for rotate, zoom 2017-07-07 17:35:32 +01:00
spacek531 bd4e8cbd08 change Min to Max 2017-07-07 17:35:32 +01:00
spacek531 ef38a66cc2 begin update editor for ms values
[ci skip]
2017-07-07 17:35:31 +01:00
spacek531 d5610ece54 Remove duplicate line 2017-07-07 17:35:31 +01:00
spacek531 c815a427c0 Change Seconds (internal) to Milliseconds, en-GB too 2017-07-07 17:35:31 +01:00
spacek531 f5bc1b598c removed extra newline, changed tabs to spaces 2017-07-07 17:35:31 +01:00
spacek531 bb8160fa3b Remove extra newline in math.hpp 2017-07-07 17:35:31 +01:00
spacek531 b460401ab6 Removed redundant Ceil 2017-07-07 17:35:31 +01:00
spacek531 ec0f35fe7b added comment 2017-07-07 17:35:31 +01:00
spacek531 cbe154f63b I hope this isn't a joke of a commit
I have no idea.
2017-07-07 17:35:31 +01:00
Richard Jenkins e5b39846b0 Merge pull request #5812 from janisozaur/fix-5795-v2
Fix #5795: Implement sprite cycle checking v2
2017-07-07 17:24:42 +01:00
wolfreak99 6633588179 Add missing cheat_reset toggle 2017-07-07 09:20:27 +02:00
wolfreak99 e5eefca5c0 Add missing cheat log strings 2017-07-07 09:20:27 +02:00
Michał Janiszewski 8d02ce37b5 Fix compilation on MSVC 2017-07-07 07:56:45 +02:00
rwjuk d364b2824f Remove needless null check 2017-07-06 23:35:00 +01:00
Michał Janiszewski a3414502a6 Update network version 2017-07-07 00:17:36 +02:00
Michał Janiszewski 12500dd802 Fixup the disjoint null sprites 2017-07-07 00:14:45 +02:00
Michał Janiszewski f6cb731476 Merge pull request #5802 from rwjuk/fix5800
Fix #5800: Crash when opening server from command line
2017-07-06 23:39:26 +02:00
rwjuk f28db5731f Guard against NULL in fix_invalid_vehicle_sprite_sizes() 2017-07-06 22:29:51 +01:00
Michał Janiszewski 22d0cb99f9 Load title sequence when invalid path was given 2017-07-06 23:25:38 +02:00
Michał Janiszewski ab95988c66 Improve error reporting for detected cycles 2017-07-06 22:28:10 +02:00
Michał Janiszewski 029aea0fc2 Remove reset_empty_sprites
Leave in sprite_clear_all_unused as the safer version
2017-07-06 22:20:07 +02:00
Michał Janiszewski bed085d329 Remove unneeded sprite reset
This is done in all exports now
2017-07-06 22:18:05 +02:00
Michał Janiszewski 07faba7aa5 Re-add sprites that got disconnected in a looped list 2017-07-06 22:17:02 +02:00
rwjuk 00848ca629 Correct sprite cycle fixing algorithm 2017-07-06 19:57:59 +02:00
rwjuk 67cbe2a2a1 Fix compilation issues and restore line that went astray 2017-07-06 19:57:55 +02:00
rwjuk 72a1ad89a3 Remove superfluous parameter 2017-07-06 19:57:52 +02:00
rwjuk 28789c3767 Restore resetting of sprite index 2017-07-06 19:57:46 +02:00
rwjuk 372781cc74 Code quality improvements 2017-07-06 19:57:41 +02:00
rwjuk 247d72b1aa Implement sprite cycle checking 2017-07-06 19:57:37 +02:00
rwjuk 5c0a85df5e Bump network version 2017-07-06 13:22:48 +01:00
rwjuk cc95aa0433 Fix visual corruption caused by zero sprite dimensions
Sprite corruption issue highlight

Fix already bugged saves

Fix visual corruption caused by zero sprite dimensions
2017-07-06 13:22:24 +01:00
Michał Janiszewski aac81163d0 Update network version to avoid confusion 2017-07-06 11:14:42 +02:00
Michał Janiszewski ec7bcfce34 Revert "Fix #5795: Implement sprite cycle checking" 2017-07-06 11:13:12 +02:00
rwjuk ab6d4ee240 Fix black screen on loading file with invalid extension 2017-07-05 23:54:43 +01:00
rwjuk 8224e715d8 Network version bump 2017-07-05 23:34:47 +01:00
rwjuk a586c961fb Correct sprite cycle fixing algorithm 2017-07-05 23:34:47 +01:00
rwjuk 9d338101b9 Fix compilation issues and restore line that went astray 2017-07-05 23:34:47 +01:00
rwjuk 30648df16a Remove superfluous parameter 2017-07-05 23:34:47 +01:00
rwjuk 5cc188076c Restore resetting of sprite index 2017-07-05 23:34:47 +01:00
rwjuk 89bfe1d1bd Code quality improvements 2017-07-05 23:34:47 +01:00
rwjuk 22f88f80b0 Implement sprite cycle checking 2017-07-05 23:34:47 +01:00
Tomas Dittmann 446796db4b Prevent integer overflow in interest calculation (#5724)
Fixes #5635
2017-07-06 00:30:10 +02:00
rwjuk e7512c58ac Fix whitespace 2017-07-05 22:47:53 +01:00
rwjuk 7c2e1b626d Fix #5800: Crash when opening server from command line 2017-07-05 22:08:02 +01:00
Tomas Dittmann 14d14de911 Fix #5205: Prevent the paint loop becoming an infinite loop (#5771) 2017-07-05 18:00:30 +01:00
Gymnasiast ee58ac4882 Fix #4512: invisible map edge tiles corrupted 2017-07-05 18:37:39 +02:00
Michael Steenbeek ae3bc6183f Bump network version 2017-07-05 09:32:50 +02:00
rwjuk 2fb1e40f1a Guard against nullptr in AudioMixer.cpp 2017-07-05 09:32:50 +02:00
rwjuk 68c819c01f Log to console when invalid objects found during check 2017-07-05 07:28:46 +02:00
rwjuk fe140c5c20 Fix #5789: No missing obj notification when loading from cmd line 2017-07-05 07:28:46 +02:00
Richard Jenkins 4e4022d693 Fix #5790: Ride list window does not force refresh on view change (#5791) 2017-07-04 23:03:43 +01:00
Ted John 705ad7c85d Fix #5787: Opening an incomplete ride moves the viewport to unrelated place
Remove ghost elements for track before validating it.
2017-07-04 22:25:23 +01:00
Ted John a558423794 Invalidate missing object list on item click 2017-07-04 21:52:11 +01:00
Gymnasiast b0fece095c Raise maximum entrance fee to £200
It could even be higher, depending on the initial guest cash, but this should do for now
2017-07-04 15:23:12 +02:00
Yaroslav Tretyakov 56987960b3 Add better fix for #3846 #5749 (#5781) 2017-07-04 12:15:15 +01:00
Yaroslav Tretyakov c7de74f132 Fix #3846, #5749: ride_create_vehicles_find_first_block could not handle diagonal blocks (#5778)
* Fix #3846: Testing or opening (certain) rollercoaster causes game to hang
* Fix #5749: Game Crash when I test the roller coaster
2017-07-04 07:43:25 +01:00
Richard Jenkins 048c543fe2 Fix needless double invocation of Memory::Set
Memory::Set() invocations moved to InitialiseEntryMaps() function.
2017-07-03 23:59:19 +01:00
Ted John 0422699539 Fix #5381: Game crashes in editor when scenery or pathing is clicked
Add more defensive checks for when there are no objects loaded.
- Do not open footpath window if there are no footpath objects loaded.
- Prevent crash in scenery window if no scenery groups loaded.
2017-07-03 21:46:07 +01:00
Richard Jenkins aec214c684 Fix #5767: Importing AA/LL SC4s causes a crash 2017-07-03 17:32:05 +01:00
rwjuk dd2ab63b26 Fix #5765: Peep purchase animation shows for $0.00 2017-07-03 15:50:50 +02:00
Ted John 32e8737796 Merge pull request #5758 from rwjuk/fix5756
Fix #5756: Only refresh ride list window every 64 ticks for performance
2017-07-03 07:57:04 +01:00
Ted John 146982d4b0 Fix #5750: OpenRCT2 locking up consistently, no reports (#5757)
Prevent freezing on corrupted ride queues by ignoring sprites that are not guests when a guest re-joins the front of the queue.
2017-07-03 07:56:34 +01:00
rwjuk a941400403 Refactor window_ride_list_refresh_list() to single loop 2017-07-02 21:32:20 +01:00
rwjuk 398004901b Only refresh ride list window every 64 ticks for perf. 2017-07-02 20:49:39 +01:00
Ted John cb28381990 Merge pull request #5746 from IntelOrca/fix/5507
Fix #5507: RCT1 path check is case-sensitive on Linux
2017-07-02 12:18:40 +01:00
Ted John 09bb7bfd6c Allocate strings with new instead of malloc 2017-07-02 11:37:01 +01:00
Ted John fd2eda921f Merge pull request #5705 from Broxzier/hardcoded-values
Replace -1 with SPR_NONE for viewport sprite, sort some includes
2017-07-02 00:08:33 +01:00
Ted John 46d8287bd9 Merge pull request #5624 from rwjuk/objectwindow
Implement window displaying object load failures
2017-07-02 00:07:17 +01:00
Ted John 14443b30f1 Fix #5751: Title sequence seconds are about 0.8 seconds 2017-07-02 00:04:32 +01:00
Ted John 3ca84dcc17 Refactor vehicle logic related to #5749 2017-07-01 12:24:38 +01:00
Broxzier 29fb31c69c Remove 'static const' that slipped in 2017-07-01 11:45:43 +02:00
Luke Lau 027be6010d Fix #5583: Right click to drag camera after menu (#5748)
Reset the input state to normal after receiving a right click outside of a dropdown.
2017-07-01 01:35:51 +01:00
Ted John 5db0a05f11 Fix #5658: Assertion failed errors in peep.c (#5747)
Protect edge cases that occur in various hacked parks:
* Current station <-> ride exits
* Current seat <-> peep load positions
2017-07-01 01:31:19 +01:00
Ted John ddb96ec267 Refactor load park result
Use a C++ struct and pass that to C.
2017-07-01 01:29:35 +01:00
Ted John d75295b027 Move handle_park_load_failure into game.c 2017-07-01 01:29:34 +01:00
Ted John c3356d457e Fix S4s never loading if no object errors 2017-07-01 01:29:34 +01:00
rwjuk ab38c07fb9 Make object window work with S4s and scenarios 2017-07-01 01:29:34 +01:00
rwjuk 214bf3988b Implement 'missing objects' window
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
2017-07-01 01:28:51 +01:00
Ted John 52555df089 Merge pull request #5738 from Gymnasiast/fix/5253
Fix #5253: RCT1 park value conversion factor too high
2017-06-30 23:13:19 +01:00
Michael Steenbeek bcbccba3e6 Create track sequence direction flags (#5744) 2017-06-30 23:11:47 +01:00
Michael Steenbeek 44af1653a6 Replace 'center' with 'centre' (#5745) 2017-06-30 23:11:28 +01:00
Ted John f515314a2d Only warn if object export can not fix checksum 2017-06-30 22:25:27 +01:00
Ted John e9519d2d8b Fix #5507: RCT1 path check is case-sensitive on Linux
If the csg path does not exist, find the first file in the directory that matches (case insensitive).
2017-06-30 21:11:35 +01:00
Ted John 9b2777bc56 Fix read keyboard config error
Do not try to read more keyboard shortcuts than there actually are.
2017-06-30 19:11:32 +01:00
Gymnasiast 6206fbda80 Do not reuse _parkValueConversionFactor of previous S4 2017-06-30 16:02:57 +02:00
Gymnasiast fea2c66036 Name remaining TRACK_ELEM_FLAGs 2017-06-30 14:37:26 +02:00
Ted John 659ccc03d0 Merge pull request #5740 from OpenRCT2/bugfixes
Fix chat sounds
2017-06-30 00:22:53 +01:00
zsilencer 2385ef1059 Fix incorrect arguments to resampler. 2017-06-29 16:40:00 -06:00
zsilencer ef6ecc8900 Set correct pan for chat sound. 2017-06-29 15:54:21 -06:00
zsilencer bde3197e79 Fix incorrect resampling rate when at the end of a sound. 2017-06-29 15:43:40 -06:00
Michał Janiszewski 1e21b150ae Fix missing newlines in various files 2017-06-29 23:31:03 +02:00
Michał Janiszewski 5a20ab2ffe Add missing newline in input.c
[ci skip]
2017-06-29 23:21:31 +02:00
zaxcav b39723a0a8 Allow mechanics to walk over wide tiles on the edge of the patrol zone 2017-06-29 20:34:37 +02:00
Ted John 50c8fefb35 Fix bug in sprite_move, add sprite null check 2017-06-29 19:25:59 +01:00
Ted John 2fffeb9470 Set the map to blank if no title sequences can load 2017-06-29 19:24:28 +01:00
Reece f581d52355 Disable money effect in pause mode 2017-06-29 20:12:36 +02:00
Gymnasiast 50a7c40fbd Fix #5253: RCT1 park value conversion factor too high 2017-06-29 20:08:59 +02:00
Gymnasiast 9148b98928 Fix #667: Incorrect banner limit calculation 2017-06-29 19:18:08 +02:00
Gymnasiast 4e87ad6ac3 Properly check 'Finish 5 roller coasters' criteria, fixes #597
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
2017-06-29 17:32:12 +02:00
Richard Jenkins 74a14505cd Fix #578: Ride ghosts show up in ride list during construction 2017-06-29 16:39:48 +02:00
Ted John e265fa8948 Fix crash when headless server creates money fx (#5729)
Ensure headless instances of the game, which do not have graphics loaded, do not try to measure the string for new money effect sprites.
2017-06-29 12:30:49 +01:00
Gymnasiast 6483705d2c Make CIs happy about return paths 2017-06-29 12:06:29 +02:00
Gymnasiast 194cc4dcb3 Fix #5730: Unable to uncheck 'No money' in the Scenario Editor 2017-06-29 12:01:30 +02:00
Michael Steenbeek 251ead0531 Fix #441: Construction rights over entrance path discarded; refactor 2017-06-29 11:30:18 +02:00
Ted John 4cc6743446 Merge pull request #5714 from Gymnasiast/refactor-land-rights-window
Refactor land rights window
2017-06-28 12:42:42 +01:00
Zeh Matt a8efd2cc4d Fix #5676: Last action issues
LastActionTime using server tick instead of real time platform ticks. (#5722)
2017-06-27 14:50:21 +01:00
Ted John f08db17d94 Merge pull request #5713 from rwjuk/fix5707
Fix #5707: Usernames aren't detected for multiplayer
2017-06-27 13:27:21 +01:00
Richard Jenkins 1893326b62 Check for file existence before releasing config in config_open() (#5712) 2017-06-27 13:23:16 +01:00
David CARLIER 04ed2d78d2 Fix building on FreeBSD 2017-06-27 08:56:03 +02:00
rwjuk c904fa9fe2 Duplicate string literal for assignment to utf8* var 2017-06-26 20:58:36 +01:00
Gymnasiast 51f5a4ff7b Fix whitespace 2017-06-26 20:59:52 +02:00
Gymnasiast 65a3d4551b Name buy land rights flags 2017-06-26 20:56:32 +02:00
rwjuk 3162b9c221 Use String::IsNullOrEmpty() 2017-06-26 19:10:55 +01:00
Gymnasiast b806ded6a4 Refactor land rights window 2017-06-26 20:01:35 +02:00
rwjuk 3236701d51 Fix #5707: Usernames aren't detected for multiplayer 2017-06-26 18:59:01 +01:00
Gymnasiast 9b25a45e90 Remove call to non-existant window class 77 2017-06-26 16:07:42 +02:00
Ted John 06859c90c2 Merge pull request #5708 from IntelOrca/reduce-headless-memory-footprint
Reduce memory footprint for headless instances
2017-06-26 14:41:55 +01:00
Michael Steenbeek ce16693da0 Merge pull request #5706 from ibara/develop
Add OpenBSD support.
2017-06-26 15:02:40 +02:00
ZehM4tt 0a633647e4 Fix ghost scenery removing objects with "Disable Clearance check" enabled.
Fix footpath_remove ignoring the ghost flag removing the wrong path.
Replaced some constants with the known flags.
2017-06-26 14:58:07 +02:00
wolfreak99 27f5773e4d rename event unknown_14 to viewport_rotate 2017-06-26 10:06:58 +02:00
Ted John 4f1cfb4631 Don't load graphics for headless 2017-06-25 23:19:24 +01:00
Brian Callahan 46ae0578e4 Add a note for OpenBSD and getting path names of running executables. 2017-06-25 23:26:26 +02:00
Brian Callahan e5d305f9e7 Use cstdarg instead of stdarg.h 2017-06-25 23:25:46 +02:00
Brian Callahan fe8f949b3f Add OpenBSD support. 2017-06-25 23:25:46 +02:00
Broxzier 9e204c11a9 Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes
needed to change its type to match .
2017-06-25 22:44:58 +02:00
Broxzier 71a922b3f5 Replace 4 more occurances of -1 with SPR_NONE 2017-06-25 21:37:51 +02:00
wolfreak99 0dbe8f32e5 Allow Construction rights to be placed on park entrance 2017-06-25 21:19:03 +02:00
Broxzier 36fb2c42d9 Replace -1 with SPR_NONE for viewport sprite, sort some includes 2017-06-25 21:13:04 +02:00
Gymnasiast 2f3b5d1c7a Add IDs for null sound IDs 2017-06-25 20:45:38 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
2017-06-25 18:59:56 +01:00
Ted John 9c269ae94b Fix #5489: Sprite index crash for car view on car ride 2017-06-25 17:53:51 +01:00
Ted John acf3b0cf83 Only include FindPkgConfig once 2017-06-25 14:28:25 +01:00
Ted John c4ad6571ea Remove speex dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 95514b9cbc Remove SDL2 dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 89d43c1120 Merge pull request #5702 from IntelOrca/refactor/nosdl/freetype2
Remove SDL2_ttf dependency, replace with some code form SDL2_ttf without SDL2 dependencies and instead only requiring freetype alone.
2017-06-25 11:35:06 +01:00
Michael Steenbeek 8333266ca5 Name several ride construction flags, clean up ride_data.c, fix "mini coaster" boosters 2017-06-25 12:14:39 +02:00
Tomas Dittmann f9be3c0046 Identify _trackDesignPlaceSceneryZ and fix #259
Add the SceneryZ-value to the TrackZ value to compute the correct value for window_track_place_get_base_z(). Fixes issue #259.
2017-06-25 11:17:25 +02:00
Ted John 6368a29d39 Fix NO_TTF builds 2017-06-25 00:18:08 +01:00
Ted John 16d6ddd22b Remove unused code from SDL_ttf 2017-06-24 23:40:46 +01:00
Ted John 8046cbc707 Replace SDL2 calls 2017-06-24 23:31:40 +01:00
Ted John b7fd89361b Use complete SDL_ttf code 2017-06-24 23:13:07 +01:00
ZehM4tt efa0275104 Fix client not resuming when server toggles pause. 2017-06-24 23:30:53 +02:00
wolfreak99 c80e782e67 Add default shortcut 2017-06-24 19:01:00 +02:00
wolfreak99 8364d8d3d8 Implement load game shortcut 2017-06-24 19:01:00 +02:00
camthesaxman c301e83a64 fix water rendering 2017-06-24 18:53:25 +02:00
Gymnasiast c9b5ec4172 Guard against NULL ObjectRepositoryItem, fixes #5614 2017-06-24 17:45:04 +02:00
Ted John 9ee1bbe4b5 Add some TTF code, poor 2017-06-24 14:50:30 +01:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Ted John b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Ted John 3003393c87 Allow re-creation of object manager
Removing lazy initialisation of it.
2017-06-24 09:56:51 +02:00
Gymnasiast 55977997fd Fix #1705: Time Twister's Medieval entrance has incorrect scrolling 2017-06-23 23:17:22 +02:00
Gymnasiast db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast 234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Matte A a1c456f607 Fix clipping in text for some translations (#5692) 2017-06-23 09:54:05 +02:00
Gymnasiast 8561f3774e Raise friction cap on the Junior Roller Coaster to 18 2017-06-23 09:41:45 +02:00
Matte A 92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
RMcTn 92988a6020 Moved peep release balloon code into a function 2017-06-22 22:55:19 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL
free(NULL) is perfectly fine, no need to check
2017-06-22 12:49:33 +02:00
ZehM4tt 81572e9592 Fix game crashing/freezing when kicking players in MP. 2017-06-21 12:02:37 +02:00
Gymnasiast 8ffe50728a Bump network version 2017-06-21 09:56:23 +02:00
Gymnasiast 16900dd618 Avoid booster speed overflows and undefined behaviour, fixes #5679 2017-06-21 09:54:54 +02:00
Gymnasiast 1f180c19b3 Clean up crooked house and top spin vehicle update 2017-06-21 09:54:53 +02:00
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 176fe0d036 Replace OPENSSL_{malloc,free} with the standard C versions 2017-06-20 18:49:43 +02:00
Michał Janiszewski 9bfc9a91e3 Pre-emptively reset sprites on export for higher compression ratios (#5668)
The sprites need to be reset anyway before they get used, so reset them
on every export just so they can be compressed better
2017-06-20 16:34:04 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast 412332a3a5 Use constants for the max amount of stations and colour schemes in the rct_ride struct 2017-06-20 13:39:12 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 0db5bc6bd2 Define max vehicles per ride entry, use SPRITE_INDEX_NULL more 2017-06-20 13:38:23 +02:00
Gymnasiast d6488f34a8 Remove unused NUM_COLOURS
It's the same as COLOUR_COUNT, which _is_ used
2017-06-20 10:44:59 +02:00
Michał Janiszewski 5f1e62721a Merge pull request #5655 from janisozaur/gfxbench
Add support for benchmarking park rendering
2017-06-20 08:10:56 +02:00
Gymnasiast 53be8da368 Fix incorrect constant 2017-06-19 22:44:06 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Hielke Morsink d68bed10cd Readd call to network_process_game_commands (#5662) 2017-06-19 22:16:19 +02:00
ZehM4tt def76edd55 Ignore UI-only flag in sprite checksum
Ignore peep.window_invalidate_flags in sprite checksum to prevent
false positivie desync alerts, flag does not affect game state.
2017-06-19 17:42:51 +02:00
ZehM4tt 10740106f2 Fix causing asserts with DEBUG_DESYNC and loading new maps. (#5650)
Moved input handling out of game_logic_update back to game_update,
should be executed per frame not tick.
Placed gInUpdateCode at the proper locations.
2017-06-19 17:41:28 +02:00
Michał Janiszewski 990a153b82 Add support for benchmarking park rendering 2017-06-19 12:37:50 +02:00
Michael Steenbeek 9c3a16b6e0 Merge pull request #5611 from OpenRCT2/android
Android
2017-06-19 10:25:18 +02:00
Marijn van der Werf fce13043ab ignore .externalNativebuild 2017-06-19 03:27:28 +02:00
Marijn van der Werf ec81f2f9fc Optimize graphics 2017-06-19 03:17:16 +02:00
Marijn van der Werf ddff36c9ee tabs to spaces 2017-06-19 02:54:21 +02:00
Marijn van der Werf fa2ea1b5ba Update dependency URL 2017-06-19 02:54:14 +02:00
Richard Jenkins 306d2623ef Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly (#5633)
* Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly

And revert incorrect 'fix'

* Remove all keyboard defines from platform.h
2017-06-18 21:47:51 +02:00
ZehM4tt 08230f047c Fix desync if "Handyman mow grass by default" is checked. (#5652) 2017-06-18 20:43:15 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
duncanspumpkin e9038e5a92 Remove unneccesary casts.
Casts had previously been used when the types were unknown. They are now known and can be removed
2017-06-18 08:07:29 +01:00
ZehM4tt efdac19f3b Extract game commands execution​ from within network_update. (#5642)
* Moved out command processing from network_update into its own function. This should fix some false positives calling scenario_rand from a command callback.

* Fix Server_Handle_GAMECMD to use the command queue instead of executing directly.

* Exit the queue processing to still check for desync
2017-06-18 08:03:37 +02:00
Gymnasiast 9f5d1cf40a Fix ride naming in S4 import, cleanup 2017-06-17 19:10:53 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations
Add define for number of colour schemes, correct several cases of max stations per ride
2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces
[ci skip]
2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632)
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
2017-06-17 12:55:41 +02:00
rwjuk 7094bbf74a Fix #5635, overflow when calculating loan interest
Introduces 64-bit money type
2017-06-17 12:20:22 +02:00
ZehM4tt 5bb8dfb49c Remove queued game commands that would be impossible to execute.
Added a warning instead of assert for commands that are discarded.
2017-06-17 11:49:26 +02:00
ZehM4tt 4362314f70 Clarified the comment. 2017-06-17 11:49:26 +02:00
ZehM4tt ea59769cfd Fixes clients receiving commands before the map data is sent and loaded. 2017-06-17 11:49:26 +02:00
Marijn van der Werf 0341841cf7 Remove commented function 2017-06-16 22:55:08 +02:00
ZehM4tt 9e1711c345 Fix some scenery, path placement and construction mode desyncs 2017-06-16 09:45:00 +02:00
wolfreak99 69a800f285 remove unused gRCT2AddressSavedGamesPath2 (#5626) 2017-06-16 07:53:09 +01:00
Michał Janiszewski 5077f2d78a Mark Path::Combine template as static 2017-06-15 22:55:33 +02:00
Marijn van der Werf 8766ec37a1 Add Android project 2017-06-15 14:22:15 +02:00
rwjuk 5f5f12a63c Fix #5617: PLATFORM_MODIFIER defined twice for macOS 2017-06-15 07:47:31 +02:00
Marijn van der Werf 297d6ba1d5 Add virtual destructor 2017-06-15 00:16:55 +02:00
Michał Janiszewski 4851a45a83 Detect warnings for all parts of compilation (#5618) 2017-06-15 00:08:41 +02:00
Ted John 1dae7f9f32 Move SDL_LoadBMP call to libopenrct2ui (#5616) 2017-06-14 19:47:22 +01:00
wolfreak99 46b575ee18 Remove unnecessary gFirstTimeSaving call, handle gFirstTimeSaving in game_load_save 2017-06-14 16:28:11 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Gymnasiast f3f15d18f7 Replace more occurrences of scenery IDs 2017-06-14 16:06:43 +02:00
Christian F. Coors c506c4be2d Add defines for scenery IDs 2017-06-14 16:06:43 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
2017-06-14 13:31:27 +02:00
Ted John fda2f38097 Merge pull request #5589 from duncanspumpkin/remove_win32_debug
Remove Win32 debug special builds as they no longer work and we will soon be removing RCT2 interop entirely.
2017-06-14 07:45:15 +01:00
Michał Janiszewski 9d5a86d0ae Fix condition checks for being in logic update code (#5610) 2017-06-14 07:44:23 +01:00
Richard Jenkins 3952971920 Fix peep sounds persisting during pause (#5612) 2017-06-14 07:43:41 +01:00
Ted John 20197d50c3 Fix #5595: No longer able to navigate map diagonally using arrow keys 2017-06-13 17:20:50 +01:00
duncanspumpkin e70a96c04f Remove Win32 debug special builds
Win32 debug previously built a special .dll build to allow calling into RCT2. This has been broken for a while and has little use anymore. It has therefore been removed.
2017-06-13 12:23:26 +01:00
Ted John f76ca6ea8b Fix #5603: Game fails on startup (#5604)
The game tries to use a ui context while setting up a platform environment. Let the platform environment be created before looking for the RCT2 directory. This is a bit hacky at the moment, but a necessary fix until it can be cleaned up.
2017-06-13 00:38:56 +01:00
Ted John 29f0372da8 Reduce SDL2 in headers 2017-06-12 19:56:32 +01:00
Ted John 7e9f7df7d1 Use standard platform defines 2017-06-12 18:01:51 +01:00
Ted John 25b6c613b9 Merge pull request #5597 from IntelOrca/refactor/nosdl/remaining-platform
Remove remaining SDL from platform code
2017-06-12 17:52:11 +01:00
Ted John 407e99bbc2 Fix mingw builds 2017-06-12 17:13:18 +01:00
Richard Jenkins 4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02:00
Richard Jenkins 5db340743f Merge pull request #5599 from Gymnasiast/fix/5596
Fix #5596: Incorrect colours in the Map window
2017-06-12 11:26:11 +01:00
ZehM4tt 60bf5083fc Fixed few multiplayer desync issues. (#5578)
This addresses some of the desync causes:

* `vehicle_create_car` was using `scenario_rand` when it shouldn't have
* ghost elements affected grass growth
* ghost elements affecting peep logic[1]

It also adds some desync debug facilities, enabled at compile time.

It also reverts part of change introduced in
https://github.com/OpenRCT2/OpenRCT2/pull/5185,
namely reorder of desync check vs call to `ProcessGameCommandQueue();`

[1] It is not ideal to have this check in multiple locations, it is prone
to human error. We already have `map_remove_provisional_elements`,
but it is possible it does not work as well as it should. This needs
further investigation.
2017-06-12 12:11:01 +02:00
Gymnasiast a586a6e15d Fix #5596: Incorrect colours in the Map window 2017-06-12 11:59:53 +02:00
Michał Janiszewski 0757582c93 Add missing include 2017-06-12 11:53:26 +02:00
Michał Janiszewski 4547dfab95 Prevent a crash in headless mode when showing error 2017-06-12 11:52:04 +02:00
Ted John 902bba6906 Fix compiler errors, add ctype.h in required source files 2017-06-11 23:43:28 +01:00
Ted John 36cfc1bb29 Remove remaining SDL from platform code 2017-06-11 23:26:14 +01:00
Ted John ee7c97b7be Move scancode to key to openrct2ui 2017-06-11 23:22:32 +01:00
Ted John 31c2b9c6b7 Move remaining SDL in input.c to openrct2ui 2017-06-11 21:18:56 +01:00
Ted John 3988b7797e Fix display of chat shortcut on network games (#5593) 2017-06-11 18:19:15 +01:00
Ted John 7a86fc2cb5 Link back shortcut functions
Some of this will be temporary until input and windows move over to libopenrct2ui.
2017-06-11 17:23:52 +01:00
Ted John 524248cfec Fix libopenrct2ui.vcxproj 2017-06-11 17:23:52 +01:00
Ted John 89ea9064de Move things in keyboard_shortcut.h into KeyboardShortcuts.h 2017-06-11 17:23:51 +01:00
Ted John cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John f62a6713ff Fix libopenrct2.vcxproj 2017-06-11 17:23:51 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John c8e4e6dae1 Remove usages of MAX_PATH 2017-06-11 15:42:06 +01:00
Ted John 0d8f9d6618 Refactor IPlatformEnvironment (#5590) 2017-06-11 12:53:37 +01:00
Ted John b563d26ffe Fix #5588: crash in object selection
Add more safety guards for -1 image IDs which can happen if images were unsuccessfully allocated during object load.
2017-06-11 11:14:58 +01:00
Ted John 5bb48f3539 Move SDL part of lightfx blend to drawing engine 2017-06-10 22:18:54 +01:00
Ted John 90aad2e2ec Use rct_palette instead of SDL 2017-06-10 22:18:54 +01:00
Ted John fc899d15ef Remove SDL_Window from IDrawingEngine and UiContext 2017-06-10 22:18:54 +01:00
Ted John b32f0b276d Merge pull request #5574 from IntelOrca/fix/screenshot
Fix screenshot command and refactor drawing engine
2017-06-10 20:06:26 +01:00
Ted John 202cc269a7 Remove more SDL stuff from old platform code 2017-06-10 17:14:07 +01:00
Ted John a52190ae44 Create C version of FULLSCREEN_MODE enum 2017-06-10 17:14:07 +01:00
Ted John 47e6f1d139 Rename our version of SDL_MIX_MAXVOLUME to MIXER_VOLUME_MAX
Keep an assert to make sure its the same as SDL in the mixer. If SDL changes it, we can either change ours or convert the number proportionally.
2017-06-10 17:14:07 +01:00
Ted John abb857e51d Remove platform_get_non_window_flags 2017-06-10 16:40:08 +01:00
Ted John 9bb055acc0 Remove unnecessary SDL.h include 2017-06-10 16:40:08 +01:00
Ted John 9cd8fd1498 Remove need of SDL in chat.c 2017-06-10 16:19:46 +01:00
Ted John a9e5a58d28 Remove need of SDL in console.c 2017-06-10 16:13:07 +01:00
Ted John a5e4a0965f Ignore final warnings for X8DrawingEngine 2017-06-10 15:48:05 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Ted John 0ad2c075e5 Separate hardware display drawing engine from software 2017-06-10 15:48:05 +01:00
Ted John df16e6a4f7 Inherit X8 engine from software engine 2017-06-10 15:48:04 +01:00
Ted John 39b3ff0251 Create new 8bpp drawing engine in openrct2 2017-06-10 15:48:04 +01:00
Ted John 7bea5d71bc Merge pull request #5243 from grimpunch/add_timestamp_chat_messages
Timestamp messages for client in chat view
2017-06-10 01:27:14 +01:00
Ted John ca68e2bb89 Use all leading format codes for timestamp 2017-06-10 01:05:47 +01:00
Michał Janiszewski 14bbe2c2c2 Verify scenario is not null before accessing it 2017-06-09 22:18:15 +02:00
Ted John f2a5d10c31 Move timestamp to chat.c and fix issues
- Timestamp now coloured correctly.
- Timestamp now added on client side (client local time).
- Timestamp is no longer duplicated in log file.
2017-06-09 19:16:29 +01:00
Christian Murphy eab0dc7cdb Add timestamps to chat messages
Squashed commit from:
- a908a4c Added config parameter "timestamp_chat" to network config section to allow chat messages to be timestamped
- 820fcd7 make timestamps on by default
- e6ecad2 timestamp chat messages, removed config option
- 3b4439d Replace strftime temp buffer with directly using strftime into lineCh
- add20d3 Move time
2017-06-09 19:16:29 +01:00
wolfreak99 12c84d8190 Rename gUnk9E2E28 to gMapLandRightsUpdateSuccess 2017-06-08 22:28:39 +02:00
Richard Jenkins 60a633e79b Fix #5571: Crash when deleting text at end of line (#5572) 2017-06-08 19:17:43 +01:00
Ted John c1ccf2b7a6 Refactor load_palette to call gfx_invalidate_screen
Nearly all calls to load_palette were succeeded with a call to gfx_invalidate_screen. So remove these and stick just one call inside load_palette.
2017-06-07 23:24:18 +01:00
Ted John 945d960cb7 Hide guest money effects on title screen 2017-06-07 23:20:35 +01:00
Michał Janiszewski ff9417f4a6 Validate access to peep_loading_positions (#4475) 2017-06-07 21:56:29 +01:00
Ted John dccc9f88c2 Merge pull request #5564 from IntelOrca/fix/download-park-temp-file
Fix #4959: Compiler warning: tmpnam
2017-06-07 21:55:05 +01:00
Ted John f8c32179b7 Increment network version 2017-06-07 21:52:51 +01:00
Jeremy Herbert ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
Ted John d31870249a macOS: Unignore deprecation warning 2017-06-07 21:23:22 +01:00
Ted John 41989da732 Fix #4959: Compiler warning: tmpnam
Load download parks directly from memory without writing to a temporary file.
2017-06-07 21:22:01 +01:00
Ted John f04439e0ac Use stdout for verbose and info logging (#5563)
Only errors and warnings should be piped to stderr.
2017-06-07 07:39:18 +01:00
Ted John 2501df61a3 Fix crash when building rides
Game was attempting to log server action in non-network games.
2017-06-07 00:06:28 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
2017-06-06 23:46:14 +02:00
Michał Janiszewski 43114b105c Extend logging with signs and track modifications 2017-06-06 23:17:46 +02:00
Ted John 8bb15a70de Refactor chat / server stream logging 2017-06-06 23:08:01 +02:00
delebota f69e7ac89e Setup server action logging for server admins in multiplayer
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
2017-06-06 23:07:54 +02:00
wolfreak99 07d1ba4f8c Create "Own all land" cheat functionality (#5056)
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
2017-06-06 21:50:42 +01:00
Michał Janiszewski 37a3179639 Fix #5558: can't hire staff
Caused by invalid flag check
2017-06-06 21:17:57 +02:00
Ted John 1e9f9790ae Fix #5496: Attempting to log into servers results in crash
Caused by the user not having the required 'official' objects. This was because the network was being closed during a network update. Disposed memory would then be accessed later in the update loop.

To fix this, a lock has been added to Close() so that it can be deferred to the end of Update(). This isn't particularly nice, but the whole of network will need redesigning to fix this properly for all potentical scenarios where Close() can be called.
2017-06-06 20:05:47 +01:00
Ted John 430ab2db5c Fix double negative showing on money effects 2017-06-06 18:58:14 +01:00
Ted John 2f053800ba Add verbose logging of base paths 2017-06-06 17:02:45 +01:00
Michael Steenbeek f3b4c88783 Merge pull request #5532 from OpenRCT2/sub_hex_fix
Name sub_<hex>() functions
2017-06-06 16:14:54 +02:00
rwjuk aa81ee4601 Add another RCT2 address comment
[ci skip]
2017-06-06 13:55:23 +01:00
rwjuk f0dec49e6d Add RCT2 address comments
[ci skip]
2017-06-06 13:48:06 +01:00
Michał Janiszewski c49f27dcab Peep pathfinding asserts (#3340) 2017-06-06 08:25:52 +01:00
Michał Janiszewski 3c7499f370 Validate access to _terrainEdgeSpriteIds (#4752) 2017-06-06 08:25:04 +01:00
Ted John c95dbf4b2f Merge pull request #5295 from janisozaur/fix-staff-hiring
Fix staff hiring check
2017-06-06 08:24:41 +01:00
rwjuk 325bb3e2da Name sub_88ABA4() 2017-06-06 01:16:44 +01:00
rwjuk ea96ab0225 Name sub_6CA162() 2017-06-06 01:02:34 +01:00
rwjuk aa17f296cb Name sub_693BE5() and second param 2017-06-06 00:51:34 +01:00
rwjuk be0d09d6ac Name sub_6E7FF3() 2017-06-06 00:51:34 +01:00
rwjuk dbd03257d9 Name sub_688956() 2017-06-06 00:51:34 +01:00
rwjuk ee637b8a33 Name sub_6B2FA9() 2017-06-06 00:51:34 +01:00
rwjuk d1928bdb22 Name sub_6D2189() 2017-06-06 00:51:34 +01:00
rwjuk 1db56c43ef Name sub_6DEDE8() 2017-06-06 00:51:34 +01:00
rwjuk c2688736bc Fix comment
[ci skip]
2017-06-06 00:51:34 +01:00
rwjuk a03699839c Name sub_666EEF() 2017-06-06 00:51:34 +01:00
rwjuk 0797a41f80 Name sub_685EBC() 2017-06-06 00:51:34 +01:00
rwjuk b346be8488 Name sub_68F8CD() 2017-06-06 00:47:08 +01:00
rwjuk 364ce73272 Name sub_69ED9E() 2017-06-06 00:47:08 +01:00
rwjuk c3401b75d5 Name sub_6B7588() 2017-06-06 00:47:08 +01:00
rwjuk 74642c8840 Name sub_6DB807(), better name for sub_6DB7D6() 2017-06-06 00:47:08 +01:00
rwjuk ae684c944e Name sub_6DB7D6() 2017-06-06 00:47:08 +01:00
rwjuk df4b150f92 Name sub_689174() 2017-06-06 00:47:08 +01:00
Richard Jenkins a38d0711a6 Remove declaration of function never defined (sub_6EDE88) 2017-06-06 00:47:08 +01:00
Richard Jenkins 07d5931193 Name sub_6A7642() 2017-06-06 00:47:08 +01:00
Richard Jenkins 457a2f624c Name sub_69AF1E() 2017-06-06 00:47:08 +01:00
Richard Jenkins b62bb1db6d Name sub_6ED990() 2017-06-06 00:47:08 +01:00
Richard Jenkins b492aa544f Name sub_684AC3() 2017-06-06 00:47:08 +01:00
Richard Jenkins 5abb5c9e9f More accurate name for sub_693BAB() 2017-06-06 00:47:08 +01:00
Richard Jenkins 03286af22b Name sub_693BAB() 2017-06-06 00:47:08 +01:00
Richard Jenkins d2fa8bab14 Name sub_6C96C0() 2017-06-06 00:47:08 +01:00
Richard Jenkins d8fe9eef9d Name sub_6A759F() 2017-06-06 00:47:08 +01:00
Richard Jenkins 1d2ced2ad7 Name sub_6CC3FB() 2017-06-06 00:47:07 +01:00
Richard Jenkins 5c28e66aa2 Name sub_6D01B3() 2017-06-06 00:47:07 +01:00
Richard Jenkins 322a2432bb Name sub_693C9E() 2017-06-06 00:47:07 +01:00
Richard Jenkins 954124738c Name sub_693B58(), and minor formatting tweak to it 2017-06-06 00:47:07 +01:00
Richard Jenkins 7a3bc1e5fd Rename rct_ride->undercover_portion to sheltered_eighths. 2017-06-06 00:47:07 +01:00
Richard Jenkins d191aaa1ef Name sub_6C9627() 2017-06-06 00:47:07 +01:00
Richard Jenkins 7a4511e11a Name some sub_hex instances that Xcode missed 2017-06-06 00:47:07 +01:00
Richard Jenkins 6efc781186 Fix comment for get_num_of_sheltered_eighths()
[ci skip]
2017-06-06 00:47:07 +01:00
Richard Jenkins 881c0c2537 Name sub_65E72D() 2017-06-06 00:47:07 +01:00
Richard Jenkins 4893521bea Name sub_6C84CE() 2017-06-06 00:47:07 +01:00
Ted John cd330ede53 Merge pull request #5133 from samhorlbeck/develop
Add enhancement to show money effect when peeps make purchases
2017-06-05 22:39:29 +01:00
Ted John 1d5c12d2ae Merge branch 'fix/rating-overflow' into develop 2017-06-05 22:31:44 +01:00
Ted John 528dbe115d Merge branch 'test/ride-ratings' into develop 2017-06-05 22:31:26 +01:00
Gymnasiast c82792e9b3 Update network version 2017-06-05 23:00:17 +02:00
wolfreak99 8006bbb9d5 Select previous element after removing in tile inspector 2017-06-05 22:59:15 +02:00
Ted John 16ac68533f Disable for network games
As it would cause desyncs, and we can not easily mitigate this at the moment.
2017-06-05 21:32:28 +01:00
Ted John 30585ea2a9 Show guest money effects with high precision 2017-06-05 21:18:14 +01:00
Sam Olsen b9e9b8320f Add enhancement to show money effect when peeps make purchases 2017-06-05 21:02:05 +01:00
Ted John 1ea9a61f98 Increase network version 2017-06-05 20:17:39 +01:00