Merge remote-tracking branch 'zini/master' into sound

Conflicts:
	apps/openmw/mwsound/soundmanagerimp.cpp
	apps/openmw/mwsound/soundmanagerimp.hpp

.gitignore

@@ -13,3 +13,4 @@ cmake_install.cmake
 Makefile
 makefile
 data
+*.kdev4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "extern/shiny"]
+	path = extern/shiny
+	url = git://github.com/scrawl/shiny.git

CMakeLists.txt

@@ -15,7 +15,7 @@ include (OpenMWMacros)
 # Version
 
 set (OPENMW_VERSION_MAJOR 0)
-set (OPENMW_VERSION_MINOR 16)
+set (OPENMW_VERSION_MINOR 18)
 set (OPENMW_VERSION_RELEASE 0)
 
 set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
@@ -31,12 +31,17 @@ option(OGRE_STATIC "Link static build of Ogre and Ogre Plugins into the binaries
 option(BUILD_ESMTOOL "build ESM inspector" ON)
 option(BUILD_LAUNCHER "build Launcher" ON)
 option(BUILD_MWINIIMPORTER "build MWiniImporter" ON)
+option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
+option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest ang GMock frameworks" OFF)
 
 # Sound source selection
 option(USE_FFMPEG "use ffmpeg for sound" OFF)
 option(USE_AUDIERE "use audiere for sound" OFF)
 option(USE_MPG123 "use mpg123 + libsndfile for sound" ON)
 
+# OS X deployment
+option(OPENMW_OSX_DEPLOYMENT OFF)
+
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 
 # Location of morrowind data files
@@ -93,20 +98,14 @@ ENDIF()
 
 set(LIBDIR ${CMAKE_SOURCE_DIR}/libs)
 
-set(MANGLE_VFS ${LIBDIR}/mangle/vfs/servers/ogre_vfs.cpp)
-set(MANGLE_INPUT ${LIBDIR}/mangle/input/servers/ois_driver.cpp)
-set(MANGLE_ALL ${MANGLE_VFS} ${MANGLE_INPUT})
-source_group(libs\\mangle FILES ${MANGLE_ALL})
-
 set(OENGINE_OGRE
   ${LIBDIR}/openengine/ogre/renderer.cpp
-  ${LIBDIR}/openengine/ogre/mouselook.cpp
   ${LIBDIR}/openengine/ogre/fader.cpp
   ${LIBDIR}/openengine/ogre/imagerotate.cpp
   ${LIBDIR}/openengine/ogre/atlas.cpp
+  ${LIBDIR}/openengine/ogre/selectionbuffer.cpp
 )
 set(OENGINE_GUI
-  ${LIBDIR}/openengine/gui/events.cpp
   ${LIBDIR}/openengine/gui/manager.cpp
 )
 
@@ -133,7 +132,7 @@ set(OENGINE_BULLET
 set(OENGINE_ALL ${OENGINE_OGRE} ${OENGINE_GUI} ${OENGINE_BULLET})
 source_group(libs\\openengine FILES ${OENGINE_ALL})
 
-set(OPENMW_LIBS ${MANGLE_ALL} ${OENGINE_ALL})
+set(OPENMW_LIBS ${OENGINE_ALL})
 set(OPENMW_LIBS_HEADER)
 
 # Sound setup
@@ -187,14 +186,24 @@ if (UNIX AND NOT APPLE)
 find_package (Threads)
 endif()
 
+# find boost without components so we can use Boost_VERSION
+find_package(Boost REQUIRED)
+
+set(BOOST_COMPONENTS system filesystem program_options thread)
+
+if (Boost_VERSION LESS 104900)
+    set(SHINY_USE_WAVE_SYSTEM_INSTALL "TRUE")
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} wave)
+endif()
+
 find_package(OGRE REQUIRED)
 find_package(MyGUI REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
+find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(OIS REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(Bullet REQUIRED)
 IF(OGRE_STATIC)
-find_package(Cg REQUIRED)
+find_package(Cg)
 IF(WIN32)
 set(OGRE_PLUGIN_INCLUDE_DIRS ${OGRE_Plugin_CgProgramManager_INCLUDE_DIRS} ${OGRE_Plugin_OctreeSceneManager_INCLUDE_DIRS} ${OGRE_Plugin_ParticleFX_INCLUDE_DIRS} ${OGRE_RenderSystem_Direct3D9_INCLUDE_DIRS} ${OGRE_RenderSystem_GL_INCLUDE_DIRS})
 ELSE(WIN32)
@@ -221,8 +230,50 @@ if (APPLE)
                           ${OGRE_Plugin_OctreeSceneManager_LIBRARY_REL}
                           ${OGRE_Plugin_CgProgramManager_LIBRARY_REL}
                           ${OGRE_Plugin_ParticleFX_LIBRARY_REL})
+
+    if (${OGRE_PLUGIN_DIR_REL}})
+        set(OGRE_PLUGINS_REL_FOUND TRUE)
+    endif ()
+
+    if (${OGRE_PLUGIN_DIR_DBG})
+        set(OGRE_PLUGINS_DBG_FOUND TRUE)
+    endif ()
+
+    if (${OGRE_PLUGINS_REL_FOUND})
+        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_REL})
+    else ()
+        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
+    endif ()
+    
+    #set(OGRE_PLUGIN_DIR "${OGRE_PLUGIN_DIR}/")
+
+    configure_file(${OpenMW_SOURCE_DIR}/files/mac/Info.plist
+        "${APP_BUNDLE_DIR}/Contents/Info.plist")
+
+    configure_file(${OpenMW_SOURCE_DIR}/files/mac/openmw.icns
+        "${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
 endif (APPLE)
 
+# Set up DEBUG define
+set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG DEBUG=1)
+
+# Set up Ogre plugin folder & debug suffix
+if (APPLE)
+	# Ogre on OS X doesn't use "_d" suffix (see Ogre's CMakeLists.txt)
+	add_definitions(-DOGRE_PLUGIN_DEBUG_SUFFIX="")
+else ()
+	add_definitions(-DOGRE_PLUGIN_DEBUG_SUFFIX="_d")
+endif()
+
+add_definitions(-DOGRE_PLUGIN_DIR_REL="${OGRE_PLUGIN_DIR_REL}")
+add_definitions(-DOGRE_PLUGIN_DIR_DBG="${OGRE_PLUGIN_DIR_DBG}")
+if (APPLE AND OPENMW_OSX_DEPLOYMENT)
+    add_definitions(-DOGRE_PLUGIN_DIR="${APP_BUNDLE_NAME}/Contents/Plugins")
+else()
+    add_definitions(-DOGRE_PLUGIN_DIR="${OGRE_PLUGIN_DIR}")
+endif()
+
+
 add_subdirectory(files/)
 add_subdirectory(files/mygui)
 
@@ -247,53 +298,12 @@ configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local
 configure_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg
     "${OpenMW_BINARY_DIR}/openmw.cfg.install")
 
-if (WIN32)
-    configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.win32
-        "${OpenMW_BINARY_DIR}/plugins.cfg" COPYONLY)
-endif (WIN32)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux
-        "${OpenMW_BINARY_DIR}/plugins.cfg")
-
     configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop
         "${OpenMW_BINARY_DIR}/openmw.desktop")
 endif()
 
-if (APPLE)
-    if (${OGRE_PLUGIN_DIR_REL}})
-        set(OGRE_PLUGINS_REL_FOUND TRUE)
-    endif ()
-
-    if (${OGRE_PLUGIN_DIR_DBG})
-        set(OGRE_PLUGINS_DBG_FOUND TRUE)
-    endif ()
-
-    if (${OGRE_PLUGINS_REL_FOUND})
-        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_REL})
-    else ()
-        set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
-    endif ()
-
-    set(OGRE_PLUGIN_DIR "${OGRE_PLUGIN_DIR}/")
-
-    configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
-        "${OpenMW_BINARY_DIR}/plugins.cfg")
-
-    set(OGRE_PLUGIN_DIR_2 ${OGRE_PLUGIN_DIR})
-    set(OGRE_PLUGIN_DIR "")
-    configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
-        "${OpenMW_BINARY_DIR}/plugins.cfg.install")
-    set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_2})
-
-    configure_file(${OpenMW_SOURCE_DIR}/files/mac/Info.plist
-        "${APP_BUNDLE_DIR}/Contents/Info.plist")
-
-    configure_file(${OpenMW_SOURCE_DIR}/files/mac/openmw.icns
-        "${APP_BUNDLE_DIR}/Contents/Resources/OpenMW.icns" COPYONLY)
-endif (APPLE)
-
-
 # Compiler settings
 if (CMAKE_COMPILER_IS_GNUCC)
     add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder)
@@ -330,7 +340,6 @@ if(DPKG_PROGRAM)
     INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "../etc/openmw/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_BINARY_DIR}/transparency-overrides.cfg" DESTINATION "../etc/openmw/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "../etc/openmw/" RENAME "openmw.cfg" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
-    INSTALL(FILES "${OpenMW_BINARY_DIR}/plugins.cfg" DESTINATION "../etc/openmw/" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw")
 
     #Install resources
     INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "share/games/openmw/" FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT "Resources")
@@ -347,7 +356,7 @@ if(DPKG_PROGRAM)
     SET(CPACK_DEBIAN_PACKAGE_NAME "openmw")
     SET(CPACK_DEBIAN_PACKAGE_VERSION "${VERSION_STRING}")
     SET(CPACK_PACKAGE_EXECUTABLES "openmw;OpenMW esmtool;Esmtool omwlauncher;OMWLauncher mwiniimporter;MWiniImporter")
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "nvidia-cg-toolkit (>= 2.1),  libboost-filesystem1.46.1 (>= 1.46.1), libboost-program-options1.46.1 (>= 1.46.1), libboost-system1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libc6 (>= 2.11.2), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libmpg123-0 (>= 1.12.1), libois-1.3.0 (>= 1.3.0), libopenal1 (>= 1:1.12.854), libsndfile1 (>= 1.0.23), libstdc++6 (>= 4.4.5), libuuid1 (>= 2.17.2), libqtgui4 (>= 4.7.0)")
+    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.46.1 (>= 1.46.1), libboost-program-options1.46.1 (>= 1.46.1), libboost-system1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libc6 (>= 2.11.2), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libmpg123-0 (>= 1.12.1), libois-1.3.0 (>= 1.3.0), libopenal1 (>= 1:1.12.854), libsndfile1 (>= 1.0.23), libstdc++6 (>= 4.4.5), libuuid1 (>= 2.17.2), libqtgui4 (>= 4.7.0)")
 
     SET(CPACK_DEBIAN_PACKAGE_SECTION "Games")
 
@@ -368,7 +377,6 @@ if(WIN32)
     INSTALL(FILES ${dll_files} DESTINATION ".")
     INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "." RENAME "openmw.cfg")
     INSTALL(FILES
-        "${OpenMW_BINARY_DIR}/plugins.cfg"
         "${OpenMW_SOURCE_DIR}/readme.txt"
         "${OpenMW_SOURCE_DIR}/GPL3.txt"
         "${OpenMW_SOURCE_DIR}/OFL.txt"
@@ -432,6 +440,10 @@ if(WIN32)
     include(CPack)
 endif(WIN32)
 
+# Extern
+add_subdirectory (extern/shiny)
+add_subdirectory (extern/oics)
+
 # Components
 add_subdirectory (components)
 
@@ -450,6 +462,11 @@ if (BUILD_MWINIIMPORTER)
    add_subdirectory( apps/mwiniimporter )
 endif()
 
+# UnitTests
+if (BUILD_UNITTESTS)
+  add_subdirectory( apps/openmw_test_suite )
+endif()
+
 if (WIN32)
   if (MSVC)
     if (USE_DEBUG_CONSOLE)
@@ -496,6 +513,7 @@ if (WIN32)
         4309 # Variable overflow, trying to store 128 in a signed char for example
         4355 # Using 'this' in member initialization list
         4701 # Potentially uninitialized local variable used
+		4800 # Boolean optimization warning, e.g. myBool = (myInt != 0) instead of myBool = myInt
         )
 
     foreach(d ${WARNINGS_DISABLE})
@@ -507,6 +525,7 @@ if (WIN32)
 		set_target_properties(omwlauncher PROPERTIES COMPILE_FLAGS ${WARNINGS})
 	endif (BUILD_LAUNCHER)
     set_target_properties(openmw PROPERTIES COMPILE_FLAGS ${WARNINGS})
+	set_target_properties(esmtool PROPERTIES COMPILE_FLAGS ${WARNINGS})
   endif(MSVC)
 
   # Same for MinGW
@@ -537,7 +556,6 @@ if (APPLE)
     install(DIRECTORY "${APP_BUNDLE_DIR}" USE_SOURCE_PERMISSIONS DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
     install(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
     install(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" RENAME "openmw.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
-    install(FILES "${OpenMW_BINARY_DIR}/plugins.cfg.install" RENAME "plugins.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
     install(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
 
     install(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${INSTALL_SUBDIR}" COMPONENT Runtime)
@@ -614,3 +632,36 @@ if (APPLE)
         " COMPONENT Runtime)
         include(CPack)
 endif (APPLE)
+
+if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
+    ## Non Debian based Linux building
+    # paths
+    set(BINDIR "${CMAKE_INSTALL_PREFIX}/usr/bin" CACHE PATH "Where to install binaries")
+    set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location")
+    set(DATADIR "${DATAROOTDIR}/openmw" CACHE PATH "Sets the openmw data directories to a non-default location")
+    set(DOCDIR "${DATAROOTDIR}/doc/openmw" CACHE PATH "Sets the doc directory to a non-default location.")
+    set(MANDIR "${DATAROOTDIR}/man" CACHE PATH "Where to install manpages")
+    set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc/openmw" CACHE PATH "Set config dir")
+    set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Set icon dir")
+
+    # Install binaries
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw" DESTINATION "${BINDIR}" )
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/omwlauncher" DESTINATION "${BINDIR}" )
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/esmtool" DESTINATION "${BINDIR}" )
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/mwiniimport" DESTINATION "${BINDIR}" )
+
+    # Install icon and .desktop
+    INSTALL(FILES "${OpenMW_SOURCE_DIR}/apps/launcher/resources/images/openmw.png" DESTINATION "${ICONDIR}")
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications")
+
+    # Install global configuration files
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.cfg.install" DESTINATION "${SYSCONFDIR}" RENAME "openmw.cfg" )
+    #INSTALL(FILES "${OpenMW_BINARY_DIR}/plugins.cfg" DESTINATION "${SYSCONFDIR}" )
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/settings-default.cfg" DESTINATION "${SYSCONFDIR}" )
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/transparency-overrides.cfg" DESTINATION "${SYSCONFDIR}" )
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.cfg" DESTINATION "${SYSCONFDIR}" )
+
+    # Install resources
+    INSTALL(DIRECTORY "${OpenMW_BINARY_DIR}/resources" DESTINATION "${DATADIR}" )
+    INSTALL(FILES "${OpenMW_BINARY_DIR}/launcher.qss" DESTINATION "${DATADIR}/resources" )
+endif(NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)

apps/esmtool/CMakeLists.txt

@@ -17,3 +17,8 @@ target_link_libraries(esmtool
 #    find_library(CARBON_FRAMEWORK Carbon)
 #    target_link_libraries(openmw ${CARBON_FRAMEWORK})
 #endif (APPLE)
+
+if (BUILD_WITH_CODE_COVERAGE)
+  add_definitions (--coverage)
+  target_link_libraries(esmtool gcov)
+endif()

apps/esmtool/esmtool.cpp

@@ -187,7 +187,7 @@ int main(int argc, char**argv)
         case REC_ALCH:
           {
             Potion p;
-            p.load(esm);
+            p.load(esm, id);
             if(quiet) break;
             cout << "  Name: " << p.name << endl;
             break;
@@ -226,7 +226,7 @@ int main(int argc, char**argv)
         case REC_BOOK:
           {
             Book b;
-            b.load(esm);
+            b.load(esm, id);
             if(quiet) break;
             cout << "  Name: " << b.name << endl;
             cout << "  Mesh: " << b.model << endl;

apps/launcher/CMakeLists.txt

@@ -100,3 +100,8 @@ else()
     configure_file(${CMAKE_SOURCE_DIR}/files/launcher.cfg
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.cfg")
 endif()
+
+if (BUILD_WITH_CODE_COVERAGE)
+  add_definitions (--coverage)
+  target_link_libraries(omwlauncher gcov)
+endif()

apps/launcher/datafilespage.cpp

@@ -189,74 +189,8 @@ void DataFilesPage::setupConfig()
 }
 
 
-bool DataFilesPage::setupDataFiles()
+void DataFilesPage::addDataFiles(Files::Collections &fileCollections, const QString &encoding)
 {
-    // We use the Configuration Manager to retrieve the configuration values
-    boost::program_options::variables_map variables;
-    boost::program_options::options_description desc;
-
-    desc.add_options()
-        ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
-//        ("data-local", boost::program_options::value<std::string>()->default_value(""))
-        ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
-        ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
-
-    mCfgMgr.readConfiguration(variables, desc);
-
-    // Put the paths in a boost::filesystem vector to use with Files::Collections
-    mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
-
-//     std::string local = variables["data-local"].as<std::string>();
-//     if (!local.empty()) {
-//         mDataLocal.push_back(Files::PathContainer::value_type(local));
-//         dataDirs.push_back(Files::PathContainer::value_type(local));
-//     }
-
-    if (mDataDirs.size()>1)
-        mDataDirs.resize (1);
-
-    mCfgMgr.processPaths(mDataDirs);
-
-    while (mDataDirs.empty()) {
-        QMessageBox msgBox;
-        msgBox.setWindowTitle("Error detecting Morrowind installation");
-        msgBox.setIcon(QMessageBox::Warning);
-        msgBox.setStandardButtons(QMessageBox::Cancel);
-        msgBox.setText(tr("<br><b>Could not find the Data Files location</b><br><br> \
-                          The directory containing the data files was not found.<br><br> \
-                          Press \"Browse...\" to specify the location manually.<br>"));
-
-        QAbstractButton *dirSelectButton =
-                msgBox.addButton(tr("B&rowse..."), QMessageBox::ActionRole);
-
-        msgBox.exec();
-
-        if (msgBox.clickedButton() == dirSelectButton) {
-
-            // Show a custom dir selection dialog which only accepts valid dirs
-            QString selectedDir = FileDialog::getExistingDirectory(
-                        this, tr("Select Data Files Directory"),
-                        QDir::currentPath(),
-                        QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
-
-            // Add the user selected data directory
-            if (!selectedDir.isEmpty()) {
-                mDataDirs.push_back(Files::PathContainer::value_type(selectedDir.toStdString()));
-                mCfgMgr.processPaths(mDataDirs);
-            } else {
-                // Cancel from within the dir selection dialog
-                return false;
-            }
-
-        } else {
-            // Cancel
-            return false;
-        }
-    }
-
-    // Create a file collection for the data dirs
-    Files::Collections fileCollections(mDataDirs, !variables["fs-strict"].as<bool>());
-
      // First we add all the master files
     const Files::MultiDirCollection &esm = fileCollections.getCollection(".esm");
     unsigned int i = 0; // Row number
@@ -284,7 +218,7 @@ bool DataFilesPage::setupDataFiles()
             ESMReader fileReader;
             QStringList availableMasters; // Will contain all found masters
 
-            fileReader.setEncoding(variables["encoding"].as<std::string>());
+            fileReader.setEncoding(encoding.toStdString());
             fileReader.open(iter->second.string());
 
             // First we fill the availableMasters and the mMastersWidget
@@ -351,10 +285,86 @@ bool DataFilesPage::setupDataFiles()
 
         } catch(std::runtime_error &e) {
             // An error occurred while reading the .esp
+            std::cerr << "Error reading .esp: " << e.what() << std::endl;
             continue;
         }
     }
 
+
+}
+
+
+bool DataFilesPage::setupDataFiles()
+{
+    // We use the Configuration Manager to retrieve the configuration values
+    boost::program_options::variables_map variables;
+    boost::program_options::options_description desc;
+
+    desc.add_options()
+        ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
+        ("data-local", boost::program_options::value<std::string>()->default_value(""))
+        ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
+        ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
+
+    mCfgMgr.readConfiguration(variables, desc);
+
+    // Put the paths in a boost::filesystem vector to use with Files::Collections
+    mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
+
+     std::string local = variables["data-local"].as<std::string>();
+     if (!local.empty()) {
+         mDataLocal.push_back(Files::PathContainer::value_type(local));
+     }
+
+    mCfgMgr.processPaths(mDataDirs);
+    mCfgMgr.processPaths(mDataLocal);
+
+    while (mDataDirs.empty()) {
+        QMessageBox msgBox;
+        msgBox.setWindowTitle("Error detecting Morrowind installation");
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.setStandardButtons(QMessageBox::Cancel);
+        msgBox.setText(tr("<br><b>Could not find the Data Files location</b><br><br> \
+                          The directory containing the data files was not found.<br><br> \
+                          Press \"Browse...\" to specify the location manually.<br>"));
+
+        QAbstractButton *dirSelectButton =
+                msgBox.addButton(tr("B&rowse..."), QMessageBox::ActionRole);
+
+        msgBox.exec();
+
+        if (msgBox.clickedButton() == dirSelectButton) {
+
+            // Show a custom dir selection dialog which only accepts valid dirs
+            QString selectedDir = FileDialog::getExistingDirectory(
+                        this, tr("Select Data Files Directory"),
+                        QDir::currentPath(),
+                        QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+
+            // Add the user selected data directory
+            if (!selectedDir.isEmpty()) {
+                mDataDirs.push_back(Files::PathContainer::value_type(selectedDir.toStdString()));
+                mCfgMgr.processPaths(mDataDirs);
+            } else {
+                // Cancel from within the dir selection dialog
+                return false;
+            }
+
+        } else {
+            // Cancel
+            return false;
+        }
+    }
+
+    // Add the plugins in the data directories
+    Files::Collections dataCollections(mDataDirs, !variables["fs-strict"].as<bool>());
+    Files::Collections dataLocalCollections(mDataLocal, !variables["fs-strict"].as<bool>());
+
+    addDataFiles(dataCollections, QString::fromStdString(variables["encoding"].as<std::string>()));
+    addDataFiles(dataLocalCollections, QString::fromStdString(variables["encoding"].as<std::string>()));
+
+    mDataFilesModel->sort(0);
+
     readConfig();
     return true;
 }
@@ -1140,11 +1150,13 @@ void DataFilesPage::writeConfig(QString profile)
         path = QString::fromStdString(it->string());
         path.remove(QChar('\"'));
 
+        QDir dir(path);
+
         // Make sure the string is quoted when it contains spaces
         if (path.contains(" ")) {
-            gameConfig << "data=\"" << path << "\"" << endl;
+            gameConfig << "data=\"" << dir.absolutePath() << "\"" << endl;
         } else {
-            gameConfig << "data=" << path << endl;
+            gameConfig << "data=" << dir.absolutePath() << endl;
         }
     }
 
@@ -1153,10 +1165,12 @@ void DataFilesPage::writeConfig(QString profile)
         path = QString::fromStdString(mDataLocal.front().string());
         path.remove(QChar('\"'));
 
+        QDir dir(path);
+
         if (path.contains(" ")) {
-            gameConfig << "data-local=\"" << path << "\"" << endl;
+            gameConfig << "data-local=\"" << dir.absolutePath() << "\"" << endl;
         } else {
-            gameConfig << "data-local=" << path << endl;
+            gameConfig << "data-local=" << dir.absolutePath() << endl;
         }
     }
 

apps/launcher/datafilespage.hpp

@@ -89,6 +89,7 @@ private:
     const QStringList checkedPlugins();
     const QStringList selectedMasters();
 
+    void addDataFiles(Files::Collections &fileCollections, const QString &encoding);
     void addPlugins(const QModelIndex &index);
     void removePlugins(const QModelIndex &index);
     void uncheckPlugins();

apps/launcher/graphicspage.cpp

@@ -1,8 +1,12 @@
 #include <QtGui>
 
+#include <cstdlib>
+
 #include <boost/math/common_factor.hpp>
+#include <boost/filesystem.hpp>
 
 #include <components/files/configurationmanager.hpp>
+#include <components/files/ogreplugin.hpp>
 #include <components/settings/settings.hpp>
 
 #include "graphicspage.hpp"
@@ -70,20 +74,13 @@ GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, QWidget *parent)
 
 bool GraphicsPage::setupOgre()
 {
-    QString pluginCfg = mCfgMgr.getPluginsConfigPath().string().c_str();
-    QFile file(pluginCfg);
-
     // Create a log manager so we can surpress debug text to stdout/stderr
     Ogre::LogManager* logMgr = OGRE_NEW Ogre::LogManager;
     logMgr->createLog((mCfgMgr.getLogPath().string() + "/launcherOgre.log"), true, false, false);
 
     try
     {
-#if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9)
         mOgre = new Ogre::Root("", "", "./launcherOgre.log");
-#else
-        mOgre = new Ogre::Root(pluginCfg.toStdString(), "", "./launcherOgre.log");
-#endif
     }
     catch(Ogre::Exception &ex)
     {
@@ -93,7 +90,6 @@ bool GraphicsPage::setupOgre()
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(tr("<br><b>Failed to create the Ogre::Root object</b><br><br> \
-        Make sure the plugins.cfg is present and valid.<br><br> \
         Press \"Show Details...\" for more information.<br>"));
         msgBox.setDetailedText(ogreError);
         msgBox.exec();
@@ -102,6 +98,31 @@ bool GraphicsPage::setupOgre()
         return false;
     }
 
+
+    std::string pluginDir;
+    const char* pluginEnv = getenv("OPENMW_OGRE_PLUGIN_DIR");
+    if (pluginEnv)
+        pluginDir = pluginEnv;
+    else
+    {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        pluginDir = ".\\";
+#endif
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        pluginDir = OGRE_PLUGIN_DIR;
+#endif
+#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+        pluginDir = OGRE_PLUGIN_DIR_REL;
+#endif
+    }
+
+    boost::filesystem::path absPluginPath = boost::filesystem::absolute(boost::filesystem::path(pluginDir));
+
+    pluginDir = absPluginPath.string();
+
+    Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mOgre);
+    Files::loadOgrePlugin(pluginDir, "RenderSystem_Direct3D9", *mOgre);
+
 #ifdef ENABLE_PLUGIN_GL
     mGLPlugin = new Ogre::GLPlugin();
     mOgre->installPlugin(mGLPlugin);
@@ -177,7 +198,7 @@ void GraphicsPage::readConfig()
     QString resolution = QString::number(Settings::Manager::getInt("resolution x", "Video"));
     resolution.append(" x " + QString::number(Settings::Manager::getInt("resolution y", "Video")));
 
-    int resIndex = mResolutionComboBox->findText(resolution);
+    int resIndex = mResolutionComboBox->findText(resolution, Qt::MatchStartsWith);
     if (resIndex != -1)
         mResolutionComboBox->setCurrentIndex(resIndex);
 }
@@ -189,8 +210,8 @@ void GraphicsPage::writeConfig()
     Settings::Manager::setString("antialiasing", "Video", mAntiAliasingComboBox->currentText().toStdString());
     Settings::Manager::setString("render system", "Video", mRendererComboBox->currentText().toStdString());
 
-    // parse resolution x and y from a string like "800 x 600"
+    // Get the current resolution, but with the tabs replaced with a single space
-    QString resolution = mResolutionComboBox->currentText();
+    QString resolution = mResolutionComboBox->currentText().simplified();
     QStringList tokens = resolution.split(" ", QString::SkipEmptyParts);
 
     int resX = tokens.at(0).toInt();
@@ -249,8 +270,9 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer)
 
         Ogre::StringVector::iterator opt_it;
         uint idx = 0;
+
         for (opt_it = i->second.possibleValues.begin ();
-        opt_it != i->second.possibleValues.end (); opt_it++, idx++)
+             opt_it != i->second.possibleValues.end (); opt_it++, idx++)
         {
             QString qval = QString::fromStdString(*opt_it).simplified();
             // remove extra tokens after the resolution (for example bpp, can be there or not depending on rendersystem)
@@ -260,7 +282,7 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer)
 
             // do not add duplicate resolutions
             if (!result.contains(resolutionStr)) {
-                // Add the aspect ratio
+
                 QString aspect = getAspect(tokens.at(0).toInt(),tokens.at(2).toInt());
 
                 if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10")) {
@@ -271,9 +293,8 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer)
                 }
 
                 result << resolutionStr;
-              }
+            }
         }
-
     }
 
     // Sort the resolutions in descending order

apps/mwiniimporter/CMakeLists.txt

@@ -18,3 +18,7 @@ target_link_libraries(mwiniimport
     components
 )
 
+if (BUILD_WITH_CODE_COVERAGE)
+  add_definitions (--coverage)
+  target_link_libraries(mwiniimport gcov)
+endif()

apps/openmw/CMakeLists.txt

@@ -15,42 +15,43 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 
 add_openmw_dir (mwrender
     renderingmanager debugging sky player animation npcanimation creatureanimation actors objects
-    renderinginterface localmap occlusionquery terrain terrainmaterial water shadows shaderhelper
+    renderinginterface localmap occlusionquery terrain terrainmaterial water shadows
-    compositors
+    compositors characterpreview externalrendering globalmap
     )
 
 add_openmw_dir (mwinput
-    inputmanager
+    inputmanagerimp
     )
 
 add_openmw_dir (mwgui
-    text_input widgets race class birth review window_manager console dialogue
+    text_input widgets race class birth review windowmanagerimp console dialogue
     dialogue_history window_base stats_window messagebox journalwindow charactercreation
     map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list
     formatting inventorywindow container hud countdialog tradewindow settingswindow
-    confirmationdialog alchemywindow referenceinterface spellwindow
+    confirmationdialog alchemywindow referenceinterface spellwindow mainmenu quickkeysmenu
+    itemselection spellbuyingwindow loadingscreen levelupdialog waitdialog
     )
 
 add_openmw_dir (mwdialogue
-    dialoguemanager journal journalentry quest topic
+    dialoguemanagerimp journalimp journalentry quest topic
     )
 
 add_openmw_dir (mwscript
-    locals scriptmanager compilercontext interpretercontext cellextensions miscextensions
+    locals scriptmanagerimp compilercontext interpretercontext cellextensions miscextensions
     guiextensions soundextensions skyextensions statsextensions containerextensions
     aiextensions controlextensions extensions globalscripts ref dialogueextensions
-    animationextensions
+    animationextensions transformationextensions consoleextensions userextensions
     )
 
 add_openmw_dir (mwsound
-    soundmanager openal_output audiere_decoder mpgsnd_decoder ffmpeg_decoder
+    soundmanagerimp openal_output audiere_decoder mpgsnd_decoder ffmpeg_decoder
     )
 
 add_openmw_dir (mwworld
-    refdata world physicssystem scene globals class action nullaction actionteleport
+    refdata worldimp physicssystem scene globals class action nullaction actionteleport
     containerstore actiontalk actiontake manualref player cellfunctors
     cells localscripts customdata weather inventorystore ptr actionopen actionread
-    actionequip timestamp actionalchemy
+    actionequip timestamp actionalchemy cellstore actionapply actioneat
     )
 
 add_openmw_dir (mwclass
@@ -59,12 +60,13 @@ add_openmw_dir (mwclass
     )
 
 add_openmw_dir (mwmechanics
-    mechanicsmanager stat creaturestats magiceffects movement actors drawstate spells
+    mechanicsmanagerimp stat creaturestats magiceffects movement actors drawstate spells
-    activespells
+    activespells npcstats aipackage aisequence
     )
 
 add_openmw_dir (mwbase
-    environment
+    environment world scriptmanager dialoguemanager journal soundmanager mechanicsmanager
+    inputmanager windowmanager
     )
 
 # Main executable
@@ -79,7 +81,6 @@ ENDIF(WIN32)
 ENDIF(OGRE_STATIC)
 add_executable(openmw
     ${OPENMW_LIBS} ${OPENMW_LIBS_HEADER}
-    ${COMPONENT_FILES}
     ${OPENMW_FILES}
     ${GAME} ${GAME_HEADER}
     ${APPLE_BUNDLE_RESOURCES}
@@ -101,6 +102,9 @@ target_link_libraries(openmw
     ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${MYGUI_PLATFORM_LIBRARIES}
+    "shiny"
+    "shiny.OgrePlatform"
+    "oics"
     components
 )
 
@@ -111,9 +115,16 @@ endif()
 
 if(APPLE)
     find_library(CARBON_FRAMEWORK Carbon)
-    target_link_libraries(openmw ${CARBON_FRAMEWORK})
+    find_library(COCOA_FRAMEWORK Cocoa)
+    find_library(IOKIT_FRAMEWORK IOKit)
+    target_link_libraries(openmw ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
 endif(APPLE)
 
 if(DPKG_PROGRAM)
     INSTALL(TARGETS openmw RUNTIME DESTINATION games COMPONENT openmw)
 endif(DPKG_PROGRAM)
+
+if (BUILD_WITH_CODE_COVERAGE)
+  add_definitions (--coverage)
+  target_link_libraries(openmw gcov)
+endif()

apps/openmw/engine.cpp

@@ -1,56 +1,38 @@
 #include "engine.hpp"
 #include "components/esm/loadcell.hpp"
 
-#include <cassert>
-
-#include <iostream>
-#include <utility>
-
 #include <OgreRoot.h>
 #include <OgreRenderWindow.h>
 
 #include <MyGUI_WidgetManager.h>
 
-#include <openengine/ogre/renderer.hpp>
-#include <openengine/gui/manager.hpp>
-
-#include <components/esm/records.hpp>
-#include <components/esm_store/cell_store.hpp>
 #include <components/bsa/bsa_archive.hpp>
-#include <components/esm/esm_reader.hpp>
-#include <components/files/fixedpath.hpp>
 #include <components/files/configurationmanager.hpp>
-#include <components/settings/settings.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
 #include <components/nifbullet/bullet_nif_loader.hpp>
 #include <components/nifogre/ogre_nif_loader.hpp>
 
-#include "mwinput/inputmanager.hpp"
+#include "mwinput/inputmanagerimp.hpp"
 
-#include "mwgui/window_manager.hpp"
+#include "mwgui/windowmanagerimp.hpp"
 #include "mwgui/cursorreplace.hpp"
 
-#include "mwscript/scriptmanager.hpp"
+#include "mwscript/scriptmanagerimp.hpp"
-#include "mwscript/compilercontext.hpp"
-#include "mwscript/interpretercontext.hpp"
 #include "mwscript/extensions.hpp"
-#include "mwscript/globalscripts.hpp"
 
-#include "mwsound/soundmanager.hpp"
+#include "mwsound/soundmanagerimp.hpp"
 
-#include "mwworld/world.hpp"
 #include "mwworld/class.hpp"
 #include "mwworld/player.hpp"
+#include "mwworld/worldimp.hpp"
 
 #include "mwclass/classes.hpp"
 
-#include "mwdialogue/dialoguemanager.hpp"
+#include "mwdialogue/dialoguemanagerimp.hpp"
-#include "mwdialogue/journal.hpp"
+#include "mwdialogue/journalimp.hpp"
 
-#include "mwmechanics/mechanicsmanager.hpp"
+#include "mwmechanics/mechanicsmanagerimp.hpp"
-
-#include "mwbase/environment.hpp"
 
 
 void OMW::Engine::executeLocalScripts()
@@ -74,11 +56,8 @@ void OMW::Engine::executeLocalScripts()
     localScripts.setIgnore (MWWorld::Ptr());
 }
 
-void OMW::Engine::setAnimationVerbose(bool animverbose){
+void OMW::Engine::setAnimationVerbose(bool animverbose)
-    if(animverbose){
+{
-        NifOgre::NIFLoader::getSingletonPtr()->setOutputAnimFiles(true);
-        NifOgre::NIFLoader::getSingletonPtr()->setVerbosePath(mCfgMgr.getLogPath().string());
-    }
 }
 
 bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
@@ -88,7 +67,7 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         mEnvironment.setFrameDuration (evt.timeSinceLastFrame);
 
         // update input
-        MWBase::Environment::get().getInputManager()->update();
+        MWBase::Environment::get().getInputManager()->update(evt.timeSinceLastFrame, false);
 
         // sound
         if (mUseSound)
@@ -150,6 +129,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
   , mCompileAll (false)
   , mScriptContext (0)
   , mFSStrict (false)
+  , mScriptConsoleMode (false)
   , mCfgMgr(configurationManager)
 {
     std::srand ( std::time(NULL) );
@@ -182,6 +162,10 @@ void OMW::Engine::loadBSA()
         dataDirectory = iter->string();
         std::cout << "Data dir " << dataDirectory << std::endl;
         Bsa::addDir(dataDirectory, mFSStrict);
+
+        // Workaround: Mygui does not find textures in non-BSA subfolders, _unless_ they are explicitely added like this
+        // For splash screens, this is OK to do, but eventually we will need an investigation why this is necessary
+        Bsa::addDir(dataDirectory + "/Splash", mFSStrict);
     }
 }
 
@@ -290,6 +274,10 @@ void OMW::Engine::go()
     else if (boost::filesystem::exists(globaldefault))
         settings.loadUser(globaldefault);
 
+    // Get the path for the keybinder xml file
+    std::string keybinderUser = (mCfgMgr.getUserPath() / "input.xml").string();
+    bool keybinderUserExists = boost::filesystem::exists(keybinderUser);
+
     mFpsLevel = settings.getInt("fps", "HUD");
 
     // load nif overrides
@@ -310,8 +298,8 @@ void OMW::Engine::go()
     }
     mOgre->configure(
         mCfgMgr.getLogPath().string(),
-        mCfgMgr.getPluginsConfigPath().string(),
         renderSystem,
+        Settings::Manager::getString("opengl rtt mode", "Video"),
         false);
 
     // This has to be added BEFORE MyGUI is initialized, as it needs
@@ -319,6 +307,8 @@ void OMW::Engine::go()
 
     //addResourcesDirectory(mResDir);
 
+    addResourcesDirectory(mCfgMgr.getCachePath ().string());
+
     addResourcesDirectory(mResDir / "mygui");
     addResourcesDirectory(mResDir / "water");
     addResourcesDirectory(mResDir / "gbuffer");
@@ -342,13 +332,14 @@ void OMW::Engine::go()
 
     // Create the world
     mEnvironment.setWorld (new MWWorld::World (*mOgre, mFileCollections, mMaster,
-        mResDir, mNewGame, mEncoding, mFallbackMap));
+        mResDir, mCfgMgr.getCachePath(), mNewGame, mEncoding, mFallbackMap));
 
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);
 
     mEnvironment.setWindowManager (new MWGui::WindowManager(
-        mExtensions, mFpsLevel, mNewGame, mOgre, mCfgMgr.getLogPath().string() + std::string("/")));
+        mExtensions, mFpsLevel, mNewGame, mOgre, mCfgMgr.getLogPath().string() + std::string("/"),
+        mCfgMgr.getCachePath ().string(), mScriptConsoleMode));
 
     // Create sound system
     mEnvironment.setSoundManager (new MWSound::SoundManager(mUseSound));
