Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Allow texture modifiers in hotbar textures. (#9271)
- Loading branch information
Showing
with
2 additions
and
20 deletions.
-
+2
−8
src/client/hud.cpp
-
+0
−12
src/network/clientpackethandler.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 |
|
|
|
@@ -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; |
|
|
} |
|
|
} |
|
|