aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarr1024 <warr1024@gmail.com>2020-02-26 04:26:24 -0500
committerGitHub <noreply@github.com>2020-02-26 10:26:24 +0100
commit244121b9643f91e1b8ffb4c37a255d7603da2116 (patch)
tree8d4579302e451899a2bc19fb791def3a4c2d271d
parent8ddb6718e3e0b4713fce13a7d7324327b2e56d20 (diff)
downloadminetest-244121b9643f91e1b8ffb4c37a255d7603da2116.tar.gz
minetest-244121b9643f91e1b8ffb4c37a255d7603da2116.tar.bz2
minetest-244121b9643f91e1b8ffb4c37a255d7603da2116.zip
Allow texture modifiers in hotbar textures. (#9271)
-rw-r--r--src/client/hud.cpp10
-rw-r--r--src/network/clientpackethandler.cpp12
2 files changed, 2 insertions, 20 deletions
diff --git a/src/client/hud.cpp b/src/client/hud.cpp
index e78130dd4..37de6640b 100644
--- a/src/client/hud.cpp
+++ b/src/client/hud.cpp
@@ -221,19 +221,13 @@ void Hud::drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
// Store hotbar_image in member variable, used by drawItem()
if (hotbar_image != player->hotbar_image) {
hotbar_image = player->hotbar_image;
- if (!hotbar_image.empty())
- use_hotbar_image = tsrc->isKnownSourceImage(hotbar_image);
- else
- use_hotbar_image = false;
+ use_hotbar_image = !hotbar_image.empty();
}
// Store hotbar_selected_image in member variable, used by drawItem()
if (hotbar_selected_image != player->hotbar_selected_image) {
hotbar_selected_image = player->hotbar_selected_image;
- if (!hotbar_selected_image.empty())
- use_hotbar_selected_image = tsrc->isKnownSourceImage(hotbar_selected_image);
- else
- use_hotbar_selected_image = false;
+ use_hotbar_selected_image = !hotbar_selected_image.empty();
}
// draw customized item background
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index ceb4b3b17..b887c0282 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1224,21 +1224,9 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt)
player->hud_hotbar_itemcount = hotbar_itemcount;
}
else if (param == HUD_PARAM_HOTBAR_IMAGE) {
- // If value not empty verify image exists in texture source
- if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) {
- errorstream << "Server sent wrong Hud hotbar image (sent value: '"
- << value << "')" << std::endl;
- return;
- }
player->hotbar_image = value;
}
else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
- // If value not empty verify image exists in texture source
- if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) {
- errorstream << "Server sent wrong Hud hotbar selected image (sent value: '"
- << value << "')" << std::endl;
- return;
- }
player->hotbar_selected_image = value;
}
}