mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-06 10:41:04 +00:00
Code Issues Releases Wiki Activity

fixed incompatibilities caused bu merge

Browse source
This commit is contained in:
florent.teppe 2022-09-05 17:57:13 +02:00
parent 3cbd0e0762
commit 9092c32f2e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,8 +127,6 @@ namespace
}
}
}
}
namespace MWWorld
@ -287,7 +285,7 @@ namespace MWWorld
};
int ESMStore::find(const std::string& id) const
int ESMStore::find(const std::string_view& id) const
{
IDMap::const_iterator it = mStoreImp->mIds.find(id);
if (it == mStoreImp->mIds.end()) {

4
apps/openmw/mwworld/esmstore.hpp
View file

@ -6,6 +6,8 @@
#include <unordered_map>
#include <components/esm/luascripts.hpp>
#include <components/esm/records.hpp>
#include "store.hpp"
namespace Loading
@ -83,7 +85,7 @@ namespace MWWorld
}
/// Look up the given ID in 'all'. Returns 0 if not found.
int find(const std::string& id) const;
int find(const std::string_view& id) const;
int findStatic(const std::string& id) const;