mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 00:26:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2986 from Capostrophic/msvc

Browse source 
Fix AppVeyor warnings
This commit is contained in:
Chris Djali 2020-08-07 15:29:33 +01:00 committed by GitHub
commit 5311956bc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwmechanics/aiavoiddoor.cpp
View file

@ -60,14 +60,14 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor, CharacterCont
// Make all nearby actors also avoid the door
std::vector<MWWorld::Ptr> actors;
MWBase::Environment::get().getMechanicsManager()->getActorsInRange(pos.asVec3(),100,actors);
for(auto& actor : actors)
for(auto& neighbor : actors)
{
if (actor == getPlayer())
if (neighbor == getPlayer())
continue;
MWMechanics::AiSequence& seq = actor.getClass().getCreatureStats(actor).getAiSequence();
MWMechanics::AiSequence& seq = neighbor.getClass().getCreatureStats(neighbor).getAiSequence();
if (seq.getTypeId() != MWMechanics::AiPackageTypeId::AvoidDoor)
seq.stack(MWMechanics::AiAvoidDoor(mDoorPtr), actor);
seq.stack(MWMechanics::AiAvoidDoor(mDoorPtr), neighbor);
}
return false;

4
apps/openmw/mwscript/miscextensions.cpp
View file

@ -563,9 +563,9 @@ namespace MWScript
effects += store.getMagicEffects();
}
for (const auto& effect : effects)
for (const auto& activeEffect : effects)
{
if (effect.first.mId == key && effect.second.getModifier() > 0)
if (activeEffect.first.mId == key && activeEffect.second.getModifier() > 0)
{
runtime.push(1);
return;

2
apps/openmw/mwscript/scriptmanagerimp.cpp
View file

@ -149,8 +149,6 @@ namespace MWScript
int count = 0;
int success = 0;
const MWWorld::Store<ESM::Script>& scripts = mStore.get<ESM::Script>();
for (auto& script : mStore.get<ESM::Script>())
{
if (!std::binary_search (mScriptBlacklist.begin(), mScriptBlacklist.end(),

1
components/sdlutil/sdlvideowrapper.cpp
View file

@ -102,7 +102,6 @@ namespace SDLUtil
int w = 0;
int h = 0;
auto index = SDL_GetWindowDisplayIndex(mWindow);
bool reposition = false;
SDL_GetDisplayBounds(index, &rect);
SDL_GetWindowSize(mWindow, &w, &h);