Commit graph

500 commits

Author SHA1 Message Date
Ted John
abc3835d7b Rename openrct2.c h to OpenRCT2.c h 2016-12-14 00:32:06 +00:00
Ted John
4d7f52960d Merge pull request #4737 from Broxzier/copy_element
Copy/paste single elements
2016-11-14 21:24:40 +00:00
Michał Janiszewski
3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Marijn van der Werf
1591c1d021 Add more sprite constants 2016-11-13 01:51:28 +01:00
Broxzier
2c334a1882 Clearing clipboard on load, and better UI feedback. 2016-11-09 20:03:20 +01:00
Broxzier
ecc9637bbd Clearing tile inspector clipboard when loading a park 2016-11-09 20:03:19 +01:00
Ted John
94a9c94c1f Fix saving in editor mode
Fixes #4572: Don't create .sv6 autosaves in track designs manager, roller coaster designer and scenario editor
Fixes #4573: "Save this before quitting?" in scenario editor saves to .sv6, not .sc6
2016-10-23 17:42:11 +01:00
Ted John
e4429641a4 Refactor viewport_paint_column 2016-10-22 13:35:21 +01:00
zsilencer
3617c2cb93 Code review 2016-10-19 16:20:13 -06:00
zsilencer
db3aa2b656 Add balloon popping as game command 2016-10-18 13:40:50 -06:00
zsilencer
d74efb23fe Add picking up peeps/staff as game command 2016-10-18 13:40:49 -06:00
Manuel Vögele
ec8d37eead Fix #1943: Placing Handyman/Security Guard/Mechanic In Multiplayer Causes Crash
Open staff window on multiplayer clients when hiring new staff instead of a random visitor.
2016-10-13 22:02:10 +01:00
LRFLEW
e5ff7412e4 Refactor/Improve String and Path Handling 2016-10-09 15:29:58 -05:00
Ted John
862b715003 Fix #4522: Theme music doesn't stop when connected to paused server
Refactor audio initialisation and stop all music and sounds when the screen mode changes.
2016-10-03 18:14:34 +01:00
Ted John
e7ef1ca6e0 Fix #4502: Error messages aren't detailed
Most likely a regression of 097c5b101d. gGameCommandErrorText is now cleared when entering a game command at nest level 0. This should ensure no previous error text is carried over to another game command but also still allow nested game commands to work properly.

Potentially fixes #4480: Inappropriate "Land not owned by park" messages.
2016-10-02 12:49:30 +01:00
Ted John
c333b0c4df Fix #3963: Messages ignore paused game 2016-10-02 01:49:58 +01:00
Ted John
548724a06f Fix #2320: Game crash after opening the inventions list
When loading saved games, fix research items that point to invalid entries.
2016-10-01 14:56:44 +01:00
Ted John
ce74ca9d5d Merge pull request #4460 from manuelVo/fix-walk-on-provisional-path
Fix peep interactions with provisional paths
2016-09-26 12:46:52 +01:00
Manuel Vögele
c531898c3b Peeps no longer interact with provisional paths
In most cases peeps treaded provisional paths like paths that were
already built. Since provisional paths aren't synced in muliplayer mode
this caused a lot of desync.
2016-09-21 21:23:38 +02:00
wolfreak99
c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
Ted John
b8e4f71ab1 Fix #4422: Save overwrite multiplayer
Make sure we reset gFirstTimeSave when we join a new game or exit to title screen.
2016-09-13 23:53:46 +01:00
Ted John
0553ed5b95 Integrate various buffers 2016-09-10 23:01:42 +01:00
Ted John
f81c394c8b Remove unused variables 2016-09-10 15:22:14 +01:00
Ted John
708efdd08c Integrate unknown game variables 2016-09-10 14:46:53 +01:00
Ted John
5893c6da82 Remove loan hash, but keep for S6 export 2016-09-04 15:11:15 +01:00
Ted John
3c80df07d4 Integrate gSavedAge 2016-09-04 15:11:15 +01:00
Michał Janiszewski
f8145b6edc Refactor inclusion of addresses.h
addresses.h is now only included when necessary, limiting scope as much
as possible.
2016-09-03 21:25:19 +01:00
Marijn van der Werf
0ae97d5f4c Integrate WeatherColours 2016-08-14 11:37:58 +02:00
Michał Janiszewski
0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Ted John
c2db79919d Integrate gWindowUpdateTicks 2016-08-06 01:35:46 +01:00
Yaroslav Tretyakov
53a7b87414 Fix #4204: Client trying to get sprite 65535
Caused by a conflict between a multiplayer map download and the title loading a different map.
2016-08-05 22:46:19 +01:00
Michał Janiszewski
b16b6814aa Fix pointer types for 64 bit builds 2016-08-01 23:14:42 +02:00
zsilencer
5d04e5e03e Multiplayer desync stuff 2016-08-01 20:47:21 +02:00
Yaroslav Tretyakov
dd4e4caeaa Reset sprite quadrant placements as part of sprite reset command
This addresses some sources of desyncs in multiplayer.
2016-07-26 22:29:54 +02:00
Niels NTG
017e688fcc New file naming convention for screenshots
- With this change screenshot file names have the following pattern:
save file name +  + YYYY-MM-DD hh-mm-ss + .png

