Commit graph

65 commits

Author SHA1 Message Date
Ted John
20c35b10eb Integrate variables in park.c 2016-09-10 17:46:34 +01:00
Ted John
708efdd08c Integrate unknown game variables 2016-09-10 14:46:53 +01:00
Ted John
3b0b8a12d1 Integrate ride count 2016-09-10 13:40:58 +01:00
Ted John
ae0eb1804c Integrate gParkRatingCasualtyPenalty 2016-09-04 15:44:59 +01:00
Ted John
9478e0a53e Integrate gHistoricalProfit 2016-09-04 15:36:39 +01:00
Ted John
e47b8d906e Integrate gLastEntranceStyle 2016-09-04 15:21:49 +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
Ted John
8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Ted John
ff12c2b326 Integrate animation objects 2016-08-20 22:38:50 +01:00
Ted John
154bb0d475 Integrate guest and park globals
Note: this also fixes loading of landscapes in the editor which did not use the new SC loading code.
2016-08-14 15:50:52 +01:00
Ted John
223d377d09 Integrate ride rating calc data using struct 2016-08-14 14:47:53 +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
zsilencer
5d04e5e03e Multiplayer desync stuff 2016-08-01 20:47:21 +02:00
Michał Janiszewski
155bc054df Fix #4172: Expose ride-type changing capability in UI
This also allows changing ride type in multiplayer games. Very crashy.
2016-08-01 20:30:08 +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
Ted John
1a4bdbcb77 Fix #4141: Newcomers can't join my server
S6 exporter was not being set to export objects for network game transfer.
2016-07-20 18:04:57 +01:00
Michał Janiszewski
010422c7da Load and save sprites to S6 explicitly 2016-07-18 00:23:33 +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
Ted John
4de1f2912a remove unnecessary functions 2016-07-09 15:36:48 +01:00
Ted John
78c6b6a251 remove all unnecessary object resets 2016-07-08 22:58:38 +01:00
Ted John
e8635c1307 prepare for better object loading 2016-07-08 22:58:38 +01:00
Ted John
52928e1e08 protect objects against invalid allocation ids 2016-07-08 22:58:38 +01:00
Ted John
80381cfaa0 fix objects always been packed into saves 2016-07-08 22:58:38 +01:00
Ted John
6f97ec798e remove object entry addresses and use constants 2016-07-08 22:58:38 +01:00
Ted John
202b754d8d fix ride type to ride entry map 2016-07-08 22:58:38 +01:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
2016-06-20 13:46:27 +01:00
Michał Janiszewski
0ec2b001cb Properly save objects, fixes #3886 (#3892) 2016-06-17 08:30:07 +01:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
X123M3-256
706b3db99e Chain lift cheat (#3818)
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
2016-06-07 22:08:38 +01:00
Ted John
a9bf0cdd4e fix #3811: Multiplayer Crash on join
Game was probably being updated with title sequence sprite spatial index.
2016-06-03 22:03:22 +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
Goddesen
0fdeb37053 Fixed space indentation 2016-06-03 00:33:15 +02:00
Goddesen
809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
Ted John
8db0933ee2 fix loading of temperature from SV6 2016-05-28 23:11:57 +01:00
Ted John
76792723ba fix saving of temperature to SV6 2016-05-28 23:08:01 +01:00
Ted John
25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Ted John
a9e4ff98c0 fix #3572: scenario description not loaded for scenarios 2016-05-15 23:26:06 +01:00
janisozaur
feb140b84c Revert part of last commit unsuitable for older compilers (#3584)
Also initialise all the items in gResearchedTrackTypesA and
gResearchedTrackTypesB
2016-05-13 10:36:24 +01:00
janisozaur
87d05f8a89 Fix compiler warnings (#3583)
Includes:
* type casting
* properly counting fields to initialise
2016-05-13 08:05:12 +01:00
Ted John
1229cbd540 clean up s6 struct a bit 2016-05-11 22:30:25 +01:00
Ted John
56da56b374 add global for gPeepWarningThrottle 2016-05-11 22:30:24 +01:00
Ted John
30a044ae72 add globals for gWeeklyProfitAverage... 2016-05-11 19:41:34 +01:00
Ted John
0f1028c92c add global for gResearchedSceneryItems 2016-05-11 19:41:33 +01:00
Ted John
4298f416d2 fix #3558: safely read chunks from S6 files
It appears many saved games have been saved with excess uncompressed data that overflows the S6 structure. This may have been caused by a save bug in an earlier version of OpenRCT2. This will now cap the uncompressed data to the amount expected.
2016-05-10 21:39:12 +01:00
Ted John
aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John
b5c0913b76 add global macros for a few more things, ride rating related and misc 2016-05-09 22:54:22 +01:00
Ted John
5162bc5a0e add global macro for a few ride variables and expenditure table 2016-05-09 22:11:56 +01:00
Ted John
3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00