mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 16:41:33 +00:00
Code Issues Releases Wiki Activity

Slight adjustments to disintegration fix

Browse source
This commit is contained in:
mrohrlach 2016-12-09 19:55:26 -07:00
parent 9624d8aade
commit f0f78c9d64
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwworld/cellref.cpp
View file

@ -107,7 +107,6 @@ namespace MWWorld
{ {
mCellRef.mChargeInt -= static_cast<int>(mCellRef.mChargeIntRemainder); mCellRef.mChargeInt -= static_cast<int>(mCellRef.mChargeIntRemainder);
} }
mCellRef.mChargeIntRemainder = newChargeRemainder; mCellRef.mChargeIntRemainder = newChargeRemainder;
} }
} }

2
apps/openmw/mwworld/cellref.hpp
View file

@ -65,7 +65,7 @@ namespace MWWorld
float getChargeFloat() const; // Implemented as union with int charge float getChargeFloat() const; // Implemented as union with int charge
void setCharge(int charge); void setCharge(int charge);
void setChargeFloat(float charge); void setChargeFloat(float charge);
void applyChargeRemainderToBeSubtracted(float chargeRemainder); void applyChargeRemainderToBeSubtracted(float chargeRemainder); // Stores remainders and applies if > 1
// The NPC that owns this object (and will get angry if you steal it) // The NPC that owns this object (and will get angry if you steal it)
std::string getOwner() const; std::string getOwner() const;

2
components/esm/cellref.hpp
View file

@ -69,7 +69,7 @@ namespace ESM
int mChargeInt; // Used by everything except lights int mChargeInt; // Used by everything except lights
float mChargeFloat; // Used only by lights float mChargeFloat; // Used only by lights
}; };
float mChargeIntRemainder; // Used by everythign except lights (amount of charge not applied to mChargeInt) float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
// Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full). // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
float mEnchantmentCharge; float mEnchantmentCharge;