Michael Steenbeek
4224193d68
Clean up ride groups
2017-10-06 10:29:24 +02:00
Christian F. Coors
ecc6bf5120
Fix scrolling with mouse wheel
2017-10-06 10:17:43 +02:00
Michał Janiszewski
07dbdfbd34
Make GameActionResult destructor virtual to ensure proper teardown
2017-10-06 07:31:40 +02:00
ζeh Matt
0423397c34
Fix #6376 : RideCreateAction::Query ignores valid secondary colour input
2017-10-05 20:46:50 +02:00
Michael Steenbeek
f2195b4300
Use constants and proper formatting in colour.[ch]
2017-10-05 15:55:57 +02:00
Aaron van Geffen
af3fa4b0ff
Options window: fix background colour for some dropdowns
2017-10-05 14:11:37 +02:00
Michał Janiszewski
1089bd2d56
Increase network version
2017-10-05 10:42:44 +02:00
Oli414
d39c80da42
Fix code style. Fix error text
2017-10-05 10:42:44 +02:00
Oli414
59eae9defa
Add missing include
2017-10-05 10:42:44 +02:00
Olivier Wervers
4bdfb31fcb
Remove changes from libopenrct2.vcxproj
2017-10-05 10:42:44 +02:00
Oli414
857faec100
Tabs to spaces
2017-10-05 10:42:44 +02:00
Oli414
0760ea6aa8
Renamed duplicate region
2017-10-05 10:42:44 +02:00
Oli414
8fa82493cb
Move set_staff_name game command functionality to game action
2017-10-05 10:42:44 +02:00
Oli414
14f59c3d9b
Move set_guest_name game command functionality to game action
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
9ff0e22aee
Whitespace fixes
2017-10-05 10:42:44 +02:00
ZehMatt
d8d7d97f74
Fix references on deprecated GAME_COMMAND_DEMOLISH_RIDE
2017-10-05 10:42:44 +02:00
Michał Janiszewski
aba3c270bb
Game actions fixes
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
Michał Janiszewski
4841e2c6f3
Improve verifying validty of new game action
2017-10-05 10:42:44 +02:00
ZehMatt
1dd5d3a3f5
Verify there is an empty slot for a new ride
2017-10-05 10:42:44 +02:00
Michał Janiszewski
fe636b5ef4
Rebase fixes
2017-10-05 10:42:44 +02:00
Michał Janiszewski
23bfb9b306
Remove superfluous move
2017-10-05 10:42:44 +02:00
Michał Janiszewski
b70dd97234
Fix rebase errors
2017-10-05 10:42:44 +02:00
Michał Janiszewski
05e7ef7791
Add missed forward declarations
2017-10-05 10:42:44 +02:00
ZehMatt
bf0bc77dfc
Refactor SetParkEntranceFeeAction to use constructor for parameters.
...
Add RideSetNameAction.
Support of string serialisation.
Check requested status for ride in Query.
Add RideDemolishAction.
2017-10-05 10:42:44 +02:00
ZehMatt
995c0d0a6b
Refactor SetParkEntranceFeeAction to use constructor for parameters.
...
Add RideSetNameAction.
Support of string serialisation.
2017-10-05 10:42:44 +02:00
ZehMatt
ce54b41aba
Fix single player pre-designed rides not working.
...
Move ride_create_command into GameActionCompat
Refactor GameActions to return the GA_FLAGS instead of using the const value.
Refactor passing params to GameActions over constructor.
2017-10-05 10:42:44 +02:00
ZehMatt
89c020d3fe
RideCreateAction takes the colours now as input.
...
Add ride_get_entry_index, same code is used at multiple spots.
Rename variable 'rei' to 'rideEntryIndex'
2017-10-05 10:42:44 +02:00
ZehMatt
e78e972de5
Moved some of RideCreateAction checks into the Query member.
2017-10-05 10:42:44 +02:00
Michał Janiszewski
cb7c0d1df4
Use std::move for RideCreateAction::Execute
...
Fixes compilation with ICC and Xcode 8
2017-10-05 10:42:44 +02:00
Michał Janiszewski
bdf8c001e4
Remove unused function
2017-10-05 10:42:44 +02:00
Michał Janiszewski
6ddac382be
Fix copyright dates
2017-10-05 10:42:44 +02:00
Michał Janiszewski
5e523c723f
Lift -Wsuggest-final-X for game actions
2017-10-05 10:42:44 +02:00
Ted John
d97123073c
Backport fixes to ride_create
2017-10-05 10:42:44 +02:00
Ted John
4e765a81b1
Tabs to spaces
...
[ci skip]
2017-10-05 10:42:44 +02:00
Ted John
ed133df13f
Fix build errors
2017-10-05 10:42:43 +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
02b77af646
More styling fixes
2017-10-05 10:42:43 +02:00
Ted John
ac1e889014
Tabs to spaces
2017-10-05 10:42:43 +02:00
Ted John
675b1b8cf4
Do style fixes
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
Ted John
84f55c75aa
Revert change to libopenrct2.vcxproj
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
ZehMatt
5283804b37
Remove unnecessary type conversation.
...
Add override attributes.
Changed GameActionResult data storage to union, happy compilers.
2017-10-05 10:42:43 +02:00
ZehMatt
c73665a003
Add deprecation warnings in old game_command functions.
...
Removed line that didn't belong there.
2017-10-05 10:42:43 +02:00
ZehMatt
22750a95e4
Fix using rct_xy8 incorrect.
2017-10-05 10:42:43 +02:00
ZehM4tt
f29dc3ff34
Fixed base class serialise not being called.
...
Implemented RideSetStatus game action.
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
Michał Janiszewski
60e72e6dbc
Mark GameAction methods as overriding
2017-10-05 10:42:43 +02:00
Michał Janiszewski
2aa7924b30
Add required virtual destructor to IGameAction
2017-10-05 10:42:43 +02:00
ZehM4tt
f20a6863cd
Simplified registration of game actions and avoid duplicate code.
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
Michał Janiszewski
634683d891
Mark GameActions::Register as static
2017-10-05 10:42:39 +02:00
duncanspumpkin
fd00096b3b
Fix tabs spaces
2017-10-05 10:42:39 +02:00
duncanspumpkin
205a1c9e12
Depreciate game command. Fix error messages
2017-10-05 10:42:39 +02:00
Michał Janiszewski
5103113740
Mark Factory variables as maybe_unused
2017-10-05 10:42:38 +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
Ted John
c483c319fc
Make dummy global static
2017-10-05 10:42:38 +02:00
Ted John
bb4a482bfc
Start writing new game action execution
2017-10-05 10:42:38 +02:00
Ted John
33397005b0
Add tag and flags to game action
2017-10-05 10:42:38 +02:00
Ted John
c89a00badd
Write initial new game action infrastructure
2017-10-05 10:42:38 +02:00
Olivier Wervers
a75d727685
Implement #5826 : Add command to show map data counts and limits
2017-10-05 10:00:32 +02:00
ZehMatt
5aa8ae5c6e
Fix viewport coordinates being set too late.
...
Fix headless always sending 0,0 viewport coordinates.
2017-10-05 09:57:08 +02:00
Jeroen D Stout
e2523a3d8d
Make sprite export start at 0 to correspond with in-game sprite id
2017-10-04 19:49:25 +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
Michael Steenbeek
055ecccf36
Clean up more track flags
2017-10-04 17:14:53 +02:00
Olivier Wervers
d47f758b0e
Fix #6118 , #6245 , #6366 : Tracked animated vehicles not animating
2017-10-04 14:51:48 +02:00
Tyler Ruckinger
d33803b5d0
Ensure title sequence user data path exists
2017-10-03 09:32:11 +02:00
Gymnasiast
e6faf6b7c4
Fix #6201 , #6250 : custom RCT1 scenarios cause empty scenario list entry
...
The scenario repository did not correctly handle custom RCT1 scenarios.
They were not listed, but if they existed, an empty entry would appear in the scenario list.
This fixes both issues, and also prints a warning message, should this ever happen again.
2017-10-03 07:48:02 +02:00
ZehMatt
5f076e8103
Compile paint code as cpp.
...
Style fixes.
2017-10-02 21:42:11 +02:00
Michael Steenbeek
0fb5f186ee
Do not hardcode music length
2017-10-02 21:40:49 +02:00
Olivier Wervers
45944cb037
Fix #6202 : Avoid breaking occupied benches
2017-10-02 17:18:51 +02:00
Michael Steenbeek
ccefc98491
RCT1 theme: make Options and Shortcut windows brown
2017-10-02 11:45:28 +02:00
LRFLEW
11cdcea72b
Fix RCTC g1.dat rendering issues
2017-09-30 19:18:31 -05:00
Olivier Wervers
1de4b2650b
Fix #6229 : Scenery costs nothing in track designs
2017-09-30 00:11:14 +02:00
Michael Steenbeek
0c4d184a9a
Use constants for map elements and the scenery window
2017-09-29 20:25:17 +02:00
Olivier Wervers
f2c9fc58d5
Implement #1329 : Add remove-unused-objects command ( #6324 )
2017-09-29 16:32:30 +02:00
LRFLEW
e177811115
Add RCTC g1.dat support
2017-09-29 10:44:23 +02:00
Michael Steenbeek
b2968ce8b0
Fix #6320 : Crash when CSS1.DAT is absent
2017-09-29 10:43:47 +02:00
Michael Steenbeek
eea40edf0a
Use more constants
2017-09-29 10:06:05 +02:00
Michał Janiszewski
5ab9f938a7
Update files missed in the great extern "C" cleanup of 2017
2017-09-28 23:29:16 +02:00
Gymnasiast
6c9e73bff2
Allow loading objects from RCTC
...
These are technically same as those from RCT2, but with a .POB extension, rather than .DAT
2017-09-28 21:42:58 +02:00
Jeroen D Stout
71317c5f7a
Adapt to coding convention
2017-09-28 17:37:48 +02:00
Jeroen D Stout
35b9038807
Refactor adjacency distance constant + loop fix
2017-09-28 17:37:48 +02:00
Jeroen D Stout
3b7ec7daa1
Alllow check_for_adjacent_station to check farther
2017-09-28 17:37:48 +02:00
Jeroen D Stout
a6993bdb9f
Introduce constant for max adjacency distance
2017-09-28 17:37:48 +02:00
Jeroen D Stout
202bea59c8
Increased network stream version
2017-09-28 17:37:48 +02:00
Jeroen D Stout
b032aaacac
Deal with map size / multiple stations
2017-09-28 17:37:48 +02:00
Jeroen D Stout
015d95749c
Increase ride synchronisation range
2017-09-28 17:37:48 +02:00
Michael Steenbeek
950ab0062f
Unify "separate ride" and "separate ride name" flags
...
They're always set together, and only setting one will probably cause undefined behaviour. Deprecate the "separate ride name" flag and instead check the "separate ride" flag in all places.
2017-09-28 17:37:07 +02:00
Michael Steenbeek
289e154fe4
Fix #6315 : Not all researched items in S4 are available
2017-09-28 16:24:44 +02:00
ZehMatt
5187946bc9
Fix #6309 : Lightfx being enabled with incompatible drawing engine.
2017-09-28 08:01:25 +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
Martin Müller
e38a77da2a
Set gScenarioFileName when loading an RCT1 park
...
This fixes bugs when completing an RCT1 scenario, where the highscore
would be saved for the wrong park because gScenarioFileName hasn't been updated on load.
2017-09-26 15:53:06 +02:00
ZehMatt
c238265834
Minor performance improvements
2017-09-26 15:52:04 +02:00
Marijn van der Werf
09517caa88
Fix #6300 : Saving track triggers assertion
2017-09-25 22:14:50 +02:00
Michael Steenbeek
18db4a5274
Implement #6292 : Allow building queue lines in the the Scenario Editor
...
Also format the file properly and do a bit of clean up.
It's now also possible to build queue lines for editor-only paths.
2017-09-25 22:09:40 +02:00
Marijn van der Werf
8a47308786
Check whether intent data is set before accessing
2017-09-24 22:41:49 +02:00
Marijn van der Werf
efa87bf931
Try different opaque pointer
2017-09-24 22:41:49 +02:00
Marijn van der Werf
9d80f7efed
Apply recommended fixes
2017-09-24 22:41:49 +02:00
Marijn van der Werf
7795ec35dd
Add assertions to Intent
2017-09-24 22:41:49 +02:00
Marijn van der Werf
11787d4ce4
Allow opening guest list
2017-09-24 22:41:49 +02:00
Marijn van der Werf
34ee3df318
Refactor intent
2017-09-24 22:41:49 +02:00
Marijn van der Werf
47e65d1ab1
Finish rebase
2017-09-24 22:41:49 +02:00
Marijn van der Werf
227ee1f914
Add logging for missing window handling
2017-09-24 22:41:49 +02:00
Marijn van der Werf
6df955dd27
Add missing window initializers
2017-09-24 22:41:49 +02:00
Marijn van der Werf
162eea0924
[fixup] Cast pointer
2017-09-24 22:41:49 +02:00
Marijn van der Werf
7ede9a3f58
Add extra casts
2017-09-24 22:41:49 +02:00
Marijn van der Werf
9d93d28efb
Change method argument type
2017-09-24 22:41:49 +02:00
Marijn van der Werf
257c9d60d5
Fix imports
2017-09-24 22:41:49 +02:00
Marijn van der Werf
b7164c5eac
Rename intent extra keys
2017-09-24 22:41:49 +02:00
Marijn van der Werf
619733ba05
Move track design windows
2017-09-24 22:41:49 +02:00
Marijn van der Werf
d18e59ff17
Move loadsave dialog
2017-09-24 22:41:49 +02:00
Marijn van der Werf
9b1b2b5c62
WIP window moving
2017-09-24 22:41:49 +02:00
Marijn van der Werf
59e1a8ac25
Trying to use intents
2017-09-24 22:41:49 +02:00
Marijn van der Werf
700a82e200
Make more data and functions static
2017-09-24 22:41:49 +02:00
Marijn van der Werf
ac910a5979
Move Error, Campaign and Ride Demolition windows
2017-09-24 22:41:49 +02:00
Marijn van der Werf
a49a777047
Move Banner, Player and Sign windows
2017-09-24 22:41:49 +02:00
Marijn van der Werf
8503b8e204
Move Finances and Park windows
2017-09-24 22:41:49 +02:00
Michał Janiszewski
cbeeea2a49
Remove workaround for mingw
...
We have udapted MinGW-64 in use, so the workaround should not be needed
anymore
2017-09-22 23:26:02 +02:00
Michael Steenbeek
1fd1d8c26b
Move editor to C++; add defines for object limits
2017-09-22 07:56:24 +02:00
Michael Steenbeek
5c2870c0e0
Name RCT2_LANGUAGE_ID_8 (Japanese)
2017-09-21 10:34:31 +02:00
Michael Steenbeek
c8d6cf12e3
Add experimental Arabic language support
2017-09-21 09:24:06 +02:00
Michael Steenbeek
fa5ec031f1
Clean up ride naming
2017-09-20 21:19:55 +02:00
Michał Janiszewski
00fd18809c
Move extern "C" {} blocks to headers ( #6282 )
2017-09-18 17:05:28 +02:00
Michael Steenbeek
6ab0f2f905
Name some rct_ride_entry_vehicle properties
2017-09-15 18:25:28 +02:00
Michael Steenbeek
c4a89e4192
Merge pull request #6269 from Gymnasiast/small-cleanup
...
Slightly refactor loading of vehicle entries
2017-09-14 15:17:04 +02:00
Michael Steenbeek
a4802983c2
Make var_02/_03 calculation methods private and static
2017-09-14 14:30:09 +02:00
Michael Steenbeek
4164d3aedd
Clarify comment
...
[ci skip]
2017-09-14 14:12:13 +02:00
Michael Steenbeek
8954303d99
Add comment about special_frames
...
[ci skip]
2017-09-14 14:10:35 +02:00
Michael Steenbeek
9cba5436e5
Split off frame calculations; don't set var_02 and _03
2017-09-14 14:07:55 +02:00
Michael Steenbeek
98e15f1cd9
Rewrite confusing if statement
2017-09-14 13:48:14 +02:00
Michael Steenbeek
735b96ac18
Bump network version for the 'Enable all drawable elements' cheat
2017-09-13 22:51:01 +02:00