mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 11:45:34 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-05-26 19:02:13 +02:00
commit 3937cfcd8b
5 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -496,10 +496,10 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
mExpelled.insert (iter->first);
if (iter->second.mRank >= 0)
mFactionRank.insert (std::make_pair (iter->first, iter->second.mRank));
mFactionRank[iter->first] = iter->second.mRank;
if (iter->second.mReputation)
mFactionReputation.insert (std::make_pair (iter->first, iter->second.mReputation));
mFactionReputation[iter->first] = iter->second.mReputation;
}
mDisposition = state.mDisposition;

2
apps/openmw/mwworld/esmstore.cpp
View file

@ -42,7 +42,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
for (int i = 0; i < esm.getIndex(); i++) {
const std::string &candidate = allPlugins->at(i).getContext().filename;
std::string fnamecandidate = boost::filesystem::path(candidate).filename().string();
if (fname == fnamecandidate) {
if (Misc::StringUtils::ciEqual(fname, fnamecandidate)) {
index = i;
break;
}

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -1375,11 +1375,11 @@ namespace MWWorld
updateWeather(duration);
mWorldScene->update (duration, paused);
if (!paused)
doPhysics (duration);
mWorldScene->update (duration, paused);
performUpdateSceneQueries ();
updateWindowManager ();

35
components/files/collections.cpp
View file

@ -1,6 +1,7 @@
#include "collections.hpp"
#include <components/misc/stringops.hpp>
namespace Files
{
Collections::Collections()
@ -36,9 +37,19 @@ namespace Files
for (Files::PathContainer::const_iterator iter = mDirectories.begin();
iter != mDirectories.end(); ++iter)
{
const boost::filesystem::path path = *iter / file;
if (boost::filesystem::exists(path))
return path.string();
for (boost::filesystem::directory_iterator iter2 (*iter);
iter2!=boost::filesystem::directory_iterator(); ++iter2)
{
boost::filesystem::path path = *iter2;
if (mFoldCase)
{
if (Misc::StringUtils::ciEqual(file, path.filename().string()))
return path.string();
}
else if (path.filename().string() == file)
return path.string();
}
}
throw std::runtime_error ("file " + file + " not found");
@ -49,9 +60,19 @@ namespace Files
for (Files::PathContainer::const_iterator iter = mDirectories.begin();
iter != mDirectories.end(); ++iter)
{
const boost::filesystem::path path = *iter / file;
if (boost::filesystem::exists(path))
return true;
for (boost::filesystem::directory_iterator iter2 (*iter);
iter2!=boost::filesystem::directory_iterator(); ++iter2)
{
boost::filesystem::path path = *iter2;
if (mFoldCase)
{
if (Misc::StringUtils::ciEqual(file, path.filename().string()))
return true;
}
else if (path.filename().string() == file)
return true;
}
}
return false;

2
files/mygui/openmw_settings_window.layout
View file

@ -417,7 +417,7 @@
<UserString key="SettingType" value="CheckButton"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" align="Left Top">
<Property key="Caption" value="Enabled"/>
<Property key="Caption" value="Shadows"/>
</Widget>
</Widget>