forked from mirror/openmw-tes3mp
Slight adjustments to disintegration fix
This commit is contained in:
parent
9624d8aade
commit
f0f78c9d64
3 changed files with 2 additions and 3 deletions
|
@ -107,7 +107,6 @@ namespace MWWorld
|
|||
{
|
||||
mCellRef.mChargeInt -= static_cast<int>(mCellRef.mChargeIntRemainder);
|
||||
}
|
||||
|
||||
mCellRef.mChargeIntRemainder = newChargeRemainder;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ namespace MWWorld
|
|||
float getChargeFloat() const; // Implemented as union with int charge
|
||||
void setCharge(int 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)
|
||||
std::string getOwner() const;
|
||||
|
|
|
@ -69,7 +69,7 @@ namespace ESM
|
|||
int mChargeInt; // Used by everything except 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).
|
||||
float mEnchantmentCharge;
|
||||
|
|
Loading…
Reference in a new issue