mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't use getExact to read structs

Browse Source
macos_ci_fix
Evil Eye 1 year ago
parent c10b9297f0
commit 37415b0382
9 changed files with 47 additions and 108 deletions
Show Stats Download Patch File Download Diff File

10
apps/esmtool/record.cpp
Unescape Escape View File

@ -1084,14 +1084,8 @@ namespace EsmTool
std::cout << " Rank: " << (int)mData.mNpdt.mRank << std::endl; std::cout << " Rank: " << (int)mData.mNpdt.mRank << std::endl;
std::cout << " Attributes:" << std::endl; std::cout << " Attributes:" << std::endl;
std::cout << " Strength: " << (int)mData.mNpdt.mStrength << std::endl; for (size_t i = 0; i != mData.mNpdt.mAttributes.size(); i++)
std::cout << " Intelligence: " << (int)mData.mNpdt.mIntelligence << std::endl; std::cout << " " << attributeLabel(i) << ": " << int(mData.mNpdt.mAttributes[i]) << std::endl;
std::cout << " Willpower: " << (int)mData.mNpdt.mWillpower << std::endl;
std::cout << " Agility: " << (int)mData.mNpdt.mAgility << std::endl;
std::cout << " Speed: " << (int)mData.mNpdt.mSpeed << std::endl;
std::cout << " Endurance: " << (int)mData.mNpdt.mEndurance << std::endl;
std::cout << " Personality: " << (int)mData.mNpdt.mPersonality << std::endl;
std::cout << " Luck: " << (int)mData.mNpdt.mLuck << std::endl;
std::cout << " Skills:" << std::endl; std::cout << " Skills:" << std::endl;
for (size_t i = 0; i != mData.mNpdt.mSkills.size(); i++) for (size_t i = 0; i != mData.mNpdt.mSkills.size(); i++)

22
apps/opencs/model/tools/referenceablecheck.cpp
Unescape Escape View File

@ -693,22 +693,12 @@ void CSMTools::ReferenceableCheckStage::npcCheck(
} }
else if (npc.mNpdt.mHealth != 0) else if (npc.mNpdt.mHealth != 0)
{ {
if (npc.mNpdt.mStrength == 0) for (size_t i = 0; i < npc.mNpdt.mAttributes.size(); ++i)
messages.add(id, "Strength is equal to zero", "", CSMDoc::Message::Severity_Warning); {
if (npc.mNpdt.mIntelligence == 0) if (npc.mNpdt.mAttributes[i] == 0)
messages.add(id, "Intelligence is equal to zero", "", CSMDoc::Message::Severity_Warning); messages.add(id, ESM::Attribute::indexToRefId(i).getRefIdString() + " is equal to zero", {},
if (npc.mNpdt.mWillpower == 0) CSMDoc::Message::Severity_Warning);
messages.add(id, "Willpower is equal to zero", "", CSMDoc::Message::Severity_Warning); }
if (npc.mNpdt.mAgility == 0)
messages.add(id, "Agility is equal to zero", "", CSMDoc::Message::Severity_Warning);
if (npc.mNpdt.mSpeed == 0)
messages.add(id, "Speed is equal to zero", "", CSMDoc::Message::Severity_Warning);
if (npc.mNpdt.mEndurance == 0)
messages.add(id, "Endurance is equal to zero", "", CSMDoc::Message::Severity_Warning);
if (npc.mNpdt.mPersonality == 0)
messages.add(id, "Personality is equal to zero", "", CSMDoc::Message::Severity_Warning);
if (npc.mNpdt.mLuck == 0)
messages.add(id, "Luck is equal to zero", "", CSMDoc::Message::Severity_Warning);
} }
if (level <= 0) if (level <= 0)

59
apps/opencs/model/world/refidadapterimp.cpp
Unescape Escape View File

