Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign up[WIP] Change: add support for next/previous railtype global hotkeys #7851
Conversation
grossws
changed the title
grossws
force-pushed the
grossws:change-prev-next-railtype-hotkeys
branch
from
ff01b43
to
f29dd26
This patch adds support for next/prev railtype global hotkeys which are basically autorail + special modifier which selects previous or next available railtype. Such behaviour is useful for players who use PURR, Useless Tracks and similar NewGRFs for quick selection. I use PURR with semantic tracks coloring (e.g. white purr for waiting bays, red purr for prio zones etc). Current patch binds this feature to `GLOBAL+[` and `GLOBAL+]` but maybe I should leave them unbound, so only those who need it will bind them. Signed-off-by: Konstantin Gribov <grossws@gmail.com>
grossws
force-pushed the
grossws:change-prev-next-railtype-hotkeys
branch
from
f29dd26
to
c42996b
|
This needs to be tested with keyboard layouts where the |
|
Some additional thoughts about this feature. Currently it switches to autorail but better in UX terms would be to stay with same chosen widget if one is selected. Then you can just switch railtype on the fly with say |
| extern RailType _last_built_railtype; | ||
| RailType rt = _last_built_railtype; | ||
| if (HasBit(hotkey, GHK_MOD_RAT_PREV_RAILTYPE)) | ||
| { |
This comment has been minimized.
This comment has been minimized.
| // RailType is byte (unsigned char), so it overflows after 0 | ||
| if (rt >= RAILTYPE_END) rt = _last_built_railtype; | ||
| } | ||
| else if (HasBit(hotkey, GHK_MOD_RAT_NEXT_RAILTYPE)) |
This comment has been minimized.
This comment has been minimized.
| if (HasBit(hotkey, GHK_MOD_RAT_PREV_RAILTYPE)) | ||
| { | ||
| ClrBit(hotkey, GHK_MOD_RAT_PREV_RAILTYPE); | ||
| do { rt--; } while (rt > RAILTYPE_BEGIN && !HasRailtypeAvail(_local_company, rt)); |
This comment has been minimized.
This comment has been minimized.
LordAro
Dec 23, 2019
Member
I get why you've done it this way, but I think I'd prefer this (and the other) to be styled "properly"
| do { rt--; } while (rt > RAILTYPE_BEGIN && !HasRailtypeAvail(_local_company, rt)); | |
| do { | |
| rt--; | |
| } while (rt > RAILTYPE_BEGIN && !HasRailtypeAvail(_local_company, rt)); |
| * Selects RailType for autorail based on _last_built_railtype and global modifiers from RailToolbarWidgetModifiers | ||
| * | ||
| * Without wrapping, so if you're on RAILTYPE_RAIL you'll stay there. Same for upper boundary. | ||
| * Also clears modifier bits to allow normal widget OhHotkey logic. |
This comment has been minimized.
This comment has been minimized.
LordAro
Dec 23, 2019
Member
| * Also clears modifier bits to allow normal widget OhHotkey logic. | |
| * Also clears modifier bits to allow normal widget OnHotkey logic. |
| * Without wrapping, so if you're on RAILTYPE_RAIL you'll stay there. Same for upper boundary. | ||
| * Also clears modifier bits to allow normal widget OhHotkey logic. | ||
| * | ||
| * @param hotkey Hotkey |
This comment has been minimized.
This comment has been minimized.
LordAro
Dec 23, 2019
Member
| * @param hotkey Hotkey | |
| * @param [out] hotkey Something more than one word please |
|
@LordAro, ok, I'll fix things mentioned above. In case of code style I just did by example and got smacked by CI once) Anyway, I will mark this as work-in-progress since I wish to change some logic (see #7851 (comment)) |
grossws
changed the title
grossws commentedDec 1, 2019
This patch adds support for next/prev railtype global hotkeys which are basically autorail + special modifier which selects previous or next available railtype.
Such behaviour is useful for players who use PURR, Useless Tracks and similar NewGRFs for quick selection.
I use PURR with semantic tracks coloring (e.g. white purr for waiting bays, red purr for prio zones etc).
Current patch binds this feature to
GLOBAL+[andGLOBAL+]but maybe I should leave them unbound, so only those who need it will bind them.Signed-off-by: Konstantin Gribov grossws@gmail.com