From 420163d35f6aac7a233bc57fb5bee334b4fd6fbd Mon Sep 17 00:00:00 2001
From: Thomas <tluppi@thomas-GE60.(none)>
Date: Wed, 23 Apr 2014 05:19:34 -0400
Subject: [PATCH] Small changes to lock command (If no valid lockLevel exists,
 defaults to 100)

---
 apps/openmw/mwscript/miscextensions.cpp |  4 ++++
 components/esm/cellref.cpp              | 18 +++++++++++++++---
 components/esm/cellref.hpp              |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index f10d1df965..686fa94a74 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -132,6 +132,10 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     Interpreter::Type_Integer lockLevel = ptr.getCellRef().mLockLevel;
+                    if(lockLevel<0) { //no lock level was ever set, set to 100 as default
+                        ptr.getCellRef().mLockLevel = 100;
+                        lockLevel = 100;
+                    }
 
                     if (arg0==1)
                     {
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 00b15f4a30..c46d83c1bb 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -54,8 +54,15 @@ void ESM::CellRef::load (ESMReader& esm, bool wideRefNum)
     else
         mTeleport = false;
 
-    mLockLevel = -1;
+    mLockLevel = -999; //Set to impossible value to indicate no lock
+    mLocked = false;
     esm.getHNOT (mLockLevel, "FLTV");
+    if(mLockLevel < 0 && mLockLevel != -999) //Unlocked lock, save lock level properly
+        mLockLevel*=-1;
+    else if(mLockLevel != -999){
+        mLocked = true;
+    }
+
     mKey = esm.getHNOString ("KNAM");
     mTrap = esm.getHNOString ("TNAM");
 
@@ -113,8 +120,12 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory) cons
         esm.writeHNOCString("DNAM", mDestCell);
     }
 
-    if (mLockLevel != -1 && !inInventory)
-        esm.writeHNT("FLTV", mLockLevel);
+    if (mLockLevel != -999 && !inInventory) {
+        if(mLocked)
+            esm.writeHNT("FLTV", mLockLevel);
+        else //If it's not locked we simply flip  the locklevel to indicate it's locked
+            esm.writeHNT("FLTV", -mLockLevel);
+    }
 
     if (!inInventory)
         esm.writeHNOCString ("KNAM", mKey);
@@ -151,6 +162,7 @@ void ESM::CellRef::blank()
     mGoldValue = 0;
     mDestCell.clear();
     mLockLevel = 0;
+    mLocked = false;
     mKey.clear();
     mTrap.clear();
     mReferenceBlocked = 0;
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 16f6603a28..75122eacb0 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -71,6 +71,7 @@ namespace ESM
 
             // Lock level for doors and containers
             int mLockLevel;
+            bool mLocked; //Door locked/unlocked
             std::string mKey, mTrap; // Key and trap ID names, if any
 
             // This corresponds to the "Reference Blocked" checkbox in the construction set,