@@ -367,11 +358,18 @@ void OMW::Engine::go()
     mEnvironment.setJournal (new MWDialogue::Journal);
     mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions));
 
+    // Sets up the input system
+    mEnvironment.setInputManager (new MWInput::InputManager (*mOgre,
+        MWBase::Environment::get().getWorld()->getPlayer(),
+         *MWBase::Environment::get().getWindowManager(), mDebug, *this, keybinderUser, keybinderUserExists));
+
     // load cell
     ESM::Position pos;
     pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
     pos.pos[2] = 0;
 
+    mEnvironment.getWorld()->renderPlayer();
+
     if (const ESM::Cell *exterior = MWBase::Environment::get().getWorld()->getExterior (mCellName))
     {
         MWBase::Environment::get().getWorld()->indexToPosition (exterior->data.gridX, exterior->data.gridY,
@@ -384,12 +382,6 @@ void OMW::Engine::go()
         MWBase::Environment::get().getWorld()->changeToInteriorCell (mCellName, pos);
     }
 
-    // Sets up the input system
-
-    mEnvironment.setInputManager (new MWInput::MWInputManager (*mOgre,
-        MWBase::Environment::get().getWorld()->getPlayer(),
-        *MWBase::Environment::get().getWindowManager(), mDebug, *this));
-
     std::cout << "\nPress Q/ESC or close window to exit.\n";
 
     mOgre->getRoot()->addFrameListener (this);
@@ -410,6 +402,9 @@ void OMW::Engine::go()
                 << std::endl;
     }
 
+    if (!mStartupScript.empty())
+        MWBase::Environment::get().getWindowManager()->executeInConsole (mStartupScript);
+
     // Start the main rendering loop
     mOgre->start();
 
@@ -512,3 +507,13 @@ void OMW::Engine::setFallbackValues(std::map<std::string,std::string> fallbackMa
 {
     mFallbackMap = fallbackMap;
 }
+
+void OMW::Engine::setScriptConsoleMode (bool enabled)
+{
+    mScriptConsoleMode = enabled;
+}
+
+void OMW::Engine::setStartupScript (const std::string& path)
+{
+    mStartupScript = path;
+}

apps/openmw/engine.hpp

@@ -1,10 +1,6 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include <string>
-
-#include <boost/filesystem.hpp>
-
 #include <OgreFrameListener.h>
 
 #include <components/compiler/extensions.hpp>
@@ -77,6 +73,8 @@ namespace OMW
             bool mCompileAll;
             std::string mFocusName;
             std::map<std::string,std::string> mFallbackMap;
+            bool mScriptConsoleMode;
+            std::string mStartupScript;
 
             Compiler::Extensions mExtensions;
             Compiler::Context *mScriptContext;
@@ -162,6 +160,12 @@ namespace OMW
 
             void setFallbackValues(std::map<std::string,std::string> map);
 
+            /// Enable console-only script functionality
+            void setScriptConsoleMode (bool enabled);
+
+            /// Set path for a script that is run on startup in the console.
+            void setStartupScript (const std::string& path);
+
         private:
             Files::ConfigurationManager& mCfgMgr;
     };

apps/openmw/main.cpp

@@ -1,13 +1,5 @@
 #include <iostream>
 
-#include <string>
-#include <fstream>
-
-#include <boost/program_options.hpp>
-
-#include <components/files/fileops.hpp>
-#include <components/files/fixedpath.hpp>
-#include <components/files/collections.hpp>
 #include <components/files/configurationmanager.hpp>
 
 #include "engine.hpp"
@@ -16,15 +8,10 @@
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream_buffer.hpp>
 
-#  if !defined(_DEBUG)
-#  include <iostream>
-#  include <fstream>
-#  endif
-
 // For OutputDebugString
 #include <Windows.h>
 // makes __argc and __argv available on windows
-#include <stdlib.h>
+#include <cstdlib>
 
 #endif
 
@@ -52,8 +39,6 @@ inline boost::filesystem::path lexical_cast<boost::filesystem::path, std::string
 } /* namespace boost */
 #endif /* (BOOST_VERSION <= 104600) */
 
-using namespace std;
-
 struct FallbackMap {
     std::map<std::string,std::string> mMap;
 };
@@ -139,12 +124,20 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("script-verbose", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "verbose script output")
 
-        ("new-game", bpo::value<bool>()->implicit_value(true)
-            ->default_value(false), "activate char gen/new game mechanics")
-
         ("script-all", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup")
 
+        ("script-console", bpo::value<bool>()->implicit_value(true)
+            ->default_value(false), "enable console-only script functionality")
+
+        ("script-run", bpo::value<std::string>()->default_value(""),
+            "select a file that is executed in the console on startup\n\n"
+            "Note: The file contains a list of script lines, but not a complete scripts. "
+            "That means no begin/end and no variable declarations.")
+
+        ("new-game", bpo::value<bool>()->implicit_value(true)
+            ->default_value(false), "activate char gen/new game mechanics")
+
         ("fs-strict", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "strict file system handling (no case folding)")
 
@@ -214,15 +207,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     std::string local(variables["data-local"].as<std::string>());
     if (!local.empty())
     {
-        std::cout << "Ignoring data-local (currently not supported)" << std::endl;
+        dataDirs.push_back(Files::PathContainer::value_type(local));
-//        dataDirs.push_back(Files::PathContainer::value_type(local));
-    }
-
-    if (dataDirs.size()>1)
-    {
-        dataDirs.resize (1);
-        std::cout << "Ignoring all but the first data path (multiple data paths currently not supported)"
-            << std::endl;
     }
 
     cfgMgr.processPaths(dataDirs);
@@ -264,6 +249,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setCompileAll(variables["script-all"].as<bool>());
     engine.setAnimationVerbose(variables["anim-verbose"].as<bool>());
     engine.setFallbackValues(variables["fallback"].as<FallbackMap>().mMap);
+    engine.setScriptConsoleMode (variables["script-console"].as<bool>());
+    engine.setStartupScript (variables["script-run"].as<std::string>());
 
     return true;
 }

apps/openmw/mwbase/dialoguemanager.hpp

@@ -0,0 +1,46 @@
+#ifndef GAME_MWBASE_DIALOGUEMANAGER_H
+#define GAME_MWBASE_DIALOGUEMANAGER_H
+
+#include <string>
+
+namespace MWWorld
+{
+    class Ptr;
+}
+
+namespace MWBase
+{
+    /// \brief Interface for dialogue manager (implemented in MWDialogue)
+    class DialogueManager
+    {
+            DialogueManager (const DialogueManager&);
+            ///< not implemented
+
+            DialogueManager& operator= (const DialogueManager&);
+            ///< not implemented
+
+        public:
+
+            DialogueManager() {}
+
+            virtual ~DialogueManager() {}
+
+            virtual void startDialogue (const MWWorld::Ptr& actor) = 0;
+
+            virtual void addTopic (const std::string& topic) = 0;
+
+            virtual void askQuestion (const std::string& question,int choice) = 0;
+
+            virtual void goodbye() = 0;
+
+            ///get the faction of the actor you are talking with
+            virtual std::string getFaction() const = 0;
+
+            //calbacks for the GUI
+            virtual void keywordSelected (const std::string& keyword) = 0;
+            virtual void goodbyeSelected() = 0;
+            virtual void questionAnswered (const std::string& answer) = 0;
+    };
+}
+
+#endif

apps/openmw/mwbase/environment.cpp

@@ -3,18 +3,14 @@
 
 #include <cassert>
 
-#include "../mwinput/inputmanager.hpp"
+#include "world.hpp"
-
+#include "scriptmanager.hpp"
-#include "../mwscript/scriptmanager.hpp"
+#include "dialoguemanager.hpp"
-
+#include "journal.hpp"
-#include "../mwsound/soundmanager.hpp"
+#include "soundmanager.hpp"
-
+#include "mechanicsmanager.hpp"
-#include "../mwworld/world.hpp"
+#include "inputmanager.hpp"
-
+#include "windowmanager.hpp"
-#include "../mwdialogue/dialoguemanager.hpp"
-#include "../mwdialogue/journal.hpp"
-
-#include "../mwmechanics/mechanicsmanager.hpp"
 
 MWBase::Environment *MWBase::Environment::sThis = 0;
 
@@ -32,42 +28,42 @@ MWBase::Environment::~Environment()
     sThis = 0;
 }
 
-void MWBase::Environment::setWorld (MWWorld::World *world)
+void MWBase::Environment::setWorld (World *world)
 {
     mWorld = world;
 }
 
-void MWBase::Environment::setSoundManager (MWSound::SoundManager *soundManager)
+void MWBase::Environment::setSoundManager (SoundManager *soundManager)
 {
     mSoundManager = soundManager;
 }
 
-void MWBase::Environment::setScriptManager (MWScript::ScriptManager *scriptManager)
+void MWBase::Environment::setScriptManager (ScriptManager *scriptManager)
 {
     mScriptManager = scriptManager;
 }
 
-void MWBase::Environment::setWindowManager (MWGui::WindowManager *windowManager)
+void MWBase::Environment::setWindowManager (WindowManager *windowManager)
 {
     mWindowManager = windowManager;
 }
 
-void MWBase::Environment::setMechanicsManager (MWMechanics::MechanicsManager *mechanicsManager)
+void MWBase::Environment::setMechanicsManager (MechanicsManager *mechanicsManager)
 {
     mMechanicsManager = mechanicsManager;
 }
 
-void MWBase::Environment::setDialogueManager (MWDialogue::DialogueManager *dialogueManager)
+void MWBase::Environment::setDialogueManager (DialogueManager *dialogueManager)
 {
     mDialogueManager = dialogueManager;
 }
 
-void MWBase::Environment::setJournal (MWDialogue::Journal *journal)
+void MWBase::Environment::setJournal (Journal *journal)
 {
     mJournal = journal;
 }
 
-void MWBase::Environment::setInputManager (MWInput::MWInputManager *inputManager)
+void MWBase::Environment::setInputManager (InputManager *inputManager)
 {
     mInputManager = inputManager;
 }
@@ -77,49 +73,49 @@ void MWBase::Environment::setFrameDuration (float duration)
     mFrameDuration = duration;
 }
 
-MWWorld::World *MWBase::Environment::getWorld() const
+MWBase::World *MWBase::Environment::getWorld() const
 {
     assert (mWorld);
     return mWorld;
 }
 
-MWSound::SoundManager *MWBase::Environment::getSoundManager() const
+MWBase::SoundManager *MWBase::Environment::getSoundManager() const
 {
     assert (mSoundManager);
     return mSoundManager;
 }
 
-MWScript::ScriptManager *MWBase::Environment::getScriptManager() const
+MWBase::ScriptManager *MWBase::Environment::getScriptManager() const
 {
     assert (mScriptManager);
     return mScriptManager;
 }
 
-MWGui::WindowManager *MWBase::Environment::getWindowManager() const
+MWBase::WindowManager *MWBase::Environment::getWindowManager() const
 {
     assert (mWindowManager);
     return mWindowManager;
 }
 
-MWMechanics::MechanicsManager *MWBase::Environment::getMechanicsManager() const
+MWBase::MechanicsManager *MWBase::Environment::getMechanicsManager() const
 {
     assert (mMechanicsManager);
     return mMechanicsManager;
 }
 
-MWDialogue::DialogueManager *MWBase::Environment::getDialogueManager() const
+MWBase::DialogueManager *MWBase::Environment::getDialogueManager() const
 {
     assert (mDialogueManager);
     return mDialogueManager;
 }
 
-MWDialogue::Journal *MWBase::Environment::getJournal() const
+MWBase::Journal *MWBase::Environment::getJournal() const
 {
     assert (mJournal);
     return mJournal;
 }
 
-MWInput::MWInputManager *MWBase::Environment::getInputManager() const
+MWBase::InputManager *MWBase::Environment::getInputManager() const
 {
     assert (mInputManager);
     return mInputManager;
@@ -150,6 +146,9 @@ void MWBase::Environment::cleanup()
     delete mScriptManager;
     mScriptManager = 0;
 
+    delete mWindowManager;
+    mWindowManager = 0;
+
     delete mWorld;
     mWorld = 0;
 }

apps/openmw/mwbase/environment.hpp

@@ -1,44 +1,17 @@
 #ifndef GAME_BASE_INVIRONMENT_H
 #define GAME_BASE_INVIRONMENT_H
 
-namespace MWSound
-{
-    class SoundManager;
-}
-
-namespace MWScript
-{
-    class ScriptManager;
-}
-
-namespace MWGui
-{
-    class WindowManager;
-}
-
-namespace MWMechanics
-{
-    class MechanicsManager;
-}
-
-namespace MWDialogue
-{
-    class DialogueManager;
-    class Journal;
-}
-
-namespace MWInput
-{
-    struct MWInputManager;
-}
-
-namespace MWWorld
-{
-    class World;
-}
-
 namespace MWBase
 {
+    class World;
+    class ScriptManager;
+    class DialogueManager;
+    class Journal;
+    class SoundManager;
+    class MechanicsManager;
+    class InputManager;
+    class WindowManager;
+
     /// \brief Central hub for mw-subsystems
     ///
     /// This class allows each mw-subsystem to access any others subsystem's top-level manager class.
@@ -49,14 +22,14 @@ namespace MWBase
     {
             static Environment *sThis;
 
-            MWWorld::World *mWorld;
+            World *mWorld;
-            MWSound::SoundManager *mSoundManager;
+            SoundManager *mSoundManager;
-            MWScript::ScriptManager *mScriptManager;
+            ScriptManager *mScriptManager;
-            MWGui::WindowManager *mWindowManager;
+            WindowManager *mWindowManager;
-            MWMechanics::MechanicsManager *mMechanicsManager;
+            MechanicsManager *mMechanicsManager;
-            MWDialogue::DialogueManager *mDialogueManager;
+            DialogueManager *mDialogueManager;
-            MWDialogue::Journal *mJournal;
+            Journal *mJournal;
-            MWInput::MWInputManager *mInputManager;
+            InputManager *mInputManager;
             float mFrameDuration;
 
             Environment (const Environment&);
@@ -71,40 +44,40 @@ namespace MWBase
 
             ~Environment();
 
-            void setWorld (MWWorld::World *world);
+            void setWorld (World *world);
 
-            void setSoundManager (MWSound::SoundManager *soundManager);
+            void setSoundManager (SoundManager *soundManager);
 
-            void setScriptManager (MWScript::ScriptManager *scriptManager);
+            void setScriptManager (MWBase::ScriptManager *scriptManager);
 
-            void setWindowManager (MWGui::WindowManager *windowManager);
+            void setWindowManager (WindowManager *windowManager);
 
-            void setMechanicsManager (MWMechanics::MechanicsManager *mechanicsManager);
+            void setMechanicsManager (MechanicsManager *mechanicsManager);
 
-            void setDialogueManager (MWDialogue::DialogueManager *dialogueManager);
+            void setDialogueManager (DialogueManager *dialogueManager);
 
-            void setJournal (MWDialogue::Journal *journal);
+            void setJournal (Journal *journal);
 
-            void setInputManager (MWInput::MWInputManager *inputManager);
+            void setInputManager (InputManager *inputManager);
 
             void setFrameDuration (float duration);
             ///< Set length of current frame in seconds.
 
-            MWWorld::World *getWorld() const;
+            World *getWorld() const;
 
-            MWSound::SoundManager *getSoundManager() const;
+            SoundManager *getSoundManager() const;
 
-            MWScript::ScriptManager *getScriptManager() const;
+            ScriptManager *getScriptManager() const;
 
-            MWGui::WindowManager *getWindowManager() const;
+            WindowManager *getWindowManager() const;
 
-            MWMechanics::MechanicsManager *getMechanicsManager() const;
+            MechanicsManager *getMechanicsManager() const;
 
-            MWDialogue::DialogueManager *getDialogueManager() const;
+            DialogueManager *getDialogueManager() const;
 
-            MWDialogue::Journal *getJournal() const;
+            Journal *getJournal() const;
 
-            MWInput::MWInputManager *getInputManager() const;
+            InputManager *getInputManager() const;
 
             float getFrameDuration() const;
 

apps/openmw/mwbase/inputmanager.hpp

@@ -0,0 +1,45 @@
+#ifndef GAME_MWBASE_INPUTMANAGER_H
+#define GAME_MWBASE_INPUTMANAGER_H
+
+#include <string>
+
+#include <components/settings/settings.hpp>
+
+namespace MWBase
+{
+    /// \brief Interface for input manager (implemented in MWInput)
+    class InputManager
+    {
+            InputManager (const InputManager&);
+            ///< not implemented
+
+            InputManager& operator= (const InputManager&);
+            ///< not implemented
+
+        public:
+
+            InputManager() {}
+
+            virtual ~InputManager() {}
+
+            virtual void update(float dt, bool loading) = 0;
+
+            virtual void changeInputMode(bool guiMode) = 0;
+
+            virtual void processChangedSettings(const Settings::CategorySettingVector& changed) = 0;
+
+            virtual void setDragDrop(bool dragDrop) = 0;
+
+            virtual void toggleControlSwitch (const std::string& sw, bool value) = 0;
+            virtual bool getControlSwitch (const std::string& sw) = 0;
+
+            virtual std::string getActionDescription (int action) = 0;
+            virtual std::string getActionBindingName (int action) = 0;
+            virtual std::vector<int> getActionSorting () = 0;
+            virtual int getNumActions() = 0;
+            virtual void enableDetectingBindingMode (int action) = 0;
+            virtual void resetToDefaultBindings() = 0;
+    };
+}
+
+#endif

apps/openmw/mwbase/journal.hpp

@@ -0,0 +1,73 @@
+#ifndef GAME_MWBASE_JOURNAL_H
+#define GAME_MWBASE_JOURNAL_H
+
+#include <string>
+#include <deque>
+#include <map>
+
+#include "../mwdialogue/journalentry.hpp"
+#include "../mwdialogue/topic.hpp"
+#include "../mwdialogue/quest.hpp"
+
+namespace MWBase
+{
+    /// \brief Interface for the player's journal (implemented in MWDialogue)
+    class Journal
+    {
+            Journal (const Journal&);
+            ///< not implemented
+
+            Journal& operator= (const Journal&);
+            ///< not implemented
+
+        public:
+
+            typedef std::deque<MWDialogue::StampedJournalEntry> TEntryContainer;
+            typedef TEntryContainer::const_iterator TEntryIter;
+            typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topc, quest
+            typedef TQuestContainer::const_iterator TQuestIter;
+            typedef std::map<std::string, MWDialogue::Topic> TTopicContainer; // topic-id, topic-content
+            typedef TTopicContainer::const_iterator TTopicIter;
+
+        public:
+
+            Journal() {}
+
+            virtual ~Journal() {}
+
+            virtual void addEntry (const std::string& id, int index) = 0;
+            ///< Add a journal entry.
+
+            virtual void setJournalIndex (const std::string& id, int index) = 0;
+            ///< Set the journal index without adding an entry.
+
+            virtual int getJournalIndex (const std::string& id) const = 0;
+            ///< Get the journal index.
+
+            virtual void addTopic (const std::string& topicId, const std::string& infoId) = 0;
+
+            virtual TEntryIter begin() const = 0;
+            ///< Iterator pointing to the begin of the main journal.
+            ///
+            /// \note Iterators to main journal entries will never become invalid.
+
+            virtual TEntryIter end() const = 0;
+            ///< Iterator pointing past the end of the main journal.
+
+            virtual TQuestIter questBegin() const = 0;
+            ///< Iterator pointing to the first quest (sorted by topic ID)
+
+            virtual TQuestIter questEnd() const = 0;
+            ///< Iterator pointing past the last quest.
+
+            virtual TTopicIter topicBegin() const = 0;
+            ///< Iterator pointing to the first topic (sorted by topic ID)
+            ///
+            /// \note The topic ID is identical with the user-visible topic string.
+
+            virtual TTopicIter topicEnd() const = 0;
+            ///< Iterator pointing past the last topic.
+    };
+}
+
+#endif

apps/openmw/mwbase/mechanicsmanager.hpp

@@ -0,0 +1,80 @@
+#ifndef GAME_MWBASE_MECHANICSMANAGER_H
+#define GAME_MWBASE_MECHANICSMANAGER_H
+
+#include <string>
+#include <vector>
+
+namespace Ogre
+{
+    class Vector3;
+}
+
+namespace ESM
+{
+    struct Class;
+}
+
+namespace MWWorld
+{
+    class Ptr;
+    class CellStore;
+}
+
+namespace MWBase
+{
+    /// \brief Interface for game mechanics manager (implemented in MWMechanics)
+    class MechanicsManager
+    {
+            MechanicsManager (const MechanicsManager&);
+            ///< not implemented
+
+            MechanicsManager& operator= (const MechanicsManager&);
+            ///< not implemented
+
+        public:
+
+            MechanicsManager() {}
+
+            virtual ~MechanicsManager() {}
+
+            virtual void addActor (const MWWorld::Ptr& ptr) = 0;
+            ///< Register an actor for stats management
+
+            virtual void removeActor (const MWWorld::Ptr& ptr) = 0;
+            ///< Deregister an actor for stats management
+
+            virtual void dropActors (const MWWorld::CellStore *cellStore) = 0;
+            ///< Deregister all actors in the given cell.
+
+            virtual void watchActor (const MWWorld::Ptr& ptr) = 0;
+            ///< On each update look for changes in a previously registered actor and update the
+            /// GUI accordingly.
+
+            virtual void update (std::vector<std::pair<std::string, Ogre::Vector3> >& movement,
+                float duration, bool paused) = 0;
+            ///< Update actor stats and store desired velocity vectors in \a movement
+            ///
+            /// \param paused In game type does not currently advance (this usually means some GUI
+            /// component is up).
+
+            virtual void setPlayerName (const std::string& name) = 0;
+            ///< Set player name.
+
+            virtual void setPlayerRace (const std::string& id, bool male) = 0;
+            ///< Set player race.
+
+            virtual void setPlayerBirthsign (const std::string& id) = 0;
+            ///< Set player birthsign.
+
+            virtual void setPlayerClass (const std::string& id) = 0;
+            ///< Set player class to stock class.
+
+            virtual void setPlayerClass (const ESM::Class& class_) = 0;
+            ///< Set player class to custom class.
+
+            virtual void restoreDynamicStats() = 0;
+            ///< If the player is sleeping, this should be called every hour.
+    };
+}
+
+#endif

apps/openmw/mwbase/scriptmanager.hpp

@@ -0,0 +1,62 @@
+#ifndef GAME_MWBASE_SCRIPTMANAGER_H
+#define GAME_MWBASE_SCRIPTMANAGER_H
+
+#include <string>
+
+namespace Interpreter
+{
+    class Context;
+}
+
+namespace Compiler
+{
+    class Locals;
+}
+
+namespace MWScript
+{
+    class GlobalScripts;
+}
+
+namespace MWBase
+{
+    /// \brief Interface for script manager (implemented in MWScript)
+    class ScriptManager
+    {
+            ScriptManager (const ScriptManager&);
+            ///< not implemented
+
+            ScriptManager& operator= (const ScriptManager&);
+            ///< not implemented
+
+        public:
+
+            ScriptManager() {}
+
+            virtual ~ScriptManager() {}
+
+            virtual void run (const std::string& name, Interpreter::Context& interpreterContext) = 0;
+            ///< Run the script with the given name (compile first, if not compiled yet)
+
+            virtual bool compile (const std::string& name) = 0;
+            ///< Compile script with the given namen
+            /// \return Success?
+
+            virtual std::pair<int, int> compileAll() = 0;
+            ///< Compile all scripts
+            /// \return count, success
+
+            virtual Compiler::Locals& getLocals (const std::string& name) = 0;
+            ///< Return locals for script \a name.
+
+            virtual MWScript::GlobalScripts& getGlobalScripts() = 0;
+
+            virtual int getLocalIndex (const std::string& scriptId, const std::string& variable,
+                char type) = 0;
+            ///< Return index of the variable of the given name and type in the given script. Will
+            /// throw an exception, if there is no such script or variable or the type does not match.
+
+    };
+}
+
+#endif

apps/openmw/mwbase/soundmanager.hpp

@@ -0,0 +1,126 @@
+#ifndef GAME_MWBASE_SOUNDMANAGER_H
+#define GAME_MWBASE_SOUNDMANAGER_H
+
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+
+#include <components/settings/settings.hpp>
+
+#include "../mwworld/ptr.hpp"
+
+namespace Ogre
+{
+    class Vector3;
+}
+
+namespace MWWorld
+{
+    class CellStore;
+}
+
+namespace MWSound
+{
+    class Sound;
+}
+
+namespace MWBase
+{
+    typedef boost::shared_ptr<MWSound::Sound> SoundPtr;
+
+    /// \brief Interface for sound manager (implemented in MWSound)
+    class SoundManager
+    {
+        public:
+
+            enum PlayMode {
+                Play_Normal  = 0, /* tracked, non-looping, multi-instance, environment */
+                Play_Loop    = 1<<0, /* Sound will continually loop until explicitly stopped */
+                Play_NoEnv   = 1<<1, /* Do not apply environment effects (eg, underwater filters) */
+                Play_NoTrack = 1<<2, /* (3D only) Play the sound at the given object's position
+                                      * but do not keep it updated (the sound will not move with
+                                      * the object and will not stop when the object is deleted. */
+            };
+
+        private:
+
+            SoundManager (const SoundManager&);
+            ///< not implemented
+
+            SoundManager& operator= (const SoundManager&);
+            ///< not implemented
+
+        public:
+
+            SoundManager() {}
+
+            virtual ~SoundManager() {}
+
+            virtual void processChangedSettings(const Settings::CategorySettingVector& settings) = 0;
+
+            virtual void stopMusic() = 0;
+            ///< Stops music if it's playing
+
+            virtual void streamMusic(const std::string& filename) = 0;
+            ///< Play a soundifle
+            /// \param filename name of a sound file in "Music/" in the data directory.
+
+            virtual void startRandomTitle() = 0;
+            ///< Starts a random track from the current playlist
+
+            virtual bool isMusicPlaying() = 0;
+            ///< Returns true if music is playing
+
+            virtual void playPlaylist(const std::string &playlist) = 0;
+            ///< Start playing music from the selected folder
+            /// \param name of the folder that contains the playlist
+
+            virtual void say(MWWorld::Ptr reference, const std::string& filename) = 0;
+            ///< Make an actor say some text.
+            /// \param filename name of a sound file in "Sound/" in the data directory.
+
+            virtual void say(const std::string& filename) = 0;
+            ///< Say some text, without an actor ref
+            /// \param filename name of a sound file in "Sound/" in the data directory.
+
+            virtual bool sayDone(MWWorld::Ptr reference=MWWorld::Ptr()) const = 0;
+            ///< Is actor not speaking?
+
+            virtual void stopSay(MWWorld::Ptr reference=MWWorld::Ptr()) = 0;
+            ///< Stop an actor speaking
+
+            virtual SoundPtr playSound(const std::string& soundId, float volume, float pitch,
+                int mode=Play_Normal) = 0;
+            ///< Play a sound, independently of 3D-position
+
+            virtual SoundPtr playSound3D(MWWorld::Ptr reference, const std::string& soundId,
+                                 float volume, float pitch, int mode=Play_Normal) = 0;
+            ///< Play a sound from an object
+
+            virtual void stopSound3D(MWWorld::Ptr reference, const std::string& soundId) = 0;
+            ///< Stop the given object from playing the given sound,
+
+            virtual void stopSound3D(MWWorld::Ptr reference) = 0;
+            ///< Stop the given object from playing all sounds.
+
+            virtual void stopSound(const MWWorld::CellStore *cell) = 0;
+            ///< Stop all sounds for the given cell.
+
+            virtual void stopSound(const std::string& soundId) = 0;
+            ///< Stop a non-3d looping sound
+
+            virtual bool getSoundPlaying(MWWorld::Ptr reference, const std::string& soundId) const = 0;
+            ///< Is the given sound currently playing on the given object?
+
+            virtual void update(float duration) = 0;
+
+            virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir) = 0;
+    };
+
+    inline int operator|(SoundManager::PlayMode a, SoundManager::PlayMode b)
+    { return static_cast<int> (a) | static_cast<int> (b); }
+    inline int operator&(SoundManager::PlayMode a, SoundManager::PlayMode b)
+    { return static_cast<int> (a) & static_cast<int> (b); }
+}
+
+#endif

apps/openmw/mwbase/windowmanager.hpp

@@ -0,0 +1,233 @@
+#ifndef GAME_MWBASE_WINDOWMANAGER_H
+#define GAME_MWBASE_WINDOWMANAGER_H
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include <components/settings/settings.hpp>
+
+#include "../mwmechanics/stat.hpp"
+
+#include "../mwgui/mode.hpp"
+
+namespace MyGUI
+{
+    class Gui;
+    class Widget;
+    class UString;
+}
+
+namespace OEngine
+{
+    namespace GUI
+    {
+        class Layout;
+    }
+}
+
+namespace ESM
+{
+    struct Class;
+}
+
+namespace MWWorld
+{
+    class CellStore;
+    class Ptr;
+}
+
+namespace MWGui
+{
+    class Console;
+    class SpellWindow;
+    class TradeWindow;
+    class SpellBuyingWindow;
+    class ConfirmationDialog;
+    class CountDialog;
+    class ScrollWindow;
+    class BookWindow;
+    class InventoryWindow;
+    class ContainerWindow;
+    class DialogueWindow;
+}
+
+namespace MWBase
+{
+    /// \brief Interface for widnow manager (implemented in MWGui)
+    class WindowManager
+    {
+            WindowManager (const WindowManager&);
+            ///< not implemented
+
+            WindowManager& operator= (const WindowManager&);
+            ///< not implemented
+
+        public:
+
+            typedef std::vector<int> SkillList;
+
+            WindowManager() {}
+
+            virtual ~WindowManager() {}
+
+            /**
+             * Should be called each frame to update windows/gui elements.
+             * This could mean updating sizes of gui elements or opening
+             * new dialogs.
+             */
+            virtual void update() = 0;
+
+            virtual void pushGuiMode (MWGui::GuiMode mode) = 0;
+            virtual void popGuiMode() = 0;
+
+            virtual void removeGuiMode (MWGui::GuiMode mode) = 0;
+            ///< can be anywhere in the stack
+
+            virtual MWGui::GuiMode getMode() const = 0;
+
+            virtual bool isGuiMode() const = 0;
+
+            virtual void toggleVisible (MWGui::GuiWindow wnd) = 0;
+
+            /// Disallow all inventory mode windows
+            virtual void disallowAll() = 0;
+
+            /// Allow one or more windows
+            virtual void allow (MWGui::GuiWindow wnd) = 0;
+
+            virtual bool isAllowed (MWGui::GuiWindow wnd) const = 0;
+
+            /// \todo investigate, if we really need to expose every single lousy UI element to the outside world
+            virtual MWGui::DialogueWindow* getDialogueWindow() = 0;
+            virtual MWGui::ContainerWindow* getContainerWindow() = 0;
+            virtual MWGui::InventoryWindow* getInventoryWindow() = 0;
+            virtual MWGui::BookWindow* getBookWindow() = 0;
+            virtual MWGui::ScrollWindow* getScrollWindow() = 0;
+            virtual MWGui::CountDialog* getCountDialog() = 0;
+            virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
+            virtual MWGui::TradeWindow* getTradeWindow() = 0;
+            virtual MWGui::SpellBuyingWindow* getSpellBuyingWindow() = 0;
+            virtual MWGui::SpellWindow* getSpellWindow() = 0;
+            virtual MWGui::Console* getConsole() = 0;
+
+            virtual MyGUI::Gui* getGui() const = 0;
+
+            virtual void wmUpdateFps(float fps, unsigned int triangleCount, unsigned int batchCount) = 0;
+
+            /// Set value for the given ID.
+            virtual void setValue (const std::string& id, const MWMechanics::Stat<int>& value) = 0;
+            virtual void setValue (int parSkill, const MWMechanics::Stat<float>& value) = 0;
+            virtual void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value) = 0;
+            virtual void setValue (const std::string& id, const std::string& value) = 0;
+            virtual void setValue (const std::string& id, int value) = 0;
+
+            virtual void setPlayerClass (const ESM::Class &class_) = 0;
+            ///< set current class of player
+
+            virtual void configureSkills (const SkillList& major, const SkillList& minor) = 0;
+            ///< configure skill groups, each set contains the skill ID for that group.
+
+            virtual void setReputation (int reputation) = 0;
+            ///< set the current reputation value
+
+            virtual void setBounty (int bounty) = 0;
+            ///< set the current bounty value
+
+            virtual void updateSkillArea() = 0;
+            ///< update display of skills, factions, birth sign, reputation and bounty
+
+            virtual void changeCell(MWWorld::CellStore* cell) = 0;
+            ///< change the active cell
+
+            virtual void setPlayerPos(const float x, const float y) = 0;
+            ///< set player position in map space
+
+            virtual void setPlayerDir(const float x, const float y) = 0;
+            ///< set player view direction in map space
+
+            virtual void setFocusObject(const MWWorld::Ptr& focus) = 0;
+            virtual void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y) = 0;
+
+            virtual void setMouseVisible(bool visible) = 0;
+            virtual void getMousePosition(int &x, int &y) = 0;
+            virtual void getMousePosition(float &x, float &y) = 0;
+            virtual void setDragDrop(bool dragDrop) = 0;
+            virtual bool getWorldMouseOver() = 0;
+
+            virtual void toggleFogOfWar() = 0;
+
+            virtual void toggleFullHelp() = 0;
+            ///< show extra info in item tooltips (owner, script)
+
+            virtual bool getFullHelp() const = 0;
+
+            virtual void setInteriorMapTexture(const int x, const int y) = 0;
+            ///< set the index of the map texture that should be used (for interiors)
+
+            /// sets the visibility of the hud health/magicka/stamina bars
+            virtual void setHMSVisibility(bool visible) = 0;
+
+            /// sets the visibility of the hud minimap
+            virtual void setMinimapVisibility(bool visible) = 0;
+            virtual void setWeaponVisibility(bool visible) = 0;
+            virtual void setSpellVisibility(bool visible) = 0;
+
+            virtual void activateQuickKey  (int index) = 0;
+
+            virtual void setSelectedSpell(const std::string& spellId, int successChancePercent) = 0;
+            virtual void setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent) = 0;
+            virtual void setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent) = 0;
+            virtual void unsetSelectedSpell() = 0;
+            virtual void unsetSelectedWeapon() = 0;
+
+            virtual void showCrosshair(bool show) = 0;
+            virtual bool getSubtitlesEnabled() = 0;
+            virtual void toggleHud() = 0;
+
+            virtual void disallowMouse() = 0;
+            virtual void allowMouse() = 0;
+            virtual void notifyInputActionBound() = 0;
+
+            virtual void addVisitedLocation(const std::string& name, int x, int y) = 0;
+
+            virtual void removeDialog(OEngine::GUI::Layout* dialog) = 0;
+            ///< Hides dialog and schedules dialog to be deleted.
+
+            virtual void messageBox (const std::string& message, const std::vector<std::string>& buttons) = 0;
+            virtual int readPressedButton() = 0;
+            ///< returns the index of the pressed button or -1 if no button was pressed (->MessageBoxmanager->InteractiveMessageBox)
+
+            virtual void onFrame (float frameDuration) = 0;
+
+            /// \todo get rid of this stuff. Move it to the respective UI element classes, if needed.
+            virtual std::map<int, MWMechanics::Stat<float> > getPlayerSkillValues() = 0;
+            virtual std::map<int, MWMechanics::Stat<int> > getPlayerAttributeValues() = 0;
+            virtual SkillList getPlayerMinorSkills() = 0;
+            virtual SkillList getPlayerMajorSkills() = 0;
+
+            /**
+             * Fetches a GMST string from the store, if there is no setting with the given
+             * ID or it is not a string the default string is returned.
+             *
+             * @param id Identifier for the GMST setting, e.g. "aName"
+             * @param default Default value if the GMST setting cannot be used.
+             */
+            virtual const std::string &getGameSettingString(const std::string &id, const std::string &default_) = 0;
+
+            virtual void processChangedSettings(const Settings::CategorySettingVector& changed) = 0;
+
+            virtual void executeInConsole (const std::string& path) = 0;
+
+            virtual void setLoadingProgress (const std::string& stage, int depth, int current, int total) = 0;
+            virtual void loadingDone() = 0;
+
+            virtual void enableRest() = 0;
+            virtual bool getRestEnabled() = 0;
+
+            virtual bool getPlayerSleeping() = 0;
+            virtual void wakeUpPlayer() = 0;
+    };
+}
+
+#endif

