mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 22:45:36 +00:00
Code Issues Releases Wiki Activity

Code cleanup

Browse source
This commit is contained in:
Andrei Kortunov 2021-01-09 14:41:10 +04:00
parent c9b885ffd4
commit 8e5f26c109
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/opencs/view/world/dragrecordtable.cpp
View file

@ -19,14 +19,10 @@ void CSVWorld::DragRecordTable::startDragFromTable (const CSVWorld::DragRecordTa
} }
CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (records, mDocument); CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (records, mDocument);
QDrag* drag = new QDrag (this);
if (mime) drag->setMimeData (mime);
{ drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
QDrag* drag = new QDrag (this); drag->exec (Qt::CopyAction);
drag->setMimeData (mime);
drag->setPixmap (QString::fromUtf8 (mime->getIcon().c_str()));
drag->exec (Qt::CopyAction);
}
} }
CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) : CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) :

2
apps/openmw/mwgui/hud.cpp
View file

@ -587,7 +587,7 @@ namespace MWGui
// effect box can have variable width -> variable left coordinate // effect box can have variable width -> variable left coordinate
int effectsDx = 0; int effectsDx = 0;
if (!mMinimapBox->getVisible ()) if (!mMinimapBox->getVisible ())
effectsDx = (viewSize.width - mMinimapBoxBaseRight) - (viewSize.width - mEffectBoxBaseRight); effectsDx = mEffectBoxBaseRight - mMinimapBoxBaseRight;
mMapVisible = mMinimapBox->getVisible (); mMapVisible = mMinimapBox->getVisible ();
if (!mMapVisible) if (!mMapVisible)

2
apps/openmw/mwrender/globalmap.cpp
View file

@ -583,7 +583,7 @@ namespace MWRender
} }
mOverlayImage->copySubImage(imageDest.mX, imageDest.mY, 0, imageDest.mImage); mOverlayImage->copySubImage(imageDest.mX, imageDest.mY, 0, imageDest.mImage);
it = mPendingImageDest.erase(it); mPendingImageDest.erase(it);
return true; return true;
} }
} }

2
components/terrain/terraindrawable.cpp
View file

@ -78,7 +78,7 @@ void TerrainDrawable::cull(osgUtil::CullVisitor *cv)
osg::RefMatrix& matrix = *cv->getModelViewMatrix(); osg::RefMatrix& matrix = *cv->getModelViewMatrix();
if (cv->getComputeNearFarMode() && bb.valid()) if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR && bb.valid())
{ {
if (!cv->updateCalculatedNearFar(matrix, *this, false)) if (!cv->updateCalculatedNearFar(matrix, *this, false))
return; return;