1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Commit Graph

400 Commits

Author SHA1 Message Date
Gymnasiast
17626dbb1a Increase station limit to 32, fix display of plural 2016-05-06 18:30:44 +02:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Gymnasiast
6c7f685b08 More occurrences of shop_item 2016-05-03 07:26:29 +02:00
Gymnasiast
b37d4804ce Integrate gErrorType and gErrorStringId, fixes 2016-05-03 07:25:19 +02:00
Gymnasiast
5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Michał Janiszewski
1cd1144dd5 Janitorial fixes
Mostly style fixes, includes minor change to make sure spinner's down
button gets shown, update to string IDs, network version and making sure
correct string gets selected based on car count.
2016-05-02 22:35:08 +02:00
X7123M3-256
d191e6a8c3 Fix indentation (again) 2016-05-02 21:42:17 +02:00
X7123M3-256
a34c3b8e19 Fix indentation (again) 2016-05-02 21:42:16 +02:00
X7123M3-256
80f83f9aec Fix indentation (again) 2016-05-02 21:42:16 +02:00
X7123M3-256
9c7de18292 Fix indentation 2016-05-02 21:42:16 +02:00
X7123M3-256
7f9b35a04e Prevent vehicle_colours from being accessed out of bounds (the last element will be used instead) 2016-05-02 21:37:09 +02:00
X7123M3-256
fd5bb09271 Remove calls to ride_entry_get_train_layout and replace with calls to ride_entry_get_vehicle_at_position 2016-05-02 21:37:08 +02:00
X7123M3-256
34a67436cd Fix spacing around operator 2016-05-02 21:37:08 +02:00
X7123M3-256
35ccd0b8e1 Implement disable train length limits cheat 2016-05-02 21:37:08 +02:00
Ted John
fc938892d8 integrate variables for command position and expenditure 2016-04-24 17:53:39 +01:00
Ted John
98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John
ee509caf35 integrate game paused variable and refactor 2016-04-23 13:34:55 +01:00
Ted John
4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John
1950fad315 add global macros for date 2016-04-23 11:03:34 +01:00
Ted John
3bd21240ed add global macros for climate variables 2016-04-23 10:53:48 +01:00
Duncan
ffcb01da91 Merge pull request #3381 from Wirlie/develop
Revert uint assignment from 7eb3a90, Fixes #3367
2016-04-23 07:47:51 +01:00
Ted John
467513616d add global macro: gCurrentTicks 2016-04-23 02:49:24 +01:00
Ted John
35e5c49454 add global macro: gScenarioObjectiveType 2016-04-23 02:14:14 +01:00
Ted John
b4b3dc7dbe add global macro: gParkValue 2016-04-23 01:50:12 +01:00
Ted John
307cb9e08b add global macro: gParkFlags 2016-04-23 00:51:22 +01:00
Wirlie
1112112157 Revert uint assignment from 7eb3a90.
For solve the another problem (the reason of that this code has been modified at 7eb3a90), I replaced the left shift operator with a multiply (suggested by zsilencer) to prevent a 'undefined behaviour', Fixes #3367.
2016-04-22 16:00:05 -05:00
janisozaur
7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +01:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01: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
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
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
0fd42f408a Extract new struct 2016-04-03 14:53:17 +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
4f59c752d6 fix #3223: invalid vehicle type warnings when placing any track design 2016-04-02 23:23:34 +01:00
Michał Janiszewski
331f9fe03b Secure memory accesses, initialise variables 2016-04-01 09:38:40 +02: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
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
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
Ted John
09f0caf8c1 Merge pull request #3111 from janisozaur/ride-type
Be more careful when dealing with hacked rides. Fix #3109
2016-03-08 18:33:29 +00:00