apps/openmw/mwbase/world.hpp

@@ -0,0 +1,297 @@
+#ifndef GAME_MWBASE_WORLD_H
+#define GAME_MWBASE_WORLD_H
+
+#include <vector>
+
+#include <components/settings/settings.hpp>
+
+#include "../mwworld/globals.hpp"
+
+namespace Ogre
+{
+    class Vector2;
+    class Vector3;
+}
+
+namespace OEngine
+{
+    namespace Render
+    {
+        class Fader;
+    }
+}
+
+namespace ESM
+{
+    class ESMReader;
+    struct Position;
+    struct Cell;
+    struct Class;
+    struct Potion;
+}
+
+namespace ESMS
+{
+    struct ESMStore;
+}
+
+namespace MWRender
+{
+    class ExternalRendering;
+}
+
+namespace MWWorld
+{
+    class CellStore;
+    class Player;
+    class LocalScripts;
+    class Ptr;
+    class TimeStamp;
+}
+
+namespace MWBase
+{
+    /// \brief Interface for the World (implemented in MWWorld)
+    class World
+    {
+            World (const World&);
+            ///< not implemented
+
+            World& operator= (const World&);
+            ///< not implemented
+
+        public:
+
+            enum RenderMode
+            {
+                Render_CollisionDebug,
+                Render_Wireframe,
+                Render_Pathgrid,
+                Render_Compositors
+            };
+
+            struct DoorMarker
+            {
+                std::string name;
+                float x, y; // world position
+            };
+
+            World() {}
+
+            virtual ~World() {}
+
+            virtual OEngine::Render::Fader* getFader() = 0;
+            ///< \ŧodo remove this function. Rendering details should not be exposed.
+
+            virtual MWWorld::CellStore *getExterior (int x, int y) = 0;
+
+            virtual MWWorld::CellStore *getInterior (const std::string& name) = 0;
+
+            virtual void setWaterHeight(const float height) = 0;
+
+            virtual void toggleWater() = 0;
+
+            virtual void adjustSky() = 0;
+
+            virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches) = 0;
+
+            virtual void setFallbackValues (const std::map<std::string, std::string>& fallbackMap) = 0;
+
+            virtual std::string getFallback (const std::string& key) const = 0;
+
+            virtual std::string getFallback (const std::string& key, const std::string& def) const = 0;
+
+            virtual MWWorld::Player& getPlayer() = 0;
+
+            virtual const ESMS::ESMStore& getStore() const = 0;
+
+            virtual ESM::ESMReader& getEsmReader() = 0;
+
+            virtual MWWorld::LocalScripts& getLocalScripts() = 0;
+
+            virtual bool hasCellChanged() const = 0;
+            ///< Has the player moved to a different cell, since the last frame?
+
+            virtual bool isCellExterior() const = 0;
+
+            virtual bool isCellQuasiExterior() const = 0;
+
+            virtual Ogre::Vector2 getNorthVector (MWWorld::CellStore* cell) = 0;
+            ///< get north vector (OGRE coordinates) for given interior cell
+
+            virtual std::vector<DoorMarker> getDoorMarkers (MWWorld::CellStore* cell) = 0;
+            ///< get a list of teleport door markers for a given cell, to be displayed on the local map
+
+            virtual void getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y) = 0;
+            ///< see MWRender::LocalMap::getInteriorMapPosition
+
+            virtual bool isPositionExplored (float nX, float nY, int x, int y, bool interior) = 0;
+            ///< see MWRender::LocalMap::isPositionExplored
+
+            virtual MWWorld::Globals::Data& getGlobalVariable (const std::string& name) = 0;
+
+            virtual MWWorld::Globals::Data getGlobalVariable (const std::string& name) const = 0;
+
+            virtual char getGlobalVariableType (const std::string& name) const = 0;
+            ///< Return ' ', if there is no global variable with this name.
+
+            virtual MWWorld::Ptr getPtr (const std::string& name, bool activeOnly) = 0;
+            ///< Return a pointer to a liveCellRef with the given name.
+            /// \param activeOnly do non search inactive cells.
+
+            virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0;
+            ///< Return a pointer to a liveCellRef with the given Ogre handle.
+
+            /// \todo enable reference in the OGRE scene
+            virtual void enable (const MWWorld::Ptr& ptr) = 0;
+
+            /// \todo disable reference in the OGRE scene
+            virtual void disable (const MWWorld::Ptr& ptr) = 0;
+
+            virtual void advanceTime (double hours) = 0;
+            ///< Advance in-game time.
+
+            virtual void setHour (double hour) = 0;
+            ///< Set in-game time hour.
+
+            virtual void setMonth (int month) = 0;
+            ///< Set in-game time month.
+
+            virtual void setDay (int day) = 0;
+            ///< Set in-game time day.
+
+            virtual int getDay() = 0;
+            virtual int getMonth() = 0;
+
+            virtual MWWorld::TimeStamp getTimeStamp() const = 0;
+            ///< Return current in-game time stamp.
+
+            virtual bool toggleSky() = 0;
+            ///< \return Resulting mode
+
+            virtual void changeWeather(const std::string& region, unsigned int id) = 0;
+
+            virtual int getCurrentWeather() const = 0;
+
+            virtual int getMasserPhase() const = 0;
+
+            virtual int getSecundaPhase() const = 0;
+
+            virtual void setMoonColour (bool red) = 0;
+
+            virtual float getTimeScaleFactor() const = 0;
+
+            virtual void changeToInteriorCell (const std::string& cellName,
+                const ESM::Position& position) = 0;
+            ///< Move to interior cell.
+
+            virtual void changeToExteriorCell (const ESM::Position& position) = 0;
+            ///< Move to exterior cell.
+
+            virtual const ESM::Cell *getExterior (const std::string& cellName) const = 0;
+            ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
+
+            virtual void markCellAsUnchanged() = 0;
+
+            virtual std::string getFacedHandle() = 0;
+            ///< Return handle of the object the player is looking at
+
+            virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
+
+            virtual void moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
+
+            virtual void
+            moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore &newCell, float x, float y, float z) = 0;
+
+            virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
+
+            virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0;
+
+            virtual void safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos) = 0;
+            ///< place an object in a "safe" location (ie not in the void, etc).
+
+            virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
+                const = 0;
+            ///< Convert cell numbers to position.
+
+            virtual void positionToIndex (float x, float y, int &cellX, int &cellY) const = 0;
+            ///< Convert position to cell numbers
+
+            virtual void doPhysics (const std::vector<std::pair<std::string, Ogre::Vector3> >& actors,
+                float duration) = 0;
+            ///< Run physics simulation and modify \a world accordingly.
+
+            virtual bool toggleCollisionMode() = 0;
+            ///< Toggle collision mode for player. If disabled player object should ignore
+            /// collisions and gravity.
+            /// \return Resulting mode
+
+            virtual bool toggleRenderMode (RenderMode mode) = 0;
+            ///< Toggle a render mode.
+            ///< \return Resulting mode
+
+            virtual std::pair<std::string, const ESM::Potion *> createRecord (const ESM::Potion& record)
+                = 0;
+            ///< Create a new recrod (of type potion) in the ESM store.
+            /// \return ID, pointer to created record
+
+            virtual std::pair<std::string, const ESM::Class *> createRecord (const ESM::Class& record)
+                = 0;
+            ///< Create a new recrod (of type class) in the ESM store.
+            /// \return ID, pointer to created record
+
+            virtual const ESM::Cell *createRecord (const ESM::Cell& record) = 0;
+            ///< Create a new recrod (of type cell) in the ESM store.
+            /// \return ID, pointer to created record
+
+            virtual void playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName,
+                int mode, int number = 1) = 0;
+            ///< Run animation for a MW-reference. Calls to this function for references that are
+            /// currently not in the rendered scene should be ignored.
+            ///
+            /// \param mode: 0 normal, 1 immediate start, 2 immediate loop
+            /// \param number How offen the animation should be run
+
+            virtual void skipAnimation (const MWWorld::Ptr& ptr) = 0;
+            ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
+            /// references that are currently not in the rendered scene should be ignored.
+
+            virtual void update (float duration) = 0;
+
+            virtual bool placeObject(const MWWorld::Ptr& object, float cursorX, float cursorY) = 0;
+            ///< place an object into the gameworld at the specified cursor position
+            /// @param object
+            /// @param cursor X (relative 0-1)
+            /// @param cursor Y (relative 0-1)
+            /// @return true if the object was placed, or false if it was rejected because the position is too far away
+
+            virtual void dropObjectOnGround (const MWWorld::Ptr& object) = 0;
+
+            virtual bool canPlaceObject (float cursorX, float cursorY) = 0;
+            ///< @return true if it is possible to place on object at specified cursor location
+
+            virtual void processChangedSettings (const Settings::CategorySettingVector& settings) = 0;
+
+            virtual bool isSwimming(const MWWorld::Ptr &object) = 0;
+            virtual bool isUnderwater(const ESM::Cell &cell, const Ogre::Vector3 &pos) = 0;
+
+            virtual void togglePOV() = 0;
+            virtual void togglePreviewMode(bool enable) = 0;
+            virtual bool toggleVanityMode(bool enable, bool force) = 0;
+            virtual void allowVanityMode(bool allow) = 0;
+            virtual void togglePlayerLooking(bool enable) = 0;
+
+            virtual void renderPlayer() = 0;
+            
+            virtual void setupExternalRendering (MWRender::ExternalRendering& rendering) = 0;
+
+            virtual int canRest() = 0;
+            ///< check if the player is allowed to rest \n
+            /// 0 - yes \n
+            /// 1 - only waiting \n
+            /// 2 - player is underwater \n
+            /// 3 - enemies are nearby (not implemented)
+    };
+}
+
+#endif

apps/openmw/mwclass/activator.cpp

@@ -3,48 +3,54 @@
 
 #include <components/esm/loadacti.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
