mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 03:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix MSVC warnings about local variables redeclaration (#3130)

Browse Source
This commit is contained in:
Andrei Kortunov 2021-09-29 11:36:05 +04:00 committed by GitHub
parent 5794a3b346
commit fc2076db1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/actors.cpp
View File

@ -1171,7 +1171,7 @@ namespace MWMechanics
creatureStats.setAiSetting(CreatureStats::AI_Flee, stat); creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Undead) if (creature && ptr.get<ESM::Creature>()->mBase->mData.mType == ESM::Creature::Undead)
{ {
Stat<int> stat = creatureStats.getAiSetting(CreatureStats::AI_Flee); stat = creatureStats.getAiSetting(CreatureStats::AI_Flee);
stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::TurnUndead).getMagnitude())); stat.setModifier(static_cast<int>(effects.get(ESM::MagicEffect::TurnUndead).getMagnitude()));
creatureStats.setAiSetting(CreatureStats::AI_Flee, stat); creatureStats.setAiSetting(CreatureStats::AI_Flee, stat);
} }

50
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -514,18 +514,18 @@ namespace MWPhysics
void PhysicsSystem::remove(const MWWorld::Ptr &ptr) void PhysicsSystem::remove(const MWWorld::Ptr &ptr)
{ {
if (auto found = mObjects.find(ptr.mRef); found != mObjects.end()) if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
{ {
if (mUnrefQueue.get()) if (mUnrefQueue.get())
mUnrefQueue->push(found->second->getShapeInstance()); mUnrefQueue->push(foundObject->second->getShapeInstance());
mAnimatedObjects.erase(found->second.get()); mAnimatedObjects.erase(foundObject->second.get());
mObjects.erase(found); mObjects.erase(foundObject);
} }
else if (auto found = mActors.find(ptr.mRef); found != mActors.end()) else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
{ {
mActors.erase(found); mActors.erase(foundActor);
} }
} }
@ -591,16 +591,16 @@ namespace MWPhysics
void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr) void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
{ {
if (auto found = mObjects.find(ptr.mRef); found != mObjects.end()) if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
{ {
float scale = ptr.getCellRef().getScale(); float scale = ptr.getCellRef().getScale();
found->second->setScale(scale); foundObject->second->setScale(scale);
mTaskScheduler->updateSingleAabb(found->second); mTaskScheduler->updateSingleAabb(foundObject->second);
} }
else if (auto found = mActors.find(ptr.mRef); found != mActors.end()) else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
{ {
found->second->updateScale(); foundActor->second->updateScale();
mTaskScheduler->updateSingleAabb(found->second); mTaskScheduler->updateSingleAabb(foundActor->second);
} }
} }
@ -633,32 +633,32 @@ namespace MWPhysics
void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate) void PhysicsSystem::updateRotation(const MWWorld::Ptr &ptr, osg::Quat rotate)
{ {
if (auto found = mObjects.find(ptr.mRef); found != mObjects.end()) if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
{ {
found->second->setRotation(rotate); foundObject->second->setRotation(rotate);
mTaskScheduler->updateSingleAabb(found->second); mTaskScheduler->updateSingleAabb(foundObject->second);
} }
else if (auto found = mActors.find(ptr.mRef); found != mActors.end()) else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
{ {
if (!found->second->isRotationallyInvariant()) if (!foundActor->second->isRotationallyInvariant())
{ {
found->second->setRotation(rotate); foundActor->second->setRotation(rotate);
mTaskScheduler->updateSingleAabb(found->second); mTaskScheduler->updateSingleAabb(foundActor->second);
} }
} }
} }
void PhysicsSystem::updatePosition(const MWWorld::Ptr &ptr) void PhysicsSystem::updatePosition(const MWWorld::Ptr &ptr)
{ {
if (auto found = mObjects.find(ptr.mRef); found != mObjects.end()) if (auto foundObject = mObjects.find(ptr.mRef); foundObject != mObjects.end())
{ {
found->second->updatePosition(); foundObject->second->updatePosition();
mTaskScheduler->updateSingleAabb(found->second); mTaskScheduler->updateSingleAabb(foundObject->second);
} }
else if (auto found = mActors.find(ptr.mRef); found != mActors.end()) else if (auto foundActor = mActors.find(ptr.mRef); foundActor != mActors.end())
{ {
found->second->updatePosition(); foundActor->second->updatePosition();
mTaskScheduler->updateSingleAabb(found->second, true); mTaskScheduler->updateSingleAabb(foundActor->second, true);
} }
} }

1
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -440,7 +440,6 @@ namespace MWRender
static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get()); static_cast<Terrain::QuadTreeWorld*>(mTerrain.get())->addChunkManager(mGroundcover.get());
mResourceSystem->addResourceManager(mGroundcover.get()); mResourceSystem->addResourceManager(mGroundcover.get());
float groundcoverDistance = std::max(0.f, Settings::Manager::getFloat("rendering distance", "Groundcover"));
mGroundcover->setViewDistance(groundcoverDistance); mGroundcover->setViewDistance(groundcoverDistance);
} }

