mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ride-window

Browse Source 
Conflicts:
	src/peep.c
	src/peep.h
This commit is contained in:
IntelOrca
2014-09-15 21:40:14 +01:00
parent cbbf372b7b 830f511a72
commit bd2ff2db05
20 changed files with 1603 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ride_data.c
View File

@@ -492,6 +492,7 @@ const bool rideUnknownData2[0x60] = {
true, // 59 LIM Launched Roller Coaster
};
/* Data at 0x0097E3B8 */
const uint8 rideUnknownData3[0x60] = {
10, // 00 Spiral Roller coaster
10, // 01 Stand Up Coaster