1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Commit Graph

1773 Commits

Author SHA1 Message Date
Broxzier
6c29bdbf21 CppCheck fixes 2016-12-24 13:10:03 +01:00
Michał Janiszewski
50d26d87eb Initialise fields to safe values 2016-12-19 23:59:03 +01:00
Marijn van der Werf
2fca2adbc1 Fix prepended wooden supports 2016-12-19 18:45:08 +01:00
Ted John
4669756d3e Merge pull request #4792 from IntelOrca/feature/title-sequence-zip
Read title sequence from ZIP files
2016-12-16 15:31:18 +00:00
jensj12
b2dee3ad9f Fix high lateral G-forces penalty 2016-12-16 12:21:00 +01:00
Ted John
870a8fc6b6 Move addresses and hook into rct2 sub directory 2016-12-16 01:25:05 +00:00
Ted John
c5899139d7 Move scenario sources to sub directory 2016-12-16 01:25:05 +00:00
Ted John
11a2b98e58 Remove title editor specific code from loadsave window
This involved removing any logic performed in loadsave for loading saved games and moving them to callback routines for all uses.
2016-12-16 01:25:03 +00:00
Ted John
3e21e56b9e Use correct directory base 2016-12-14 00:32:06 +00:00
Ted John
7811987ad1 Use PlatformEnvironment for track design repository 2016-12-14 00:32:06 +00:00
Ted John
abc3835d7b Rename openrct2.c h to OpenRCT2.c h 2016-12-14 00:32:06 +00:00
Ted John
1935f79507 Don't return pointer to local variable 2016-12-13 21:48:27 +00:00
Michał Janiszewski
1ae2ca54f7 Sort includes 2016-12-01 16:03:16 +01:00
Michał Janiszewski
54e622659d Extract common parts from rct2.h to common.h 2016-12-01 16:03:16 +01:00
Michał Janiszewski
7eb008b546 Ensure includes are used when needed 2016-12-01 09:09:15 +01:00
Duncan
a9eb93ce88 Merge pull request #4809 from duncanspumpkin/refactor
Refactor place scenery
2016-11-29 21:50:30 +00:00
duncanspumpkin
329c8b1f76 Fix motion simulator vehicle colours.
Due to a mistake during implementation the vehicle colour of the motion simulator was the wrong way around. The trim colour was applied to the body and vice versa. Issue noticed by reddit user.
2016-11-28 17:51:37 +00:00
Michael Steenbeek
30c61345d8 Fix special cases for ride photos when looking up uniform price, fixes #933 2016-11-28 10:27:42 +01:00
duncanspumpkin
d09238ac0c Label known register uses 2016-11-22 18:48:32 +00:00
Gymnasiast
89f6a7eaf9 Raise Junior RC height limit to 14 units, fixes #4686 2016-11-14 19:38:04 +01:00
Duncan
6a90f9eb40 Fix #4777: Check for enough free elements before placement
Previously multi tiled placements would only check for one free element before placing. This would cause a crash when it failed to allocate the next element on maps that were close to reaching their full capacity. Renamed sub_68B044 to map_check_free_elements_and_organise and gave it an argument value to check for enough free elements.
2016-11-13 22:44:08 +00:00
Michał Janiszewski
3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Michał Janiszewski
0299844b13 Rename some static tables 2016-11-13 19:36:03 +01:00
Michał Janiszewski
5524979289 Add include guards to headers missing it 2016-11-13 19:36:03 +01:00
Marijn van der Werf
06b128bac7 Name more palettes 2016-11-13 01:51:27 +01:00
Marijn van der Werf
1ce2242bb3 Start cleaning up filters 2016-11-13 01:45:43 +01:00
duncanspumpkin
3da10b7d7d Use correct comparison for previous commit 2016-11-09 19:16:25 +00:00
duncanspumpkin
2f6f728200 Fix #4714. Prevent invalid peep access on closed golf rides.
When a golf ride is closed it will remove the peep from the vehicle (the ball). Due to the way vehicles leave stations the vehicle would still travel to the next hole but when it tried to update the peeps action it would crash. This skips updating the peeps action but lets the ball still continue. This will cause a phantom ball to go around the golf course until all the vehicles are back in their closed state.
2016-11-09 19:00:09 +00:00
Michał Janiszewski
9c818ea2dc Reorder fields to reduce padding (#4758)
Reduces padding:
* In `rct_viewport` from 5 to 1
* In `rct_ride_entrance_definition` from 4 to 0
2016-11-06 21:06:02 +01:00
Michał Janiszewski
3653baf720 Remove needless const for returned values 2016-11-04 09:44:13 +01:00
duncanspumpkin
cc0803d466 Prevent crash #4694. Crash in ride_get_entrance with no station
Issue is being caused by deleting the station track without removing the station track entry in the ride struct. This will prevent the crash but this should not happen in practice.
2016-11-03 18:23:42 +00:00
Michał Janiszewski
593230b19c Rename 65DDD1 to turns_ratings 2016-10-30 22:09:59 +01:00
Michał Janiszewski
ccc3297424 Rename 65E1C2 to sheltered_ratings 2016-10-30 22:08:51 +01:00
Michał Janiszewski
ff8fa26eab Fix argument values to ride_ratings_apply_65E1C2 2016-10-30 22:06:35 +01:00
zsilencer
3d712ddc58 Give names to _currentTrackSelectionFlags flags 2016-10-26 16:19:56 -06:00
zsilencer
1b47bdd180 Fix desync caused by provisional track piece peep interaction 2016-10-26 15:38:54 -06:00
zsilencer
24bd56af02 Fix desync caused by provisional ride entrance/exit peep interaction 2016-10-26 15:01:50 -06:00
Ted John
5699b9e4ed Merge pull request #4685 from marijnvdwerf/fix/paint-5
Combine Junior RC and Water RC drawing
2016-10-25 12:14:03 +01:00
Ted John
aef32c0fba Merge pull request #4696 from IntelOrca/render/night-lights
The light effects mod branch #3798 by @JeroenDStout has become quite out of date. I plan to properly implement it, but first I want to merge in what we have already, so that I can branch off develop again and rebase (currently rebasing this branch is too difficult, far too many commits).

Most code that this is merging is protected by the __ENABLE_LIGHTFX__ directive, so it should not make any difference until its time to enable it via a new pull request.

I have isolated it as much as possible to lightfx.c.
2016-10-25 12:12:48 +01:00
Michał Janiszewski
73aede6052 Fix memory leak in TrackDesignRepository 2016-10-23 22:46:59 +02:00
Marijn van der Werf
e8e2039832 Fix GCC 2016-10-23 14:52:32 +02:00
Marijn van der Werf
b868cccea2 Remove pragma mark 2016-10-23 14:41:47 +02:00
Marijn van der Werf
551962123a Reorganise file to minimise diffs 2016-10-23 14:40:11 +02:00
Marijn van der Werf
7d3cd99c0c Combine Junior RC and Water RC drawing 2016-10-23 14:13:11 +02:00
Ted John
712e062bcc Only load tracks if cache is invalid 2016-10-23 01:12:17 +01:00
Ted John
9eaf887546 Fix track manager issues 2016-10-23 00:42:22 +01:00
Ted John
a9db9528ae Fix bitwise and expression 2016-10-22 22:36:45 +01:00
Ted John
cdc45a2848 When renaming, don't change extension 2016-10-22 22:36:45 +01:00
Ted John
7834afb34a Re-write FileScanner for easier cross platform and multiple patterns 2016-10-22 22:36:45 +01:00
Ted John
9118f24778 Rename FileEnumerator to FileScanner 2016-10-22 22:36:45 +01:00