teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

sorting out some Display enum mixup

Browse source
This commit is contained in:
Marc Zinnschlag 2015-04-04 19:55:53 +02:00
parent 66c866aec9
commit 3b408b6427
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,7 @@ bool CSMWorld::ColumnBase::isId (Display display)
Display_JournalInfo, Display_JournalInfo,
Display_Scene, Display_Scene,
Display_GlobalVariable, Display_GlobalVariable,
Display_Script,
Display_Mesh, Display_Mesh,
Display_Icon, Display_Icon,
@ -74,8 +75,6 @@ bool CSMWorld::ColumnBase::isId (Display display)
Display_Texture, Display_Texture,
Display_Video, Display_Video,
Display_Id,
Display_None Display_None
}; };
@ -93,5 +92,5 @@ bool CSMWorld::ColumnBase::isText (Display display)
bool CSMWorld::ColumnBase::isScript (Display display) bool CSMWorld::ColumnBase::isScript (Display display)
{ {
return display==Display_Script || display==Display_ScriptLines; return display==Display_ScriptFile || display==Display_ScriptLines;
} }

1
apps/opencs/model/world/columnbase.hpp
View file

@ -101,6 +101,7 @@ namespace CSMWorld
Display_Texture, Display_Texture,
Display_Video, Display_Video,
Display_Colour, Display_Colour,
Display_ScriptFile,
Display_ScriptLines, // console context Display_ScriptLines, // console context
Display_SoundGeneratorType, Display_SoundGeneratorType,
Display_School, Display_School,

2
apps/opencs/model/world/columnimp.hpp
View file

@ -818,7 +818,7 @@ namespace CSMWorld
ScriptColumn (Type type) ScriptColumn (Type type)
: Column<ESXRecordT> (Columns::ColumnId_ScriptText, : Column<ESXRecordT> (Columns::ColumnId_ScriptText,
type==Type_File ? ColumnBase::Display_Script : ColumnBase::Display_ScriptLines, type==Type_File ? ColumnBase::Display_ScriptFile : ColumnBase::Display_ScriptLines,
type==Type_File ? 0 : ColumnBase::Flag_Dialogue) type==Type_File ? 0 : ColumnBase::Flag_Dialogue)
{} {}

2
apps/opencs/model/world/refidcollection.cpp
View file

@ -40,7 +40,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
{ {
BaseColumns baseColumns; BaseColumns baseColumns;
mColumns.push_back (RefIdColumn (Columns::ColumnId_Id, ColumnBase::Display_String, mColumns.push_back (RefIdColumn (Columns::ColumnId_Id, ColumnBase::Display_Id,
ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false)); ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false));
baseColumns.mId = &mColumns.back(); baseColumns.mId = &mColumns.back();
mColumns.push_back (RefIdColumn (Columns::ColumnId_Modification, ColumnBase::Display_RecordState, mColumns.push_back (RefIdColumn (Columns::ColumnId_Modification, ColumnBase::Display_RecordState,

2
apps/opencs/model/world/resourcetable.cpp
View file

@ -60,7 +60,7 @@ QVariant CSMWorld::ResourceTable::headerData (int section, Qt::Orientation orien
return Columns::getName (Columns::ColumnId_Id).c_str(); return Columns::getName (Columns::ColumnId_Id).c_str();
if (role==ColumnBase::Role_Display) if (role==ColumnBase::Role_Display)
return ColumnBase::Display_String; return ColumnBase::Display_Id;
break; break;

2
apps/opencs/view/world/scriptsubview.cpp
View file

@ -22,7 +22,7 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
for (int i=0; i<mModel->columnCount(); ++i) for (int i=0; i<mModel->columnCount(); ++i)
if (mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display)== if (mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display)==
CSMWorld::ColumnBase::Display_Script) CSMWorld::ColumnBase::Display_ScriptFile)
{ {
mColumn = i; mColumn = i;
break; break;