Merge branch 'clean' into 'master'

Appease some clang warnings

See merge request OpenMW/openmw!1794
pull/3226/head
jvoisin 3 years ago
commit 3621b9a759

@ -530,12 +530,10 @@ namespace MWGui
markerTexture = "textures\\detect_enchantment_icon.dds";
}
int counter = 0;
for (const MWWorld::Ptr& ptr : markers)
{
const ESM::Position& worldPos = ptr.getRefData().getPosition();
MarkerUserData markerPos (mLocalMapRender);
++counter;
MyGUI::ImageBox* markerWidget = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
getMarkerCoordinates(worldPos.pos[0], worldPos.pos[1], markerPos, 8), MyGUI::Align::Default);
markerWidget->setDepth(Local_MarkerAboveFogLayer);

@ -160,13 +160,11 @@ namespace MWGui
// try to go 1 level up until there is a widget that has tooltip
// this is necessary because some skin elements are actually separate widgets
int i=0;
while (!focus->isUserString("ToolTipType"))
{
focus = focus->getParent();
if (!focus)
return;
++i;
}
std::string type = focus->getUserString("ToolTipType");

Loading…
Cancel
Save