- To get the correct date and time the method platform_get_time and platform_get_date are rewritten and to a version for UTC and a version for local time. This change gave the opportunity to simplify the code generating file names for autosaves.

- SOUND_WINDOW_OPEN is now the new "shutter" sound when taking screenshot.
2016-07-24 20:32:55 +02:00
Michał Janiszewski
9f57c82653 Refactor access to g_sprite_list
Hide g_sprite_list behind accessor function with a check. `assert` is
temporarily disabled, as it breaks nearly every park.
2016-07-17 22:19:34 +02:00
Josue Acevedo
097c5b101d Fix open ride error messages
Some error messages aren't properly displayed because 'gGameCommandErrorText' is replaced with 'STR_NONE' before it's displayed.

This only happens with commands that use multiple commands inside them for do another "job" (or do another check).
2016-07-14 20:00:16 +01:00
Michał Janiszewski
a6d0e6916e Fix function definitions to match their declarations
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
2016-07-14 14:11:49 +02:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Michał Janiszewski
402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Alexander Overvoorde
ca1590c086 Add parameter to utf8_remove_formatting to allow colour codes (fixes #3638) (#3831) 2016-06-09 12:30:32 +01:00
Michał Janiszewski
4955279b7b Synchronise reset_0x69EBE4 over network
Clients calling reset_0x69EBE4 not in sync is a major cause of desyncs,
this change tries to force sync across clients
2016-06-03 00:33:15 +02:00
Ted John
fbcc68dff1 fix #3575: Construction Redirection Bug
Was probably only caused when a player did not have 'Allow unfinished tracks to be tested' enabled. The function was too embeded to work into a callback function, so a new flag is added to say whether the current game command is network sourced or not. This now means the host has to have the unfinished tracks option enabled, otherwise nothing will happen on the client machine. Unfortunately if the host has it enabled and the client doesn't, the command will run on the host game but not the client game and desync. The option, like some of the cheats is game session fixed.
2016-05-30 12:39:17 +01:00
CraigCraig
3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
Hielke Morsink
5d6c8e3b8e Sorting peeps on startup 2016-05-22 21:48:13 +02:00
Hielke Morsink
e948135636 Sort guest list when loading a park 2016-05-22 21:48:11 +02:00
Ted John
781c422c76 integrate tick variables 2016-05-20 22:56:45 +01:00
Ted John
8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John
e73aeb9a42 integrate gGameCommandNestLevel 2016-05-17 21:47:14 +01:00
Ted John
1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00