mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 22:36:39 +00:00
Code Issues Releases Wiki Activity

Remove redundant components/esm/records.hpp include

Browse source
This commit is contained in:
elsid 2022-08-16 22:44:13 +02:00
parent 226f12528b
commit 3057fa6bee
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/esmtool/esmtool.cpp
View file

@ -14,7 +14,6 @@
#include <components/esm3/esmreader.hpp> #include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp> #include <components/esm3/esmwriter.hpp>
#include <components/esm/records.hpp>
#include <components/esm/format.hpp> #include <components/esm/format.hpp>
#include <components/files/openfile.hpp> #include <components/files/openfile.hpp>
#include <components/misc/strings/algorithm.hpp> #include <components/misc/strings/algorithm.hpp>

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

@ -19,7 +19,6 @@
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include <MyGUI_Macros.h> #include <MyGUI_Macros.h>
#include <components/esm/records.hpp>
#include "inventoryitemmodel.hpp" #include "inventoryitemmodel.hpp"
#include "sortfilteritemmodel.hpp" #include "sortfilteritemmodel.hpp"

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

@ -5,7 +5,6 @@
#include <MyGUI_Gui.h> #include <MyGUI_Gui.h>
#include <MyGUI_ScrollBar.h> #include <MyGUI_ScrollBar.h>
#include <components/esm/records.hpp>
#include <components/widgets/list.hpp> #include <components/widgets/list.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>

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

@ -6,6 +6,8 @@
#include <components/esm3/readerscache.hpp> #include <components/esm3/readerscache.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include <components/esm3/loadstat.hpp>
#include <components/esm3/loadcell.hpp>
#include <apps/openmw/mwbase/environment.hpp> #include <apps/openmw/mwbase/environment.hpp>

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

@ -4,6 +4,7 @@
#include <components/esm3/esmreader.hpp> #include <components/esm3/esmreader.hpp>
#include <components/esm3/esmwriter.hpp> #include <components/esm3/esmwriter.hpp>
#include <components/esm/records.hpp>
#include <components/loadinglistener/loadinglistener.hpp> #include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
@ -330,6 +331,9 @@ namespace MWWorld
} }
return ptr; return ptr;
} }
void Store<ESM::LandTexture>::resize(std::size_t num) { mStatic.resize(num); }
size_t Store<ESM::LandTexture>::getSize() const size_t Store<ESM::LandTexture>::getSize() const
{ {
return mStatic.size(); return mStatic.size();

15
apps/openmw/mwworld/store.hpp
View file

@ -8,7 +8,10 @@
#include <unordered_map> #include <unordered_map>
#include <set> #include <set>
#include <components/esm/records.hpp> #include <components/esm3/loadland.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadpgrd.hpp>
#include <components/esm3/loadcell.hpp>
#include <components/misc/strings/algorithm.hpp> #include <components/misc/strings/algorithm.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
@ -16,7 +19,13 @@
namespace ESM namespace ESM
{ {
struct Land; struct Attribute;
struct LandTexture;
struct MagicEffect;
struct Skill;
struct WeaponType;
class ESMReader;
class ESMWriter;
} }
namespace Loading namespace Loading
@ -227,7 +236,7 @@ namespace MWWorld
const ESM::LandTexture *search(size_t index, size_t plugin) const; const ESM::LandTexture *search(size_t index, size_t plugin) const;
const ESM::LandTexture *find(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); } void resize(std::size_t num);
size_t getSize() const override; size_t getSize() const override;
size_t getSize(size_t plugin) const; size_t getSize(size_t plugin) const;