dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split config transparency settings into base and extra fields

Browse Source 
This is to avoid incorrect settings when loading in trunk,
as the min/max clamping is not bitwise.
In particular having all options set in trunk when transparent vehicles
in tunnels was set.
This commit is contained in:
Jonathan G Rennison
2021-11-21 22:10:31 +00:00
parent 5c0c057dda
commit 9ff8643fd9
4 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/transparency_gui.cpp
View File

@@ -22,10 +22,33 @@
TransparencyOptionBits _transparency_opt; ///< The bits that should be transparent.
TransparencyOptionBits _transparency_lock; ///< Prevent these bits from flipping with X.
TransparencyOptionBits _transparency_opt_base; ///< Separate base and extra fields for config save/load.
TransparencyOptionBits _transparency_lock_base; ///< "
TransparencyOptionBits _transparency_opt_extra; ///< "
TransparencyOptionBits _transparency_lock_extra; ///< "
TransparencyOptionBits _invisibility_opt; ///< The bits that should be invisible.
byte _display_opt; ///< What do we want to draw/do?
byte _extra_display_opt;
void PreTransparencyOptionSave()
{
auto handler = [](TransparencyOptionBits value, TransparencyOptionBits &base, TransparencyOptionBits &extra) {
base = value & 0x1FF;
extra = (value >> 9) & 0x1;
};
handler(_transparency_opt, _transparency_opt_base, _transparency_opt_extra);
handler(_transparency_lock, _transparency_lock_base, _transparency_lock_extra);
}
void PostTransparencyOptionLoad()
{
auto handler = [](TransparencyOptionBits base, TransparencyOptionBits extra) -> TransparencyOptionBits {
return (base & 0x3FF) | ((extra & 0x1) << 9);
};
_transparency_opt = handler(_transparency_opt_base, _transparency_opt_extra);
_transparency_lock = handler(_transparency_lock_base, _transparency_lock_extra);
}
class TransparenciesWindow : public Window
{
public: