1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

5034 Commits

Author SHA1 Message Date
Derek Lee
4d1153669e Refactor peep code
Use constants rather than magic numbers and make identifiers consistent
2016-04-18 23:34:11 -07:00
Derek Lee
c4226235e3 Add cheat to disable littering
Add cheat and increment NETWORK_STREAM_VERSION
2016-04-18 23:34:10 -07:00
janisozaur
0b9b976dd6 Cast peep's arguments properly (#3341)
Left-hand side of shift operator determines what's the resultant size of
whole expression. Consider this:

    uint16 p = 65535;
    uint32 q = p << 16;

`q` will be an undefined result, as it will not fit in `uint16` type
anymore, and compiler can optimise it away, unless you cast `p` to be
something which can hold such value, in this case `uint32`.
2016-04-18 23:02:08 +01:00
Ted John
ec50198fa4 Merge pull request #2535 from Gymnasiast/allow-ownership-map-edges
Allow setting ownership of map edges
2016-04-18 22:59:58 +01:00
Duncan
1187b0c534 Merge pull request #3334 from marijnvdwerf/fix-3326
Fix #3326
2016-04-18 22:08:49 +01:00
Hielke Morsink
1dbd313fb4 Moved logic from window to map, inside loops that already existed. 2016-04-18 20:28:34 +02:00
Hielke Morsink
15727b68a9 Recalculating the fences when resizing the map 2016-04-18 20:28:34 +02:00
Gymnasiast
ed9334f944 Rename sub_68AE2A to clear_elements_at 2016-04-18 20:28:34 +02:00
Gymnasiast
01c4c0adc5 Allow setting ownership of map edges 2016-04-18 20:28:34 +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
Marijn van der Werf
a610b372fd Name addresses 2016-04-18 15:35:33 +02:00
Marijn van der Werf
d78077ce22 Convert method call to sub_98197C 2016-04-18 15:34:06 +02:00
Marijn van der Werf
6b951400a5 Fix #3326: Match original implementation of sub_67933B 2016-04-18 12:59:53 +02:00
janisozaur
24eaa0a56d Show units used when streaming the map over network. Fix #3328 (#3331) 2016-04-17 21:27:23 +01:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Marijn van der Werf
eabbdb7e30 Identify structure members 2016-04-17 10:31:50 +02: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
1eb91cb210 OpenRCT2 0.0.4 (stable) 2016-04-15 22:42:57 +01:00
Ted John
e906ab5e95 enable quick save when loading save by command line 2016-04-15 21:52:15 +01:00
Harry Lam
0a65c13e7e Change Japanese Font from msgothic_02.ttf to ms...
gothic.ttc, Fix #3118

In Chinese, there is also a newer MingLiu called "PMingLiu", but it was embedded as a large text pack as ttc. (ttc is a collection file for TrueType Font) And, Windows has **bad** support on TTC, so changing into "msgothic.ttc" should fix the issue.
2016-04-15 21:25:11 +01:00
Ted John
faa2fb4fa1 fix #3314: save custom objects when quick-saving 2016-04-15 21:22:23 +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
janisozaur
fb5d281eaf Check return value from realpath(). Fixes #2483 (#3309) 2016-04-15 18:17:45 +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
duncanspumpkin
51ba0b2e1d Fix #3302. Max ride mode tweak has been broken since a refactor. 2016-04-14 20:27:09 +01:00
IntelOrca
de79bd4599 fix #3294: crash when closing a window being dragged 2016-04-14 17:41:06 +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
Marijn van der Werf
a6cbd392c6 Add parameter to 9c 2016-04-14 10:08:40 +02:00
Marijn van der Werf
e529532ddd Add parameters to sub_98198C 2016-04-14 10:02:17 +02:00
Marijn van der Werf
001dd3bcf6 Fix wrong function call 2016-04-14 09:59:01 +02:00
Michał Janiszewski
da80a691bc Start 0.0.5
changelog.txt not updated yet
2016-04-13 14:20:40 +02:00
Duncan
9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs
Clean up data use
2016-04-13 12:38:58 +01:00
Duncan
945f9ddc8e Merge pull request #2994 from marijnvdwerf/decompile-679074
Decompile sub_679074
2016-04-13 12:37:57 +01:00
duncanspumpkin
2df58747e5 Update version.h to rc1 2016-04-12 20:49:35 +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
duncanspumpkin
be8c84f1c1 Fix grass growth mistake
Nibbles are only 4 bits not 8
2016-04-11 20:04:03 +01:00
IntelOrca
547837f208 fix warnings in crash.cpp 2016-04-10 19:51:44 +01:00
IntelOrca
37d759ffb7 fix #3268: water tool sound even when no change 2016-04-10 13:05:16 +01:00