1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Commit Graph

538 Commits

Author SHA1 Message Date
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
78b788e660 Merge pull request #4282 from marijnvdwerf/clean/data-15-maze
[Cleanup] Integrate peep maze data
2016-08-14 14:27:19 +01:00
Marijn van der Werf
a57a674522 Fix peeps not walking 2016-08-14 14:04:09 +01:00
Marijn van der Werf
82d0d229ce Use word_981D6C 2016-08-14 13:12:07 +01:00
Marijn van der Werf
9ed4f86f38 Rename addresses to match actual location 2016-08-14 12:30:53 +02:00
Marijn van der Werf
d1fd11d5fd Integrate data at 0x00981FE1 2016-08-14 12:28:03 +02:00
Marijn van der Werf
718347eddc Integrate data at 0x00981FF1 2016-08-14 12:09:02 +02:00
Marijn van der Werf
37b426659e Integrate data at 0x00981FD1, 0x00981FD3 2016-08-14 11:53:32 +02:00
Marijn van der Werf
533696bb58 Integrate data at 0x00981F4C, 0x00981F4E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
92403cf4a6 Integrate data at 0x00981F2C, 0x00981F2E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
9127a67229 Integrate data for peep_update_ride_sub_state_15
0x00981F0C, 0x00981F0E, 0x00981F1C, 0x00981F1E
2016-08-14 11:39:11 +02:00
Marijn van der Werf
ad29a7006b Integrate data at 0x00981D7C, 0x00981D7E 2016-08-14 11:39:11 +02:00
Ted John
572999e8e3 Merge pull request #4269 from marijnvdwerf/clean/data-11
Integrate various data
2016-08-12 23:38:09 +01:00
Marijn van der Werf
32f6f36d1d Integrate data at 0x00982134 2016-08-12 22:44:41 +02:00
Marijn van der Werf
c60fd16617 Integrate data at 0x00982004 2016-08-12 22:44:41 +02:00
Marijn van der Werf
afde0df6f6 Integrate data at 0x009822F4, 0x00982310 2016-08-12 22:44:41 +02:00
Marijn van der Werf
da4307a6c6 Integrate nausea tolerances 2016-08-12 22:44:41 +02:00
Marijn van der Werf
af629d7867 Integrate discard containers 2016-08-12 22:44:40 +02:00
Marijn van der Werf
7c737e8538 Integrate crowded thoughts 2016-08-12 22:44:40 +02:00
Marijn van der Werf
5690b95ff0 Integrate peep clothing colours 2016-08-12 22:44:40 +02:00
Marijn van der Werf
ace68bb491 Use byte_98D800 2016-08-12 22:36:47 +02:00
Marijn van der Werf
443d508fb0 Include some peep data 2016-08-07 20:13:46 +02:00
Marijn van der Werf
b428a95724 Ride classes 2016-08-07 20:11:43 +02:00
Michał Janiszewski
0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Marijn van der Werf
082e4c76fa Include data from 0x0097D7CB 2016-08-05 11:53:44 +01:00
Yaroslav Tretyakov
54974b3e6d Fix ride music related desyncs
I think this might fix #1968 finally.
2016-08-04 22:56:47 +01:00
Marijn van der Werf
51f4988e06 Clean/include peep/staff vars 2016-08-02 23:32:58 +02:00
Michał Janiszewski
2b85801fc3 Integrate 97e1bc 2016-08-01 23:14:42 +02:00
zsilencer
5d04e5e03e Multiplayer desync stuff 2016-08-01 20:47:21 +02:00
Michał Janiszewski
e19cf781b1 Verify inputs to various functions 2016-07-24 13:18:50 +02:00
Michał Janiszewski
8446ae9026 Check for NULL scenery 2016-07-18 23:46:59 +02:00
Michał Janiszewski
bb2ae29699 Limit valid sprite indices when renaming peeps 2016-07-18 21:18:23 +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
Michał Janiszewski
4db876c184 Add missing data to SpriteTypeToSlowWalkMap
* Add missing data to SpriteTypeToSlowWalkMap
2016-07-17 17:47:22 +01:00
Ted John
304d6d9304 Fix #4110: guests still get charged for rides 2016-07-16 16:27:49 +01:00
Michał Janiszewski
1673163bc2 Integrate path map elements in get_ride_queue_end 2016-07-16 15:12:51 +01:00
Michał Janiszewski
601f344b40 Integrate g_music_tracking_viewport 2016-07-16 13:07:01 +01:00
Ted John
3a8b0c662f import peep sprite data 2016-07-15 23:56:51 +01:00
Ted John
79cc7ff250 use PeepThoughtToActionMap for 0x00981DB1 2016-07-15 22:58:32 +01:00
Ted John
8f4ba85b89 import unk_982134 2016-07-15 22:55:19 +01:00
Ted John
c8e3c338f2 import unk_981D8C and unk_981D8F 2016-07-15 22:46:27 +01:00
Ted John
4cee21a515 import PeepThoughtToActionMap data 2016-07-15 22:42:29 +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
Ted John
04340021f6 Fix #4071: Guests paid when free entry park flag
Make most usages of park entrance fee use a common function which does the necessary checks.
2016-07-13 19:48:42 +01:00
Ted John
c09780967b Fix #4069: Assertion when applying no-money
There was one case where it called peep_spend_money without checking if money was enabled
2016-07-13 19:08:35 +01:00
Josue Acevedo
d52fabb9d7 Fix guest sorting with guests that have a generated name. (#4028) 2016-07-12 20:17:59 +02:00
Michał Janiszewski
96376255f6 Fix #3790: Guard against null ride types in peep AI 2016-06-17 21:19:25 +01:00
Duncan
f339bd6e7a Merge pull request #3465 from marijnvdwerf/paint-setup/path
Path paint
2016-06-15 07:10:55 +01:00
Marijn van der Werf
b13f499d5b Fix typo in enum value 2016-06-12 19:01:16 +02:00