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

Replace explicitly sized reads in cellid, cellref

Browse source
This commit is contained in:
Evil Eye 2023-08-08 21:41:44 +02:00
parent 48484c9416
commit 9e376f3783
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm3/cellid.cpp
View file

@ -13,7 +13,7 @@ namespace ESM
if (esm.isNextSub("CIDX")) if (esm.isNextSub("CIDX"))
{ {
esm.getHTSized<8>(mIndex); esm.getHT(mIndex.mX, mIndex.mY);
mPaged = true; mPaged = true;
} }
else else

5
components/esm3/cellid.hpp
View file

@ -2,6 +2,7 @@
#define OPENMW_ESM_CELLID_H #define OPENMW_ESM_CELLID_H
#include <components/esm/refid.hpp> #include <components/esm/refid.hpp>
#include <cstdint>
#include <string> #include <string>
namespace ESM namespace ESM
@ -13,8 +14,8 @@ namespace ESM
{ {
struct CellIndex struct CellIndex
{ {
int mX; int32_t mX;
int mY; int32_t mY;
}; };
std::string mWorldspace; std::string mWorldspace;

4
components/esm3/cellref.cpp
View file

@ -112,7 +112,7 @@ namespace ESM
case fourCC("DODT"): case fourCC("DODT"):
if constexpr (load) if constexpr (load)
{ {
esm.getHTSized<24>(cellRef.mDoorDest); esm.getHT(cellRef.mDoorDest.pos, cellRef.mDoorDest.rot);
cellRef.mTeleport = true; cellRef.mTeleport = true;
} }
else else
@ -132,7 +132,7 @@ namespace ESM
break; break;
case fourCC("DATA"): case fourCC("DATA"):
if constexpr (load) if constexpr (load)
esm.getHTSized<24>(cellRef.mPos); esm.getHT(cellRef.mPos.pos, cellRef.mPos.rot);
else else
esm.skipHTSized<24, decltype(cellRef.mPos)>(); esm.skipHTSized<24, decltype(cellRef.mPos)>();
break; break;

9
components/esm3/cellref.hpp
View file

@ -1,6 +1,7 @@
#ifndef OPENMW_ESM_CELLREF_H #ifndef OPENMW_ESM_CELLREF_H
#define OPENMW_ESM_CELLREF_H #define OPENMW_ESM_CELLREF_H
#include <cstdint>
#include <string> #include <string>
#include "components/esm/defs.hpp" #include "components/esm/defs.hpp"
@ -48,7 +49,7 @@ namespace ESM
ESM::RefId mFaction; ESM::RefId mFaction;
// PC faction rank required to use the item. Sometimes is -1, which means "any rank". // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
int mFactionRank; int32_t mFactionRank;
// For weapon or armor, this is the remaining item health. // For weapon or armor, this is the remaining item health.
// For tools (lockpicks, probes, repair hammer) it is the remaining uses. // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
@ -56,7 +57,7 @@ namespace ESM
// This could be -1 if the charge was not touched yet (i.e. full). // This could be -1 if the charge was not touched yet (i.e. full).
union union
{ {
int mChargeInt; // Used by everything except lights int32_t mChargeInt; // Used by everything except lights
float mChargeFloat; // Used only by lights float mChargeFloat; // Used only by lights
}; };
float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
@ -65,7 +66,7 @@ namespace ESM
float mEnchantmentCharge; float mEnchantmentCharge;
// This is 5 for Gold_005 references, 100 for Gold_100 and so on. // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
int mGoldValue; int32_t mGoldValue;
// For doors - true if this door teleports to somewhere else, false // For doors - true if this door teleports to somewhere else, false
// if it should open through animation. // if it should open through animation.
@ -78,7 +79,7 @@ namespace ESM
std::string mDestCell; std::string mDestCell;
// Lock level for doors and containers // Lock level for doors and containers
int mLockLevel; int32_t mLockLevel;
bool mIsLocked{}; bool mIsLocked{};
ESM::RefId mKey, mTrap; // Key and trap ID names, if any ESM::RefId mKey, mTrap; // Key and trap ID names, if any