@ -938,30 +938,9 @@ QVariant CSMWorld::NpcAttributesRefIdAdapter::getNestedData(
if (subColIndex == 0) if (subColIndex == 0)
return subRowIndex; return subRowIndex;
else if (subColIndex == 1) else if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
switch (subRowIndex) return static_cast<int>(npcStruct.mAttributes[subRowIndex]);
{ return QVariant(); // throw an exception here?
case 0:
return static_cast<int>(npcStruct.mStrength);
case 1:
return static_cast<int>(npcStruct.mIntelligence);
case 2:
return static_cast<int>(npcStruct.mWillpower);
case 3:
return static_cast<int>(npcStruct.mAgility);
case 4:
return static_cast<int>(npcStruct.mSpeed);
case 5:
return static_cast<int>(npcStruct.mEndurance);
case 6:
return static_cast<int>(npcStruct.mPersonality);
case 7:
return static_cast<int>(npcStruct.mLuck);
default:
return QVariant(); // throw an exception here?
}
else
return QVariant(); // throw an exception here?
} }
void CSMWorld::NpcAttributesRefIdAdapter::setNestedData( void CSMWorld::NpcAttributesRefIdAdapter::setNestedData(
@ -972,36 +951,8 @@ void CSMWorld::NpcAttributesRefIdAdapter::setNestedData(
ESM::NPC npc = record.get(); ESM::NPC npc = record.get();
ESM::NPC::NPDTstruct52& npcStruct = npc.mNpdt; ESM::NPC::NPDTstruct52& npcStruct = npc.mNpdt;
if (subColIndex == 1) if (subColIndex == 1 && subRowIndex >= 0 && subRowIndex < ESM::Attribute::Length)
switch (subRowIndex) npcStruct.mAttributes[subRowIndex] = static_cast<unsigned char>(value.toInt());
{
case 0:
npcStruct.mStrength = static_cast<unsigned char>(value.toInt());
break;
case 1:
npcStruct.mIntelligence = static_cast<unsigned char>(value.toInt());
break;
case 2:
npcStruct.mWillpower = static_cast<unsigned char>(value.toInt());
break;
case 3:
npcStruct.mAgility = static_cast<unsigned char>(value.toInt());
break;
case 4:
npcStruct.mSpeed = static_cast<unsigned char>(value.toInt());
break;
case 5:
npcStruct.mEndurance = static_cast<unsigned char>(value.toInt());
break;
case 6:
npcStruct.mPersonality = static_cast<unsigned char>(value.toInt());
break;
case 7:
npcStruct.mLuck = static_cast<unsigned char>(value.toInt());
break;
default:
return; // throw an exception here?
}
else else
return; // throw an exception here? return; // throw an exception here?

10
apps/openmw/mwclass/npc.cpp
Unescape Escape View File

@ -313,14 +313,8 @@ namespace MWClass
for (size_t i = 0; i < ref->mBase->mNpdt.mSkills.size(); ++i) for (size_t i = 0; i < ref->mBase->mNpdt.mSkills.size(); ++i)
data->mNpcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(ref->mBase->mNpdt.mSkills[i]); data->mNpcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(ref->mBase->mNpdt.mSkills[i]);
data->mNpcStats.setAttribute(ESM::Attribute::Strength, ref->mBase->mNpdt.mStrength); for (size_t i = 0; i < ref->mBase->mNpdt.mAttributes.size(); ++i)
data->mNpcStats.setAttribute(ESM::Attribute::Intelligence, ref->mBase->mNpdt.mIntelligence); data->mNpcStats.setAttribute(ESM::Attribute::indexToRefId(i), ref->mBase->mNpdt.mAttributes[i]);
data->mNpcStats.setAttribute(ESM::Attribute::Willpower, ref->mBase->mNpdt.mWillpower);
data->mNpcStats.setAttribute(ESM::Attribute::Agility, ref->mBase->mNpdt.mAgility);
data->mNpcStats.setAttribute(ESM::Attribute::Speed, ref->mBase->mNpdt.mSpeed);
data->mNpcStats.setAttribute(ESM::Attribute::Endurance, ref->mBase->mNpdt.mEndurance);
data->mNpcStats.setAttribute(ESM::Attribute::Personality, ref->mBase->mNpdt.mPersonality);
data->mNpcStats.setAttribute(ESM::Attribute::Luck, ref->mBase->mNpdt.mLuck);
data->mNpcStats.setHealth(ref->mBase->mNpdt.mHealth); data->mNpcStats.setHealth(ref->mBase->mNpdt.mHealth);
data->mNpcStats.setMagicka(ref->mBase->mNpdt.mMana); data->mNpcStats.setMagicka(ref->mBase->mNpdt.mMana);

11
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
Unescape Escape View File

@ -134,14 +134,9 @@ namespace MWMechanics
for (size_t i = 0; i < player->mNpdt.mSkills.size(); ++i) for (size_t i = 0; i < player->mNpdt.mSkills.size(); ++i)
npcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(player->mNpdt.mSkills[i]); npcStats.getSkill(ESM::Skill::indexToRefId(i)).setBase(player->mNpdt.mSkills[i]);
creatureStats.setAttribute(ESM::Attribute::Strength, player->mNpdt.mStrength); for (size_t i = 0; i < player->mNpdt.mAttributes.size(); ++i)
creatureStats.setAttribute(ESM::Attribute::Intelligence, player->mNpdt.mIntelligence); npcStats.setAttribute(ESM::Attribute::indexToRefId(i), player->mNpdt.mSkills[i]);
creatureStats.setAttribute(ESM::Attribute::Willpower, player->mNpdt.mWillpower);
creatureStats.setAttribute(ESM::Attribute::Agility, player->mNpdt.mAgility);
creatureStats.setAttribute(ESM::Attribute::Speed, player->mNpdt.mSpeed);
creatureStats.setAttribute(ESM::Attribute::Endurance, player->mNpdt.mEndurance);
creatureStats.setAttribute(ESM::Attribute::Personality, player->mNpdt.mPersonality);
creatureStats.setAttribute(ESM::Attribute::Luck, player->mNpdt.mLuck);
const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore(); const MWWorld::ESMStore& esmStore = *MWBase::Environment::get().getESMStore();
// race // race

31
components/esm3/loadnpc.cpp
Unescape Escape View File

@ -59,23 +59,31 @@ namespace ESM
if (esm.getSubSize() == 52) if (esm.getSubSize() == 52)
{ {
mNpdtType = NPC_DEFAULT; mNpdtType = NPC_DEFAULT;
esm.getExact(&mNpdt, 52); esm.getT(mNpdt.mLevel);
esm.getT(mNpdt.mAttributes);
esm.getT(mNpdt.mSkills);
esm.getT(mNpdt.mUnknown1);
esm.getT(mNpdt.mHealth);
esm.getT(mNpdt.mMana);
esm.getT(mNpdt.mFatigue);
esm.getT(mNpdt.mDisposition);
esm.getT(mNpdt.mReputation);
esm.getT(mNpdt.mRank);
esm.getT(mNpdt.mUnknown2);
esm.getT(mNpdt.mGold);
} }
else if (esm.getSubSize() == 12) else if (esm.getSubSize() == 12)
{ {
// Reading into temporary NPDTstruct12 object
NPDTstruct12 npdt12;
mNpdtType = NPC_WITH_AUTOCALCULATED_STATS; mNpdtType = NPC_WITH_AUTOCALCULATED_STATS;
esm.getExact(&npdt12, 12);
// Clearing the mNdpt struct to initialize all values // Clearing the mNdpt struct to initialize all values
blankNpdt(); blankNpdt();
// Swiching to an internal representation esm.getT(mNpdt.mLevel);
mNpdt.mLevel = npdt12.mLevel; esm.getT(mNpdt.mDisposition);
mNpdt.mDisposition = npdt12.mDisposition; esm.getT(mNpdt.mReputation);
mNpdt.mReputation = npdt12.mReputation; esm.getT(mNpdt.mRank);
mNpdt.mRank = npdt12.mRank; esm.skip(3);
mNpdt.mGold = npdt12.mGold; esm.getT(mNpdt.mGold);
} }
else else
esm.fail("NPC_NPDT must be 12 or 52 bytes long"); esm.fail("NPC_NPDT must be 12 or 52 bytes long");
@ -213,8 +221,7 @@ namespace ESM
void NPC::blankNpdt() void NPC::blankNpdt()
{ {
mNpdt.mLevel = 0; mNpdt.mLevel = 0;
mNpdt.mStrength = mNpdt.mIntelligence = mNpdt.mWillpower = mNpdt.mAgility = mNpdt.mSpeed = mNpdt.mEndurance mNpdt.mAttributes.fill(0);
= mNpdt.mPersonality = mNpdt.mLuck = 0;
mNpdt.mSkills.fill(0); mNpdt.mSkills.fill(0);
mNpdt.mReputation = 0; mNpdt.mReputation = 0;
mNpdt.mHealth = mNpdt.mMana = mNpdt.mFatigue = 0; mNpdt.mHealth = mNpdt.mMana = mNpdt.mFatigue = 0;

3
components/esm3/loadnpc.hpp
Unescape Escape View File

@ -6,6 +6,7 @@
#include <vector> #include <vector>
#include "aipackage.hpp" #include "aipackage.hpp"
#include "components/esm/attr.hpp"
#include "components/esm/defs.hpp" #include "components/esm/defs.hpp"
#include "components/esm/refid.hpp" #include "components/esm/refid.hpp"
#include "loadcont.hpp" #include "loadcont.hpp"
@ -80,7 +81,7 @@ namespace ESM
struct NPDTstruct52 struct NPDTstruct52
{ {
int16_t mLevel; int16_t mLevel;
unsigned char mStrength, mIntelligence, mWillpower, mAgility, mSpeed, mEndurance, mPersonality, mLuck; std::array<unsigned char, Attribute::Length> mAttributes;
// mSkill can grow up to 200, it must be unsigned // mSkill can grow up to 200, it must be unsigned
std::array<unsigned char, Skill::Length> mSkills; std::array<unsigned char, Skill::Length> mSkills;

7
components/esm3/loadpgrd.cpp
Unescape Escape View File

@ -70,7 +70,12 @@ namespace ESM
for (uint16_t i = 0; i < mData.mPoints; ++i) for (uint16_t i = 0; i < mData.mPoints; ++i)
{ {
Point p; Point p;
esm.getExact(&p, sizeof(Point)); esm.getT(p.mX);
esm.getT(p.mY);
esm.getT(p.mZ);
esm.getT(p.mAutogenerated);
esm.getT(p.mConnectionNum);
esm.getT(p.mUnknown);
mPoints.push_back(p); mPoints.push_back(p);
edgeCount += p.mConnectionNum; edgeCount += p.mConnectionNum;
} }

2
components/esm3/loadrace.cpp
Unescape Escape View File

@ -12,6 +12,7 @@ namespace ESM
int index = ESM::Attribute::refIdToIndex(attribute); int index = ESM::Attribute::refIdToIndex(attribute);
if (index < 0) if (index < 0)
return 0; return 0;
index *= 2;
if (!male) if (!male)
index++; index++;
return mAttributeValues[static_cast<size_t>(index)]; return mAttributeValues[static_cast<size_t>(index)];
@ -22,6 +23,7 @@ namespace ESM
int index = ESM::Attribute::refIdToIndex(attribute); int index = ESM::Attribute::refIdToIndex(attribute);
if (index < 0) if (index < 0)
return; return;
index *= 2;
if (!male) if (!male)
index++; index++;
mAttributeValues[static_cast<size_t>(index)] = value; mAttributeValues[static_cast<size_t>(index)] = value;

Write Preview
Loading…
Cancel
Save