1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Commit Graph

891 Commits

Author SHA1 Message Date
Ted John
cf628ea7cf Merge pull request #3152 from dlee13/cheat-disable-littering
Add cheat to disable littering and refactor peep thought code.
2016-04-19 17:31:58 +01:00
Derek Lee
4d1153669e Refactor peep code
Use constants rather than magic numbers and make identifiers consistent
2016-04-18 23:34:11 -07:00
Marijn van der Werf
6e3375a3d4 Small fixes 2016-04-18 21:18:48 +02:00
Marijn van der Werf
c1572f4f58 Update method signature 2016-04-18 20:20:41 +02:00
Marijn van der Werf
d8c952d503 Clean up code 2016-04-18 20:20:41 +02:00
Marijn van der Werf
db302b89a1 Fix wrong value 2016-04-18 20:20:40 +02:00
Marijn van der Werf
85087f8a86 Draw maze tracks 2016-04-18 20:20:40 +02:00
Duncan
0860cf4540 Merge pull request #3299 from marijnvdwerf/paint-setup/cleanup
WIP Paint setup/cleanup
2016-04-18 18:48:53 +01:00
Marijn van der Werf
e49abad3ff Rename local variables 2016-04-18 15:36:15 +02:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Marijn van der Werf
18a36298b4 Update method signature 2016-04-17 09:42:34 +02:00
Ted John
e5666f214b Merge pull request #3313 from IntelOrca/integrate-ride-session-vars
Integrate ride construction session variables
2016-04-16 14:10:05 +01:00
Yaroslav Tretyakov
90a4cafc87 Fix #3307, ride music discrepancy with original (#3319) 2016-04-16 14:09:22 +01:00
Ted John
63f008566c Merge branch 'master' into develop 2016-04-15 23:25:45 +01:00
Ted John
7b248f0079 integrate ride construction variables
- _currentTrackPrice
- _numCurrentPossibleRideConfigurations
- _numCurrentPossibleSpecialTrackPieces
- _currentTrackCurve
- _currentTrackEndX
- _currentTrackEndY
- _rideConstructionState
- _currentRideIndex
- _currentTrackBeginX
- _currentTrackBeginY
- _currentTrackBeginZ
- _currentTrackPieceDirection
- _currentTrackPieceType
- _currentTrackSelectionFlags
- _rideConstructionArrowPulseTime
- _currentTrackSlopeEnd
- _currentTrackBankEnd
- _currentTrackLiftHill
- _currentTrackCovered
- _previousTrackBankEnd
- _previousTrackSlopeEnd
- _previousTrackPieceX
- _previousTrackPieceY
- _previousTrackPieceZ
- _currentSeatRotationAngle
2016-04-15 20:56:48 +01:00
Ted John
681961eaec change ride construction addresses to defines 2016-04-15 20:35:27 +01:00
Ted John
f73e3ab0e1 integrate footpath construction variables
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
2016-04-15 19:16:48 +01:00
Ted John
84edd049d9 integrate current tool variables:
- gCurrentToolId
- gCurrentToolWidget
2016-04-15 18:26:47 +01:00
Ted John
1b3f46f960 integrate game command error string variables
- gGameCommandErrorTitle
- gGameCommandErrorText
2016-04-15 17:54:46 +01:00
IntelOrca
89ad0cc769 store windows in openrct2 memory and increase max
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
2016-04-14 23:00:35 +01:00
duncanspumpkin
6e4b93a011 Fix #3301. Refactor set_ride_price to prevent pointing at invalid memory. 2016-04-14 20:36:25 +01:00
Marijn van der Werf
cb9b31f873 Remove leading whitespace 2016-04-14 11:53:20 +02:00
Marijn van der Werf
0e5b32bd56 Inline variables 2016-04-14 11:17:39 +02:00
Marijn van der Werf
3bb2214235 Pass 0x009DEA52-0x009DEA56 as parameters 2016-04-14 11:07:41 +02:00
Duncan
9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs
Clean up data use
2016-04-13 12:38:58 +01:00
duncanspumpkin
b0fb2451b4 Fix #3286. Top Spin front support draws correctly now.
Issue caused by mistake when changing the parameter orders of the drawing functions
2016-04-12 20:14:12 +01:00
duncanspumpkin
08de41bdd5 Fix #2710. Chairlifts no longer crash at large y value stations. 2016-04-12 19:28:27 +01:00
IntelOrca
a275649786 fix #3266: too high message given instead of too low
caused by Z parameter not being correctly converted to a signed int 16.
2016-04-09 12:52:12 +01:00
Marijn van der Werf
d809b81ac0 Include ride rating multipliers 2016-04-03 15:43:12 +02:00
Marijn van der Werf
0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
Marijn van der Werf
e4fadc5a66 Include struct at 0x0097DD78 2016-04-03 13:56:06 +02:00
Marijn van der Werf
e9bd7e56fc Identify two used variables in ride_data_4 2016-04-03 04:11:21 +02:00
IntelOrca
8c6e5cd9ae fix #3224: Maze designs clear fences and walls 2016-04-02 23:52:05 +01:00
IntelOrca
d626d9d5f2 fix removing of fences for normal tracks
Building track and track designs did not use correct flag for ghosts therefore always attempting to remove fences and the removing of intersecting fences also did not work correctly. Fix both issues.
2016-04-02 23:51:12 +01:00
IntelOrca
4f59c752d6 fix #3223: invalid vehicle type warnings when placing any track design 2016-04-02 23:23:34 +01:00
Marijn van der Werf
5369111580 Fix #3206: Round support costs properly 2016-04-02 15:27:23 +01:00
Michał Janiszewski
331f9fe03b Secure memory accesses, initialise variables 2016-04-01 09:38:40 +02:00
IntelOrca
1122bff8bc prevent double td6 extension 2016-03-31 20:48:27 +01:00
IntelOrca
40fcfbb405 use localised strings for native file dialogs 2016-03-31 20:41:49 +01:00
IntelOrca
d865e4d453 pass better data in struct to file dialog function 2016-03-31 20:41:47 +01:00
IntelOrca
d690ee6423 fix #3183: opening ride with construction window open
Issue caused with boat hire rides as there is usually a ghost station present when the construction window is open. This causes vehicles to be created in the ghost station. Fixed by closing the construction window before the vehicles are created for the ride.
2016-03-27 14:18:20 +01:00
duncanspumpkin
9018120c17 Change order of parameters in image setup code. 2016-03-25 18:35:00 +00:00
IntelOrca
1e390e4f13 fix mistake in refactor: flags -> uint32 2016-03-23 17:27:49 +00:00
IntelOrca
0ed22f52dd validate vehicle type 2016-03-22 22:40:06 +00:00
IntelOrca
304fd4b84e validate all the other ride operation settings 2016-03-22 21:59:16 +00:00
IntelOrca
16e8609da3 add constants for ride setting id 2016-03-22 21:32:37 +00:00
IntelOrca
64442820b9 validate setting of ride operation mode 2016-03-22 21:12:11 +00:00
duncanspumpkin
8c7dfd3097 Revert #3147 and fix construction issue. Revert most of c7c1f86 and rework to prevent issues 2016-03-21 21:21:43 +00:00
Michał Janiszewski
c1a413c298 Fix crash when opening canoes 2016-03-19 00:47:34 +01:00
duncanspumpkin
a3efbad2ba Fix #3126. Go Karts now correctly choose lanes.
Issue caused by mistake in implementation. Old version could use the variable ride->num_vehicles but in the new version this variable is not incremented each loop so vehicleIndex has to be passed into the vehicle creation functions
2016-03-13 18:07:10 +00:00