Commit Graph

918 Commits

Author SHA1 Message Date
Duncan 6e1521caec Reintroduce error messages when trying to open invalid rides (#6381)
* Reintroduce error messages when trying to open invalid rides

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

* Bring error message setting into the function

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

* Increment network version for error message fix on set status

* Reintroduce the error title to set ride name

* Try not to introduce bugs due to inverting logic
2017-10-09 15:50:49 +01:00
Christian F. Coors 84086a2465 Fix http_request_t 2017-10-07 20:15:39 +02:00
ZehMatt 19f9a9b755 Fix #6394: RideCreateAction not working with empty colour presets. 2017-10-07 20:13:05 +02:00
Michael Steenbeek 31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
ζeh Matt 0423397c34 Fix #6376: RideCreateAction::Query ignores valid secondary colour input 2017-10-05 20:46:50 +02:00
Michał Janiszewski 1089bd2d56 Increase network version 2017-10-05 10:42:44 +02:00
ZehMatt 3f93af11d6 Fix game actions executing wrong callbacks. 2017-10-05 10:42:44 +02:00
Michał Janiszewski 540f306809 Provide default values for various scalar fields 2017-10-05 10:42:44 +02:00
Ted John 4ac8f1dc35 Make the game action callback type safe 2017-10-05 10:42:43 +02:00
Ted John aa30859ab7 Merge IGameAction into GameAction 2017-10-05 10:42:43 +02:00
Ted John 2b57d36174 Tabs to spaces 2017-10-05 10:42:43 +02:00
Ted John b068331db2 Move contents of IGameAction.h into GameAction.h 2017-10-05 10:42:43 +02:00
ZehMatt 072ecadd48 Fix leaking memory creating game actions.
Specialized class use for game action results.
2017-10-05 10:42:43 +02:00
ZehMatt 97504b45ae Add network stubs for no network builds. 2017-10-05 10:42:43 +02:00
ZehM4tt 3657122b3b Moved ride create command to new game action system. 2017-10-05 10:42:43 +02:00
ZehM4tt fbd793083c Put action files in headers instead of cpps.
Added callbacks for GameActions and network support for them.
Refactored GameAction registration due static library issues.
Moved all C functions into a single file.
2017-10-05 10:42:43 +02:00
ZehM4tt 1b2a61c6ba Separated out byte swapping into its own header.
Simplified data serialisation of game actions.
Moved the flags away from parameters.
GameAction base now serialises mandatory data such as flags and player.
Split some functions from network in order to move command processing to the end of tick.
2017-10-05 10:42:43 +02:00
duncanspumpkin 149a854c51 Make changes to match @ZehMatt code 2017-10-05 10:42:39 +02:00
duncanspumpkin a7d1cbee9e Add deep copy to GameCommand 2017-10-05 10:42:39 +02:00
duncanspumpkin 1d3076a2af Initial attempt at getting place entrance into game action 2017-10-05 10:42:38 +02:00
duncanspumpkin 8adcbd6e35 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin feef3d98da Refactor packet handling 2017-10-05 10:42:38 +02:00
Duncan f8241b7bb0 Fix no network builds 2017-10-05 10:42:38 +02:00
duncanspumpkin df5ea16026 Change function declarations. Move network code into network 2017-10-05 10:42:38 +02:00
Ted John 8f362cef8c Fix spaces / tabs for network.h and network.cpp 2017-10-05 10:42:38 +02:00
Ted John fae45d6989 Fix warning 2017-10-05 10:42:38 +02:00
duncanspumpkin 254041985f Make servers work 2017-10-05 10:42:38 +02:00
duncanspumpkin ae24ded8bf Make client work 2017-10-05 10:42:38 +02:00
duncanspumpkin 351b0df76b Initial try at adding networking 2017-10-05 10:42:38 +02:00
duncanspumpkin e7c66bb208 Start adding network code 2017-10-05 10:42:38 +02:00
Michael Steenbeek 05b274a239 Fix #5609: Vehicle switching may cause '0 cars per train' to be set 2017-10-04 19:42:44 +02:00
Olivier Wervers 45944cb037 Fix #6202: Avoid breaking occupied benches 2017-10-02 17:18:51 +02:00
Michał Janiszewski 5ab9f938a7 Update files missed in the great extern "C" cleanup of 2017 2017-09-28 23:29:16 +02:00
Jeroen D Stout 202bea59c8 Increased network stream version 2017-09-28 17:37:48 +02:00
TELK 40b026a4f1 Switch to utf8_remove_formatting() in Twitch integration to support non-latin characters 2017-09-26 15:54:24 +02:00
Marijn van der Werf ac910a5979 Move Error, Campaign and Ride Demolition windows 2017-09-24 22:41:49 +02:00
Michał Janiszewski 00fd18809c Move extern "C" {} blocks to headers (#6282) 2017-09-18 17:05:28 +02:00
Michael Steenbeek 735b96ac18 Bump network version for the 'Enable all drawable elements' cheat 2017-09-13 22:51:01 +02:00
Chris Guillott 5944d5be4d remove redundant line 2017-09-10 21:21:49 +02:00
Chris Guillott 5991c25919 trap getaddrinfo return codes 2017-09-10 21:21:49 +02:00
Bernd Buschinski 0bb0c3b60f Initialize result pointer
This fixes a crash in case getaddrinfo returns an error.
2017-08-20 23:05:16 +02:00
Michał Janiszewski d698ad1100 Convert NULL -> nullptr in C++ 2017-08-15 11:51:56 +02:00
duncanspumpkin df742b70b6 Fix infinite loop when removing scenery elements with >127 height
Bug introduced when refactoring. Type mismatch not picked up by compiler
2017-08-10 23:43:28 +02:00
Michał Janiszewski 1f9ae4d4ec Start v0.1.2 2017-08-10 00:17:26 +02:00
Matthias Moninger d5f116b3e5 Fix compilation error on VS2015 2017-08-09 11:28:58 +02:00
ZehMatt 304a7f3f45 Fix #3852: Desync constructing path with scenery in its way. 2017-08-06 22:58:08 +02:00
duncanspumpkin 18d082053e Rename cpp files to use TitleCase 2017-08-04 18:12:54 +02:00
Michael Steenbeek 2f3a30f22b Fix cast to bool in map element functions 2017-08-01 13:42:50 +02:00
Michał Janiszewski ee443818a8 Verify size of objects sent/requested (#6076) 2017-08-01 12:29:16 +01:00
Ted John 6699d0885b Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c
Move remaining functions out rct2.c
2017-07-30 18:09:26 +01:00
wolfreak99 675028d173 Bump network version 2017-07-30 19:00:30 +02:00
Michał Janiszewski 1ea5a902df Initialise various fields and variables 2017-07-30 15:28:16 +02:00
Ted John 8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
jensj12 2736058912 Update text files and network version 2017-07-29 12:02:46 +02:00
ZehMatt 6a85c49074 Increment network version. 2017-07-29 10:04:09 +01:00
duncanspumpkin 12b6d48d46 Update change log and increment network 2017-07-29 09:33:24 +01:00
Richard Jenkins 222782b228 Fix #6007: 'Felicity Anderson' can affect peeps entering rides 2017-07-28 07:50:35 +02:00
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 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
Christian F. Coors 32da66aa79 Fix build errors 2017-07-25 22:50:19 +02:00
zsilencer 424f2fcef5 Fix #5984: Allow socket binding to same port after crash 2017-07-25 08:35:35 +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
wolfreak99 47a89c4cf3 Add "Ignore research status" cheat 2017-07-23 12:09:29 +02:00
Keatzee ea87e87750 Fix #4301: Remove leading/trailing space from playername 2017-07-22 09:43:24 +01:00
Gymnasiast 4d23845d4b Fix rides not breaking down 2017-07-20 21:55:29 +02:00
Michael Steenbeek 70f1e94ce9 Fix #5946: assertion hit when building new ride 2017-07-19 13:41:24 +02:00
Michael Steenbeek c0d06498b3 Increase network version because of reliability fixes 2017-07-18 10:51:30 +02: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
Michał Janiszewski 3d487541d7 Reset network version for 0.1.1 2017-07-12 23:24:33 +02:00
Michael Steenbeek da17ac9781 Bump network version 2017-07-12 12:10:21 +02:00
X123M3-256 b73c954362 Prevent booster pieces from toggling spinning 2017-07-11 15:55:06 +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
Michał Janiszewski a3414502a6 Update network version 2017-07-07 00:17:36 +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 8224e715d8 Network version bump 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
Michael Steenbeek ae3bc6183f Bump network version 2017-07-05 09:32:50 +02: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
zaxcav b39723a0a8 Allow mechanics to walk over wide tiles on the edge of the patrol zone 2017-06-29 20:34:37 +02: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
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 0dbe8f32e5 Allow Construction rights to be placed on park entrance 2017-06-25 21:19:03 +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
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
Ted John b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +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 176fe0d036 Replace OPENSSL_{malloc,free} with the standard C versions 2017-06-20 18:49:43 +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
ZehM4tt 08230f047c Fix desync if "Handyman mow grass by default" is checked. (#5652) 2017-06-18 20:43:15 +02: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
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces
[ci skip]
2017-06-17 13:41:40 +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
ZehM4tt 9e1711c345 Fix some scenery, path placement and construction mode desyncs 2017-06-16 09:45:00 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Michał Janiszewski 9d5a86d0ae Fix condition checks for being in logic update code (#5610) 2017-06-14 07:44:23 +01:00
Ted John 7e9f7df7d1 Use standard platform defines 2017-06-12 18:01:51 +01:00
Richard Jenkins 4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02: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
Ted John 3988b7797e Fix display of chat shortcut on network games (#5593) 2017-06-11 18:19:15 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John 0d8f9d6618 Refactor IPlatformEnvironment (#5590) 2017-06-11 12:53:37 +01:00
Ted John 9bb055acc0 Remove unnecessary SDL.h include 2017-06-10 16:40:08 +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 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
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
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 c95dbf4b2f Merge pull request #5295 from janisozaur/fix-staff-hiring
Fix staff hiring check
2017-06-06 08:24:41 +01:00
Gymnasiast c82792e9b3 Update network version 2017-06-05 23:00:17 +02:00
Leurak 112f7b7a0d Add address parameter in network_begin_server 2017-06-04 00:42:13 +01:00
Leurak c002df1abf Keep address parameter in BeginServer 2017-06-04 00:42:13 +01:00
Leurak 14c46a659c Add config option for socket listen address 2017-06-04 00:42:13 +01:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
Ted John e2a7189663 Do not use SDL_Colour for gPalette 2017-05-29 22:38:44 +02:00
Richard Jenkins 6d32c38fb3 Fix #5471: Ride name issues at ride construction time 2017-05-16 21:56:20 +02:00
Richard Jenkins 6472c0e6c3 Allow ride names to duplicate existing user strings, fixes #5211 2017-05-12 23:43:48 +02:00
Hielke Morsink 3ba33d098e Set correct base height for newly inserted corrupt elements 2017-05-12 23:41:25 +02:00
Richard Jenkins d6b32591ae Implement guard function for decrementing guest counts
* Implement guard function for decrementing guest counts

* Implement separate functions for incr/decr of peep count globals

* assert() on attempt to increment guest counts over UINT16_MAX

* Increase network version
2017-05-11 18:31:29 +02:00
Michał Janiszewski bccedd3b1f Change network version after f9acdcb02 2017-05-08 23:52:03 +02:00
Craig Craig 9dd820e2e7 Spelling fixes 2017-05-08 08:30:50 +02:00
Ted John b703520311 Merge pull request #5336 from IntelOrca/refactor/nosdl/phase-0
Remove SDL2 dependencies: Phase 0
2017-05-06 18:07:42 +01:00
Michał Janiszewski e103a90d59 Update network version in wake of 14ec639 2017-05-05 21:21:58 +02:00
Michał Janiszewski a25ce1e646 Make Network::server_connection dynamically instantiated 2017-05-05 16:54:44 +02:00
Ted John 80bdb25740 Change http.cpp to use std::thread 2017-05-04 17:29:05 +01:00
Ted John 08b3817272 Use C++ future, thread and chrono for TcpSocket 2017-05-04 17:29:05 +01:00
Ted John 90596e0f54 Remove unnecessary SDL headers from NetworkTypes.h 2017-05-04 17:28:37 +01:00
Ted John 73fb132e41 Replace some SDL functions with our own 2017-05-04 17:27:51 +01:00
Michał Janiszewski ac593b9daf Start v0.0.8 2017-05-03 23:43:16 +02:00
Michael Steenbeek b713b799b5 Increase network version 2017-05-03 08:41:34 +02:00
zaxcav 0debd879da Ignore wide flags on patrol zone edges in path finding heuristic, fixes #5414
Wide path flags in patrol zones can divide the paths with an uncrossable boundary. Ignore wide flags on the patrol zone edges to provide doorways for mechanics through these boundaries without otherwise affecting the path finding heuristic.

Fixes #5414.

Requires new network version.
2017-05-02 08:10:09 +02:00
Michał Janiszewski 5e03fcde33 Update network version to 20 after #5423 2017-05-01 21:41:52 +02:00
CraigCraig e0b875398b Tons of spelling fixes (#5413)
[ci skip]
2017-04-30 06:39:24 +02:00
Michał Janiszewski b8bc6c7374 Bump network version to 19 2017-04-29 20:56:32 +02:00
Gymnasiast 264e758ac6 Bump network version 2017-04-13 22:27:46 +02:00
duncanspumpkin 1b98c0b1cb Increment network 2017-04-12 20:34:57 +01:00
Michael Steenbeek bc3e5f1057 Update network version 2017-04-11 14:27:26 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
Michał Janiszewski a7e6c6ab24 Update network version to 15 2017-04-11 10:23:37 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
duncanspumpkin d305925cde Fix #5334. Make signs save text in the correct order.
Mistake made during refactoring that would cause the sign text to be in the wrong order. If the text was less than 12 characters sign would be blank.
2017-04-04 20:05:10 +01:00
Ted John 9c4c7e7b23 Merge pull request #5319 from IntelOrca/refactor/fountain-cpp
Refactor fountain to C++
2017-04-03 21:53:33 +01:00
Michał Janiszewski f0b8a514fa Update network version to 13 2017-04-02 23:00:00 +02:00
Margen67 10d1e8a538 Disable clearance checks for underwater and underground walls
Also update network version.
2017-03-31 09:38:03 +02:00
zaxcav 071c8135ba Update ride_find_closest_mechanic() to search using the station exit location, fixes #5284 2017-03-27 20:00:50 +02:00
Richard Jenkins 2ce4b51528 Do not return money when demolishing a ghost footpath, fixes #5318 2017-03-27 15:04:12 +02:00
Richard Jenkins ccce7b0432 Pass selected colour to the create banner command, fixes #5316 2017-03-26 15:31:21 +02:00
GrahamRCT 6ea78d6c01 Remove duplicate ride penalty for closed rides
The game reduces the 'value' of a ride, which decides how much guests will pay for it, when multiple rides of the same type exists within a park. Currently, the rides' status is not taken into account.

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

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

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

Also refactored the code slightly to decrease average-case runtime.
2017-03-24 08:13:04 +01:00
Michał Janiszewski 2df1f87662 Include SDL.h in twitch.cpp for SDL_GetTicks() 2017-03-23 21:06:37 +01:00
Michał Janiszewski 12f0c2d660 Fix staff hiring check 2017-03-10 15:36:29 +01:00
Michał Janiszewski 8087fc6a17 Bump network version as a result of 5bd44a6d3f 2017-03-07 22:49:33 +01:00
Michał Janiszewski 7341f4aadd Remove trailing whitespace
[ci skip]
2017-03-07 20:38:11 +01:00
wolfreak99 38f264cce8 Allow for more peep spawns in the future 2017-03-02 23:02:54 +01:00
wolfreak99 c6b5053261 Add cooldowns to help prevent mass demolishing 2017-02-28 09:31:26 +01:00
Duncan 1654ba4fe4 Merge pull request #5236 from duncanspumpkin/refactor
Refactor fence to wall
2017-02-28 06:56:06 +00:00
Ted John af7af61536 Merge pull request #5240 from IntelOrca/refactor/config-cpp-2
Refactor config
2017-02-25 01:35:03 +00:00
duncanspumpkin f54c71b61c Rename functions to wall. Refactor game commands 2017-02-20 21:02:19 +00:00
Michał Janiszewski f6f6d27b4f Make default "User" group not have "passwordless login" permission 2017-02-19 23:28:23 +01:00
Michał Janiszewski 0f40930ec9 Clamp values in vehicle.c to prevent signed overflow 2017-02-19 22:48:27 +01:00
Ted John a473740efd Fix build errors 2017-02-19 21:41:36 +00:00
Ted John fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00
Michał Janiszewski 19833b9110 Increase network version 2017-02-17 09:07:40 +01:00
Michał Janiszewski 7d62c70c59 Initialise variables to default values 2017-02-17 08:50:58 +01:00
Michał Janiszewski d088f9b3ac Update network version
Also fix a typo
2017-02-14 23:18:25 +01:00
wolfreak99 5bdf2cac75 Add permissions for MODIFY_TILE command 2017-02-12 23:02:59 +01:00
Ted John 3474f2adff Remove RWops from server_list.c 2017-02-12 10:40:31 +00:00
Ted John 591e81a0af Merge pull request #5157 from IntelOrca/fix/windows-tests-assert
Allow control of assertion behaviour
2017-02-10 18:18:49 +00:00
Christian Murphy b3e079c7fa Resolve #5140: Headless server saves default user.json 2017-02-09 18:51:49 +00:00
Ted John e649e7ad4a Move creation of version string to Version.cpp 2017-02-09 17:58:19 +00:00
Ted John d0a05df106 Move Convert definitions to TcpSocket.h 2017-02-09 12:33:44 +00:00
Ted John c379347d59 Use stream for chat log 2017-02-08 22:00:04 +00:00
Ted John d124f4fad0 Use streams for network load and save 2017-02-08 18:16:33 +00:00
Ted John de0e6bf521 Use IStream for network code 2017-02-08 12:53:00 +00:00
Ted John 2a11bc97fd Merge pull request #5179 from IntelOrca/refactor/sc-chunk-writer
Use streams for SV6 export
2017-02-08 12:01:38 +00:00
Yaroslav Tretyakov 546aace3dd Fix invalid desync checks
#5185
2017-02-07 12:04:41 +00:00
Ted John 2518362112 Use streams for SV6 export 2017-02-05 15:45:23 +00:00
Michał Janiszewski 6ac6b272c4 Bump network version 2017-02-02 22:46:37 +01:00
Michael Steenbeek 94d38b9f7a Don't remove vehicles when removing all guests, name some interaction fields 2017-01-30 23:51:01 +01:00
Michał Janiszewski bde17f2b30 Start v0.0.7 2017-01-29 23:35:17 +00:00
Michał Janiszewski 6bd9e3eca8 Make sure various fields are initialised properly 2017-01-27 07:35:48 +01:00
Michał Janiszewski 8d1fbcf188 Raise network version to 33 2017-01-26 23:00:56 +01:00
duncanspumpkin 61bb44cd22 Bump network version just in case 2017-01-26 19:52:01 +00:00
Ted John 2900f38cc3 Allow entertainer costume to be given to game command 2017-01-24 13:06:23 +00:00
Michał Janiszewski 88113ca952 Fix some ghost consideration in peep AI
This is a continuation of
https://github.com/OpenRCT2/OpenRCT2/pull/5094.

While the previous PR cured some desyncs, the real issue remained –
logic of the game considers ghost elements. This change fixes it, to
some extent.

The problem here is we already remove ghosts when interacting over
network (e.g. `footpath_provisional_remove` in `footpath_place_real`),
but this happens only when such a game command is executed in OpenRCT2.
Whenever SV6 gets imported, path map elements already have had edges
calculated for them, neighbours being ghost or not, and we don't update
it. OpenRCT2/OpenRCT2#5094 is one, naïve, way to solve, the other option
would be to recalculate all the paths whenever we load SV6.
2017-01-24 11:29:58 +01:00
wolfreak99 a15a3fedf7 Create "misc_commands" enum 2017-01-21 12:43:16 +01:00
wolfreak99 55972f17f8 Remove empty extern
[ci skip]
2017-01-19 08:37:11 +01:00
Marijn van der Werf 24f9a0c0ef Fix #5081: Crash on fetching server list 2017-01-16 14:29:49 +00:00
wolfreak99 3e621d75f6 Check finance_payment for int overflows 2017-01-16 14:29:03 +01:00
Ted John 0d51bdde3f Fix broken code alignment 2017-01-14 23:40:46 +00:00
Broxzier 2bf1b4cd2f Fox linux builds (hopefully) 2017-01-14 12:37:34 +01:00
Broxzier 60603ae10a Use types from common.h 2017-01-14 12:37:31 +01:00
Michał Janiszewski 0a36af19e4 Mark classes as final to help devirtualisation 2017-01-13 12:12:50 +01:00
Michał Janiszewski cf670deb10 Add -Wshadow to CMakeLists and fix offenders 2017-01-13 10:02:17 +01:00
Ted John 50d0d69815 Fix name warnings for NetworkPacket 2017-01-12 17:45:48 +00:00
Ted John 18597bacb1 Fix more warnings 2017-01-12 17:36:05 +00:00
Ted John ec07d61d7b Fix name warnings for Network 2017-01-12 13:26:12 +00:00
Ted John d2cf97d0a1 Fix name warnings for NetworkPlayer 2017-01-12 13:23:16 +00:00
Ted John 3a9b6f4bb0 Fix more warnings 2017-01-12 13:16:00 +00:00
wolfreak99 0316decb6b Update network version for Add/set money commands (#5042) 2017-01-11 00:35:22 +01:00
Christian F. Coors 06d1d2116f Remove unnecessary code 2017-01-10 12:44:30 +01:00
Christian F. Coors e0a6955924 Remove openssl dependency when building without network support 2017-01-10 12:44:30 +01:00
zaxcav 78715fa1c0 Increment network version 2017-01-05 20:46:14 +01:00
Ted John 25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00