mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

fixed RefID search

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-05-11 16:55:10 +02:00
parent 0f29ab8cf9
commit 02ace69511
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/opencs/model/world/refidcollection.cpp
View File

@ -4,6 +4,7 @@
#include <stdexcept> #include <stdexcept>
#include "refidadapter.hpp" #include "refidadapter.hpp"
#include "refidadapterimp.hpp"
CSMWorld::RefIdColumn::RefIdColumn (const std::string& title, Display displayType, int flag, CSMWorld::RefIdColumn::RefIdColumn (const std::string& title, Display displayType, int flag,
bool editable, bool userEditable) bool editable, bool userEditable)
@ -37,7 +38,11 @@ CSMWorld::RefIdCollection::RefIdCollection()
ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false)); ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false));
mColumns.push_back (RefIdColumn ("*", ColumnBase::Display_Integer, mColumns.push_back (RefIdColumn ("*", ColumnBase::Display_Integer,
ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false)); ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false));
mColumns.push_back (RefIdColumn ("Name", ColumnBase::Display_String)); // mColumns.push_back (RefIdColumn ("Name", ColumnBase::Display_String));
mAdapters.insert (std::make_pair (UniversalId::Type_Static, new StaticRefIdAdapter (&mColumns[0],
&mColumns[1])));
} }
CSMWorld::RefIdCollection::~RefIdCollection() CSMWorld::RefIdCollection::~RefIdCollection()
@ -107,7 +112,12 @@ void CSMWorld::RefIdCollection::appendBlankRecord (const std::string& id, Univer
int CSMWorld::RefIdCollection::searchId (const std::string& id) const int CSMWorld::RefIdCollection::searchId (const std::string& id) const
{ {
return mData.localToGlobalIndex (mData.searchId (id)); RefIdData::LocalIndex localIndex = mData.searchId (id);
if (localIndex.first==-1)
return -1;
return mData.localToGlobalIndex (localIndex);
} }
void CSMWorld::RefIdCollection::replace (int index, const RecordBase& record) void CSMWorld::RefIdCollection::replace (int index, const RecordBase& record)

2
apps/opencs/model/world/refiddata.cpp
View File

@ -71,7 +71,7 @@ CSMWorld::RefIdData::LocalIndex CSMWorld::RefIdData::searchId (
std::map<std::string, std::pair<int, UniversalId::Type> >::const_iterator iter = mIndex.find (id2); std::map<std::string, std::pair<int, UniversalId::Type> >::const_iterator iter = mIndex.find (id2);
if (iter!=mIndex.end()) if (iter==mIndex.end())
return std::make_pair (-1, CSMWorld::UniversalId::Type_None); return std::make_pair (-1, CSMWorld::UniversalId::Type_None);
return iter->second; return iter->second;