Allow texture modifiers in hotbar textures. (#9271)

Warr1024 · web-flow · commit 244121b9643f · 2020-02-26T10:26:24.000+01:00
diff --git 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
@@ -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;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1224,21 +1224,9 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt)`
`1224`	`1224`	`player->hud_hotbar_itemcount = hotbar_itemcount;`
`1225`	`1225`	`}`
`1226`	`1226`	`else if (param == HUD_PARAM_HOTBAR_IMAGE) {`
`1227`		`- // If value not empty verify image exists in texture source`
`1228`		`- if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) {`
`1229`		`- errorstream << "Server sent wrong Hud hotbar image (sent value: '"`
`1230`		`- << value << "')" << std::endl;`
`1231`		`- return;`
`1232`		`- }`
`1233`	`1227`	`player->hotbar_image = value;`
`1234`	`1228`	`}`
`1235`	`1229`	`else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {`
`1236`		`- // If value not empty verify image exists in texture source`
`1237`		`- if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) {`
`1238`		`- errorstream << "Server sent wrong Hud hotbar selected image (sent value: '"`
`1239`		`- << value << "')" << std::endl;`
`1240`		`- return;`
`1241`		`- }`
`1242`	`1230`	`player->hotbar_selected_image = value;`
`1243`	`1231`	`}`
`1244`	`1232`	`}`