mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 16:29:55 +00:00
Code Issues Releases Wiki Activity

Replace more sized reads and unsized ints

Browse source
This commit is contained in:
Evil Eye 2023-10-06 16:44:18 +02:00
parent 2c81220cf7
commit f9c5edf6b9
8 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm3/loadmisc.cpp
View file

@ -28,7 +28,7 @@ namespace ESM
mName = esm.getHString(); mName = esm.getHString();
break; break;
case fourCC("MCDT"): case fourCC("MCDT"):
esm.getHTSized<12>(mData); esm.getHT(mData.mWeight, mData.mValue, mData.mFlags);
hasData = true; hasData = true;
break; break;
case fourCC("SCRI"): case fourCC("SCRI"):

6
components/esm3/loadmisc.hpp
View file

@ -27,8 +27,8 @@ namespace ESM
struct MCDTstruct struct MCDTstruct
{ {
float mWeight; float mWeight;
int mValue; int32_t mValue;
int mFlags; int32_t mFlags;
}; };
enum Flags enum Flags
@ -38,7 +38,7 @@ namespace ESM
MCDTstruct mData; MCDTstruct mData;
unsigned int mRecordFlags; uint32_t mRecordFlags;
RefId mId, mScript; RefId mId, mScript;
std::string mName, mModel, mIcon; std::string mName, mModel, mIcon;

2
components/esm3/loadprob.cpp
View file

@ -28,7 +28,7 @@ namespace ESM
mName = esm.getHString(); mName = esm.getHString();
break; break;
case fourCC("PBDT"): case fourCC("PBDT"):
esm.getHTSized<16>(mData); esm.getHT(mData.mWeight, mData.mValue, mData.mQuality, mData.mUses);
hasData = true; hasData = true;
break; break;
case fourCC("SCRI"): case fourCC("SCRI"):

6
components/esm3/loadprob.hpp
View file

@ -22,14 +22,14 @@ namespace ESM
struct Data struct Data
{ {
float mWeight; float mWeight;
int mValue; int32_t mValue;
float mQuality; float mQuality;
int mUses; int32_t mUses;
}; // Size = 16 }; // Size = 16
Data mData; Data mData;
unsigned int mRecordFlags; uint32_t mRecordFlags;
RefId mId, mScript; RefId mId, mScript;
std::string mName, mModel, mIcon; std::string mName, mModel, mIcon;

2
components/esm3/loadsoun.cpp
View file

@ -25,7 +25,7 @@ namespace ESM
mSound = esm.getHString(); mSound = esm.getHString();
break; break;
case fourCC("DATA"): case fourCC("DATA"):
esm.getHTSized<3>(mData); esm.getHT(mData.mVolume, mData.mMinRange, mData.mMaxRange);
hasData = true; hasData = true;
break; break;
case SREC_DELE: case SREC_DELE:

2
components/esm3/loadsoun.hpp
View file

@ -25,7 +25,7 @@ namespace ESM
static std::string_view getRecordType() { return "Sound"; } static std::string_view getRecordType() { return "Sound"; }
SOUNstruct mData; SOUNstruct mData;
unsigned int mRecordFlags; uint32_t mRecordFlags;
std::string mSound; std::string mSound;
RefId mId; RefId mId;

6
components/esm3/loadspel.cpp
View file

@ -27,13 +27,11 @@ namespace ESM
mName = esm.getHString(); mName = esm.getHString();
break; break;
case fourCC("SPDT"): case fourCC("SPDT"):
esm.getHTSized<12>(mData); esm.getHT(mData.mType, mData.mCost, mData.mFlags);
hasData = true; hasData = true;
break; break;
case fourCC("ENAM"): case fourCC("ENAM"):
ENAMstruct s; mEffects.add(esm);
esm.getHTSized<24>(s);
mEffects.mList.push_back(s);
break; break;
case SREC_DELE: case SREC_DELE:
esm.skipHSub(); esm.skipHSub();

8
components/esm3/loadspel.hpp
View file

@ -39,13 +39,13 @@ namespace ESM
struct SPDTstruct struct SPDTstruct
{ {
int mType; // SpellType int32_t mType; // SpellType
int mCost; // Mana cost int32_t mCost; // Mana cost
int mFlags; // Flags int32_t mFlags; // Flags
}; };
SPDTstruct mData; SPDTstruct mData;
unsigned int mRecordFlags; uint32_t mRecordFlags;
std::string mName; std::string mName;
RefId mId; RefId mId;
EffectList mEffects; EffectList mEffects;