mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 15:45:35 +00:00
Code Issues Releases Wiki Activity

partially revert "Store: moved all the template specialization to its own heaper file, included where it's needed"

Browse source 
This reverts commit 80a25bcd3021f7ebfaf2f864e34532009b9b8aeb.
It didn't really make sense to do all those changes in the same MR

partially Revert "Store refactoring: more forgotten storeSpecialization.hpp"

This reverts commit 9943a5bc96b9025f06cbaac5bb7f1bf51ebc746f.

removed remaining references to storeSpecialization  CMakeLists.txt,  and landmanager.cpp
This commit is contained in:
florent.teppe 2022-07-03 20:53:08 +02:00
parent 3b6ac53be4
commit 1ced0c912e
46 changed files with 1 additions and 336 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -75,7 +75,7 @@ add_openmw_dir (mwworld
containerstore actiontalk actiontake manualref player cellvisitors failedaction
cells localscripts customdata inventorystore ptr actionopen actionread actionharvest
actionequip timestamp actionalchemy cellstore actionapply actioneat
store esmstore storeSpecialization fallback actionrepair actionsoulgem livecellref actiondoor
store esmstore fallback actionrepair actionsoulgem livecellref actiondoor
contentloader esmloader actiontrap cellreflist cellref weather projectilemanager
cellpreloader datetimemanager groundcoverstore magiceffects
)

1
apps/openmw/mwclass/creature.cpp
View file

@ -35,7 +35,6 @@
#include "../mwworld/localscripts.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwrender/renderinginterface.hpp"
#include "../mwrender/objects.hpp"

1
apps/openmw/mwclass/npc.cpp
View file

@ -49,7 +49,6 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/localscripts.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwrender/objects.hpp"
#include "../mwrender/renderinginterface.hpp"

1
apps/openmw/mwdialogue/hypertextparser.cpp
View file

@ -5,7 +5,6 @@
#include "../mwworld/store.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "keywordsearch.hpp"

1
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -17,7 +17,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include <MyGUI_Macros.h>

1
apps/openmw/mwgui/console.cpp
View file

