more cleanup

apps/openmw/CMakeLists.txt

@@ -45,7 +45,7 @@ add_openmw_dir (mwsound
 
 add_openmw_dir (mwworld
     refdata world physicssystem scene environment globals class action nullaction actionteleport
-    containerstore actiontalk actiontake containerstore manualref containerutil player cellfunctors
+    containerstore actiontalk actiontake manualref player cellfunctors
     cells localscripts customdata
     )
 

apps/openmw/mwclass/containerutil.hpp

@@ -1,28 +0,0 @@
-#ifndef GAME_MWCLASS_CONTAINERUTIL_H
-#define GAME_MWCLASS_CONTAINERUTIL_H
-
-#include <components/esm_store/cell_store.hpp>
-
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/containerstore.hpp"
-
-namespace MWClass
-{
-    template<typename T>
-    void insertIntoContainerStore (const MWWorld::Ptr& ptr,
-        ESMS::CellRefList<T, MWWorld::RefData>& containerStore)
-    {
-        if (!ptr.isEmpty())
-        {
-            // TODO check stacking
-
-            ESMS::LiveCellRef<T, MWWorld::RefData> cellRef(ptr.getCellRef(), ptr.get<T>()->base);
-            cellRef.mData = ptr.getRefData();
-
-            containerStore.list.push_back (cellRef);
-
-        }
-    }
-}
-
-#endif

apps/openmw/mwworld/containerutil.cpp

@@ -1,43 +0,0 @@
-
-#include "containerutil.hpp"
-
-namespace
-{
-    template<typename T>
-    void listItemsInContainerImp (const std::string& id,
-        ESMS::CellRefList<T, MWWorld::RefData>& containerStore,
-        const ESMS::RecListT<T>& store, std::vector<MWWorld::Ptr>& list)
-    {
-        if (const T *record = store.search (id))
-        {
-            for (typename ESMS::CellRefList<T, MWWorld::RefData>::List::iterator iter
-                (containerStore.list.begin());
-                iter!=containerStore.list.end(); ++iter)
-            {
-                if (iter->base==record)
-                    list.push_back (MWWorld::Ptr (&*iter, 0));
-            }
-        }
-    }
-}
-
-namespace MWWorld
-{
-    void listItemsInContainer (const std::string& id,
-        ContainerStore& containerStore,
-        const ESMS::ESMStore& store, std::vector<Ptr>& list)
-    {
-        listItemsInContainerImp (id, containerStore.potions, store.potions, list);
-        listItemsInContainerImp (id, containerStore.appas, store.appas, list);
-        listItemsInContainerImp (id, containerStore.armors, store.armors, list);
-        listItemsInContainerImp (id, containerStore.books, store.books, list);
-        listItemsInContainerImp (id, containerStore.clothes, store.clothes, list);
-        listItemsInContainerImp (id, containerStore.ingreds, store.ingreds, list);
-        listItemsInContainerImp (id, containerStore.lights, store.lights, list);
-        listItemsInContainerImp (id, containerStore.lockpicks, store.lockpicks, list);
-        listItemsInContainerImp (id, containerStore.miscItems, store.miscItems, list);
-        listItemsInContainerImp (id, containerStore.probes, store.probes, list);
-        listItemsInContainerImp (id, containerStore.repairs, store.repairs, list);
-        listItemsInContainerImp (id, containerStore.weapons, store.weapons, list);
-    }
-}

apps/openmw/mwworld/containerutil.hpp

@@ -1,19 +0,0 @@
-#ifndef GAME_MWWORLD_CONTAINERUTIL_H
-#define GAME_MWWORLD_CONTAINERUTIL_H
-
-#include <string>
-#include <vector>
-
-#include <components/esm_store/store.hpp>
-
-#include "containerstore.hpp"
-#include "ptr.hpp"
-
-namespace MWWorld
-{
-    void listItemsInContainer (const std::string& id, ContainerStore& containerStore,
-        const ESMS::ESMStore& store, std::vector<Ptr>& list);
-    ///< append all references with the given id to list.
-}
-
-#endif