(mOperations.size());
int newCount = oldCount - 1;
mLayout->removeItem ((*iter)->getLayout());
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 6fe01dc27..4514cfb58 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -749,7 +749,7 @@ void CSVDoc::View::infoAbout()
"| %4 | https://openmw.org |
"
"| %5 | https://forum.openmw.org |
"
"| %6 | https://gitlab.com/OpenMW/openmw/issues |
"
- "| %7 | irc://irc.freenode.net/#openmw |
"
+ "| %7 | ircs://irc.libera.chat/#openmw |
"
""
"")
.arg(versionInfo
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 8cca3a849..95f9f606d 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -11,7 +11,6 @@
#include "../../model/doc/documentmanager.hpp"
#include "../../model/doc/document.hpp"
#include "../../model/world/columns.hpp"
-#include "../../model/world/universalid.hpp"
#include "../../model/world/idcompletionmanager.hpp"
#include "../../model/prefs/state.hpp"
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 6073807ce..d8ff63801 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -2,7 +2,6 @@
#include
#include
-#include
#include
#include
@@ -13,15 +12,23 @@
#include "../../model/world/cellcoordinates.hpp"
const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
-const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
+
+/*
+ The number of vertices per cell border is equal to the number of vertices per edge
+ minus the duplicated corner vertices. An additional vertex to close the loop is NOT needed.
+*/
+const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 4;
CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
: mParentNode(cellNode)
{
+ mBorderGeometry = new osg::Geometry();
+
mBaseNode = new osg::PositionAttitudeTransform();
mBaseNode->setNodeMask(Mask_CellBorder);
mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
+ mBaseNode->addChild(mBorderGeometry);
mParentNode->addChild(mBaseNode);
}
@@ -38,56 +45,59 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
if (!landData)
return;
- osg::ref_ptr geometry = new osg::Geometry();
+ mBaseNode->removeChild(mBorderGeometry);
+ mBorderGeometry = new osg::Geometry();
- // Vertices
osg::ref_ptr vertices = new osg::Vec3Array();
- int x = 0, y = 0;
- for (; x < ESM::Land::LAND_SIZE; ++x)
+ int x = 0;
+ int y = 0;
+
+ /*
+ Traverse the cell border counter-clockwise starting at the SW corner vertex (0, 0).
+ Each loop starts at a corner vertex and ends right before the next corner vertex.
+ */
+ for (; x < ESM::Land::LAND_SIZE - 1; ++x)
vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
x = ESM::Land::LAND_SIZE - 1;
- for (; y < ESM::Land::LAND_SIZE; ++y)
+ for (; y < ESM::Land::LAND_SIZE - 1; ++y)
vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
y = ESM::Land::LAND_SIZE - 1;
- for (; x >= 0; --x)
+ for (; x > 0; --x)
vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
x = 0;
- for (; y >= 0; --y)
+ for (; y > 0; --y)
vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
- geometry->setVertexArray(vertices);
+ mBorderGeometry->setVertexArray(vertices);
- // Color
osg::ref_ptr colors = new osg::Vec4Array();
colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
- geometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
+ mBorderGeometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
- // Primitive
osg::ref_ptr primitives =
- new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount+1);
+ new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount + 1);
+ // Assign one primitive to each vertex.
for (size_t i = 0; i < VertexCount; ++i)
primitives->setElement(i, i);
+ // Assign the last primitive to the first vertex to close the loop.
primitives->setElement(VertexCount, 0);
- geometry->addPrimitiveSet(primitives);
- geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-
+ mBorderGeometry->addPrimitiveSet(primitives);
+ mBorderGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
- osg::ref_ptr geode = new osg::Geode();
- geode->addDrawable(geometry);
- mBaseNode->addChild(geode);
+ mBaseNode->addChild(mBorderGeometry);
}
size_t CSVRender::CellBorder::landIndex(int x, int y)
{
- return y * ESM::Land::LAND_SIZE + x;
+ return static_cast(y) * ESM::Land::LAND_SIZE + x;
}
float CSVRender::CellBorder::scaleToWorld(int value)
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
index c91aa46c6..be2e18eee 100644
--- a/apps/opencs/view/render/cellborder.hpp
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -7,6 +7,7 @@
namespace osg
{
+ class Geometry;
class Group;
class PositionAttitudeTransform;
}
@@ -47,7 +48,7 @@ namespace CSVRender
osg::Group* mParentNode;
osg::ref_ptr mBaseNode;
-
+ osg::ref_ptr mBorderGeometry;
};
}
diff --git a/apps/opencs/view/render/commands.cpp b/apps/opencs/view/render/commands.cpp
new file mode 100644
index 000000000..699bf5d01
--- /dev/null
+++ b/apps/opencs/view/render/commands.cpp
@@ -0,0 +1,44 @@
+#include "commands.hpp"
+
+#include
+
+#include
+#include
+
+#include "editmode.hpp"
+#include "terrainselection.hpp"
+#include "terrainshapemode.hpp"
+#include "terraintexturemode.hpp"
+#include "worldspacewidget.hpp"
+
+CSVRender::DrawTerrainSelectionCommand::DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent)
+ : mWorldspaceWidget(worldspaceWidget)
+{ }
+
+void CSVRender::DrawTerrainSelectionCommand::redo()
+{
+ tryUpdate();
+}
+
+void CSVRender::DrawTerrainSelectionCommand::undo()
+{
+ tryUpdate();
+}
+
+void CSVRender::DrawTerrainSelectionCommand::tryUpdate()
+{
+ if (!mWorldspaceWidget)
+ {
+ Log(Debug::Verbose) << "Can't update terrain selection, no WorldspaceWidget found!";
+ return;
+ }
+
+ auto terrainMode = dynamic_cast(mWorldspaceWidget->getEditMode());
+ if (!terrainMode)
+ {
+ Log(Debug::Verbose) << "Can't update terrain selection in current EditMode";
+ return;
+ }
+
+ terrainMode->getTerrainSelection()->update();
+}
diff --git a/apps/opencs/view/render/commands.hpp b/apps/opencs/view/render/commands.hpp
new file mode 100644
index 000000000..62b7fbfdc
--- /dev/null
+++ b/apps/opencs/view/render/commands.hpp
@@ -0,0 +1,42 @@
+#ifndef CSV_RENDER_COMMANDS_HPP
+#define CSV_RENDER_COMMANDS_HPP
+
+#include
+
+#include
+
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+ class TerrainSelection;
+
+ /*
+ Current solution to force a redrawing of the terrain-selection grid
+ when undoing/redoing changes in the editor.
+ This only triggers a simple redraw of the grid, so only use it in
+ conjunction with actual data changes which deform the grid.
+
+ Please note that this command needs to be put onto the QUndoStack twice:
+ at the start and at the end of the related terrain manipulation.
+ This makes sure that the grid is always updated after all changes have
+ been undone or redone -- but it also means that the selection is redrawn
+ once at the beginning of either action. Future refinement may solve that.
+ */
+ class DrawTerrainSelectionCommand : public QUndoCommand
+ {
+
+ private:
+ QPointer mWorldspaceWidget;
+
+ public:
+ DrawTerrainSelectionCommand(WorldspaceWidget* worldspaceWidget, QUndoCommand* parent = nullptr);
+
+ void redo() override;
+ void undo() override;
+
+ void tryUpdate();
+ };
+}
+
+#endif
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
index 79ac0167a..c81402ed1 100644
--- a/apps/opencs/view/render/orbitcameramode.cpp
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -3,7 +3,6 @@
#include
#include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
#include "worldspacewidget.hpp"
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index ed3558422..a0b4de979 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -7,18 +7,14 @@
#include
#include
-#include
-
#include
#include "../../model/prefs/shortcut.hpp"
-#include "../../model/world/tablemimedata.hpp"
#include "../../model/world/idtable.hpp"
#include "../widget/scenetooltoggle2.hpp"
#include "../widget/scenetoolmode.hpp"
-#include "../widget/scenetooltoggle2.hpp"
#include "editmode.hpp"
#include "mask.hpp"
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 7a3fc8ecf..193cb664d 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -9,8 +9,6 @@
#include "../../model/world/commands.hpp"
#include "../../model/world/commandmacro.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/idtree.hpp"
#include "../widget/scenetoolbar.hpp"
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 97f4c6ce2..c444cc8c6 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -26,7 +26,6 @@
#include "../../model/prefs/state.hpp"
#include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
#include "lighting.hpp"
#include "mask.hpp"
diff --git a/apps/opencs/view/render/terrainselection.cpp b/apps/opencs/view/render/terrainselection.cpp
index 4e209af57..0593917e0 100644
--- a/apps/opencs/view/render/terrainselection.cpp
+++ b/apps/opencs/view/render/terrainselection.cpp
@@ -39,64 +39,23 @@ std::vector> CSVRender::TerrainSelection::getTerrainSelectio
void CSVRender::TerrainSelection::onlySelect(const std::vector> &localPositions)
{
mSelection = localPositions;
+
update();
}
-void CSVRender::TerrainSelection::addSelect(const std::pair &localPos)
+void CSVRender::TerrainSelection::addSelect(const std::vector>& localPositions, bool toggleInProgress)
{
- if (std::find(mSelection.begin(), mSelection.end(), localPos) == mSelection.end())
- {
- mSelection.emplace_back(localPos);
- update();
- }
+ handleSelection(localPositions, toggleInProgress, SelectionMethod::AddSelect);
}
-void CSVRender::TerrainSelection::toggleSelect(const std::vector> &localPositions, bool toggleInProgress)
+void CSVRender::TerrainSelection::removeSelect(const std::vector>& localPositions, bool toggleInProgress)
{
- if (toggleInProgress)
- {
- for(auto const& localPos: localPositions)
- {
- auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
- mDraggedOperationFlag = true;
-
- if (iterTemp == mTemporarySelection.end())
- {
- auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
- if (iter != mSelection.end())
- {
- mSelection.erase(iter);
- }
- else
- {
- mSelection.emplace_back(localPos);
- }
- }
+ handleSelection(localPositions, toggleInProgress, SelectionMethod::RemoveSelect);
+}
- mTemporarySelection.push_back(localPos);
- }
- }
- else if (mDraggedOperationFlag == false)
- {
- for(auto const& localPos: localPositions)
- {
- const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
- if (iter != mSelection.end())
- {
- mSelection.erase(iter);
- }
- else
- {
- mSelection.emplace_back(localPos);
- }
- }
- }
- else
- {
- mDraggedOperationFlag = false;
- mTemporarySelection.clear();
- }
- update();
+void CSVRender::TerrainSelection::toggleSelect(const std::vector>& localPositions, bool toggleInProgress)
+{
+ handleSelection(localPositions, toggleInProgress, SelectionMethod::ToggleSelect);
}
void CSVRender::TerrainSelection::activate()
@@ -239,6 +198,100 @@ void CSVRender::TerrainSelection::drawTextureSelection(const osg::ref_ptr>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod)
+{
+ if (toggleInProgress)
+ {
+ for (auto const& localPos : localPositions)
+ {
+ auto iterTemp = std::find(mTemporarySelection.begin(), mTemporarySelection.end(), localPos);
+ mDraggedOperationFlag = true;
+
+ if (iterTemp == mTemporarySelection.end())
+ {
+ auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+
+ switch (selectionMethod)
+ {
+ case SelectionMethod::AddSelect:
+ if (iter == mSelection.end())
+ {
+ mSelection.emplace_back(localPos);
+ }
+
+ break;
+ case SelectionMethod::RemoveSelect:
+ if (iter != mSelection.end())
+ {
+ mSelection.erase(iter);
+ }
+
+ break;
+ case SelectionMethod::ToggleSelect:
+ if (iter == mSelection.end())
+ {
+ mSelection.emplace_back(localPos);
+ }
+ else
+ {
+ mSelection.erase(iter);
+ }
+
+ break;
+ default: break;
+ }
+ }
+
+ mTemporarySelection.push_back(localPos);
+ }
+ }
+ else if (mDraggedOperationFlag == false)
+ {
+ for (auto const& localPos : localPositions)
+ {
+ const auto iter = std::find(mSelection.begin(), mSelection.end(), localPos);
+
+ switch (selectionMethod)
+ {
+ case SelectionMethod::AddSelect:
+ if (iter == mSelection.end())
+ {
+ mSelection.emplace_back(localPos);
+ }
+
+ break;
+ case SelectionMethod::RemoveSelect:
+ if (iter != mSelection.end())
+ {
+ mSelection.erase(iter);
+ }
+
+ break;
+ case SelectionMethod::ToggleSelect:
+ if (iter == mSelection.end())
+ {
+ mSelection.emplace_back(localPos);
+ }
+ else
+ {
+ mSelection.erase(iter);
+ }
+
+ break;
+ default: break;
+ }
+ }
+ }
+ else
+ {
+ mDraggedOperationFlag = false;
+
+ mTemporarySelection.clear();
+ }
+
+ update();
+}
+
bool CSVRender::TerrainSelection::noCell(const std::string& cellId)
{
CSMDoc::Document& document = mWorldspaceWidget->getDocument();
diff --git a/apps/opencs/view/render/terrainselection.hpp b/apps/opencs/view/render/terrainselection.hpp
index 84ee6f25a..18622ad13 100644
--- a/apps/opencs/view/render/terrainselection.hpp
+++ b/apps/opencs/view/render/terrainselection.hpp
@@ -27,6 +27,14 @@ namespace CSVRender
Shape
};
+ enum class SelectionMethod
+ {
+ OnlySelect,
+ AddSelect,
+ RemoveSelect,
+ ToggleSelect
+ };
+
/// \brief Class handling the terrain selection data and rendering
class TerrainSelection
{
@@ -36,7 +44,8 @@ namespace CSVRender
~TerrainSelection();
void onlySelect(const std::vector> &localPositions);
- void addSelect(const std::pair &localPos);
+ void addSelect(const std::vector>& localPositions, bool toggleInProgress);
+ void removeSelect(const std::vector>& localPositions, bool toggleInProgress);
void toggleSelect(const std::vector> &localPositions, bool toggleInProgress);
void activate();
@@ -55,6 +64,8 @@ namespace CSVRender
private:
+ void handleSelection(const std::vector>& localPositions, bool toggleInProgress, SelectionMethod selectionMethod);
+
bool noCell(const std::string& cellId);
bool noLand(const std::string& cellId);
diff --git a/apps/opencs/view/render/terrainshapemode.cpp b/apps/opencs/view/render/terrainshapemode.cpp
index e495d2355..050494495 100644
--- a/apps/opencs/view/render/terrainshapemode.cpp
+++ b/apps/opencs/view/render/terrainshapemode.cpp
@@ -25,18 +25,16 @@
#include "../../model/doc/document.hpp"
#include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
#include "../../model/world/commands.hpp"
#include "../../model/world/data.hpp"
#include "../../model/world/idtable.hpp"
#include "../../model/world/idtree.hpp"
#include "../../model/world/land.hpp"
-#include "../../model/world/resourcetable.hpp"
#include "../../model/world/tablemimedata.hpp"
#include "../../model/world/universalid.hpp"
#include "brushdraw.hpp"
+#include "commands.hpp"
#include "editmode.hpp"
#include "pagedworldspacewidget.hpp"
#include "mask.hpp"
@@ -45,7 +43,7 @@
#include "worldspacewidget.hpp"
CSVRender::TerrainShapeMode::TerrainShapeMode (WorldspaceWidget *worldspaceWidget, osg::Group* parentNode, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain | Mask_Reference, "Terrain land editing", parent),
+: EditMode (worldspaceWidget, QIcon {":scenetoolbar/editing-terrain-shape"}, Mask_Terrain, "Terrain land editing", parent),
mParentNode(parentNode)
{
}
@@ -288,6 +286,9 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
undoStack.beginMacro ("Edit shape and normal records");
+ // One command at the beginning of the macro for redrawing the terrain-selection grid when undoing the changes.
+ undoStack.push(new DrawTerrainSelectionCommand(&getWorldspaceWidget()));
+
for(CSMWorld::CellCoordinates cellCoordinates: mAlteredCells)
{
std::string cellId = CSMWorld::CellCoordinates::generateId(cellCoordinates.getX(), cellCoordinates.getY());
@@ -356,6 +357,9 @@ void CSVRender::TerrainShapeMode::applyTerrainEditChanges()
}
pushNormalsEditToCommand(landNormalsNew, document, landTable, cellId);
}
+ // One command at the end of the macro for redrawing the terrain-selection grid when redoing the changes.
+ undoStack.push(new DrawTerrainSelectionCommand(&getWorldspaceWidget()));
+
undoStack.endMacro();
clearTransientEdits();
}
@@ -433,7 +437,9 @@ void CSVRender::TerrainShapeMode::editTerrainShapeGrid(const std::pair
float smoothedByDistance = 0.0f;
if (mShapeEditTool == ShapeEditTool_Drag) smoothedByDistance = calculateBumpShape(distance, r, mTotalDiffY);
if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower) smoothedByDistance = calculateBumpShape(distance, r, r + mShapeEditToolStrength);
- if (distance <= r)
+
+ // Using floating-point radius here to prevent selecting too few vertices.
+ if (distance <= mBrushSize / 2.0f)
{
if (mShapeEditTool == ShapeEditTool_Drag) alterHeight(cellCoords, x, y, smoothedByDistance);
if (mShapeEditTool == ShapeEditTool_PaintToRaise || mShapeEditTool == ShapeEditTool_PaintToLower)
@@ -1036,10 +1042,35 @@ void CSVRender::TerrainShapeMode::handleSelection(int globalSelectionX, int glob
return;
int selectionX = globalSelectionX;
int selectionY = globalSelectionY;
- if (xIsAtCellBorder)
+
+ /*
+ The northern and eastern edges don't belong to the current cell.
+ If the corresponding adjacent cell is not loaded, some special handling is necessary to select border vertices.
+ */
+ if (xIsAtCellBorder && yIsAtCellBorder)
+ {
+ /*
+ Handle the NW, NE, and SE corner vertices.
+ NW corner: (+1, -1) offset to reach current cell.
+ NE corner: (-1, -1) offset to reach current cell.
+ SE corner: (-1, +1) offset to reach current cell.
+ */
+ if (isInCellSelection(globalSelectionX - 1, globalSelectionY - 1)
+ || isInCellSelection(globalSelectionX + 1, globalSelectionY - 1)
+ || isInCellSelection(globalSelectionX - 1, globalSelectionY + 1))
+ {
+ selections->emplace_back(globalSelectionX, globalSelectionY);
+ }
+ }
+ else if (xIsAtCellBorder)
+ {
selectionX--;
- if (yIsAtCellBorder)
+ }
+ else if (yIsAtCellBorder)
+ {
selectionY--;
+ }
+
if (isInCellSelection(selectionX, selectionY))
selections->emplace_back(globalSelectionX, globalSelectionY);
}
@@ -1074,8 +1105,11 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair&
{
int distanceX = abs(i - vertexCoords.first);
int distanceY = abs(j - vertexCoords.second);
- int distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
- if (distance <= r) handleSelection(i, j, &selections);
+ float distance = sqrt(pow(distanceX, 2)+pow(distanceY, 2));
+
+ // Using floating-point radius here to prevent selecting too few vertices.
+ if (distance <= mBrushSize / 2.0f)
+ handleSelection(i, j, &selections);
}
}
}
@@ -1092,9 +1126,21 @@ void CSVRender::TerrainShapeMode::selectTerrainShapes(const std::pair&
}
}
- if(selectMode == 0) mTerrainShapeSelection->onlySelect(selections);
- if(selectMode == 1) mTerrainShapeSelection->toggleSelect(selections, dragOperation);
+ std::string selectAction;
+ if (selectMode == 0)
+ selectAction = CSMPrefs::get()["3D Scene Editing"]["primary-select-action"].toString();
+ else
+ selectAction = CSMPrefs::get()["3D Scene Editing"]["secondary-select-action"].toString();
+
+ if (selectAction == "Select only")
+ mTerrainShapeSelection->onlySelect(selections);
+ else if (selectAction == "Add to selection")
+ mTerrainShapeSelection->addSelect(selections, dragOperation);
+ else if (selectAction == "Remove from selection")
+ mTerrainShapeSelection->removeSelect(selections, dragOperation);
+ else if (selectAction == "Invert selection")
+ mTerrainShapeSelection->toggleSelect(selections, dragOperation);
}
void CSVRender::TerrainShapeMode::pushEditToCommand(const CSMWorld::LandHeightsColumn::DataType& newLandGrid, CSMDoc::Document& document,
@@ -1398,6 +1444,11 @@ void CSVRender::TerrainShapeMode::mouseMoveEvent (QMouseEvent *event)
mBrushDraw->hide();
}
+std::shared_ptr CSVRender::TerrainShapeMode::getTerrainSelection()
+{
+ return mTerrainShapeSelection;
+}
+
void CSVRender::TerrainShapeMode::setBrushSize(int brushSize)
{
mBrushSize = brushSize;
diff --git a/apps/opencs/view/render/terrainshapemode.hpp b/apps/opencs/view/render/terrainshapemode.hpp
index a88e60c9c..abc4b8aba 100644
--- a/apps/opencs/view/render/terrainshapemode.hpp
+++ b/apps/opencs/view/render/terrainshapemode.hpp
@@ -92,6 +92,8 @@ namespace CSVRender
void dragMoveEvent (QDragMoveEvent *event) override;
void mouseMoveEvent (QMouseEvent *event) override;
+ std::shared_ptr getTerrainSelection();
+
private:
/// Remove duplicates and sort mAlteredCells, then limitAlteredHeights forward and reverse
@@ -176,7 +178,7 @@ namespace CSVRender
int mDragMode = InteractionType_None;
osg::Group* mParentNode;
bool mIsEditing = false;
- std::unique_ptr mTerrainShapeSelection;
+ std::shared_ptr mTerrainShapeSelection;
int mTotalDiffY = 0;
std::vector mAlteredCells;
osg::Vec3d mEditingPos;
diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp
index fa46cf673..dfcc29ae0 100644
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@@ -12,23 +12,17 @@
#include
-#include
-
#include "../widget/modebutton.hpp"
#include "../widget/scenetoolbar.hpp"
#include "../widget/scenetooltexturebrush.hpp"
#include "../../model/doc/document.hpp"
#include "../../model/prefs/state.hpp"
-#include "../../model/world/columnbase.hpp"
-#include "../../model/world/commandmacro.hpp"
#include "../../model/world/commands.hpp"
#include "../../model/world/data.hpp"
#include "../../model/world/idtable.hpp"
#include "../../model/world/idtree.hpp"
-#include "../../model/world/land.hpp"
#include "../../model/world/landtexture.hpp"
-#include "../../model/world/resourcetable.hpp"
#include "../../model/world/tablemimedata.hpp"
#include "../../model/world/universalid.hpp"
#include "../widget/brushshapes.hpp"
@@ -332,7 +326,7 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
int textureColumn = landTable.findColumnIndex(CSMWorld::Columns::ColumnId_LandTexturesIndex);
- std::size_t hashlocation = mBrushTexture.find("#");
+ std::size_t hashlocation = mBrushTexture.find('#');
std::string mBrushTextureInt = mBrushTexture.substr (hashlocation+1);
int brushInt = stoi(mBrushTexture.substr (hashlocation+1))+1; // All indices are offset by +1
@@ -718,6 +712,11 @@ void CSVRender::TerrainTextureMode::mouseMoveEvent (QMouseEvent *event)
mBrushDraw->hide();
}
+std::shared_ptr CSVRender::TerrainTextureMode::getTerrainSelection()
+{
+ return mTerrainTextureSelection;
+}
+
void CSVRender::TerrainTextureMode::setBrushSize(int brushSize)
{
diff --git a/apps/opencs/view/render/terraintexturemode.hpp b/apps/opencs/view/render/terraintexturemode.hpp
index 31932df21..e0c6e4b40 100644
--- a/apps/opencs/view/render/terraintexturemode.hpp
+++ b/apps/opencs/view/render/terraintexturemode.hpp
@@ -85,6 +85,8 @@ namespace CSVRender
void mouseMoveEvent (QMouseEvent *event) override;
+ std::shared_ptr getTerrainSelection();
+
private:
/// \brief Handle brush mechanics, maths regarding worldspace hit etc.
void editTerrainTextureGrid (const WorldspaceHitResult& hit);
@@ -115,7 +117,7 @@ namespace CSVRender
int mDragMode;
osg::Group* mParentNode;
bool mIsEditing;
- std::unique_ptr mTerrainTextureSelection;
+ std::shared_ptr mTerrainTextureSelection;
const int cellSize {ESM::Land::REAL_SIZE};
const int landTextureSize {ESM::Land::LAND_TEXTURE_SIZE};
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index c4fef45dd..20dc5b8d1 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -12,7 +12,6 @@
#include "../../model/world/idtable.hpp"
#include "../../model/world/tablemimedata.hpp"
-#include "../widget/scenetooltoggle.hpp"
#include "../widget/scenetooltoggle2.hpp"
#include "cameracontroller.hpp"
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6eb437daf..2ebc083f2 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -17,7 +17,6 @@
#include "../../model/world/idtable.hpp"
#include "../../model/prefs/shortcut.hpp"
-#include "../../model/prefs/shortcuteventhandler.hpp"
#include "../../model/prefs/state.hpp"
#include "../render/orbitcameramode.hpp"
@@ -453,6 +452,11 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
return hit;
}
+CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
+{
+ return dynamic_cast (mEditMode->getCurrent());
+}
+
void CSVRender::WorldspaceWidget::abortDrag()
{
if (mDragging)
@@ -698,11 +702,6 @@ void CSVRender::WorldspaceWidget::handleInteractionPress (const WorldspaceHitRes
editMode.primaryOpenPressed (hit);
}
-CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
-{
- return dynamic_cast (mEditMode->getCurrent());
-}
-
void CSVRender::WorldspaceWidget::primaryOpen(bool activate)
{
handleInteraction(InteractionType_PrimaryOpen, activate);
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 5e224b380..cf244ce71 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -189,6 +189,8 @@ namespace CSVRender
/// Erase all overrides and restore the visual representation to its true state.
virtual void reset (unsigned int elementMask) = 0;
+ EditMode *getEditMode();
+
protected:
/// Visual elements in a scene
@@ -215,8 +217,6 @@ namespace CSVRender
void settingChanged (const CSMPrefs::Setting *setting) override;
- EditMode *getEditMode();
-
bool getSpeedMode();
private:
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index b53282036..24bcf3f13 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -30,7 +30,7 @@ void CSVWidget::SceneToolRun::updateIcon()
void CSVWidget::SceneToolRun::updatePanel()
{
- mTable->setRowCount (mProfiles.size());
+ mTable->setRowCount (static_cast(mProfiles.size()));
int i = 0;
diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp
index 4b2d20004..d0419a13a 100644
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@@ -27,11 +27,6 @@
#include "../../model/doc/document.hpp"
#include "../../model/prefs/state.hpp"
#include "../../model/world/commands.hpp"
-#include "../../model/world/data.hpp"
-#include "../../model/world/idcollection.hpp"
-#include "../../model/world/idtable.hpp"
-#include "../../model/world/landtexture.hpp"
-#include "../../model/world/universalid.hpp"
CSVWidget::ShapeBrushSizeControls::ShapeBrushSizeControls(const QString &title, QWidget *parent)
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index fa0be3155..04ac3322b 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -80,7 +80,7 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
int y = index / xMax;
int x = index % xMax;
- int total = mButtons.size();
+ int total = static_cast(mButtons.size());
int actualYIcons = total/xMax;
@@ -154,7 +154,7 @@ void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned in
desc.mMask = mask;
desc.mSmallIcon = smallIcon;
desc.mName = name;
- desc.mIndex = mButtons.size();
+ desc.mIndex = static_cast(mButtons.size());
mButtons.insert (std::make_pair (button, desc));
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index cf9bfe349..363cae570 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -99,7 +99,7 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id, unsigned int mask,
desc.mButtonId = id;
desc.mMask = mask;
desc.mName = name;
- desc.mIndex = mButtons.size();
+ desc.mIndex = static_cast(mButtons.size());
mButtons.insert (std::make_pair (button, desc));
diff --git a/apps/opencs/view/world/colordelegate.cpp b/apps/opencs/view/world/colordelegate.cpp
index 15a07b42c..3b5f692fe 100644
--- a/apps/opencs/view/world/colordelegate.cpp
+++ b/apps/opencs/view/world/colordelegate.cpp
@@ -3,8 +3,6 @@
#include
#include
-#include "../widget/coloreditor.hpp"
-
CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
CSMDoc::Document& document,
QObject *parent)
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 3d3b3cdbe..f2360b137 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -28,7 +28,6 @@
#include "../../model/world/columns.hpp"
#include "../../model/world/record.hpp"
#include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/idtree.hpp"
#include "../../model/world/commands.hpp"
#include "../../model/doc/document.hpp"
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index 1092d7217..442157ac5 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -42,7 +42,7 @@ QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) con
if (!mNamespace.empty())
{
- std::string namespace_ = input.left (mNamespace.size()).toUtf8().constData();
+ std::string namespace_ = input.left (static_cast(mNamespace.size())).toUtf8().constData();
if (Misc::StringUtils::lowerCase (namespace_)!=mNamespace)
return QValidator::Invalid; // incorrect namespace
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 44542c529..58d159a17 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -15,7 +15,6 @@
#include "../render/pagedworldspacewidget.hpp"
#include "../render/unpagedworldspacewidget.hpp"
-#include "../render/editmode.hpp"
#include "../widget/scenetoolbar.hpp"
#include "../widget/scenetoolmode.hpp"
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 096fc8a9e..6eab7aaa5 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -12,7 +12,6 @@
#include "../../model/doc/document.hpp"
#include "../../model/world/universalid.hpp"
#include "../../model/world/data.hpp"
-#include "../../model/world/columnbase.hpp"
#include "../../model/world/commands.hpp"
#include "../../model/world/idtable.hpp"
#include "../../model/prefs/state.hpp"
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index e0d2ea998..02348452f 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -184,7 +184,7 @@ if(APPLE)
add_subdirectory(../../files/ ${CMAKE_CURRENT_BINARY_DIR}/files)
- configure_file("${OpenMW_BINARY_DIR}/settings-default.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
+ configure_file("${OpenMW_BINARY_DIR}/defaults.bin" ${BUNDLE_RESOURCES_DIR} COPYONLY)
configure_file("${OpenMW_BINARY_DIR}/openmw.cfg" ${BUNDLE_RESOURCES_DIR} COPYONLY)
configure_file("${OpenMW_BINARY_DIR}/gamecontrollerdb.txt" ${BUNDLE_RESOURCES_DIR} COPYONLY)
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 677174877..35e550582 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -496,8 +496,8 @@ void OMW::Engine::setSkipMenu (bool skipMenu, bool newGame)
std::string OMW::Engine::loadSettings (Settings::Manager & settings)
{
// Create the settings manager and load default settings file
- const std::string localdefault = (mCfgMgr.getLocalPath() / "settings-default.cfg").string();
- const std::string globaldefault = (mCfgMgr.getGlobalPath() / "settings-default.cfg").string();
+ const std::string localdefault = (mCfgMgr.getLocalPath() / "defaults.bin").string();
+ const std::string globaldefault = (mCfgMgr.getGlobalPath() / "defaults.bin").string();
// prefer local
if (boost::filesystem::exists(localdefault))
@@ -505,7 +505,7 @@ std::string OMW::Engine::loadSettings (Settings::Manager & settings)
else if (boost::filesystem::exists(globaldefault))
settings.loadDefault(globaldefault);
else
- throw std::runtime_error ("No default settings file found! Make sure the file \"settings-default.cfg\" was properly installed.");
+ throw std::runtime_error ("No default settings file found! Make sure the file \"defaults.bin\" was properly installed.");
// load user settings if they exist
const std::string settingspath = (mCfgMgr.getUserConfigPath() / "settings.cfg").string();
@@ -1081,6 +1081,8 @@ void OMW::Engine::go()
// Save user settings
settings.saveUser(settingspath);
+ mViewer->stopThreading();
+
Log(Debug::Info) << "Quitting peacefully.";
}
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 709ffda2c..8f7e16058 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -44,6 +44,10 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
desc.add_options()
("help", "print help message")
("version", "print version information and quit")
+
+ ("replace", bpo::value()->default_value(Files::EscapeStringVector(), "")
+ ->multitoken()->composing(), "settings where the values from the current source should replace those from lower-priority sources instead of being appended")
+
("data", bpo::value()->default_value(Files::EscapePathContainer(), "data")
->multitoken()->composing(), "set data directories (later directories have higher priority)")
@@ -192,6 +196,15 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
Log(Debug::Error) << "No content file given (esm/esp, nor omwgame/omwaddon). Aborting...";
return false;
}
+ std::set contentDedupe;
+ for (const auto& contentFile : content)
+ {
+ if (!contentDedupe.insert(contentFile).second)
+ {
+ Log(Debug::Error) << "Content file specified more than once: " << contentFile << ". Aborting...";
+ return false;
+ }
+ }
for (auto& file : content)
{
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 570399e91..b0c38f98d 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -301,7 +301,7 @@ namespace MWBase
virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
///< @return an updated Ptr
- virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive) = 0;
+ virtual MWWorld::Ptr moveObjectBy(const MWWorld::Ptr &ptr, osg::Vec3f vec, bool moveToActive, bool ignoreCollisions) = 0;
///< @return an updated Ptr
virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 692ca72bb..b3c792bde 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -26,7 +26,6 @@
#include "../mwworld/failedaction.hpp"
#include "../mwworld/customdata.hpp"
#include "../mwworld/containerstore.hpp"
-#include "../mwphysics/physicssystem.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/localscripts.hpp"
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 3a5ff0d9a..849960a09 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -132,12 +132,14 @@ namespace MWClass
MWBase::Environment::get().getWorld()->getMaxActivationDistance())
{
MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(ptr);
+ if(animation)
+ {
+ const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+ int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
+ const ESM::MagicEffect *effect = store.get().find(index);
- const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
- int index = ESM::MagicEffect::effectStringToId("sEffectTelekinesis");
- const ESM::MagicEffect *effect = store.get().find(index);
-
- animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+ animation->addSpellCastGlow(effect, 1); // 1 second glow to match the time taken for a door opening or closing
+ }
}
const std::string keyId = ptr.getCellRef().getKey();
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 9d2c45b10..50206b32c 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -36,7 +36,6 @@
#include "../mwworld/failedaction.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/customdata.hpp"
-#include "../mwphysics/physicssystem.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/localscripts.hpp"
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 34fd5828f..3c6349ad8 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -343,7 +343,7 @@ namespace MWDialogue
if(!inJournal(topicId, answer->mId))
{
// Does this dialogue contains some actor-specific answer?
- if (answer->mActor == mActor.getCellRef().getRefId())
+ if (Misc::StringUtils::ciEqual(answer->mActor, mActor.getCellRef().getRefId()))
flag |= MWBase::DialogueManager::TopicType::Specific;
}
else
diff --git a/apps/openmw/mwdialogue/journalimp.hpp b/apps/openmw/mwdialogue/journalimp.hpp
index a6501e54e..0c778d2ba 100644
--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@@ -3,7 +3,6 @@
#include "../mwbase/journal.hpp"
-#include "journalentry.hpp"
#include "quest.hpp"
namespace MWDialogue
diff --git a/apps/openmw/mwgui/bookpage.hpp b/apps/openmw/mwgui/bookpage.hpp
index f9fd93089..512a43992 100644
--- a/apps/openmw/mwgui/bookpage.hpp
+++ b/apps/openmw/mwgui/bookpage.hpp
@@ -10,7 +10,6 @@
#include
#include
-#include
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index d0d3b87a6..b9004fcdb 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -9,6 +9,10 @@
#include
#include
+#include
+#include
+#include
+#include
#include "../mwscript/extensions.hpp"
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index 52aa42f2a..2b8cecbc0 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -6,12 +6,8 @@
#include
#include
-#include
-#include
-#include
#include
#include
-#include
#include "../mwscript/compilercontext.hpp"
#include "../mwscript/interpretercontext.hpp"
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index b0913219f..c980ef3ea 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -12,7 +12,9 @@
#include "../mwworld/class.hpp"
#include "../mwworld/inventorystore.hpp"
+#include "../mwmechanics/aipackage.hpp"
#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/summoning.hpp"
#include "../mwscript/interpretercontext.hpp"
@@ -268,6 +270,23 @@ namespace MWGui
for (const auto& creature : creatureMap)
MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(ptr, creature.second);
creatureMap.clear();
+
+ // Check if we are a summon and inform our master we've bit the dust
+ for(const auto& package : creatureStats.getAiSequence())
+ {
+ if(package->followTargetThroughDoors() && !package->getTarget().isEmpty())
+ {
+ const auto& summoner = package->getTarget();
+ auto& summons = summoner.getClass().getCreatureStats(summoner).getSummonedCreatureMap();
+ auto it = std::find_if(summons.begin(), summons.end(), [&] (const auto& entry) { return entry.second == creatureStats.getActorId(); });
+ if(it != summons.end())
+ {
+ MWMechanics::purgeSummonEffect(summoner, *it);
+ summons.erase(it);
+ break;
+ }
+ }
+ }
}
MWBase::Environment::get().getWorld()->deleteObject(ptr);
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index eb2b36c8a..43c8f4ffe 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -310,7 +310,7 @@ namespace MWGui
deleteLater();
for (Link* link : mLinks)
delete link;
- for (auto link : mTopicLinks)
+ for (const auto& link : mTopicLinks)
delete link.second;
for (auto history : mHistoryContents)
delete history;
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index cf88efaae..4e4d77da4 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -2,7 +2,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index 94dcc77c5..14f2c1dd9 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -5,9 +5,7 @@
#include
#include
#include
-#include
#include
-#include
#include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp
index 065a503e6..40053b3c8 100644
--- a/apps/openmw/mwgui/journalbooks.cpp
+++ b/apps/openmw/mwgui/journalbooks.cpp
@@ -278,7 +278,7 @@ BookTypesetter::Ptr JournalBooks::createCyrillicJournalIndex ()
mIndexPagesCount = 2;
}
- unsigned char ch[2] = {0xd0, 0x90}; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
+ unsigned char ch[3] = {0xd0, 0x90, 0x00}; // CYRILLIC CAPITAL A is a 0xd090 in UTF-8
for (int i = 0; i < 32; ++i)
{
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 86f92db6f..14de3fd27 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -12,7 +12,6 @@
#include "../mwbase/soundmanager.hpp"
#include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/npcstats.hpp"
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 6501284fd..9fab582b5 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -26,8 +26,6 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/inputmanager.hpp"
-#include "../mwrender/vismask.hpp"
-
#include "backgroundimage.hpp"
namespace MWGui
@@ -103,7 +101,7 @@ namespace MWGui
Log(Debug::Warning) << "Warning: no splash screens found!";
}
- void LoadingScreen::setLabel(const std::string &label, bool important, bool center)
+ void LoadingScreen::setLabel(const std::string &label, bool important)
{
mImportantLabel = important;
@@ -113,7 +111,7 @@ namespace MWGui
size.width = std::max(300, size.width);
mLoadingBox->setSize(size);
- if (center)
+ if (MWBase::Environment::get().getWindowManager()->getMessagesCount() > 0)
mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight()/2 - mLoadingBox->getHeight()/2);
else
mLoadingBox->setPosition(mMainWidget->getWidth()/2 - mLoadingBox->getWidth()/2, mMainWidget->getHeight() - mLoadingBox->getHeight() - 8);
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index e1c652386..c64396534 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -3,7 +3,6 @@
#include
-#include
#include
#include
@@ -38,7 +37,7 @@ namespace MWGui
virtual ~LoadingScreen();
/// Overridden from Loading::Listener, see the Loading::Listener documentation for usage details
- void setLabel (const std::string& label, bool important, bool center) override;
+ void setLabel (const std::string& label, bool important) override;
void loadingOn(bool visible=true) override;
void loadingOff() override;
void setProgressRange (size_t range) override;
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index b4de5cb50..5daea8f3f 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -7,7 +7,6 @@
#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/pickpocket.hpp"
-#include "../mwworld/containerstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index d0e950979..b2742df79 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -1,8 +1,6 @@
#ifndef MWGUI_QUICKKEYS_H
#define MWGUI_QUICKKEYS_H
-#include "../mwworld/ptr.hpp"
-
#include "windowbase.hpp"
#include "spellmodel.hpp"
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index f8d89c0cb..df6962c78 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -1,7 +1,6 @@
#include "recharge.hpp"
#include
-#include
#include
@@ -15,10 +14,10 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
-#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/actorutil.hpp"
#include "../mwmechanics/recharge.hpp"
+#include "itemselection.hpp"
#include "itemwidget.hpp"
#include "itemchargeview.hpp"
#include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index 3d469bac5..c260b1554 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -3,8 +3,6 @@
#include "windowbase.hpp"
-#include "itemselection.hpp"
-
namespace MWWorld
{
class Ptr;
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index ea79e0326..351b97603 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -3,8 +3,6 @@
#include
#include
-#include
-#include
#include
@@ -17,6 +15,7 @@
#include "../mwworld/containerstore.hpp"
#include "../mwworld/class.hpp"
+#include "itemselection.hpp"
#include "itemwidget.hpp"
#include "itemchargeview.hpp"
#include "sortfilteritemmodel.hpp"
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 594ad2823..701009f54 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -3,8 +3,6 @@
#include "windowbase.hpp"
-#include "itemselection.hpp"
-
#include "../mwmechanics/repair.hpp"
namespace MWGui
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index dcd94b768..26149e147 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -1,9 +1,7 @@
#include "spellwindow.hpp"
-#include
#include
#include
-#include
#include