6
apps/openmw/mwworld/scene.cpp
View File

@ -917,9 +917,9 @@ namespace MWWorld
// unload // unload
for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); ) for (auto iter = mInactiveCells.begin(); iter!=mInactiveCells.end(); )
{ {
auto* cell = *iter++; auto* cellToUnload = *iter++;
deactivateCell(cell); deactivateCell(cellToUnload);
unloadInactiveCell(cell); unloadInactiveCell(cellToUnload);
} }
assert(mActiveCells.empty()); assert(mActiveCells.empty());
assert(mInactiveCells.empty()); assert(mInactiveCells.empty());

4
components/detournavigator/navigatorimpl.cpp
View File

@ -39,8 +39,8 @@ namespace DetourNavigator
if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape()) if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
{ {
const ObjectId avoidId(avoidShape); const ObjectId avoidId(avoidShape);
CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape}; CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
if (mNavMeshManager.addObject(avoidId, collisionShape, transform, AreaType_null)) if (mNavMeshManager.addObject(avoidId, avoidCollisionShape, transform, AreaType_null))
{ {
updateAvoidShapeId(id, avoidId); updateAvoidShapeId(id, avoidId);
result = true; result = true;

24
components/detournavigator/recastmeshbuilder.cpp
View File

@ -49,9 +49,9 @@ namespace DetourNavigator
std::vector<osg::Vec3f> uniqueVertices; std::vector<osg::Vec3f> uniqueVertices;
uniqueVertices.reserve(3 * triangles.size()); uniqueVertices.reserve(3 * triangles.size());
for (const RecastMeshTriangle& v : triangles) for (const RecastMeshTriangle& triangle : triangles)
for (const osg::Vec3f& v : v.mVertices) for (const osg::Vec3f& vertex : triangle.mVertices)
uniqueVertices.push_back(v); uniqueVertices.push_back(vertex);
std::sort(uniqueVertices.begin(), uniqueVertices.end()); std::sort(uniqueVertices.begin(), uniqueVertices.end());
uniqueVertices.erase(std::unique(uniqueVertices.begin(), uniqueVertices.end()), uniqueVertices.end()); uniqueVertices.erase(std::unique(uniqueVertices.begin(), uniqueVertices.end()), uniqueVertices.end());
@ -61,15 +61,15 @@ namespace DetourNavigator
std::vector<AreaType> areaTypes; std::vector<AreaType> areaTypes;
areaTypes.reserve(triangles.size()); areaTypes.reserve(triangles.size());
for (const RecastMeshTriangle& v : triangles) for (const RecastMeshTriangle& triangle : triangles)
{ {
areaTypes.push_back(v.mAreaType); areaTypes.push_back(triangle.mAreaType);
for (const osg::Vec3f& v : v.mVertices) for (const osg::Vec3f& vertex : triangle.mVertices)
{ {
const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), v); const auto it = std::lower_bound(uniqueVertices.begin(), uniqueVertices.end(), vertex);
assert(it != uniqueVertices.end()); assert(it != uniqueVertices.end());
assert(*it == v); assert(*it == vertex);
indices.push_back(static_cast<int>(it - uniqueVertices.begin())); indices.push_back(static_cast<int>(it - uniqueVertices.begin()));
} }
} }
@ -79,11 +79,11 @@ namespace DetourNavigator
std::vector<float> vertices; std::vector<float> vertices;
vertices.reserve(3 * uniqueVertices.size()); vertices.reserve(3 * uniqueVertices.size());
for (const osg::Vec3f& v : uniqueVertices) for (const osg::Vec3f& vertex : uniqueVertices)
{ {
vertices.push_back(v.x() + shift.x()); vertices.push_back(vertex.x() + shift.x());
vertices.push_back(v.y() + shift.y()); vertices.push_back(vertex.y() + shift.y());
vertices.push_back(v.z() + shift.z()); vertices.push_back(vertex.z() + shift.z());
} }
return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes)); return Mesh(std::move(indices), std::move(vertices), std::move(areaTypes));

6
components/sceneutil/recastmesh.cpp
View File

@ -52,10 +52,10 @@ namespace SceneUtil
for (const Heightfield& heightfield : recastMesh.getHeightfields()) for (const Heightfield& heightfield : recastMesh.getHeightfields())
{ {
const Mesh mesh = makeMesh(heightfield); const Mesh heightfieldMesh = makeMesh(heightfield);
const int indexShift = static_cast<int>(vertices.size() / 3); const int indexShift = static_cast<int>(vertices.size() / 3);
std::copy(mesh.getVertices().begin(), mesh.getVertices().end(), std::back_inserter(vertices)); std::copy(heightfieldMesh.getVertices().begin(), heightfieldMesh.getVertices().end(), std::back_inserter(vertices));
std::transform(mesh.getIndices().begin(), mesh.getIndices().end(), std::back_inserter(indices), std::transform(heightfieldMesh.getIndices().begin(), heightfieldMesh.getIndices().end(), std::back_inserter(indices),
[&] (int index) { return index + indexShift; }); [&] (int index) { return index + indexShift; });
} }