mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,696 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

8696 Commits

Author SHA1 Message Date
zaxcav de00f27195 Fix issues with sync adjacent stations 
Change try_add_synchronised_station() so that adjacent stations are always in the _synchronisedVehicles list; those without a vehicle to sync have vehicle_id == SPRITE_INDEX_NULL.

Change vehicle_can_depart_synchronised() so that adjacent stations are searched for on both sides of the tile; reverse the logic of the return values to make sense with respect to the function name (all except for the case when there are no adjacent stations, which already made sense and was consequently flipped in relation to all other returns; numerous minor fixes to the checks on the departure conditions/exceptions.

In vehicle_update_waiting_to_depart() flip the logic on the call to vehicle_can_depart_synchronised() according with the above change to its return values.

Fixes issues: #4178 and #4182
 2016-08-15 12:13:46 +02:00
wolfreak99 791733a571 See-through paths, Convert gCurrentViewportFlags to uint32 2016-08-15 00:58:15 -04:00
wolfreak99 92e875e007 (Partially) implement gCurrentViewportFlags 2016-08-15 00:28:22 -04:00
Matte A 07989e325f Update contributors.md (#4288) 2016-08-14 22:29:55 +02:00
Marijn van der Werf 98fc9c29b9 Name struct fields 2016-08-14 22:08:20 +02:00
Ted John 6a3853c09f Merge pull request #4287 from marijnvdwerf/clean/data-19 
[Clean] Integrate more peep data
 2016-08-14 20:43:15 +01:00
Marijn van der Werf 30fa5851e5 Return false if there was no space for supports 2016-08-14 21:39:12 +02:00
Marijn van der Werf 3ff3db13f4 Integrate data at 0x0097AF32 2016-08-14 21:39:12 +02:00
Marijn van der Werf d67afb263b Integrate variables for metal supports 2016-08-14 21:39:12 +02:00
Marijn van der Werf 1d883eea2f Integrate data at 0x00992A5C 2016-08-14 21:14:33 +02:00
Marijn van der Werf 5acc9f813b Integrate 0x00992A4C 2016-08-14 21:10:21 +02:00
Marijn van der Werf a56dae2953 Integrate data at 0x00992A3C 2016-08-14 20:27:12 +02:00
Marijn van der Werf de1c69d5d9 Integrate 0x009929C8 and 0x009929CA 2016-08-14 18:05:15 +02:00
Ted John 612de0e567 Integrate 3 more park globals 2016-08-14 16:22:30 +01:00
Ted John 4e7bce99e6 Integrate research globals 2016-08-14 16:16:54 +01:00
Ted John 13ef119c0f Fix gExpenditureTable size 2016-08-14 16:07:03 +01:00
Ted John 15cde6b004 Integrate finance globals 2016-08-14 16:01:43 +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 81fb5f9545 Integrate climate globals 2016-08-14 15:07:32 +01:00
Ted John cb3a023755 Use integrated variables for ride ratings brakes and reversers 2016-08-14 15:01:16 +01:00
Marijn van der Werf 18edae3edf Integrate TerrainPricing 2016-08-14 14:49:32 +01:00
Ted John 9830ca3561 Format code for #ifdefs in ride_ratings.c 2016-08-14 14:48:47 +01:00
Ted John 223d377d09 Integrate ride rating calc data using struct 2016-08-14 14:47:53 +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
Ted John 0a329fd53f Merge pull request #4281 from marijnvdwerf/clean/data-13 
[Cleanup] Integrate more peep_update related data
 2016-08-14 13:11:44 +01:00
Marijn van der Werf 57ea87ed0b Integrate FlatTrackCoordinates 2016-08-14 13:10:44 +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
Marijn van der Werf ac070103b1 Integrate duck frames 2016-08-14 11:37:59 +02:00
Marijn van der Werf 30fd2160d7 Integrate data at 0x0097FEFC 2016-08-14 11:37:59 +02:00
Marijn van der Werf 0ae97d5f4c Integrate WeatherColours 2016-08-14 11:37:58 +02:00
delebota e806a88d71 #4193 Add a server greeting which is displayed to connecting user 2016-08-13 23:15:45 -05:00
Michael Steenbeek 7f71bece5c Clean up some residual usage of non-integrated versions of already integrated variables 2016-08-13 10:52:42 +01:00
YJSoft 4117e9a9e5 fix #4251 Banner font is black when using ttf font (#4272) 2016-08-13 10:29:04 +02:00
wolfreak99 eec0a0cb18 Invalidate Map Generator button when resizing map window (#4271) 2016-08-13 10:06:47 +02:00
LRFLEW dd63caf5aa Disable NTFS Timestamps on Windows zip distributions 2016-08-13 00:18:26 +01:00
Ted John 572999e8e3 Merge pull request #4269 from marijnvdwerf/clean/data-11 
Integrate various data
 2016-08-12 23:38:09 +01:00
Ted John 6b57474945 Merge pull request #4268 from marijnvdwerf/clean/data-10 
Integrate various peep data
 2016-08-12 23:37:48 +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