mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'xethik/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-09-21 08:07:00 +02:00
commit 96b181bb54
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwinput/inputmanagerimp.cpp
View File

@ -585,7 +585,7 @@ namespace MWInput
mPlayer->pitch(-y/scale);
}
if (arg.zrel)
if (arg.zrel && mControlSwitch["playerviewswitch"]) //Check to make sure you are allowed to zoomout and there is a change
{
MWBase::Environment::get().getWorld()->changeVanityModeScale(arg.zrel);
MWBase::Environment::get().getWorld()->setCameraDistance(arg.zrel, true, true);

3
apps/openmw/mwmechanics/magiceffects.cpp
View File

@ -151,8 +151,7 @@ namespace MWMechanics
for (Collection::const_iterator iter (prev.begin()); iter!=prev.end(); ++iter)
{
Collection::const_iterator other = now.mCollection.find (iter->first);
if (other==prev.end())
if (other==now.end())
{
result.add (iter->first, EffectParam() - iter->second);
}