From 1e8182220ae7c14de13ab634c82f2b14444c0e69 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sun, 19 Jul 2015 23:27:51 +0300
Subject: [PATCH] Fix build errors & warnings

---
 apps/opencs/model/doc/savingstages.hpp   | 2 +-
 apps/opencs/model/world/idcollection.hpp | 8 ++++----
 components/esm/cellref.cpp               | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index 9dbb5bee3..a7d9704b0 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -102,7 +102,7 @@ namespace CSMDoc
 
         ESM::ESMWriter& writer = mState.getWriter();
         CSMWorld::RecordBase::State state = mCollection.getRecord (stage).mState;
-        CollectionT::ESXRecord record = mCollection.getRecord (stage).get();
+        typename CollectionT::ESXRecord record = mCollection.getRecord (stage).get();
 
         if (state == CSMWorld::RecordBase::State_Modified ||
             state == CSMWorld::RecordBase::State_ModifiedOnly ||
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 4acfdc474..9d3ec990e 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -46,7 +46,7 @@ namespace CSMWorld
         loadRecord (record, reader);
 
         std::string id = IdAccessorT().getId (record);
-        int index = searchId (id);
+        int index = this->searchId (id);
 
         if (isRecordDeleted(record))
         {
@@ -60,13 +60,13 @@ namespace CSMWorld
 
             if (base)
             {
-                removeRows (index, 1);
+                this->removeRows (index, 1);
                 return -1;
             }
 
-            Record<ESXRecordT> baseRecord = getRecord (index);
+            Record<ESXRecordT> baseRecord = this->getRecord (index);
             baseRecord.mState = RecordBase::State_Deleted;
-            setRecord (index, baseRecord);
+            this->setRecord (index, baseRecord);
             return index;
         }
 
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index c6fb899b3..bcf3de807 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -7,10 +7,12 @@
 ESM::CellRef::CellRef()
     : mScale(1.0f),
       mFactionRank(-2),
-      mEnchantmentCharge(-1),
-      mGoldValue(1),
       mChargeInt(-1),
+      mEnchantmentCharge(-1.0f),
+      mGoldValue(1),
+      mTeleport(false),
       mLockLevel(0),
+      mReferenceBlocked(-1),
       mIsDeleted(false)
 {}