Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve #5835: Add keyboard shortcut for scenery remover #5857

Merged
merged 3 commits into from
Jul 26, 2017
Merged

Resolve #5835: Add keyboard shortcut for scenery remover #5857

merged 3 commits into from
Jul 26, 2017

Conversation

Kuriibo
Copy link
Contributor

@Kuriibo Kuriibo commented Jul 10, 2017

Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).

@IntelOrca IntelOrca added this to the v0.1.1 milestone Jul 10, 2017
marijnvdwerf
marijnvdwerf suggested changes Jul 10, 2017
View reviewed changes
src/openrct2/interface/window.h
@@ -497,6 +497,7 @@ enum {
#define WC_TOP_TOOLBAR__WIDX_WATER 9
#define WC_TOP_TOOLBAR__WIDX_SCENERY 10
#define WC_TOP_TOOLBAR__WIDX_PATH 11
#define WC_TOP_TOOLBAR__WIDX_CLEAR_SCENERY 17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs an accompanying validate_global_widx(WC_TOP_TOOLBAR, WIDX_CLEAR_SCENERY) in windows/top_toolbar.c

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validate_global_widx(WC_TOP_TOOLBAR, WIDX_CLEAR_SCENERY) has been added to top_toolbar.c

src/openrct2-ui/windows/shortcut_keys.c Outdated
@@ -150,6 +150,7 @@ const rct_string_id ShortcutStringIds[] = {
STR_SHORTCUT_RIDE_CONSTRUCTION_BUILD_CURRENT,
STR_SHORTCUT_RIDE_CONSTRUCTION_DEMOLISH_CURRENT,
STR_LOAD_GAME,
STR_CLEAR_SCENERY,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a new shortcut-specific string

marijnvdwerf
marijnvdwerf reviewed Jul 10, 2017
View reviewed changes
src/openrct2/localisation/string_ids.h Outdated
@@ -1962,6 +1962,7 @@ enum {
STR_SHORTCUT_SHOW_MAP = 2523,
STR_SHORTCUT_SCREENSHOT = 2524,
STR_SHORTCUT_KEY_UNKNOWN = 2525,

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing whitespace

marijnvdwerf
marijnvdwerf reviewed Jul 10, 2017
View reviewed changes
src/openrct2/localisation/string_ids.h Outdated
@@ -3799,6 +3800,8 @@ enum {
STR_OBJECT_ERROR_WINDOW_EXPLANATION = 6128,
STR_COPY_SELECTED = 6129,
STR_COPY_ALL = 6130,

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trailing whitespace

marijnvdwerf
marijnvdwerf reviewed Jul 10, 2017
View reviewed changes
src/openrct2/localisation/string_ids.h Outdated
@@ -3799,6 +3800,8 @@ enum {
STR_OBJECT_ERROR_WINDOW_EXPLANATION = 6128,
STR_COPY_SELECTED = 6129,
STR_COPY_ALL = 6130,

STR_SHORTCUT_OPEN_CLEAR_SCENERY=6131,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing spaces around = symbol (SCENERY = 6131)

@rwjuk rwjuk changed the title Keyboard Shortcut for Scenery Remover - issue 5835 Keyboard Shortcut for Scenery Remover - issue #5835 Jul 11, 2017
@Kuriibo @IntelOrca
Keyboard Shortcut for Scenery Remover - #5835
d0db59e 
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
@Kuriibo @IntelOrca
Added new string for shortcut, validate_global_widx
59fabad
@IntelOrca IntelOrca changed the title Keyboard Shortcut for Scenery Remover - issue #5835 Resolve #5835: Add keyboard shortcut for scenery remover Jul 26, 2017
@IntelOrca IntelOrca merged commit 4af64bb into OpenRCT2:develop Jul 26, 2017
@Nubbie Nubbie mentioned this pull request Jul 28, 2017
Closed
14 tasks
janisozaur added a commit to janisozaur/OpenRCT2 that referenced this pull request Aug 9, 2017
@janisozaur
Release 0.1.1
4333295 
- Feature: [OpenRCT2#5815] Add cheat to ignore research status and access rides/scenery not yet invented.
- Feature: [OpenRCT2#5857] Keyboard shortcut for clear scenery.
- Feature: [OpenRCT2#5877] Allow up to 16 stations to be synchronised
- Feature: [OpenRCT2#5970] The Bobsleigh Roller Coaster now supports on-ride photos.
- Feature: [OpenRCT2#5991] Allow all tracked rides that can be tested without guests to the Track Designer
- Fix: [OpenRCT2#2127, OpenRCT2#2229, OpenRCT2#5586] Mountain tool cost calculation
- Fix: [OpenRCT2#3589] Crash due to invalid footpathEntry in path_paint
- Fix: [OpenRCT2#3852] Constructing path not clearing scenery on server.
- Fix: [OpenRCT2#4455] Crash in window_sign_invalidate due to original bug
- Fix: [OpenRCT2#4715] Fix OpenGL rendering of water when zoomed. See OpenRCT2#5890.
- Fix: [OpenRCT2#4931] Crash in path_paint - footpathentry was null
- Fix: [OpenRCT2#5629] Issue with tower ride modes approach to station - incorrect sum caused sawtooth in velocity
- Fix: [OpenRCT2#5768] Prevent loading non-existent title sequences.
- Fix: [OpenRCT2#5858] Crash when using custom ride with no colour presets.
- Fix: [OpenRCT2#5865] Ride preview flickering on uneven terrain or mid air.
- Fix: [OpenRCT2#5872] Incorrect OpenGL rendering of masked sprites
- Fix: [OpenRCT2#5880] Leaving bumper cars without building causes assertion.
- Fix: [OpenRCT2#5890] Fix zoomed OpenGL rendering of special sprites with primary and secondary colours.
- Fix: [OpenRCT2#5912] Negative queue when moving entrance in paused state.
- Fix: [OpenRCT2#5920] Placing guest spawn doesn't do anything every 3rd click
- Fix: [OpenRCT2#5939] Crash when importing 'Six Flags Santa Fe'.
- Fix: [OpenRCT2#5977] Custom music files not showing up in music list
- Fix: [OpenRCT2#5981] Ride list doesn't update after using quick demolish.
- Fix: [OpenRCT2#5984] Allow socket binding to same port after crash
- Fix: [OpenRCT2#5998] Staff not getting paid / no loan interest.
- Fix: [OpenRCT2#6026] 'Select ride to advertise' dropdown does not display all items.
- Fix: [OpenRCT2#6052] Unable to place entrance/exit on certain ride types.
- Fix: [OpenRCT2#6071] Quick demolish can delete protected ride.
- Fix: [OpenRCT2#6111] Mute button always visible in editor.
- Fix: [OpenRCT2#6113] Track preview shows incorrect highest drop height.
- Improved: [OpenRCT2#2223] Change mountain tool to ignore higher surrounding tiles.
- Improved: [OpenRCT2#4301] Leading and trailing whitespace in player name is now removed.
- Improved: [OpenRCT2#5859] OpenGL rendering performance
- Improved: [OpenRCT2#5863] Switching drawing engines no longer requires the application to restart.
- Improved: [OpenRCT2#6003] Doors placed on tracks will now work with all vehicles
- Improved: [OpenRCT2#6037] Autosaves are now stored in a subfolder
- Improved: The land tool buttons can now be held down to increase/decrease size.
- Improved: Dropdowns longer than 32 items overflow into columns.
- Improved: Ride Type option in ride window is now a dropdown.
- Improved: "About OpenRCT2" window redesigned, now contains OpenRCT2 info and access to changelog
janisozaur added a commit that referenced this pull request Aug 9, 2017
@janisozaur
Release 0.1.1
4601265 
- Feature: [#5815] Add cheat to ignore research status and access rides/scenery not yet invented.
- Feature: [#5857] Keyboard shortcut for clear scenery.
- Feature: [#5877] Allow up to 16 stations to be synchronised
- Feature: [#5970] The Bobsleigh Roller Coaster now supports on-ride photos.
- Feature: [#5991] Allow all tracked rides that can be tested without guests to the Track Designer
- Fix: [#2127, #2229, #5586] Mountain tool cost calculation
- Fix: [#3589] Crash due to invalid footpathEntry in path_paint
- Fix: [#3852] Constructing path not clearing scenery on server.
- Fix: [#4455] Crash in window_sign_invalidate due to original bug
- Fix: [#4715] Fix OpenGL rendering of water when zoomed. See #5890.
- Fix: [#4931] Crash in path_paint - footpathentry was null
- Fix: [#5629] Issue with tower ride modes approach to station - incorrect sum caused sawtooth in velocity
- Fix: [#5768] Prevent loading non-existent title sequences.
- Fix: [#5858] Crash when using custom ride with no colour presets.
- Fix: [#5865] Ride preview flickering on uneven terrain or mid air.
- Fix: [#5872] Incorrect OpenGL rendering of masked sprites
- Fix: [#5880] Leaving bumper cars without building causes assertion.
- Fix: [#5890] Fix zoomed OpenGL rendering of special sprites with primary and secondary colours.
- Fix: [#5912] Negative queue when moving entrance in paused state.
- Fix: [#5920] Placing guest spawn doesn't do anything every 3rd click
- Fix: [#5939] Crash when importing 'Six Flags Santa Fe'.
- Fix: [#5977] Custom music files not showing up in music list
- Fix: [#5981] Ride list doesn't update after using quick demolish.
- Fix: [#5984] Allow socket binding to same port after crash
- Fix: [#5998] Staff not getting paid / no loan interest.
- Fix: [#6026] 'Select ride to advertise' dropdown does not display all items.
- Fix: [#6052] Unable to place entrance/exit on certain ride types.
- Fix: [#6071] Quick demolish can delete protected ride.
- Fix: [#6111] Mute button always visible in editor.
- Fix: [#6113] Track preview shows incorrect highest drop height.
- Improved: [#2223] Change mountain tool to ignore higher surrounding tiles.
- Improved: [#4301] Leading and trailing whitespace in player name is now removed.
- Improved: [#5859] OpenGL rendering performance
- Improved: [#5863] Switching drawing engines no longer requires the application to restart.
- Improved: [#6003] Doors placed on tracks will now work with all vehicles
- Improved: [#6037] Autosaves are now stored in a subfolder
- Improved: The land tool buttons can now be held down to increase/decrease size.
- Improved: Dropdowns longer than 32 items overflow into columns.
- Improved: Ride Type option in ride window is now a dropdown.
- Improved: "About OpenRCT2" window redesigned, now contains OpenRCT2 info and access to changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marijnvdwerf marijnvdwerf marijnvdwerf requested changes

Assignees

@marijnvdwerf marijnvdwerf

Labels
None yet
Projects
None yet
Milestone
v0.1.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Kuriibo @marijnvdwerf @IntelOrca