1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 19:56:13 +01:00
Commit Graph

258 Commits

Author SHA1 Message Date
Tobias Kohlbau
7a8c5c2842 multiplayer: Adds option to pause server
OpenRCT2 does not provide a simple function to pause a server
while no client is connected. This patch adds a so called
"pause_server_if_no_clients" flag within network section of
config.ini. By default this flag is set to false to be backward
compatible with running servers. After setting this flag to
true the game is paused on launch and gets unpaused on first
connection.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2017-12-31 12:55:07 +01:00
Hielke Morsink
bcfd66cbc6 Use nullptr instead of 0 2017-12-21 23:47:30 +01:00
Robert Lewicki
3c2aaefc85 Fix #6851: Passing password as argument does not work
* Using password from command line arguments to connect to server

* Replaced tabs with spaces

* Added myself to contributors
2017-12-21 21:23:01 +01:00
Michael Steenbeek
282e70a806 Allow building level crossings without cheats 2017-12-20 18:20:31 +01:00
Gymnasiast
b52b22c97b Fix #6829: Steel Twister cannot reach the same height as in vanilla 2017-12-17 17:39:38 +01:00
Michael Steenbeek
1a9975d683 Compile util and cheats as C++ 2017-12-14 10:03:21 +01:00
Michael Steenbeek
6dc49d643a Compile files in base dir as C++ 2017-12-13 08:03:48 +01:00
Hielke Morsink
e307d22bf9 Replace loop with std::fill 2017-12-08 11:06:43 +01:00
Hielke Morsink
79aa4a99cf Use range-based for loops 2017-12-08 11:06:43 +01:00
Michael Steenbeek
3868b100df Stop encrypting money
It serves no purpose any more. Of course, we still need the ENCRYPT_MONEY() and DECRYPT_MONEY() functions for importing and exporting S6 files.
2017-12-07 23:22:24 +01:00
Michael Steenbeek
60d8865efb Compile game.c and game.h as C++ 2017-12-05 09:10:27 +01:00
Michał Janiszewski
0920e58f98 Remove ADVERTISE_STATUS_ prefix 2017-12-02 09:03:59 +01:00
Michał Janiszewski
8e57c7d05d Make ADVERTISE_STATUS enum class 2017-12-02 09:03:59 +01:00
Michał Janiszewski
053a2540f3 Fix building with HTTP disabled, but network enabled 2017-12-02 09:03:59 +01:00
duncanspumpkin
b3cf757ee1 Increment network version 2017-11-25 09:31:16 +00:00
TELK
d6131ed062 Fix #6547: logging does not work if server contains CJK characters (#6565) 2017-11-16 23:02:37 +00:00
Ted John
36ffb1d3cb Use initialiser instead of memset zero 2017-11-12 20:31:29 +00:00
Ted John
4722f0fe94 Make DiscordService final 2017-11-11 23:56:24 +00:00
Ted John
324058a640 Delay presence refresh to 5s interval 2017-11-11 23:48:04 +00:00
Ted John
83e80d9658 Implement basic discord status report 2017-11-11 23:48:04 +00:00
duncanspumpkin
55aea7188b Fix #6617. Maze deletion no longer costs 0x800000 for certain mazes.
When a maze does not have a completely hollowed out hedge the game command would return 0x8000000 as it tries to remove an element that has already been deleted. As game actions no longer use 0x80000000 to indicate a failure this would get interpreted as the refund price and cause the issue.

Fix was to introduce checks when adding up the refund price. This was done rather than changing the game action so that it can be properly fixed when get_refund_price is converted into a game action
2017-11-08 16:03:41 +01:00
Robert Jordan
a01471b535 Enhance #6530: Don't block land rights tool
Land rights tool no longer cares if part of the available land is
unavailable for purchase. It will not even through an error when none of
the tiles are available. Just like other tools.

Added a changelog entry.

This increments the network version.
2017-11-03 19:21:58 +01:00
Marijn van der Werf
4a4f9648a7 Move network status window to UI module 2017-11-03 01:54:37 +01:00
Christian F. Coors
06afeeda9a Apply some refactoring 2017-11-02 12:22:28 +01:00
duncanspumpkin
85b257cc2e Fix #6503. GameActions correctly recorded.
Mistake made during GameActions refactor.
2017-10-30 12:09:40 +01:00
Michał Janiszewski
9815df5e04 Remove redundant checks for group
It is enough to just check it once
2017-10-30 12:04:23 +01:00
Robert Jordan
0e354e18af Improve #6125: Place path in park entrances (#6479)
Can now update park entrance path by placing path over the middle tile.
Updating the path costs money just like normally replacing a path.

Updating the path type can only be done in sandbox mode or in the
scenario editor.
2017-10-24 09:50:33 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
Michał Janiszewski
6695a4ce13 Fix #6497: Boat hire boats do not return to station
Credit goes to @duncanspumpkin
2017-10-17 10:17:39 +02:00
Robert Jordan
0313183d13 Fix #6318: Can't fire staff that are being placed 2017-10-14 22:14:45 +02:00
Mark van Renswoude
ce73d3a8a5 Fix #6390: Crash when renaming rides in multiplayer 2017-10-14 14:21:06 +02:00
Michael Steenbeek
7f9c25a7a9 Use constant for LOCATION_NULL, split off location stuff to Location.h 2017-10-13 22:23:07 +02:00
Michał Janiszewski
ab3835719a Compile peep and staff logic as C++ 2017-10-13 10:06:36 +02:00
Michael Steenbeek
42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michael Steenbeek
17557569d0 Turn 'unlock all prices' into a regular option
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
Duncan
f97068d0b6 Fix #6420: Demolishing rides refunds twice as much as the ride costs to build 2017-10-11 07:58:49 +02:00
Michał Janiszewski
16bd2c6439 Fix #6430: endless vomiting
Mistake during refactor
2017-10-10 14:02:50 +02:00
Michael Steenbeek
6621faf27a Fix #6196: Guest's energy underflows and never decreases
Issue caused by using max where min was intended.
This also reverts an earlier change in capping the energy target, since it seems to max out at 255, unlike energy itself.
2017-10-10 10:06:56 +02:00
Michael Steenbeek
5cc5761a25 Fix #6414: raise maximum launch speed of the Corkscrew to 96 km/h 2017-10-10 09:53:36 +02:00
Michał Janiszewski
c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
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