mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity
20,095 Commits 8 Branches 59 Tags
32c2b7d449a705e1e1312d0ffccb1c00a2bb0f8c
Commit Graph

20095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aaron van Geffen
0ad7e9787e Add JsonFwd.hpp to the Xcode project 2020-10-06 00:16:21 +02:00
Aaron van Geffen
ccb47e4a36 Update CI to use new 0.3.1 Docker images 2020-10-06 00:16:21 +02:00
Simon Jarrett
134371f03c Change includes of nlohmann/json_fwd.hpp to new core/JsonFwd.hpp 2020-10-06 00:16:21 +02:00
Michael Steenbeek
b835477542 Add Esperanto to language list (#13096) 2020-10-05 08:21:27 -03:00
OpenRCT2 git bot
f461b42ee6 Merge Localisation/master into OpenRCT2/develop 2020-10-05 04:05:40 +00:00
Aaron van Geffen
fe54eee07c Tab-specific event functions for Options window (#13058) 
* Options window: move event lists and open function.

* Options: split off display tab events; add event lists for each tab

* Options: split off rendering tab events

* Options: split off culture tab events

* Options: split off audio tab events

* Options: split off control/interface tab events

* Options: split off misc tab events

* Options: split off advanced tab events; remove old event functions

* Reduce code duplication with common mouseup event
 2020-10-04 17:08:10 +02:00
OpenRCT2 git bot
a284119990 Merge Localisation/master into OpenRCT2/develop 2020-10-04 04:05:10 +00:00
Michael Steenbeek
01146123ca en-GB: Fix strings introduced in #13066 2020-10-03 22:11:11 +02:00
Tulio Leao
f4b588256d Merge pull request #13066 from tupaschoal/fix-5904 
Light Tile Inspector Improvements
 2020-10-03 15:16:10 -03:00
Michael Steenbeek
8e60ecc022 Do not output error if the sourceGame parameter is omitted (#13079) 
Since >90% of objects in the wild are custom objects, it make sense if this
parameter can be safely omitted. Only warn if this field contains garbage.
 2020-10-03 14:41:52 -03:00
Simon J
7f963c4901 Fix entrance and exit ghosts not being removed for mazes (#13074) 
* Fix entrance and exit ghosts not being removed for mazes

Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-10-03 09:33:28 -03:00
Tulio Leao
324f3403ec Merge pull request #13077 from ZehMatt/refactor/ga-cleanup 
Cleanup game actions
 2020-10-03 01:17:43 -03:00
Matt
0d43f1fd91 Directly use enums for serialisation 2020-10-03 06:15:13 +03:00
Matt
13f332d5b8 Ensure/Cleanup member initialization for game actions 2020-10-03 05:58:57 +03:00
Matt
82916f6824 Use default constructor 2020-10-03 05:55:33 +03:00
Julia Pinheiro
6a76547c5b Close #12412: Refactor PROMPT_MODE to use strong enum (#13076) 2020-10-02 23:04:59 -03:00
Mike Jones
4c26fb09b3 Close #12435: Refactor FILEDIALOG_TYPE to use strong enum (#13072) 
* Close #12435: Refactor FILEDIALOG_TYPE to use strong enum
 2020-10-02 22:43:06 -03:00
Julia Pinheiro
8800c32e52 Close #12404: Refactor DRAWING_ENGINE to use strong enum (#13070) 2020-10-02 22:41:30 -03:00
Simon Jarrett
9c5e9f8dbc Replace includes of Json.hpp in header files with json_fwd.hpp 2020-10-02 11:31:20 +01:00