mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 08:45:00 +01:00
Code Issues Releases Wiki Activity
22,064 Commits 8 Branches 59 Tags
ebedf8317696da68888536b28bdfd8ccc4aee44d
Commit Graph

22064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
0c3de1fa00 Fix potential nullptr dereference (#13149) 
This fixes optimised builds on ARM
 2020-10-10 14:49:33 -03:00
Julia Pinheiro
b628bba704 Close #12429: Refactor OBJECT_ERROR to use strong enum and typo fix in build.sh (#13145) 
* Close #12429: Refactor OBJECT_ERROR to use strong enum

* Typo Fix in build.sh: Unknown
 2020-10-10 16:21:07 +01:00
Duncan
f28907a87d Rework tooltip to be more logical (#13137) 2020-10-10 10:49:56 -03:00
Tulio Leao
61c8cbf88b Fix #13118: Closing construction window resets ride viewport (#13123) 2020-10-10 10:01:28 -03:00
Duncan
1207434afa Add test cases for updated logical sort (#13143) 2020-10-10 13:37:56 +01:00
Tulio Leao
f418acfe19 Merge pull request #11493 from OpenRCT2/Wold-style-cast 
Enable -Wold-style-cast
 2020-10-10 09:15:59 -03:00
OpenRCT2 git bot
63d536a10e Merge Localisation/master into OpenRCT2/develop 2020-10-10 04:05:24 +00:00
Nathan Ikola
7389e10e95 Apply change requested by duncanspumpkin 
Remove or improve comments that do not provide information

Use range based for loops when indexes are not necessary

Use more informative variable names

Load tiles starting from the most recently added tile to better mimic
the recursive logic of the original code

Operate on TileState objects rather than overwriting local variables to
simplify the logic in CaptureCurrentTileState and LoadNextTileElement

Use the existing map_is_edge function versus manually checking for
the map edge in the code

Fix edge culling logic to correctly cull all banner edges

Replace incorrect continue with break

Remove level, distanceFromJunction, and junctionTolerance from function
arguments as they are no longer required
 2020-10-09 20:22:20 -07:00
Nathan Ikola
6a0d089c84 Add vanilla RCT2 behavior for unowning paths 
Implements vanilla RCT2 behavior when unowning paths
by bypassing the early returns when the UNOWN flag is set
and letting the method continue to unown all connected path tiles
 2020-10-09 15:29:27 -07:00
Nathan Ikola
30d65aa433 Fix #12557: no editor hang when looking for edges 
Fixed a bug that caused the scenario editor to hang
when searching for the map edge
 2020-10-09 15:29:27 -07:00
Nathan Ikola
24a8b4be70 Remove recursion in footpath_is_connected_to... 
Refactor footpath_is_connected_to_map_edge to be
iterative rather than recursive
 2020-10-09 15:29:27 -07:00
Nathan Ikola
94731c5f5f Fix #12334: remove goto in footpath_is...map_edge 2020-10-09 15:29:26 -07:00
Bryan DiLaura
7c95f594d3 Close #12413: Refactor VISIBILITY_CACHE to use strong enum (#13136) 2020-10-09 19:12:14 -03:00
Keith Stellyes
3468d1fc6b Close #13125: Selecting the RCT2 files now uses localised dialogs 2020-10-09 21:13:14 +02:00
Duncan
e23c1cded7 Fix logical sort 2020-10-09 20:59:43 +02:00
Duncan
197bb897bb Fix #7748. Move tooltip timeout reset to correct location (#13132) 
* Fix #7748. Move tooltip timeout reset to correct location

Mistake made in implementation

* Add changelog entry
 2020-10-09 16:53:31 +01:00
Duncan
84c9ff833a Move formatter to separate file. Rework GetMeasurement (#13131) 
* Move formatter to seperate file. Rework GetMeasurement

* Add Formatter source files to Xcode project

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-10-09 08:02:07 -03:00
Tulio Leao
bace4d62f8 Specify SYSTEM includes on CMAKE builds 2020-10-09 01:28:34 -03:00
Michał Janiszewski
16f9a2d494 Enable -Wold-style-cast 
Now that casts have been changed to new style, prevent adding more
old-style cast
 2020-10-09 01:02:03 -03:00
Tulio Leao
32c2b7d449 Merge pull request #13122 from vjavs/strong-enum/PeepSpriteType 
Refactor PeepSpriteType to use strong enum
 2020-10-08 23:48:45 -03:00
Duncan
4fb4feb83c Fix missing error message on ride graph (#13129) 
* Fix missing error message on ride graph

Mistake made during implementation meant that the ride graph would not show the error message when the ride had not left the station. Another mistake meant that the tertiary colour of the ride window was not set to green. The tertiary colour was only used by this error message though so was not noticed.
 2020-10-08 15:22:23 -03:00
Tulio Leao
1cf0f91199 Fix #4041: Garbled park option on scenario editor with custom theme (#13126) 
* Fix #4041: Garbled park option on scenario editor with custom theme

* Remove duplicate string draw
 2020-10-08 14:35:25 +01:00
OpenRCT2 git bot
6ce60498c7 Merge Localisation/master into OpenRCT2/develop 2020-10-08 04:04:42 +00:00
aw20368
119bacdd44 Fix #13083: Dialog cropped for conflicting track design rename (#13124) 
Change description drawing from gfx_draw_string_centred to gfx_draw_string_centred_wrapped.
 2020-10-07 23:17:52 -03:00
Ben Johnston
2524e9201a Fixed console cursor rendering. (#13025) 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-10-07 21:45:57 -03:00
Vinicius Sa
01d237ad27 Use helper function GetSpriteBounds 
It's intended to retrieve a rct_sprite_bounds from the global array
g_peep_animation_entries, given PeepSpriteType and PeepActionSpriteType
as parameters.
 2020-10-07 17:34:27 -03:00
Vinicius Sa
80718f1774 Use helper function GetPeepAnimation 
It's intended to retrieve a rct_peep_animation_entry from the global
array g_peep_animation_entries, given PeepSpriteType and
PeepActionSpriteType as parameters.
 2020-10-07 17:34:25 -03:00
Vinicius Sa
4d28901cb0 Refactor PeepSpriteType to use strong enum 
Issue: 12396
 2020-10-07 17:34:21 -03:00
ζeh Matt
61b510db66 Merge pull request #13073 from ZehMatt/refactor/audio-cleanup 
Minor cleanup around audio code
 2020-10-07 21:18:59 +03:00
Tulio Leao
a1b058f648 Fix #10186: Placing multiple saved rides ignores design name (#13120) 2020-10-07 12:45:19 -03:00
Tulio Leao
076544f490 Merge pull request #13084 from vjavs/PVS-Studio/Fixes 
Make some PVS-Studio fixes
 2020-10-07 08:24:59 -03:00
Tulio Leao
2dfef7f476 Close #13107: Use ellipsis over three consecutive dots 2020-10-07 10:21:05 +02:00
Mike Jones
7441001c4e Close #12407: Refactor CHAT_INPUT to use strong enum (#13116) 2020-10-06 21:37:08 -03:00
Tulio Leao
db728d61a7 Fix signed/unsigned mismatch 2020-10-06 21:32:59 -03:00
Matt
7045fd9e9f Minor cleanup 2020-10-07 01:10:53 +03:00
Matt
091145037e Move the audio code into OpenRCT2 namespace 2020-10-07 00:34:42 +03:00
Vinicius Sa
22a1df32d7 Remove redundant assignment in CustomListView::MouseUp 
Reported by PVS-Studio (Warning: V1048).

Fix 7/7.

Issue: 12523
 2020-10-06 18:21:28 -03:00
Vinicius Sa
c6b7893d77 Verify pointer against nullptr before using it 
Reported by PVS-Studio (Warning: V1004).

Fix 6/7.

Issue: 12523
 2020-10-06 18:21:26 -03:00
Vinicius Sa
579e008590 Refactor process_mouse_over() 
- Remove unnecessary local variables and assignments

 - Remove unreached if-statement branch

Reported by PVS-Studio (Warning: V587).

Fix 5/7.

Issue: 12523
 2020-10-06 18:21:24 -03:00
Vinicius Sa
59e9162137 Give a variable for an arithmetic operation used as a condition 
Avoid reverse logic around if-statement for the sake of readability.

Reported by PVS-Studio (Warning: V793).

Fix 4/7.

Issue: 12523
 2020-10-06 18:21:21 -03:00
Vinicius Sa
d583911997 Avoid variable shadowing in derived struct RCT12BannerElement 
Give a more meaningful name to its private member that caused the
shadowing, as well as in the struct BannerElement.

Reported by PVS-Studio (Warning: V703).

Fix 3/7.

Issue: 12523
 2020-10-06 18:21:19 -03:00
Vinicius Sa
b93024039a Remove redundant sub-expression involving or bitwise 
Reported by PVS-Studio (Warning: V501).

Fix 2/7.

Issue: 12523
 2020-10-06 18:21:11 -03:00
Vinicius Sa
8e73dfd440 Fix possible memory leak in CreateObjectFromJson 
As reported by PVS-Studio. Warning: V773.

Fix 1/7.

Issue: 12523
 2020-10-06 18:20:37 -03:00
Matt
86b1c0dbe1 Minor cleanup around audio code 2020-10-06 23:31:51 +03:00
Tulio Leao
e53cde1d5d Fix #6086: Cannot install existing track design with another name (#13082) 2020-10-06 08:27:38 -03:00
Duncan
eb3f3edc1b Use RemoveViewport helper function (#13104) 2020-10-06 10:27:56 +01:00
OpenRCT2 git bot
74d4182c95 Merge Localisation/master into OpenRCT2/develop 2020-10-06 04:05:15 +00:00
Ishmael King
fb47b3bb90 Close #9568: Replace RRC lift sounds LiftWood to match SFRC (#13071) 
* refactor: Replace RRC lift sounds LiftWood to match SFRC

* refactor: Replace SLC lift sounds with Classic lift sound

* Update replays for change in lift sound

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2020-10-05 23:14:43 -03:00
Vinicius Sa
bd8c633ea3 Close #12394: Refactor PeepNauseaTolerance to use strong enum (#13106) 2020-10-05 22:13:44 -03:00
Aaron van Geffen
797fe48b0f Merge pull request #13068 from mwnciau/json-compilation-performance 
Fix #13055: Replace includes of Json.hpp in header files with json_fwd.hpp
 2020-10-06 01:09:41 +02:00