diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp deleted file mode 100644 index 5a6b6a763..000000000 --- a/apps/openmw/mwworld/store.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "store.hpp" - -namespace MWWorld -{ - template <> - void Store::load(ESM::ESMReader &esm, const std::string &id) { - mStatic.push_back(ESM::Dialogue()); - mStatic.back().mId = id; - mStatic.back().load(esm); - } - - template <> - void Store::load(ESM::ESMReader &esm, const std::string &id) { - mStatic.push_back(ESM::Script()); - mStatic.back().load(esm); - StringUtils::toLower(mStatic.back().mId); - } -} diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp index a406a39de..fd93f39f1 100644 --- a/apps/openmw/mwworld/store.hpp +++ b/apps/openmw/mwworld/store.hpp @@ -203,10 +203,18 @@ namespace MWWorld }; template <> - void Store::load(ESM::ESMReader &esm, const std::string &id); + inline void Store::load(ESM::ESMReader &esm, const std::string &id) { + mStatic.push_back(ESM::Dialogue()); + mStatic.back().mId = id; + mStatic.back().load(esm); + } template <> - void Store::load(ESM::ESMReader &esm, const std::string &id); + inline void Store::load(ESM::ESMReader &esm, const std::string &id) { + mStatic.push_back(ESM::Script()); + mStatic.back().load(esm); + StringUtils::toLower(mStatic.back().mId); + } template <> class Store : public StoreBase @@ -347,7 +355,7 @@ namespace MWWorld typedef std::map DynamicInt; typedef std::map, ESM::Cell> DynamicExt; - + DynamicInt mDynamicInt; DynamicExt mDynamicExt;