-#include "../mwworld/ptr.hpp"
-#include "../mwrender/objects.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwgui/window_manager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwworld//cellstore.hpp"
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/physicssystem.hpp"
+
+#include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
+
+#include "../mwgui/tooltips.hpp"
 
 namespace MWClass
 {
    void Activator::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Activator>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Activator::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Activator>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Activator::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
+            ptr.get<ESM::Activator>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Activator::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
 
         return ref->base->name;
@@ -52,7 +58,7 @@ namespace MWClass
 
     std::string Activator::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
 
         return ref->base->script;
@@ -67,7 +73,7 @@ namespace MWClass
 
     bool Activator::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
 
         return (ref->base->name != "");
@@ -75,7 +81,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Activator::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Activator, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
             ptr.get<ESM::Activator>();
 
         MWGui::ToolTipInfo info;
@@ -88,4 +94,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Activator::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Activator> *ref =
+            ptr.get<ESM::Activator>();
+
+        return MWWorld::Ptr(&cell.activators.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/activator.hpp

@@ -7,6 +7,10 @@ namespace MWClass
 {
     class Activator : public MWWorld::Class
     {
+
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -28,6 +32,8 @@ namespace MWClass
             ///< Return name of the script attached to ptr
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/apparatus.cpp

@@ -3,57 +3,57 @@
 
 #include <components/esm/loadappa.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionalchemy.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwsound/soundmanager.hpp"
-
 namespace MWClass
 {
-   void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
+    void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Apparatus>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Apparatus::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Apparatus>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Apparatus::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
+            ptr.get<ESM::Apparatus>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Apparatus::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         return ref->base->name;
@@ -62,15 +62,17 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Apparatus::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+    	boost::shared_ptr<MWWorld::Action> action(
+    	            new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+    	action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Apparatus::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         return ref->base->script;
@@ -78,7 +80,7 @@ namespace MWClass
 
     int Apparatus::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         return ref->base->data.value;
@@ -103,7 +105,7 @@ namespace MWClass
 
     std::string Apparatus::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         return ref->base->icon;
@@ -111,7 +113,7 @@ namespace MWClass
 
     bool Apparatus::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         return (ref->base->name != "");
@@ -119,19 +121,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Apparatus::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
             ptr.get<ESM::Apparatus>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
-        text += "\n" + store.gameSettings.search("sQuality")->str + ": " + MWGui::ToolTips::toString(ref->base->data.quality);
+        text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->base->data.quality);
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -147,4 +147,13 @@ namespace MWClass
     {
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionAlchemy());
     }
+
+    MWWorld::Ptr
+    Apparatus::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Apparatus> *ref =
+            ptr.get<ESM::Apparatus>();
+
+        return MWWorld::Ptr(&cell.appas.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/apparatus.hpp

@@ -7,6 +7,10 @@ namespace MWClass
 {
     class Apparatus : public MWWorld::Class
     {
+
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -48,6 +52,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/armor.cpp

@@ -5,56 +5,58 @@
 #include <components/esm/loadskil.hpp>
 #include <components/esm/loadgmst.hpp>
 
-#include <components/esm_store/cell_store.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
-
+#include "../mwworld/physicssystem.hpp"
-#include "../mwbase/environment.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
-#include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
-
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Armor::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Armor>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Armor::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+
+    std::string Armor::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Armor::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->name;
@@ -63,10 +65,11 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Armor::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     bool Armor::hasItemHealth (const MWWorld::Ptr& ptr) const
@@ -76,7 +79,7 @@ namespace MWClass
 
     int Armor::getItemMaxHealth (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->data.health;
@@ -84,7 +87,7 @@ namespace MWClass
 
     std::string Armor::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->script;
@@ -92,7 +95,7 @@ namespace MWClass
 
     std::pair<std::vector<int>, bool> Armor::getEquipmentSlots (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         std::vector<int> slots;
@@ -126,7 +129,7 @@ namespace MWClass
 
     int Armor::getEquipmentSkill (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         std::string typeGmst;
@@ -149,13 +152,13 @@ namespace MWClass
         if (typeGmst.empty())
             return -1;
 
-        float iWeight = MWBase::Environment::get().getWorld()->getStore().gameSettings.find (typeGmst)->i;
+        float iWeight = MWBase::Environment::get().getWorld()->getStore().gameSettings.find (typeGmst)->getInt();
 
-        if (iWeight * MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fLightMaxMod")->f>=
+        if (iWeight * MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fLightMaxMod")->getFloat()>=
             ref->base->data.weight)
             return ESM::Skill::LightArmor;
 
-        if (iWeight * MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fMedMaxMod")->f>=
+        if (iWeight * MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fMedMaxMod")->getFloat()>=
             ref->base->data.weight)
             return ESM::Skill::MediumArmor;
 
@@ -164,7 +167,7 @@ namespace MWClass
 
     int Armor::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->data.value;
@@ -201,7 +204,7 @@ namespace MWClass
 
     std::string Armor::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->icon;
@@ -209,7 +212,7 @@ namespace MWClass
 
     bool Armor::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return (ref->base->name != "");
@@ -217,7 +220,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Armor::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         MWGui::ToolTipInfo info;
@@ -226,25 +229,23 @@ namespace MWClass
 
         std::string text;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         // get armor type string (light/medium/heavy)
         int armorType = getEquipmentSkill(ptr);
         std::string typeText;
         if (armorType == ESM::Skill::LightArmor)
-            typeText = store.gameSettings.search("sLight")->str;
+            typeText = "#{sLight}";
         else if (armorType == ESM::Skill::MediumArmor)
-            typeText = store.gameSettings.search("sMedium")->str;
+            typeText = "#{sMedium}";
         else
-            typeText = store.gameSettings.search("sHeavy")->str;
+            typeText = "#{sHeavy}";
 
-        text += "\n" + store.gameSettings.search("sArmorRating")->str + ": " + MWGui::ToolTips::toString(ref->base->data.armor);
+        text += "\n#{sArmorRating}: " + MWGui::ToolTips::toString(ref->base->data.armor);
 
         /// \todo store the current armor health somewhere
-        text += "\n" + store.gameSettings.search("sCondition")->str + ": " + MWGui::ToolTips::toString(ref->base->data.health);
+        text += "\n#{sCondition}: " + MWGui::ToolTips::toString(ref->base->data.health);
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight) + " (" + typeText + ")";
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight) + " (" + typeText + ")";
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -260,7 +261,7 @@ namespace MWClass
 
     std::string Armor::getEnchantment (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Armor, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
             ptr.get<ESM::Armor>();
 
         return ref->base->enchant;
@@ -268,8 +269,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Armor::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Armor::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Armor> *ref =
+            ptr.get<ESM::Armor>();
+
+        return MWWorld::Ptr(&cell.armors.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/armor.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Armor : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -66,6 +69,7 @@ namespace MWClass
                 const;
             ///< Generate action for using via inventory menu
 
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/book.cpp

@@ -3,55 +3,57 @@
 
 #include <components/esm/loadbook.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actionread.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
-#include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
-
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Book::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Book>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Book::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Book>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Book::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Book> *ref =
+            ptr.get<ESM::Book>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Book::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return ref->base->name;
@@ -66,7 +68,7 @@ namespace MWClass
 
     std::string Book::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return ref->base->script;
@@ -74,7 +76,7 @@ namespace MWClass
 
     int Book::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return ref->base->data.value;
@@ -99,7 +101,7 @@ namespace MWClass
 
     std::string Book::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return ref->base->icon;
@@ -107,7 +109,7 @@ namespace MWClass
 
     bool Book::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return (ref->base->name != "");
@@ -115,19 +117,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Book::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -143,7 +143,7 @@ namespace MWClass
 
     std::string Book::getEnchantment (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Book> *ref =
             ptr.get<ESM::Book>();
 
         return ref->base->enchant;
@@ -154,4 +154,12 @@ namespace MWClass
         return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionRead(ptr));
     }
 
+    MWWorld::Ptr
+    Book::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Book> *ref =
+            ptr.get<ESM::Book>();
+
+        return MWWorld::Ptr(&cell.books.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/book.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Book : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -50,6 +53,8 @@ namespace MWClass
 
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr) const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/clothing.cpp

@@ -3,75 +3,76 @@
 
 #include <components/esm/loadclot.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/tooltips.hpp"
-#include "../mwgui/window_manager.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Clothing::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Clothing>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Clothing::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Clothing>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Clothing::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
+            ptr.get<ESM::Clothing>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Clothing::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return ref->base->name;
     }
 
     boost::shared_ptr<MWWorld::Action> Clothing::activate (const MWWorld::Ptr& ptr,
-        const MWWorld::Ptr& actor) const
+    		const MWWorld::Ptr& actor) const
     {
-         MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+    	boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+    	action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+    	return action;
     }
 
     std::string Clothing::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return ref->base->script;
@@ -79,7 +80,7 @@ namespace MWClass
 
     std::pair<std::vector<int>, bool> Clothing::getEquipmentSlots (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         std::vector<int> slots;
@@ -119,7 +120,7 @@ namespace MWClass
 
     int Clothing::getEquipmentSkill (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         if (ref->base->data.type==ESM::Clothing::Shoes)
@@ -130,7 +131,7 @@ namespace MWClass
 
     int Clothing::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return ref->base->data.value;
@@ -145,7 +146,7 @@ namespace MWClass
 
     std::string Clothing::getUpSoundId (const MWWorld::Ptr& ptr) const
     {
-         ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+         MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         if (ref->base->data.type == 8)
@@ -157,7 +158,7 @@ namespace MWClass
 
     std::string Clothing::getDownSoundId (const MWWorld::Ptr& ptr) const
     {
-         ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+         MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         if (ref->base->data.type == 8)
@@ -169,7 +170,7 @@ namespace MWClass
 
     std::string Clothing::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return ref->base->icon;
@@ -177,7 +178,7 @@ namespace MWClass
 
     bool Clothing::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return (ref->base->name != "");
@@ -185,19 +186,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Clothing::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -213,7 +212,7 @@ namespace MWClass
 
     std::string Clothing::getEnchantment (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Clothing, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
             ptr.get<ESM::Clothing>();
 
         return ref->base->enchant;
@@ -221,8 +220,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Clothing::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Clothing::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Clothing> *ref =
+            ptr.get<ESM::Clothing>();
+
+        return MWWorld::Ptr(&cell.clothes.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/clothing.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Clothing : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -59,6 +62,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/container.cpp

@@ -3,23 +3,24 @@
 
 #include <components/esm/loadcont.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/actionopen.hpp"
+#include "../mwworld/physicssystem.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-#include "../mwworld/actionopen.hpp"
+#include "../mwrender/renderinginterface.hpp"
-
-#include "../mwsound/soundmanager.hpp"
 
 namespace
 {
@@ -53,32 +54,33 @@ namespace MWClass
 
     void Container::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Container>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Container::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Container>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Container::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Container> *ref =
+            ptr.get<ESM::Container>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     boost::shared_ptr<MWWorld::Action> Container::activate (const MWWorld::Ptr& ptr,
@@ -87,37 +89,58 @@ namespace MWClass
         const std::string lockedSound = "LockedChest";
         const std::string trapActivationSound = "Disarm Trap Fail";
 
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
 
-        if (ptr.getCellRef().lockLevel>0)
+        bool needKey = ptr.getCellRef().lockLevel>0;
+        bool hasKey = false;
+        std::string keyName;
+        for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
-            // TODO check for key
+            if (it->getCellRef ().refID == ptr.getCellRef().key)
-            std::cout << "Locked container" << std::endl;
+            {
-            MWBase::Environment::get().getSoundManager()->playSound3D (ptr, lockedSound, 1.0, 1.0);
+                hasKey = true;
-            return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+                keyName = MWWorld::Class::get(*it).getName(*it);
+            }
         }
-        else
+
+        if (needKey && hasKey)
+        {
+            MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}", std::vector<std::string>());
+            ptr.getCellRef().lockLevel = 0;
+            // using a key disarms the trap
+            ptr.getCellRef().trap = "";
+        }
+
+
+        if (!needKey || hasKey)
         {
-            std::cout << "Unlocked container" << std::endl;
             if(ptr.getCellRef().trap.empty())
             {
-                // Not trapped, Inventory GUI goes here
+                boost::shared_ptr<MWWorld::Action> action (new MWWorld::ActionOpen(ptr));
-                //return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+                return action;
-                return boost::shared_ptr<MWWorld::Action> (new MWWorld::ActionOpen(ptr));
             }
             else
             {
                 // Trap activation goes here
                 std::cout << "Activated trap: " << ptr.getCellRef().trap << std::endl;
-                MWBase::Environment::get().getSoundManager()->playSound3D (ptr, trapActivationSound, 1.0, 1.0);
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::NullAction);
+                action->setSound(trapActivationSound);
                 ptr.getCellRef().trap = "";
-                return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+                return action;
             }
         }
+        else
+        {
+            boost::shared_ptr<MWWorld::Action> action(new MWWorld::NullAction);
+            action->setSound(lockedSound);
+            return action;
+        }
     }
 
     std::string Container::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
 
         return ref->base->name;
@@ -133,7 +156,7 @@ namespace MWClass
 
     std::string Container::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
 
         return ref->base->script;
@@ -148,7 +171,7 @@ namespace MWClass
 
     bool Container::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
 
         return (ref->base->name != "");
@@ -156,19 +179,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Container::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
         if (ref->ref.lockLevel > 0)
-            text += "\n" + store.gameSettings.search("sLockLevel")->str + ": " + MWGui::ToolTips::toString(ref->ref.lockLevel);
+            text += "\n#{sLockLevel}: " + MWGui::ToolTips::toString(ref->ref.lockLevel);
         if (ref->ref.trap != "")
-            text += "\n" + store.gameSettings.search("sTrapped")->str;
+            text += "\n#{sTrapped}";
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -182,7 +203,7 @@ namespace MWClass
 
     float Container::getCapacity (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Container, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Container> *ref =
             ptr.get<ESM::Container>();
 
         return ref->base->weight;
@@ -205,4 +226,13 @@ namespace MWClass
     {
         ptr.getCellRef().lockLevel = 0;
     }
+
+    MWWorld::Ptr
+    Container::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Container> *ref =
+            ptr.get<ESM::Container>();
+
+        return MWWorld::Ptr(&cell.containers.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/container.hpp

@@ -9,6 +9,10 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -51,6 +55,8 @@ namespace MWClass
             ///< Unlock object
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/creature.cpp

@@ -4,17 +4,21 @@
 #include <components/esm/loadcrea.hpp>
 
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwmechanics/mechanicsmanager.hpp"
 #include "../mwmechanics/magiceffects.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
-#include "../mwgui/window_manager.hpp"
+#include "../mwrender/renderinginterface.hpp"
+
+#include "../mwgui/tooltips.hpp"
 
 namespace
 {
@@ -40,27 +44,32 @@ namespace MWClass
         {
             std::auto_ptr<CustomData> data (new CustomData);
 
-            ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref = ptr.get<ESM::Creature>();
+            MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
 
             // creature stats
-            data->mCreatureStats.mAttributes[0].set (ref->base->data.strength);
+            data->mCreatureStats.getAttribute(0).set (ref->base->data.strength);
-            data->mCreatureStats.mAttributes[1].set (ref->base->data.intelligence);
+            data->mCreatureStats.getAttribute(1).set (ref->base->data.intelligence);
-            data->mCreatureStats.mAttributes[2].set (ref->base->data.willpower);
+            data->mCreatureStats.getAttribute(2).set (ref->base->data.willpower);
-            data->mCreatureStats.mAttributes[3].set (ref->base->data.agility);
+            data->mCreatureStats.getAttribute(3).set (ref->base->data.agility);
-            data->mCreatureStats.mAttributes[4].set (ref->base->data.speed);
+            data->mCreatureStats.getAttribute(4).set (ref->base->data.speed);
-            data->mCreatureStats.mAttributes[5].set (ref->base->data.endurance);
+            data->mCreatureStats.getAttribute(5).set (ref->base->data.endurance);
-            data->mCreatureStats.mAttributes[6].set (ref->base->data.personality);
+            data->mCreatureStats.getAttribute(6).set (ref->base->data.personality);
-            data->mCreatureStats.mAttributes[7].set (ref->base->data.luck);
+            data->mCreatureStats.getAttribute(7).set (ref->base->data.luck);
-            data->mCreatureStats.mDynamic[0].set (ref->base->data.health);
+            data->mCreatureStats.getHealth().set (ref->base->data.health);
-            data->mCreatureStats.mDynamic[1].set (ref->base->data.mana);
+            data->mCreatureStats.getMagicka().set (ref->base->data.mana);
-            data->mCreatureStats.mDynamic[2].set (ref->base->data.fatigue);
+            data->mCreatureStats.getFatigue().set (ref->base->data.fatigue);
 
-            data->mCreatureStats.mLevel = ref->base->data.level;
+            data->mCreatureStats.setLevel(ref->base->data.level);
 
-            data->mCreatureStats.mHello = ref->base->AI.hello;
+            data->mCreatureStats.setHello(ref->base->mAiData.mHello);
-            data->mCreatureStats.mFight = ref->base->AI.fight;
+            data->mCreatureStats.setFight(ref->base->mAiData.mFight);
-            data->mCreatureStats.mFlee = ref->base->AI.flee;
+            data->mCreatureStats.setFlee(ref->base->mAiData.mFlee);
-            data->mCreatureStats.mAlarm = ref->base->AI.alarm;
+            data->mCreatureStats.setAlarm(ref->base->mAiData.mAlarm);
+
+            // spells
+            for (std::vector<std::string>::const_iterator iter (ref->base->mSpells.list.begin());
+                iter!=ref->base->mSpells.list.end(); ++iter)
+                data->mCreatureStats.getSpells().add (*iter);
 
             // store
             ptr.getRefData().setCustomData (data.release());
@@ -69,7 +78,7 @@ namespace MWClass
 
     std::string Creature::getId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
 
         return ref->base->mId;
@@ -83,21 +92,29 @@ namespace MWClass
 
     void Creature::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
+        if(!model.empty()){
+            physics.insertActorPhysics(ptr, model);
+        }
+        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
+    }
+
+    std::string Creature::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
+        assert (ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertActorPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
-        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
     }
 
     std::string Creature::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
 
         return ref->base->name;
@@ -126,7 +143,7 @@ namespace MWClass
 
     std::string Creature::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
 
         return ref->base->script;
@@ -148,7 +165,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Creature::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
             ptr.get<ESM::Creature>();
 
         MWGui::ToolTipInfo info;
@@ -165,7 +182,7 @@ namespace MWClass
     float Creature::getCapacity (const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
-        return stats.mAttributes[0].getModified()*5;
+        return stats.getAttribute(0).getModified()*5;
     }
 
     float Creature::getEncumbrance (const MWWorld::Ptr& ptr) const
@@ -174,13 +191,22 @@ namespace MWClass
 
         const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
 
-        weight -= stats.mMagicEffects.get (MWMechanics::EffectKey (8)).mMagnitude; // feather
+        weight -= stats.getMagicEffects().get (MWMechanics::EffectKey (8)).mMagnitude; // feather
 
-        weight += stats.mMagicEffects.get (MWMechanics::EffectKey (7)).mMagnitude; // burden
+        weight += stats.getMagicEffects().get (MWMechanics::EffectKey (7)).mMagnitude; // burden
 
         if (weight<0)
             weight = 0;
 
         return weight;
     }
+
+    MWWorld::Ptr
+    Creature::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Creature> *ref =
+            ptr.get<ESM::Creature>();
+
+        return MWWorld::Ptr(&cell.creatures.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/creature.hpp

@@ -1,7 +1,6 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
-#include "../mwworld/class.hpp"
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/actors.hpp"
 
@@ -12,6 +11,9 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
@@ -55,6 +57,13 @@ namespace MWClass
             /// effects). Throws an exception, if the object can't hold other objects.
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
+
+            virtual bool
+            isActor() const {
+                return true;
+            }
     };
 }
 

apps/openmw/mwclass/door.cpp

@@ -3,56 +3,59 @@
 
 #include <components/esm/loaddoor.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/actionteleport.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-         ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Door>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Door::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-         ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+
+    std::string Door::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
+        return "";
     }
 
     std::string Door::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
 
         if (ref->ref.teleport && !ref->ref.destCell.empty()) // TODO doors that lead to exteriors
@@ -64,7 +67,7 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Door::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
 
         const std::string &openSound = ref->base->openSound;
@@ -72,50 +75,81 @@ namespace MWClass
         const std::string lockedSound = "LockedDoor";
         const std::string trapActivationSound = "Disarm Trap Fail";
 
-        if (ptr.getCellRef().lockLevel>0)
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
-        {
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
-            // TODO check for key
-            // TODO report failure to player (message, sound?). Look up behaviour of original MW.
-            std::cout << "Locked!" << std::endl;
-            MWBase::Environment::get().getSoundManager()->playSound3D (ptr, lockedSound, 1.0, 1.0);
-            return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
-        }
 
-        if(!ptr.getCellRef().trap.empty())
+        bool needKey = ptr.getCellRef().lockLevel>0;
+        bool hasKey = false;
+        std::string keyName;
+        for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
-            // Trap activation
+            if (it->getCellRef ().refID == ptr.getCellRef().key)
-            std::cout << "Activated trap: " << ptr.getCellRef().trap << std::endl;
-            MWBase::Environment::get().getSoundManager()->playSound3D(ptr, trapActivationSound, 1.0, 1.0);
-            ptr.getCellRef().trap = "";
-            return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
-        }
-
-        if (ref->ref.teleport)
-        {
-            // teleport door
-            if (MWBase::Environment::get().getWorld()->getPlayer().getPlayer()==actor)
             {
-                // the player is using the door
+                hasKey = true;
-                // The reason this is not 3D is that it would get interrupted when you teleport
+                keyName = MWWorld::Class::get(*it).getName(*it);
-                MWBase::Environment::get().getSoundManager()->playSound(openSound, 1.0, 1.0);
+            }
-                return boost::shared_ptr<MWWorld::Action> (
+        }
-                    new MWWorld::ActionTeleportPlayer (ref->ref.destCell, ref->ref.doorDest));
+
+        if (needKey && hasKey)
+        {
+            MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}", std::vector<std::string>());
+            ptr.getCellRef().lockLevel = 0;
+            // using a key disarms the trap
+            ptr.getCellRef().trap = "";
+        }
+
+        if (!needKey || hasKey)
+        {
+            if(!ptr.getCellRef().trap.empty())
+            {
+                // Trap activation
+                std::cout << "Activated trap: " << ptr.getCellRef().trap << std::endl;
+
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::NullAction);
+
+                action->setSound(trapActivationSound);
+                ptr.getCellRef().trap = "";
+
+                return action;
+            }
+
+            if (ref->ref.teleport)
+            {
+                // teleport door
+                /// \todo remove this if clause once ActionTeleport can also support other actors
+                if (MWBase::Environment::get().getWorld()->getPlayer().getPlayer()==actor)
+                {
+                    boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ref->ref.destCell, ref->ref.doorDest));
+
+                    action->setSound(openSound);
+
+                    return action;
+                }
+                else
+                {
+                    // another NPC or a creature is using the door
+                    return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+                }
             }
             else
             {
-                // another NPC or a creature is using the door
+                // animated door
-                // TODO return action for teleporting other NPC/creature
+                // TODO return action for rotating the door
-                return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
+
+                // This is a little pointless, but helps with testing
+                boost::shared_ptr<MWWorld::Action> action(new MWWorld::NullAction);
+
+                action->setSound(openSound);
+
+                return action;
             }
         }
         else
         {
-            // animated door
+            // locked, and we can't open.
-            // TODO return action for rotating the door
+            boost::shared_ptr<MWWorld::Action> action(new MWWorld::NullAction);
-
+            action->setSound(lockedSound);
-            // This is a little pointless, but helps with testing
+            return action;
-            MWBase::Environment::get().getSoundManager()->playSound3D (ptr, openSound, 1.0, 1.0);
-            return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
         }
     }
 
@@ -134,7 +168,7 @@ namespace MWClass
 
     std::string Door::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
 
         return ref->base->script;
@@ -149,7 +183,7 @@ namespace MWClass
 
     bool Door::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
 
         return (ref->base->name != "");
@@ -157,7 +191,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Door::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Door, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Door> *ref =
             ptr.get<ESM::Door>();
 
         MWGui::ToolTipInfo info;
@@ -189,14 +223,14 @@ namespace MWClass
                     dest = region->name;
                 }
             }
-            text += "\n" + store.gameSettings.search("sTo")->str;
+            text += "\n#{sTo}";
             text += "\n"+dest;
         }
 
         if (ref->ref.lockLevel > 0)
-            text += "\n" + store.gameSettings.search("sLockLevel")->str + ": " + MWGui::ToolTips::toString(ref->ref.lockLevel);
+            text += "\n#{sLockLevel}: " + MWGui::ToolTips::toString(ref->ref.lockLevel);
         if (ref->ref.trap != "")
-            text += "\n" + store.gameSettings.search("sTrapped")->str;
+            text += "\n#{sTrapped}";
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp())
             text += MWGui::ToolTips::getMiscString(ref->base->script, "Script");
@@ -205,4 +239,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Door::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Door> *ref =
+            ptr.get<ESM::Door>();
+
+        return MWWorld::Ptr(&cell.doors.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/door.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Door : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -38,6 +41,8 @@ namespace MWClass
             ///< Return name of the script attached to ptr
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/ingredient.cpp

@@ -3,54 +3,65 @@
 
 #include <components/esm/loadingr.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
+#include "../mwworld/actioneat.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
-    void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
+    std::string Ingredient::getId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
-        assert (ref->base != NULL);
+        return ref->base->mId;
-        const std::string &model = ref->base->model;
+    }
     
-        if (!model.empty())
+    void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
-        {
+    {
+        const std::string model = getModel(ptr);
+        if (!model.empty()) {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Ingredient::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
+
+    std::string Ingredient::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
+        return "";
     }
 
     std::string Ingredient::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         return ref->base->name;
@@ -59,15 +70,16 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Ingredient::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Ingredient::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         return ref->base->script;
@@ -75,12 +87,22 @@ namespace MWClass
 
     int Ingredient::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         return ref->base->data.value;
     }
 
+   
+    boost::shared_ptr<MWWorld::Action> Ingredient::use (const MWWorld::Ptr& ptr) const
+    {
+        boost::shared_ptr<MWWorld::Action> action (new MWWorld::ActionEat (ptr));
+
+        action->setSound ("Swallow");
+
+        return action;    
+    }
+    
     void Ingredient::registerSelf()
     {
         boost::shared_ptr<Class> instance (new Ingredient);
@@ -100,7 +122,7 @@ namespace MWClass
 
     std::string Ingredient::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         return ref->base->icon;
@@ -108,7 +130,7 @@ namespace MWClass
 
     bool Ingredient::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         return (ref->base->name != "");
@@ -116,19 +138,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Ingredient::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
             ptr.get<ESM::Ingredient>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -152,4 +172,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Ingredient::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Ingredient> *ref =
+            ptr.get<ESM::Ingredient>();
+
+        return MWWorld::Ptr(&cell.ingreds.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/ingredient.hpp

@@ -7,8 +7,14 @@ namespace MWClass
 {
     class Ingredient : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
+            virtual std::string getId (const MWWorld::Ptr& ptr) const;
+            ///< Return ID of \a ptr
+
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
@@ -34,6 +40,10 @@ namespace MWClass
             virtual int getValue (const MWWorld::Ptr& ptr) const;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
+            virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
+                const;
+            ///< Generate action for using via inventory menu
+            
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
@@ -44,6 +54,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/light.cpp

@@ -3,32 +3,32 @@
 
 #include <components/esm/loadligh.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwsound/soundmanager.hpp"
-
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 namespace MWClass
 {
     void Light::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
-
         assert (ref->base != NULL);
+
         const std::string &model = ref->base->model;
 
         MWRender::Objects& objects = renderingInterface.getObjects();
@@ -47,25 +47,36 @@ namespace MWClass
 
     void Light::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
-
         assert (ref->base != NULL);
+
         const std::string &model = ref->base->model;
 
-        if(!model.empty()){
+        if(!model.empty()) {
             physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        if (!ref->base->sound.empty()) {
-        if (!ref->base->sound.empty())
+            MWBase::Environment::get().getSoundManager()->playSound3D(ptr, ref->base->sound, 1.0, 1.0, MWBase::SoundManager::Play_Loop);
-        {
-            MWBase::Environment::get().getSoundManager()->playSound3D (ptr, ref->base->sound, 1.0, 1.0, MWSound::Play_Loop);
         }
     }
 
+    std::string Light::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Light> *ref =
+            ptr.get<ESM::Light>();
+        assert (ref->base != NULL);
+
+        const std::string &model = ref->base->model;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
+
     std::string Light::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         if (ref->base->model.empty())
@@ -77,21 +88,22 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Light::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         if (!(ref->base->data.flags & ESM::Light::Carry))
             return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction);
 
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Light::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         return ref->base->script;
@@ -99,7 +111,7 @@ namespace MWClass
 
     std::pair<std::vector<int>, bool> Light::getEquipmentSlots (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         std::vector<int> slots;
@@ -112,7 +124,7 @@ namespace MWClass
 
     int Light::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         return ref->base->data.value;
@@ -138,7 +150,7 @@ namespace MWClass
 
     std::string Light::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         return ref->base->icon;
@@ -146,7 +158,7 @@ namespace MWClass
 
     bool Light::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         return (ref->base->name != "");
@@ -154,19 +166,17 @@ namespace MWClass
 
     MWGui::ToolTipInfo Light::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Light, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Light> *ref =
             ptr.get<ESM::Light>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -180,8 +190,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Light::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Light::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Light> *ref =
+            ptr.get<ESM::Light>();
+
+        return MWWorld::Ptr(&cell.lights.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/light.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Light : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
              virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -52,6 +55,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/lockpick.cpp

@@ -3,58 +3,58 @@
 
 #include <components/esm/loadlocks.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
-#include "../mwgui/window_manager.hpp"
+#include "../mwworld/physicssystem.hpp"
+
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Lockpick::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Tool>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Lockpick::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Tool>();
+        if(!model.empty()) {
-
+            physics.insertObjectPhysics(ptr, model);
-
-        const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
+    std::string Lockpick::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
+            ptr.get<ESM::Tool>();
+        assert(ref->base != NULL);
+
+        const std::string &model = ref->base->model;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
 
     std::string Lockpick::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         return ref->base->name;
@@ -63,15 +63,16 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Lockpick::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Lockpick::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         return ref->base->script;
@@ -88,7 +89,7 @@ namespace MWClass
 
     int Lockpick::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         return ref->base->data.value;
@@ -113,7 +114,7 @@ namespace MWClass
 
     std::string Lockpick::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         return ref->base->icon;
@@ -121,7 +122,7 @@ namespace MWClass
 
     bool Lockpick::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         return (ref->base->name != "");
@@ -129,23 +130,21 @@ namespace MWClass
 
     MWGui::ToolTipInfo Lockpick::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Tool, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
             ptr.get<ESM::Tool>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
         /// \todo store remaining uses somewhere
 
-        text += "\n" + store.gameSettings.search("sUses")->str + ": " + MWGui::ToolTips::toString(ref->base->data.uses);
+        text += "\n#{sUses}: " + MWGui::ToolTips::toString(ref->base->data.uses);
-        text += "\n" + store.gameSettings.search("sQuality")->str + ": " + MWGui::ToolTips::toString(ref->base->data.quality);
+        text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->base->data.quality);
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -159,8 +158,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Lockpick::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Lockpick::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Tool> *ref =
+            ptr.get<ESM::Tool>();
+
+        return MWWorld::Ptr(&cell.lockpicks.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/lockpick.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Lockpick : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -52,6 +55,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/misc.cpp

@@ -5,20 +5,20 @@
 
 #include <components/esm/loadmisc.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
+#include "../mwworld/manualref.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 #include <boost/lexical_cast.hpp>
 
@@ -26,37 +26,38 @@ namespace MWClass
 {
     void Miscellaneous::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Miscellaneous>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Miscellaneous::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Miscellaneous>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Miscellaneous::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
+            ptr.get<ESM::Miscellaneous>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Miscellaneous::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         return ref->base->name;
@@ -65,15 +66,16 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Miscellaneous::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Miscellaneous::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         return ref->base->script;
@@ -81,7 +83,7 @@ namespace MWClass
 
     int Miscellaneous::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         return ref->base->data.value;
@@ -96,10 +98,10 @@ namespace MWClass
 
     std::string Miscellaneous::getUpSoundId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
-        if (ref->base->name == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+        if (ref->base->name == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sGold")->getString())
         {
             return std::string("Item Gold Up");
         }
@@ -108,10 +110,10 @@ namespace MWClass
 
     std::string Miscellaneous::getDownSoundId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
-        if (ref->base->name == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+        if (ref->base->name == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sGold")->getString())
         {
             return std::string("Item Gold Down");
         }
@@ -120,7 +122,7 @@ namespace MWClass
 
     std::string Miscellaneous::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         return ref->base->icon;
@@ -128,7 +130,7 @@ namespace MWClass
 
     bool Miscellaneous::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         return (ref->base->name != "");
@@ -136,7 +138,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Miscellaneous::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
             ptr.get<ESM::Miscellaneous>();
 
         MWGui::ToolTipInfo info;
@@ -145,7 +147,7 @@ namespace MWClass
 
         int count = ptr.getRefData().getCount();
 
-        bool isGold = (ref->base->name == store.gameSettings.search("sGold")->str);
+        bool isGold = (ref->base->name == store.gameSettings.find("sGold")->getString());
         if (isGold && count == 1)
             count = ref->base->data.value;
 
@@ -168,8 +170,8 @@ namespace MWClass
 
         if (!isGold)
         {
-            text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+            text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-            text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+            text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
         }
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
@@ -181,4 +183,39 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Miscellaneous::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::Ptr newPtr;
+
+        const ESMS::ESMStore &store =
+            MWBase::Environment::get().getWorld()->getStore();
+
+        if (MWWorld::Class::get(ptr).getName(ptr) == store.gameSettings.find("sGold")->getString()) {
+            int goldAmount = ptr.getRefData().getCount();
+
+            std::string base = "Gold_001";
+            if (goldAmount >= 100)
+                base = "Gold_100";
+            else if (goldAmount >= 25)
+                base = "Gold_025";
+            else if (goldAmount >= 10)
+                base = "Gold_010";
+            else if (goldAmount >= 5)
+                base = "Gold_005";
+
+            // Really, I have no idea why moving ref out of conditional
+            // scope causes list::push_back throwing std::bad_alloc
+            MWWorld::ManualRef newRef(store, base);
+            MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
+                newRef.getPtr().get<ESM::Miscellaneous>();
+            newPtr = MWWorld::Ptr(&cell.miscItems.insert(*ref), &cell);
+        } else {
+            MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
+                ptr.get<ESM::Miscellaneous>();
+            newPtr = MWWorld::Ptr(&cell.miscItems.insert(*ref), &cell);
+        }
+        return newPtr;
+    }
 }

apps/openmw/mwclass/misc.hpp

@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Miscellaneous : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
@@ -44,6 +47,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/npc.cpp

@@ -9,20 +9,25 @@
 
 #include <components/esm/loadnpc.hpp>
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/movement.hpp"
-#include "../mwmechanics/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
-#include "../mwworld/world.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/customdata.hpp"
+#include "../mwworld/physicssystem.hpp"
 
-#include "../mwgui/window_manager.hpp"
+#include "../mwrender/actors.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
-#include "../mwbase/environment.hpp"
+#include "../mwgui/tooltips.hpp"
 
 namespace
 {
@@ -53,7 +58,7 @@ namespace MWClass
         {
             std::auto_ptr<CustomData> data (new CustomData);
 
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ptr.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
             // NPC stats
             if (!ref->base->faction.empty())
@@ -62,11 +67,11 @@ namespace MWClass
                 boost::algorithm::to_lower(faction);
                 if(ref->base->npdt52.gold != -10)
                 {
-                    data->mNpcStats.mFactionRank[faction] = (int)ref->base->npdt52.rank;
+                    data->mNpcStats.getFactionRanks()[faction] = (int)ref->base->npdt52.rank;
                 }
                 else
                 {
-                    data->mNpcStats.mFactionRank[faction] = (int)ref->base->npdt12.rank;
+                    data->mNpcStats.getFactionRanks()[faction] = (int)ref->base->npdt12.rank;
                 }
             }
 
@@ -74,31 +79,36 @@ namespace MWClass
             if(ref->base->npdt52.gold != -10)
             {
                 for (int i=0; i<27; ++i)
-                    data->mNpcStats.mSkill[i].setBase (ref->base->npdt52.skills[i]);
+                    data->mNpcStats.getSkill (i).setBase (ref->base->npdt52.skills[i]);
 
-                data->mCreatureStats.mAttributes[0].set (ref->base->npdt52.strength);
+                data->mCreatureStats.getAttribute(0).set (ref->base->npdt52.strength);
-                data->mCreatureStats.mAttributes[1].set (ref->base->npdt52.intelligence);
+                data->mCreatureStats.getAttribute(1).set (ref->base->npdt52.intelligence);
-                data->mCreatureStats.mAttributes[2].set (ref->base->npdt52.willpower);
+                data->mCreatureStats.getAttribute(2).set (ref->base->npdt52.willpower);
-                data->mCreatureStats.mAttributes[3].set (ref->base->npdt52.agility);
+                data->mCreatureStats.getAttribute(3).set (ref->base->npdt52.agility);
-                data->mCreatureStats.mAttributes[4].set (ref->base->npdt52.speed);
+                data->mCreatureStats.getAttribute(4).set (ref->base->npdt52.speed);
-                data->mCreatureStats.mAttributes[5].set (ref->base->npdt52.endurance);
+                data->mCreatureStats.getAttribute(5).set (ref->base->npdt52.endurance);
-                data->mCreatureStats.mAttributes[6].set (ref->base->npdt52.personality);
+                data->mCreatureStats.getAttribute(6).set (ref->base->npdt52.personality);
-                data->mCreatureStats.mAttributes[7].set (ref->base->npdt52.luck);
+                data->mCreatureStats.getAttribute(7).set (ref->base->npdt52.luck);
-                data->mCreatureStats.mDynamic[0].set (ref->base->npdt52.health);
+                data->mCreatureStats.getHealth().set (ref->base->npdt52.health);
-                data->mCreatureStats.mDynamic[1].set (ref->base->npdt52.mana);
+                data->mCreatureStats.getMagicka().set (ref->base->npdt52.mana);
-                data->mCreatureStats.mDynamic[2].set (ref->base->npdt52.fatigue);
+                data->mCreatureStats.getFatigue().set (ref->base->npdt52.fatigue);
 
-                data->mCreatureStats.mLevel = ref->base->npdt52.level;
+                data->mCreatureStats.setLevel(ref->base->npdt52.level);
             }
             else
             {
                 /// \todo do something with npdt12 maybe:p
             }
 
-            data->mCreatureStats.mHello = ref->base->AI.hello;
+            data->mCreatureStats.setHello(ref->base->mAiData.mHello);
-            data->mCreatureStats.mFight = ref->base->AI.fight;
+            data->mCreatureStats.setFight(ref->base->mAiData.mFight);
-            data->mCreatureStats.mFlee = ref->base->AI.flee;
+            data->mCreatureStats.setFlee(ref->base->mAiData.mFlee);
-            data->mCreatureStats.mAlarm = ref->base->AI.alarm;
+            data->mCreatureStats.setAlarm(ref->base->mAiData.mAlarm);
+
+            // spells
+            for (std::vector<std::string>::const_iterator iter (ref->base->spells.list.begin());
+                iter!=ref->base->spells.list.end(); ++iter)
+                data->mCreatureStats.getSpells().add (*iter);
 
             // store
             ptr.getRefData().setCustomData (data.release());
@@ -107,7 +117,7 @@ namespace MWClass
 
     std::string Npc::getId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
 
         return ref->base->mId;
@@ -120,25 +130,36 @@ namespace MWClass
 
     void Npc::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+        physics.insertActorPhysics(ptr, getModel(ptr));
+        MWBase::Environment::get().getMechanicsManager()->addActor(ptr);
+    }
+
+    std::string Npc::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
+        assert(ref->base != NULL);
 
-        assert (ref->base != NULL);
         std::string headID = ref->base->head;
-        std::string bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4);
-        bool beast = bodyRaceID == "b_n_khajiit_m_" || bodyRaceID == "b_n_khajiit_f_" || bodyRaceID == "b_n_argonian_m_" || bodyRaceID == "b_n_argonian_f_";
 
-        std::string smodel = "meshes\\base_anim.nif";
+        int end = headID.find_last_of("head_") - 4;
-        if(beast)
+        std::string bodyRaceID = headID.substr(0, end);
-            smodel = "meshes\\base_animkna.nif";
+
-        physics.insertActorPhysics(ptr, smodel);
+        std::string model = "meshes\\base_anim.nif";
+        if (bodyRaceID == "b_n_khajiit_m_" ||
+            bodyRaceID == "b_n_khajiit_f_" ||
+            bodyRaceID == "b_n_argonian_m_" ||
+            bodyRaceID == "b_n_argonian_f_")
+        {
+            model = "meshes\\base_animkna.nif";
+        }
+        return model;
 
-        MWBase::Environment::get().getMechanicsManager()->addActor (ptr);
     }
 
     std::string Npc::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
 
         return ref->base->name;
@@ -182,7 +203,7 @@ namespace MWClass
 
     std::string Npc::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
 
         return ref->base->script;
@@ -196,12 +217,12 @@ namespace MWClass
         {
             case Run:
 
-                stats.mForceRun = force;
+                stats.setMovementFlag (MWMechanics::NpcStats::Flag_ForceRun, force);
                 break;
 
             case Sneak:
 
-                stats.mForceSneak = force;
+                stats.setMovementFlag (MWMechanics::NpcStats::Flag_ForceSneak, force);
                 break;
 
             case Combat:
@@ -218,17 +239,18 @@ namespace MWClass
         {
             case Run:
 
-                stats.mRun = set;
+                stats.setMovementFlag (MWMechanics::NpcStats::Flag_Run, set);
                 break;
 
             case Sneak:
 
-                stats.mSneak = set;
+                stats.setMovementFlag (MWMechanics::NpcStats::Flag_Sneak, set);
                 break;
 
             case Combat:
 
-                stats.mCombat = set;
+                // Combat stance ignored for now; need to be determined based on draw state instead of
+                // being maunally set.
                 break;
         }
     }
@@ -241,21 +263,21 @@ namespace MWClass
         {
             case Run:
 
-                if (!ignoreForce && stats.mForceRun)
+                if (!ignoreForce && stats.getMovementFlag (MWMechanics::NpcStats::Flag_ForceRun))
                     return true;
 
-                return stats.mRun;
+                return stats.getMovementFlag (MWMechanics::NpcStats::Flag_Run);
 
             case Sneak:
 
-                if (!ignoreForce && stats.mForceSneak)
+                if (!ignoreForce && stats.getMovementFlag (MWMechanics::NpcStats::Flag_ForceSneak))
                     return true;
 
-                return stats.mSneak;
+                return stats.getMovementFlag (MWMechanics::NpcStats::Flag_Sneak);
 
             case Combat:
 
-                return stats.mCombat;
+                return false;
         }
 
         return false;
@@ -277,7 +299,7 @@ namespace MWClass
     {
         Ogre::Vector3 vector (0, 0, 0);
 
-        vector.x = - getMovementSettings (ptr).mLeftRight * 127;
+        vector.x = getMovementSettings (ptr).mLeftRight * 127;
         vector.y = getMovementSettings (ptr).mForwardBackward * 127;
 		vector.z = getMovementSettings(ptr).mUpDown * 127;
 
@@ -302,7 +324,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Npc::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
             ptr.get<ESM::NPC>();
 
         MWGui::ToolTipInfo info;
@@ -319,7 +341,7 @@ namespace MWClass
     float Npc::getCapacity (const MWWorld::Ptr& ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
-        return stats.mAttributes[0].getModified()*5;
+        return stats.getAttribute(0).getModified()*5;
     }
 
     float Npc::getEncumbrance (const MWWorld::Ptr& ptr) const
@@ -328,13 +350,50 @@ namespace MWClass
 
         const MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
 
-        weight -= stats.mMagicEffects.get (MWMechanics::EffectKey (8)).mMagnitude; // feather
+        weight -= stats.getMagicEffects().get (MWMechanics::EffectKey (8)).mMagnitude; // feather
 
-        weight += stats.mMagicEffects.get (MWMechanics::EffectKey (7)).mMagnitude; // burden
+        weight += stats.getMagicEffects().get (MWMechanics::EffectKey (7)).mMagnitude; // burden
 
         if (weight<0)
             weight = 0;
 
         return weight;
     }
+
+    bool Npc::apply (const MWWorld::Ptr& ptr, const std::string& id,
+        const MWWorld::Ptr& actor) const
+    {
+        MWMechanics::CreatureStats& stats = getCreatureStats (ptr);
+
+        /// \todo consider instant effects
+
+        return stats.getActiveSpells().addSpell (id, actor);
+    }
+
+    void Npc::skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType) const
+    {
+        MWMechanics::NpcStats& stats = getNpcStats (ptr);
+
+        MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+
+        const ESM::Class *class_ = MWBase::Environment::get().getWorld()->getStore().classes.find (
+            ref->base->cls);
+
+        stats.useSkill (skill, *class_, usageType);
+    }
+
+    void Npc::adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const
+    {
+        y = 0;
+        x = 0;
+    }
+
+    MWWorld::Ptr
+    Npc::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::NPC> *ref =
+            ptr.get<ESM::NPC>();
+
+        return MWWorld::Ptr(&cell.npcs.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/npc.hpp

@@ -9,6 +9,9 @@ namespace MWClass
     {
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual std::string getId (const MWWorld::Ptr& ptr) const;
@@ -48,7 +51,7 @@ namespace MWClass
             virtual std::string getScript (const MWWorld::Ptr& ptr) const;
             ///< Return name of the script attached to ptr
 
-           virtual void setForceStance (const MWWorld::Ptr& ptr, Stance stance, bool force) const;
+            virtual void setForceStance (const MWWorld::Ptr& ptr, Stance stance, bool force) const;
             ///< Force or unforce a stance.
 
             virtual void setStance (const MWWorld::Ptr& ptr, Stance stance, bool set) const;
@@ -76,7 +79,25 @@ namespace MWClass
             ///< Returns total weight of objects inside this object (including modifications from magic
             /// effects). Throws an exception, if the object can't hold other objects.
 
+            virtual bool apply (const MWWorld::Ptr& ptr, const std::string& id,
+                const MWWorld::Ptr& actor) const;
+            ///< Apply \a id on \a ptr.
+            /// \param actor Actor that is resposible for the ID being applied to \a ptr.
+            /// \return Any effect?
+
+            virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType) const;
+            ///< Inform actor \a ptr that a skill use has succeeded.
+
+            virtual void adjustRotation(const MWWorld::Ptr& ptr,float& x,float& y,float& z) const;
+
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
+
+            virtual bool
+            isActor() const {
+                return true;
+            }
     };
 }
 

apps/openmw/mwclass/potion.cpp

@@ -3,56 +3,58 @@
 
 #include <components/esm/loadalch.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/actionapply.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
+#include "../mwworld/player.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Potion::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Potion>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Potion::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Potion>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Potion::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
+            ptr.get<ESM::Potion>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Potion::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         return ref->base->name;
@@ -61,15 +63,17 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Potion::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+    	boost::shared_ptr<MWWorld::Action> action(
+    	            new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+    	action->setSound (getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Potion::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         return ref->base->script;
@@ -77,7 +81,7 @@ namespace MWClass
 
     int Potion::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         return ref->base->data.value;
@@ -102,7 +106,7 @@ namespace MWClass
 
     std::string Potion::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         return ref->base->icon;
@@ -110,7 +114,7 @@ namespace MWClass
 
     bool Potion::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         return (ref->base->name != "");
@@ -118,21 +122,20 @@ namespace MWClass
 
     MWGui::ToolTipInfo Potion::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Potion, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
             ptr.get<ESM::Potion>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         info.effects = MWGui::Widgets::MWEffectList::effectListFromESM(&ref->base->effects);
+        info.isPotion = true;
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -143,4 +146,30 @@ namespace MWClass
 
         return info;
     }
+
+    boost::shared_ptr<MWWorld::Action> Potion::use (const MWWorld::Ptr& ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
+            ptr.get<ESM::Potion>();
+
+        ptr.getRefData().setCount (ptr.getRefData().getCount()-1);
+
+        MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+
+        boost::shared_ptr<MWWorld::Action> action (
+            new MWWorld::ActionApply (actor, ref->base->mId));
+
+        action->setSound ("Drink");
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Potion::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Potion> *ref =
+            ptr.get<ESM::Potion>();
+
+        return MWWorld::Ptr(&cell.potions.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/potion.hpp

@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Potion : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
@@ -34,6 +37,9 @@ namespace MWClass
             virtual int getValue (const MWWorld::Ptr& ptr) const;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
+            virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr) const;
+            ///< Generate action for using via inventory menu
+
             static void registerSelf();
 
             virtual std::string getUpSoundId (const MWWorld::Ptr& ptr) const;
@@ -44,6 +50,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/probe.cpp

@@ -3,58 +3,58 @@
 
 #include <components/esm/loadlocks.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
-#include "../mwgui/window_manager.hpp"
+#include "../mwworld/physicssystem.hpp"
+
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Probe::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Probe>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Probe::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Probe>();
+        if(!model.empty()) {
-
+            physics.insertObjectPhysics(ptr, model);
-
-        const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
     }
 
+    std::string Probe::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
+            ptr.get<ESM::Probe>();
+        assert(ref->base != NULL);
+
+        const std::string &model = ref->base->model;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
 
     std::string Probe::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         return ref->base->name;
@@ -62,15 +62,16 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Probe::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Probe::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         return ref->base->script;
@@ -87,7 +88,7 @@ namespace MWClass
 
     int Probe::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         return ref->base->data.value;
@@ -112,7 +113,7 @@ namespace MWClass
 
     std::string Probe::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         return ref->base->icon;
@@ -120,7 +121,7 @@ namespace MWClass
 
     bool Probe::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         return (ref->base->name != "");
@@ -128,23 +129,21 @@ namespace MWClass
 
     MWGui::ToolTipInfo Probe::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Probe, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
             ptr.get<ESM::Probe>();
 
         MWGui::ToolTipInfo info;
         info.caption = ref->base->name + MWGui::ToolTips::getCountString(ptr.getRefData().getCount());
         info.icon = ref->base->icon;
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         std::string text;
 
         /// \todo store remaining uses somewhere
 
-        text += "\n" + store.gameSettings.search("sUses")->str + ": " + MWGui::ToolTips::toString(ref->base->data.uses);
+        text += "\n#{sUses}: " + MWGui::ToolTips::toString(ref->base->data.uses);
-        text += "\n" + store.gameSettings.search("sQuality")->str + ": " + MWGui::ToolTips::toString(ref->base->data.quality);
+        text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->base->data.quality);
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -158,8 +157,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Probe::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Probe::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Probe> *ref =
+            ptr.get<ESM::Probe>();
+
+        return MWWorld::Ptr(&cell.probes.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/probe.hpp

@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Probe : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
@@ -52,6 +55,8 @@ namespace MWClass
             virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)
                 const;
             ///< Generate action for using via inventory menu
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/repair.cpp

@@ -3,55 +3,56 @@
 
 #include <components/esm/loadlocks.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
-#include "../mwgui/window_manager.hpp"
+#include "../mwworld/physicssystem.hpp"
+
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Repair::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Repair>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Repair::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Repair>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Repair::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
+            ptr.get<ESM::Repair>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Repair::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         return ref->base->name;
@@ -60,15 +61,16 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Repair::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     std::string Repair::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         return ref->base->script;
@@ -76,7 +78,7 @@ namespace MWClass
 
     int Repair::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         return ref->base->data.value;
@@ -101,7 +103,7 @@ namespace MWClass
 
     std::string Repair::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         return ref->base->icon;
@@ -109,7 +111,7 @@ namespace MWClass
 
     bool Repair::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         return (ref->base->name != "");
@@ -117,7 +119,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Repair::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Repair, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
             ptr.get<ESM::Repair>();
 
         MWGui::ToolTipInfo info;
@@ -128,11 +130,10 @@ namespace MWClass
 
         /// \todo store remaining uses somewhere
 
-        const ESMS::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+        text += "\n#{sUses}: " + MWGui::ToolTips::toString(ref->base->data.uses);
-        text += "\n" + store.gameSettings.search("sUses")->str + ": " + MWGui::ToolTips::toString(ref->base->data.uses);
+        text += "\n#{sQuality}: " + MWGui::ToolTips::toString(ref->base->data.quality);
-        text += "\n" + store.gameSettings.search("sQuality")->str + ": " + MWGui::ToolTips::toString(ref->base->data.quality);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
 
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
@@ -143,4 +144,13 @@ namespace MWClass
 
         return info;
     }
+
+    MWWorld::Ptr
+    Repair::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Repair> *ref =
+            ptr.get<ESM::Repair>();
+
+        return MWWorld::Ptr(&cell.repairs.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/repair.hpp

@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Repair : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
@@ -44,6 +47,8 @@ namespace MWClass
 
             virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
             ///< Return name of inventory icon.
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/static.cpp

@@ -4,40 +4,44 @@
 #include <components/esm/loadstat.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 namespace MWClass
 {
     void Static::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Static, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Static>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), true);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Static::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Static, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Static>();
+        if(!model.empty()) {
-
+            physics.insertObjectPhysics(ptr, model);
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if(!model.empty()){
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
     }
     
+    std::string Static::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Static> *ref =
+            ptr.get<ESM::Static>();
+        assert(ref->base != NULL);
+
+        const std::string &model = ref->base->model;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
+
     std::string Static::getName (const MWWorld::Ptr& ptr) const
     {
         return "";
@@ -49,4 +53,13 @@ namespace MWClass
 
         registerClass (typeid (ESM::Static).name(), instance);
     }
+
+    MWWorld::Ptr
+    Static::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Static> *ref =
+            ptr.get<ESM::Static>();
+
+        return MWWorld::Ptr(&cell.statics.insert(*ref), &cell);
+    }
 }

apps/openmw/mwclass/static.hpp

@@ -7,9 +7,12 @@ namespace MWClass
 {
     class Static : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
-             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
@@ -19,6 +22,8 @@ namespace MWClass
             /// can return an empty string.
 
             static void registerSelf();
+
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwclass/weapon.cpp

@@ -3,58 +3,58 @@
 
 #include <components/esm/loadweap.hpp>
 
-#include <components/esm_store/cell_store.hpp>
-
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-
+#include "../mwrender/renderinginterface.hpp"
-#include "../mwsound/soundmanager.hpp"
 
 namespace MWClass
 {
     void Weapon::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Weapon>();
+        if (!model.empty()) {
-
-        assert (ref->base != NULL);
-        const std::string &model = ref->base->model;
-
-        if (!model.empty())
-        {
             MWRender::Objects& objects = renderingInterface.getObjects();
             objects.insertBegin(ptr, ptr.getRefData().isEnabled(), false);
-            objects.insertMesh(ptr, "meshes\\" + model);
+            objects.insertMesh(ptr, model);
         }
     }
 
     void Weapon::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        const std::string model = getModel(ptr);
-            ptr.get<ESM::Weapon>();
+        if(!model.empty()) {
+            physics.insertObjectPhysics(ptr, model);
+        }
+    }
 
+    std::string Weapon::getModel(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
+            ptr.get<ESM::Weapon>();
+        assert(ref->base != NULL);
 
         const std::string &model = ref->base->model;
-        assert (ref->base != NULL);
+        if (!model.empty()) {
-        if(!model.empty()){
+            return "meshes\\" + model;
-            physics.insertObjectPhysics(ptr, "meshes\\" + model);
         }
-
+        return "";
     }
 
     std::string Weapon::getName (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->name;
@@ -63,10 +63,11 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Weapon::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound3D (ptr, getUpSoundId(ptr), 1.0, 1.0, MWSound::Play_NoTrack);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTake (ptr));
 
-        return boost::shared_ptr<MWWorld::Action> (
+        action->setSound(getUpSoundId(ptr));
-            new MWWorld::ActionTake (ptr));
+
+        return action;
     }
 
     bool Weapon::hasItemHealth (const MWWorld::Ptr& ptr) const
@@ -76,7 +77,7 @@ namespace MWClass
 
     int Weapon::getItemMaxHealth (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->data.health;
@@ -84,7 +85,7 @@ namespace MWClass
 
     std::string Weapon::getScript (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->script;
@@ -92,7 +93,7 @@ namespace MWClass
 
     std::pair<std::vector<int>, bool> Weapon::getEquipmentSlots (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         std::vector<int> slots;
@@ -116,7 +117,7 @@ namespace MWClass
 
     int Weapon::getEquipmentSkill (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         const int size = 12;
@@ -146,7 +147,7 @@ namespace MWClass
 
     int Weapon::getValue (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->data.value;
@@ -161,7 +162,7 @@ namespace MWClass
 
     std::string Weapon::getUpSoundId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         int type = ref->base->data.type;
@@ -207,7 +208,7 @@ namespace MWClass
 
     std::string Weapon::getDownSoundId (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         int type = ref->base->data.type;
@@ -253,7 +254,7 @@ namespace MWClass
 
     std::string Weapon::getInventoryIcon (const MWWorld::Ptr& ptr) const
     {
-          ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+          MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->icon;
@@ -261,7 +262,7 @@ namespace MWClass
 
     bool Weapon::hasToolTip (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return (ref->base->name != "");
@@ -269,7 +270,7 @@ namespace MWClass
 
     MWGui::ToolTipInfo Weapon::getToolTipInfo (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         MWGui::ToolTipInfo info;
@@ -283,7 +284,7 @@ namespace MWClass
         // weapon type & damage. arrows / bolts don't have his info.
         if (ref->base->data.type < 12)
         {
-            text += "\n" + store.gameSettings.search("sType")->str + " ";
+            text += "\n#{sType} ";
 
             std::map <int, std::pair <std::string, std::string> > mapping;
             mapping[ESM::Weapon::ShortBladeOneHand] = std::make_pair("sSkillShortblade", "sOneHanded");
@@ -302,29 +303,29 @@ namespace MWClass
             std::string type = mapping[ref->base->data.type].first;
             std::string oneOrTwoHanded = mapping[ref->base->data.type].second;
 
-            text += store.gameSettings.search(type)->str +
+            text += store.gameSettings.find(type)->getString() +
-                ((oneOrTwoHanded != "") ? ", " + store.gameSettings.search(oneOrTwoHanded)->str : "");
+                ((oneOrTwoHanded != "") ? ", " + store.gameSettings.find(oneOrTwoHanded)->getString() : "");
 
             // weapon damage
             if (ref->base->data.type >= 9)
             {
                 // marksman
-                text += "\n" + store.gameSettings.search("sAttack")->str + ": "
+                text += "\n#{sAttack}: "
                     + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.chop[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.chop[1]));
             }
             else
             {
                 // Chop
-                text += "\n" + store.gameSettings.search("sChop")->str + ": "
+                text += "\n#{sChop}: "
                     + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.chop[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.chop[1]));
                 // Slash
-                text += "\n" + store.gameSettings.search("sSlash")->str + ": "
+                text += "\n#{sSlash}: "
                     + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.slash[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.slash[1]));
                 // Thrust
-                text += "\n" + store.gameSettings.search("sThrust")->str + ": "
+                text += "\n#{sThrust}: "
                     + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.thrust[0]))
                     + " - " + MWGui::ToolTips::toString(static_cast<int>(ref->base->data.thrust[1]));
             }
@@ -332,10 +333,10 @@ namespace MWClass
 
         /// \todo store the current weapon health somewhere
         if (ref->base->data.type < 11) // thrown weapons and arrows/bolts don't have health, only quantity
-            text += "\n" + store.gameSettings.search("sCondition")->str + ": " + MWGui::ToolTips::toString(ref->base->data.health);
+            text += "\n#{sCondition}: " + MWGui::ToolTips::toString(ref->base->data.health);
 
-        text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
+        text += "\n#{sWeight}: " + MWGui::ToolTips::toString(ref->base->data.weight);
-        text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
+        text += MWGui::ToolTips::getValueString(ref->base->data.value, "#{sValue}");
 
         info.enchant = ref->base->enchant;
 
@@ -351,7 +352,7 @@ namespace MWClass
 
     std::string Weapon::getEnchantment (const MWWorld::Ptr& ptr) const
     {
-        ESMS::LiveCellRef<ESM::Weapon, MWWorld::RefData> *ref =
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
             ptr.get<ESM::Weapon>();
 
         return ref->base->enchant;
@@ -359,8 +360,19 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Weapon::use (const MWWorld::Ptr& ptr) const
     {
-        MWBase::Environment::get().getSoundManager()->playSound (getUpSoundId(ptr), 1.0, 1.0);
+        boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionEquip(ptr));
 
-        return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionEquip(ptr));
+        action->setSound(getUpSoundId(ptr));
+
+        return action;
+    }
+
+    MWWorld::Ptr
+    Weapon::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
+    {
+        MWWorld::LiveCellRef<ESM::Weapon> *ref =
+            ptr.get<ESM::Weapon>();
+
+        return MWWorld::Ptr(&cell.weapons.insert(*ref), &cell);
     }
 }

apps/openmw/mwclass/weapon.hpp

@@ -7,6 +7,9 @@ namespace MWClass
 {
     class Weapon : public MWWorld::Class
     {
+            virtual MWWorld::Ptr
+            copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const;
+
         public:
 
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
@@ -66,6 +69,7 @@ namespace MWClass
                 const;
             ///< Generate action for using via inventory menu
 
+            virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
 

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -1,5 +1,5 @@
 
-#include "dialoguemanager.hpp"
+#include "dialoguemanagerimp.hpp"
 
 #include <cctype>
 #include <algorithm>
@@ -10,34 +10,31 @@
 #include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/scriptmanager.hpp"
+#include "../mwbase/journal.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/world.hpp"
 #include "../mwworld/refdata.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/containerstore.hpp"
 
-#include "../mwinput/inputmanager.hpp"
 #include "../mwgui/dialogue.hpp"
-#include "../mwgui/window_manager.hpp"
-
-#include "journal.hpp"
 
 #include <iostream>
 
-#include "../mwscript/extensions.hpp"
-#include "../mwscript/scriptmanager.hpp"
-
 #include <components/compiler/exception.hpp>
 #include <components/compiler/errorhandler.hpp>
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
 #include <components/compiler/output.hpp>
+#include <components/compiler/scriptparser.hpp>
 #include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/compilercontext.hpp"
 #include "../mwscript/interpretercontext.hpp"
-#include <components/compiler/scriptparser.hpp>
+#include "../mwscript/extensions.hpp"
 
 #include "../mwclass/npc.hpp"
 #include "../mwmechanics/npcstats.hpp"
@@ -121,24 +118,24 @@ namespace
     }
 
     template<typename T>
-    bool checkGlobal (char comp, const std::string& name, T value, MWWorld::World& world)
+    bool checkGlobal (char comp, const std::string& name, T value)
     {
-        switch (world.getGlobalVariableType (name))
+        switch (MWBase::Environment::get().getWorld()->getGlobalVariableType (name))
         {
         case 's':
-            return selectCompare (comp, world.getGlobalVariable (name).mShort, value);
+            return selectCompare (comp, MWBase::Environment::get().getWorld()->getGlobalVariable (name).mShort, value);
 
         case 'l':
 
-            return selectCompare (comp, world.getGlobalVariable (name).mLong, value);
+            return selectCompare (comp, MWBase::Environment::get().getWorld()->getGlobalVariable (name).mLong, value);
 
         case 'f':
 
-            return selectCompare (comp, world.getGlobalVariable (name).mFloat, value);
+            return selectCompare (comp, MWBase::Environment::get().getWorld()->getGlobalVariable (name).mFloat, value);
 
         case ' ':
 
-            world.getGlobalVariable (name); // trigger exception
+            MWBase::Environment::get().getWorld()->getGlobalVariable (name); // trigger exception
             break;
 
         default:
@@ -203,10 +200,10 @@ namespace MWDialogue
                     MWMechanics::NpcStats PCstats = MWWorld::Class::get(MWBase::Environment::get().getWorld()->getPlayer().getPlayer()).getNpcStats(MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
                     MWMechanics::NpcStats NPCstats = MWWorld::Class::get(actor).getNpcStats(actor);
                     int sameFaction = 0;
-                    if(!NPCstats.mFactionRank.empty())
+                    if(!NPCstats.getFactionRanks().empty())
                     {
-                        std::string NPCFaction = NPCstats.mFactionRank.begin()->first;
+                        std::string NPCFaction = NPCstats.getFactionRanks().begin()->first;
-                        if(PCstats.mFactionRank.find(toLower(NPCFaction)) != PCstats.mFactionRank.end()) sameFaction = 1;
+                        if(PCstats.getFactionRanks().find(toLower(NPCFaction)) != PCstats.getFactionRanks().end()) sameFaction = 1;
                     }
                     if(!selectCompare<int,int>(comp,sameFaction,select.i)) return false;
                     }
@@ -309,12 +306,12 @@ namespace MWDialogue
                 if (select.type==ESM::VT_Short || select.type==ESM::VT_Int ||
                     select.type==ESM::VT_Long)
                 {
-                    if (!checkGlobal (comp, toLower (name), select.i, *MWBase::Environment::get().getWorld()))
+                    if (!checkGlobal (comp, toLower (name), select.i))
                         return false;
                 }
                 else if (select.type==ESM::VT_Float)
                 {
-                    if (!checkGlobal (comp, toLower (name), select.f, *MWBase::Environment::get().getWorld()))
+                    if (!checkGlobal (comp, toLower (name), select.f))
                         return false;
                 }
                 else
@@ -392,7 +389,7 @@ namespace MWDialogue
 
                 if(select.type==ESM::VT_Int)
                 {
-                    ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
+                    MWWorld::LiveCellRef<ESM::NPC>* npc = actor.get<ESM::NPC>();
                     int isFaction = int(toLower(npc->base->faction) == toLower(name));
                     if(selectCompare<int,int>(comp,!isFaction,select.i))
                         return false;
@@ -409,7 +406,7 @@ namespace MWDialogue
 
                 if(select.type==ESM::VT_Int)
                 {
-                    ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
+                    MWWorld::LiveCellRef<ESM::NPC>* npc = actor.get<ESM::NPC>();
                     int isClass = int(toLower(npc->base->cls) == toLower(name));
                     if(selectCompare<int,int>(comp,!isClass,select.i))
                         return false;
@@ -426,7 +423,7 @@ namespace MWDialogue
 
                 if(select.type==ESM::VT_Int)
                 {
-                    ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
+                    MWWorld::LiveCellRef<ESM::NPC>* npc = actor.get<ESM::NPC>();
                     int isRace = int(toLower(npc->base->race) == toLower(name));
                     if(selectCompare<int,int>(comp,!isRace,select.i))
                         return false;
@@ -493,7 +490,7 @@ namespace MWDialogue
             if (isCreature)
                 return false;
 
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *cellRef = actor.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC> *cellRef = actor.get<ESM::NPC>();
 
             if (!cellRef)
                 return false;
@@ -508,7 +505,7 @@ namespace MWDialogue
             if (isCreature)
                 return false;
 
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *cellRef = actor.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC> *cellRef = actor.get<ESM::NPC>();
 
             if (!cellRef)
                 return false;
@@ -525,8 +522,8 @@ namespace MWDialogue
 
             //MWWorld::Class npcClass = MWWorld::Class::get(actor);
             MWMechanics::NpcStats stats = MWWorld::Class::get(actor).getNpcStats(actor);
-            std::map<std::string,int>::iterator it = stats.mFactionRank.find(toLower(info.npcFaction));
+            std::map<std::string,int>::iterator it = stats.getFactionRanks().find(toLower(info.npcFaction));
-            if(it!=stats.mFactionRank.end())
+            if(it!=stats.getFactionRanks().end())
             {
                 //check rank
                 if(it->second < (int)info.data.rank) return false;
@@ -542,8 +539,8 @@ namespace MWDialogue
         if(!info.pcFaction.empty())
         {
             MWMechanics::NpcStats stats = MWWorld::Class::get(MWBase::Environment::get().getWorld()->getPlayer().getPlayer()).getNpcStats(MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
-            std::map<std::string,int>::iterator it = stats.mFactionRank.find(toLower(info.pcFaction));
+            std::map<std::string,int>::iterator it = stats.getFactionRanks().find(toLower(info.pcFaction));
-            if(it!=stats.mFactionRank.end())
+            if(it!=stats.getFactionRanks().end())
             {
                 //check rank
                 if(it->second < (int)info.data.PCrank) return false;
@@ -558,7 +555,7 @@ namespace MWDialogue
         //check gender
         if (!isCreature)
         {
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* npc = actor.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC>* npc = actor.get<ESM::NPC>();
             if(npc->base->flags&npc->base->Female)
             {
                 if(static_cast<int> (info.data.gender)==0)  return false;
@@ -591,7 +588,7 @@ namespace MWDialogue
         mIsInChoice = false;
         mCompilerContext.setExtensions (&extensions);
         mDialogueMap.clear();
-        actorKnownTopics.clear();
+        mActorKnownTopics.clear();
         ESMS::RecListCaseT<ESM::Dialogue>::MapType dialogueList = MWBase::Environment::get().getWorld()->getStore().dialogs.list;
         for(ESMS::RecListCaseT<ESM::Dialogue>::MapType::iterator it = dialogueList.begin(); it!=dialogueList.end();it++)
         {
@@ -599,26 +596,26 @@ namespace MWDialogue
         }
     }
 
-    void DialogueManager::addTopic(std::string topic)
+    void DialogueManager::addTopic (const std::string& topic)
     {
-        knownTopics[toLower(topic)] = true;
+        mKnownTopics[toLower(topic)] = true;
     }
 
-    void DialogueManager::parseText(std::string text)
+    void DialogueManager::parseText (std::string text)
     {
         std::list<std::string>::iterator it;
-        for(it = actorKnownTopics.begin();it != actorKnownTopics.end();++it)
+        for(it = mActorKnownTopics.begin();it != mActorKnownTopics.end();++it)
         {
             size_t pos = find_str_ci(text,*it,0);
             if(pos !=std::string::npos)
             {
                 if(pos==0)
                 {
-                    knownTopics[*it] = true;
+                    mKnownTopics[*it] = true;
                 }
                 else if(text.substr(pos -1,1) == " ")
                 {
-                    knownTopics[*it] = true;
+                    mKnownTopics[*it] = true;
                 }
             }
         }
@@ -632,7 +629,7 @@ namespace MWDialogue
 
         mActor = actor;
 
-        actorKnownTopics.clear();
+        mActorKnownTopics.clear();
 
         //initialise the GUI
         MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue);
@@ -706,7 +703,7 @@ namespace MWDialogue
             }
             return false;
         }
-        catch (const Compiler::SourceException& error)
+        catch (const Compiler::SourceException& /* error */)
         {
             // error has already been reported via error handler
         }
@@ -742,7 +739,7 @@ namespace MWDialogue
         std::list<std::string> keywordList;
         int choice = mChoice;
         mChoice = -1;
-        actorKnownTopics.clear();
+        mActorKnownTopics.clear();
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         ESMS::RecListCaseT<ESM::Dialogue>::MapType dialogueList = MWBase::Environment::get().getWorld()->getStore().dialogs.list;
         for(ESMS::RecListCaseT<ESM::Dialogue>::MapType::iterator it = dialogueList.begin(); it!=dialogueList.end();it++)
@@ -755,9 +752,9 @@ namespace MWDialogue
                 {
                     if (isMatching (mActor, *iter) && functionFilter(mActor,*iter,true))
                     {
-                        actorKnownTopics.push_back(toLower(it->first));
+                        mActorKnownTopics.push_back(toLower(it->first));
                         //does the player know the topic?
-                        if(knownTopics.find(toLower(it->first)) != knownTopics.end())
+                        if(mKnownTopics.find(toLower(it->first)) != mKnownTopics.end())
                         {
                             keywordList.push_back(it->first);
                             break;
@@ -771,15 +768,15 @@ namespace MWDialogue
         int services = 0;
         if (mActor.getTypeName() == typeid(ESM::NPC).name())
         {
-            ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* ref = mActor.get<ESM::NPC>();
+            MWWorld::LiveCellRef<ESM::NPC>* ref = mActor.get<ESM::NPC>();
-            if (ref->base->hasAI)
+            if (ref->base->mHasAI)
-                services = ref->base->AI.services;
+                services = ref->base->mAiData.mServices;
         }
         else if (mActor.getTypeName() == typeid(ESM::Creature).name())
         {
-            ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData>* ref = mActor.get<ESM::Creature>();
+            MWWorld::LiveCellRef<ESM::Creature>* ref = mActor.get<ESM::Creature>();
-            if (ref->base->hasAI)
+            if (ref->base->mHasAI)
-                services = ref->base->AI.services;
+                services = ref->base->mAiData.mServices;
         }
 
         if (services & ESM::NPC::Weapon
@@ -797,6 +794,11 @@ namespace MWDialogue
         else
             win->setShowTrade(false);
 
+        if (services & ESM::NPC::Spells)
+            win->setShowSpells(true);
+        else
+            win->setShowSpells(false);
+
         // sort again, because the previous sort was case-sensitive
         keywordList.sort(stringCompareNoCase);
         win->setKeywords(keywordList);
@@ -804,7 +806,7 @@ namespace MWDialogue
         mChoice = choice;
     }
 
-    void DialogueManager::keywordSelected(std::string keyword)
+    void DialogueManager::keywordSelected (const std::string& keyword)
     {
         if(!mIsInChoice)
         {
@@ -846,11 +848,11 @@ namespace MWDialogue
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
     }
 
-    void DialogueManager::questionAnswered(std::string answere)
+    void DialogueManager::questionAnswered (const std::string& answer)
     {
-        if(mChoiceMap.find(answere) != mChoiceMap.end())
+        if(mChoiceMap.find(answer) != mChoiceMap.end())
         {
-            mChoice = mChoiceMap[answere];
+            mChoice = mChoiceMap[answer];
 
             std::vector<ESM::DialInfo>::const_iterator iter;
             if(mDialogueMap.find(mLastTopic) != mDialogueMap.end())
@@ -882,13 +884,13 @@ namespace MWDialogue
         }
     }
 
-    void DialogueManager::printError(std::string error)
+    void DialogueManager::printError (std::string error)
     {
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         win->addText(error);
     }
 
-    void DialogueManager::askQuestion(std::string question, int choice)
+    void DialogueManager::askQuestion (const std::string& question, int choice)
     {
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         win->askQuestion(question);
@@ -896,20 +898,20 @@ namespace MWDialogue
         mIsInChoice = true;
     }
 
-    std::string DialogueManager::getFaction()
+    std::string DialogueManager::getFaction() const
     {
         if (mActor.getTypeName() != typeid(ESM::NPC).name())
             return "";
 
         std::string factionID("");
         MWMechanics::NpcStats stats = MWWorld::Class::get(mActor).getNpcStats(mActor);
-        if(stats.mFactionRank.empty())
+        if(stats.getFactionRanks().empty())
         {
             std::cout << "No faction for this actor!";
         }
         else
         {
-            factionID = stats.mFactionRank.begin()->first;
+            factionID = stats.getFactionRanks().begin()->first;
         }
         return factionID;
     }

apps/openmw/mwdialogue/dialoguemanagerimp.hpp

@@ -1,5 +1,7 @@
-#ifndef GAME_MMDIALOG_DIALOGUEMANAGER_H
+#ifndef GAME_MWDIALOG_DIALOGUEMANAGERIMP_H
-#define GAME_MWDIALOG_DIALOGUEMANAGER_H
+#define GAME_MWDIALOG_DIALOGUEMANAGERIMP_H
+
+#include "../mwbase/dialoguemanager.hpp"
 
 #include <components/esm/loadinfo.hpp>
 
@@ -9,11 +11,12 @@
 #include <components/compiler/output.hpp>
 
 #include "../mwworld/ptr.hpp"
+
 #include <map>
 
 namespace MWDialogue
 {
-    class DialogueManager
+    class DialogueManager : public MWBase::DialogueManager
     {
             bool isMatching (const MWWorld::Ptr& actor, const ESM::DialInfo::SelectStruct& select) const;
 
@@ -26,8 +29,8 @@ namespace MWDialogue
             void updateTopics();
 
             std::map<std::string,ESM::Dialogue> mDialogueMap;
-            std::map<std::string,bool> knownTopics;// Those are the topics the player knows.
+            std::map<std::string,bool> mKnownTopics;// Those are the topics the player knows.
-            std::list<std::string> actorKnownTopics;
+            std::list<std::string> mActorKnownTopics;
 
             MWScript::CompilerContext mCompilerContext;
             std::ostream mErrorStream;
@@ -50,21 +53,21 @@ namespace MWDialogue
 
             DialogueManager (const Compiler::Extensions& extensions);
 
-            void startDialogue (const MWWorld::Ptr& actor);
+            virtual void startDialogue (const MWWorld::Ptr& actor);
 
-            void addTopic(std::string topic);
+            virtual void addTopic (const std::string& topic);
 
-            void askQuestion(std::string question,int choice);
+            virtual void askQuestion (const std::string& question,int choice);
 
-            void goodbye();
+            virtual void goodbye();
 
             ///get the faction of the actor you are talking with
-            std::string getFaction();
+            virtual std::string getFaction() const;
 
             //calbacks for the GUI
-            void keywordSelected(std::string keyword);
+            virtual void keywordSelected (const std::string& keyword);
-            void goodbyeSelected();
+            virtual void goodbyeSelected();
-            void questionAnswered(std::string answere);
+            virtual void questionAnswered (const std::string& answer);
 
     };
 }

apps/openmw/mwdialogue/journalentry.cpp

@@ -5,7 +5,8 @@
 
 #include <components/esm_store/store.hpp>
 
-#include "../mwworld/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWDialogue
 {
@@ -27,16 +28,14 @@ namespace MWDialogue
         throw std::runtime_error ("unknown info ID " + mInfoId + " for topic " + mTopic);
     }
 
-    JournalEntry JournalEntry::makeFromQuest (const std::string& topic, int index,
+    JournalEntry JournalEntry::makeFromQuest (const std::string& topic, int index)
-        const MWWorld::World& world)
     {
-        return JournalEntry (topic, idFromIndex (topic, index, world));
+        return JournalEntry (topic, idFromIndex (topic, index));
     }
 
-    std::string JournalEntry::idFromIndex (const std::string& topic, int index,
+    std::string JournalEntry::idFromIndex (const std::string& topic, int index)
-        const MWWorld::World& world)
     {
-        const ESM::Dialogue *dialogue = world.getStore().dialogs.find (topic);
+        const ESM::Dialogue *dialogue = MWBase::Environment::get().getWorld()->getStore().dialogs.find (topic);
 
         for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
@@ -57,13 +56,12 @@ namespace MWDialogue
     : JournalEntry (topic, infoId), mDay (day), mMonth (month), mDayOfMonth (dayOfMonth)
     {}
 
-    StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index,
+    StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index)
-        const MWWorld::World& world)
     {
-        int day = world.getGlobalVariable ("dayspassed").mLong;
+        int day = MWBase::Environment::get().getWorld()->getGlobalVariable ("dayspassed").mLong;
-        int month = world.getGlobalVariable ("day").mLong;
+        int month = MWBase::Environment::get().getWorld()->getGlobalVariable ("day").mLong;
-        int dayOfMonth = world.getGlobalVariable ("month").mLong;
+        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalVariable ("month").mLong;
 
-        return StampedJournalEntry (topic, idFromIndex (topic, index, world), day, month, dayOfMonth);
+        return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth);
     }
 }

apps/openmw/mwdialogue/journalentry.hpp

@@ -1,5 +1,5 @@
-#ifndef GAME_MMDIALOGUE_JOURNALENTRY_H
+#ifndef GAME_MWDIALOGUE_JOURNALENTRY_H
-#define GAME_MMDIALOGUE_JOURNALENTRY_H
+#define GAME_MWDIALOGUE_JOURNALENTRY_H
 
 #include <string>
 
@@ -8,11 +8,6 @@ namespace ESMS
     struct ESMStore;
 }
 
-namespace MWWorld
-{
-    class World;
-}
-
 namespace MWDialogue
 {
     /// \brief A quest or dialogue entry
@@ -27,11 +22,9 @@ namespace MWDialogue
 
         std::string getText (const ESMS::ESMStore& store) const;
 
-        static JournalEntry makeFromQuest (const std::string& topic, int index,
+        static JournalEntry makeFromQuest (const std::string& topic, int index);
-            const MWWorld::World& world);
 
-        static std::string idFromIndex (const std::string& topic, int index,
+        static std::string idFromIndex (const std::string& topic, int index);
-            const MWWorld::World& world);
     };
 
     /// \biref A quest entry with a timestamp.
@@ -46,8 +39,7 @@ namespace MWDialogue
         StampedJournalEntry (const std::string& topic, const std::string& infoId,
             int day, int month, int dayOfMonth);
 
-        static StampedJournalEntry makeFromQuest (const std::string& topic, int index,
+        static StampedJournalEntry makeFromQuest (const std::string& topic, int index);
-            const MWWorld::World& world);
     };
 }
 

apps/openmw/mwdialogue/journalimp.cpp

@@ -1,13 +1,14 @@
 
-#include "journal.hpp"
+#include "journalimp.hpp"
+
+#include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
-#include "../mwgui/window_manager.hpp"
 #include "../mwgui/messagebox.hpp"
 
-#include "../mwworld/world.hpp"
-
 namespace MWDialogue
 {
     Quest& Journal::getQuest (const std::string& id)
@@ -30,17 +31,16 @@ namespace MWDialogue
 
     void Journal::addEntry (const std::string& id, int index)
     {
-        StampedJournalEntry entry =
+        StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index);
-            StampedJournalEntry::makeFromQuest (id, index, *MWBase::Environment::get().getWorld());
 
         mJournal.push_back (entry);
 
         Quest& quest = getQuest (id);
 
-        quest.addEntry (entry, *MWBase::Environment::get().getWorld()); // we are doing slicing on purpose here
+        quest.addEntry (entry); // we are doing slicing on purpose here
 
         std::vector<std::string> empty;
-        std::string notification = MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sJournalEntry")->str;
+        std::string notification = "#{sJournalEntry}";
         MWBase::Environment::get().getWindowManager()->messageBox (notification, empty);
     }
 
@@ -48,7 +48,7 @@ namespace MWDialogue
     {
         Quest& quest = getQuest (id);
 
-        quest.setIndex (index, *MWBase::Environment::get().getWorld());
+        quest.setIndex (index);
     }
 
     void Journal::addTopic (const std::string& topicId, const std::string& infoId)
@@ -63,7 +63,7 @@ namespace MWDialogue
             iter = result.first;
         }
 
-        iter->second.addEntry (JournalEntry (topicId, infoId), *MWBase::Environment::get().getWorld());
+        iter->second.addEntry (JournalEntry (topicId, infoId));
     }
 
     int Journal::getJournalIndex (const std::string& id) const

apps/openmw/mwdialogue/journalimp.hpp

@@ -1,9 +1,7 @@
-#ifndef GAME_MMDIALOG_JOURNAL_H
+#ifndef GAME_MWDIALOG_JOURNAL_H
 #define GAME_MWDIALOG_JOURNAL_H
 
-#include <string>
+#include "../mwbase/journal.hpp"
-#include <deque>
-#include <map>
 
 #include "journalentry.hpp"
 #include "quest.hpp"
@@ -11,19 +9,8 @@
 namespace MWDialogue
 {
     /// \brief The player's journal
-    class Journal
+    class Journal : public MWBase::Journal
     {
-        public:
-
-            typedef std::deque<StampedJournalEntry> TEntryContainer;
-            typedef TEntryContainer::const_iterator TEntryIter;
-            typedef std::map<std::string, Quest> TQuestContainer; // topc, quest
-            typedef TQuestContainer::const_iterator TQuestIter;
-            typedef std::map<std::string, Topic> TTopicContainer; // topic-id, topic-content
-            typedef TTopicContainer::const_iterator TTopicIter;
-
-        private:
-
             TEntryContainer mJournal;
             TQuestContainer mQuests;
             TTopicContainer mTopics;
@@ -34,37 +21,37 @@ namespace MWDialogue
 
             Journal();
 
-            void addEntry (const std::string& id, int index);
+            virtual void addEntry (const std::string& id, int index);
             ///< Add a journal entry.
 
-            void setJournalIndex (const std::string& id, int index);
+            virtual void setJournalIndex (const std::string& id, int index);
             ///< Set the journal index without adding an entry.
 
-            int getJournalIndex (const std::string& id) const;
+            virtual int getJournalIndex (const std::string& id) const;
             ///< Get the journal index.
 
-            void addTopic (const std::string& topicId, const std::string& infoId);
+            virtual void addTopic (const std::string& topicId, const std::string& infoId);
 
-            TEntryIter begin() const;
+            virtual TEntryIter begin() const;
             ///< Iterator pointing to the begin of the main journal.
             ///
             /// \note Iterators to main journal entries will never become invalid.
 
-            TEntryIter end() const;
+            virtual TEntryIter end() const;
             ///< Iterator pointing past the end of the main journal.
 
-            TQuestIter questBegin() const;
+            virtual TQuestIter questBegin() const;
             ///< Iterator pointing to the first quest (sorted by topic ID)
 
-            TQuestIter questEnd() const;
+            virtual TQuestIter questEnd() const;
             ///< Iterator pointing past the last quest.
 
-            TTopicIter topicBegin() const;
+            virtual TTopicIter topicBegin() const;
             ///< Iterator pointing to the first topic (sorted by topic ID)
             ///
             /// \note The topic ID is identical with the user-visible topic string.
 
-            TTopicIter topicEnd() const;
+            virtual TTopicIter topicEnd() const;
             ///< Iterator pointing past the last topic.
     };
 }

apps/openmw/mwdialogue/quest.cpp

@@ -3,7 +3,8 @@
 
 #include <components/esm_store/store.hpp>
 
-#include "../mwworld/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWDialogue
 {
@@ -15,9 +16,9 @@ namespace MWDialogue
     : Topic (topic), mIndex (0), mFinished (false)
     {}
 
-    const std::string Quest::getName (const MWWorld::World& world) const
+    const std::string Quest::getName() const
     {
-        const ESM::Dialogue *dialogue = world.getStore().dialogs.find (mTopic);
+        const ESM::Dialogue *dialogue = MWBase::Environment::get().getWorld()->getStore().dialogs.find (mTopic);
 
         for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
@@ -32,9 +33,9 @@ namespace MWDialogue
         return mIndex;
     }
 
-    void Quest::setIndex (int index, const MWWorld::World& world)
+    void Quest::setIndex (int index)
     {
-        const ESM::Dialogue *dialogue = world.getStore().dialogs.find (mTopic);
+        const ESM::Dialogue *dialogue = MWBase::Environment::get().getWorld()->getStore().dialogs.find (mTopic);
 
         for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
@@ -58,11 +59,11 @@ namespace MWDialogue
         return mFinished;
     }
 
-    void Quest::addEntry (const JournalEntry& entry, const MWWorld::World& world)
+    void Quest::addEntry (const JournalEntry& entry)
     {
         int index = -1;
 
-        const ESM::Dialogue *dialogue = world.getStore().dialogs.find (entry.mTopic);
+        const ESM::Dialogue *dialogue = MWBase::Environment::get().getWorld()->getStore().dialogs.find (entry.mTopic);
 
         for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
@@ -75,7 +76,7 @@ namespace MWDialogue
         if (index==-1)
             throw std::runtime_error ("unknown journal entry for topic " + mTopic);
 
-        setIndex (index, world);
+        setIndex (index);
 
         for (TEntryIter iter (mEntries.begin()); iter!=mEntries.end(); ++iter)
             if (*iter==entry.mInfoId)

apps/openmw/mwdialogue/quest.hpp

@@ -1,4 +1,4 @@
-#ifndef GAME_MMDIALOG_QUEST_H
+#ifndef GAME_MWDIALOG_QUEST_H
 #define GAME_MWDIALOG_QUEST_H
 
 #include "topic.hpp"
@@ -17,17 +17,17 @@ namespace MWDialogue
 
             Quest (const std::string& topic);
 
-            const std::string getName (const MWWorld::World& world) const;
+            const std::string getName() const;
             ///< May be an empty string
 
             int getIndex() const;
 
-            void setIndex (int index, const MWWorld::World& world);
+            void setIndex (int index);
             ///< Calling this function with a non-existant index while throw an exception.
 
             bool isFinished() const;
 
-            virtual void addEntry (const JournalEntry& entry, const MWWorld::World& world);
+            virtual void addEntry (const JournalEntry& entry);
             ///< Add entry and adjust index accordingly.
             ///
             /// \note Redundant entries are ignored, but the index is still adjusted.

apps/openmw/mwdialogue/topic.cpp

@@ -3,8 +3,6 @@
 
 #include <components/esm_store/store.hpp>
 
-#include "../mwworld/world.hpp"
-
 namespace MWDialogue
 {
     Topic::Topic()
@@ -17,7 +15,7 @@ namespace MWDialogue
     Topic::~Topic()
     {}
 
-    void Topic::addEntry (const JournalEntry& entry, const MWWorld::World& world)
+    void Topic::addEntry (const JournalEntry& entry)
     {
         if (entry.mTopic!=mTopic)
             throw std::runtime_error ("topic does not match: " + mTopic);

apps/openmw/mwdialogue/topic.hpp

@@ -1,4 +1,4 @@
-#ifndef GAME_MMDIALOG_TOPIC_H
+#ifndef GAME_MWDIALOG_TOPIC_H
 #define GAME_MWDIALOG_TOPIC_H
 
 #include <string>
@@ -6,11 +6,6 @@
 
 #include "journalentry.hpp"
 
-namespace MWWorld
-{
-    class World;
-}
-
 namespace MWDialogue
 {
     /// \brief Collection of seen responses for a topic
@@ -34,7 +29,7 @@ namespace MWDialogue
 
             virtual ~Topic();
 
-            virtual void addEntry (const JournalEntry& entry, const MWWorld::World& world);
+            virtual void addEntry (const JournalEntry& entry);
             ///< Add entry
             ///
             /// \note Redundant entries are ignored.

apps/openmw/mwgui/alchemywindow.cpp

@@ -3,13 +3,13 @@
 #include <boost/algorithm/string.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/player.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwsound/soundmanager.hpp"
-
-#include "window_manager.hpp"
 
 namespace
 {
@@ -26,8 +26,8 @@ namespace
 
 namespace MWGui
 {
-    AlchemyWindow::AlchemyWindow(WindowManager& parWindowManager)
+    AlchemyWindow::AlchemyWindow(MWBase::WindowManager& parWindowManager)
-        : WindowBase("openmw_alchemy_window_layout.xml", parWindowManager)
+        : WindowBase("openmw_alchemy_window.layout", parWindowManager)
         , ContainerBase(0)
     {
         getWidget(mCreateButton, "CreateButton");
@@ -48,14 +48,6 @@ namespace MWGui
         mIngredient3->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
         mIngredient4->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
 
-        MyGUI::Widget* buttonBox = mCancelButton->getParent();
-        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
-        mCancelButton->setCoord(buttonBox->getWidth() - cancelButtonWidth,
-                                mCancelButton->getTop(), cancelButtonWidth, mCancelButton->getHeight());
-        int createButtonWidth = mCreateButton->getTextSize().width + 24;
-        mCreateButton->setCoord(buttonBox->getWidth() - createButtonWidth - cancelButtonWidth - 4,
-                                mCreateButton->getTop(), createButtonWidth, mCreateButton->getHeight());
-
         mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked);
 
@@ -275,7 +267,7 @@ namespace MWGui
         for (MWWorld::ContainerStoreIterator it(store.begin(MWWorld::ContainerStore::Type_Apparatus));
             it != store.end(); ++it)
         {
-            ESMS::LiveCellRef<ESM::Apparatus, MWWorld::RefData>* ref = it->get<ESM::Apparatus>();
+            MWWorld::LiveCellRef<ESM::Apparatus>* ref = it->get<ESM::Apparatus>();
             if (ref->base->data.type == ESM::Apparatus::Albemic
             && (bestAlbemic.isEmpty() || ref->base->data.quality > bestAlbemic.get<ESM::Apparatus>()->base->data.quality))
                 bestAlbemic = *it;
@@ -420,7 +412,7 @@ namespace MWGui
                 continue;
 
             // add the effects of this ingredient to list of effects
-            ESMS::LiveCellRef<ESM::Ingredient, MWWorld::RefData>* ref = ingredient->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>();
+            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ingredient->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>();
             for (int i=0; i<4; ++i)
             {
                 if (ref->base->data.effectID[i] < 0)
@@ -493,7 +485,7 @@ namespace MWGui
 
         MyGUI::IntCoord coord(0, 0, mEffectsBox->getWidth(), 24);
         Widgets::MWEffectListPtr effectsWidget = mEffectsBox->createWidget<Widgets::MWEffectList>
-            ("MW_StatName", coord, Align::Left | Align::Top);
+            ("MW_StatName", coord, MyGUI::Align::Left | MyGUI::Align::Top);
         effectsWidget->setWindowManager(&mWindowManager);
         effectsWidget->setEffectList(effects);
 

apps/openmw/mwgui/alchemywindow.hpp

@@ -3,13 +3,14 @@
 
 #include "window_base.hpp"
 #include "container.hpp"
+#include "widgets.hpp"
 
 namespace MWGui
 {
     class AlchemyWindow : public WindowBase, public ContainerBase
     {
     public:
-        AlchemyWindow(WindowManager& parWindowManager);
+        AlchemyWindow(MWBase::WindowManager& parWindowManager);
 
         virtual void open();
 

apps/openmw/mwgui/birth.cpp

@@ -1,29 +1,34 @@
 #include "birth.hpp"
-#include "window_manager.hpp"
-#include "widgets.hpp"
-#include "components/esm_store/store.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
+#include "components/esm_store/store.hpp"
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "widgets.hpp"
+
 using namespace MWGui;
 using namespace Widgets;
 
-BirthDialog::BirthDialog(WindowManager& parWindowManager)
+BirthDialog::BirthDialog(MWBase::WindowManager& parWindowManager)
-  : WindowBase("openmw_chargen_birth_layout.xml", parWindowManager)
+  : WindowBase("openmw_chargen_birth.layout", parWindowManager)
 {
     // Centre dialog
     center();
 
-    getWidget(spellArea, "SpellArea");
+    getWidget(mSpellArea, "SpellArea");
 
-    getWidget(birthImage, "BirthsignImage");
+    getWidget(mBirthImage, "BirthsignImage");
 
-    getWidget(birthList, "BirthsignList");
+    getWidget(mBirthList, "BirthsignList");
-    birthList->setScrollVisible(true);
+    mBirthList->setScrollVisible(true);
-    birthList->eventListSelectAccept += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    mBirthList->eventListSelectAccept += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
-    birthList->eventListMouseItemActivate += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    mBirthList->eventListMouseItemActivate += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
-    birthList->eventListChangePosition += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
+    mBirthList->eventListChangePosition += MyGUI::newDelegate(this, &BirthDialog::onSelectBirth);
 
     MyGUI::ButtonPtr backButton;
     getWidget(backButton, "BackButton");
@@ -40,9 +45,6 @@ BirthDialog::BirthDialog(WindowManager& parWindowManager)
 
 void BirthDialog::setNextButtonShow(bool shown)
 {
-    MyGUI::ButtonPtr backButton;
-    getWidget(backButton, "BackButton");
-
     MyGUI::ButtonPtr okButton;
     getWidget(okButton, "OKButton");
 
@@ -50,32 +52,26 @@ void BirthDialog::setNextButtonShow(bool shown)
         okButton->setCaption(mWindowManager.getGameSettingString("sNext", ""));
     else
         okButton->setCaption(mWindowManager.getGameSettingString("sOK", ""));
-
-    int okButtonWidth = okButton->getTextSize().width + 24;
-    int backButtonWidth = backButton->getTextSize().width + 24;
-
-    okButton->setCoord(473 - okButtonWidth, 340, okButtonWidth, 23);
-    backButton->setCoord(473 - okButtonWidth - backButtonWidth - 6, 340, backButtonWidth, 23);
 }
 
 void BirthDialog::open()
 {
+    WindowBase::open();
     updateBirths();
     updateSpells();
-    setVisible(true);
 }
 
 
 void BirthDialog::setBirthId(const std::string &birthId)
 {
-    currentBirthId = birthId;
+    mCurrentBirthId = birthId;
-    birthList->setIndexSelected(MyGUI::ITEM_NONE);
+    mBirthList->setIndexSelected(MyGUI::ITEM_NONE);
-    size_t count = birthList->getItemCount();
+    size_t count = mBirthList->getItemCount();
     for (size_t i = 0; i < count; ++i)
     {
-        if (boost::iequals(*birthList->getItemDataAt<std::string>(i), birthId))
+        if (boost::iequals(*mBirthList->getItemDataAt<std::string>(i), birthId))
         {
-            birthList->setIndexSelected(i);
+            mBirthList->setIndexSelected(i);
             break;
         }
     }
@@ -100,11 +96,11 @@ void BirthDialog::onSelectBirth(MyGUI::ListBox* _sender, size_t _index)
     if (_index == MyGUI::ITEM_NONE)
         return;
 
-    const std::string *birthId = birthList->getItemDataAt<std::string>(_index);
+    const std::string *birthId = mBirthList->getItemDataAt<std::string>(_index);
-    if (boost::iequals(currentBirthId, *birthId))
+    if (boost::iequals(mCurrentBirthId, *birthId))
         return;
 
-    currentBirthId = *birthId;
+    mCurrentBirthId = *birthId;
     updateSpells();
 }
 
@@ -112,9 +108,9 @@ void BirthDialog::onSelectBirth(MyGUI::ListBox* _sender, size_t _index)
 
 void BirthDialog::updateBirths()
 {
-    birthList->removeAllItems();
+    mBirthList->removeAllItems();
 
-    const ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
 
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator it = store.birthSigns.list.begin();
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator end = store.birthSigns.list.end();
@@ -122,34 +118,34 @@ void BirthDialog::updateBirths()
     for (; it != end; ++it)
     {
         const ESM::BirthSign &birth = it->second;
-        birthList->addItem(birth.name, it->first);
+        mBirthList->addItem(birth.name, it->first);
-        if (boost::iequals(it->first, currentBirthId))
+        if (boost::iequals(it->first, mCurrentBirthId))
-            birthList->setIndexSelected(index);
+            mBirthList->setIndexSelected(index);
         ++index;
     }
 }
 
 void BirthDialog::updateSpells()
 {
-    for (std::vector<MyGUI::WidgetPtr>::iterator it = spellItems.begin(); it != spellItems.end(); ++it)
+    for (std::vector<MyGUI::WidgetPtr>::iterator it = mSpellItems.begin(); it != mSpellItems.end(); ++it)
     {
         MyGUI::Gui::getInstance().destroyWidget(*it);
     }
-    spellItems.clear();
+    mSpellItems.clear();
 
-    if (currentBirthId.empty())
+    if (mCurrentBirthId.empty())
         return;
 
     MWSpellPtr spellWidget;
     const int lineHeight = 18;
-    MyGUI::IntCoord coord(0, 0, spellArea->getWidth(), 18);
+    MyGUI::IntCoord coord(0, 0, mSpellArea->getWidth(), 18);
 
-    const ESMS::ESMStore &store = mWindowManager.getStore();
+    const ESMS::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-    const ESM::BirthSign *birth = store.birthSigns.find(currentBirthId);
+    const ESM::BirthSign *birth = store.birthSigns.find(mCurrentBirthId);
 
     std::string texturePath = std::string("textures\\") + birth->texture;
     fixTexturePath(texturePath);
-    birthImage->setImageTexture(texturePath);
+    mBirthImage->setImageTexture(texturePath);
 
     std::vector<std::string> abilities, powers, spells;
 
@@ -183,25 +179,25 @@ void BirthDialog::updateSpells()
     {
         if (!categories[category].spells.empty())
         {
-            MyGUI::TextBox* label = spellArea->createWidget<MyGUI::TextBox>("SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
+            MyGUI::TextBox* label = mSpellArea->createWidget<MyGUI::TextBox>("SandBrightText", coord, MyGUI::Align::Default, std::string("Label"));
             label->setCaption(mWindowManager.getGameSettingString(categories[category].label, ""));
-            spellItems.push_back(label);
+            mSpellItems.push_back(label);
             coord.top += lineHeight;
 
             std::vector<std::string>::const_iterator end = categories[category].spells.end();
             for (std::vector<std::string>::const_iterator it = categories[category].spells.begin(); it != end; ++it)
             {
                 const std::string &spellId = *it;
-                spellWidget = spellArea->createWidget<MWSpell>("MW_StatName", coord, MyGUI::Align::Default, std::string("Spell") + boost::lexical_cast<std::string>(i));
+                spellWidget = mSpellArea->createWidget<MWSpell>("MW_StatName", coord, MyGUI::Align::Default, std::string("Spell") + boost::lexical_cast<std::string>(i));
                 spellWidget->setWindowManager(&mWindowManager);
                 spellWidget->setSpellId(spellId);
 
-                spellItems.push_back(spellWidget);
+                mSpellItems.push_back(spellWidget);
                 coord.top += lineHeight;
 
                 MyGUI::IntCoord spellCoord = coord;
                 spellCoord.height = 24; // TODO: This should be fetched from the skin somehow, or perhaps a widget in the layout as a template?
-                spellWidget->createEffectWidgets(spellItems, spellArea, spellCoord, (category == 0) ? MWEffectList::EF_Constant : 0);
+                spellWidget->createEffectWidgets(mSpellItems, mSpellArea, spellCoord, (category == 0) ? MWEffectList::EF_Constant : 0);
                 coord.top = spellCoord.top;
 
                 ++i;

apps/openmw/mwgui/birth.hpp

@@ -5,19 +5,15 @@
 
 /*
   This file contains the dialog for choosing a birth sign.
-  Layout is defined by resources/mygui/openmw_chargen_race_layout.xml.
+  Layout is defined by resources/mygui/openmw_chargen_race.layout.
  */
 
 namespace MWGui
 {
-    using namespace MyGUI;
-
-    class WindowManager;
-
     class BirthDialog : public WindowBase
     {
     public:
-        BirthDialog(WindowManager& parWindowManager);
+        BirthDialog(MWBase::WindowManager& parWindowManager);
 
         enum Gender
         {
@@ -25,14 +21,14 @@ namespace MWGui
             GM_Female
         };
 
-        const std::string &getBirthId() const { return currentBirthId; }
+        const std::string &getBirthId() const { return mCurrentBirthId; }
         void setBirthId(const std::string &raceId);
 
         void setNextButtonShow(bool shown);
-        void open();
+        virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -49,12 +45,12 @@ namespace MWGui
         void updateBirths();
         void updateSpells();
 
-        MyGUI::ListBox*    birthList;
+        MyGUI::ListBox* mBirthList;
-        MyGUI::WidgetPtr  spellArea;
+        MyGUI::WidgetPtr  mSpellArea;
-        MyGUI::ImageBox* birthImage;
+        MyGUI::ImageBox* mBirthImage;
-        std::vector<MyGUI::WidgetPtr> spellItems;
+        std::vector<MyGUI::WidgetPtr> mSpellItems;
 
-        std::string currentBirthId;
+        std::string mCurrentBirthId;
     };
 }
 #endif

apps/openmw/mwgui/bookwindow.cpp

@@ -3,17 +3,19 @@
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwinput/inputmanager.hpp"
+#include "../mwbase/world.hpp"
-#include "../mwsound/soundmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/actiontake.hpp"
+#include "../mwworld/player.hpp"
 
 #include "formatting.hpp"
-#include "window_manager.hpp"
 
 using namespace MWGui;
 
-BookWindow::BookWindow (WindowManager& parWindowManager) :
+BookWindow::BookWindow (MWBase::WindowManager& parWindowManager) :
-    WindowBase("openmw_book_layout.xml", parWindowManager)
+    WindowBase("openmw_book.layout", parWindowManager)
 {
     getWidget(mCloseButton, "CloseButton");
     mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BookWindow::onCloseButtonClicked);
@@ -55,8 +57,7 @@ void BookWindow::open (MWWorld::Ptr book)
 
     MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
 
-    ESMS::LiveCellRef<ESM::Book, MWWorld::RefData> *ref =
+    MWWorld::LiveCellRef<ESM::Book> *ref = mBook.get<ESM::Book>();
-        mBook.get<ESM::Book>();
 
     BookTextParser parser;
     std::vector<std::string> results = parser.split(ref->base->text, mLeftPage->getSize().width, mLeftPage->getSize().height);
@@ -97,10 +98,10 @@ void BookWindow::onCloseButtonClicked (MyGUI::Widget* _sender)
 
 void BookWindow::onTakeButtonClicked (MyGUI::Widget* _sender)
 {
-    MWBase::Environment::get().getSoundManager()->playSound ("Item Book Up", 1.0, 1.0, MWSound::Play_NoTrack);
+    MWBase::Environment::get().getSoundManager()->playSound ("Item Book Up", 1.0, 1.0, MWBase::SoundManager::Play_NoTrack);
 
     MWWorld::ActionTake take(mBook);
-    take.execute();
+    take.execute (MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
 
     mWindowManager.removeGuiMode(GM_Book);
 }

apps/openmw/mwgui/bookwindow.hpp

@@ -10,7 +10,7 @@ namespace MWGui
     class BookWindow : public WindowBase
     {
         public:
-            BookWindow(WindowManager& parWindowManager);
+            BookWindow(MWBase::WindowManager& parWindowManager);
 
             void open(MWWorld::Ptr book);
             void setTakeButtonShow(bool show);
@@ -43,4 +43,3 @@ namespace MWGui
 }
 
 #endif
-

apps/openmw/mwgui/charactercreation.cpp

@@ -9,7 +9,8 @@
 #include "mode.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwsound/soundmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 namespace
 {
@@ -103,11 +104,19 @@ namespace
         {ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}
         }
     } };
+
+    struct ClassPoint
+    {
+        const char *id;
+        // Specialization points to match, in order: Stealth, Combat, Magic
+        // Note: Order is taken from http://www.uesp.net/wiki/Morrowind:Class_Quiz
+        unsigned int points[3];
+    };
 }
 
 using namespace MWGui;
 
-CharacterCreation::CharacterCreation(WindowManager* _wm)
+CharacterCreation::CharacterCreation(MWBase::WindowManager* _wm)
     : mNameDialog(0)
     , mRaceDialog(0)
     , mClassChoiceDialog(0)
@@ -142,7 +151,7 @@ void CharacterCreation::setValue (const std::string& id, const MWMechanics::Stat
     }
 }
 
-void CharacterCreation::setValue (const std::string& id, const MWMechanics::DynamicStat<int>& value)
+void CharacterCreation::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
 {
     if (mReviewDialog)
     {
@@ -178,64 +187,64 @@ void CharacterCreation::spawnDialog(const char id)
     switch (id)
     {
         case GM_Name:
-            if(mNameDialog)
+            mWM->removeDialog(mNameDialog);
-                mWM->removeDialog(mNameDialog);
+            mNameDialog = 0;
             mNameDialog = new TextInputDialog(*mWM);
             mNameDialog->setTextLabel(mWM->getGameSettingString("sName", "Name"));
             mNameDialog->setTextInput(mPlayerName);
             mNameDialog->setNextButtonShow(mCreationStage >= CSE_NameChosen);
             mNameDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onNameDialogDone);
-            mNameDialog->open();
+            mNameDialog->setVisible(true);
             break;
 
         case GM_Race:
-            if (mRaceDialog)
+            mWM->removeDialog(mRaceDialog);
-                mWM->removeDialog(mRaceDialog);
+            mRaceDialog = 0;
             mRaceDialog = new RaceDialog(*mWM);
             mRaceDialog->setNextButtonShow(mCreationStage >= CSE_RaceChosen);
             mRaceDialog->setRaceId(mPlayerRaceId);
             mRaceDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogDone);
             mRaceDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onRaceDialogBack);
-            mRaceDialog->open();
+            mRaceDialog->setVisible(true);;
             break;
 
         case GM_Class:
-            if (mClassChoiceDialog)
+            mWM->removeDialog(mClassChoiceDialog);
-                mWM->removeDialog(mClassChoiceDialog);
+            mClassChoiceDialog = 0;
             mClassChoiceDialog = new ClassChoiceDialog(*mWM);
             mClassChoiceDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassChoice);
-            mClassChoiceDialog->open();
+            mClassChoiceDialog->setVisible(true);
             break;
 
         case GM_ClassPick:
-            if (mPickClassDialog)
+            mWM->removeDialog(mPickClassDialog);
-                mWM->removeDialog(mPickClassDialog);
+            mPickClassDialog = 0;
             mPickClassDialog = new PickClassDialog(*mWM);
             mPickClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
             mPickClassDialog->setClassId(mPlayerClass.name);
             mPickClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogDone);
             mPickClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogBack);
-            mPickClassDialog->open();
+            mPickClassDialog->setVisible(true);
             break;
 
         case GM_Birth:
-            if (mBirthSignDialog)
+            mWM->removeDialog(mBirthSignDialog);
-                mWM->removeDialog(mBirthSignDialog);
+            mBirthSignDialog = 0;
             mBirthSignDialog = new BirthDialog(*mWM);
             mBirthSignDialog->setNextButtonShow(mCreationStage >= CSE_BirthSignChosen);
             mBirthSignDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogDone);
             mBirthSignDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onBirthSignDialogBack);
-            mBirthSignDialog->open();
+            mBirthSignDialog->setVisible(true);
             break;
 
         case GM_ClassCreate:
-            if (mCreateClassDialog)
+            mWM->removeDialog(mCreateClassDialog);
-                mWM->removeDialog(mCreateClassDialog);
+            mCreateClassDialog = 0;
             mCreateClassDialog = new CreateClassDialog(*mWM);
             mCreateClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
             mCreateClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
             mCreateClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
-            mCreateClassDialog->open();
+            mCreateClassDialog->setVisible(true);
             break;
         case GM_ClassGenerate:
             mGenerateClassStep = 0;
@@ -246,8 +255,8 @@ void CharacterCreation::spawnDialog(const char id)
             showClassQuestionDialog();
             break;
         case GM_Review:
-            if (mReviewDialog)
+            mWM->removeDialog(mReviewDialog);
-                mWM->removeDialog(mReviewDialog);
+            mReviewDialog = 0;
             mReviewDialog = new ReviewDialog(*mWM);
             mReviewDialog->setPlayerName(mPlayerName);
             mReviewDialog->setRace(mPlayerRaceId);
@@ -259,20 +268,20 @@ void CharacterCreation::spawnDialog(const char id)
             mReviewDialog->setFatigue(mPlayerFatigue);
 
             {
-                std::map<ESM::Attribute::AttributeID, MWMechanics::Stat<int> > attributes = mWM->getPlayerAttributeValues();
+                std::map<int, MWMechanics::Stat<int> > attributes = mWM->getPlayerAttributeValues();
-                for (std::map<ESM::Attribute::AttributeID, MWMechanics::Stat<int> >::iterator it = attributes.begin();
+                for (std::map<int, MWMechanics::Stat<int> >::iterator it = attributes.begin();
                     it != attributes.end(); ++it)
                 {
-                    mReviewDialog->setAttribute(it->first, it->second);
+                    mReviewDialog->setAttribute(static_cast<ESM::Attribute::AttributeID> (it->first), it->second);
                 }
             }
 
             {
-                std::map<ESM::Skill::SkillEnum, MWMechanics::Stat<float> > skills = mWM->getPlayerSkillValues();
+                std::map<int, MWMechanics::Stat<float> > skills = mWM->getPlayerSkillValues();
-                for (std::map<ESM::Skill::SkillEnum, MWMechanics::Stat<float> >::iterator it = skills.begin();
+                for (std::map<int, MWMechanics::Stat<float> >::iterator it = skills.begin();
                     it != skills.end(); ++it)
                 {
-                    mReviewDialog->setSkillValue(it->first, it->second);
+                    mReviewDialog->setSkillValue(static_cast<ESM::Skill::SkillEnum> (it->first), it->second);
                 }
                 mReviewDialog->configureSkills(mWM->getPlayerMajorSkills(), mWM->getPlayerMinorSkills());
             }
@@ -280,46 +289,46 @@ void CharacterCreation::spawnDialog(const char id)
             mReviewDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogDone);
             mReviewDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onReviewDialogBack);
             mReviewDialog->eventActivateDialog += MyGUI::newDelegate(this, &CharacterCreation::onReviewActivateDialog);
-            mReviewDialog->open();
+            mReviewDialog->setVisible(true);
             break;
     }
 }
 
-void CharacterCreation::setPlayerHealth (const MWMechanics::DynamicStat<int>& value)
+void CharacterCreation::setPlayerHealth (const MWMechanics::DynamicStat<float>& value)
 {
     mPlayerHealth = value;
 }
 
-void CharacterCreation::setPlayerMagicka (const MWMechanics::DynamicStat<int>& value)
+void CharacterCreation::setPlayerMagicka (const MWMechanics::DynamicStat<float>& value)
 {
     mPlayerMagicka = value;
 }
 
-void CharacterCreation::setPlayerFatigue (const MWMechanics::DynamicStat<int>& value)
+void CharacterCreation::setPlayerFatigue (const MWMechanics::DynamicStat<float>& value)
 {
     mPlayerFatigue = value;
 }
 
 void CharacterCreation::onReviewDialogDone(WindowBase* parWindow)
 {
-    if (mReviewDialog)
+    mWM->removeDialog(mReviewDialog);
-        mWM->removeDialog(mReviewDialog);
+    mReviewDialog = 0;
 
     mWM->popGuiMode();
 }
 
 void CharacterCreation::onReviewDialogBack()
 {
-    if (mReviewDialog)
+    mWM->removeDialog(mReviewDialog);
-        mWM->removeDialog(mReviewDialog);
+    mReviewDialog = 0;
 
     mWM->pushGuiMode(GM_Birth);
 }
 
 void CharacterCreation::onReviewActivateDialog(int parDialog)
 {
-    if (mReviewDialog)
+    mWM->removeDialog(mReviewDialog);
-        mWM->removeDialog(mReviewDialog);
+    mReviewDialog = 0;
     mCreationStage = CSE_ReviewNext;
 
     mWM->popGuiMode();
@@ -354,6 +363,7 @@ void CharacterCreation::onPickClassDialogDone(WindowBase* parWindow)
             mWM->setPlayerClass(mPlayerClass);
         }
         mWM->removeDialog(mPickClassDialog);
+        mPickClassDialog = 0;
     }
 
     //TODO This bit gets repeated a few times; wrap it in a function
@@ -382,6 +392,7 @@ void CharacterCreation::onPickClassDialogBack()
         if (!classId.empty())
             MWBase::Environment::get().getMechanicsManager()->setPlayerClass(classId);
         mWM->removeDialog(mPickClassDialog);
+        mPickClassDialog = 0;
     }
 
     mWM->popGuiMode();
@@ -390,10 +401,8 @@ void CharacterCreation::onPickClassDialogBack()
 
 void CharacterCreation::onClassChoice(int _index)
 {
-    if (mClassChoiceDialog)
+    mWM->removeDialog(mClassChoiceDialog);
-    {
+    mClassChoiceDialog = 0;
-        mWM->removeDialog(mClassChoiceDialog);
-    }
 
     mWM->popGuiMode();
 
@@ -423,6 +432,7 @@ void CharacterCreation::onNameDialogDone(WindowBase* parWindow)
         mWM->setValue("name", mPlayerName);
         MWBase::Environment::get().getMechanicsManager()->setPlayerName(mPlayerName);
         mWM->removeDialog(mNameDialog);
+        mNameDialog = 0;
     }
 
     if (mCreationStage == CSE_ReviewNext)
@@ -450,6 +460,7 @@ void CharacterCreation::onRaceDialogBack()
         if (!mPlayerRaceId.empty())
             MWBase::Environment::get().getMechanicsManager()->setPlayerRace(mPlayerRaceId, mRaceDialog->getGender() == RaceDialog::GM_Male);
         mWM->removeDialog(mRaceDialog);
+        mRaceDialog = 0;
     }
 
     mWM->popGuiMode();
@@ -465,6 +476,7 @@ void CharacterCreation::onRaceDialogDone(WindowBase* parWindow)
         if (!mPlayerRaceId.empty())
             MWBase::Environment::get().getMechanicsManager()->setPlayerRace(mPlayerRaceId, mRaceDialog->getGender() == RaceDialog::GM_Male);
         mWM->removeDialog(mRaceDialog);
+        mRaceDialog = 0;
     }
 
     if (mCreationStage == CSE_ReviewNext)
@@ -492,6 +504,7 @@ void CharacterCreation::onBirthSignDialogDone(WindowBase* parWindow)
         if (!mPlayerBirthSignId.empty())
             MWBase::Environment::get().getMechanicsManager()->setPlayerBirthsign(mPlayerBirthSignId);
         mWM->removeDialog(mBirthSignDialog);
+        mBirthSignDialog = 0;
     }
 
     if (mCreationStage >= CSE_BirthSignChosen)
@@ -512,6 +525,7 @@ void CharacterCreation::onBirthSignDialogBack()
     {
         MWBase::Environment::get().getMechanicsManager()->setPlayerBirthsign(mBirthSignDialog->getBirthId());
         mWM->removeDialog(mBirthSignDialog);
+        mBirthSignDialog = 0;
     }
 
     mWM->popGuiMode();
@@ -547,6 +561,7 @@ void CharacterCreation::onCreateClassDialogDone(WindowBase* parWindow)
         mWM->setPlayerClass(klass);
 
         mWM->removeDialog(mCreateClassDialog);
+        mCreateClassDialog = 0;
     }
 
     if (mCreationStage == CSE_ReviewNext)
@@ -568,8 +583,8 @@ void CharacterCreation::onCreateClassDialogDone(WindowBase* parWindow)
 
 void CharacterCreation::onCreateClassDialogBack()
 {
-    if (mCreateClassDialog)
+    mWM->removeDialog(mCreateClassDialog);
-        mWM->removeDialog(mCreateClassDialog);
+    mCreateClassDialog = 0;
 
     mWM->popGuiMode();
     mWM->pushGuiMode(GM_Class);
@@ -579,8 +594,9 @@ void CharacterCreation::onClassQuestionChosen(int _index)
 {
     MWBase::Environment::get().getSoundManager()->stopSay();
 
-    if (mGenerateClassQuestionDialog)
+    mWM->removeDialog(mGenerateClassQuestionDialog);
-        mWM->removeDialog(mGenerateClassQuestionDialog);
+    mGenerateClassQuestionDialog = 0;
+
     if (_index < 0 || _index >= 3)
     {
         mWM->popGuiMode();
@@ -657,13 +673,14 @@ void CharacterCreation::showClassQuestionDialog()
             }
         }
 
-        if (mGenerateClassResultDialog)
+        mWM->removeDialog(mGenerateClassResultDialog);
-            mWM->removeDialog(mGenerateClassResultDialog);
+        mGenerateClassResultDialog = 0;
+
         mGenerateClassResultDialog = new GenerateClassResultDialog(*mWM);
         mGenerateClassResultDialog->setClassId(mGenerateClass);
         mGenerateClassResultDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassBack);
         mGenerateClassResultDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onGenerateClassDone);
-        mGenerateClassResultDialog->open();
+        mGenerateClassResultDialog->setVisible(true);
         return;
     }
 
@@ -674,8 +691,9 @@ void CharacterCreation::showClassQuestionDialog()
         return;
     }
 
-    if (mGenerateClassQuestionDialog)
+    mWM->removeDialog(mGenerateClassQuestionDialog);
-        mWM->removeDialog(mGenerateClassQuestionDialog);
+    mGenerateClassQuestionDialog = 0;
+
     mGenerateClassQuestionDialog = new InfoBoxDialog(*mWM);
 
     InfoBoxDialog::ButtonList buttons;
@@ -685,7 +703,7 @@ void CharacterCreation::showClassQuestionDialog()
     buttons.push_back(sGenerateClassSteps[mGenerateClassStep].mButtons[2]);
     mGenerateClassQuestionDialog->setButtons(buttons);
     mGenerateClassQuestionDialog->eventButtonSelected += MyGUI::newDelegate(this, &CharacterCreation::onClassQuestionChosen);
-    mGenerateClassQuestionDialog->open();
+    mGenerateClassQuestionDialog->setVisible(true);
 
     MWBase::Environment::get().getSoundManager()->say(sGenerateClassSteps[mGenerateClassStep].mSound);
 }
@@ -695,8 +713,9 @@ void CharacterCreation::onGenerateClassBack()
     if(mCreationStage < CSE_ClassChosen)
         mCreationStage = CSE_ClassChosen;
 
-    if (mGenerateClassResultDialog)
+    mWM->removeDialog(mGenerateClassResultDialog);
-        mWM->removeDialog(mGenerateClassResultDialog);
+    mGenerateClassResultDialog = 0;
+
     MWBase::Environment::get().getMechanicsManager()->setPlayerClass(mGenerateClass);
 
     mWM->popGuiMode();
@@ -705,8 +724,9 @@ void CharacterCreation::onGenerateClassBack()
 
 void CharacterCreation::onGenerateClassDone(WindowBase* parWindow)
 {
-    if (mGenerateClassResultDialog)
+    mWM->removeDialog(mGenerateClassResultDialog);
-        mWM->removeDialog(mGenerateClassResultDialog);
+    mGenerateClassResultDialog = 0;
+
     MWBase::Environment::get().getMechanicsManager()->setPlayerClass(mGenerateClass);
     const ESM::Class *klass = MWBase::Environment::get().getWorld()->getStore().classes.find(mGenerateClass);
     mPlayerClass = *klass;

apps/openmw/mwgui/charactercreation.hpp

@@ -1,16 +1,15 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
-#include "window_manager.hpp"
-
-#include "../mwmechanics/mechanicsmanager.hpp"
-#include "../mwmechanics/stat.hpp"
-#include "../mwworld/world.hpp"
 #include <components/esm_store/store.hpp>
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwmechanics/stat.hpp"
+
 namespace MWGui
 {
-    class WindowManager;
     class WindowBase;
 
     class TextInputDialog;
@@ -30,20 +29,20 @@ namespace MWGui
     public:
     typedef std::vector<int> SkillList;
 
-    CharacterCreation(WindowManager* _wm);
+    CharacterCreation(MWBase::WindowManager* _wm);
     ~CharacterCreation();
 
     //Show a dialog
     void spawnDialog(const char id);
 
-    void setPlayerHealth (const MWMechanics::DynamicStat<int>& value);
+    void setPlayerHealth (const MWMechanics::DynamicStat<float>& value);
 
-    void setPlayerMagicka (const MWMechanics::DynamicStat<int>& value);
+    void setPlayerMagicka (const MWMechanics::DynamicStat<float>& value);
 
-    void setPlayerFatigue (const MWMechanics::DynamicStat<int>& value);
+    void setPlayerFatigue (const MWMechanics::DynamicStat<float>& value);
 
     void setValue (const std::string& id, const MWMechanics::Stat<int>& value);
-    void setValue (const std::string& id, const MWMechanics::DynamicStat<int>& value);
+    void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value);
     void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::Stat<float>& value);
     void configureSkills (const SkillList& major, const SkillList& minor);
 
@@ -59,16 +58,16 @@ namespace MWGui
     BirthDialog* mBirthSignDialog;
     ReviewDialog* mReviewDialog;
 
-    WindowManager* mWM;
+    MWBase::WindowManager* mWM;
 
     //Player data
     std::string mPlayerName;
     std::string mPlayerRaceId;
     std::string mPlayerBirthSignId;
     ESM::Class mPlayerClass;
-    MWMechanics::DynamicStat<int> mPlayerHealth;
+    MWMechanics::DynamicStat<float> mPlayerHealth;
-    MWMechanics::DynamicStat<int> mPlayerMagicka;
+    MWMechanics::DynamicStat<float> mPlayerMagicka;
-    MWMechanics::DynamicStat<int> mPlayerFatigue;
+    MWMechanics::DynamicStat<float> mPlayerFatigue;
 
     //Class generation vars
     unsigned mGenerateClassStep;                 // Keeps track of current step in Generate Class dialog

apps/openmw/mwgui/class.hpp

@@ -7,19 +7,15 @@
 
 /*
   This file contains the dialogs for choosing a class.
-  Layout is defined by resources/mygui/openmw_chargen_class_layout.xml.
+  Layout is defined by resources/mygui/openmw_chargen_class.layout.
  */
 
 namespace MWGui
 {
-    using namespace MyGUI;
-
-    class WindowManager;
-
     class InfoBoxDialog : public WindowBase
     {
     public:
-        InfoBoxDialog(WindowManager& parWindowManager);
+        InfoBoxDialog(MWBase::WindowManager& parWindowManager);
 
         typedef std::vector<std::string> ButtonList;
 
@@ -27,11 +23,11 @@ namespace MWGui
         std::string getText() const;
         void setButtons(ButtonList &buttons);
 
-        void open();
+        virtual void open();
         int getChosenButton() const;
 
         // Events
-        typedef delegates::CMultiDelegate1<int> EventHandle_Int;
+        typedef MyGUI::delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Button was clicked.\n
             signature : void method(int index)\n
@@ -45,11 +41,11 @@ namespace MWGui
 
         void fitToText(MyGUI::TextBox* widget);
         void layoutVertically(MyGUI::WidgetPtr widget, int margin);
-        int currentButton;
+        int mCurrentButton;
-        MyGUI::WidgetPtr textBox;
+        MyGUI::WidgetPtr mTextBox;
-        MyGUI::TextBox* text;
+        MyGUI::TextBox* mText;
-        MyGUI::WidgetPtr buttonBar;
+        MyGUI::WidgetPtr mButtonBar;
-        std::vector<MyGUI::ButtonPtr> buttons;
+        std::vector<MyGUI::ButtonPtr> mButtons;
     };
 
     // Lets the player choose between 3 ways of creating a class
@@ -64,21 +60,19 @@ namespace MWGui
             Class_Create = 2,
             Class_Back = 3
         };
-        ClassChoiceDialog(WindowManager& parWindowManager);
+        ClassChoiceDialog(MWBase::WindowManager& parWindowManager);
     };
 
     class GenerateClassResultDialog : public WindowBase
     {
     public:
-        GenerateClassResultDialog(WindowManager& parWindowManager);
+        GenerateClassResultDialog(MWBase::WindowManager& parWindowManager);
 
         std::string getClassId() const;
         void setClassId(const std::string &classId);
 
-        void open();
-
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -90,25 +84,25 @@ namespace MWGui
         void onBackClicked(MyGUI::Widget* _sender);
 
     private:
-        MyGUI::ImageBox* classImage;
+        MyGUI::ImageBox* mClassImage;
-        MyGUI::TextBox*  className;
+        MyGUI::TextBox*  mClassName;
 
-        std::string currentClassId;
+        std::string mCurrentClassId;
     };
 
     class PickClassDialog : public WindowBase
     {
     public:
-        PickClassDialog(WindowManager& parWindowManager);
+        PickClassDialog(MWBase::WindowManager& parWindowManager);
 
-        const std::string &getClassId() const { return currentClassId; }
+        const std::string &getClassId() const { return mCurrentClassId; }
         void setClassId(const std::string &classId);
 
         void setNextButtonShow(bool shown);
-        void open();
+        virtual void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -125,26 +119,26 @@ namespace MWGui
         void updateClasses();
         void updateStats();
 
-        MyGUI::ImageBox* classImage;
+        MyGUI::ImageBox* mClassImage;
-        MyGUI::ListBox*        classList;
+        MyGUI::ListBox*  mClassList;
-        MyGUI::TextBox*  specializationName;
+        MyGUI::TextBox*  mSpecializationName;
-        Widgets::MWAttributePtr favoriteAttribute[2];
+        Widgets::MWAttributePtr mFavoriteAttribute[2];
-        Widgets::MWSkillPtr   majorSkill[5];
+        Widgets::MWSkillPtr   mMajorSkill[5];
-        Widgets::MWSkillPtr   minorSkill[5];
+        Widgets::MWSkillPtr   mMinorSkill[5];
 
-        std::string currentClassId;
+        std::string mCurrentClassId;
     };
 
-    class SelectSpecializationDialog : public WindowBase
+    class SelectSpecializationDialog : public WindowModal
     {
     public:
-        SelectSpecializationDialog(WindowManager& parWindowManager);
+        SelectSpecializationDialog(MWBase::WindowManager& parWindowManager);
         ~SelectSpecializationDialog();
 
-        ESM::Class::Specialization getSpecializationId() const { return specializationId; }
+        ESM::Class::Specialization getSpecializationId() const { return mSpecializationId; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -161,23 +155,23 @@ namespace MWGui
         void onCancelClicked(MyGUI::Widget* _sender);
 
     private:
-        MyGUI::TextBox      *specialization0, *specialization1, *specialization2;
+        MyGUI::TextBox *mSpecialization0, *mSpecialization1, *mSpecialization2;
 
-        ESM::Class::Specialization specializationId;
+        ESM::Class::Specialization mSpecializationId;
     };
 
-    class SelectAttributeDialog : public WindowBase
+    class SelectAttributeDialog : public WindowModal
     {
     public:
-        SelectAttributeDialog(WindowManager& parWindowManager);
+        SelectAttributeDialog(MWBase::WindowManager& parWindowManager);
         ~SelectAttributeDialog();
 
-        ESM::Attribute::AttributeID getAttributeId() const { return attributeId; }
+        ESM::Attribute::AttributeID getAttributeId() const { return mAttributeId; }
-        Widgets::MWAttributePtr getAffectedWidget() const { return affectedWidget; }
+        Widgets::MWAttributePtr getAffectedWidget() const { return mAffectedWidget; }
-        void setAffectedWidget(Widgets::MWAttributePtr widget) { affectedWidget = widget; }
+        void setAffectedWidget(Widgets::MWAttributePtr widget) { mAffectedWidget = widget; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -194,23 +188,23 @@ namespace MWGui
         void onCancelClicked(MyGUI::Widget* _sender);
 
     private:
-        Widgets::MWAttributePtr affectedWidget;
+        Widgets::MWAttributePtr mAffectedWidget;
 
-        ESM::Attribute::AttributeID attributeId;
+        ESM::Attribute::AttributeID mAttributeId;
     };
 
-    class SelectSkillDialog : public WindowBase
+    class SelectSkillDialog : public WindowModal
     {
     public:
-        SelectSkillDialog(WindowManager& parWindowManager);
+        SelectSkillDialog(MWBase::WindowManager& parWindowManager);
         ~SelectSkillDialog();
 
-        ESM::Skill::SkillEnum getSkillId() const { return skillId; }
+        ESM::Skill::SkillEnum getSkillId() const { return mSkillId; }
-        Widgets::MWSkillPtr getAffectedWidget() const { return affectedWidget; }
+        Widgets::MWSkillPtr getAffectedWidget() const { return mAffectedWidget; }
-        void setAffectedWidget(Widgets::MWSkillPtr widget) { affectedWidget = widget; }
+        void setAffectedWidget(Widgets::MWSkillPtr widget) { mAffectedWidget = widget; }
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Cancel button clicked.\n
             signature : void method()\n
@@ -227,34 +221,34 @@ namespace MWGui
         void onCancelClicked(MyGUI::Widget* _sender);
 
     private:
-        Widgets::MWSkillPtr combatSkill[9];
+        Widgets::MWSkillPtr mCombatSkill[9];
-        Widgets::MWSkillPtr magicSkill[9];
+        Widgets::MWSkillPtr mMagicSkill[9];
-        Widgets::MWSkillPtr stealthSkill[9];
+        Widgets::MWSkillPtr mStealthSkill[9];
-        Widgets::MWSkillPtr affectedWidget;
+        Widgets::MWSkillPtr mAffectedWidget;
 
-        ESM::Skill::SkillEnum skillId;
+        ESM::Skill::SkillEnum mSkillId;
     };
 
-    class DescriptionDialog : public WindowBase
+    class DescriptionDialog : public WindowModal
     {
     public:
-        DescriptionDialog(WindowManager& parWindowManager);
+        DescriptionDialog(MWBase::WindowManager& parWindowManager);
         ~DescriptionDialog();
 
-        std::string getTextInput() const { return textEdit ? textEdit->getOnlyText() : ""; }
+        std::string getTextInput() const { return mTextEdit ? mTextEdit->getOnlyText() : ""; }
-        void setTextInput(const std::string &text) { if (textEdit) textEdit->setOnlyText(text); }
+        void setTextInput(const std::string &text) { if (mTextEdit) mTextEdit->setOnlyText(text); }
 
     protected:
         void onOkClicked(MyGUI::Widget* _sender);
 
     private:
-        MyGUI::EditPtr textEdit;
+        MyGUI::EditPtr mTextEdit;
     };
 
     class CreateClassDialog : public WindowBase
     {
     public:
-        CreateClassDialog(WindowManager& parWindowManager);
+        CreateClassDialog(MWBase::WindowManager& parWindowManager);
         virtual ~CreateClassDialog();
 
         std::string getName() const;
@@ -265,10 +259,9 @@ namespace MWGui
         std::vector<ESM::Skill::SkillEnum> getMinorSkills() const;
 
         void setNextButtonShow(bool shown);
-        void open();
 
         // Events
-        typedef delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
 
         /** Event : Back button clicked.\n
             signature : void method()\n
@@ -294,20 +287,20 @@ namespace MWGui
         void update();
 
     private:
-        MyGUI::EditPtr          editName;
+        MyGUI::EditPtr                   mEditName;
-        MyGUI::TextBox*    specializationName;
+        MyGUI::TextBox*                  mSpecializationName;
-        Widgets::MWAttributePtr favoriteAttribute0, favoriteAttribute1;
+        Widgets::MWAttributePtr          mFavoriteAttribute0, mFavoriteAttribute1;
-        Widgets::MWSkillPtr     majorSkill[5];
+        Widgets::MWSkillPtr              mMajorSkill[5];
-        Widgets::MWSkillPtr     minorSkill[5];
+        Widgets::MWSkillPtr              mMinorSkill[5];
-        std::vector<Widgets::MWSkillPtr> skills;
+        std::vector<Widgets::MWSkillPtr> mSkills;
-        std::string             description;
+        std::string                      mDescription;
 
-        SelectSpecializationDialog *specDialog;
+        SelectSpecializationDialog       *mSpecDialog;
-        SelectAttributeDialog *attribDialog;
+        SelectAttributeDialog            *mAttribDialog;
-        SelectSkillDialog *skillDialog;
+        SelectSkillDialog                *mSkillDialog;
-        DescriptionDialog *descDialog;
+        DescriptionDialog                *mDescDialog;
 
-        ESM::Class::Specialization specializationId;
+        ESM::Class::Specialization       mSpecializationId;
     };
 }
 #endif

apps/openmw/mwgui/confirmationdialog.cpp

@@ -3,12 +3,12 @@
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWGui
 {
-    ConfirmationDialog::ConfirmationDialog(WindowManager& parWindowManager) :
+    ConfirmationDialog::ConfirmationDialog(MWBase::WindowManager& parWindowManager) :
-        WindowBase("openmw_confirmation_dialog_layout.xml", parWindowManager)
+        WindowModal("openmw_confirmation_dialog.layout", parWindowManager)
     {
         getWidget(mMessage, "Message");
         getWidget(mOkButton, "OkButton");
@@ -31,40 +31,19 @@ namespace MWGui
         mMessage->setSize(mMessage->getWidth(), mMessage->getTextSize().height+24);
 
         center();
-
-        // make other gui elements inaccessible while this dialog is open
-        MyGUI::InputManager::getInstance().addWidgetModal(mMainWidget);
-
-        int okButtonWidth = mOkButton->getTextSize().width + 24;
-        mOkButton->setCoord(mMainWidget->getWidth() - 30 - okButtonWidth,
-                            mOkButton->getTop(),
-                            okButtonWidth,
-                            mOkButton->getHeight());
-
-        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
-        mCancelButton->setCoord(mMainWidget->getWidth() - 30 - okButtonWidth - cancelButtonWidth - 8,
-                            mCancelButton->getTop(),
-                            cancelButtonWidth,
-                            mCancelButton->getHeight());
     }
 
     void ConfirmationDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
         eventCancelClicked();
 
-        close();
+        setVisible(false);
     }
 
     void ConfirmationDialog::onOkButtonClicked(MyGUI::Widget* _sender)
     {
         eventOkClicked();
 
-        close();
-    }
-
-    void ConfirmationDialog::close()
-    {
         setVisible(false);
-        MyGUI::InputManager::getInstance().removeWidgetModal(mMainWidget);
     }
 }

apps/openmw/mwgui/confirmationdialog.hpp

@@ -5,10 +5,10 @@
 
 namespace MWGui
 {
-    class ConfirmationDialog : public WindowBase
+    class ConfirmationDialog : public WindowModal
     {
         public:
-            ConfirmationDialog(WindowManager& parWindowManager);
+            ConfirmationDialog(MWBase::WindowManager& parWindowManager);
             void open(const std::string& message);
 
             typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
@@ -26,8 +26,6 @@ namespace MWGui
 
             void onCancelButtonClicked(MyGUI::Widget* _sender);
             void onOkButtonClicked(MyGUI::Widget* _sender);
-
-            void close();
     };
 
 }

apps/openmw/mwgui/console.cpp

@@ -2,6 +2,10 @@
 #include "console.hpp"
 
 #include <algorithm>
+#include <fstream>
+
+#include <components/esm_store/reclists.hpp>
+#include <components/esm_store/store.hpp>
 
 #include <components/compiler/exception.hpp>
 
@@ -102,9 +106,10 @@ namespace MWGui
         }
     }
 
-    Console::Console(int w, int h, const Compiler::Extensions& extensions)
+    Console::Console(int w, int h, bool consoleOnlyScripts)
-      : Layout("openmw_console_layout.xml"),
+      : Layout("openmw_console.layout"),
-        mCompilerContext (MWScript::CompilerContext::Type_Console)
+        mCompilerContext (MWScript::CompilerContext::Type_Console),
+        mConsoleOnlyScripts (consoleOnlyScripts)
     {
         setCoord(10,10, w-10, h/2);
 
@@ -123,7 +128,8 @@ namespace MWGui
         history->setVisibleVScroll(true);
 
         // compiler
-        mCompilerContext.setExtensions (&extensions);
+        MWScript::registerExtensions (mExtensions, mConsoleOnlyScripts);
+        mCompilerContext.setExtensions (&mExtensions);
     }
 
     void Console::enable()
@@ -170,6 +176,47 @@ namespace MWGui
         print("#FF2222" + msg + "\n");
     }
 
+    void Console::execute (const std::string& command)
+    {
+        // Log the command
+        print("#FFFFFF> " + command + "\n");
+
+        Compiler::Locals locals;
+        Compiler::Output output (locals);
+
+        if (compile (command + "\n", output))
+        {
+            try
+            {
+                ConsoleInterpreterContext interpreterContext (*this, mPtr);
+                Interpreter::Interpreter interpreter;
+                MWScript::installOpcodes (interpreter, mConsoleOnlyScripts);
+                std::vector<Interpreter::Type_Code> code;
+                output.getCode (code);
+                interpreter.run (&code[0], code.size(), interpreterContext);
+            }
+            catch (const std::exception& error)
+            {
+                printError (std::string ("An exception has been thrown: ") + error.what());
+            }
+        }
+    }
+
+    void Console::executeFile (const std::string& path)
+    {
+        std::ifstream stream (path.c_str());
+
+        if (!stream.is_open())
+            printError ("failed to open file: " + path);
+        else
+        {
+            std::string line;
+
+            while (std::getline (stream, line))
+                execute (line);
+        }
+    }
+
     void Console::keyPress(MyGUI::WidgetPtr _sender,
                   MyGUI::KeyCode key,
                   MyGUI::Char _char)
@@ -231,28 +278,7 @@ namespace MWGui
         current = command_history.end();
         editString.clear();
 
-        // Log the command
+        execute (cm);
-        print("#FFFFFF> " + cm + "\n");
-
-        Compiler::Locals locals;
-        Compiler::Output output (locals);
-
-        if (compile (cm + "\n", output))
-        {
-            try
-            {
-                ConsoleInterpreterContext interpreterContext (*this, mPtr);
-                Interpreter::Interpreter interpreter;
-                MWScript::installOpcodes (interpreter);
-                std::vector<Interpreter::Type_Code> code;
-                output.getCode (code);
-                interpreter.run (&code[0], code.size(), interpreterContext);
-            }
-            catch (const std::exception& error)
-            {
-                printError (std::string ("An exception has been thrown: ") + error.what());
-            }
-        }
 
         command->setCaption("");
     }

apps/openmw/mwgui/console.hpp

@@ -11,6 +11,7 @@
 #include <components/compiler/scanner.hpp>
 #include <components/compiler/locals.hpp>
 #include <components/compiler/output.hpp>
+#include <components/compiler/extensions.hpp>
 #include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/compilercontext.hpp"
@@ -24,8 +25,10 @@ namespace MWGui
   {
     private:
 
+        Compiler::Extensions mExtensions;
         MWScript::CompilerContext mCompilerContext;
         std::vector<std::string> mNames;
+        bool mConsoleOnlyScripts;
 
         bool compile (const std::string& cmd, Compiler::Output& output);
 
@@ -62,7 +65,7 @@ namespace MWGui
     StringList::iterator current;
     std::string editString;
 
-    Console(int w, int h, const Compiler::Extensions& extensions);
+    Console(int w, int h, bool consoleOnlyScripts);
 
     void enable();
 
@@ -86,6 +89,10 @@ namespace MWGui
     /// Error message
     void printError(const std::string &msg);
 
+    void execute (const std::string& command);
+
+    void executeFile (const std::string& command);
+
   private:
 
     void keyPress(MyGUI::WidgetPtr _sender,

apps/openmw/mwgui/container.cpp

@@ -3,22 +3,23 @@
 #include <cmath>
 #include <algorithm>
 #include <iterator>
-#include <assert.h>
+#include <cassert>
 #include <iostream>
 
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/manualref.hpp"
-#include "../mwworld/world.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwclass/container.hpp"
-#include "../mwinput/inputmanager.hpp"
-#include "../mwsound/soundmanager.hpp"
 
-#include "window_manager.hpp"
+#include "../mwclass/container.hpp"
+
 #include "widgets.hpp"
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
@@ -75,7 +76,7 @@ ContainerBase::ContainerBase(DragAndDrop* dragAndDrop) :
 {
 }
 
-void ContainerBase::setWidgets(Widget* containerWidget, ScrollView* itemView)
+void ContainerBase::setWidgets(MyGUI::Widget* containerWidget, MyGUI::ScrollView* itemView)
 {
     mContainerWidget = containerWidget;
     mItemView = itemView;
@@ -109,7 +110,7 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
             }
             else
             {
-                std::string message = MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sTake")->str;
+                std::string message = "#{sTake}";
                 CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
                 dialog->open(MWWorld::Class::get(object).getName(object), message, count);
                 dialog->eventOkClicked.clear();
@@ -129,18 +130,17 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
             // the player is trying to sell an item, check if the merchant accepts it
             // also, don't allow selling gold (let's be better than Morrowind at this, can we?)
             if (!MWBase::Environment::get().getWindowManager()->getTradeWindow()->npcAcceptsItem(object)
-                || MWWorld::Class::get(object).getName(object) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+                    || MWWorld::Class::get(object).getName(object) == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sGold")->getString())
             {
                 // user notification "i don't buy this item"
                 MWBase::Environment::get().getWindowManager()->
-                    messageBox(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarterDialog4")->str, std::vector<std::string>());
+                        messageBox("#{sBarterDialog4}", std::vector<std::string>());
                 return;
             }
         }
 
         bool buying = isTradeWindow(); // buying or selling?
-        std::string message = buying ? MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sQuanityMenuMessage02")->str
+        std::string message = buying ? "#{sQuanityMenuMessage02}" : "#{sQuanityMenuMessage01}";
-                :  MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sQuanityMenuMessage01")->str;
 
         if (std::find(mBoughtItems.begin(), mBoughtItems.end(), object) != mBoughtItems.end())
         {
@@ -273,12 +273,12 @@ void ContainerBase::onContainerClicked(MyGUI::Widget* _sender)
             // check the container's Organic flag (if this is a container). container with Organic flag doesn't allow putting items inside
             if (mPtr.getTypeName() == typeid(ESM::Container).name())
             {
-                ESMS::LiveCellRef<ESM::Container, MWWorld::RefData>* ref = mPtr.get<ESM::Container>();
+                MWWorld::LiveCellRef<ESM::Container>* ref = mPtr.get<ESM::Container>();
                 if (ref->base->flags & ESM::Container::Organic)
                 {
                     // user notification
                     MWBase::Environment::get().getWindowManager()->
-                        messageBox(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sContentsMessage2")->str, std::vector<std::string>());
+                        messageBox("#{sContentsMessage2}", std::vector<std::string>());
                     return;
                 }
             }
@@ -301,7 +301,7 @@ void ContainerBase::onContainerClicked(MyGUI::Widget* _sender)
                     object.getRefData().setCount(origCount);
                     // user notification
                     MWBase::Environment::get().getWindowManager()->
-                        messageBox(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sContentsMessage3")->str, std::vector<std::string>());
+                        messageBox("#{sContentsMessage3}", std::vector<std::string>());
                     return;
                 }
                 else
@@ -362,7 +362,7 @@ void ContainerBase::drawItems()
     int maxHeight = mItemView->getSize().height - 58;
 
     bool onlyMagic = false;
-    int categories;
+    int categories = 0;
     if (mFilter == Filter_All)
         categories = MWWorld::ContainerStore::Type_All;
     else if (mFilter == Filter_Weapon)
@@ -470,7 +470,7 @@ void ContainerBase::drawItems()
 
             // background widget (for the "equipped" frame and magic item background image)
             bool isMagic = (MWWorld::Class::get(*iter).getEnchantment(*iter) != "");
-            MyGUI::ImageBox* backgroundWidget = mContainerWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 42, 42), MyGUI::Align::Default);
+            MyGUI::ImageBox* backgroundWidget = mContainerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(x, y, 42, 42), MyGUI::Align::Default);
             backgroundWidget->setUserString("ToolTipType", "ItemPtr");
             backgroundWidget->setUserData(*iter);
 
@@ -502,7 +502,7 @@ void ContainerBase::drawItems()
             backgroundWidget->eventMouseWheel += MyGUI::newDelegate(this, &ContainerBase::onMouseWheel);
 
             // image
-            ImageBox* image = backgroundWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
+            MyGUI::ImageBox* image = backgroundWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
             int pos = path.rfind(".");
             path.erase(pos);
             path.append(".dds");
@@ -590,9 +590,9 @@ MWWorld::ContainerStore& ContainerBase::getContainerStore()
 
 // ------------------------------------------------------------------------------------------------
 
-ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
+ContainerWindow::ContainerWindow(MWBase::WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
     : ContainerBase(dragAndDrop)
-    , WindowBase("openmw_container_window_layout.xml", parWindowManager)
+    , WindowBase("openmw_container_window.layout", parWindowManager)
 {
     getWidget(mTakeButton, "TakeButton");
     getWidget(mCloseButton, "CloseButton");
@@ -606,18 +606,9 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dr
     mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onCloseButtonClicked);
     mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onTakeAllButtonClicked);
 
-    // adjust buttons size to fit text
-    int closeButtonWidth = mCloseButton->getTextSize().width+24;
-    int takeButtonWidth = mTakeButton->getTextSize().width+24;
-    mCloseButton->setCoord(600-20-closeButtonWidth, mCloseButton->getCoord().top, closeButtonWidth, mCloseButton->getCoord().height);
-    mTakeButton->setCoord(600-20-closeButtonWidth-takeButtonWidth-8, mTakeButton->getCoord().top, takeButtonWidth, mTakeButton->getCoord().height);
-
-    int w = MyGUI::RenderManager::getInstance().getViewSize().width;
-    //int h = MyGUI::RenderManager::getInstance().getViewSize().height;
-
     static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &ContainerWindow::onWindowResize);
 
-    setCoord(w-600,0,600,300);
+    setCoord(200,0,600,300);
 }
 
 ContainerWindow::~ContainerWindow()

apps/openmw/mwgui/container.hpp

@@ -127,7 +127,7 @@ namespace MWGui
     class ContainerWindow : public ContainerBase, public WindowBase
     {
     public:
-        ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop);
+        ContainerWindow(MWBase::WindowManager& parWindowManager,DragAndDrop* dragAndDrop);
 
         virtual ~ContainerWindow();
 

apps/openmw/mwgui/countdialog.cpp

@@ -3,12 +3,12 @@
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwworld/world.hpp"
+#include "../mwbase/world.hpp"
 
 namespace MWGui
 {
-    CountDialog::CountDialog(WindowManager& parWindowManager) :
+    CountDialog::CountDialog(MWBase::WindowManager& parWindowManager) :
-        WindowBase("openmw_count_window_layout.xml", parWindowManager)
+        WindowModal("openmw_count_window.layout", parWindowManager)
     {
         getWidget(mSlider, "CountSlider");
         getWidget(mItemEdit, "ItemEdit");
@@ -27,7 +27,7 @@ namespace MWGui
     {
         setVisible(true);
 
-        mLabelText->setCaption(message);
+        mLabelText->setCaptionWithReplacing(message);
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
 
@@ -40,37 +40,22 @@ namespace MWGui
                 width,
                 mMainWidget->getHeight());
 
-        // make other gui elements inaccessible while this dialog is open
-        MyGUI::InputManager::getInstance().addWidgetModal(mMainWidget);
-
         MyGUI::InputManager::getInstance().setKeyFocusWidget(mItemEdit);
 
         mSlider->setScrollPosition(maxCount-1);
         mItemEdit->setCaption(boost::lexical_cast<std::string>(maxCount));
-
-        int okButtonWidth = mOkButton->getTextSize().width + 24;
-        mOkButton->setCoord(width - 30 - okButtonWidth,
-                            mOkButton->getTop(),
-                            okButtonWidth,
-                            mOkButton->getHeight());
-
-        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
-        mCancelButton->setCoord(width - 30 - okButtonWidth - cancelButtonWidth - 8,
-                            mCancelButton->getTop(),
-                            cancelButtonWidth,
-                            mCancelButton->getHeight());
     }
 
     void CountDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
-        close();
+        setVisible(false);
     }
 
     void CountDialog::onOkButtonClicked(MyGUI::Widget* _sender)
     {
         eventOkClicked(NULL, mSlider->getScrollPosition()+1);
 
-        close();
+        setVisible(false);
     }
 
     void CountDialog::onEditTextChange(MyGUI::EditBox* _sender)
@@ -99,10 +84,4 @@ namespace MWGui
     {
         mItemEdit->setCaption(boost::lexical_cast<std::string>(_position+1));
     }
-
-    void CountDialog::close()
-    {
-        setVisible(false);
-        MyGUI::InputManager::getInstance().removeWidgetModal(mMainWidget);
-    }
 }

apps/openmw/mwgui/countdialog.hpp

@@ -5,10 +5,10 @@
 
 namespace MWGui
 {
-    class CountDialog : public WindowBase
+    class CountDialog : public WindowModal
     {
         public:
-            CountDialog(WindowManager& parWindowManager);
+            CountDialog(MWBase::WindowManager& parWindowManager);
             void open(const std::string& item, const std::string& message, const int maxCount);
 
             typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
@@ -30,8 +30,6 @@ namespace MWGui
             void onOkButtonClicked(MyGUI::Widget* _sender);
             void onEditTextChange(MyGUI::EditBox* _sender);
             void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
-
-            void close();
     };
 
 }

apps/openmw/mwgui/cursorreplace.cpp

@@ -16,4 +16,5 @@ CursorReplace::CursorReplace()
     OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_dresize2.png", 45);
 
     OEngine::Render::Atlas::createFromFile("atlas1.cfg", "mwgui1", "textures\\");
+    OEngine::Render::Atlas::createFromFile("mainmenu.cfg", "mwgui2", "textures\\");
 }

apps/openmw/mwgui/dialogue.cpp

@@ -1,6 +1,5 @@
 #include "dialogue.hpp"
 
-#include <assert.h>
 #include <iostream>
 #include <iterator>
 
@@ -10,13 +9,15 @@
 #include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwdialogue/dialoguemanager.hpp"
+#include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "dialogue_history.hpp"
-#include "window_manager.hpp"
 #include "widgets.hpp"
 #include "list.hpp"
 #include "tradewindow.hpp"
+#include "spellbuyingwindow.hpp"
 #include "inventorywindow.hpp"
 
 using namespace MWGui;
@@ -42,19 +43,20 @@ std::string::size_type find_str_ci(const std::string& str, const std::string& su
 }
 
 
-DialogueWindow::DialogueWindow(WindowManager& parWindowManager)
+DialogueWindow::DialogueWindow(MWBase::WindowManager& parWindowManager)
-    : WindowBase("openmw_dialogue_window_layout.xml", parWindowManager)
+    : WindowBase("openmw_dialogue_window.layout", parWindowManager)
     , mEnabled(true)
     , mShowTrade(false)
+    , mShowSpells(false)
 {
     // Centre dialog
     center();
 
     //History view
-    getWidget(history, "History");
+    getWidget(mHistory, "History");
-    history->setOverflowToTheLeft(true);
+    mHistory->setOverflowToTheLeft(true);
-    history->setMaxTextLength(1000000);
+    mHistory->setMaxTextLength(1000000);
-    Widget* eventbox;
+    MyGUI::Widget* eventbox;
 
     //An EditBox cannot receive mouse click events, so we use an
     //invisible widget on top of the editbox to receive them
@@ -63,36 +65,36 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager)
     eventbox->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel);
 
     //Topics list
-    getWidget(topicsList, "TopicsList");
+    getWidget(mTopicsList, "TopicsList");
-    topicsList->eventItemSelected += MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
+    mTopicsList->eventItemSelected += MyGUI::newDelegate(this, &DialogueWindow::onSelectTopic);
 
     MyGUI::ButtonPtr byeButton;
     getWidget(byeButton, "ByeButton");
     byeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
 
-    getWidget(pDispositionBar, "Disposition");
+    getWidget(mDispositionBar, "Disposition");
-    getWidget(pDispositionText,"DispositionText");
+    getWidget(mDispositionText,"DispositionText");
 
     static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);
 }
 
 void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
 {
-    ISubWidgetText* t = history->getClient()->getSubWidgetText();
+    MyGUI::ISubWidgetText* t = mHistory->getClient()->getSubWidgetText();
     if(t == nullptr)
         return;
 
-    const IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
+    const MyGUI::IntPoint& lastPressed = MyGUI::InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
 
     size_t cursorPosition = t->getCursorPosition(lastPressed);
-    MyGUI::UString color = history->getColorAtPos(cursorPosition);
+    MyGUI::UString color = mHistory->getColorAtPos(cursorPosition);
 
     if (!mEnabled && color == "#572D21")
         MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
 
     if(color != "#B29154")
     {
-        UString key = history->getColorTextAt(cursorPosition);
+        MyGUI::UString key = mHistory->getColorTextAt(cursorPosition);
         if(color == "#686EBA") MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(key));
 
         if(color == "#572D21") MWBase::Environment::get().getDialogueManager()->questionAnswered(lower_string(key));
@@ -101,15 +103,15 @@ void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
 
 void DialogueWindow::onWindowResize(MyGUI::Window* _sender)
 {
-    topicsList->adjustSize();
+    mTopicsList->adjustSize();
 }
 
 void DialogueWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
 {
-    if (history->getVScrollPosition() - _rel*0.3 < 0)
+    if (mHistory->getVScrollPosition() - _rel*0.3 < 0)
-        history->setVScrollPosition(0);
+        mHistory->setVScrollPosition(0);
     else
-        history->setVScrollPosition(history->getVScrollPosition() - _rel*0.3);
+        mHistory->setVScrollPosition(mHistory->getVScrollPosition() - _rel*0.3);
 }
 
 void DialogueWindow::onByeClicked(MyGUI::Widget* _sender)
@@ -121,12 +123,17 @@ void DialogueWindow::onSelectTopic(std::string topic)
 {
     if (!mEnabled) return;
 
-    if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarter")->str)
+    if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sBarter")->getString())
     {
         /// \todo check if the player is allowed to trade with this actor (e.g. faction rank high enough)?
         mWindowManager.pushGuiMode(GM_Barter);
         mWindowManager.getTradeWindow()->startTrade(mPtr);
     }
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpells")->getString())
+    {
+        mWindowManager.pushGuiMode(GM_SpellBuying);
+        mWindowManager.getSpellBuyingWindow()->startSpellBuying(mPtr);
+    }
 
     else
         MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(topic));
@@ -136,40 +143,43 @@ void DialogueWindow::startDialogue(MWWorld::Ptr actor, std::string npcName)
 {
     mEnabled = true;
     mPtr = actor;
-    topicsList->setEnabled(true);
+    mTopicsList->setEnabled(true);
     setTitle(npcName);
 
-    topicsList->clear();
+    mTopicsList->clear();
-    history->eraseText(0,history->getTextLength());
+    mHistory->eraseText(0,mHistory->getTextLength());
     updateOptions();
 }
 
 void DialogueWindow::setKeywords(std::list<std::string> keyWords)
 {
-    topicsList->clear();
+    mTopicsList->clear();
 
-    bool anyService = mShowTrade;
+    bool anyService = mShowTrade||mShowSpells;
 
     if (mShowTrade)
-        topicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarter")->str);
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sBarter")->getString());
+
+    if (mShowSpells)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpells")->getString());
 
     if (anyService)
-        topicsList->addSeparator();
+        mTopicsList->addSeparator();
 
     for(std::list<std::string>::iterator it = keyWords.begin(); it != keyWords.end(); ++it)
     {
-        topicsList->addItem(*it);
+        mTopicsList->addItem(*it);
     }
-    topicsList->adjustSize();
+    mTopicsList->adjustSize();
 }
 
 void DialogueWindow::removeKeyword(std::string keyWord)
 {
-    if(topicsList->hasItem(keyWord))
+    if(mTopicsList->hasItem(keyWord))
     {
-        topicsList->removeItem(keyWord);
+        mTopicsList->removeItem(keyWord);
     }
-    topicsList->adjustSize();
+    mTopicsList->adjustSize();
 }
 
 void addColorInString(std::string& str, const std::string& keyword,std::string color1, std::string color2)
@@ -206,9 +216,9 @@ void addColorInString(std::string& str, const std::string& keyword,std::string c
 std::string DialogueWindow::parseText(std::string text)
 {
     bool separatorReached = false; // only parse topics that are below the separator (this prevents actions like "Barter" that are not topics from getting blue-colored)
-    for(unsigned int i = 0;i<topicsList->getItemCount();i++)
+    for(unsigned int i = 0;i<mTopicsList->getItemCount();i++)
     {
-        std::string keyWord = topicsList->getItemNameAt(i);
+        std::string keyWord = mTopicsList->getItemNameAt(i);
         if (separatorReached && keyWord != "")
             addColorInString(text,keyWord,"#686EBA","#B29154");
         else
@@ -219,7 +229,7 @@ std::string DialogueWindow::parseText(std::string text)
 
 void DialogueWindow::addText(std::string text)
 {
-    history->addDialogText("#B29154"+parseText(text)+"#B29154");
+    mHistory->addDialogText("#B29154"+parseText(text)+"#B29154");
 }
 
 void DialogueWindow::addTitle(std::string text)
@@ -227,37 +237,37 @@ void DialogueWindow::addTitle(std::string text)
     // This is called from the dialogue manager, so text is
     // case-smashed - thus we have to retrieve the correct case
     // of the text through the topic list.
-    for (size_t i=0; i<topicsList->getItemCount(); ++i)
+    for (size_t i=0; i<mTopicsList->getItemCount(); ++i)
     {
-        std::string item = topicsList->getItemNameAt(i);
+        std::string item = mTopicsList->getItemNameAt(i);
         if (lower_string(item) == text)
             text = item;
     }
 
-    history->addDialogHeading(text);
+    mHistory->addDialogHeading(text);
 }
 
 void DialogueWindow::askQuestion(std::string question)
 {
-    history->addDialogText("#572D21"+question+"#B29154"+" ");
+    mHistory->addDialogText("#572D21"+question+"#B29154"+" ");
 }
 
 void DialogueWindow::updateOptions()
 {
     //Clear the list of topics
-    topicsList->clear();
+    mTopicsList->clear();
-    history->eraseText(0,history->getTextLength());
+    mHistory->eraseText(0, mHistory->getTextLength());
 
-    pDispositionBar->setProgressRange(100);
+    mDispositionBar->setProgressRange(100);
-    pDispositionBar->setProgressPosition(40);
+    mDispositionBar->setProgressPosition(40);
-    pDispositionText->eraseText(0,pDispositionText->getTextLength());
+    mDispositionText->eraseText(0, mDispositionText->getTextLength());
-    pDispositionText->addText("#B29154"+std::string("40/100")+"#B29154");
+    mDispositionText->addText("#B29154"+std::string("40/100")+"#B29154");
 }
 
 void DialogueWindow::goodbye()
 {
-    history->addDialogText("\n#572D21" + MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGoodbye")->str);
+    mHistory->addDialogText("\n#572D21" + MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sGoodbye")->getString());
-    topicsList->setEnabled(false);
+    mTopicsList->setEnabled(false);
     mEnabled = false;
 }
 

apps/openmw/mwgui/dialogue.hpp

@@ -19,7 +19,7 @@ namespace MWGui
 
 /*
   This file contains the dialouge window
-  Layout is defined by resources/mygui/openmw_dialogue_window_layout.xml.
+  Layout is defined by resources/mygui/openmw_dialogue_window.layout.
  */
 
 namespace MWGui
@@ -29,7 +29,7 @@ namespace MWGui
     class DialogueWindow: public WindowBase, public ReferenceInterface
     {
     public:
-        DialogueWindow(WindowManager& parWindowManager);
+        DialogueWindow(MWBase::WindowManager& parWindowManager);
 
         // Events
         typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
@@ -51,6 +51,7 @@ namespace MWGui
         // various service button visibilities, depending if the npc/creature talked to has these services
         // make sure to call these before setKeywords()
         void setShowTrade(bool show) { mShowTrade = show; }
+        void setShowSpells(bool show) { mShowSpells = show; }
 
     protected:
         void onSelectTopic(std::string topic);
@@ -70,13 +71,14 @@ namespace MWGui
 
         // various service button visibilities, depending if the npc/creature talked to has these services
         bool mShowTrade;
+        bool mShowSpells;
 
         bool mEnabled;
 
-        DialogueHistory*     history;
+        DialogueHistory*   mHistory;
-        Widgets::MWList*      topicsList;
+        Widgets::MWList*   mTopicsList;
-        MyGUI::ProgressPtr pDispositionBar;
+        MyGUI::ProgressPtr mDispositionBar;
-        MyGUI::EditPtr pDispositionText;
+        MyGUI::EditPtr     mDispositionText;
     };
 }
 #endif

apps/openmw/mwgui/dialogue_history.cpp

@@ -1,9 +1,10 @@
 #include "dialogue_history.hpp"
-#include "window_manager.hpp"
+
+#include "../mwbase/windowmanager.hpp"
+
 #include "widgets.hpp"
 #include "components/esm_store/store.hpp"
 
-#include <assert.h>
 #include <iostream>
 #include <iterator>
 
@@ -13,10 +14,10 @@
 using namespace MWGui;
 using namespace Widgets;
 
-UString DialogueHistory::getColorAtPos(size_t _pos)
+MyGUI::UString DialogueHistory::getColorAtPos(size_t _pos)
 {
-    UString colour = TextIterator::convertTagColour(getTextColour());
+    MyGUI::UString colour = MyGUI::TextIterator::convertTagColour(getTextColour());
-    TextIterator iterator(getCaption());
+    MyGUI::TextIterator iterator(getCaption());
     while(iterator.moveNext())
     {
         size_t pos = iterator.getPosition();
@@ -29,13 +30,13 @@ UString DialogueHistory::getColorAtPos(size_t _pos)
     return colour;
 }
 
-UString DialogueHistory::getColorTextAt(size_t _pos)
+MyGUI::UString DialogueHistory::getColorTextAt(size_t _pos)
 {
     bool breakOnNext = false;
-    UString colour = TextIterator::convertTagColour(getTextColour());
+    MyGUI::UString colour = MyGUI::TextIterator::convertTagColour(getTextColour());
-    UString colour2 = colour;
+    MyGUI::UString colour2 = colour;
-    TextIterator iterator(getCaption());
+    MyGUI::TextIterator iterator(getCaption());
-    TextIterator col_start = iterator;
+    MyGUI::TextIterator col_start = iterator;
     while(iterator.moveNext())
     {
         size_t pos = iterator.getPosition();
@@ -59,17 +60,16 @@ UString DialogueHistory::getColorTextAt(size_t _pos)
     return "";
 }
 
-void DialogueHistory::addDialogHeading(const UString& parText)
+void DialogueHistory::addDialogHeading(const MyGUI::UString& parText)
 {
-    UString head("\n#D8C09A");
+    MyGUI::UString head("\n#D8C09A");
     head.append(parText);
     head.append("#B29154\n");
     addText(head);
 }
 
-void DialogueHistory::addDialogText(const UString& parText)
+void DialogueHistory::addDialogText(const MyGUI::UString& parText)
 {
     addText(parText);
     addText("\n");
 }
-

apps/openmw/mwgui/dialogue_history.hpp

@@ -4,16 +4,15 @@
 
 namespace MWGui
 {
-    using namespace MyGUI;
     class DialogueHistory : public MyGUI::EditBox
     {
         MYGUI_RTTI_DERIVED( DialogueHistory )
         public:
             Widget* getClient() { return mClient; }
-            UString getColorAtPos(size_t _pos);
+            MyGUI::UString getColorAtPos(size_t _pos);
-            UString getColorTextAt(size_t _pos);
+            MyGUI::UString getColorTextAt(size_t _pos);
-            void addDialogHeading(const UString& parText);
+            void addDialogHeading(const MyGUI::UString& parText);
-            void addDialogText(const UString& parText);
+            void addDialogText(const MyGUI::UString& parText);
     };
 }
 #endif

apps/openmw/mwgui/hud.cpp

@@ -7,41 +7,44 @@
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwsound/soundmanager.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/class.hpp"
-#include "../mwworld/world.hpp"
 #include "../mwworld/player.hpp"
 
+#include "../mwgui/widgets.hpp"
+
 #include "inventorywindow.hpp"
-#include "window_manager.hpp"
 #include "container.hpp"
 #include "console.hpp"
 
 using namespace MWGui;
 
 HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
-    : Layout("openmw_hud_layout.xml")
+    : Layout("openmw_hud.layout")
-    , health(NULL)
+    , mHealth(NULL)
-    , magicka(NULL)
+    , mMagicka(NULL)
-    , stamina(NULL)
+    , mStamina(NULL)
-    , weapImage(NULL)
+    , mWeapImage(NULL)
-    , spellImage(NULL)
+    , mSpellImage(NULL)
-    , weapStatus(NULL)
+    , mWeapStatus(NULL)
-    , spellStatus(NULL)
+    , mSpellStatus(NULL)
-    , effectBox(NULL)
+    , mEffectBox(NULL)
-    , effect1(NULL)
+    , mEffect1(NULL)
-    , minimap(NULL)
+    , mMinimap(NULL)
-    , compass(NULL)
+    , mCompass(NULL)
-    , crosshair(NULL)
+    , mCrosshair(NULL)
-    , fpsbox(NULL)
+    , mFpsBox(NULL)
-    , fpscounter(NULL)
+    , mFpsCounter(NULL)
-    , trianglecounter(NULL)
+    , mTriangleCounter(NULL)
-    , batchcounter(NULL)
+    , mBatchCounter(NULL)
-    , hmsBaseLeft(0)
+    , mHealthManaStaminaBaseLeft(0)
-    , weapBoxBaseLeft(0)
+    , mWeapBoxBaseLeft(0)
-    , spellBoxBaseLeft(0)
+    , mSpellBoxBaseLeft(0)
-    , effectBoxBaseRight(0)
+    , mEffectBoxBaseRight(0)
-    , minimapBoxBaseRight(0)
+    , mMinimapBoxBaseRight(0)
     , mDragAndDrop(dragAndDrop)
     , mCellNameTimer(0.0f)
     , mCellNameBox(NULL)
@@ -54,11 +57,10 @@ HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
 
     // Energy bars
     getWidget(mHealthFrame, "HealthFrame");
-    getWidget(health, "Health");
+    getWidget(mHealth, "Health");
-    getWidget(magicka, "Magicka");
+    getWidget(mMagicka, "Magicka");
-    getWidget(stamina, "Stamina");
+    getWidget(mStamina, "Stamina");
-
+    mHealthManaStaminaBaseLeft = mHealthFrame->getLeft();
-    hmsBaseLeft = mHealthFrame->getLeft();
 
     MyGUI::Widget *healthFrame, *magickaFrame, *fatigueFrame;
     getWidget(healthFrame, "HealthFrame");
@@ -71,42 +73,43 @@ HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
     const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
 
     // Item and spell images and status bars
-    getWidget(weapBox, "WeapBox");
+    getWidget(mWeapBox, "WeapBox");
-    getWidget(weapImage, "WeapImage");
+    getWidget(mWeapImage, "WeapImage");
-    getWidget(weapStatus, "WeapStatus");
+    getWidget(mWeapStatus, "WeapStatus");
-    weapBoxBaseLeft = weapBox->getLeft();
+    mWeapBoxBaseLeft = mWeapBox->getLeft();
-    weapBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onWeaponClicked);
+    mWeapBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onWeaponClicked);
 
-    getWidget(spellBox, "SpellBox");
+    getWidget(mSpellBox, "SpellBox");
-    getWidget(spellImage, "SpellImage");
+    getWidget(mSpellImage, "SpellImage");
-    getWidget(spellStatus, "SpellStatus");
+    getWidget(mSpellStatus, "SpellStatus");
-    spellBoxBaseLeft = spellBox->getLeft();
+    mSpellBoxBaseLeft = mSpellBox->getLeft();
-    spellBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMagicClicked);
+    mSpellBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMagicClicked);
 
-    getWidget(effectBox, "EffectBox");
+    getWidget(mEffectBox, "EffectBox");
-    getWidget(effect1, "Effect1");
+    getWidget(mEffect1, "Effect1");
-    effectBoxBaseRight = viewSize.width - effectBox->getRight();
+    mEffectBoxBaseRight = viewSize.width - mEffectBox->getRight();
-    effectBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMagicClicked);
+    mEffectBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMagicClicked);
 
-    getWidget(minimapBox, "MiniMapBox");
+    getWidget(mMinimapBox, "MiniMapBox");
-    minimapBoxBaseRight = viewSize.width - minimapBox->getRight();
+    mMinimapBoxBaseRight = viewSize.width - mMinimapBox->getRight();
-    minimapBox->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);
+    getWidget(mMinimap, "MiniMap");
-    getWidget(minimap, "MiniMap");
+    getWidget(mCompass, "Compass");
-    getWidget(compass, "Compass");
+    getWidget(mMinimapButton, "MiniMapButton");
+    mMinimapButton->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);
 
     getWidget(mCellNameBox, "CellName");
     getWidget(mWeaponSpellBox, "WeaponSpellName");
 
-    getWidget(crosshair, "Crosshair");
+    getWidget(mCrosshair, "Crosshair");
 
     setFpsLevel(fpsLevel);
 
-    getWidget(trianglecounter, "TriangleCounter");
+    getWidget(mTriangleCounter, "TriangleCounter");
-    getWidget(batchcounter, "BatchCounter");
+    getWidget(mBatchCounter, "BatchCounter");
 
     setEffect("icons\\s\\tx_s_chameleon.dds");
 
-    LocalMapBase::init(minimap, compass, this);
+    LocalMapBase::init(mMinimap, mCompass, this);
 
     mMainWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onWorldClicked);
     mMainWidget->eventMouseMove += MyGUI::newDelegate(this, &HUD::onWorldMouseOver);
@@ -115,7 +118,7 @@ HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
 
 void HUD::setFpsLevel(int level)
 {
-    fpscounter = 0;
+    mFpsCounter = 0;
 
     MyGUI::Widget* fps;
     getWidget(fps, "FPSBoxAdv");
@@ -125,40 +128,40 @@ void HUD::setFpsLevel(int level)
 
     if (level == 2)
     {
-        getWidget(fpsbox, "FPSBoxAdv");
+        getWidget(mFpsBox, "FPSBoxAdv");
-        fpsbox->setVisible(true);
+        mFpsBox->setVisible(true);
-        getWidget(fpscounter, "FPSCounterAdv");
+        getWidget(mFpsCounter, "FPSCounterAdv");
     }
     else if (level == 1)
     {
-        getWidget(fpsbox, "FPSBox");
+        getWidget(mFpsBox, "FPSBox");
-        fpsbox->setVisible(true);
+        mFpsBox->setVisible(true);
-        getWidget(fpscounter, "FPSCounter");
+        getWidget(mFpsCounter, "FPSCounter");
     }
 }
 
 void HUD::setFPS(float fps)
 {
-    if (fpscounter)
+    if (mFpsCounter)
-        fpscounter->setCaption(boost::lexical_cast<std::string>((int)fps));
+        mFpsCounter->setCaption(boost::lexical_cast<std::string>((int)fps));
 }
 
 void HUD::setTriangleCount(unsigned int count)
 {
-    trianglecounter->setCaption(boost::lexical_cast<std::string>(count));
+    mTriangleCounter->setCaption(boost::lexical_cast<std::string>(count));
 }
 
 void HUD::setBatchCount(unsigned int count)
 {
-    batchcounter->setCaption(boost::lexical_cast<std::string>(count));
+    mBatchCounter->setCaption(boost::lexical_cast<std::string>(count));
 }
 
 void HUD::setEffect(const char *img)
 {
-    effect1->setImageTexture(img);
+    mEffect1->setImageTexture(img);
 }
 
-void HUD::setValue(const std::string& id, const MWMechanics::DynamicStat<int>& value)
+void HUD::setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value)
 {
     static const char *ids[] =
     {
@@ -173,20 +176,20 @@ void HUD::setValue(const std::string& id, const MWMechanics::DynamicStat<int>& v
             switch (i)
             {
                 case 0:
-                    health->setProgressRange (value.getModified());
+                    mHealth->setProgressRange (value.getModified());
-                    health->setProgressPosition (value.getCurrent());
+                    mHealth->setProgressPosition (value.getCurrent());
                     getWidget(w, "HealthFrame");
                     w->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
                     break;
                 case 1:
-                    magicka->setProgressRange (value.getModified());
+                    mMagicka->setProgressRange (value.getModified());
-                    magicka->setProgressPosition (value.getCurrent());
+                    mMagicka->setProgressPosition (value.getCurrent());
                     getWidget(w, "MagickaFrame");
                     w->setUserString("Caption_HealthDescription", "#{sIntDesc}\n" + valStr);
                     break;
                 case 2:
-                    stamina->setProgressRange (value.getModified());
+                    mStamina->setProgressRange (value.getModified());
-                    stamina->setProgressPosition (value.getCurrent());
+                    mStamina->setProgressPosition (value.getCurrent());
                     getWidget(w, "FatigueFrame");
                     w->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
                     break;
@@ -194,52 +197,17 @@ void HUD::setValue(const std::string& id, const MWMechanics::DynamicStat<int>& v
         }
 }
 
-void HUD::setBottomLeftVisibility(bool hmsVisible, bool weapVisible, bool spellVisible)
-{
-    int weapDx = 0, spellDx = 0;
-    if (!hmsVisible)
-        spellDx = weapDx = weapBoxBaseLeft - hmsBaseLeft;
-
-    if (!weapVisible)
-        spellDx += spellBoxBaseLeft - weapBoxBaseLeft;
-
-    mWeaponVisible = weapVisible;
-    mSpellVisible = spellVisible;
-    if (!mWeaponVisible && !mSpellVisible)
-        mWeaponSpellBox->setVisible(false);
-
-    health->setVisible(hmsVisible);
-    stamina->setVisible(hmsVisible);
-    magicka->setVisible(hmsVisible);
-    weapBox->setPosition(weapBoxBaseLeft - weapDx, weapBox->getTop());
-    weapBox->setVisible(weapVisible);
-    spellBox->setPosition(spellBoxBaseLeft - spellDx, spellBox->getTop());
-    spellBox->setVisible(spellVisible);
-}
-
-void HUD::setBottomRightVisibility(bool effectBoxVisible, bool minimapBoxVisible)
-{
-    const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
-
-    // effect box can have variable width -> variable left coordinate
-    int effectsDx = 0;
-    if (!minimapBoxVisible)
-        effectsDx = (viewSize.width - minimapBoxBaseRight) - (viewSize.width - effectBoxBaseRight);
-
-    mMapVisible = minimapBoxVisible;
-    minimapBox->setVisible(minimapBoxVisible);
-    effectBox->setPosition((viewSize.width - effectBoxBaseRight) - effectBox->getWidth() + effectsDx, effectBox->getTop());
-    effectBox->setVisible(effectBoxVisible);
-}
-
 void HUD::onWorldClicked(MyGUI::Widget* _sender)
 {
+    if (!MWBase::Environment::get().getWindowManager ()->isGuiMode ())
+        return;
+
     if (mDragAndDrop->mIsOnDragAndDrop)
     {
         // drop item into the gameworld
         MWWorld::Ptr object = *mDragAndDrop->mDraggedWidget->getUserData<MWWorld::Ptr>();
 
-        MWWorld::World* world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
         MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
         MyGUI::IntPoint cursorPosition = MyGUI::InputManager::getInstance().getMousePosition();
@@ -282,7 +250,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
         {
             object = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
         }
-        catch (std::exception& e)
+        catch (std::exception& /* e */)
         {
             return;
         }
@@ -308,7 +276,7 @@ void HUD::onWorldMouseOver(MyGUI::Widget* _sender, int x, int y)
         float mouseX = cursorPosition.left / float(viewSize.width);
         float mouseY = cursorPosition.top / float(viewSize.height);
 
-        MWWorld::World* world = MWBase::Environment::get().getWorld();
+        MWBase::World* world = MWBase::Environment::get().getWorld();
 
         // if we can't drop the object at the wanted position, show the "drop on ground" cursor.
         bool canDrop = world->canPlaceObject(mouseX, mouseY);
@@ -391,14 +359,14 @@ void HUD::setSelectedSpell(const std::string& spellId, int successChancePercent)
         mWeaponSpellBox->setVisible(true);
     }
 
-    spellStatus->setProgressRange(100);
+    mSpellStatus->setProgressRange(100);
-    spellStatus->setProgressPosition(successChancePercent);
+    mSpellStatus->setProgressPosition(successChancePercent);
 
-    if (spellImage->getChildCount())
+    if (mSpellImage->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(spellImage->getChildAt(0));
+        MyGUI::Gui::getInstance().destroyWidget(mSpellImage->getChildAt(0));
 
-    spellBox->setUserString("ToolTipType", "Spell");
+    mSpellBox->setUserString("ToolTipType", "Spell");
-    spellBox->setUserString("Spell", spellId);
+    mSpellBox->setUserString("Spell", spellId);
 
     // use the icon of the first effect
     const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().magicEffects.find(spell->effects.list.front().effectID);
@@ -407,7 +375,7 @@ void HUD::setSelectedSpell(const std::string& spellId, int successChancePercent)
     icon.insert(slashPos+1, "b_");
     icon = std::string("icons\\") + icon;
     Widgets::fixTexturePath(icon);
-    spellImage->setImageTexture(icon);
+    mSpellImage->setImageTexture(icon);
 }
 
 void HUD::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
@@ -421,17 +389,17 @@ void HUD::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
         mWeaponSpellBox->setVisible(true);
     }
 
-    spellStatus->setProgressRange(100);
+    mSpellStatus->setProgressRange(100);
-    spellStatus->setProgressPosition(chargePercent);
+    mSpellStatus->setProgressPosition(chargePercent);
 
-    if (spellImage->getChildCount())
+    if (mSpellImage->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(spellImage->getChildAt(0));
+        MyGUI::Gui::getInstance().destroyWidget(mSpellImage->getChildAt(0));
 
-    spellBox->setUserString("ToolTipType", "ItemPtr");
+    mSpellBox->setUserString("ToolTipType", "ItemPtr");
-    spellBox->setUserData(item);
+    mSpellBox->setUserData(item);
 
-    spellImage->setImageTexture("textures\\menu_icon_magic_mini.dds");
+    mSpellImage->setImageTexture("textures\\menu_icon_magic_mini.dds");
-    MyGUI::ImageBox* itemBox = spellImage->createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0,0,1,1)
+    MyGUI::ImageBox* itemBox = mSpellImage->createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0,0,1,1)
         , MyGUI::Align::Stretch);
 
     std::string path = std::string("icons\\");
@@ -452,14 +420,14 @@ void HUD::setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent)
         mWeaponSpellBox->setVisible(true);
     }
 
-    weapBox->setUserString("ToolTipType", "ItemPtr");
+    mWeapBox->setUserString("ToolTipType", "ItemPtr");
-    weapBox->setUserData(item);
+    mWeapBox->setUserData(item);
 
-    weapStatus->setProgressRange(100);
+    mWeapStatus->setProgressRange(100);
-    weapStatus->setProgressPosition(durabilityPercent);
+    mWeapStatus->setProgressPosition(durabilityPercent);
 
-    if (weapImage->getChildCount())
+    if (mWeapImage->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(weapImage->getChildAt(0));
+        MyGUI::Gui::getInstance().destroyWidget(mWeapImage->getChildAt(0));
 
     std::string path = std::string("icons\\");
     path+=MWWorld::Class::get(item).getInventoryIcon(item);
@@ -467,14 +435,14 @@ void HUD::setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent)
 
     if (MWWorld::Class::get(item).getEnchantment(item) != "")
     {
-        weapImage->setImageTexture("textures\\menu_icon_magic_mini.dds");
+        mWeapImage->setImageTexture("textures\\menu_icon_magic_mini.dds");
-        MyGUI::ImageBox* itemBox = weapImage->createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0,0,1,1)
+        MyGUI::ImageBox* itemBox = mWeapImage->createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0,0,1,1)
             , MyGUI::Align::Stretch);
         itemBox->setImageTexture(path);
         itemBox->setNeedMouseFocus(false);
     }
     else
-        weapImage->setImageTexture(path);
+        mWeapImage->setImageTexture(path);
 }
 
 void HUD::unsetSelectedSpell()
@@ -488,12 +456,12 @@ void HUD::unsetSelectedSpell()
         mWeaponSpellBox->setVisible(true);
     }
 
-    if (spellImage->getChildCount())
+    if (mSpellImage->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(spellImage->getChildAt(0));
+        MyGUI::Gui::getInstance().destroyWidget(mSpellImage->getChildAt(0));
-    spellStatus->setProgressRange(100);
+    mSpellStatus->setProgressRange(100);
-    spellStatus->setProgressPosition(0);
+    mSpellStatus->setProgressPosition(0);
-    spellImage->setImageTexture("");
+    mSpellImage->setImageTexture("");
-    spellBox->clearUserStrings();
+    mSpellBox->clearUserStrings();
 }
 
 void HUD::unsetSelectedWeapon()
@@ -507,10 +475,75 @@ void HUD::unsetSelectedWeapon()
         mWeaponSpellBox->setVisible(true);
     }
 
-    if (weapImage->getChildCount())
+    if (mWeapImage->getChildCount())
-        MyGUI::Gui::getInstance().destroyWidget(weapImage->getChildAt(0));
+        MyGUI::Gui::getInstance().destroyWidget(mWeapImage->getChildAt(0));
-    weapStatus->setProgressRange(100);
+    mWeapStatus->setProgressRange(100);
-    weapStatus->setProgressPosition(0);
+    mWeapStatus->setProgressPosition(0);
-    weapImage->setImageTexture("icons\\k\\stealth_handtohand.dds");
+    mWeapImage->setImageTexture("icons\\k\\stealth_handtohand.dds");
-    weapBox->clearUserStrings();
+    mWeapBox->clearUserStrings();
+}
+
+void HUD::setCrosshairVisible(bool visible)
+{
+    mCrosshair->setVisible (visible);
+}
+
+void HUD::setHmsVisible(bool visible)
+{
+    mHealth->setVisible(visible);
+    mMagicka->setVisible(visible);
+    mStamina->setVisible(visible);
+    updatePositions();
+}
+
+void HUD::setWeapVisible(bool visible)
+{
+    mWeapBox->setVisible(visible);
+    updatePositions();
+}
+
+void HUD::setSpellVisible(bool visible)
+{
+    mSpellBox->setVisible(visible);
+    updatePositions();
+}
+
+void HUD::setEffectVisible(bool visible)
+{
+    mEffectBox->setVisible (visible);
+    updatePositions();
+}
+
+void HUD::setMinimapVisible(bool visible)
+{
+    mMinimapBox->setVisible (visible);
+    updatePositions();
+}
+
+void HUD::updatePositions()
+{
+    int weapDx = 0, spellDx = 0;
+    if (!mHealth->getVisible())
+        spellDx = weapDx = mWeapBoxBaseLeft - mHealthManaStaminaBaseLeft;
+
+    if (!mWeapBox->getVisible())
+        spellDx += mSpellBoxBaseLeft - mWeapBoxBaseLeft;
+
+    mWeaponVisible = mWeapBox->getVisible();
+    mSpellVisible = mSpellBox->getVisible();
+    if (!mWeaponVisible && !mSpellVisible)
+        mWeaponSpellBox->setVisible(false);
+
+    mWeapBox->setPosition(mWeapBoxBaseLeft - weapDx, mWeapBox->getTop());
+    mSpellBox->setPosition(mSpellBoxBaseLeft - spellDx, mSpellBox->getTop());
+
+    const MyGUI::IntSize& viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+
+    // effect box can have variable width -> variable left coordinate
+    int effectsDx = 0;
+    if (!mMinimapBox->getVisible ())
+        effectsDx = (viewSize.width - mMinimapBoxBaseRight) - (viewSize.width - mEffectBoxBaseRight);
+
+    mMapVisible = mMinimapBox->getVisible ();
+    mEffectBox->setPosition((viewSize.width - mEffectBoxBaseRight) - mEffectBox->getWidth() + effectsDx, mEffectBox->getTop());
 }

apps/openmw/mwgui/hud.hpp

@@ -14,12 +14,18 @@ namespace MWGui
     public:
         HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop);
         void setEffect(const char *img);
