mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-11 19:13:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'

Browse Source
This commit is contained in:
Marc Zinnschlag 2017-02-13 10:06:08 +01:00
commit 93c5630e02
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/esmtool/record.cpp
View File

@ -494,7 +494,7 @@ void Record<ESM::Book>::print()
std::cout << " Weight: " << mData.mData.mWeight << std::endl; std::cout << " Weight: " << mData.mData.mWeight << std::endl;
std::cout << " Value: " << mData.mData.mValue << std::endl; std::cout << " Value: " << mData.mData.mValue << std::endl;
std::cout << " IsScroll: " << mData.mData.mIsScroll << std::endl; std::cout << " IsScroll: " << mData.mData.mIsScroll << std::endl;
std::cout << " SkillID: " << mData.mData.mSkillID << std::endl; std::cout << " SkillId: " << mData.mData.mSkillId << std::endl;
std::cout << " Enchantment Points: " << mData.mData.mEnchant << std::endl; std::cout << " Enchantment Points: " << mData.mData.mEnchant << std::endl;
if (mPrintPlain) if (mPrintPlain)
{ {

2
apps/essimporter/converter.hpp
View File

@ -202,7 +202,7 @@ public:
bool isDeleted = false; bool isDeleted = false;
book.load(esm, isDeleted); book.load(esm, isDeleted);
if (book.mData.mSkillID == -1) if (book.mData.mSkillId == -1)
mContext->mPlayer.mObject.mNpcStats.mUsedIds.push_back(Misc::StringUtils::lowerCase(book.mId)); mContext->mPlayer.mObject.mNpcStats.mUsedIds.push_back(Misc::StringUtils::lowerCase(book.mId));
mRecords[book.mId] = book; mRecords[book.mId] = book;

4
apps/opencs/model/world/refidadapterimp.cpp
View File

@ -316,7 +316,7 @@ QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column,
return record.get().mData.mIsScroll!=0; return record.get().mData.mIsScroll!=0;
if (column==mSkill) if (column==mSkill)
return record.get().mData.mSkillID; return record.get().mData.mSkillId;
if (column==mText) if (column==mText)
return QString::fromUtf8 (record.get().mText.c_str()); return QString::fromUtf8 (record.get().mText.c_str());
@ -335,7 +335,7 @@ void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
if (column==mScroll) if (column==mScroll)
book.mData.mIsScroll = value.toInt(); book.mData.mIsScroll = value.toInt();
else if (column==mSkill) else if (column==mSkill)
book.mData.mSkillID = value.toInt(); book.mData.mSkillId = value.toInt();
else if (column==mText) else if (column==mText)
book.mText = value.toString().toUtf8().data(); book.mText = value.toString().toUtf8().data();
else else

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

@ -294,8 +294,8 @@ CSMWorld::RefIdCollection::RefIdCollection()
mColumns.push_back (RefIdColumn (Columns::ColumnId_Scroll, ColumnBase::Display_Boolean)); mColumns.push_back (RefIdColumn (Columns::ColumnId_Scroll, ColumnBase::Display_Boolean));
const RefIdColumn *scroll = &mColumns.back(); const RefIdColumn *scroll = &mColumns.back();
mColumns.push_back (RefIdColumn (Columns::ColumnId_Attribute, ColumnBase::Display_Attribute)); mColumns.push_back (RefIdColumn (Columns::ColumnId_Skill, ColumnBase::Display_SkillId));
const RefIdColumn *attribute = &mColumns.back(); const RefIdColumn *skill = &mColumns.back();
mColumns.push_back (RefIdColumn (Columns::ColumnId_Text, ColumnBase::Display_LongString)); mColumns.push_back (RefIdColumn (Columns::ColumnId_Text, ColumnBase::Display_LongString));
const RefIdColumn *text = &mColumns.back(); const RefIdColumn *text = &mColumns.back();
@ -659,7 +659,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
mAdapters.insert (std::make_pair (UniversalId::Type_Armor, mAdapters.insert (std::make_pair (UniversalId::Type_Armor,
new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor, partRef))); new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor, partRef)));
mAdapters.insert (std::make_pair (UniversalId::Type_Book, mAdapters.insert (std::make_pair (UniversalId::Type_Book,
new BookRefIdAdapter (enchantableColumns, scroll, attribute, text))); new BookRefIdAdapter (enchantableColumns, scroll, skill, text)));
mAdapters.insert (std::make_pair (UniversalId::Type_Clothing, mAdapters.insert (std::make_pair (UniversalId::Type_Clothing,
new ClothingRefIdAdapter (enchantableColumns, clothingType, partRef))); new ClothingRefIdAdapter (enchantableColumns, clothingType, partRef)));
mAdapters.insert (std::make_pair (UniversalId::Type_Container, mAdapters.insert (std::make_pair (UniversalId::Type_Container,

4
apps/openmw/mwworld/actionread.cpp
View File

@ -44,7 +44,7 @@ namespace MWWorld
MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor); MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor);
// Skill gain from books // Skill gain from books
if (ref->mBase->mData.mSkillID >= 0 && ref->mBase->mData.mSkillID < ESM::Skill::Length if (ref->mBase->mData.mSkillId >= 0 && ref->mBase->mData.mSkillId < ESM::Skill::Length
&& !npcStats.hasBeenUsed (ref->mBase->mId)) && !npcStats.hasBeenUsed (ref->mBase->mId))
{ {
MWWorld::LiveCellRef<ESM::NPC> *playerRef = actor.get<ESM::NPC>(); MWWorld::LiveCellRef<ESM::NPC> *playerRef = actor.get<ESM::NPC>();
@ -54,7 +54,7 @@ namespace MWWorld
playerRef->mBase->mClass playerRef->mBase->mClass
); );
npcStats.increaseSkill (ref->mBase->mData.mSkillID, *class_, true); npcStats.increaseSkill (ref->mBase->mData.mSkillId, *class_, true);
npcStats.flagAsUsed (ref->mBase->mId); npcStats.flagAsUsed (ref->mBase->mId);
} }

2
components/esm/loadbook.cpp
View File

@ -84,7 +84,7 @@ namespace ESM
mData.mWeight = 0; mData.mWeight = 0;
mData.mValue = 0; mData.mValue = 0;
mData.mIsScroll = 0; mData.mIsScroll = 0;
mData.mSkillID = 0; mData.mSkillId = 0;
mData.mEnchant = 0; mData.mEnchant = 0;
mName.clear(); mName.clear();
mModel.clear(); mModel.clear();

2
components/esm/loadbook.hpp
View File

@ -21,7 +21,7 @@ struct Book
struct BKDTstruct struct BKDTstruct
{ {
float mWeight; float mWeight;
int mValue, mIsScroll, mSkillID, mEnchant; int mValue, mIsScroll, mSkillId, mEnchant;
}; };
BKDTstruct mData; BKDTstruct mData;