mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 21:35:24 +00:00
Code Issues Projects Releases Wiki Activity

Compilation fix after merging commt e30f24

Browse Source
This commit is contained in:
cc9cii 2015-03-16 13:21:02 +11:00
parent 5eefcd862f
commit 76adb64e20
1 changed files with 66 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/opencs/model/world/nestedadaptors.hpp
View File

@ -264,7 +264,7 @@ namespace CSMWorld
virtual void addNestedRow (RefIdData& data, int index, int position) const virtual void addNestedRow (RefIdData& data, int index, int position) const
{ {
std::vector<ESM::NPC::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport; std::vector<ESM::Transport::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList;
ESM::Position newPos; ESM::Position newPos;
for (unsigned i = 0; i < 3; ++i) for (unsigned i = 0; i < 3; ++i)
@ -273,7 +273,7 @@ namespace CSMWorld
newPos.rot[i] = 0; newPos.rot[i] = 0;
} }
ESM::NPC::Dest newRow; ESM::Transport::Dest newRow;
newRow.mPos = newPos; newRow.mPos = newPos;
newRow.mCellName = ""; newRow.mCellName = "";
@ -295,7 +295,7 @@ namespace CSMWorld
virtual int getNestedRowsCount(const RefIdData& data, virtual int getNestedRowsCount(const RefIdData& data,
int index) const int index) const
{ {
return CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.size(); return CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.size();
} }
}; };
@ -312,14 +312,14 @@ namespace CSMWorld
int index, int index,
const NestedTableWrapperBase& nestedTable) const NestedTableWrapperBase& nestedTable)
{ {
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList =
(static_cast<const NestedTableWrapper<std::vector<ESM::NPC::Dest> >&>(nestedTable)).mNestedTable; (static_cast<const NestedTableWrapper<std::vector<ESM::Transport::Dest> >&>(nestedTable)).mNestedTable;
} }
virtual NestedTableWrapperBase* nestedTable(const RefIdData& data, virtual NestedTableWrapperBase* nestedTable(const RefIdData& data,
int index) const int index) const
{ {
return new NestedTableWrapper<std::vector<ESM::NPC::Dest> >(CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport); return new NestedTableWrapper<std::vector<ESM::Transport::Dest> >(CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList);
} }
virtual QVariant getNestedData(const CSMWorld::RefIdData& data, virtual QVariant getNestedData(const CSMWorld::RefIdData& data,
@ -327,7 +327,7 @@ namespace CSMWorld
int subRowIndex, int subRowIndex,
int subColIndex) const int subColIndex) const
{ {
const ESM::NPC::Dest& content = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex); const ESM::Transport::Dest& content = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex);
switch (subColIndex) switch (subColIndex)
{ {
@ -359,7 +359,7 @@ namespace CSMWorld
virtual void removeNestedRow (RefIdData& data, int index, int rowToRemove) const virtual void removeNestedRow (RefIdData& data, int index, int rowToRemove) const
{ {
std::vector<ESM::NPC::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport; std::vector<ESM::Transport::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList;
list.erase (list.begin () + rowToRemove); list.erase (list.begin () + rowToRemove);
} }
@ -373,31 +373,31 @@ namespace CSMWorld
switch(subColIndex) switch(subColIndex)
{ {
case 0: case 0:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mCellName = std::string(value.toString().toUtf8().constData()); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mCellName = std::string(value.toString().toUtf8().constData());
break; break;
case 1: case 1:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.pos[0] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.pos[0] = value.toFloat();
break; break;
case 2: case 2:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.pos[1] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.pos[1] = value.toFloat();
break; break;
case 3: case 3:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.pos[2] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.pos[2] = value.toFloat();
break; break;
case 4: case 4:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.rot[0] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.rot[0] = value.toFloat();
break; break;
case 5: case 5:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.rot[1] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.rot[1] = value.toFloat();
break; break;
case 6: case 6:
CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.at(subRowIndex).mPos.rot[2] = value.toFloat(); CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.at(subRowIndex).mPos.rot[2] = value.toFloat();
break; break;
default: default:
@ -407,7 +407,7 @@ namespace CSMWorld
virtual void addNestedRow (RefIdData& data, int index, int position) const virtual void addNestedRow (RefIdData& data, int index, int position) const
{ {
std::vector<ESM::NPC::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport; std::vector<ESM::Transport::Dest>& list = CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList;
ESM::Position newPos; ESM::Position newPos;
for (unsigned i = 0; i < 3; ++i) for (unsigned i = 0; i < 3; ++i)
@ -416,7 +416,7 @@ namespace CSMWorld
newPos.rot[i] = 0; newPos.rot[i] = 0;
} }
ESM::NPC::Dest newRow; ESM::Transport::Dest newRow;
newRow.mPos = newPos; newRow.mPos = newPos;
newRow.mCellName = ""; newRow.mCellName = "";
@ -434,11 +434,10 @@ namespace CSMWorld
return 7; return 7;
} }
virtual int getNestedRowsCount(const RefIdData& data, virtual int getNestedRowsCount(const RefIdData& data,
int index) const int index) const
{ {
return CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.size(); return CastableHelper<ESXRecordT>::getRecord(data, index).get().mTransport.mList.size();
} }
}; };
@ -532,7 +531,6 @@ namespace CSMWorld
return 2; return 2;
} }
virtual int getNestedRowsCount(const RefIdData& data, virtual int getNestedRowsCount(const RefIdData& data,
int index) const int index) const
{ {