-        void setValue (const std::string& id, const MWMechanics::DynamicStat<int>& value);
+        void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value);
         void setFPS(float fps);
         void setTriangleCount(unsigned int count);
         void setBatchCount(unsigned int count);
-        void setBottomLeftVisibility(bool hmsVisible, bool weapVisible, bool spellVisible);
+
-        void setBottomRightVisibility(bool effectBoxVisible, bool minimapVisible);
+        void setHmsVisible(bool visible);
+        void setWeapVisible(bool visible);
+        void setSpellVisible(bool visible);
+
+        void setEffectVisible(bool visible);
+        void setMinimapVisible(bool visible);
+
         void setFpsLevel(const int level);
 
         void setSelectedSpell(const std::string& spellId, int successChancePercent);
@@ -28,6 +34,8 @@ namespace MWGui
         void unsetSelectedSpell();
         void unsetSelectedWeapon();
 
+        void setCrosshairVisible(bool visible);
+
         void onFrame(float dt);
         void onResChange(int width, int height);
 
@@ -35,29 +43,32 @@ namespace MWGui
 
         bool getWorldMouseOver() { return mWorldMouseOver; }
 
-        MyGUI::ProgressPtr health, magicka, stamina;
+    private:
+        MyGUI::ProgressPtr mHealth, mMagicka, mStamina;
         MyGUI::Widget* mHealthFrame;
