Commit graph

4678 commits

Author SHA1 Message Date
Ted John
f8b08b334e Fix a few more bugs 2019-07-29 19:18:16 +01:00
Ted John
3f8890afde Fix remaining errors and a few bugs 2019-07-29 19:18:16 +01:00
Ted John
3f45976009 Fix openrct2ui errors 2019-07-29 19:18:16 +01:00
Ted John
3155c661fa Refactor format peep action 2019-07-29 19:18:16 +01:00
Ted John
6fff2079f9 Refactor ride name to dynamic args and std::string 2019-07-29 19:18:16 +01:00
Ted John
3ee7824df4
Fix #9678: Korean scenario name is not saved (#9679) 2019-07-29 19:17:49 +01:00
Jim Armstrong
a432a8a514 Fix #9487: Access violation in UpdateRideEnterVehicle (#9577)
* Fix #9487: Implement nullptr checks

Implemented nullptr checks for the ride and vehicle variables
in UpdateRideEnterVehicle()
2019-07-29 18:07:21 +01:00
Ted John
0315c9b741
Add lots of guards to track block get next / previous (#9661) 2019-07-29 16:37:51 +01:00
Matt
26535862e1
Make the CI happy 2019-07-27 19:22:26 +02:00
Matt
8ab0ca4f8f
Fix DataSerialiser returning the wrong stream object 2019-07-27 16:06:26 +02:00
Matt
0ff9d3af12
Serialise cheats separately and preserve storage for future park parameters 2019-07-27 15:22:58 +02:00
Matt
3d1b243d21
Add CheatsSerialise for variable count of cheats 2019-07-27 15:16:38 +02:00
Michał Janiszewski
83e26804e5 Limit scrolling text colour to valid options (#9639) 2019-07-27 14:23:34 +02:00
Ted John
0b4d989a67 Rename get_banner to GetBanner 2019-07-26 17:24:19 +01:00
Ted John
3bff25ab22 Use TileCoordsXY 2019-07-26 17:14:09 +01:00
Ted John
5c07c53faf Refactor get banner 2019-07-25 22:21:19 +01:00
Ted John
85543bd1c8 Separate RCT2 and OpenRCT2 banner struct 2019-07-25 22:21:19 +01:00
Duncan
9b4f8a6b4b
Merge pull request #9451 from ZehMatt/refactor/sprite-create-untangle
Refactor create_sprite
2019-07-25 06:50:57 +01:00
Michael Steenbeek
e5ed5568a8
Remove conversion from UTF-8 to widechar and back again (#9637) 2019-07-24 21:56:49 +02:00
Matt
f3638ca858
Address code review 2019-07-24 18:12:25 +02:00
Matt
3395079737
Remove NUM_SPRITE_LISTS macro and replace with SPRITE_LIST_COUNT for consistency 2019-07-24 17:53:54 +02:00
Matt
98a17fe8d9
Refactor create_sprite and remove unnecessary move_sprite_to_list 2019-07-24 17:53:51 +02:00
Michał Janiszewski
837879018f
Make socket status atomic (#9636)
* Make socket status atomic

`TcpSocket::ConnectAsync` will call `Connect` and modify `_status` from
a different thread and must ensure it doesn't introduce a data race.

* Update src/openrct2/network/Socket.cpp

Co-Authored-By: ζeh Matt <m.moninger.h@gmail.com>
2019-07-24 15:05:26 +02:00
Ted John
a1d9e52046 Rename ToUtf16 to ToWideChar
This is more correct as wchar_t size can differ, for example Linux typically uses 32 bits for wchar_t where as Windows uses 16 bits.
2019-07-22 23:44:03 +01:00
Ted John
6f61c94dbd Remove old widechar <-> utf-8 conversion function 2019-07-22 23:44:03 +01:00
Ted John
3e28073981 Log path when loading / saving park 2019-07-22 22:15:01 +01:00
Duncan
ab5f5b20cd
Use enum class for RCT2_SOUND (#9618)
* Use enum class for RCT2_SOUND

* Fix formatting. Fix mistaken declaration.

* Change name of enum to SoundId

* Fix clang format
2019-07-22 19:02:45 +01:00
ζeh Matt
5a6f573f6b
Merge pull request #9466 from ZehMatt/opengl/rain
Fix #6515: Add rain rendering to OpenGL renderer
2019-07-21 19:29:03 +02:00
Ted John
5733d666b3 Do not store park name as a user string 2019-07-21 11:33:15 +02:00
Cody Brittain
5342a6d9a9 Renamed sound enums for accuracy and organization 2019-07-20 12:41:36 +02:00
Matt
2cf4a42cbe
Add rain rendering to OpenGL renderer 2019-07-18 20:54:47 +02:00
FredFucks
d44e89d9a4 Fix Chinese fonts on Linux with "WenQuanYi Micro Hei" (#9584) 2019-07-17 11:22:38 +02:00
Ferdinand Thiessen
7b317e312c Fix Werror=maybe-uninitialized issue of struct, found by gcc 9.1.1. (#9578) 2019-07-16 10:20:15 +02:00
Duncan
b32f799e21
Merge pull request #9546 from aaruel/vector-locations
Refactor #9110: Use a vector for station locations list in sub_6CB945
2019-07-14 17:46:29 +01:00
Matt
73d7591f40
Serialise all cheats 2019-07-14 16:42:24 +02:00
Matt
e267be785b
Remove obsolete code 2019-07-14 16:42:08 +02:00
Michael Steenbeek
3706581073
Add support for drawing en-dash and multiplication sign (#9570) 2019-07-14 15:58:33 +02:00
Michael Steenbeek
aff3e42408
Merge pull request #9453 from duncanspumpkin/remove_gc
Remove Networked Game Commands
2019-07-14 14:46:46 +02:00
Cody Brittain
238a10034e Remove sloped curves from Spinning Wild Mouse 2019-07-14 14:05:27 +02:00
Duncan
4e44818a04
Merge pull request #9449 from ZehMatt/refactor/sprite-list-pow2
Remove unnecessary multiplication and division for sprite lists
2019-07-13 09:37:35 +01:00
duncanspumpkin
fc657e2571 Revert name change in RCT12 struct to reflect its use.
The new linked_list_index is only for the internal sprite base struct. When importing we are referring to the old linked_list_type_offset. If the names were the same it would not provide any information as to why one was a factor of two different.
2019-07-13 07:20:15 +01:00
Duncan
6eda04943d
Merge pull request #9458 from Spongeloaf/feature/9285_scenario_group_tab
Fix #9285 Add feature to remember scernario tab
2019-07-11 20:47:39 +01:00
Jim Armstrong
9c976daa51 Refactor #9474: Refactor jumping fountain code (#9475)
* Refactor jumping_fountain_update to Update

* Refactor jumping_fountain_get_type to GetType

* Refactor jumping_fountain_continue to Continue

Fix typos and misc refactoring

* Refactor begin and create functions into static member functions

Move jumping_fountain_begin and jumping_fountain_create into the rct_jumping_fountain struct and make them static

* Refactor remaining fountain functionality into member functions

* Rename JumpingFountain struct and move to proper header file

JumpingFountain code was refactored to conform to variable naming conventions and moved into the Fountain.h file.

rct_sprite_generic struct was moved to SpriteBase.h - this was done to get around a circular header dependency between Fountain.h and Sprite.h

* Set access modifier for private functions

* Change JumpingFountain variable names to TitleCase

* Refactor #9474: Clarify where auto is being used with pointers

* Refactor #9474: Change function names for clarity

* Refactor #9474: Fix incorrect function names
2019-07-11 20:38:30 +01:00
Duncan
d7586e9b76
Merge pull request #9459 from 41northstudios/refactor-9291
Refactor #9291: Move easter egg code to Guest
2019-07-11 20:37:25 +01:00
Aaron van Geffen
cfd863ef12 Prevent making unnecessary copies in certain tile loops (#9549) 2019-07-11 18:43:33 +02:00
Aaron van Geffen
ac7a1ebf71 Release v0.2.3.
- Feature: [#485] Rides can now be simulated with ghost trains during construction.
- Feature: [#1260] Option for making giant screenshots have a transparent background.
- Feature: [#2339] Find local servers automatically when fetching servers.
- Feature: [#7296] Allow assigning a keyboard shortcut for the scenery picker.
- Feature: [#8029] Add the Hungarian Forint (HUF) to the list of available currencies.
- Feature: [#8481] Multi-threaded rendering.
- Feature: [#8558] Guest debugging tab.
- Feature: [#8659] Banner and sign texts are now shown in tooltips.
- Feature: [#8687] New multiplayer toolbar icon showing network status with reconnect option.
- Feature: [#8791] Improved tile element flag manipulation in Tile Inspector.
- Feature: [#8919] Allow setting ride price from console.
- Feature: [#8963] Add missing Czech letters to sprite font, use sprite font for Czech.
- Feature: [#9154] Change map toolbar icon with current viewport rotation.
- Change: [#7877] Files are now sorted in logical rather than dictionary order.
- Change: [#8427] Ghost elements now show up as white on the mini-map.
- Change: [#8688] Move common actions from debug menu into cheats menu.
- Change: [#9428] Increase maximum height of the Hypercoaster to RCT1 limits.
- Fix: [#2294] Clients crashing the server with invalid object selection.
- Fix: [#4568, #5896] Incorrect fences removed when building a tracked ride through
- Fix: [#5103] OpenGL: ride track preview not rendered.
- Fix: [#5889] Giant screenshot does not work while using OpenGL renderer.
- Fix: [#5579] Network desync immediately after connecting.
- Fix: [#5893] Looking at guest window tabs other than the main tab eventually causes assertion.
- Fix: [#5905] Urban Park merry-go-round has entrance and exit swapped (original bug).
- Fix: [#6006] Objects higher than 6 metres are considered trees (original bug).
- Fix: [#7039] Map window not rendering properly when using OpenGL.
- Fix: [#7045] Theme window's colour pickers not drawn properly on OpenGL.
- Fix: [#7323] Tunnel entrances not rendering in 'highlight path issues' mode if they have benches inside.
- Fix: [#7729] Money Input Prompt breaks on certain values.
- Fix: [#7884] Unfinished preserved rides can be demolished with quick demolish.
- Fix: [#7913] RCT1/RCT2 title sequence timing is off.
- Fix: [#7700, #8079, #8969] Crash when unloading buggy custom rides.
- Fix: [#7829] Rotated information kiosk can cause 'unreachable' messages.
- Fix: [#7878] Scroll shortcut keys ignore SHIFT/CTRL/ALT modifiers.
- Fix: [#8219] Faulty folder recreation in "save" folder.
- Fix: [#8480, #8535] Crash when mirroring track design.
- Fix: [#8507] Incorrect change in vehicle rolling direction.
- Fix: [#8537] Imported RCT1 rides/shops are all numbered 1.
- Fix: [#8553] Scenery removal tool removes fences and paths while paused.
- Fix: [#8598] Taking screenshots fails with some park names.
- Fix: [#8602] Wall piece collision detection deviates from vanilla
- Fix: [#8649] Setting date does not work in multiplayer.
- Fix: [#8873] Potential crash when placing footpaths.
- Fix: [#8882] Submarine Ride does not count as indoors (original bug).
- Fix: [#8900] Peep tracking is not synchronized.
- Fix: [#8909] Potential crash when invoking game actions as server.
- Fix: [#8947] Detection of AVX2 support.
- Fix: [#8988] Character sprite lookup noticeably slows down drawing.
- Fix: [#9000] Show correct error message if not enough money available.
- Fix: [#9067] Land/water tools show prices when money is disabled.
- Fix: [#9124] Disconnected clients can crash the server.
- Fix: [#9132] System file browser cannot open SV4 files.
- Fix: [#9152] Spectators can modify ride colours.
- Fix: [#9202] Artefacts show when changing ride type as client or using in-game console.
- Fix: [#9240] Crash when passing directory instead of save file.
- Fix: [#9245] Headless servers apply Discord Rich Presence.
- Fix: [#9293] Issue with the native load/save dialog.
- Fix: [#9322] Peep crashing the game trying to find a ride to look at.
- Fix: [#9324] Crash trying to remove invalid footpath scenery.
- Fix: [#9402] Ad campaigns disappear when you save and load the game.
- Fix: [#9411] Ad campaigns end too soon.
- Fix: [#9476] Running `simulate` command on park yields `Completed: (null)`.
- Fix: [#9520] Time Twister object artdec29 conversion problem.
- Fix: Guests eating popcorn are drawn as if they're eating pizza.
- Fix: The arbitrary ride type and vehicle dropdown lists are ordered case-sensitively.
- Improved: [#6116] Expose colour scheme for track elements in the tile inspector.
- Improved: Allow the use of numpad enter key for console and chat.
2019-07-10 22:52:26 +02:00
aaruel
4eadbe3c6e Cleaned up location duplication check 2019-07-09 21:10:57 -04:00
aaruel
899b5c136a Refactor station locations array to vector 2019-07-09 03:04:56 -04:00
ζeh Matt
a7f8960151 Fix #9498: Only close the most recent window when using the hotkey (#9504) 2019-07-01 22:59:31 +02:00
ζeh Matt
e149722a15 Fix #9467: Crash when windows create new window when being closed (#9470) 2019-06-27 22:28:07 +02:00
muemart
7703774437 Correctly determine size of wchar arrays (#9490) 2019-06-27 19:46:03 +02:00
Jim Armstrong
f80695d0eb Fix #9485: Staff cannot be hired in pause mode (#9489)
Set ALLOW_WHILE_PAUSED flag for staff hire GA
2019-06-27 17:42:18 +02:00
Ted John
f9101a2d7a Fix #9476: Running simulate command on park yields Completed: (null) 2019-06-24 23:17:48 +01:00
Jim Armstrong
cc62e41feb Refactor #9291: Move easter egg code to Guest
Refactored static Peep functions related to easter egg names into member
functions in the Guest struct.
2019-06-24 15:17:59 -04:00
Gymnasiast
063b87e0a0 Remove more unused code; fix compilation on GCC 2019-06-23 23:10:34 +02:00
duncanspumpkin
759db552f4 Remove game command for non network builds 2019-06-23 18:50:35 +01:00
duncanspumpkin
2d75c01882 Unnetwork game commands
Only track designs still use game commands and they cannot be networked so remove dead code
2019-06-23 18:50:35 +01:00
duncanspumpkin
e99c51d23c Remove game command callback 2019-06-23 18:50:35 +01:00
Matt
fc3afb3349
Remove unnecessary multiplication and division for sprite lists 2019-06-22 17:38:28 +02:00
Spongeloaf
5777074a3e #9285 Add feature to remember scernario tab 2019-06-21 12:54:49 -04:00
duncanspumpkin
2de9430bd3 Remove incorrect code that resets picked peep
The game command owner is never set for game actions so this would be incorrect
2019-06-20 20:13:23 +01:00
duncanspumpkin
27e958fe2b Increment network version 2019-06-20 19:34:02 +01:00
ζeh Matt
6bd09f6b98 Cancel concurrent peep pickups on placement (#29) 2019-06-20 19:34:02 +01:00
duncanspumpkin
b896f07687 Add PeepPickupAction
Move Guest and Staff pickup to the new game action. Rework the game
action so that only one game action is required for the two game
commands. Remove the final game command with a callback.
2019-06-20 19:34:02 +01:00
duncanspumpkin
65c0b0591d Fix build for gcc
Invalid cast to int32_t that had been left in after refactoring months ago. Latest version of gcc flags this as the cast made this a comparison between a signed and unsigned value.
2019-06-20 19:27:56 +01:00
Duncan
cc82975090
Merge pull request #9448 from ZehMatt/fix-9287
Fix marketing/money effect bugs
2019-06-20 19:18:03 +01:00
nhair
eb13c5a776 Fix #9245: Headless servers apply Discord Rich Presence 2019-06-19 23:02:57 +02:00
Matt
881b7012ac
Bump up network version 2019-06-19 03:29:46 +02:00
Matt
df30d5d9bc
Fix MarketingCampaignFlags::FIRST_WEEK not being imported/exported with sv6 2019-06-19 03:20:19 +02:00
Matt
0a4fa68138
Fix money effect having random position in multiplayer 2019-06-19 03:18:58 +02:00
Michael Steenbeek
bbd93f93cc
Increase maximum height of Hypercoaster to RCT1 limits 2019-06-18 21:44:06 +02:00
ζeh Matt
7c0f04903e Fix crash with truetype fonts and multi threading (#9424) 2019-06-16 17:43:53 +02:00
Hielke Morsink
6b7fee86bb Don't clear the screen to black for giant screenshots
When certain viewport flags were set (underground view, hide base land,
hide vetical faces, clip view), the viewport would always be cleared,
including for giant screenshots.
2019-06-16 16:42:21 +02:00
ζeh Matt
2044dbcad5 Fix #9324: crash trying to remove invalid footpath scenery 2019-06-16 13:40:15 +02:00
Hielke Morsink
84e7376aac
Merge pull request #9403 from duncanspumpkin/fix_9396
Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal
2019-06-14 23:55:12 +02:00
Hielke Morsink
b94cd2b30a
Fix campaign bugs (#9402 and #9411) (#9413)
Fix campaign bugs (#9402 and #9411)
2019-06-14 23:54:59 +02:00
duncanspumpkin
a0b77c4bff return the value 2019-06-13 19:33:37 +01:00
duncanspumpkin
357273fe7d Refund the removal cost of banners on paths.
Found a small bug in the banner removal on paths code
2019-06-13 19:31:49 +01:00
aw20368
9effe21dd0 Fix #8602: Wall piece collision detection deviates from vanilla (#9414)
Wall piece collision used the base height of the wall. Changed to use the clearance height.
2019-06-13 20:03:53 +02:00
Gymnasiast
72c4baebda Fix #9411: Ad campaigns end too soon 2019-06-12 22:31:16 +02:00
Gymnasiast
3933e2ffc6 Fix #9402: Ad campaigns disappear when you save and load the game 2019-06-12 22:20:00 +02:00
Duncan
e5972f8a67
Fix #9401, Fix #9387. Check for tile element before deref. (#9409)
This fixes two crashes that can occur when surface elements are deleted. For normal play you should never delete a surface element as the game expects there to be a surface element on all usable terrain.
2019-06-12 21:16:40 +01:00
duncanspumpkin
501e4ba3f9 Increment network version 2019-06-12 19:18:07 +01:00
duncanspumpkin
082f969fab Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal.
Previously this would never have happened because the old code would do a scenery ghost removal before calling anything else. I think this is a better way of handling it though and don't want to revert to the old method
2019-06-12 19:17:29 +01:00
duncanspumpkin
9cd3119897 Increment network version 2019-06-11 18:44:23 +01:00
duncanspumpkin
96ec0123ca Refactor and clean up for CI's. 2019-06-11 18:43:23 +01:00
duncanspumpkin
afca838f17 Provide a game command translation 2019-06-11 18:43:06 +01:00
duncanspumpkin
3162d4dc75 Implement TileModifyAction
Further work moving game commands into the game action framework
2019-06-11 18:42:52 +01:00
Matt
ea7374b332
Bump up network version 2019-06-11 17:50:17 +02:00
Matt
9a23234631
Fix #9388: Crash using set grass length cheat 2019-06-11 17:49:49 +02:00
Matt
92129f01d0
Bump up network version 2019-06-11 05:10:27 +02:00
Matt
82fd212834
Fix #8859: Network gCheatsEnableAllDrawableTrackPieces on initial join 2019-06-11 05:10:05 +02:00
Gymnasiast
b65e243486 Fix #9398: Observation tower vehicle is coloured incorrectly 2019-06-10 22:51:23 +02:00
Duncan
ba040fcd6a
Fix clang format (#9393) 2019-06-09 19:18:04 +01:00
duncanspumpkin
4fa77e1f71 Fix the build 2019-06-09 16:08:29 +01:00
Peter
dd948f99c4 #9295 Refactor rct_vehcile->status to rct_vehicle::SetState() (#9329)
Fix #9295. Refactor rct_vehicle->status to rct_vehicle::SetState()

Created rct_vehicle::SetState() and refactored all assignments to
rct_vehcile->status. SetState also includes a call to
vehicle_invalidate_window(), so it cannot be forgotten.
2019-06-09 15:45:56 +01:00
Ted John
6f0298deb3 Refactor ride measurement storage 2019-06-09 11:55:41 +02:00
Hielke Morsink
b3ed5b0cc1 Make giant screenshots transparent by default 2019-06-09 11:03:01 +02:00
Hielke Morsink
e2d7b2cf03 Use new setting in screenshot command too 2019-06-09 11:03:01 +02:00
Hielke Morsink
5418eb6e34 Add transparency setting to options window 2019-06-09 11:03:01 +02:00
Hielke Morsink
bffc012d16 Implement #1260: --transparent switch for screenshot command 2019-06-09 11:03:00 +02:00
Hielke Morsink
f5ac98c1e2 Early out when context creation fails 2019-06-09 11:03:00 +02:00
Duncan
993709c087
Merge pull request #9321 from aw20368/fix/8723-use-rotate_map_coordinates
Fix #8723 Use rotate_map_coordinates to rotate coordinate
2019-06-08 07:52:52 +01:00
aw20368
e0cf476398 Fix #8723 Use rotate_map_coordinates to rotate coordinate
Added Rotate to CoordsXY, TileCoordsXY and used them to replace redundant rotation code.
2019-06-06 08:21:40 -04:00
Matt
f98d027a14
Fix #9377: accumulate a list of windows to close before actual closing 2019-06-06 12:21:46 +02:00
aw20368
834d1e828a Fix #7829 Rotated information kiosk can cause 'unreachable' messages (#9337)
Some entrance directions were lost upon rotation. Corrected rotation of entrance directions.
2019-06-05 09:33:39 +02:00
aw20368
df263eb1f6 Fix #5896 Fences not always removed when building a tracked ride through (#9341)
Fence removal did not account for track direction. Added the rotation for the track/fence intersection test.
2019-06-04 23:27:36 +02:00
aw20368
3823befa10 Fix #7323 Tunnel entrances not rendering in 'highlight path issues' (#9339)
Hiding path scenery caused function that draws tunnel to prematurely return. Changed to only skip drawing scenery.
2019-06-04 20:34:39 +02:00
Aaron van Geffen
f1ac847fce
Merge pull request #9222 from IntelOrca/implement/485-ghost-train-simulation
Implement #485: ghost train simulation
2019-06-04 20:24:16 +02:00
Duncan
06c666c298
Merge pull request #9358 from ZehMatt/undo-fuckup1
Remove useless log_info
2019-06-04 18:45:34 +01:00
Duncan
f44d29f861
Merge pull request #9368 from ZehMatt/fix-9365
Fix #9365: Crash when bringing window to front
2019-06-04 18:45:22 +01:00
Matt
d6975a8f23
Fix #9365: Crash when bringing window to front 2019-06-04 07:02:55 +02:00
Hielke Morsink
4dea507e50 Fix #9360: sticky windows can be closed 2019-06-03 22:49:45 +02:00
Matt
af65811f50
Remove useless log_info 2019-06-03 18:59:23 +02:00
ζeh Matt
cf9e5e14a6
Merge pull request #9330 from ZehMatt/window-refactor
Refactor window storage to use std::list instead of std::vector
2019-06-01 21:22:02 +02:00
aw20368
3ee6be0dbf Fix #9288: Replace repeated 3d to 2d functions (#9301)
Replaced duplicate 3d to 2d code with translate_3d_to_2d_with_z(...).
2019-05-30 22:41:53 +02:00
ζeh Matt
bc14f427a5 Fix #9322: Peep crashing the game trying to find a ride to look at 2019-05-30 20:49:54 +02:00
James Warwood
67f1359936 Fix: Unable to change colours of scrolling wall banner sign via sign dialog (#9303)
1. Check in SignSetStlyeAction query was accidentally inverting value of
   wallFound boolean
2. Code in action execution was not looping through the tile elements to find
   the correct wall piece like the query did (which meant just fixing 1. would
   cause a segfault)

Moved code to find relevant wall tile element into new helper function
banner_get_scrolling_wall_tile_element() in Banner; use in both query and action
to avoid any duplication of search logic.
2019-05-30 10:33:13 +02:00
Matt
951f5009ef
Refactor window storage to use std::list instead of std::vector 2019-05-29 19:32:18 +02:00
Ted John
efac635cfa Do not update ride measurements when simulating 2019-05-28 22:37:54 +01:00
Ted John
8d5e083998 Remove duplicate divisions 2019-05-28 22:31:46 +01:00
Ted John
ca32357dad Use bool for isApplying 2019-05-28 22:31:46 +01:00
Ted John
63b1649666 Do not clear construction / peeps for ghost entrance / exits 2019-05-28 16:53:31 +01:00
Ted John
1dd696d453 Do not clear construction / peeps when querying ride entrance / exit 2019-05-28 16:50:38 +01:00
Aaron van Geffen
d1f48fab53 Add RCT1 traffic light sprites for ride simulate status. 2019-05-28 16:50:38 +01:00
Aaron van Geffen
bab7711c5b Add new simulate icon. 2019-05-28 16:50:38 +01:00
Ted John
62ff1e7534 Prevent breakdown during simulation 2019-05-28 16:50:38 +01:00
Ted John
5fa0c18455 Do not provide test results for simulate 2019-05-28 16:50:08 +01:00
Ted John
94caa46654 Allow modification of ride entrance during simulation 2019-05-28 16:50:08 +01:00
Ted John
5c8aa743f6 Implement ghost drawing for special vehicles 2019-05-28 16:50:08 +01:00
Ted John
5f1f428bce Add and use Ride::SupportsStatus 2019-05-28 16:50:08 +01:00
Ted John
fec6d660c6 Remove obsolete configs:
- no crashes
- test unfinished track
2019-05-28 16:50:08 +01:00
Ted John
c4e18e570e Add and implement simulation mode for rides 2019-05-28 16:50:08 +01:00
nexgenration
46889b5381 Implement #9231: Add sprite_index to Guest Debug Tab 2019-05-27 22:39:03 +02:00
James Warwood
1cf4f17ee6 Fix: Unable to use second skyscraper terrain edge style
Code to check if selected edge style is valid was passing the wrong object type
(surface instead of edge) to GetLoadedObject, causing that method to warn that
the selected edge style index was out-of-range.
2019-05-27 22:37:31 +02:00
Sijmen Schoon
f26a1aee57 Fix compile error with DISABLE_HTTP (#9309)
There are two variables, MASTER_SERVER_REGISTER_TIME and
MASTER_SERVER_HEARTBEAT_TIME, which are unused when DISABLE_HTTP is set.
This commit fixes that.
2019-05-26 16:06:56 +02:00
aw20368
8c20b635bd Fix #9270: Refactor money effect
Changed static functions to rct_money_effect member functions. GetStringId now returns std::pair.
2019-05-21 21:22:47 +02:00
ζeh Matt
ee79c11389 Fix desync when host changes map 2019-05-19 17:44:43 +02:00
Michael Steenbeek
1de25be4fb
Merge pull request #9274 from ZehMatt/fix-mp-pause-toggle
Fix clients being behind one tick
2019-05-19 15:09:25 +02:00
Michael Steenbeek
1b11612e3c
Merge pull request #9259 from duncanspumpkin/scenario_set
Implement ScenarioSetSetting game action
2019-05-19 15:09:12 +02:00
Matt
8389e5119b
Bump up network version 2019-05-18 19:57:51 +02:00
Matt
83511c5c7f
Fix clients being behind one tick at all times 2019-05-18 19:56:03 +02:00
James Warwood
d7074e65a2 Fix: Staff patrol areas getting clobbered when hiring new staff (#9271)
Fixed incorrect indexing when resetting staff patrol areas during hiring
process.
2019-05-18 11:43:06 +02:00
nexgenration
6b232f7e53 Fix#9197: Peep insert new thought (#9230)
Improve the readability of the codebase by moving functions into the relevant structures.
- Change name of peep_insert_new_thought to InsertNewThought.
- Update InsertNewThought definition to Guest::InsertNewThought.
2019-05-18 09:47:25 +01:00
ζeh Matt
f7bd6d516a Fix #9267: Only check if a file is a directory before opening it (#9269) 2019-05-16 08:05:09 +01:00
ζeh Matt
1978372679
Merge pull request #9236 from ZehMatt/fix-ga-logging
Improve game action logging
2019-05-15 22:44:47 +02:00
duncanspumpkin
00c4b393a3 Take care of default case 2019-05-15 19:47:18 +01:00
ζeh Matt
1a01a49002 Fix #9124: Disconnected clients can crash the server 2019-05-15 19:55:16 +02:00
Greg Hennis
1fcedae3bc Fix #9258: Rename SPRITE_LIST_NULL to ..._FREE (#9260) 2019-05-15 19:07:01 +02:00
duncanspumpkin
3ac596faf1 Implement ScenarioSetSetting game action
Further work moving game commands into the game action framework to improve design.
2019-05-14 21:46:27 +01:00
Gymnasiast
cb6a563e2d Bump network version [ci skip] 2019-05-14 21:59:16 +02:00
duncanspumpkin
0b7d7027e1 Fix formatting 2019-05-14 21:58:55 +02:00
duncanspumpkin
e72195d16e Make suggested changes 2019-05-14 21:58:55 +02:00
duncanspumpkin
1eb7f4d8c6 Implement Modify Group and Kick Player Actions.
Further work on the Game Actions porting
2019-05-14 21:58:55 +02:00
Duncan
7793001f5d Implement BalloonPressAction
Furthering reducing the number of game commands and moving them to the Game Action framework
2019-05-14 21:54:54 +02:00
joshtucker132
4dc77bf121 Feature #8791: Improved tile element flag manipulation in Tile Inspector 2019-05-14 21:38:31 +02:00
Gymnasiast
5e39640837 Also remove game_command_set_park_entrance_fee from new_game_command_table 2019-05-14 18:39:14 +02:00
Gymnasiast
4e23c42d38 Remove stub functions from new_game_command_table[] 2019-05-13 22:51:41 +02:00
Gymnasiast
8d9645a382 Remove comment 2019-05-13 22:22:14 +02:00
Gymnasiast
170307cd0f Remove redundant semicolons after for loops 2019-05-13 22:16:30 +02:00
Gymnasiast
2ea1fcc69d Remove unused declarations and functions 2019-05-13 22:16:14 +02:00
ζeh Matt
0ff19f071f Fix #9240: crash when passing directory instead of save file 2019-05-13 21:34:58 +02:00
duncanspumpkin
4de6071fb4 Increment network version 2019-05-12 19:03:03 +01:00
duncanspumpkin
b9a70d02a3 Make suggested changes
Implement suggestions

Fix formatting
2019-05-12 17:31:48 +01:00
duncanspumpkin
e9e445837f Add landset/buyrights action 2019-05-12 17:29:19 +01:00
Michael Steenbeek
e5eea9d1fa
Merge pull request #9235 from ZehMatt/fix-util-rand
Improve util_rand
2019-05-12 13:50:19 +02:00
Ted John
15cb3e1889 Remove unnecessary new line characters from log calls (#9237) 2019-05-12 13:48:56 +02:00
Ted John
616fdfd96e
Merge pull request #9212 from IntelOrca/fix/2339-broadcast-lan
Implement searching of local servers by broadcasting UDP packets.
2019-05-12 12:07:56 +01:00
Matt
eb3018b6a9
Fix warnings 2019-05-12 11:32:41 +02:00
Matt
c6ea47c631
Make util_rand thread safe 2019-05-12 11:32:33 +02:00
Matt
5198df5c25
Improve generation of random advertisment key 2019-05-12 11:27:48 +02:00
Duncan
5da95e963d
Fix GameAction use during pause (#9242)
* Use correct flag to allow action while paused.

Mistake made during implementing on GameActions

* Increment network version
2019-05-12 09:54:21 +01:00
Ted John
dd20ebad49 Make more methods const 2019-05-12 00:57:56 +01:00
Ted John
5e94f6385d Initialise hostname 2019-05-12 00:51:33 +01:00
Ted John
73b8310e8e Refactor creation of UDP socket 2019-05-12 00:51:33 +01:00
Ted John
f8e3abcf4e Remove by-reference string_view 2019-05-12 00:51:33 +01:00
Ted John
f0d1e9c320 Apply some of the code review comments 2019-05-12 00:51:33 +01:00
Ted John
3334d40da4 Explicitly use std::launch::async 2019-05-12 00:51:33 +01:00
Gymnasiast
6e6fe3c3c1 Replace optional.value() with *optional (fix Xcode compilation)
Xcode cannot handle the optional.value() notation, but *optional
should mean the same.

Also see https://en.cppreference.com/w/cpp/utility/optional/operator*
2019-05-12 00:51:33 +01:00
Gymnasiast
9b1321067b Use opt:: namespace 2019-05-12 00:51:33 +01:00
Ted John
52afcb795f Fix windows build 2019-05-12 00:51:33 +01:00
Ted John
47f48721e8 Fix clang build 2019-05-12 00:51:33 +01:00
Ted John
4b0f2bbceb Fix disable network / disable http builds 2019-05-12 00:51:33 +01:00
Ted John
20f52a8cbe Refactor TcpSocket and UdpSocket 2019-05-12 00:51:33 +01:00
Ted John
6a4791e39e Only reply to broadcasts with correct message 2019-05-12 00:51:33 +01:00
Ted John
59ddd7e1ea Get and broadcast to all broadcast address 2019-05-12 00:51:33 +01:00
Ted John
51117432f0 Improve status messages and prevent duplicates 2019-05-12 00:51:33 +01:00
Ted John
04c04d197e Refactor broadcasting code and logging 2019-05-12 00:51:33 +01:00
Ted John
4f0a733496 Sort by LAN servers 2019-05-12 00:51:33 +01:00
Ted John
3a400a2471 Refactor server list 2019-05-12 00:51:33 +01:00
Ted John
4437113805 Fix server list LAN address and port 2019-05-12 00:51:33 +01:00
Ted John
7a20874366 Fix Windows build 2019-05-12 00:51:33 +01:00
Ted John
123a8eacad Get the server list showing LAN servers 2019-05-12 00:51:33 +01:00
Ted John
694cb7eb3f Implement UDP socket and broadcasting 2019-05-12 00:50:13 +01:00
Ted John
5992b9f76e Add UDP socket class 2019-05-12 00:49:37 +01:00
Matt
2ea15ac146
Write server log as binary 2019-05-11 23:42:23 +02:00
Matt
c1d6337e3b
Increase buffer size to avoid truncating text 2019-05-11 23:40:59 +02:00
Matt
6aa0e74d3e
Fix util_rand only returning 15 bit values. 2019-05-11 22:37:19 +02:00
Matt
9561567b6c
Bump up network version 2019-05-11 21:39:01 +02:00
Matt
7c7909fb45
Fix #2294: Clients crashing the server with invalid object selection 2019-05-11 21:39:01 +02:00