Revert "Light charge handling fix"

This reverts commit 5e0428243b.

apps/esmtool/esmtool.cpp

@@ -261,7 +261,7 @@ void loadCell(ESM::Cell &cell, ESM::ESMReader &esm, Arguments& info)
         std::cout << "    Faction: '" << ref.mFaction << "'" << std::endl;
         std::cout << "    Faction rank: '" << ref.mFactionRank << "'" << std::endl;
         std::cout << "    Enchantment charge: '" << ref.mEnchantmentCharge << "'\n";
-        std::cout << "    Uses/health: '" << ref.mChargeInt << "'\n";
+        std::cout << "    Uses/health: '" << ref.mCharge << "'\n";
         std::cout << "    Gold value: '" << ref.mGoldValue << "'\n";
         std::cout << "    Blocked: '" << static_cast<int>(ref.mReferenceBlocked) << "'" << std::endl;
         std::cout << "    Deleted: " << deleted << std::endl;

apps/essimporter/convertinventory.cpp

@@ -12,10 +12,10 @@ namespace ESSImport
         {
             ESM::ObjectState objstate;
             objstate.blank();
-            objstate.mRef = *it;
             objstate.mRef.mRefID = Misc::StringUtils::lowerCase(it->mId);
             objstate.mCount = std::abs(it->mCount); // restocking items have negative count in the savefile
                                                     // openmw handles them differently, so no need to set any flags
+            objstate.mRef.mCharge = it->mCondition;
             state.mItems.push_back(std::make_pair(objstate, it->mRelativeEquipmentSlot));
         }
     }

apps/essimporter/importinventory.cpp

@@ -45,9 +45,9 @@ namespace ESSImport
                 // for XSOL and XCHG seen so far, but probably others too
                 item.ESM::CellRef::loadData(esm);
 
-                int charge=-1;
-                esm.getHNOT(charge, "XHLT");
-                item.mChargeInt = charge;
+                item.mCondition = -1;
+                // FIXME: for Lights, this is actually a float
+                esm.getHNOT(item.mCondition, "XHLT");
             }
 
             mItems.push_back(item);

apps/essimporter/importinventory.hpp

@@ -20,6 +20,7 @@ namespace ESSImport
         {
             std::string mId;
             int mCount;
+            int mCondition;
             int mRelativeEquipmentSlot;
         };
         std::vector<InventoryItem> mItems;

apps/opencs/model/world/columnimp.hpp

@@ -1053,13 +1053,13 @@ namespace CSMWorld
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
-            return record.get().mChargeInt;
+            return record.get().mCharge;
         }
 
         virtual void set (Record<ESXRecordT>& record, const QVariant& data)
         {
             ESXRecordT record2 = record.get();
-            record2.mChargeInt = data.toInt();
+            record2.mCharge = data.toInt();
             record.setModified (record2);
         }
 

apps/openmw/mwclass/light.cpp

@@ -26,6 +26,27 @@
 #include "../mwrender/actors.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
+namespace
+{
+    struct LightCustomData : public MWWorld::CustomData
+    {
+        float mTime;
+        ///< Time remaining
+
+        LightCustomData(MWWorld::Ptr ptr)
+        {
+            MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
+            mTime = ref->mBase->mData.mTime;
+        }
+        ///< Constructs this CustomData from the base values for Ptr.
+
+        virtual MWWorld::CustomData *clone() const
+        {
+            return new LightCustomData (*this);
+        }
+    };
+}
+
 namespace MWClass
 {
     std::string Light::getId (const MWWorld::Ptr& ptr) const
@@ -198,16 +219,17 @@ namespace MWClass
 
     void Light::setRemainingUsageTime (const MWWorld::Ptr& ptr, float duration) const
     {
-        ptr.getCellRef().setChargeFloat(duration);
+        ensureCustomData(ptr);
+
+        float &timeRemaining = dynamic_cast<LightCustomData&> (*ptr.getRefData().getCustomData()).mTime;
+        timeRemaining = duration;
     }
 
     float Light::getRemainingUsageTime (const MWWorld::Ptr& ptr) const
     {
-        MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
-        if (ptr.getCellRef().getCharge() == -1)
-            return ref->mBase->mData.mTime;
-        else
-            return ptr.getCellRef().getChargeFloat();
+        ensureCustomData(ptr);
+
+        return dynamic_cast<LightCustomData&> (*ptr.getRefData().getCustomData()).mTime;
     }
 
     MWWorld::Ptr
@@ -219,6 +241,12 @@ namespace MWClass
         return MWWorld::Ptr(&cell.get<ESM::Light>().insert(*ref), &cell);
     }
 
+    void Light::ensureCustomData (const MWWorld::Ptr& ptr) const
+    {
+        if (!ptr.getRefData().getCustomData())
+            ptr.getRefData().setCustomData(new LightCustomData(ptr));
+    }
+
     bool Light::canSell (const MWWorld::Ptr& item, int npcServices) const
     {
         return npcServices & ESM::NPC::Lights;
@@ -254,6 +282,22 @@ namespace MWClass
         return std::make_pair(1,"");
     }
 