-        MyGUI::Widget *weapBox, *spellBox;
+        MyGUI::Widget *mWeapBox, *mSpellBox;
-        MyGUI::ImageBox *weapImage, *spellImage;
+        MyGUI::ImageBox *mWeapImage, *mSpellImage;
-        MyGUI::ProgressPtr weapStatus, spellStatus;
+        MyGUI::ProgressPtr mWeapStatus, mSpellStatus;
-        MyGUI::Widget *effectBox, *minimapBox;
+        MyGUI::Widget *mEffectBox, *mMinimapBox;
-        MyGUI::ImageBox* effect1;
+        MyGUI::Button* mMinimapButton;
-        MyGUI::ScrollView* minimap;
+        MyGUI::ImageBox* mEffect1;
-        MyGUI::ImageBox* compass;
+        MyGUI::ScrollView* mMinimap;
-        MyGUI::ImageBox* crosshair;
+        MyGUI::ImageBox* mCompass;
+        MyGUI::ImageBox* mCrosshair;
         MyGUI::TextBox* mCellNameBox;
         MyGUI::TextBox* mWeaponSpellBox;
 
-        MyGUI::WidgetPtr fpsbox;
+        MyGUI::Widget* mDummy;
-        MyGUI::TextBox* fpscounter;
+
-        MyGUI::TextBox* trianglecounter;
+        MyGUI::WidgetPtr mFpsBox;
-        MyGUI::TextBox* batchcounter;
+        MyGUI::TextBox* mFpsCounter;
+        MyGUI::TextBox* mTriangleCounter;
+        MyGUI::TextBox* mBatchCounter;
 
