Merge remote-tracking branch 'origin/master'

CMakeLists.txt

@@ -338,6 +338,7 @@ if (NOT WIN32 AND NOT APPLE)
 endif()
 
 # CXX Compiler settings
+set(CMAKE_CXX_STANDARD 11)
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -std=c++11 -pedantic -Wno-long-long")
     add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS=ON )

apps/openmw/mwworld/worldimp.cpp

@@ -2446,9 +2446,8 @@ namespace MWWorld
             if (ptr.getRefData().isDeleted())
                 return true;
 
-            // we should not sell ingrediends from owned organic containers
+            // vanilla Morrowind does not allow to sell items from containers with zero capacity
-            MWWorld::LiveCellRef<ESM::Container>* ref = ptr.get<ESM::Container>();
+            if (ptr.getClass().getCapacity(ptr) <= 0.f)
-            if (ref && (ref->mBase->mFlags & ESM::Container::Organic))
                 return true;
 
             if (Misc::StringUtils::ciEqual(ptr.getCellRef().getOwner(), mOwner.getCellRef().getRefId()))