From 65878801715efd86faf1673f4ca68cbe512f7517 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:03:37 +0100 Subject: [PATCH 1/8] Update refidcollection.cpp Makes Book records display skill IDs instead of attribute IDs for teached skills. Related issue: - Bug #3746: OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry. --- apps/opencs/model/world/refidcollection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp index 74867d6265..5674ba3270 100644 --- a/apps/opencs/model/world/refidcollection.cpp +++ b/apps/opencs/model/world/refidcollection.cpp @@ -294,8 +294,8 @@ CSMWorld::RefIdCollection::RefIdCollection() mColumns.push_back (RefIdColumn (Columns::ColumnId_Scroll, ColumnBase::Display_Boolean)); const RefIdColumn *scroll = &mColumns.back(); - mColumns.push_back (RefIdColumn (Columns::ColumnId_Attribute, ColumnBase::Display_Attribute)); - const RefIdColumn *attribute = &mColumns.back(); + mColumns.push_back (RefIdColumn (Columns::ColumnId_Skill, ColumnBase::Display_SkillId)); + const RefIdColumn *skill = &mColumns.back(); mColumns.push_back (RefIdColumn (Columns::ColumnId_Text, ColumnBase::Display_LongString)); const RefIdColumn *text = &mColumns.back(); @@ -659,7 +659,7 @@ CSMWorld::RefIdCollection::RefIdCollection() mAdapters.insert (std::make_pair (UniversalId::Type_Armor, new ArmorRefIdAdapter (enchantableColumns, armorType, health, armor, partRef))); 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, new ClothingRefIdAdapter (enchantableColumns, clothingType, partRef))); mAdapters.insert (std::make_pair (UniversalId::Type_Container, From c5dcfe0794daeed3ee39b0887cac7d7a265a203c Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:50:58 +0100 Subject: [PATCH 2/8] Update refidadapterimp.cpp Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records. --- apps/opencs/model/world/refidadapterimp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp index 086e95c340..0da4769a88 100644 --- a/apps/opencs/model/world/refidadapterimp.cpp +++ b/apps/opencs/model/world/refidadapterimp.cpp @@ -316,7 +316,7 @@ QVariant CSMWorld::BookRefIdAdapter::getData (const RefIdColumn *column, return record.get().mData.mIsScroll!=0; if (column==mSkill) - return record.get().mData.mSkillID; + return record.get().mData.mSkillId; if (column==mText) return QString::fromUtf8 (record.get().mText.c_str()); @@ -335,7 +335,7 @@ void CSMWorld::BookRefIdAdapter::setData (const RefIdColumn *column, RefIdData& if (column==mScroll) book.mData.mIsScroll = value.toInt(); else if (column==mSkill) - book.mData.mSkillID = value.toInt(); + book.mData.mSkillId = value.toInt(); else if (column==mText) book.mText = value.toString().toUtf8().data(); else From 347fb1ff4b57aa69bced6094bee6bc0b365ab717 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:51:36 +0100 Subject: [PATCH 3/8] Update converter.hpp Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records. --- apps/essimporter/converter.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp index b05337aeac..e4985f9930 100644 --- a/apps/essimporter/converter.hpp +++ b/apps/essimporter/converter.hpp @@ -202,7 +202,7 @@ public: bool isDeleted = false; 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)); mRecords[book.mId] = book; From 7bc65ce05b5b5417da6fc11fbe6d8187c3b2eda7 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:52:11 +0100 Subject: [PATCH 4/8] Update actionread.cpp Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records. --- apps/openmw/mwworld/actionread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp index 90e9a375b3..ffab2959c7 100644 --- a/apps/openmw/mwworld/actionread.cpp +++ b/apps/openmw/mwworld/actionread.cpp @@ -44,7 +44,7 @@ namespace MWWorld MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor); // 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)) { MWWorld::LiveCellRef *playerRef = actor.get(); @@ -54,7 +54,7 @@ namespace MWWorld playerRef->mBase->mClass ); - npcStats.increaseSkill (ref->mBase->mData.mSkillID, *class_, true); + npcStats.increaseSkill (ref->mBase->mData.mSkillId, *class_, true); npcStats.flagAsUsed (ref->mBase->mId); } From 5a58ab1837bdfd5280582e02d8681cc5fad12459 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:52:36 +0100 Subject: [PATCH 5/8] Update loadbook.hpp --- components/esm/loadbook.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esm/loadbook.hpp b/components/esm/loadbook.hpp index 3d50356aea..bb2d7912f7 100644 --- a/components/esm/loadbook.hpp +++ b/components/esm/loadbook.hpp @@ -21,7 +21,7 @@ struct Book struct BKDTstruct { float mWeight; - int mValue, mIsScroll, mSkillID, mEnchant; + int mValue, mIsScroll, mSkillId, mEnchant; }; BKDTstruct mData; From b4ef9e23144431a0a7e33675b7d2d8e7084626cf Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 13:53:10 +0100 Subject: [PATCH 6/8] Update loadbook.cpp --- components/esm/loadbook.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp index d5283b8eb0..ee3c0c4af5 100644 --- a/components/esm/loadbook.cpp +++ b/components/esm/loadbook.cpp @@ -84,7 +84,7 @@ namespace ESM mData.mWeight = 0; mData.mValue = 0; mData.mIsScroll = 0; - mData.mSkillID = 0; + mData.mSkillId = 0; mData.mEnchant = 0; mName.clear(); mModel.clear(); From c46eadae901df729ba81b17dc132a5ea4313630b Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 17:17:33 +0100 Subject: [PATCH 7/8] Update actionread.cpp *grrr* Forgot to change the latter "mSkillID" in line 47... --- apps/openmw/mwworld/actionread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp index ffab2959c7..b3ac772aeb 100644 --- a/apps/openmw/mwworld/actionread.cpp +++ b/apps/openmw/mwworld/actionread.cpp @@ -44,7 +44,7 @@ namespace MWWorld MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor); // 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)) { MWWorld::LiveCellRef *playerRef = actor.get(); From 2d1af3ee4a1bbd45a0e38cee1641f9e37bdc0f09 Mon Sep 17 00:00:00 2001 From: MAtahualpa Date: Sun, 12 Feb 2017 20:55:50 +0100 Subject: [PATCH 8/8] Update record.cpp This should be the last instance of "mSkillID". Let's see what Travis says about it... --- apps/esmtool/record.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp index 2382612a4d..3123308efe 100644 --- a/apps/esmtool/record.cpp +++ b/apps/esmtool/record.cpp @@ -494,7 +494,7 @@ void Record::print() std::cout << " Weight: " << mData.mData.mWeight << std::endl; std::cout << " Value: " << mData.mData.mValue << 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; if (mPrintPlain) {