-    private:
         // bottom left elements
-        int hmsBaseLeft, weapBoxBaseLeft, spellBoxBaseLeft;
+        int mHealthManaStaminaBaseLeft, mWeapBoxBaseLeft, mSpellBoxBaseLeft;
         // bottom right elements
-        int minimapBoxBaseRight, effectBoxBaseRight;
+        int mMinimapBoxBaseRight, mEffectBoxBaseRight;
 
         DragAndDrop* mDragAndDrop;
 
@@ -81,5 +92,7 @@ namespace MWGui
         void onWeaponClicked(MyGUI::Widget* _sender);
         void onMagicClicked(MyGUI::Widget* _sender);
         void onMapClicked(MyGUI::Widget* _sender);
+
+        void updatePositions();
     };
 }

apps/openmw/mwgui/inventorywindow.cpp

@@ -3,22 +3,22 @@
 #include <cmath>
 #include <algorithm>
 #include <iterator>
-#include <assert.h>
+#include <cassert>
-#include <iostream>
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwclass/container.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/world.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwbase/environment.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/actiontake.hpp"
-#include "../mwsound/soundmanager.hpp"
+#include "../mwworld/inventorystore.hpp"
 
-#include "window_manager.hpp"
 #include "widgets.hpp"
 #include "bookwindow.hpp"
 #include "scrollwindow.hpp"
