Merge remote-tracking branch 'jeffreyhaines/master'

apps/openmw/mwclass/creature.cpp

@@ -134,10 +134,6 @@ namespace MWClass
             getContainerStore(ptr).fill(ref->mBase->mInventory, getId(ptr), "",
                                        MWBase::Environment::get().getWorld()->getStore());
 
-            // TODO: this is not quite correct, in vanilla the merchant's gold pool is not available in his inventory.
-            // (except for gold you gave him)
-            //getContainerStore(ptr).add(MWWorld::ContainerStore::sGoldId, ref->mBase->mData.mGold, ptr);
-
             if (ref->mBase->mFlags & ESM::Creature::Weapon)
                 getInventoryStore(ptr).autoEquip(ptr);   
         }

apps/openmw/mwclass/npc.cpp

@@ -365,13 +365,7 @@ namespace MWClass
             // store
             ptr.getRefData().setCustomData (data.release());
 
-            // TODO: this is not quite correct, in vanilla the merchant's gold pool is not available in his inventory.
-            // (except for gold you gave him)
-            //getContainerStore(ptr).add(MWWorld::ContainerStore::sGoldId, gold, ptr);
-
-            getInventoryStore(ptr).autoEquip(ptr);
-
-            
+            getInventoryStore(ptr).autoEquip(ptr); 
         }
     }
 

apps/openmw/mwworld/class.cpp

@@ -397,5 +397,8 @@ namespace MWWorld
 
     void Class::writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state) const {}
 
-    int Class::getBaseGold(const MWWorld::Ptr& ptr) const {}
+    int Class::getBaseGold(const MWWorld::Ptr& ptr) const 
+    {
+        throw std::runtime_error("class does not support base gold");
+    }
 }