@ -25,7 +25,6 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace MWGui
{

1
apps/openmw/mwgui/hud.cpp
View file

@ -17,7 +17,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwmechanics/actorutil.hpp"

1
apps/openmw/mwgui/mapwindow.cpp
View file

@ -26,7 +26,6 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/cellutils.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwrender/globalmap.hpp"
#include "../mwrender/localmap.hpp"

1
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -15,7 +15,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp"

1
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -18,7 +18,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/store.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/spellutil.hpp"
#include "../mwmechanics/actorutil.hpp"

1
apps/openmw/mwgui/spellicons.cpp
View file

@ -17,7 +17,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/actorutil.hpp"

1
apps/openmw/mwgui/spellmodel.cpp
View file

@ -13,7 +13,6 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace
{

1
apps/openmw/mwgui/statswindow.cpp
View file

@ -18,7 +18,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwmechanics/actorutil.hpp"

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -18,8 +18,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/spellutil.hpp"
#include "../mwmechanics/actorutil.hpp"

1
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -11,7 +11,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwmechanics/npcstats.hpp"
#include "../mwmechanics/actorutil.hpp"

1
apps/openmw/mwgui/widgets.cpp
View file

@ -15,7 +15,6 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "controllers.hpp"
#include "ustring.hpp"

1
apps/openmw/mwmechanics/activespells.cpp
View file

@ -27,7 +27,6 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace
{

2
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -14,8 +14,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/dialoguemanager.hpp"

1
apps/openmw/mwmechanics/aicombataction.cpp
View file

@ -12,7 +12,6 @@
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/actionequip.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "actorutil.hpp"
#include "npcstats.hpp"

1
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -17,7 +17,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwphysics/collisiontype.hpp"

1
apps/openmw/mwmechanics/alchemy.cpp
View file

@ -21,7 +21,6 @@
#include "../mwworld/containerstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "magiceffects.hpp"
#include "creaturestats.hpp"

1
apps/openmw/mwmechanics/autocalcspell.cpp
View file

@ -3,7 +3,6 @@
#include <limits>
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"

1
apps/openmw/mwmechanics/enchanting.cpp
View file

@ -7,7 +7,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"

1
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -14,7 +14,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/ptr.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/statemanager.hpp"

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

@ -11,7 +11,6 @@
#include <components/misc/strings/format.hpp>
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"

1
apps/openmw/mwmechanics/pathgrid.cpp
View file

@ -5,7 +5,6 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace
{

1
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -18,7 +18,6 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwrender/animation.hpp"

1
apps/openmw/mwmechanics/spelleffects.cpp
View file

@ -29,7 +29,6 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/player.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace
{

1
apps/openmw/mwmechanics/spellpriority.cpp
View file

@ -13,7 +13,6 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/cellstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "creaturestats.hpp"
#include "spellresistance.hpp"

1
apps/openmw/mwmechanics/spellresistance.cpp
View file

@ -7,7 +7,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "creaturestats.hpp"
#include "spellutil.hpp"

2
apps/openmw/mwmechanics/spellutil.cpp
View file

@ -7,8 +7,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "actorutil.hpp"
#include "creaturestats.hpp"

1
apps/openmw/mwrender/globalmap.cpp
View file

@ -23,7 +23,6 @@
#include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "vismask.hpp"
#include "util.hpp"

1
apps/openmw/mwrender/landmanager.cpp
View file

@ -7,7 +7,6 @@
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
namespace MWRender

2
apps/openmw/mwrender/objectpaging.cpp
View file

@ -31,8 +31,6 @@
#include <components/misc/rng.hpp>
#include "apps/openmw/mwworld/esmstore.hpp"
#include "apps/openmw/mwworld/storeSpecialization.hpp"
#include "apps/openmw/mwbase/environment.hpp"
#include "apps/openmw/mwbase/world.hpp"

1
apps/openmw/mwrender/pathgrid.cpp
View file

@ -19,7 +19,6 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwmechanics/pathfinding.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "vismask.hpp"

1
apps/openmw/mwrender/terrainstorage.cpp
View file

@ -3,7 +3,6 @@
#include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "landmanager.hpp"

1
apps/openmw/mwscript/guiextensions.cpp
View file

@ -7,7 +7,6 @@
#include <components/interpreter/opcodes.hpp>
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"

285
apps/openmw/mwworld/StoreSpecialization.hpp
View file

@ -1,285 +0,0 @@
#pragma once
namespace MWWorld
{
class StoreBase;
template<typename T> class Store;
template<typename T> class IndexedStore;
template <>
class Store<ESM::LandTexture> : public StoreBase
{
// For multiple ESM/ESP files we need one list per file.
typedef std::vector<ESM::LandTexture> LandTextureList;
std::vector<LandTextureList> mStatic;
public:
Store();
typedef std::vector<ESM::LandTexture>::const_iterator iterator;
// Must be threadsafe! Called from terrain background loading threads.
// Not a big deal here, since ESM::LandTexture can never be modified or inserted/erased
const ESM::LandTexture *search(size_t index, size_t plugin) const;
const ESM::LandTexture *find(size_t index, size_t plugin) const;
void resize(size_t num) { mStatic.resize(num); }
size_t getSize() const override;
size_t getSize(size_t plugin) const;
RecordId load(ESM::ESMReader &esm) override;
iterator begin(size_t plugin) const;
iterator end(size_t plugin) const;
};
template <>
class Store<ESM::Land> : public StoreBase
{
struct SpatialComparator
{
using is_transparent = void;
bool operator()(const ESM::Land& x, const ESM::Land& y) const
{
return std::tie(x.mX, x.mY) < std::tie(y.mX, y.mY);
}
bool operator()(const ESM::Land& x, const std::pair<int, int>& y) const
{
return std::tie(x.mX, x.mY) < std::tie(y.first, y.second);
}
bool operator()(const std::pair<int, int>& x, const ESM::Land& y) const
{
return std::tie(x.first, x.second) < std::tie(y.mX, y.mY);
}
};
using Statics = std::set<ESM::Land, SpatialComparator>;
Statics mStatic;
public:
typedef typename Statics::iterator iterator;
virtual ~Store();
size_t getSize() const override;
iterator begin() const;
iterator end() const;
// Must be threadsafe! Called from terrain background loading threads.
// Not a big deal here, since ESM::Land can never be modified or inserted/erased
const ESM::Land *search(int x, int y) const;
const ESM::Land *find(int x, int y) const;
RecordId load(ESM::ESMReader &esm) override;
void setUp() override;
private:
bool mBuilt = false;
};
template <>
class Store<ESM::Cell> : public StoreBase
{
struct DynamicExtCmp
{
bool operator()(const std::pair<int, int> &left, const std::pair<int, int> &right) const {
if (left.first == right.first && left.second == right.second)
return false;
if (left.first == right.first)
return left.second > right.second;
// Exterior cells are listed in descending, row-major order,
// this is a workaround for an ambiguous chargen_plank reference in the vanilla game.
// there is one at -22,16 and one at -2,-9, the latter should be used.
return left.first > right.first;
}
};
typedef std::unordered_map<std::string, ESM::Cell, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> DynamicInt;
typedef std::map<std::pair<int, int>, ESM::Cell, DynamicExtCmp> DynamicExt;
DynamicInt mInt;
DynamicExt mExt;
std::vector<ESM::Cell *> mSharedInt;
std::vector<ESM::Cell *> mSharedExt;
DynamicInt mDynamicInt;
DynamicExt mDynamicExt;
const ESM::Cell *search(const ESM::Cell &cell) const;
void handleMovedCellRefs(ESM::ESMReader& esm, ESM::Cell* cell);
public:
typedef SharedIterator<ESM::Cell> iterator;
const ESM::Cell *search(const std::string &id) const;
const ESM::Cell *search(int x, int y) const;
const ESM::Cell *searchStatic(int x, int y) const;
const ESM::Cell *searchOrCreate(int x, int y);
const ESM::Cell *find(const std::string &id) const;
const ESM::Cell *find(int x, int y) const;
void clearDynamic() override;
void setUp() override;
RecordId load(ESM::ESMReader &esm) override;
iterator intBegin() const;
iterator intEnd() const;
iterator extBegin() const;
iterator extEnd() const;
// Return the northernmost cell in the easternmost column.
const ESM::Cell *searchExtByName(const std::string &id) const;
// Return the northernmost cell in the easternmost column.
const ESM::Cell *searchExtByRegion(const std::string &id) const;
size_t getSize() const override;
size_t getExtSize() const;
size_t getIntSize() const;
void listIdentifier(std::vector<std::string> &list) const override;
ESM::Cell *insert(const ESM::Cell &cell);
bool erase(const ESM::Cell &cell);
bool erase(const std::string &id);
bool erase(int x, int y);
};
template <>
class Store<ESM::Pathgrid> : public StoreBase
{
private:
typedef std::unordered_map<std::string, ESM::Pathgrid, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Interior;
typedef std::map<std::pair<int, int>, ESM::Pathgrid> Exterior;
Interior mInt;
Exterior mExt;
Store<ESM::Cell>* mCells;
public:
Store();
void setCells(Store<ESM::Cell>& cells);
RecordId load(ESM::ESMReader &esm) override;
size_t getSize() const override;
void setUp() override;
const ESM::Pathgrid *search(int x, int y) const;
const ESM::Pathgrid *search(const std::string& name) const;
const ESM::Pathgrid *find(int x, int y) const;
const ESM::Pathgrid* find(const std::string& name) const;
const ESM::Pathgrid *search(const ESM::Cell &cell) const;
const ESM::Pathgrid *find(const ESM::Cell &cell) const;
};
template <>
class Store<ESM::Skill> : public IndexedStore<ESM::Skill>
{
public:
Store();
};
template <>
class Store<ESM::MagicEffect> : public IndexedStore<ESM::MagicEffect>
{
public:
Store();
};
template <>
class Store<ESM::Attribute> : public IndexedStore<ESM::Attribute>
{
std::vector<ESM::Attribute> mStatic;
public:
typedef std::vector<ESM::Attribute>::const_iterator iterator;
Store();
const ESM::Attribute *search(size_t index) const;
// calls `search` and throws an exception if not found
const ESM::Attribute *find(size_t index) const;
void setUp();
size_t getSize() const;
iterator begin() const;
iterator end() const;
};
template <>
class Store<ESM::WeaponType> : public StoreBase
{
std::map<int, ESM::WeaponType> mStatic;
public:
typedef std::map<int, ESM::WeaponType>::const_iterator iterator;
Store();
const ESM::WeaponType *search(const int id) const;
// calls `search` and throws an exception if not found
const ESM::WeaponType *find(const int id) const;
RecordId load(ESM::ESMReader &esm) override { return RecordId({}, false); }
ESM::WeaponType* insert(const ESM::WeaponType &weaponType);
void setUp() override;
size_t getSize() const override;
iterator begin() const;
iterator end() const;
};
template <>
class Store<ESM::Dialogue> : public StoreBase
{
typedef std::unordered_map<std::string, ESM::Dialogue, Misc::StringUtils::CiHash, Misc::StringUtils::CiEqual> Static;
Static mStatic;
/// @par mShared usually preserves the record order as it came from the content files (this
/// is relevant for the spell autocalc code and selection order
/// for heads/hairs in the character creation)
/// @warning ESM::Dialogue Store currently implements a sorted order for unknown reasons.
std::vector<ESM::Dialogue*> mShared;
mutable bool mKeywordSearchModFlag;
mutable MWDialogue::KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
public:
Store();
typedef SharedIterator<ESM::Dialogue> iterator;
void setUp() override;
const ESM::Dialogue *search(const std::string &id) const;
const ESM::Dialogue *find(const std::string &id) const;
iterator begin() const;
iterator end() const;
size_t getSize() const override;
bool eraseStatic(const std::string &id) override;
RecordId load(ESM::ESMReader &esm) override;
void listIdentifier(std::vector<std::string> &list) const override;
const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() const;
};
}

1
apps/openmw/mwworld/cells.cpp
View file

@ -15,7 +15,6 @@
#include "esmstore.hpp"
#include "containerstore.hpp"
#include "cellstore.hpp"
#include "storeSpecialization.hpp"
namespace
{

1
apps/openmw/mwworld/class.cpp
View file

@ -8,7 +8,6 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "ptr.hpp"
#include "nullaction.hpp"

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

@ -13,7 +13,6 @@
#include <components/esmloader/load.hpp>
#include "../mwmechanics/spelllist.hpp"
#include "storeSpecialization.hpp"
namespace
{

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

@ -4,9 +4,7 @@
#include <memory>
#include <stdexcept>
#include <unordered_map>
#include <map>
#include <components/misc/stringops.hpp>
#include <components/esm/luascripts.hpp>
#include "store.hpp"
@ -23,7 +21,6 @@ namespace MWMechanics
namespace ESM
{
class ReadersCache;
struct Dialogue;
}
namespace MWWorld

1
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -30,7 +30,6 @@
#include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/storeSpecialization.hpp"
#include "../mwbase/soundmanager.hpp"
#include "../mwbase/world.hpp"

1
apps/openmw/mwworld/scene.cpp
View file

@ -43,7 +43,6 @@
#include "cellpreloader.hpp"
#include "worldimp.hpp"
#include "cellutils.hpp"
#include "storeSpecialization.hpp"
namespace
{

1
apps/openmw/mwworld/store.cpp
View file

@ -8,7 +8,6 @@
#include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/rng.hpp>
#include "storeSpecialization.hpp"
#include <iterator>
#include <stdexcept>

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

@ -86,7 +86,6 @@
#include "contentloader.hpp"
#include "esmloader.hpp"
#include "cellutils.hpp"
#include "storeSpecialization.hpp"
namespace MWWorld
{