+    void Light::readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
+        const
+    {
+        ensureCustomData (ptr);
+
+        dynamic_cast<LightCustomData&> (*ptr.getRefData().getCustomData()).mTime = state.mTime;
+    }
+
+    void Light::writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state)
+        const
+    {
+        ensureCustomData (ptr);
+
+        state.mTime = dynamic_cast<LightCustomData&> (*ptr.getRefData().getCustomData()).mTime;
+    }
+
     std::string Light::getSound(const MWWorld::Ptr& ptr) const
     {
       return ptr.get<ESM::Light>()->mBase->mSound;

apps/openmw/mwclass/light.hpp

@@ -10,6 +10,8 @@ namespace MWClass
             virtual MWWorld::Ptr
             copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
 
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
+
         public:
 
             /// Return ID of \a ptr
@@ -73,6 +75,14 @@ namespace MWClass
 
             std::pair<int, std::string> canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;
 
+            virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
+                const;
+            ///< Read additional state from \a state into \a ptr.
+
+            virtual void writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state)
+                const;
+            ///< Write additional state from \a ptr into \a state.
+
             virtual std::string getSound(const MWWorld::Ptr& ptr) const;
     };
 }

apps/openmw/mwworld/cellref.cpp

@@ -81,29 +81,15 @@ namespace MWWorld
 
     int CellRef::getCharge() const
     {
-        return mCellRef.mChargeInt;
+        return mCellRef.mCharge;
     }
 
     void CellRef::setCharge(int charge)
     {
-        if (charge != mCellRef.mChargeInt)
+        if (charge != mCellRef.mCharge)
         {
             mChanged = true;
-            mCellRef.mChargeInt = charge;
-        }
-    }
-
-    float CellRef::getChargeFloat() const
-    {
-        return mCellRef.mChargeFloat;
-    }
-
-    void CellRef::setChargeFloat(float charge)
-    {
-        if (charge != mCellRef.mChargeFloat)
-        {
-            mChanged = true;
-            mCellRef.mChargeFloat = charge;
+            mCellRef.mCharge = charge;
         }
     }
 

apps/openmw/mwworld/cellref.hpp

@@ -60,11 +60,8 @@ namespace MWWorld
 
         // For weapon or armor, this is the remaining item health.
         // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
-        // If this returns int(-1) it means full health.
         int getCharge() const;
-        float getChargeFloat() const; // Implemented as union with int charge
         void setCharge(int charge);
-        void setChargeFloat(float charge);
 
         // The NPC that owns this object (and will get angry if you steal it)
         std::string getOwner() const;

apps/openmw/mwworld/manualref.hpp

@@ -28,7 +28,7 @@ namespace MWWorld
                 cellRef.mRefID = name;
                 cellRef.mScale = 1;
                 cellRef.mFactionRank = 0;
-                cellRef.mChargeInt = -1;
+                cellRef.mCharge = -1;
                 cellRef.mGoldValue = 1;
                 cellRef.mEnchantmentCharge = -1;
                 cellRef.mTeleport = false;

components/esm/cellref.cpp

@@ -46,12 +46,12 @@ void ESM::CellRef::loadData(ESMReader &esm)
     esm.getHNOT (mFactionRank, "INDX");
 
     mGoldValue = 1;
-    mChargeInt = -1;
+    mCharge = -1;
     mEnchantmentCharge = -1;
 
     esm.getHNOT (mEnchantmentCharge, "XCHG");
 
-    esm.getHNOT (mChargeInt, "INTV");
+    esm.getHNOT (mCharge, "INTV");
 
     esm.getHNOT (mGoldValue, "NAM9");
 
@@ -106,8 +106,8 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory) cons
     if (mEnchantmentCharge != -1)
         esm.writeHNT("XCHG", mEnchantmentCharge);
 
-    if (mChargeInt != -1)
-        esm.writeHNT("INTV", mChargeInt);
+    if (mCharge != -1)
+        esm.writeHNT("INTV", mCharge);
 
     if (mGoldValue != 1) {
         esm.writeHNT("NAM9", mGoldValue);
@@ -146,7 +146,7 @@ void ESM::CellRef::blank()
     mSoul.clear();
     mFaction.clear();
     mFactionRank = -2;
-    mChargeInt = -1;
+    mCharge = -1;
     mEnchantmentCharge = -1;
     mGoldValue = 0;
     mDestCell.clear();

components/esm/cellref.hpp

@@ -59,11 +59,7 @@ namespace ESM
 
             // For weapon or armor, this is the remaining item health.
             // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
-            union
-            {
-                int mChargeInt;
-                float mChargeFloat;
-            };
+            int mCharge;
 
             // Remaining enchantment charge. This could be -1 if the charge was not touched yet (i.e. full).
             float mEnchantmentCharge;

components/esm/objectstate.cpp

@@ -24,9 +24,9 @@ void ESM::ObjectState::load (ESMReader &esm)
 
     esm.getHNOT (mLocalRotation, "LROT", 12);
 
-    // obsolete
-    int unused;
-    esm.getHNOT(unused, "LTIM");
+    // used for lights only
+    mTime = 0;
+    esm.getHNOT (mTime, "LTIM");
 
     // FIXME: assuming "false" as default would make more sense, but also break compatibility with older save files
     mHasCustomState = true;
@@ -55,6 +55,9 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
         esm.writeHNT ("LROT", mLocalRotation, 12);
     }
 
+    if (mTime)
+        esm.writeHNT ("LTIM", mTime);
+
     if (!mHasCustomState)
         esm.writeHNT ("HCUS", false);
 }
@@ -71,6 +74,7 @@ void ESM::ObjectState::blank()
         mPosition.rot[i] = 0;
         mLocalRotation[i] = 0;
     }
+    mTime = 0;
     mHasCustomState = true;
 }
 

components/esm/objectstate.hpp

@@ -26,6 +26,8 @@ namespace ESM
         ESM::Position mPosition;
         float mLocalRotation[3];
 
+        float mTime; // Used for lights only. Overhead should not be so awful, besides CellRef isn't OO either
+
         // Is there any class-specific state following the ObjectState
         bool mHasCustomState;