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

loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix

Browse source
This commit is contained in:
Marco Melletti 2014-09-03 14:40:32 +02:00
parent ccca6db865
commit 8bce460f34
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/model/tools/bodypartcheck.cpp
View file

@ -33,7 +33,7 @@ void CSMTools::BodyPartCheckStage::perform ( int stage, Messages &messages )
if ( bodyPart.mData.mVampire < 0 ) if ( bodyPart.mData.mVampire < 0 )
messages.push_back(std::make_pair( id, bodyPart.mId + " has negative vampire flag." )); messages.push_back(std::make_pair( id, bodyPart.mId + " has negative vampire flag." ));
if ( bodyPart.mData.mFlags < 0 || bodyPart.mData.mFlags > 2 ) if ( bodyPart.mData.mFlags < 0 || bodyPart.mData.mFlags > 3 )
messages.push_back(std::make_pair( id, bodyPart.mId + " has out of range flags value." )); messages.push_back(std::make_pair( id, bodyPart.mId + " has out of range flags value." ));
if ( bodyPart.mData.mType < 0 || bodyPart.mData.mType > 2 ) if ( bodyPart.mData.mType < 0 || bodyPart.mData.mType > 2 )
@ -52,4 +52,4 @@ void CSMTools::BodyPartCheckStage::perform ( int stage, Messages &messages )
messages.push_back(std::make_pair( id, bodyPart.mId + " has no race." )); messages.push_back(std::make_pair( id, bodyPart.mId + " has no race." ));
else if ( mRaces.searchId( bodyPart.mRace ) == -1 ) else if ( mRaces.searchId( bodyPart.mRace ) == -1 )
messages.push_back(std::make_pair( id, bodyPart.mId + " has invalid race." )); messages.push_back(std::make_pair( id, bodyPart.mId + " has invalid race." ));
} }

4
components/esm/aipackage.hpp
View file

@ -16,8 +16,8 @@ namespace ESM
struct AIData struct AIData
{ {
// These are probabilities char mU1, mU2, mU3, mU4; // Unknown values
char mHello, mU1, mFight, mFlee, mAlarm, mU2, mU3, mU4; unsigned char mHello, mFight, mFlee, mAlarm; // These are probabilities [0, 100]
int mServices; // See the Services enum int mServices; // See the Services enum
void blank(); void blank();

2
components/esm/loadarmo.hpp
View file

@ -46,7 +46,7 @@ enum PartReferenceType
// Reference to body parts // Reference to body parts
struct PartReference struct PartReference
{ {
char mPart; unsigned char mPart; // declared values [0, 26]
std::string mMale, mFemale; std::string mMale, mFemale;
}; };

8
components/esm/loadbody.hpp
View file

@ -49,10 +49,10 @@ struct BodyPart
struct BYDTstruct struct BYDTstruct
{ {
char mPart; unsigned char mPart; // mesh part
char mVampire; unsigned char mVampire; // boolean
char mFlags; unsigned char mFlags;
char mType; unsigned char mType; // mesh type
}; };
BYDTstruct mData; BYDTstruct mData;

11
components/esm/loadnpc.hpp
View file

@ -81,9 +81,11 @@ struct NPC
mLuck; mLuck;
char mSkills[Skill::Length]; char mSkills[Skill::Length];
char mReputation;
// at opencs/model/tools/referenceablecheck.cpp:679 is assumed that negative reputation values are invalid, can we assume we won't find any negative value?
unsigned char mReputation;
unsigned short mHealth, mMana, mFatigue; unsigned short mHealth, mMana, mFatigue;
char mDisposition, mFactionID, mRank; signed char mDisposition, mFactionID, mRank;
char mUnknown; char mUnknown;
int mGold; int mGold;
}; // 52 bytes }; // 52 bytes
@ -91,7 +93,8 @@ struct NPC
struct NPDTstruct12 struct NPDTstruct12
{ {
short mLevel; short mLevel;
char mDisposition, mReputation, mRank; unsigned char mReputation; // see NPTDstruct52.mReputation
signed char mDisposition, mRank;
char mUnknown1, mUnknown2, mUnknown3; char mUnknown1, mUnknown2, mUnknown3;
int mGold; // ?? not certain int mGold; // ?? not certain
}; // 12 bytes }; // 12 bytes
@ -103,7 +106,7 @@ struct NPC
}; };
#pragma pack(pop) #pragma pack(pop)
char mNpdtType; unsigned char mNpdtType;
NPDTstruct52 mNpdt52; NPDTstruct52 mNpdt52;
NPDTstruct12 mNpdt12; //for autocalculated characters NPDTstruct12 mNpdt12; //for autocalculated characters