@@ -40,14 +40,18 @@ namespace
 namespace MWGui
 {
 
-    InventoryWindow::InventoryWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
+    InventoryWindow::InventoryWindow(MWBase::WindowManager& parWindowManager,DragAndDrop* dragAndDrop)
         : ContainerBase(dragAndDrop)
-        , WindowPinnableBase("openmw_inventory_window_layout.xml", parWindowManager)
+        , WindowPinnableBase("openmw_inventory_window.layout", parWindowManager)
         , mTrading(false)
+        , mLastXSize(0)
+        , mLastYSize(0)
+        , mPreview(MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ())
     {
         static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
 
         getWidget(mAvatar, "Avatar");
+        getWidget(mAvatarImage, "AvatarImage");
         getWidget(mEncumbranceBar, "EncumbranceBar");
         getWidget(mEncumbranceText, "EncumbranceBarT");
         getWidget(mFilterAll, "AllButton");
@@ -66,26 +70,6 @@ namespace MWGui
         getWidget(itemView, "ItemView");
         setWidgets(containerWidget, itemView);
 
-        // adjust size of buttons to fit text
-        int curX = 0;
-        mFilterAll->setSize( mFilterAll->getTextSize().width + 24, mFilterAll->getSize().height );
-        curX += mFilterAll->getTextSize().width + 24 + 4;
-
-        mFilterWeapon->setPosition(curX, mFilterWeapon->getPosition().top);
-        mFilterWeapon->setSize( mFilterWeapon->getTextSize().width + 24, mFilterWeapon->getSize().height );
-        curX += mFilterWeapon->getTextSize().width + 24 + 4;
-
-        mFilterApparel->setPosition(curX, mFilterApparel->getPosition().top);
-        mFilterApparel->setSize( mFilterApparel->getTextSize().width + 24, mFilterApparel->getSize().height );
-        curX += mFilterApparel->getTextSize().width + 24 + 4;
-
-        mFilterMagic->setPosition(curX, mFilterMagic->getPosition().top);
-        mFilterMagic->setSize( mFilterMagic->getTextSize().width + 24, mFilterMagic->getSize().height );
-        curX += mFilterMagic->getTextSize().width + 24 + 4;
-
-        mFilterMisc->setPosition(curX, mFilterMisc->getPosition().top);
-        mFilterMisc->setSize( mFilterMisc->getTextSize().width + 24, mFilterMisc->getSize().height );
-
         mFilterAll->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onFilterChanged);
         mFilterWeapon->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onFilterChanged);
         mFilterApparel->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onFilterChanged);
@@ -96,6 +80,8 @@ namespace MWGui
 
         setCoord(0, 342, 498, 258);
 
+        MWBase::Environment::get().getWorld ()->setupExternalRendering (mPreview);
+
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         openContainer(player);
     }
@@ -109,6 +95,7 @@ namespace MWGui
         mBoughtItems.clear();
 
         onWindowResize(static_cast<MyGUI::Window*>(mMainWidget));
+        drawItems();
     }
 
     void InventoryWindow::onWindowResize(MyGUI::Window* _sender)
@@ -119,7 +106,13 @@ namespace MWGui
                               mRightPane->getPosition().top,
                               _sender->getSize().width - 12 - (_sender->getSize().height-44) * aspect - 15,
                               _sender->getSize().height-44 );
-        drawItems();
+
+        if (mMainWidget->getSize().width != mLastXSize || mMainWidget->getSize().height != mLastYSize)
+        {
+            drawItems();
+            mLastXSize = mMainWidget->getSize().width;
+            mLastYSize = mMainWidget->getSize().height;
+        }
     }
 
     void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender)
@@ -172,7 +165,7 @@ namespace MWGui
 
             boost::shared_ptr<MWWorld::Action> action = MWWorld::Class::get(ptr).use(ptr);
 
-            action->execute();
+            action->execute (MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
 
             // this is necessary for books/scrolls: if they are already in the player's inventory,
             // the "Take" button should not be visible.
@@ -191,15 +184,45 @@ namespace MWGui
 
             drawItems();
 
-            // update selected weapon icon
+            notifyContentChanged();
-            MWWorld::InventoryStore& invStore = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
-            MWWorld::ContainerStoreIterator weaponSlot = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-            if (weaponSlot == invStore.end())
-                mWindowManager.unsetSelectedWeapon();
-            else
-                mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
-
         }
+        else
+        {
+            MyGUI::IntPoint mousePos = MyGUI::InputManager::getInstance ().getLastPressedPosition (MyGUI::MouseButton::Left);
+            MyGUI::IntPoint relPos = mousePos - mAvatar->getAbsolutePosition ();
+            int realX = int(float(relPos.left) / float(mAvatar->getSize().width) * 512.f );
+            int realY = int(float(relPos.top) / float(mAvatar->getSize().height) * 1024.f );
+
+            MWWorld::Ptr itemSelected = getAvatarSelectedItem (realX, realY);
+            if (itemSelected.isEmpty ())
+                return;
+
+            for (unsigned int i=0; i < mContainerWidget->getChildCount (); ++i)
+            {
+                MyGUI::Widget* w = mContainerWidget->getChildAt (i);
+
+                if (*w->getUserData<MWWorld::Ptr>() == itemSelected)
+                {
+                    onSelectedItem(w);
+                    return;
+                }
+            }
+        }
+    }
+
+    MWWorld::Ptr InventoryWindow::getAvatarSelectedItem(int x, int y)
+    {
+        int slot = mPreview.getSlotSelected (x, y);
+
+        if (slot == -1)
+            return MWWorld::Ptr();
+
+        MWWorld::Ptr player = mPtr;
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
+        if (invStore.getSlot(slot) != invStore.end())
+            return *invStore.getSlot (slot);
+        else
+            return MWWorld::Ptr();
     }
 
     std::vector<MWWorld::Ptr> InventoryWindow::getEquippedItems()
@@ -285,6 +308,12 @@ namespace MWGui
             mWindowManager.unsetSelectedWeapon();
         else
             mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
+
+        MyGUI::IntSize size = mAvatar->getSize();
+
+        mPreview.update (size.width, size.height);
+        mAvatarImage->setSize(MyGUI::IntSize(std::max(mAvatar->getSize().width, 512), std::max(mAvatar->getSize().height, 1024)));
+        mAvatarImage->setImageTexture("CharacterPreview");
     }
 
     void InventoryWindow::pickUpObject (MWWorld::Ptr object)
@@ -307,6 +336,9 @@ namespace MWGui
             && (type != typeid(ESM::Potion).name()))
             return;
 
+        if (MWWorld::Class::get(object).getName(object) == "") // objects without name presented to user can never be picked up
+            return;
+
         // sound
         std::string sound = MWWorld::Class::get(object).getUpSoundId(object);
         MWBase::Environment::get().getSoundManager()->playSound(sound, 1, 1);
@@ -325,12 +357,12 @@ namespace MWGui
 
         std::string path = std::string("icons\\");
         path += MWWorld::Class::get(newObject).getInventoryIcon(newObject);
-        MyGUI::ImageBox* baseWidget = mContainerWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
+        MyGUI::ImageBox* baseWidget = mContainerWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
         baseWidget->detachFromWidget();
         baseWidget->attachToWidget(mDragAndDrop->mDragAndDropWidget);
         baseWidget->setUserData(newObject);
         mDragAndDrop->mDraggedWidget = baseWidget;
-        ImageBox* image = baseWidget->createWidget<ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
+        MyGUI::ImageBox* image = baseWidget->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -346,4 +378,9 @@ namespace MWGui
         text->setCaption(getCountString(count));
         mDragAndDrop->mDraggedFrom = this;
     }
+
+    MyGUI::IntCoord InventoryWindow::getAvatarScreenCoord ()
+    {
+        return mAvatar->getAbsoluteCoord ();
+    }
 }

apps/openmw/mwgui/inventorywindow.hpp

@@ -1,6 +1,8 @@
 #ifndef MGUI_Inventory_H
 #define MGUI_Inventory_H
 
+#include "../mwrender/characterpreview.hpp"
+
 #include "container.hpp"
 #include "window_pinnable_base.hpp"
 
@@ -9,7 +11,7 @@ namespace MWGui
     class InventoryWindow : public ContainerBase, public WindowPinnableBase
     {
         public:
-            InventoryWindow(WindowManager& parWindowManager,DragAndDrop* dragAndDrop);
+            InventoryWindow(MWBase::WindowManager& parWindowManager,DragAndDrop* dragAndDrop);
 
             virtual void open();
 
@@ -22,8 +24,13 @@ namespace MWGui
 
             int getPlayerGold();
 
+            MyGUI::IntCoord getAvatarScreenCoord();
+
+            MWWorld::Ptr getAvatarSelectedItem(int x, int y);
+
         protected:
             MyGUI::Widget* mAvatar;
+            MyGUI::ImageBox* mAvatarImage;
             MyGUI::TextBox* mArmorRating;
             MyGUI::ProgressBar* mEncumbranceBar;
             MyGUI::TextBox* mEncumbranceText;
@@ -37,6 +44,11 @@ namespace MWGui
             MyGUI::Button* mFilterMagic;
             MyGUI::Button* mFilterMisc;
 
+            int mLastXSize;
+            int mLastYSize;
+
+            MWRender::InventoryPreview mPreview;
+
             bool mTrading;
 
             void onWindowResize(MyGUI::Window* _sender);

apps/openmw/mwgui/itemselection.cpp

@@ -0,0 +1,39 @@
+#include "itemselection.hpp"
+
+namespace MWGui
+{
+
+    ItemSelectionDialog::ItemSelectionDialog(const std::string &label, ContainerBase::Filter filter, MWBase::WindowManager& parWindowManager)
+        : ContainerBase(NULL)
+        , WindowModal("openmw_itemselection_dialog.layout", parWindowManager)
+    {
+        mFilter = filter;
+
+        MyGUI::ScrollView* itemView;
+        MyGUI::Widget* containerWidget;
+        getWidget(containerWidget, "Items");
+        getWidget(itemView, "ItemView");
+        setWidgets(containerWidget, itemView);
+
+        MyGUI::TextBox* l;
+        getWidget(l, "Label");
+        l->setCaptionWithReplacing (label);
+
+        MyGUI::Button* cancelButton;
+        getWidget(cancelButton, "CancelButton");
+        cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemSelectionDialog::onCancelButtonClicked);
+
+        center();
+    }
+
+    void ItemSelectionDialog::onSelectedItemImpl(MWWorld::Ptr item)
+    {
+        eventItemSelected(item);
+    }
+
+    void ItemSelectionDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    {
+        eventDialogCanceled();
+    }
+
+}

apps/openmw/mwgui/itemselection.hpp

@@ -0,0 +1,28 @@
+#include "container.hpp"
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWGui
+{
+
+    class ItemSelectionDialog : public ContainerBase, public WindowModal
+    {
+    public:
+        ItemSelectionDialog(const std::string& label, ContainerBase::Filter filter, MWBase::WindowManager& parWindowManager);
+
+        typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
+        typedef MyGUI::delegates::CMultiDelegate1<MWWorld::Ptr> EventHandle_Item;
+
+        EventHandle_Item eventItemSelected;
+        EventHandle_Void eventDialogCanceled;
+
+
+    private:
+        virtual void onReferenceUnavailable() { ; }
+
+        virtual void onSelectedItemImpl(MWWorld::Ptr item);
+
+        void onCancelButtonClicked(MyGUI::Widget* sender);
+    };
+
+}

apps/openmw/mwgui/journalwindow.cpp

@@ -1,10 +1,12 @@
 #include "journalwindow.hpp"
-#include "window_manager.hpp"
-#include "../mwdialogue/journal.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwworld/world.hpp"
 
-#include "../mwsound/soundmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/journal.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwdialogue/journalentry.hpp"
 
 namespace
 {
@@ -79,9 +81,9 @@ book formatText(std::string text,book mBook,int maxLine, int lineSize)
 }
 
 
-MWGui::JournalWindow::JournalWindow (WindowManager& parWindowManager)
+MWGui::JournalWindow::JournalWindow (MWBase::WindowManager& parWindowManager)
-    : WindowBase("openmw_journal_layout.xml", parWindowManager)
+    : WindowBase("openmw_journal.layout", parWindowManager)
-    , lastPos(0)
+    , mLastPos(0)
     , mVisible(false)
 {
     //setCoord(0,0,498, 342);
@@ -145,19 +147,19 @@ void MWGui::JournalWindow::open()
         {
             if(left)
             {
-                leftPages.push_back(*it);
+                mLeftPages.push_back(*it);
             }
             else
             {
-                rightPages.push_back(*it);
+                mRightPages.push_back(*it);
             }
             left = !left;
         }
-        if(!left) rightPages.push_back("");
+        if(!left) mRightPages.push_back("");
 
-        mPageNumber = leftPages.size()-1;
+        mPageNumber = mLeftPages.size()-1;
-        displayLeftText(leftPages[mPageNumber]);
+        displayLeftText(mLeftPages[mPageNumber]);
-        displayRightText(rightPages[mPageNumber]);
+        displayRightText(mRightPages[mPageNumber]);
 
     }
     else
@@ -181,13 +183,13 @@ void MWGui::JournalWindow::displayRightText(std::string text)
 
 void MWGui::JournalWindow::notifyNextPage(MyGUI::WidgetPtr _sender)
 {
-    if(mPageNumber < int(leftPages.size())-1)
+    if(mPageNumber < int(mLeftPages.size())-1)
     {
         std::string nextSound = "book page2";
         MWBase::Environment::get().getSoundManager()->playSound (nextSound, 1.0, 1.0);
         mPageNumber = mPageNumber + 1;
-        displayLeftText(leftPages[mPageNumber]);
+        displayLeftText(mLeftPages[mPageNumber]);
-        displayRightText(rightPages[mPageNumber]);
+        displayRightText(mRightPages[mPageNumber]);
     }
 }
 
@@ -198,7 +200,7 @@ void MWGui::JournalWindow::notifyPrevPage(MyGUI::WidgetPtr _sender)
         std::string prevSound = "book page";
         MWBase::Environment::get().getSoundManager()->playSound (prevSound, 1.0, 1.0);
         mPageNumber = mPageNumber - 1;
-        displayLeftText(leftPages[mPageNumber]);
+        displayLeftText(mLeftPages[mPageNumber]);
-        displayRightText(rightPages[mPageNumber]);
+        displayRightText(mRightPages[mPageNumber]);
     }
 }