mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity
19,667 Commits 8 Branches 59 Tags
6f8ae294ae2bbbddd9e1a0458ac3e6acd3166e46
Commit Graph

229 Commits

Author SHA1 Message Date
Michał Janiszewski
6f8ae294ae Fix launchpad builds (#12575) 
```
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp: In function ‘InteractionInfo viewport_interaction_get_item_left(const ScreenCoordsXY&)’:
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp:85:29: error: potential null pointer dereference [-Werror=null-dereference]
   85 |             switch (sprite->sprite_identifier)
      |                     ~~~~~~~~^~~~~~~~~~~~~~~~~
```
 2020-08-09 07:27:26 +01:00
Duncan
aa11773da3 Fix #12566, #12565, #12562, #12560, #12558: Nullptr deref (#12567) 
Mistake made in refactor meant that a nullptr deref took place when the screen coords were outside of the normal play area
 2020-08-02 20:13:09 +01:00
Duncan
733bc5a981 Close #12518: Viewport Refactor (#12541) 
* Remove viewport pointer from get_map_coordinates_from_pos

* Removed viewport from get_window

* Return a InteractionInfo from get_map_coord...

* Remove viewport_interaction_info struct

* Add Entity union to simplify code

* Name the enum used for viewport interaction

* Simplify functions further by returning the info struct

* Add default switches
 2020-08-02 08:32:59 +01:00
Aaron van Geffen
e039a51826 Fix #12552: Grey rectangles appear under windows and menus (#12554) 
* Fix #12552: Grey rectangles appear under windows and menus

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-08-02 00:47:28 -03:00
annoyingdroid
ddd21fa87a Part of #12098: Use ScreenRect on gfx_filter_rect (#12134) 2020-08-01 14:40:01 -03:00
Duncan
6d11825e1a Reduce the use of rct_sprite (#12530) 
* Reduce the use of rct_sprite

* Pass the correct types in S4 importer

* Add additional nullptr checks

* Simplify the viewport interaction

* Apply review comments

* Small cleanup of GetEntity

* Fix test paint
 2020-08-01 11:29:54 +01:00
frutiemax
af0fc89cf4 Close #12456: Refactor INPUT_STATE to use strong enum (#12484) 2020-07-27 19:51:10 -03:00
Gymnasiast
682add27dd Change ObjectEntryIndex null value to 0xFFFF 2020-07-23 12:45:42 +02:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Tulio Leao
289dc96f25 Remove goto from window_create_auto_pos (#12256) 
* Reduce code duplication on window_create_auto_pos

* Remove deadcode from window_create_auto_pos

Cascadin window offset deadcode

* Extract ClampWindowToScreen from window_create_auto_pos

* Remove goto usage from window_create_auto_pos
 2020-07-15 22:59:35 +01:00
Thamara Andrade
0fb2a6216c Close #12099: Use ScreenLine on gfx_draw_line (#12143) 2020-07-12 18:50:52 -03:00
frutiemax
27734e2971 Part of #12160: Use Coords for viewport_coord_to_map_coord (#12216) 2020-07-12 18:42:54 -03:00
frutiemax
0e96674a46 Part of #12096: ScreenRect w/ gfx_fill_rect in libopenrct2ui (#12188) 2020-07-10 13:59:08 -03:00
frutiemax
4aa7dec84f Part of #12096: Use ScreenRect on gfx_fill_rect in Widget.cpp (#12169) 2020-07-08 23:06:46 -03:00
frutiemax
280a21fa30 Fix #12095: Use ScreenRect on gfx_set_dirty_blocks (#12106) 2020-07-08 13:16:24 -03:00
duncanspumpkin
e51bbeed23 Convert SPRITE_LIST to an enum class 2020-07-04 07:38:11 +01:00
DrunkBlood
55f0f34fe0 Close #12101: gfx_draw_dashed_line to use ScreenLine (#12116) 2020-07-03 18:05:18 -03:00
Tulio Leao
a86a60cbf5 Extract ScreenRect from Graph for reusability 2020-06-30 09:32:22 -03:00
Tulio Leao
a0ed2c181e Make gfx_draw_string_left_centred use ScreenCoordsXY 2020-06-29 10:23:54 -03:00
Aaron van Geffen
2cb5402069 Introduce widget::textTop 2020-06-26 19:39:30 +02:00
Aaron van Geffen
2e153a7e95 Introduce widget::midX and widget::midY helper functions 2020-06-25 10:31:15 +02:00
Aaron van Geffen
681b8d7938 Introduce widget::width and widget::height helper functions (#12053) 2020-06-24 22:44:00 -03:00
Michael Steenbeek
a102892370 Merge pull request #11985 from AaronVanGeffen/windows/object-selection 
Increase widget heights in object selection window
 2020-06-24 23:09:10 +02:00
TomasZilinek
9d965ccfb6 Part of #12017 - create gfx_draw_sprite overload (#12026) 
* Part of #12017 - create gfx_draw_sprite overload

Part 1. Creates the overload and replaces about a half of the calls since there are too many for one PR.

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-23 18:32:34 -03:00
TomasZilinek
69db54f770 Fix #12018 - gfx_draw_sprite_solid overload (#12023) 
Creates the overload, replaces all calls to the old function and removes the old function.
 2020-06-21 11:50:05 -03:00
TomasZilinek
e93e32d139 Part of #11571: create gfx_draw_string_left() overload (#11984) 
Replaces a third of all occurrences of the old function
 2020-06-20 00:22:01 -03:00
Aaron van Geffen
81dd7c1a7d Use available vertical text box space for text and cursor 2020-06-19 08:42:12 +02:00
duncanspumpkin
6ed17b4ff9 Remove FOR_ALL_PEEPS/GUESTS/STAFF macros 
Replaced with an EntityList iterator

Fix formatting

Fix nullptr issues
 2020-06-16 20:27:44 +01:00
Tulio Leao
13df05ce32 Part of #11564: Use ScreenCoordsXY instead of <x,y> 2020-06-14 12:51:06 -03:00
Tulio Leao
613cec3f7a Part of #11564: gfx_draw_string_centred_clipped with ScreenCoordsXY 2020-06-14 12:26:53 -03:00
XplosiveLugnut
f9c5633c19 Can now pop balloons and quack ducks in title screen. (#9614) 
* Can now pop balloons and quack ducks in title screen.

* Chengelog entry

* Narrow check for misc sprite down to only duck and balloon sprite.

* Update distribution/changelog.txt

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Use the IsBalloon and IsDuck functions instead.

* Update src/openrct2-ui/interface/ViewportInteraction.cpp

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Squash: Bring code up to date.

* Add nullptr check.

* Update src/openrct2-ui/interface/ViewportInteraction.cpp

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-06-10 18:31:33 +01:00
Ted John
14899f3940 Fix #11926: Plugin Checkbox and Groupbox widgets crash the game (#11927) 2020-06-10 14:00:53 -03:00
Michael Steenbeek
9ef8d6da42 Convert most remaining C-style casts to C++-style ones (#11867) 2020-06-07 23:18:11 +02:00
duncanspumpkin
6e78d8d654 Remove AsBalloon 2020-06-06 11:36:48 +01:00
Michael Steenbeek
f21ddb0723 Refactor checks for station pieces (#11876) 2020-06-05 17:55:15 -03:00
Tulio Leao
7b8257c692 Fix #11816: Text overflowing boundary box (#11830) 2020-05-30 17:07:58 +02:00
TusharSariya
2cf95adc4b Fix #11565: gfx_draw_string_left_clipped to use ScreenCoordsXY (#11765) 
* Issue #11565, created overload for gfx_draw_string_left_clipped

Co-authored-by: Tushar <tushar.97@hotmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-05-17 19:30:58 -03:00
TomasZilinek
277080de74 Fix #11570 - create gfx_draw_string_centered() overload (#11760) 
* Fix #11570 - create gfx_draw_string_centered() overload

I created the overload, updated all calls from the old function to the new and deleted the old one
 2020-05-17 15:29:56 -03:00
Michael Steenbeek
620fb5e5c4 Migrate many set_format_arg calls to Formatter (#11744) 2020-05-13 21:29:39 -03:00
TomasZilinek
9fde6a74c3 Close #11561: Use ScreenCoordsXY in gfx_draw_string() 
* Fix #11572 create gfx_draw_string() overload

created the overload and changed all calls of the old function to the new (using const ScreenCoordsXY&)

...
 2020-05-10 09:49:15 -03:00
hdpoliveira
acc6b9f878 Part of #9473: Create Vehicle::SetMapToolbar 
Converted from vehicle_set_map_toolbar
 2020-05-01 19:49:02 -03:00
Tulio Leao
d0704baab2 Make window_dropdown_show_text() use ScreenCoordsXY 2020-05-01 15:58:36 -03:00
Tulio Leao
4933785b1c Make window_dropdown_show_text_custom_width() use ScreenCoordsXY 2020-05-01 15:48:20 -03:00
Michael Steenbeek
158adfba82 Merge pull request #11560 from tupaschoal/more-coordz 
Scours through openrct2-ui to use more coords structs
 2020-05-01 19:01:37 +02:00
Tulio Leao
28b2010838 Use ScreenCoordsXY on interface/Window.cpp 2020-05-01 12:26:01 -03:00
Ted John
4501173c0d Implement custom window tabs 2020-04-30 23:42:28 +01:00
Ted John
3fe49ca2a3 Apply suggestions from code review 
Co-Authored-By: Michał Janiszewski <janisozaur@users.noreply.github.com>
Co-Authored-By: Aaron van Geffen <aaron@aaronweb.net>
Co-Authored-By: Tulio Leao <tupaschoal@gmail.com>
 2020-04-26 14:35:08 +01:00
Ted John
da98ef63d3 Implement checkboxes and disabling widgets 2020-04-26 14:35:02 +01:00
Ted John
a9a67a7a7e Implement group boxes 2020-04-26 14:35:02 +01:00
Hielke Morsink
e8bdb95f13 format new files 
Since many of the changes were made before the clang-format changes went live, the new source files used a different format still. This PR applies the new style to all the new source files.
 2020-04-26 14:35:00 +01:00