mirror of
https://github.com/luanti-org/luanti.git
synced 2025-10-05 19:31:04 +00:00
Make string to v3f parsing consistent, replace core.setting_get_pos()
by core.settings:get_pos()
(#15438)
Co-authored-by: sfan5 <sfan5@live.de> Co-authored-by: Lars Müller <34514239+appgurueu@users.noreply.github.com>
This commit is contained in:
parent
18caf3a18d
commit
e545e96d2b
17 changed files with 162 additions and 45 deletions
|
@ -55,14 +55,14 @@ Hud::Hud(Client *client, LocalPlayer *player,
|
|||
|
||||
tsrc = client->getTextureSource();
|
||||
|
||||
v3f crosshair_color = g_settings->getV3F("crosshair_color");
|
||||
v3f crosshair_color = g_settings->getV3F("crosshair_color").value_or(v3f());
|
||||
u32 cross_r = rangelim(myround(crosshair_color.X), 0, 255);
|
||||
u32 cross_g = rangelim(myround(crosshair_color.Y), 0, 255);
|
||||
u32 cross_b = rangelim(myround(crosshair_color.Z), 0, 255);
|
||||
u32 cross_a = rangelim(g_settings->getS32("crosshair_alpha"), 0, 255);
|
||||
crosshair_argb = video::SColor(cross_a, cross_r, cross_g, cross_b);
|
||||
|
||||
v3f selectionbox_color = g_settings->getV3F("selectionbox_color");
|
||||
v3f selectionbox_color = g_settings->getV3F("selectionbox_color").value_or(v3f());
|
||||
u32 sbox_r = rangelim(myround(selectionbox_color.X), 0, 255);
|
||||
u32 sbox_g = rangelim(myround(selectionbox_color.Y), 0, 255);
|
||||
u32 sbox_b = rangelim(myround(selectionbox_color.Z), 0, 255);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue