mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-05 17:45:32 +00:00
Code Issues Releases Wiki Activity

fixed ctor of nestedwrapper (missing initialization of member data field)

Browse source
This commit is contained in:
Marek Kochanowicz 2014-07-19 13:08:28 +02:00
parent 1ff8abb240
commit 0017fc68ef
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/model/world/nestedtablewrapper.hpp
View file

@ -20,7 +20,8 @@ namespace CSMWorld
public: public:
NestedTableWrapper(const NestedTable& nestedTable) {} NestedTableWrapper(const NestedTable& nestedTable)
: mNestedTable(nestedTable) {}
NestedTable getNestedTable() const NestedTable getNestedTable() const
{ {

5
apps/opencs/model/world/refidadapterimp.cpp
View file

@ -1,9 +1,10 @@
#include "refidadapterimp.hpp" #include "refidadapterimp.hpp"
#include "nestedtablewrapper.hpp"
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <components/esm/loadcont.hpp> #include <components/esm/loadcont.hpp>
#include "nestedtablewrapper.hpp"
CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const InventoryColumns& columns, CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const InventoryColumns& columns,
const RefIdColumn *autoCalc) const RefIdColumn *autoCalc)
@ -315,7 +316,7 @@ void CSMWorld::ContainerRefIdAdapter::setNestedTable(const RefIdColumn* column,
Record<ESM::Container>& record = dynamic_cast<Record<ESM::Container>&> ( Record<ESM::Container>& record = dynamic_cast<Record<ESM::Container>&> (
data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container))); data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
record.get().mInventory.mList = dynamic_cast<const NestedTableWrapper<std::vector<ESM::ContItem> >&>(nestedTable).getNestedTable(); record.get().mInventory.mList = (dynamic_cast<const NestedTableWrapper<std::vector<ESM::ContItem> >&>(nestedTable)).getNestedTable();
} }
CSMWorld::NestedTableWrapperBase CSMWorld::ContainerRefIdAdapter::nestedTable (const RefIdColumn* column, CSMWorld::NestedTableWrapperBase CSMWorld::ContainerRefIdAdapter::nestedTable (const RefIdColumn* column,