From 956234cde999034c5e0a7af27d43818d4252b660 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 2 Jun 2015 23:11:09 +0200
Subject: [PATCH 001/765] Add preliminary appveyor data

---
 CI/before_script.msvc.sh | 331 +++++++++++++++++++++++++++++++++++++++
 CI/build.msvc.sh         |  22 +++
 appveyor.yml             |  20 +++
 3 files changed, 373 insertions(+)
 create mode 100644 CI/before_script.msvc.sh
 create mode 100644 CI/build.msvc.sh
 create mode 100644 appveyor.yml

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
new file mode 100644
index 0000000000..9f94d5f310
--- /dev/null
+++ b/CI/before_script.msvc.sh
@@ -0,0 +1,331 @@
+#!/bin/bash
+
+while [ $# -gt 0 ]; do
+	ARG=$1
+	shift
+
+	case $ARG in
+		-v )
+			VERBOSE=true ;;
+
+		x86|i686|win32 )
+			platform=i686 ;;
+
+		x64_64|x64|win64 )
+			platform=x86_64 ;;
+
+		* )
+			echo "Unknown arg $ARG." ;;
+	esac
+done
+
+if [ -z $VERBOSE ]; then
+	STRIP="> /dev/null 2>&1"
+fi
+
+cd $(dirname $0)/..
+which appveyor > /dev/null
+if [ $? -eq 0 ]; then
+	VERSION="$(cat README.md | grep Version: | awk '{ print $3; }')-$(git rev-parse --short HEAD)"
+	appveyor UpdateBuild -Version "$VERSION"
+fi
+
+download() {
+	if ! [ -f $2 ]; then
+		printf "  Downloading $2... "
+
+		if [ -z $VERBOSE ]; then
+			curl --silent --retry 10 -kLy 5 -o $2 $1
+			RET=$?
+		else
+			curl --retry 10 -kLy 5 -o $2 $1
+			RET=$?
+		fi
+
+		if [ $RET -ne 0 ]; then
+			echo "Failed!"
+		else
+			echo "Done"
+		fi
+
+		return $RET
+	else
+		echo "  $2 exists, skipping."
+	fi
+
+	return 0
+}
+
+real_pwd() {
+	pwd | sed "s,/\(.\),\1:,"
+}
+
+msbuild() {
+	/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe $@
+}
+
+CMAKE_OPTS=""
+add_cmake_opts() {
+	CMAKE_OPTS="$CMAKE_OPTS $@"
+}
+
+if [ -z "$ARCH" ]; then
+	if [ -z "$platform" ]; then
+		ARCH=`uname -m`
+	else
+		ARCH="$platform"
+	fi
+fi
+
+if [ $ARCH == x86_64 ]; then
+	ARCHNAME=x86-64
+	ARCHSUFFIX=64
+	BITS=64
+
+	BASE_OPTS="-G\"Visual Studio 12 2013 Win64\""
+	add_cmake_opts "-G\"Visual Studio 12 2013 Win64\""
+else
+	ARCHNAME=x86
+	ARCHSUFFIX=86
+	BITS=32
+
+	BASE_OPTS="-G\"Visual Studio 12 2013\" -Tv120_xp"
+	add_cmake_opts "-G\"Visual Studio 12 2013\"" -Tv120_xp
+fi
+
+mkdir -p deps
+cd deps
+
+DEPS="`pwd`"
+
+echo "Downloading dependency packages."
+echo
+
+# Boost
+echo "Boost 1.58.0..."
+download http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe boost-1.58.0-win$BITS.exe
+echo
+
+# Bullet
+echo "Bullet 2.83.4..."
+download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.zip
+echo
+
+# FFmpeg
+echo "FFmpeg 2.5.2..."
+download http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z ffmpeg$BITS-2.5.2.7z
+download http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z ffmpeg$BITS-2.5.2-dev.7z
+echo
+
+# MyGUI
+echo "MyGUI 3.2.2..."
+download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/MyGUI-3.2.2-win$BITS.7z MyGUI-3.2.2-win$BITS.7z
+echo
+
+# Ogre
+echo "Ogre 1.9..."
+download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Ogre-1.9-win$BITS.7z Ogre-1.9-win$BITS.7z
+echo
+
+# OpenAL
+echo "OpenAL-Soft 1.16.0..."
+download http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip OpenAL-Soft-1.16.0.zip
+echo
+
+# Qt
+echo "Qt 4.8.6..."
+download http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z qt$BITS-4.8.6.7z
+echo
+
+# SDL2
+echo "SDL 2.0.3 binaries..."
+download https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip SDL2-2.0.3.zip
+echo
+
+cd ..
+
+# Set up dependencies
+rm -rf build_$BITS
+mkdir -p build_$BITS/deps
+cd deps
+
+echo
+echo "Extracting dependencies..."
+echo
+
+# Boost
+printf "Boost 1.58.0... "
+cd ../build_$BITS/deps
+
+BOOST_SDK="`real_pwd`/Boost"
+
+$DEPS/boost_1_58_0-msvc-12.0-$BITS.exe //dir="$BOOST_SDK" //verysilent
+
+add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
+	-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+
+cd $DEPS
+
+echo Done.
+echo
+
+# Bullet
+printf "Bullet 2.83.4... "
+cd ../build_$BITS/deps
+
+eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
+mv Bullet-2.83.4-win$BITS Bullet
+
+BULLET_SDK="`real_pwd`/Bullet"
+add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include" \
+	-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
+	-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
+	-DBULLET_DYNAMICS_LIBRARY="$BULLET_SDK/lib/BulletDynamics.lib" \
+	-DBULLET_DYNAMICS_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletDynamics_Debug.lib" \
+	-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
+	-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"
+
+cd $DEPS
+
+echo Done.
+echo
+
+# FFmpeg
+printf "FFmpeg 2.5.2... "
+cd ../build_$BITS/deps
+
+eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
+eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+
+mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
+cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
+rm -rf ffmpeg-2.5.2-win$BITS-dev
+
+FFMPEG_SDK="`real_pwd`/FFmpeg"
+add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \
+	-DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \
+	-DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \
+	-DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \
+	-DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \
+	-DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \
+	-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+	-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
+
+if [ $BITS -eq 32 ]; then
+	add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
+fi
+
+cd $DEPS
+
+echo Done.
+echo
+
+# Ogre
+printf "Ogre 1.9... "
+cd ../build_$BITS/deps
+
+eval 7z x -y $DEPS/Ogre-1.9-win$BITS.7z $STRIP
+mv Ogre-1.9-win$BITS Ogre
+
+OGRE_SDK="`real_pwd`/Ogre"
+
+add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
+
+cd $DEPS
+
+echo Done.
+echo
+
+# MyGUI
+printf "MyGUI 3.2.2... "
+cd ../build_$BITS/deps
+
+eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
+mv MyGUI-3.2.2-win$BITS MyGUI
+
+MYGUI_SDK="`real_pwd`/MyGUI"
+
+add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
+	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
+	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
+	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.hpp"
+
+cd $DEPS
+
+echo Done.
+echo
+
+# OpenAL
+printf "OpenAL-Soft 1.16.0... "
+eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+
+OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
+
+add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include" \
+	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
+
+echo Done.
+echo
+
+# Qt
+printf "Qt 4.8.6 binaries... "
+cd ../build_$BITS/deps
+
+eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
+mv qt-4.8.6-* Qt
+
+QT_SDK="`real_pwd`/Qt"
+
+cd $QT_SDK
+eval qtbinpatcher.exe $STRIP
+
+add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+
+cd $DEPS
+
+echo Done.
+echo
+
+# SDL2
+printf "SDL 2.0.3 binaries... "
+eval 7z x -y SDL2-2.0.3.zip $STRIP
+
+SDL_SDK="`real_pwd`/SDL2-2.0.3"
+add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
+	-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
+	-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
+	-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+
+cd $DEPS
+
+echo Done.
+echo
+
+cd ../build_$BITS
+
+echo "Building OpenMW."
+
+add_cmake_opts -DBUILD_BSATOOL=no \
+	-DBUILD_ESMTOOL=no \
+	-DBUILD_MYGUI_PLUGIN=no
+
+if [ -z $VERBOSE ]; then
+	printf "  Configuring... "
+else
+	echo "  cmake .. $CMAKE_OPTS"
+fi
+
+eval cmake .. $CMAKE_OPTS $STRIP
+RET=$?
+
+if [ -z $VERBOSE ]; then echo Done.; fi
+
+echo
+
+exit $RET
\ No newline at end of file
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
new file mode 100644
index 0000000000..101aa88275
--- /dev/null
+++ b/CI/build.msvc.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+while [ $# -gt 0 ]; do
+	ARG=$1
+	shift
+
+	case $ARG in
+		x86|i686|win32 )
+			BITS=32 ;;
+
+		x64_64|x64|win64 )
+			BITS=64 ;;
+
+		* )
+			echo "Unknown arg $ARG."
+			exit 1 ;;
+	esac
+done
+
+cd $(dirname $0)/../build_$BITS
+
+msbuild OpenMW.sln //t:Build //p:Configuration=Release //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..3bb773d28c
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,20 @@
+version: "{build}"
+
+platform:
+	- Win32
+	- x64
+
+matrix:
+	fast_finish: true
+
+init:
+	- cmd: cmake --version
+	- cmd: msbuild /version
+
+clone_folder: C:\projects\openmw
+
+build:
+	- cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform%
+
+before_build:
+	- cmd: sh C:\projects\openmw\CI\before_script.msvc.sh %platform%

From db521cddadc51875dcc43ab1108506fc04668ac4 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 2 Jun 2015 23:23:03 +0200
Subject: [PATCH 002/765] Needs to be spaces and not tabs

---
 appveyor.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3bb773d28c..399be0c389 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +1,20 @@
 version: "{build}"
 
 platform:
-	- Win32
-	- x64
+    - Win32
+    - x64
 
 matrix:
-	fast_finish: true
+    fast_finish: true
 
 init:
-	- cmd: cmake --version
-	- cmd: msbuild /version
+    - cmd: cmake --version
+    - cmd: msbuild /version
 
 clone_folder: C:\projects\openmw
 
 build:
-	- cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform%
+    - cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform%
 
 before_build:
-	- cmd: sh C:\projects\openmw\CI\before_script.msvc.sh %platform%
+    - cmd: sh C:\projects\openmw\CI\before_script.msvc.sh %platform%

From cd4042109a5046707dfa1f07d93e41f9a34d569b Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 2 Jun 2015 23:29:47 +0200
Subject: [PATCH 003/765] Fix the script issues

---
 CI/build.msvc.sh | 25 ++++++++++---------------
 appveyor.yml     |  8 ++++++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index 101aa88275..b19325689c 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -1,22 +1,17 @@
 #!/bin/bash
 
-while [ $# -gt 0 ]; do
-	ARG=$1
-	shift
+case $1 in
+	x86|i686|win32 )
+		BITS=32 ;;
 
-	case $ARG in
-		x86|i686|win32 )
-			BITS=32 ;;
+	x64_64|x64|win64 )
+		BITS=64 ;;
 
-		x64_64|x64|win64 )
-			BITS=64 ;;
-
-		* )
-			echo "Unknown arg $ARG."
-			exit 1 ;;
-	esac
-done
+	* )
+		echo "Unknown platform $ARG."
+		exit 1 ;;
+esac
 
 cd $(dirname $0)/../build_$BITS
 
-msbuild OpenMW.sln //t:Build //p:Configuration=Release //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+msbuild OpenMW.sln //t:Build //p:Configuration=$2 //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/appveyor.yml b/appveyor.yml
index 399be0c389..896c0b4646 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,10 @@ platform:
     - Win32
     - x64
 
+configuration:
+    - Debug
+    - Release
+
 matrix:
     fast_finish: true
 
@@ -13,8 +17,8 @@ init:
 
 clone_folder: C:\projects\openmw
 
-build:
-    - cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform%
+build_script:
+    - cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform% %configuration%
 
 before_build:
     - cmd: sh C:\projects\openmw\CI\before_script.msvc.sh %platform%

From d7494128a2edd645fa2b4e7bd9a30964a2b3decf Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 2 Jun 2015 23:50:52 +0200
Subject: [PATCH 004/765] More script fixes

---
 CI/before_script.msvc.sh | 67 ++++++++++++++++++++++++----------------
 CI/build.msvc.sh         | 10 +++---
 appveyor.yml             | 20 ++++++++++--
 3 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 9f94d5f310..8c44a5b9e4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -8,14 +8,9 @@ while [ $# -gt 0 ]; do
 		-v )
 			VERBOSE=true ;;
 
-		x86|i686|win32 )
-			platform=i686 ;;
-
-		x64_64|x64|win64 )
-			platform=x86_64 ;;
-
 		* )
-			echo "Unknown arg $ARG." ;;
+			echo "Unknown arg $ARG."
+			exit 1 ;;
 	esac
 done
 
@@ -23,9 +18,14 @@ if [ -z $VERBOSE ]; then
 	STRIP="> /dev/null 2>&1"
 fi
 
-cd $(dirname $0)/..
-which appveyor > /dev/null
-if [ $? -eq 0 ]; then
+if [ -z $APPVEYOR ]; then
+	echo "Running prebuild outside of Appveyor."
+
+	cd $(dirname $0)/..
+else
+	echo "Running prebuild in Appveyor."
+
+	cd $APPVEYOR_BUILD_FOLDER
 	VERSION="$(cat README.md | grep Version: | awk '{ print $3; }')-$(git rev-parse --short HEAD)"
 	appveyor UpdateBuild -Version "$VERSION"
 fi
@@ -70,28 +70,43 @@ add_cmake_opts() {
 }
 
 if [ -z "$ARCH" ]; then
-	if [ -z "$platform" ]; then
+	if [ -z "$PLATFORM" ]; then
 		ARCH=`uname -m`
 	else
-		ARCH="$platform"
+		ARCH="$PLATFORM"
 	fi
 fi
 
-if [ $ARCH == x86_64 ]; then
-	ARCHNAME=x86-64
-	ARCHSUFFIX=64
-	BITS=64
+case $PLATFORM in
+	x64|x86_64|x86-64|win64|Win64 )
+		ARCHNAME=x86-64
+		ARCHSUFFIX=64
+		BITS=64
 
-	BASE_OPTS="-G\"Visual Studio 12 2013 Win64\""
-	add_cmake_opts "-G\"Visual Studio 12 2013 Win64\""
-else
-	ARCHNAME=x86
-	ARCHSUFFIX=86
-	BITS=32
+		BASE_OPTS="-G\"Visual Studio 12 2013 Win64\""
+		add_cmake_opts "-G\"Visual Studio 12 2013 Win64\""
+		;;
 
-	BASE_OPTS="-G\"Visual Studio 12 2013\" -Tv120_xp"
-	add_cmake_opts "-G\"Visual Studio 12 2013\"" -Tv120_xp
-fi
+	x32|x86|i686|i386|win32|Win32 )
+		ARCHNAME=x86
+		ARCHSUFFIX=86
+		BITS=32
+
+		BASE_OPTS="-G\"Visual Studio 12 2013\" -Tv120_xp"
+		add_cmake_opts "-G\"Visual Studio 12 2013\"" -Tv120_xp
+		;;
+
+	* )
+		echo "Unknown platform $PLATFORM."
+		exit 1
+		;;
+esac
+
+echo
+echo "=========================="
+echo "Starting prebuild on win$BITS"
+echo "=========================="
+echo
 
 mkdir -p deps
 cd deps
@@ -108,7 +123,7 @@ echo
 
 # Bullet
 echo "Bullet 2.83.4..."
-download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.zip
+download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.7z
 echo
 
 # FFmpeg
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index b19325689c..34ce3d0627 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-case $1 in
-	x86|i686|win32 )
+case $PLATFORM in
+	x32|x86|i686|i386|win32|Win32 )
 		BITS=32 ;;
 
-	x64_64|x64|win64 )
+	x64|x86_64|x86-64|win64|Win64 )
 		BITS=64 ;;
 
 	* )
-		echo "Unknown platform $ARG."
+		echo "Unknown platform $PLATFORM."
 		exit 1 ;;
 esac
 
 cd $(dirname $0)/../build_$BITS
 
-msbuild OpenMW.sln //t:Build //p:Configuration=$2 //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/appveyor.yml b/appveyor.yml
index 896c0b4646..f466b2b82d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,14 +11,30 @@ configuration:
 matrix:
     fast_finish: true
 
+cache:
+    - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\Ogre-1.9-win32.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\Ogre-1.9-win64.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\OpenAL-Soft-1.16.0.zip -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\SDL2-2.0.3.zip -> CI/before_script.msvc.sh
+
 init:
+    - cmd: bash --version
     - cmd: cmake --version
     - cmd: msbuild /version
+    - cmd: echo.
 
 clone_folder: C:\projects\openmw
 
 build_script:
-    - cmd: sh C:\projects\openmw\CI\build.msvc.sh %platform% %configuration%
+    - cmd: sh C:\projects\openmw\CI\build.msvc.sh
 
 before_build:
-    - cmd: sh C:\projects\openmw\CI\before_script.msvc.sh %platform%
+    - cmd: sh C:\projects\openmw\CI\before_script.msvc.sh

From 6993fbaece237f6e0a9d49419e0fd6c31241126a Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 2 Jun 2015 23:52:34 +0200
Subject: [PATCH 005/765] And yet more issues slip past

---
 CI/before_script.msvc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 8c44a5b9e4..ca4479deab 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -174,7 +174,7 @@ cd ../build_$BITS/deps
 
 BOOST_SDK="`real_pwd`/Boost"
 
-$DEPS/boost_1_58_0-msvc-12.0-$BITS.exe //dir="$BOOST_SDK" //verysilent
+$DEPS/boost-1.58.0-win$BITS.exe //dir="$BOOST_SDK" //verysilent
 
 add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 	-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"

From 0a1454d5ecbba634cb2256dee0611e31a988786a Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 00:51:22 +0200
Subject: [PATCH 006/765] Final fixes, moving to Appveyor unstable for boost

---
 CI/before_script.msvc.sh | 72 +++++++++++++++++++++++++++++++---------
 appveyor.yml             |  6 ++--
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index ca4479deab..3bd9c490ff 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -21,7 +21,8 @@ fi
 if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
 
-	cd $(dirname $0)/..
+	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
+	cd $(dirname "$DIR")
 else
 	echo "Running prebuild in Appveyor."
 
@@ -30,6 +31,33 @@ else
 	appveyor UpdateBuild -Version "$VERSION"
 fi
 
+run_cmd() {
+	CMD="$1"
+	shift
+
+	if [ -z $VERBOSE ]; then
+		eval $CMD $@ > output.log 2>&1
+		RET=$?
+
+		if [ $RET -ne 0 ]; then
+			if [ -z $APPVEYOR ]; then
+				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
+				exit $RET
+			else
+				appveyor PushArtifact output.log -DeploymentName $CMD-output.log
+				appveyor AddMessage "Command $CMD failed ($RET), output has been pushed as an artifact." -Category Error
+			fi
+		else
+			rm output.log
+		fi
+
+		return $RET
+	else
+		eval $CMD $@
+		return $?
+	fi
+}
+
 download() {
 	if ! [ -f $2 ]; then
 		printf "  Downloading $2... "
@@ -117,9 +145,11 @@ echo "Downloading dependency packages."
 echo
 
 # Boost
-echo "Boost 1.58.0..."
-download http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe boost-1.58.0-win$BITS.exe
-echo
+if [ -z $APPVEYOR ]; then
+	echo "Boost 1.58.0..."
+	download http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe boost-1.58.0-win$BITS.exe
+	echo
+fi
 
 # Bullet
 echo "Bullet 2.83.4..."
@@ -169,20 +199,27 @@ echo "Extracting dependencies..."
 echo
 
 # Boost
-printf "Boost 1.58.0... "
-cd ../build_$BITS/deps
+if [ -z $APPVEYOR ]; then
+	printf "Boost 1.58.0... "
+	cd ../build_$BITS/deps
 
-BOOST_SDK="`real_pwd`/Boost"
+	BOOST_SDK="`real_pwd`/Boost"
 
-$DEPS/boost-1.58.0-win$BITS.exe //dir="$BOOST_SDK" //verysilent
+	$DEPS/boost-1.58.0-win$BITS.exe //dir="$BOOST_SDK" //verysilent
 
-add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-	-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
+		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
 
-cd $DEPS
+	cd $DEPS
 
-echo Done.
-echo
+	echo Done.
+	echo
+else
+	# Appveyor unstable has all the boost we need already
+	BOOST_SDK="c:/Libraries/boost"
+	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
+		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+fi
 
 # Bullet
 printf "Bullet 2.83.4... "
@@ -269,7 +306,7 @@ MYGUI_SDK="`real_pwd`/MyGUI"
 add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
 	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
 	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
-	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.hpp"
+	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
 cd $DEPS
 
@@ -336,10 +373,13 @@ else
 	echo "  cmake .. $CMAKE_OPTS"
 fi
 
-eval cmake .. $CMAKE_OPTS $STRIP
+run_cmd cmake .. $CMAKE_OPTS
 RET=$?
 
-if [ -z $VERBOSE ]; then echo Done.; fi
+if [ -z $VERBOSE ]; then
+	if [ $RET -eq 0 ]; then echo Done.; fi
+	else echo Failed!; fi
+fi
 
 echo
 
diff --git a/appveyor.yml b/appveyor.yml
index f466b2b82d..890b9684bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,6 +11,8 @@ configuration:
 matrix:
     fast_finish: true
 
+os: unstable
+
 cache:
     - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
     - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh
@@ -34,7 +36,7 @@ init:
 clone_folder: C:\projects\openmw
 
 build_script:
-    - cmd: sh C:\projects\openmw\CI\build.msvc.sh
+    - cmd: bash --login C:\projects\openmw\CI\build.msvc.sh
 
 before_build:
-    - cmd: sh C:\projects\openmw\CI\before_script.msvc.sh
+    - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh

From ba9b21bc296f25d5dd1d951badd44544fd195ee7 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 01:18:10 +0200
Subject: [PATCH 007/765] Moving dependencies to a better place

---
 CI/before_script.msvc.sh | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3bd9c490ff..56d56762f6 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -44,8 +44,10 @@ run_cmd() {
 				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
 				exit $RET
 			else
-				appveyor PushArtifact output.log -DeploymentName $CMD-output.log
-				appveyor AddMessage "Command $CMD failed ($RET), output has been pushed as an artifact." -Category Error
+				7z a output.7z output.log > /dev/null 2>&1
+
+				appveyor PushArtifact output.7z -DeploymentName $CMD-output.7z
+				appveyor AddMessage "Command $CMD failed (code $RET), output has been pushed as an artifact." -Category Error
 			fi
 		else
 			rm output.log
@@ -153,7 +155,7 @@ fi
 
 # Bullet
 echo "Bullet 2.83.4..."
-download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.7z
+download http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.7z
 echo
 
 # FFmpeg
@@ -164,12 +166,12 @@ echo
 
 # MyGUI
 echo "MyGUI 3.2.2..."
-download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/MyGUI-3.2.2-win$BITS.7z MyGUI-3.2.2-win$BITS.7z
+download http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z MyGUI-3.2.2-win$BITS.7z
 echo
 
 # Ogre
 echo "Ogre 1.9..."
-download https://gist.github.com/ace13/dc6aad628d48338d590e/raw/Ogre-1.9-win$BITS.7z Ogre-1.9-win$BITS.7z
+download http://www.lysator.liu.se/~ace/OpenMW/deps/Ogre-1.9-win$BITS.7z Ogre-1.9-win$BITS.7z
 echo
 
 # OpenAL
@@ -196,7 +198,6 @@ cd deps
 
 echo
 echo "Extracting dependencies..."
-echo
 
 # Boost
 if [ -z $APPVEYOR ]; then
@@ -213,7 +214,6 @@ if [ -z $APPVEYOR ]; then
 	cd $DEPS
 
 	echo Done.
-	echo
 else
 	# Appveyor unstable has all the boost we need already
 	BOOST_SDK="c:/Libraries/boost"
@@ -240,7 +240,6 @@ add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include" \
 cd $DEPS
 
 echo Done.
-echo
 
 # FFmpeg
 printf "FFmpeg 2.5.2... "
@@ -276,7 +275,6 @@ fi
 cd $DEPS
 
 echo Done.
-echo
 
 # Ogre
 printf "Ogre 1.9... "
@@ -292,7 +290,6 @@ add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
 cd $DEPS
 
 echo Done.
-echo
 
 # MyGUI
 printf "MyGUI 3.2.2... "
@@ -311,7 +308,6 @@ add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
 cd $DEPS
 
 echo Done.
-echo
 
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
@@ -323,10 +319,9 @@ add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include" \
 	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
 
 echo Done.
-echo
 
 # Qt
-printf "Qt 4.8.6 binaries... "
+printf "Qt 4.8.6... "
 cd ../build_$BITS/deps
 
 eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
@@ -342,10 +337,9 @@ add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 cd $DEPS
 
 echo Done.
-echo
 
 # SDL2
-printf "SDL 2.0.3 binaries... "
+printf "SDL 2.0.3... "
 eval 7z x -y SDL2-2.0.3.zip $STRIP
 
 SDL_SDK="`real_pwd`/SDL2-2.0.3"
@@ -361,7 +355,7 @@ echo
 
 cd ../build_$BITS
 
-echo "Building OpenMW."
+echo "Building OpenMW..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
@@ -377,8 +371,8 @@ run_cmd cmake .. $CMAKE_OPTS
 RET=$?
 
 if [ -z $VERBOSE ]; then
-	if [ $RET -eq 0 ]; then echo Done.; fi
-	else echo Failed!; fi
+	if [ $RET -eq 0 ]; then echo Done.
+	else echo Failed.; fi
 fi
 
 echo

From 20b7c7b46cf3ada8aa888c51f250cf991bb6a090 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 01:41:45 +0200
Subject: [PATCH 008/765] Hopefully the last fixes, build should run

---
 CI/before_script.msvc.sh | 16 ++++++++--------
 CI/build.msvc.sh         | 21 ++++++++++++++++++++-
 appveyor.yml             |  2 ++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 56d56762f6..cd4190ea97 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -22,7 +22,7 @@ if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
 
 	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
-	cd $(dirname "$DIR")
+	cd $(dirname "$DIR")/..
 else
 	echo "Running prebuild in Appveyor."
 
@@ -99,12 +99,12 @@ add_cmake_opts() {
 	CMAKE_OPTS="$CMAKE_OPTS $@"
 }
 
-if [ -z "$ARCH" ]; then
-	if [ -z "$PLATFORM" ]; then
-		ARCH=`uname -m`
-	else
-		ARCH="$PLATFORM"
-	fi
+if [ -z $PLATFORM ]; then
+	PLATFORM=`uname -m`
+fi
+
+if [ -z $CONFIGURATION ]; then
+	CONFIGURATION="Debug"
 fi
 
 case $PLATFORM in
@@ -206,7 +206,7 @@ if [ -z $APPVEYOR ]; then
 
 	BOOST_SDK="`real_pwd`/Boost"
 
-	$DEPS/boost-1.58.0-win$BITS.exe //dir="$BOOST_SDK" //verysilent
+	$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
 
 	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index 34ce3d0627..57f4f6c1d6 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+if [ -z $PLATFORM ]; then
+	PLATFORM=`uname -m`
+fi
+
+if [ -z $CONFIGURATION ]; then
+	CONFIGURATION="Debug"
+fi
+
 case $PLATFORM in
 	x32|x86|i686|i386|win32|Win32 )
 		BITS=32 ;;
@@ -12,6 +20,17 @@ case $PLATFORM in
 		exit 1 ;;
 esac
 
-cd $(dirname $0)/../build_$BITS
+if [ -z $APPVEYOR ]; then
+	echo "Running $BITS-bit $CONFIGURATION build outside of Appveyor."
+
+	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
+	cd $(dirname "$DIR")/..
+else
+	echo "Running $BITS-bit $CONFIGURATION build in Appveyor."
+
+	cd $APPVEYOR_BUILD_FOLDER
+fi
+
+cd build_$BITS
 
 msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
diff --git a/appveyor.yml b/appveyor.yml
index 890b9684bd..3f8b27e22f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,6 +13,8 @@ matrix:
 
 os: unstable
 
+shallow_clone: true
+
 cache:
     - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
     - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh

From 108c2719a85ca915bfe90a67a854fe18cad83fad Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 02:04:31 +0200
Subject: [PATCH 009/765] And yet I forgot about msbuild, should work now

---
 CI/before_script.msvc.sh | 6 +-----
 CI/build.msvc.sh         | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index cd4190ea97..cefc06fe9e 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -46,7 +46,7 @@ run_cmd() {
 			else
 				7z a output.7z output.log > /dev/null 2>&1
 
-				appveyor PushArtifact output.7z -DeploymentName $CMD-output.7z
+				appveyor PushArtifact output.7z -FileName $CMD-output.7z
 				appveyor AddMessage "Command $CMD failed (code $RET), output has been pushed as an artifact." -Category Error
 			fi
 		else
@@ -90,10 +90,6 @@ real_pwd() {
 	pwd | sed "s,/\(.\),\1:,"
 }
 
-msbuild() {
-	/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe $@
-}
-
 CMAKE_OPTS=""
 add_cmake_opts() {
 	CMAKE_OPTS="$CMAKE_OPTS $@"
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index 57f4f6c1d6..b17e7b94c6 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -33,4 +33,11 @@ fi
 
 cd build_$BITS
 
+which msbuild > /dev/null
+if [ $? -ne 0 ]; then
+	msbuild() {
+		/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe "$@"
+	}
+fi
+
 msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

From 3425e9b1d14806cae73d7bc6256c65af55b0206b Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 02:34:45 +0200
Subject: [PATCH 010/765] And done.

Switched to a slight less shallow clone too, for better versioning
---
 CI/before_script.msvc.sh | 2 +-
 appveyor.yml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index cefc06fe9e..36f8213d45 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -225,7 +225,7 @@ eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
 mv Bullet-2.83.4-win$BITS Bullet
 
 BULLET_SDK="`real_pwd`/Bullet"
-add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include" \
+add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
 	-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
 	-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
 	-DBULLET_DYNAMICS_LIBRARY="$BULLET_SDK/lib/BulletDynamics.lib" \
diff --git a/appveyor.yml b/appveyor.yml
index 3f8b27e22f..e46dd3dd8c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,7 @@ matrix:
 
 os: unstable
 
-shallow_clone: true
+clone_depth: 5
 
 cache:
     - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh

From e49cf2888de2c8a0ef5e3189afbeda0d674d04c9 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 3 Jun 2015 10:15:28 +0200
Subject: [PATCH 011/765] Let's disable everything except OpenMW itself

Just to check if it's at all possible to use AppVeyor
---
 CI/before_script.msvc.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 36f8213d45..66f74520c4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -355,7 +355,12 @@ echo "Building OpenMW..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
-	-DBUILD_MYGUI_PLUGIN=no
+	-DBUILD_MYGUI_PLUGIN=no \
+	-DBUILD_OPENCS=no \
+	-DBUILD_WIZARD=no \
+	-DBUILD_ESSIMPORTER=no \
+	-DBUILD_LAUNCHER=no \
+	-DBUILD_MWINIIMPORTER=no
 
 if [ -z $VERBOSE ]; then
 	printf "  Configuring... "
@@ -373,4 +378,4 @@ fi
 
 echo
 
-exit $RET
\ No newline at end of file
+exit $RET

From 4f2cd1711944b12d6a90d9a54332d91d0ec96c40 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 8 Jun 2015 02:14:20 +0200
Subject: [PATCH 012/765] Let's get some OSG builds going

---
 CI/before_script.msvc.sh | 260 +++++++++++++++++++++++----------------
 CMakeLists.txt           |   3 +
 2 files changed, 158 insertions(+), 105 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 36f8213d45..a12c170384 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -8,6 +8,15 @@ while [ $# -gt 0 ]; do
 		-v )
 			VERBOSE=true ;;
 
+		-d )
+			SKIP_DOWNLOAD=true ;;
+
+		-e )
+			SKIP_EXTRACT=true ;;
+
+		-k )
+			KEEP=true ;;
+
 		* )
 			echo "Unknown arg $ARG."
 			exit 1 ;;
@@ -61,29 +70,46 @@ run_cmd() {
 }
 
 download() {
-	if ! [ -f $2 ]; then
-		printf "  Downloading $2... "
-
-		if [ -z $VERBOSE ]; then
-			curl --silent --retry 10 -kLy 5 -o $2 $1
-			RET=$?
-		else
-			curl --retry 10 -kLy 5 -o $2 $1
-			RET=$?
-		fi
-
-		if [ $RET -ne 0 ]; then
-			echo "Failed!"
-		else
-			echo "Done"
-		fi
-
-		return $RET
-	else
-		echo "  $2 exists, skipping."
+	if [ $# -lt 3 ]; then
+		echo "Invalid parameters to download."
+		return 1
 	fi
 
-	return 0
+	NAME=$1
+	shift
+
+	echo "$NAME..."
+
+	while [ $# -gt 1 ]; do
+		URL=$1
+		FILE=$2
+		shift
+		shift
+
+		if ! [ -f $FILE ]; then
+			printf "  Downloading $FILE... "
+
+			if [ -z $VERBOSE ]; then
+				curl --silent --retry 10 -kLy 5 -o $FILE $URL
+				RET=$?
+			else
+				curl --retry 10 -kLy 5 -o $FILE $URL
+				RET=$?
+			fi
+
+			if [ $RET -ne 0 ]; then
+				echo "Failed!"
+			else
+				echo "Done."
+			fi
+		else
+			echo "  $FILE exists, skipping."
+		fi
+	done
+
+	if [ $# -ne 0 ]; then
+		echo "Missing parameter."
+	fi
 }
 
 real_pwd() {
@@ -134,63 +160,71 @@ echo "Starting prebuild on win$BITS"
 echo "=========================="
 echo
 
+# cd OpenMW/AppVeyor-test
 mkdir -p deps
 cd deps
 
 DEPS="`pwd`"
 
-echo "Downloading dependency packages."
-echo
-
-# Boost
-if [ -z $APPVEYOR ]; then
-	echo "Boost 1.58.0..."
-	download http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe boost-1.58.0-win$BITS.exe
+if [ -z $SKIP_DOWNLOAD ]; then
+	echo "Downloading dependency packages."
 	echo
+
+	# Boost
+	if [ -z $APPVEYOR ]; then
+		download "Boost 1.58.0" \
+			http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe \
+			boost-1.58.0-win$BITS.exe
+	fi
+
+	# Bullet
+	download "Bullet 2.83.4" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.4-win$BITS.7z \
+		Bullet-2.83.4-win$BITS.7z
+
+	# FFmpeg
+	download "FFmpeg 2.5.2" \
+		http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z \
+		ffmpeg$BITS-2.5.2.7z \
+		http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z \
+		ffmpeg$BITS-2.5.2-dev.7z
+
+	# MyGUI
+	download "MyGUI 3.2.2" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z \
+		MyGUI-3.2.2-win$BITS.7z
+
+	# OpenAL
+	download "OpenAL-Soft 1.16.0" \
+		http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip \
+		OpenAL-Soft-1.16.0.zip
+
+	# OSG
+	download "OpenSceneGraph 3.3.8" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.3.8-win$BITS.7z \
+		OSG-3.3.8-win$BITS.7z
+
+	# Qt
+	download "Qt 4.8.6" \
+		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+		qt$BITS-4.8.6.7z
+
+	# SDL2
+	download "SDL 2.0.3" \
+		https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip \
+		SDL2-2.0.3.zip
 fi
 
-# Bullet
-echo "Bullet 2.83.4..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.7z
-echo
-
-# FFmpeg
-echo "FFmpeg 2.5.2..."
-download http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z ffmpeg$BITS-2.5.2.7z
-download http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z ffmpeg$BITS-2.5.2-dev.7z
-echo
-
-# MyGUI
-echo "MyGUI 3.2.2..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z MyGUI-3.2.2-win$BITS.7z
-echo
-
-# Ogre
-echo "Ogre 1.9..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/Ogre-1.9-win$BITS.7z Ogre-1.9-win$BITS.7z
-echo
-
-# OpenAL
-echo "OpenAL-Soft 1.16.0..."
-download http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip OpenAL-Soft-1.16.0.zip
-echo
-
-# Qt
-echo "Qt 4.8.6..."
-download http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z qt$BITS-4.8.6.7z
-echo
-
-# SDL2
-echo "SDL 2.0.3 binaries..."
-download https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip SDL2-2.0.3.zip
-echo
-
-cd ..
+cd .. #/..
 
 # Set up dependencies
-rm -rf build_$BITS
-mkdir -p build_$BITS/deps
-cd deps
+if [ -z $KEEP ]; then
+	rm -rf OSG_$BITS
+	mkdir -p OSG_$BITS/deps
+fi
+cd OSG_$BITS/deps
+
+DEPS_INSTALL=`pwd`
 
 echo
 echo "Extracting dependencies..."
@@ -198,11 +232,13 @@ echo "Extracting dependencies..."
 # Boost
 if [ -z $APPVEYOR ]; then
 	printf "Boost 1.58.0... "
-	cd ../build_$BITS/deps
+	cd $DEPS_INSTALL
 
 	BOOST_SDK="`real_pwd`/Boost"
 
-	$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+	if [ -z $SKIP_EXTRACT ]; then
+		$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+	fi
 
 	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
@@ -219,10 +255,12 @@ fi
 
 # Bullet
 printf "Bullet 2.83.4... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
-mv Bullet-2.83.4-win$BITS Bullet
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
+	mv Bullet-2.83.4-win$BITS Bullet
+fi
 
 BULLET_SDK="`real_pwd`/Bullet"
 add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
@@ -239,14 +277,16 @@ echo Done.
 
 # FFmpeg
 printf "FFmpeg 2.5.2... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
-eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
+	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
 
-mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
-cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
-rm -rf ffmpeg-2.5.2-win$BITS-dev
+	mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
+	cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
+	rm -rf ffmpeg-2.5.2-win$BITS-dev
+fi
 
 FFMPEG_SDK="`real_pwd`/FFmpeg"
 add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
@@ -272,33 +312,19 @@ cd $DEPS
 
 echo Done.
 
-# Ogre
-printf "Ogre 1.9... "
-cd ../build_$BITS/deps
-
-eval 7z x -y $DEPS/Ogre-1.9-win$BITS.7z $STRIP
-mv Ogre-1.9-win$BITS Ogre
-
-OGRE_SDK="`real_pwd`/Ogre"
-
-add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
-
-cd $DEPS
-
-echo Done.
-
 # MyGUI
 printf "MyGUI 3.2.2... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
-mv MyGUI-3.2.2-win$BITS MyGUI
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
+	mv MyGUI-3.2.2-win$BITS MyGUI
+fi
 
 MYGUI_SDK="`real_pwd`/MyGUI"
 
 add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
-	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
+	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
 	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
 cd $DEPS
@@ -307,7 +333,9 @@ echo Done.
 
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
-eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+fi
 
 OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
 
@@ -316,12 +344,31 @@ add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include" \
 
 echo Done.
 
+# OSG
+printf "OSG 3.3.8... "
+cd $DEPS_INSTALL
+
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
+	mv OSG-3.3.8-win$BITS OSG
+fi
+
+OSG_SDK="`real_pwd`/OSG"
+
+add_cmake_opts -DOSG_DIR="$OSG_SDK"
+
+cd $DEPS
+
+echo Done.
+
 # Qt
 printf "Qt 4.8.6... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
-mv qt-4.8.6-* Qt
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
+	mv qt-4.8.6-* Qt
+fi
 
 QT_SDK="`real_pwd`/Qt"
 
@@ -336,7 +383,10 @@ echo Done.
 
 # SDL2
 printf "SDL 2.0.3... "
-eval 7z x -y SDL2-2.0.3.zip $STRIP
+
+if [ -z $SKIP_EXTRACT ]; then
+	eval 7z x -y SDL2-2.0.3.zip $STRIP
+fi
 
 SDL_SDK="`real_pwd`/SDL2-2.0.3"
 add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
@@ -349,7 +399,7 @@ cd $DEPS
 echo Done.
 echo
 
-cd ../build_$BITS
+cd $DEPS_INSTALL/..
 
 echo "Building OpenMW..."
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77b054ff51..f988384528 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,9 @@ if (WIN32)
 
     # Suppress WinMain(), provided by SDL
     add_definitions(-DSDL_MAIN_HANDLED)
+
+    # Get rid of useless crud from windows.h
+    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
 # Dependencies

From c71bbd02bfccb1507d984e36127eaf54acd3205e Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 8 Jun 2015 02:26:23 +0200
Subject: [PATCH 013/765] Finish up the OSG build scripts and configuration

Sadly it seems like Appveyor can't build OpenMW without timing out yet.
More build-time improvements are in order
---
 CI/before_script.msvc.sh | 186 ++++++++++++++++++++++++++++++++++-----
 CI/build.msvc.sh         |  18 +++-
 CMakeLists.txt           |   3 -
 appveyor.yml             |  31 +++----
 4 files changed, 197 insertions(+), 41 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a12c170384..367a402a09 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -121,6 +121,11 @@ add_cmake_opts() {
 	CMAKE_OPTS="$CMAKE_OPTS $@"
 }
 
+RUNTIME_DLLS=""
+add_runtime_dlls() {
+	RUNTIME_DLLS="$RUNTIME_DLLS $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM=`uname -m`
 fi
@@ -154,6 +159,20 @@ case $PLATFORM in
 		;;
 esac
 
+case $CONFIGURATION in
+	debug|Debug|DEBUG )
+		CONFIGURATION=Debug
+		;;
+
+	release|Release|RELEASE )
+		CONFIGURATION=Release
+		;;
+
+	relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
+		CONFIGURATION=RelWithDebInfo
+		;;
+esac
+
 echo
 echo "=========================="
 echo "Starting prebuild on win$BITS"
@@ -178,9 +197,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
 	fi
 
 	# Bullet
-	download "Bullet 2.83.4" \
-		http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.4-win$BITS.7z \
-		Bullet-2.83.4-win$BITS.7z
+	download "Bullet 2.83.5" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.5-win$BITS.7z \
+		Bullet-2.83.5-win$BITS.7z
 
 	# FFmpeg
 	download "FFmpeg 2.5.2" \
@@ -219,10 +238,16 @@ cd .. #/..
 
 # Set up dependencies
 if [ -z $KEEP ]; then
-	rm -rf OSG_$BITS
-	mkdir -p OSG_$BITS/deps
+	echo
+	printf "Preparing build directory... "
+
+	rm -rf Build_$BITS
+	mkdir -p Build_$BITS/deps
+
+	echo Done.
 fi
-cd OSG_$BITS/deps
+mkdir -p Build_$BITS/deps
+cd Build_$BITS/deps
 
 DEPS_INSTALL=`pwd`
 
@@ -236,7 +261,10 @@ if [ -z $APPVEYOR ]; then
 
 	BOOST_SDK="`real_pwd`/Boost"
 
-	if [ -z $SKIP_EXTRACT ]; then
+	if [ -d Boost ] && grep "BOOST_VERSION 105800" Boost/boost/version.hpp > /dev/null; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf Boost
 		$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
 	fi
 
@@ -254,12 +282,15 @@ else
 fi
 
 # Bullet
-printf "Bullet 2.83.4... "
+printf "Bullet 2.83.5... "
 cd $DEPS_INSTALL
 
-if [ -z $SKIP_EXTRACT ]; then
-	eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
-	mv Bullet-2.83.4-win$BITS Bullet
+if [ -d Bullet ]; then
+	printf "Exists. (No version checking) "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf Bullet
+	eval 7z x -y $DEPS/Bullet-2.83.5-win$BITS.7z $STRIP
+	mv Bullet-2.83.5-win$BITS Bullet
 fi
 
 BULLET_SDK="`real_pwd`/Bullet"
@@ -279,7 +310,11 @@ echo Done.
 printf "FFmpeg 2.5.2... "
 cd $DEPS_INSTALL
 
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf FFmpeg
+
 	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
 	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
 
@@ -304,6 +339,8 @@ add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
 	-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
 	-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
 
+add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
+
 if [ $BITS -eq 32 ]; then
 	add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
 fi
@@ -316,7 +353,14 @@ echo Done.
 printf "MyGUI 3.2.2... "
 cd $DEPS_INSTALL
 
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d MyGUI ] && \
+	grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+	grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+	grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
+then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf MyGUI
 	eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
 	mv MyGUI-3.2.2-win$BITS MyGUI
 fi
@@ -327,28 +371,47 @@ add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
 	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
 	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="_d"
+else
+	SUFFIX=""
+fi
+add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll
+
 cd $DEPS
 
 echo Done.
 
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d openal-soft-1.16.0-bin ]; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf openal-soft-1.16.0-bin
 	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
 fi
 
 OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
 
-add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include" \
+add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
 	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
 
+
+
 echo Done.
 
 # OSG
 printf "OSG 3.3.8... "
 cd $DEPS_INSTALL
 
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d OSG ] && \
+	grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+	grep "OPENSCENEGRAPH_MINOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+	grep "OPENSCENEGRAPH_PATCH_VERSION    8" OSG/include/osg/Version > /dev/null
+then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf OSG
 	eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
 	mv OSG-3.3.8-win$BITS OSG
 fi
@@ -357,6 +420,21 @@ OSG_SDK="`real_pwd`/OSG"
 
 add_cmake_opts -DOSG_DIR="$OSG_SDK"
 
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="d"
+else
+	SUFFIX=""
+fi
+add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
+	`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll
+
+OSG_PLUGINS=""
+add_osg_dlls() {
+	OSG_PLUGINS="$OSG_PLUGINS $@"
+}
+
+add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll
+
 cd $DEPS
 
 echo Done.
@@ -365,7 +443,10 @@ echo Done.
 printf "Qt 4.8.6... "
 cd $DEPS_INSTALL
 
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf Qt
 	eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
 	mv qt-4.8.6-* Qt
 fi
@@ -377,6 +458,13 @@ eval qtbinpatcher.exe $STRIP
 
 add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="d4"
+else
+	SUFFIX="4"
+fi
+add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
+
 cd $DEPS
 
 echo Done.
@@ -384,7 +472,10 @@ echo Done.
 # SDL2
 printf "SDL 2.0.3... "
 
-if [ -z $SKIP_EXTRACT ]; then
+if [ -d SDL2-2.0.3 ]; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf SDL2-2.0.3
 	eval 7z x -y SDL2-2.0.3.zip $STRIP
 fi
 
@@ -394,6 +485,8 @@ add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
 	-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
 	-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
 
+add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
+
 cd $DEPS
 
 echo Done.
@@ -401,11 +494,50 @@ echo
 
 cd $DEPS_INSTALL/..
 
-echo "Building OpenMW..."
+echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
-	-DBUILD_MYGUI_PLUGIN=no
+	-DBUILD_MYGUI_PLUGIN=no \
+	-DOPENMW_MP_BUILD=yes
+
+if [ -z $APPVEYOR ]; then
+	echo "  (Outside of AppVeyor, doing full build.)"
+else
+	case $STEP in
+		components )
+			echo "  Subproject: Components."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENCS=no \
+				-DBUILD_OPENMW=no \
+				-DBUILD_WIZARD=no
+			rm -rf components
+			;;
+		openmw )
+			echo "  Subproject: OpenMW."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENCS=no \
+				-DBUILD_WIZARD=no
+			;;
+		opencs )
+			echo "  Subproject: OpenCS."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENMW=no \
+				-DBUILD_WIZARD=no
+			;;
+		misc )
+			echo "  Subproject: Misc."
+			add_cmake_opts -DBUILD_OPENCS=no \
+				-DBUILD_OPENMW=no
+			;;
+	esac
+fi
 
 if [ -z $VERBOSE ]; then
 	printf "  Configuring... "
@@ -423,4 +555,18 @@ fi
 
 echo
 
+echo "Copying Runtime DLLs..."
+mkdir -p $CONFIGURATION
+for DLL in $RUNTIME_DLLS; do
+	echo "  `basename $DLL`."
+	cp "$DLL" $CONFIGURATION/
+done
+echo "OSG Plugin DLLs..."
+mkdir -p $CONFIGURATION/osgPlugins-3.3.8
+for DLL in $OSG_PLUGINS; do
+	echo "  `basename $DLL`."
+	cp "$DLL" $CONFIGURATION/osgPlugins-3.3.8
+done
+echo
+
 exit $RET
\ No newline at end of file
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index b17e7b94c6..d426ef90d4 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -10,10 +10,14 @@ fi
 
 case $PLATFORM in
 	x32|x86|i686|i386|win32|Win32 )
-		BITS=32 ;;
+		BITS=32
+		PLATFORM=Win32
+		;;
 
 	x64|x86_64|x86-64|win64|Win64 )
-		BITS=64 ;;
+		BITS=64
+		PLATFORM=x64
+		;;
 
 	* )
 		echo "Unknown platform $PLATFORM."
@@ -40,4 +44,12 @@ if [ $? -ne 0 ]; then
 	}
 fi
 
-msbuild OpenMW.sln //t:Build //p:Configuration=$CONFIGURATION //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+if [ -z $APPVEYOR ]; then
+	msbuild OpenMW.sln //t:Build //m:8
+else
+	msbuild OpenMW.sln //t:Build //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+fi
+
+if [ ! -z $PACKAGE ]; then
+	msbuild PACKAGE.vcxproj //t:Build //m:8
+fi
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f988384528..77b054ff51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,9 +138,6 @@ if (WIN32)
 
     # Suppress WinMain(), provided by SDL
     add_definitions(-DSDL_MAIN_HANDLED)
-
-    # Get rid of useless crud from windows.h
-    add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
 # Dependencies
diff --git a/appveyor.yml b/appveyor.yml
index e46dd3dd8c..a229a2212c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,28 +6,27 @@ platform:
 
 configuration:
     - Debug
-    - Release
+
+environment:
+    matrix:
+    - STEP: openmw
+    - STEP: opencs
+    - STEP: misc
 
 matrix:
     fast_finish: true
 
 os: unstable
 
-clone_depth: 5
+clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\OpenAL-Soft-1.16.0.zip -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\SDL2-2.0.3.zip -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\Bullet-2.83.5-win32.7z
+    - C:\projects\openmw\deps\Bullet-2.83.5-win64.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z
+    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z
+    - C:\projects\openmw\deps\OSG-3.3.8-win32.7z
+    - C:\projects\openmw\deps\OSG-3.3.8-win64.7z
 
 init:
     - cmd: bash --version
@@ -41,4 +40,6 @@ build_script:
     - cmd: bash --login C:\projects\openmw\CI\build.msvc.sh
 
 before_build:
-    - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
+    - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh -k
+
+test: off

From a1e29162bdb6da9069394c439a90a7e96cfa4e01 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 24 Jun 2015 15:54:00 +0200
Subject: [PATCH 014/765] Bring Ogre pre-build script up to OSG standard

---
 CI/before_script.msvc.sh | 393 ++++++++++++++++++++++++++++-----------
 1 file changed, 284 insertions(+), 109 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 66f74520c4..ae74146bc2 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -8,6 +8,15 @@ while [ $# -gt 0 ]; do
 		-v )
 			VERBOSE=true ;;
 
+		-d )
+			SKIP_DOWNLOAD=true ;;
+
+		-e )
+			SKIP_EXTRACT=true ;;
+
+		-k )
+			KEEP=true ;;
+
 		* )
 			echo "Unknown arg $ARG."
 			exit 1 ;;
@@ -61,29 +70,46 @@ run_cmd() {
 }
 
 download() {
-	if ! [ -f $2 ]; then
-		printf "  Downloading $2... "
-
-		if [ -z $VERBOSE ]; then
-			curl --silent --retry 10 -kLy 5 -o $2 $1
-			RET=$?
-		else
-			curl --retry 10 -kLy 5 -o $2 $1
-			RET=$?
-		fi
-
-		if [ $RET -ne 0 ]; then
-			echo "Failed!"
-		else
-			echo "Done"
-		fi
-
-		return $RET
-	else
-		echo "  $2 exists, skipping."
+	if [ $# -lt 3 ]; then
+		echo "Invalid parameters to download."
+		return 1
 	fi
 
-	return 0
+	NAME=$1
+	shift
+
+	echo "$NAME..."
+
+	while [ $# -gt 1 ]; do
+		URL=$1
+		FILE=$2
+		shift
+		shift
+
+		if ! [ -f $FILE ]; then
+			printf "  Downloading $FILE... "
+
+			if [ -z $VERBOSE ]; then
+				curl --silent --retry 10 -kLy 5 -o $FILE $URL
+				RET=$?
+			else
+				curl --retry 10 -kLy 5 -o $FILE $URL
+				RET=$?
+			fi
+
+			if [ $RET -ne 0 ]; then
+				echo "Failed!"
+			else
+				echo "Done."
+			fi
+		else
+			echo "  $FILE exists, skipping."
+		fi
+	done
+
+	if [ $# -ne 0 ]; then
+		echo "Missing parameter."
+	fi
 }
 
 real_pwd() {
@@ -95,6 +121,11 @@ add_cmake_opts() {
 	CMAKE_OPTS="$CMAKE_OPTS $@"
 }
 
+RUNTIME_DLLS=""
+add_runtime_dlls() {
+	RUNTIME_DLLS="$RUNTIME_DLLS $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM=`uname -m`
 fi
@@ -128,6 +159,21 @@ case $PLATFORM in
 		;;
 esac
 
+
+case $CONFIGURATION in
+	debug|Debug|DEBUG )
+		CONFIGURATION=Debug
+		;;
+
+	release|Release|RELEASE )
+		CONFIGURATION=Release
+		;;
+
+	relwithdebinfo|RelWithDebInfo|RELWITHDEBINFO )
+		CONFIGURATION=RelWithDebInfo
+		;;
+esac
+
 echo
 echo "=========================="
 echo "Starting prebuild on win$BITS"
@@ -139,58 +185,71 @@ cd deps
 
 DEPS="`pwd`"
 
-echo "Downloading dependency packages."
-echo
-
-# Boost
-if [ -z $APPVEYOR ]; then
-	echo "Boost 1.58.0..."
-	download http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe boost-1.58.0-win$BITS.exe
+if [ -z $SKIP_DOWNLOAD ]; then
+	echo "Downloading dependency packages."
 	echo
+
+	# Boost
+	if [ -z $APPVEYOR ]; then
+		download "Boost 1.58.0" \
+			http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/boost_1_58_0-msvc-12.0-$BITS.exe \
+			boost-1.58.0-win$BITS.exe
+	fi
+
+	# Bullet
+	download "Bullet 2.83.5" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.5-win$BITS.7z \
+		Bullet-2.83.5-win$BITS.7z
+
+	# FFmpeg
+	download "FFmpeg 2.5.2" \
+		http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z \
+		ffmpeg$BITS-2.5.2.7z \
+		http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z \
+		ffmpeg$BITS-2.5.2-dev.7z
+
+	# MyGUI
+	download "MyGUI 3.2.2" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z \
+		MyGUI-3.2.2-win$BITS.7z
+
+	# OpenAL
+	download "OpenAL-Soft 1.16.0" \
+		http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip \
+		OpenAL-Soft-1.16.0.zip
+
+	# Ogre
+	download "Ogre 1.9" \
+		http://www.lysator.liu.se/~ace/OpenMW/deps/Ogre-1.9-win$BITS.7z \
+		Ogre-1.9-win$BITS.7z
+
+	# Qt
+	download "Qt 4.8.6" \
+		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+		qt$BITS-4.8.6.7z
+
+	# SDL2
+	download "SDL 2.0.3" \
+		https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip \
+		SDL2-2.0.3.zip
 fi
 
-# Bullet
-echo "Bullet 2.83.4..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.83.4-win$BITS.7z Bullet-2.83.4-win$BITS.7z
-echo
-
-# FFmpeg
-echo "FFmpeg 2.5.2..."
-download http://ffmpeg.zeranoe.com/builds/win$BITS/shared/ffmpeg-2.5.2-win$BITS-shared.7z ffmpeg$BITS-2.5.2.7z
-download http://ffmpeg.zeranoe.com/builds/win$BITS/dev/ffmpeg-2.5.2-win$BITS-dev.7z ffmpeg$BITS-2.5.2-dev.7z
-echo
-
-# MyGUI
-echo "MyGUI 3.2.2..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-win$BITS.7z MyGUI-3.2.2-win$BITS.7z
-echo
-
-# Ogre
-echo "Ogre 1.9..."
-download http://www.lysator.liu.se/~ace/OpenMW/deps/Ogre-1.9-win$BITS.7z Ogre-1.9-win$BITS.7z
-echo
-
-# OpenAL
-echo "OpenAL-Soft 1.16.0..."
-download http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip OpenAL-Soft-1.16.0.zip
-echo
-
-# Qt
-echo "Qt 4.8.6..."
-download http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z qt$BITS-4.8.6.7z
-echo
-
-# SDL2
-echo "SDL 2.0.3 binaries..."
-download https://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip SDL2-2.0.3.zip
-echo
-
 cd ..
 
 # Set up dependencies
-rm -rf build_$BITS
-mkdir -p build_$BITS/deps
-cd deps
+if [ -z $KEEP ]; then
+	echo
+	printf "Preparing build directory... "
+
+	rm -rf Build_$BITS
+	mkdir -p Build_$BITS/deps
+
+	echo Done.
+fi
+mkdir -p Build_$BITS/deps
+cd Build_$BITS/deps
+
+DEPS_INSTALL=`pwd`
 
 echo
 echo "Extracting dependencies..."
@@ -198,11 +257,16 @@ echo "Extracting dependencies..."
 # Boost
 if [ -z $APPVEYOR ]; then
 	printf "Boost 1.58.0... "
-	cd ../build_$BITS/deps
+	cd $DEPS_INSTALL
 
 	BOOST_SDK="`real_pwd`/Boost"
 
-	$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+	if [ -d Boost ] && grep "BOOST_VERSION 105800" Boost/boost/version.hpp > /dev/null; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf Boost
+		$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+	fi
 
 	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
@@ -218,11 +282,16 @@ else
 fi
 
 # Bullet
-printf "Bullet 2.83.4... "
-cd ../build_$BITS/deps
+printf "Bullet 2.83.5... "
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/Bullet-2.83.4-win$BITS.7z $STRIP
-mv Bullet-2.83.4-win$BITS Bullet
+if [ -d Bullet ]; then
+	printf "Exists. (No version checking) "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf Bullet
+	eval 7z x -y $DEPS/Bullet-2.83.5-win$BITS.7z $STRIP
+	mv Bullet-2.83.5-win$BITS Bullet
+fi
 
 BULLET_SDK="`real_pwd`/Bullet"
 add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
@@ -239,14 +308,20 @@ echo Done.
 
 # FFmpeg
 printf "FFmpeg 2.5.2... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
-eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf FFmpeg
 
-mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
-cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
-rm -rf ffmpeg-2.5.2-win$BITS-dev
+	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
+	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+
+	mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
+	cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
+	rm -rf ffmpeg-2.5.2-win$BITS-dev
+fi
 
 FFMPEG_SDK="`real_pwd`/FFmpeg"
 add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
@@ -264,6 +339,8 @@ add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
 	-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
 	-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
 
+add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
+
 if [ $BITS -eq 32 ]; then
 	add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
 fi
@@ -272,34 +349,64 @@ cd $DEPS
 
 echo Done.
 
-# Ogre
-printf "Ogre 1.9... "
-cd ../build_$BITS/deps
+# MyGUI
+printf "MyGUI 3.2.2... "
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/Ogre-1.9-win$BITS.7z $STRIP
-mv Ogre-1.9-win$BITS Ogre
+if [ -d MyGUI ] && \
+	grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+	grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+	grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
+then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf MyGUI
+	eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
+	mv MyGUI-3.2.2-win$BITS MyGUI
+fi
 
-OGRE_SDK="`real_pwd`/Ogre"
+MYGUI_SDK="`real_pwd`/MyGUI"
 
-add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
+add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
+	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
+	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
+	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
+
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="_d"
+else
+	SUFFIX=""
+fi
+add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll
 
 cd $DEPS
 
 echo Done.
 
-# MyGUI
-printf "MyGUI 3.2.2... "
-cd ../build_$BITS/deps
+# Ogre
+printf "Ogre 1.9... "
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
-mv MyGUI-3.2.2-win$BITS MyGUI
+if [ -d Ogre ]; then
+	printf "Exists. (No version check) "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf Ogre
+	eval 7z x -y $DEPS/Ogre-1.9-win$BITS.7z $STRIP
+	mv Ogre-1.9-win$BITS Ogre
+fi
 
-MYGUI_SDK="`real_pwd`/MyGUI"
+OGRE_SDK="`real_pwd`/Ogre"
 
-add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
-	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
-	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
+add_cmake_opts -DOGRE_SDK="$OGRE_SDK"
+
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="_d"
+else
+	SUFFIX=""
+fi
+
+add_runtime_dlls `pwd`/Ogre/bin/$CONFIGURATION/cg.dll \
+	`pwd`/Ogre/bin/$CONFIGURATION/{OgreMain,OgreOverlay,Plugin_CgProgramManager,Plugin_ParticleFX,RenderSystem_Direct3D9,RenderSystem_GL}$SUFFIX.dll
 
 cd $DEPS
 
@@ -307,21 +414,33 @@ echo Done.
 
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
-eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+if [ -d openal-soft-1.16.0-bin ]; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf openal-soft-1.16.0-bin
+	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+fi
 
 OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
 
-add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include" \
+add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
 	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
 
+
+
 echo Done.
 
 # Qt
 printf "Qt 4.8.6... "
-cd ../build_$BITS/deps
+cd $DEPS_INSTALL
 
-eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
-mv qt-4.8.6-* Qt
+if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf Qt
+	eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
+	mv qt-4.8.6-* Qt
+fi
 
 QT_SDK="`real_pwd`/Qt"
 
@@ -330,13 +449,26 @@ eval qtbinpatcher.exe $STRIP
 
 add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 
+if [ $CONFIGURATION == "Debug" ]; then
+	SUFFIX="d4"
+else
+	SUFFIX="4"
+fi
+add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
+
 cd $DEPS
 
 echo Done.
 
 # SDL2
 printf "SDL 2.0.3... "
-eval 7z x -y SDL2-2.0.3.zip $STRIP
+
+if [ -d SDL2-2.0.3 ]; then
+	printf "Exists. "
+elif [ -z $SKIP_EXTRACT ]; then
+	rm -rf SDL2-2.0.3
+	eval 7z x -y SDL2-2.0.3.zip $STRIP
+fi
 
 SDL_SDK="`real_pwd`/SDL2-2.0.3"
 add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
@@ -344,23 +476,59 @@ add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
 	-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
 	-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
 
+add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
+
 cd $DEPS
 
 echo Done.
 echo
 
-cd ../build_$BITS
+cd $DEPS_INSTALL/..
 
-echo "Building OpenMW..."
+echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
 	-DBUILD_MYGUI_PLUGIN=no \
-	-DBUILD_OPENCS=no \
-	-DBUILD_WIZARD=no \
-	-DBUILD_ESSIMPORTER=no \
-	-DBUILD_LAUNCHER=no \
-	-DBUILD_MWINIIMPORTER=no
+	-DOPENMW_MP_BUILD=yes
+
+if [ -z $APPVEYOR ]; then
+	echo "  (Outside of AppVeyor, doing full build.)"
+else
+	case $STEP in
+		components )
+			echo "  Subproject: Components."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENCS=no \
+				-DBUILD_OPENMW=no \
+				-DBUILD_WIZARD=no
+			rm -rf components
+			;;
+		openmw )
+			echo "  Subproject: OpenMW."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENCS=no \
+				-DBUILD_WIZARD=no
+			;;
+		opencs )
+			echo "  Subproject: OpenCS."
+			add_cmake_opts -DBUILD_ESSIMPORTER=no \
+				-DBUILD_LAUNCHER=no \
+				-DBUILD_MWINIIMPORTER=no \
+				-DBUILD_OPENMW=no \
+				-DBUILD_WIZARD=no
+			;;
+		misc )
+			echo "  Subproject: Misc."
+			add_cmake_opts -DBUILD_OPENCS=no \
+				-DBUILD_OPENMW=no
+			;;
+	esac
+fi
 
 if [ -z $VERBOSE ]; then
 	printf "  Configuring... "
@@ -378,4 +546,11 @@ fi
 
 echo
 
+echo "Copying Runtime DLLs..."
+mkdir -p $CONFIGURATION
+for DLL in $RUNTIME_DLLS; do
+	echo "  `basename $DLL`."
+	cp "$DLL" $CONFIGURATION/
+done
+
 exit $RET

From 9b09c7bbb0e666aa29c40cfa74db0b2cd654cba0 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 25 Jun 2015 09:02:30 +0200
Subject: [PATCH 015/765] Test the pre-existing Qt 5.4.1 install on Appveyor

---
 CI/before_script.msvc.sh | 83 +++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index ae74146bc2..f3db640200 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -224,9 +224,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		Ogre-1.9-win$BITS.7z
 
 	# Qt
-	download "Qt 4.8.6" \
-		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
-		qt$BITS-4.8.6.7z
+	if [ -z $APPVEYOR ]; then
+		download "Qt 4.8.6" \
+			http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+			qt$BITS-4.8.6.7z
+	fi
 
 	# SDL2
 	download "SDL 2.0.3" \
@@ -281,6 +283,7 @@ else
 		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
 fi
 
+
 # Bullet
 printf "Bullet 2.83.5... "
 cd $DEPS_INSTALL
@@ -306,6 +309,7 @@ cd $DEPS
 
 echo Done.
 
+
 # FFmpeg
 printf "FFmpeg 2.5.2... "
 cd $DEPS_INSTALL
@@ -349,6 +353,7 @@ cd $DEPS
 
 echo Done.
 
+
 # MyGUI
 printf "MyGUI 3.2.2... "
 cd $DEPS_INSTALL
@@ -383,6 +388,7 @@ cd $DEPS
 
 echo Done.
 
+
 # Ogre
 printf "Ogre 1.9... "
 cd $DEPS_INSTALL
@@ -412,6 +418,7 @@ cd $DEPS
 
 echo Done.
 
+
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
 if [ -d openal-soft-1.16.0-bin ]; then
@@ -426,39 +433,51 @@ OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
 add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
 	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
 
-
-
 echo Done.
 
+
 # Qt
-printf "Qt 4.8.6... "
-cd $DEPS_INSTALL
+if [ -z $APPVEYOR ]; then
+	printf "Qt 4.8.6... "
+	cd $DEPS_INSTALL
 
-if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf Qt
-	eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
-	mv qt-4.8.6-* Qt
-fi
+	if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf Qt
+		eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
+		mv qt-4.8.6-* Qt
+	fi
 
-QT_SDK="`real_pwd`/Qt"
+	QT_SDK="`real_pwd`/Qt"
 
-cd $QT_SDK
-eval qtbinpatcher.exe $STRIP
+	cd $QT_SDK
+	eval qtbinpatcher.exe $STRIP
 
-add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+	add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 
-if [ $CONFIGURATION == "Debug" ]; then
-	SUFFIX="d4"
+	if [ $CONFIGURATION == "Debug" ]; then
+		SUFFIX="d4"
+	else
+		SUFFIX="4"
+	fi
+	add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
+
+	cd $DEPS
+
+	echo Done.
 else
-	SUFFIX="4"
+	echo "Using Appveyor Qt 5 version."
+	if [ $PLATFORM == "win32" ]; then
+		QT_SDK="C:/Qt/5.4/msvc2013_opengl"
+	else
+		QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
+	fi
+
+	add_cmake_opts -DDESIRED_QT_VERSION=4 \
+		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 fi
-add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
 
-cd $DEPS
-
-echo Done.
 
 # SDL2
 printf "SDL 2.0.3... "
@@ -546,11 +565,13 @@ fi
 
 echo
 
-echo "Copying Runtime DLLs..."
-mkdir -p $CONFIGURATION
-for DLL in $RUNTIME_DLLS; do
-	echo "  `basename $DLL`."
-	cp "$DLL" $CONFIGURATION/
-done
+if [ -z $APPVEYOR ]; then
+	echo "Copying Runtime DLLs..."
+	mkdir -p $CONFIGURATION
+	for DLL in $RUNTIME_DLLS; do
+		echo "  `basename $DLL`."
+		cp "$DLL" $CONFIGURATION/
+	done
+fi
 
 exit $RET

From b93cba9a698e353f0da6d19fed41fcb7bdf773a2 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 25 Jun 2015 18:16:59 +0200
Subject: [PATCH 016/765] Push messages properly

---
 CI/before_script.msvc.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index f3db640200..2652e9898a 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -51,12 +51,9 @@ run_cmd() {
 		if [ $RET -ne 0 ]; then
 			if [ -z $APPVEYOR ]; then
 				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
-				exit $RET
 			else
-				7z a output.7z output.log > /dev/null 2>&1
-
-				appveyor PushArtifact output.7z -FileName $CMD-output.7z
-				appveyor AddMessage "Command $CMD failed (code $RET), output has been pushed as an artifact." -Category Error
+				appveyor AddMessage "Command $CMD failed." -Category Error -Details "$CMD $@"
+				while read in; do appveyor AddMessage "$in" -Category Error; done < output.log
 			fi
 		else
 			rm output.log

From 331d87d738f7a23c577b7955a7a72c13e8a9554f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 25 Jun 2015 19:19:04 +0200
Subject: [PATCH 017/765] Bring over some more OSG changes to the Appveyor
 scripts, and properly use Qt

---
 CI/before_script.msvc.sh | 13 +++++++------
 appveyor.yml             | 27 +++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2652e9898a..06b14f2fe8 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -52,8 +52,9 @@ run_cmd() {
 			if [ -z $APPVEYOR ]; then
 				echo "Command $CMD failed, output can be found in `real_pwd`/output.log"
 			else
-				appveyor AddMessage "Command $CMD failed." -Category Error -Details "$CMD $@"
-				while read in; do appveyor AddMessage "$in" -Category Error; done < output.log
+				echo
+				echo "Command $CMD failed;"
+				cat output.log
 			fi
 		else
 			rm output.log
@@ -451,7 +452,8 @@ if [ -z $APPVEYOR ]; then
 	cd $QT_SDK
 	eval qtbinpatcher.exe $STRIP
 
-	add_cmake_opts -DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+	add_cmake_opts -DDESIRED_QT_VERSION=4 \
+		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 
 	if [ $CONFIGURATION == "Debug" ]; then
 		SUFFIX="d4"
@@ -471,7 +473,7 @@ else
 		QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
 	fi
 
-	add_cmake_opts -DDESIRED_QT_VERSION=4 \
+	add_cmake_opts -DDESIRED_QT_VERSION=5 \
 		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
 fi
 
@@ -505,8 +507,7 @@ echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
-	-DBUILD_MYGUI_PLUGIN=no \
-	-DOPENMW_MP_BUILD=yes
+	-DBUILD_MYGUI_PLUGIN=no
 
 if [ -z $APPVEYOR ]; then
 	echo "  (Outside of AppVeyor, doing full build.)"
diff --git a/appveyor.yml b/appveyor.yml
index e46dd3dd8c..a71df21552 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,28 +6,25 @@ platform:
 
 configuration:
     - Debug
-    - Release
+
+environment:
+    matrix:
+    - STEP: openmw
+    - STEP: opencs
+    - STEP: misc
 
 matrix:
     fast_finish: true
 
 os: unstable
 
-clone_depth: 5
+clone_depth: 1
 
 cache:
-    - C:\projects\openmw\deps\Bullet-2.83.4-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Bullet-2.83.4-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\MyGUI-3.2.2-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win32.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\Ogre-1.9-win64.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\OpenAL-Soft-1.16.0.zip -> CI/before_script.msvc.sh
-    - C:\projects\openmw\deps\SDL2-2.0.3.zip -> CI/before_script.msvc.sh
+    - C:\projects\openmw\deps\ffmpeg32-2.5.2.7z
+    - C:\projects\openmw\deps\ffmpeg32-2.5.2-dev.7z
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
+    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z
 
 init:
     - cmd: bash --version
@@ -42,3 +39,5 @@ build_script:
 
 before_build:
     - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
+
+test: off

From 8c6ba01c0846ef28759b1090a692ca322acdd966 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 6 Jul 2015 10:59:40 +0200
Subject: [PATCH 018/765] Fix a few merge issues

---
 CI/before_script.msvc.sh | 46 +++++-----------------------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index c5c15008ca..a53b6d7957 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -222,9 +222,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		OSG-3.3.8-win$BITS.7z
 
 	# Qt
-	download "Qt 4.8.6" \
-		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
-		qt$BITS-4.8.6.7z
+	if [ -z $APPVEYOR ]; then
+		download "Qt 4.8.6" \
+			http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+			qt$BITS-4.8.6.7z
+	fi
 
 	# SDL2
 	download "SDL 2.0.3" \
@@ -557,44 +559,6 @@ else
 	esac
 fi
 
-if [ -z $APPVEYOR ]; then
-	echo "  (Outside of AppVeyor, doing full build.)"
-else
-	case $STEP in
-		components )
-			echo "  Subproject: Components."
-			add_cmake_opts -DBUILD_ESSIMPORTER=no \
-				-DBUILD_LAUNCHER=no \
-				-DBUILD_MWINIIMPORTER=no \
-				-DBUILD_OPENCS=no \
-				-DBUILD_OPENMW=no \
-				-DBUILD_WIZARD=no
-			rm -rf components
-			;;
-		openmw )
-			echo "  Subproject: OpenMW."
-			add_cmake_opts -DBUILD_ESSIMPORTER=no \
-				-DBUILD_LAUNCHER=no \
-				-DBUILD_MWINIIMPORTER=no \
-				-DBUILD_OPENCS=no \
-				-DBUILD_WIZARD=no
-			;;
-		opencs )
-			echo "  Subproject: OpenCS."
-			add_cmake_opts -DBUILD_ESSIMPORTER=no \
-				-DBUILD_LAUNCHER=no \
-				-DBUILD_MWINIIMPORTER=no \
-				-DBUILD_OPENMW=no \
-				-DBUILD_WIZARD=no
-			;;
-		misc )
-			echo "  Subproject: Misc."
-			add_cmake_opts -DBUILD_OPENCS=no \
-				-DBUILD_OPENMW=no
-			;;
-	esac
-fi
-
 if [ -z $VERBOSE ]; then
 	printf "  Configuring... "
 else

From ad47fb7b518db892c70e769c2f58933a572f926f Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 7 Jul 2015 15:50:40 +0200
Subject: [PATCH 019/765] Fix build script

---
 CI/before_script.msvc.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 06b14f2fe8..7c544ad54d 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -474,7 +474,8 @@ else
 	fi
 
 	add_cmake_opts -DDESIRED_QT_VERSION=5 \
-		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
+		-DCMAKE_PREFIX_PATH="$QT_SDK"
 fi
 
 
@@ -507,7 +508,8 @@ echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_ESMTOOL=no \
-	-DBUILD_MYGUI_PLUGIN=no
+	-DBUILD_MYGUI_PLUGIN=no \
+	-DOPENMW_MP_BUILD=on
 
 if [ -z $APPVEYOR ]; then
 	echo "  (Outside of AppVeyor, doing full build.)"

From f8485211a1ea5c00310fdbf7bd7ad0fa5dcd32d6 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 7 Jul 2015 15:54:03 +0200
Subject: [PATCH 020/765] Fix merge issue

---
 CI/before_script.msvc.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index a25e238d01..6543df4d3b 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -222,9 +222,11 @@ if [ -z $SKIP_DOWNLOAD ]; then
 		OSG-3.3.8-win$BITS.7z
 
 	# Qt
-	download "Qt 4.8.6" \
-		http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
-		qt$BITS-4.8.6.7z
+	if [ -z $APPVEYOR ]; then
+		download "Qt 4.8.6" \
+			http://sourceforge.net/projects/qt64ng/files/qt/$ARCHNAME/4.8.6/msvc2013/qt-4.8.6-x$ARCHSUFFIX-msvc2013.7z \
+			qt$BITS-4.8.6.7z
+	fi
 
 	# SDL2
 	download "SDL 2.0.3" \

From a831e89a43cc72c1bd8ffefb7570a7c73be45c38 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 7 Jul 2015 16:21:56 +0200
Subject: [PATCH 021/765] Fix MyGUI include dir, and properly return error
 codes

---
 CI/before_script.msvc.sh | 3 +--
 CI/build.msvc.sh         | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 6543df4d3b..0d72806fb5 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -372,8 +372,7 @@ fi
 MYGUI_SDK="`real_pwd`/MyGUI"
 
 add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include" \
-	-DMYGUI_PLATFORM_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
+	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
 	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
 if [ $CONFIGURATION == "Debug" ]; then
diff --git a/CI/build.msvc.sh b/CI/build.msvc.sh
index d426ef90d4..731c51eda0 100644
--- a/CI/build.msvc.sh
+++ b/CI/build.msvc.sh
@@ -50,6 +50,10 @@ else
 	msbuild OpenMW.sln //t:Build //m:8 //logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 fi
 
-if [ ! -z $PACKAGE ]; then
+RET=$?
+if [ $RET -eq 0 ] && [ ! -z $PACKAGE ]; then
 	msbuild PACKAGE.vcxproj //t:Build //m:8
-fi
\ No newline at end of file
+	RET=$?
+fi
+
+exit $RET

From 27a4af26abdb65e32eed89af1f2ca3d8b6cedc61 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Sun, 12 Jul 2015 00:45:42 +0200
Subject: [PATCH 022/765] Cleaning up AppVeyor scripts

---
 CI/before_script.msvc.sh | 407 ++++++++++++++++++++-------------------
 appveyor.yml             |  31 +--
 2 files changed, 224 insertions(+), 214 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 0d72806fb5..d23e3013f5 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -124,6 +124,11 @@ add_runtime_dlls() {
 	RUNTIME_DLLS="$RUNTIME_DLLS $@"
 }
 
+OSG_PLUGINS=""
+add_osg_dlls() {
+	OSG_PLUGINS="$OSG_PLUGINS $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM=`uname -m`
 fi
@@ -250,270 +255,274 @@ mkdir -p Build_$BITS/deps
 cd Build_$BITS/deps
 
 DEPS_INSTALL=`pwd`
+cd $DEPS
 
 echo
 echo "Extracting dependencies..."
 
 
 # Boost
-if [ -z $APPVEYOR ]; then
-	printf "Boost 1.58.0... "
-	cd $DEPS_INSTALL
+printf "Boost 1.58.0... "
+{
+	if [ -z $APPVEYOR ]; then
+		cd $DEPS_INSTALL
 
-	BOOST_SDK="`real_pwd`/Boost"
+		BOOST_SDK="`real_pwd`/Boost"
 
-	if [ -d Boost ] && grep "BOOST_VERSION 105800" Boost/boost/version.hpp > /dev/null; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf Boost
-		$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+		if [ -d Boost ] && grep "BOOST_VERSION 105800" Boost/boost/version.hpp > /dev/null; then
+			printf "Exists. "
+		elif [ -z $SKIP_EXTRACT ]; then
+			rm -rf Boost
+			$DEPS/boost-1.58.0-win$BITS.exe //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent
+		fi
+
+		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
+			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+
+		echo Done.
+	else
+		# Appveyor unstable has all the boost we need already
+		BOOST_SDK="c:/Libraries/boost"
+		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
+			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
+
+		echo AppVeyor.
 	fi
-
-	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
-
-	cd $DEPS
-
-	echo Done.
-else
-	# Appveyor unstable has all the boost we need already
-	BOOST_SDK="c:/Libraries/boost"
-	add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
-		-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
-fi
-
+}
+cd $DEPS
 
 # Bullet
 printf "Bullet 2.83.5... "
-cd $DEPS_INSTALL
+{
+	cd $DEPS_INSTALL
 
-if [ -d Bullet ]; then
-	printf "Exists. (No version checking) "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf Bullet
-	eval 7z x -y $DEPS/Bullet-2.83.5-win$BITS.7z $STRIP
-	mv Bullet-2.83.5-win$BITS Bullet
-fi
+	if [ -d Bullet ]; then
+		printf "Exists. (No version checking) "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf Bullet
+		eval 7z x -y $DEPS/Bullet-2.83.5-win$BITS.7z $STRIP
+		mv Bullet-2.83.5-win$BITS Bullet
+	fi
 
-BULLET_SDK="`real_pwd`/Bullet"
-add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
-	-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
-	-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
-	-DBULLET_DYNAMICS_LIBRARY="$BULLET_SDK/lib/BulletDynamics.lib" \
-	-DBULLET_DYNAMICS_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletDynamics_Debug.lib" \
-	-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
-	-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"
+	BULLET_SDK="`real_pwd`/Bullet"
+	add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
+		-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
+		-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
+		-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
+		-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"
 
+	echo Done.
+}
 cd $DEPS
 
-echo Done.
-
-
 # FFmpeg
 printf "FFmpeg 2.5.2... "
-cd $DEPS_INSTALL
+{
+	cd $DEPS_INSTALL
 
-if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf FFmpeg
+	if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf FFmpeg
 
-	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
-	eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
+		eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2.7z $STRIP
+		eval 7z x -y $DEPS/ffmpeg$BITS-2.5.2-dev.7z $STRIP
 
-	mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
-	cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
-	rm -rf ffmpeg-2.5.2-win$BITS-dev
-fi
+		mv ffmpeg-2.5.2-win$BITS-shared FFmpeg
+		cp -r ffmpeg-2.5.2-win$BITS-dev/* FFmpeg/
+		rm -rf ffmpeg-2.5.2-win$BITS-dev
+	fi
 
-FFMPEG_SDK="`real_pwd`/FFmpeg"
-add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \
-	-DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \
-	-DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \
-	-DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \
-	-DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \
-	-DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \
-	-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-	-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
+	FFMPEG_SDK="`real_pwd`/FFmpeg"
+	add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \
+		-DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \
+		-DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \
+		-DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \
+		-DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \
+		-DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \
+		-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
+		-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
 
-add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
+	add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
 
-if [ $BITS -eq 32 ]; then
-	add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
-fi
+	if [ $BITS -eq 32 ]; then
+		add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
+	fi
 
+	echo Done.
+}
 cd $DEPS
 
-echo Done.
-
-
 # MyGUI
 printf "MyGUI 3.2.2... "
-cd $DEPS_INSTALL
+{
+	cd $DEPS_INSTALL
 
-if [ -d MyGUI ] && \
-	grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-	grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
-	grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
-then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf MyGUI
-	eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
-	mv MyGUI-3.2.2-win$BITS MyGUI
-fi
+	if [ -d MyGUI ] && \
+		grep "MYGUI_VERSION_MAJOR 3" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+		grep "MYGUI_VERSION_MINOR 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null && \
+		grep "MYGUI_VERSION_PATCH 2" MyGUI/include/MYGUI/MyGUI_Prerequest.h > /dev/null
+	then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf MyGUI
+		eval 7z x -y $DEPS/MyGUI-3.2.2-win$BITS.7z $STRIP
+		mv MyGUI-3.2.2-win$BITS MyGUI
+	fi
 
-MYGUI_SDK="`real_pwd`/MyGUI"
+	MYGUI_SDK="`real_pwd`/MyGUI"
 
-add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
-	-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
-	-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
+	add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \
+		-DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \
+		-DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h"
 
-if [ $CONFIGURATION == "Debug" ]; then
-	SUFFIX="_d"
-else
-	SUFFIX=""
-fi
-add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll
+	if [ $CONFIGURATION == "Debug" ]; then
+		SUFFIX="_d"
+	else
+		SUFFIX=""
+	fi
+	add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll
 
+	echo Done.
+}
 cd $DEPS
 
-echo Done.
-
-
 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
-if [ -d openal-soft-1.16.0-bin ]; then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf openal-soft-1.16.0-bin
-	eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
-fi
+{
+	if [ -d openal-soft-1.16.0-bin ]; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf openal-soft-1.16.0-bin
+		eval 7z x -y OpenAL-Soft-1.16.0.zip $STRIP
+	fi
 
-OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
+	OPENAL_SDK="`real_pwd`/openal-soft-1.16.0-bin"
 
-add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
-	-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
-
-echo Done.
+	add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
+		-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"
 
+	echo Done.
+}
+cd $DEPS
 
 # OSG
 printf "OSG 3.3.8... "
-cd $DEPS_INSTALL
+{
+	cd $DEPS_INSTALL
 
-if [ -d OSG ] && \
-	grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
-	grep "OPENSCENEGRAPH_MINOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
-	grep "OPENSCENEGRAPH_PATCH_VERSION    8" OSG/include/osg/Version > /dev/null
-then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf OSG
-	eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
-	mv OSG-3.3.8-win$BITS OSG
-fi
+	if [ -d OSG ] && \
+		grep "OPENSCENEGRAPH_MAJOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+		grep "OPENSCENEGRAPH_MINOR_VERSION    3" OSG/include/osg/Version > /dev/null && \
+		grep "OPENSCENEGRAPH_PATCH_VERSION    8" OSG/include/osg/Version > /dev/null
+	then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf OSG
+		eval 7z x -y $DEPS/OSG-3.3.8-win$BITS.7z $STRIP
+		mv OSG-3.3.8-win$BITS OSG
+	fi
 
-OSG_SDK="`real_pwd`/OSG"
+	OSG_SDK="`real_pwd`/OSG"
 
-add_cmake_opts -DOSG_DIR="$OSG_SDK"
+	add_cmake_opts -DOSG_DIR="$OSG_SDK"
 
-if [ $CONFIGURATION == "Debug" ]; then
-	SUFFIX="d"
-else
-	SUFFIX=""
-fi
-add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
-	`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll
+	if [ $CONFIGURATION == "Debug" ]; then
+		SUFFIX="d"
+	else
+		SUFFIX=""
+	fi
 
-OSG_PLUGINS=""
-add_osg_dlls() {
-	OSG_PLUGINS="$OSG_PLUGINS $@"
+	add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
+		`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll
+
+	add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll
+
+	echo Done.
 }
-
-add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll
-
 cd $DEPS
 
-echo Done.
-
-
 # Qt
 if [ -z $APPVEYOR ]; then
 	printf "Qt 4.8.6... "
-	cd $DEPS_INSTALL
-
-	if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
-		printf "Exists. "
-	elif [ -z $SKIP_EXTRACT ]; then
-		rm -rf Qt
-		eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
-		mv qt-4.8.6-* Qt
-	fi
-
-	QT_SDK="`real_pwd`/Qt"
-
-	cd $QT_SDK
-	eval qtbinpatcher.exe $STRIP
-
-	add_cmake_opts -DDESIRED_QT_VERSION=4 \
-		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
-
-	if [ $CONFIGURATION == "Debug" ]; then
-		SUFFIX="d4"
-	else
-		SUFFIX="4"
-	fi
-	add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
-
-	cd $DEPS
-
-	echo Done.
 else
-	echo "Using Appveyor Qt 5 version."
-	if [ $PLATFORM == "win32" ]; then
-		QT_SDK="C:/Qt/5.4/msvc2013_opengl"
-	else
-		QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
-	fi
-
-	add_cmake_opts -DDESIRED_QT_VERSION=5 \
-		-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
-		-DCMAKE_PREFIX_PATH="$QT_SDK"
+	printf "Qt 5.4... "
 fi
+{
+	if [ -z $APPVEYOR ]; then
+		cd $DEPS_INSTALL
+		QT_SDK="`real_pwd`/Qt"
 
+		if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
+			printf "Exists. "
+		elif [ -z $SKIP_EXTRACT ]; then
+			rm -rf Qt
+			eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
+			mv qt-4.8.6-* Qt
+			(
+				cd $QT_SDK
+				eval qtbinpatcher.exe $STRIP
+			)
+		fi
+
+		cd $QT_SDK
+
+		add_cmake_opts -DDESIRED_QT_VERSION=4 \
+			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
+
+		if [ $CONFIGURATION == "Debug" ]; then
+			SUFFIX="d4"
+		else
+			SUFFIX="4"
+		fi
+
+		add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll
+
+		echo Done.
+	else
+		if [ $BITS -eq 32 ]; then
+			QT_SDK="C:/Qt/5.4/msvc2013_opengl"
+		else
+			QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
+		fi
+
+		add_cmake_opts -DDESIRED_QT_VERSION=5 \
+			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
+			-DCMAKE_PREFIX_PATH="$QT_SDK"
+	fi
+}
+cd $DEPS
 
 # SDL2
 printf "SDL 2.0.3... "
+{
+	if [ -d SDL2-2.0.3 ]; then
+		printf "Exists. "
+	elif [ -z $SKIP_EXTRACT ]; then
+		rm -rf SDL2-2.0.3
+		eval 7z x -y SDL2-2.0.3.zip $STRIP
+	fi
 
-if [ -d SDL2-2.0.3 ]; then
-	printf "Exists. "
-elif [ -z $SKIP_EXTRACT ]; then
-	rm -rf SDL2-2.0.3
-	eval 7z x -y SDL2-2.0.3.zip $STRIP
-fi
+	SDL_SDK="`real_pwd`/SDL2-2.0.3"
+	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
+		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
+		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
 
-SDL_SDK="`real_pwd`/SDL2-2.0.3"
-add_cmake_opts  -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
-	-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
-	-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
-	-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
 
-add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
+	echo Done.
+}
 
-cd $DEPS
-
-echo Done.
-echo
 
 cd $DEPS_INSTALL/..
 
+echo
 echo "Setting up OpenMW build..."
 
 add_cmake_opts -DBUILD_BSATOOL=no \
@@ -521,8 +530,8 @@ add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_MYGUI_PLUGIN=no \
 	-DOPENMW_MP_BUILD=on
 
-if [ -z $APPVEYOR ]; then
-	echo "  (Outside of AppVeyor, doing full build.)"
+if [ -z $CI ]; then
+	echo "  (Outside of CI, doing full build.)"
 else
 	case $STEP in
 		components )
@@ -533,7 +542,6 @@ else
 				-DBUILD_OPENCS=no \
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
-			rm -rf components
 			;;
 		openmw )
 			echo "  Subproject: OpenMW."
@@ -575,7 +583,8 @@ fi
 
 echo
 
-if [ -z $APPVEYOR ]; then
+# NOTE: Disable this when/if we want to run test cases
+if [ -z $CI ]; then
 	echo "Copying Runtime DLLs..."
 	mkdir -p $CONFIGURATION
 	for DLL in $RUNTIME_DLLS; do
diff --git a/appveyor.yml b/appveyor.yml
index 926aaff689..d5ad134306 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,17 +1,22 @@
 version: "{build}"
 
+branches:
+    only:
+        - appveyor
+
 platform:
     - Win32
     - x64
 
-configuration:
-    - Debug
+configuration: Debug
 
 environment:
     matrix:
-    - STEP: openmw
-    - STEP: opencs
-    - STEP: misc
+        - STEP: misc
+#        - STEP: components # misc builds this too
+# Build takes too long for these, ignore for now
+#        - STEP: openmw
+#        - STEP: opencs
 
 matrix:
     fast_finish: true
@@ -32,18 +37,14 @@ cache:
     - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
     - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z
 
-init:
-    - cmd: bash --version
-    - cmd: cmake --version
-    - cmd: msbuild /version
-    - cmd: echo.
-
 clone_folder: C:\projects\openmw
 
-build_script:
-    - cmd: bash --login C:\projects\openmw\CI\build.msvc.sh
-
 before_build:
-    - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh
+
+build_script:
+    - cmd: if %PLATFORM%==Win32 set build=Build_32
+    - cmd: if %PLATFORM%==x64 set build=Build_64
+    - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 test: off

From 90af7060ea2c5a17e0fdbcf00d7e926a0e232a86 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Tue, 14 Jul 2015 16:26:32 +0200
Subject: [PATCH 023/765] Forgot an echo

---
 CI/before_script.msvc.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index d23e3013f5..cd47cbf8d4 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -495,6 +495,8 @@ fi
 		add_cmake_opts -DDESIRED_QT_VERSION=5 \
 			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
+
+		echo AppVeyor.
 	fi
 }
 cd $DEPS

From fec08ef73e286e3749b67b9fa768e7e773a180b0 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Sep 2015 15:29:08 +0200
Subject: [PATCH 024/765] Run unity build

---
 CI/before_script.msvc.sh | 7 +++++++
 appveyor.yml             | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index cd47cbf8d4..756653fe97 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -16,6 +16,9 @@ while [ $# -gt 0 ]; do
 
 		-k )
 			KEEP=true ;;
+		
+		-u )
+			UNITY_BUILD=true ;;
 
 		* )
 			echo "Unknown arg $ARG."
@@ -162,6 +165,10 @@ case $PLATFORM in
 		;;
 esac
 
+if ! [ -z $UNITY_BUILD ]; then
+	add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
+fi
+
 case $CONFIGURATION in
 	debug|Debug|DEBUG )
 		CONFIGURATION=Debug
diff --git a/appveyor.yml b/appveyor.yml
index d5ad134306..e89a54e3b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,7 +15,7 @@ environment:
         - STEP: misc
 #        - STEP: components # misc builds this too
 # Build takes too long for these, ignore for now
-#        - STEP: openmw
+        - STEP: openmw
 #        - STEP: opencs
 
 matrix:
@@ -40,7 +40,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From 33175b44b827601c070776891a679eda617cf8b0 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Sep 2015 16:02:03 +0200
Subject: [PATCH 025/765] Disable SDL main library

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 756653fe97..bc8965066f 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -520,8 +520,8 @@ printf "SDL 2.0.3... "
 
 	SDL_SDK="`real_pwd`/SDL2-2.0.3"
 	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
-		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
-		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
+		-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
 
 	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
 

From 7df115d61bade2750fb22a1e0eaeb473d07aebbd Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Sep 2015 16:21:40 +0200
Subject: [PATCH 026/765] Just run OpenMW builds for now

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index e89a54e3b9..ea508abd6c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ configuration: Debug
 
 environment:
     matrix:
-        - STEP: misc
+#        - STEP: misc
 #        - STEP: components # misc builds this too
 # Build takes too long for these, ignore for now
         - STEP: openmw

From 2e174fd1b5981103fc317bcca83a06748c6b02c1 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Sep 2015 19:59:17 +0200
Subject: [PATCH 027/765] Readd SDL2 main

---
 CI/before_script.msvc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index bc8965066f..756653fe97 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -520,8 +520,8 @@ printf "SDL 2.0.3... "
 
 	SDL_SDK="`real_pwd`/SDL2-2.0.3"
 	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
-		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
-		-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
+		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
 
 	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll
 

From 4ddb2feebb1b9a3fb5fc813047ab110c99605ac4 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 28 Oct 2015 17:35:16 +0100
Subject: [PATCH 028/765] Let's try building everything, see how far we get

---
 CI/before_script.msvc.sh | 3 +++
 appveyor.yml             | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 756653fe97..37905fc4c2 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -573,6 +573,9 @@ else
 			add_cmake_opts -DBUILD_OPENCS=no \
 				-DBUILD_OPENMW=no
 			;;
+		* )
+			echo "  Building everything."
+			;;
 	esac
 fi
 
diff --git a/appveyor.yml b/appveyor.yml
index ea508abd6c..651f41783e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,12 +10,12 @@ platform:
 
 configuration: Debug
 
-environment:
-    matrix:
+#environment:
+#    matrix:
 #        - STEP: misc
 #        - STEP: components # misc builds this too
 # Build takes too long for these, ignore for now
-        - STEP: openmw
+#        - STEP: openmw
 #        - STEP: opencs
 
 matrix:

From f3187b17c83d0196b2b580b0122a938743f28770 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 23 Dec 2015 18:38:53 +0100
Subject: [PATCH 029/765] Update OpenAL soft link, get qtbinpatcher to run

---
 CI/before_script.msvc.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 37905fc4c2..50fd13e4e2 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -225,7 +225,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# OpenAL
 	download "OpenAL-Soft 1.16.0" \
-		http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip \
+		http://kcat.strangesoft.net/openal-binaries/openal-soft-1.16.0-bin.zip \
 		OpenAL-Soft-1.16.0.zip
 
 	# OSG
@@ -472,10 +472,8 @@ fi
 			rm -rf Qt
 			eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
 			mv qt-4.8.6-* Qt
-			(
-				cd $QT_SDK
-				eval qtbinpatcher.exe $STRIP
-			)
+			cd Qt
+			eval ./qtbinpatcher.exe $STRIP
 		fi
 
 		cd $QT_SDK

From 5743c839a8bd40fa9336c7dacdaae4c59b1ef7ee Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 23 Dec 2015 18:51:04 +0100
Subject: [PATCH 030/765] Why is this breaking on AppVeyor?

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 651f41783e..be8f2b12bf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -v
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From c226d015aca698cb8ac95f8ee6571f36c2946248 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 23 Dec 2015 18:59:41 +0100
Subject: [PATCH 031/765] AppVeyor doesn't pass the platform env variable?

---
 CI/before_script.msvc.sh | 2 +-
 appveyor.yml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 50fd13e4e2..3cb024ddaf 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -40,7 +40,7 @@ else
 
 	cd $APPVEYOR_BUILD_FOLDER
 	VERSION="$(cat README.md | grep Version: | awk '{ print $3; }')-$(git rev-parse --short HEAD)"
-	appveyor UpdateBuild -Version "$VERSION"
+	appveyor UpdateBuild -Version "$VERSION" > /dev/null &
 fi
 
 run_cmd() {
diff --git a/appveyor.yml b/appveyor.yml
index be8f2b12bf..b137d4850b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -v
+    - cmd: sh PLATFORM=%PLATFORM% %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From c8145a1b917d81639577cfb7c6018d0d786b7b73 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Wed, 23 Dec 2015 19:32:43 +0100
Subject: [PATCH 032/765] Let's see if we can't get AppVeyor to work

---
 CI/before_script.msvc.sh | 8 ++++++++
 appveyor.yml             | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 3cb024ddaf..51734ceb37 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -20,6 +20,14 @@ while [ $# -gt 0 ]; do
 		-u )
 			UNITY_BUILD=true ;;
 
+		-p )
+			PLATFORM=$1
+			shift ;;
+
+		-c )
+			CONFIGURATION=$1
+			shift ;;
+
 		* )
 			echo "Unknown arg $ARG."
 			exit 1 ;;
diff --git a/appveyor.yml b/appveyor.yml
index b137d4850b..46241bf29f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh PLATFORM=%PLATFORM% %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM%
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From 1dbc1e67d8cd4f2807792bac7aa3e83d5fa274b3 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 02:41:35 +0100
Subject: [PATCH 033/765] Possible Qt5 link fix for AppVeyor

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e966a1635..d75d044b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,8 +99,8 @@ if (WIN32)
     option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
 endif()
 
-# We probably support older versions than this.
-cmake_minimum_required(VERSION 2.6)
+# To make Qt5 happy and allow linking QtMain on Windows. 
+cmake_minimum_required(VERSION 2.8.11)
 
 # Sound setup
 unset(FFMPEG_LIBRARIES CACHE)

From 2142d0d2d65c40155be00e49578eea5e60a25080 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 02:48:00 +0100
Subject: [PATCH 034/765] Make Qt5 happy

---
 apps/launcher/CMakeLists.txt | 3 ---
 apps/opencs/CMakeLists.txt   | 3 ---
 apps/wizard/CMakeLists.txt   | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index 274239fb0c..4d2dc6ac4b 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -103,9 +103,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif(WIN32)
 else()
     qt5_use_modules(openmw-launcher Widgets Core)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (BUILD_WITH_CODE_COVERAGE)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 6af04e8fc2..a8ed683282 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -224,9 +224,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif()
 else()
     qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (WIN32)
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 89438640c1..4be5fb2b76 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -129,9 +129,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif()
 else()
     qt5_use_modules(openmw-wizard Widgets Core)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (OPENMW_USE_UNSHIELD)

From 93ee8f1991beeeb8a1822164df502f2cf940001e Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 11:33:59 +0100
Subject: [PATCH 035/765] Allow for earlier CMake on Qt4

---
 CMakeLists.txt | 57 +++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 906c87db20..509988fef6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,8 +111,37 @@ if (WIN32)
     option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
 endif()
 
-# To make Qt5 happy and allow linking QtMain on Windows. 
-cmake_minimum_required(VERSION 2.8.11)
+if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
+   set(USE_QT FALSE)
+else()
+   set(USE_QT TRUE)
+endif()
+
+# Dependencies
+if (USE_QT)
+    set(DESIRED_QT_VERSION 4 CACHE STRING "The QT version OpenMW should use (4 or 5)")
+    set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
+    message(STATUS "Using Qt${DESIRED_QT_VERSION}")
+
+    if (DESIRED_QT_VERSION MATCHES 4)
+        find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtNetwork QtOpenGL)
+    else()
+        find_package(Qt5Widgets REQUIRED)
+        find_package(Qt5Core REQUIRED)
+        find_package(Qt5Network REQUIRED)
+        find_package(Qt5OpenGL REQUIRED)
+    # Instruct CMake to run moc automatically when needed.
+    #set(CMAKE_AUTOMOC ON)
+    endif()
+endif()
+
+if (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
+	# 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
+	cmake_minimum_required(VERSION 2.8.11)
+else()
+	# We probably support older versions than this.
+	cmake_minimum_required(VERSION 2.6)
+endif()
 
 # Sound setup
 unset(FFMPEG_LIBRARIES CACHE)
@@ -167,30 +196,6 @@ if (OPENGL_ES)
     add_definitions(-DOPENGL_ES)
 endif(OPENGL_ES)
 
-if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
-   set(USE_QT FALSE)
-else()
-   set(USE_QT TRUE)
-endif()
- 
-# Dependencies
-if (USE_QT)
-    set(DESIRED_QT_VERSION 4 CACHE STRING "The QT version OpenMW should use (4 or 5)")
-    set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
-    message(STATUS "Using Qt${DESIRED_QT_VERSION}")
-
-    if (DESIRED_QT_VERSION MATCHES 4)
-        find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtNetwork QtOpenGL)
-    else()
-        find_package(Qt5Widgets REQUIRED)
-        find_package(Qt5Core REQUIRED)
-        find_package(Qt5Network REQUIRED)
-        find_package(Qt5OpenGL REQUIRED)
-    # Instruct CMake to run moc automatically when needed.
-    #set(CMAKE_AUTOMOC ON)
-    endif()
-endif()
-
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
     find_package (Threads)

From 09ec622f66d0d4e970c8a32165161d7aa4acdb94 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 11:42:12 +0100
Subject: [PATCH 036/765] Remove unused environment, only do 32-bit

---
 appveyor.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 46241bf29f..631cae63ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,18 +6,10 @@ branches:
 
 platform:
     - Win32
-    - x64
+#    - x64
 
 configuration: Debug
 
-#environment:
-#    matrix:
-#        - STEP: misc
-#        - STEP: components # misc builds this too
-# Build takes too long for these, ignore for now
-#        - STEP: openmw
-#        - STEP: opencs
-
 matrix:
     fast_finish: true
 

From f422fe49f8b2f07bec6e4fcd9950fd15ac9bb7f3 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 18:27:57 +0100
Subject: [PATCH 037/765] Slight improvement to the build setup

---
 CI/before_script.msvc.sh | 111 +++++++++++++++++++++++++++++----------
 appveyor.yml             |   3 +-
 2 files changed, 86 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 CI/before_script.msvc.sh

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
old mode 100644
new mode 100755
index 51734ceb37..5aa8d3e9d5
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -1,42 +1,86 @@
 #!/bin/bash
 
 while [ $# -gt 0 ]; do
-	ARG=$1
+	ARGSTR=$1
 	shift
 
-	case $ARG in
-		-v )
-			VERBOSE=true ;;
+	if [ ${ARGSTR:0:1} != "-" ]; then
+		echo "Unknown argument $ARGSTR"
+		echo "Try '$0 -h'"
+		exit 1
+	fi
 
-		-d )
-			SKIP_DOWNLOAD=true ;;
+	for (( i=1; i<${#ARGSTR}; i++ )); do
+		ARG=${ARGSTR:$i:1}
+		case $ARG in
+			V )
+				VERBOSE=true ;;
 
-		-e )
-			SKIP_EXTRACT=true ;;
+			v )
+				VS_VERSION=$1
+				shift ;;
 
-		-k )
-			KEEP=true ;;
-		
-		-u )
-			UNITY_BUILD=true ;;
+			d )
+				SKIP_DOWNLOAD=true ;;
 
-		-p )
-			PLATFORM=$1
-			shift ;;
+			e )
+				SKIP_EXTRACT=true ;;
 
-		-c )
-			CONFIGURATION=$1
-			shift ;;
+			k )
+				KEEP=true ;;
 
-		* )
-			echo "Unknown arg $ARG."
-			exit 1 ;;
-	esac
+			u )
+				UNITY_BUILD=true ;;
+
+			p )
+				PLATFORM=$1
+				shift ;;
+
+			c )
+				CONFIGURATION=$1
+				shift ;;
+
+			h )
+				cat <<EOF
+Usage: $0 [-cdehkpuvV]
+
+Options:
+	-c <Release/Debug>
+		Set the configuration, can also be set with environment variable CONFIGURATION.
+	-d
+		Skip checking the downloads.
+	-e
+		Skip extracting dependencies.
+	-h
+		Show this message.
+	-k
+		Keep the old build directory, default is to delete it.
+	-p <Win32/Win64>
+		Set the build platform, can also be set with environment variable PLATFORM.
+	-u
+		Configure for unity builds.
+	-v <2013/2015>
+		Choose the Visual Studio version to use.
+	-V
+		Run verbosely
+EOF
+				exit 0
+				;;
+
+			* )
+				echo "Unknown argument $ARG."
+				echo "Try '$0 -h'"
+				exit 1 ;;
+		esac
+	done
 done
 
 if [ -z $VERBOSE ]; then
 	STRIP="> /dev/null 2>&1"
 fi
+if [ -z $VS_VERSION ]; then
+	VS_VERSION="2013"
+fi
 
 if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
@@ -148,14 +192,27 @@ if [ -z $CONFIGURATION ]; then
 	CONFIGURATION="Debug"
 fi
 
+case $VS_VERSION in
+	14|2015 )
+		GENERATOR="Visual Studio 14 2015"
+		XP_TOOLSET="v140_xp"
+		;;
+
+#	12|2013|
+	* )
+		GENERATOR="Visual Studio 12 2013"
+		XP_TOOLSET="v120_xp"
+		;;
+esac
+
 case $PLATFORM in
 	x64|x86_64|x86-64|win64|Win64 )
 		ARCHNAME=x86-64
 		ARCHSUFFIX=64
 		BITS=64
 
-		BASE_OPTS="-G\"Visual Studio 12 2013 Win64\""
-		add_cmake_opts "-G\"Visual Studio 12 2013 Win64\""
+		BASE_OPTS="-G\"$GENERATOR Win64\""
+		add_cmake_opts "-G\"$GENERATOR Win64\""
 		;;
 
 	x32|x86|i686|i386|win32|Win32 )
@@ -163,8 +220,8 @@ case $PLATFORM in
 		ARCHSUFFIX=86
 		BITS=32
 
-		BASE_OPTS="-G\"Visual Studio 12 2013\" -Tv120_xp"
-		add_cmake_opts "-G\"Visual Studio 12 2013\"" -Tv120_xp
+		BASE_OPTS="-G\"$GENERATOR\" -T$XP_TOOLSET"
+		add_cmake_opts "-G\"$GENERATOR\"" -T$XP_TOOLSET
 		;;
 
 	* )
diff --git a/appveyor.yml b/appveyor.yml
index 631cae63ac..0667e0ee09 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,7 +15,8 @@ matrix:
 
 os: unstable
 
-clone_depth: 1
+shallow_clone: true
+#clone_depth: 1
 
 cache:
     - C:\projects\openmw\deps\Bullet-2.83.5-win32.7z

From d32358558e91b889cebb79873a5a4bf8b41ac63b Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Thu, 24 Dec 2015 22:39:07 +0100
Subject: [PATCH 038/765] We actually want the commit hash, so no zips

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0667e0ee09..28df364df2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,8 +15,8 @@ matrix:
 
 os: unstable
 
-shallow_clone: true
-#clone_depth: 1
+#shallow_clone: true
+clone_depth: 1
 
 cache:
     - C:\projects\openmw\deps\Bullet-2.83.5-win32.7z

From 1ac091e5b5c0200356bdb50e3d23fe606f834703 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Sun, 27 Dec 2015 20:00:52 +0100
Subject: [PATCH 039/765] Quick appveyor.yml cleanup

---
 appveyor.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 28df364df2..1bc0d3ca69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,8 @@ version: "{build}"
 
 branches:
     only:
+        - master
+        - /openmw-.*$/
         - appveyor
 
 platform:
@@ -13,9 +15,11 @@ configuration: Debug
 matrix:
     fast_finish: true
 
+# For the Qt, Boost, CMake, etc installs
 os: unstable
 
-#shallow_clone: true
+# We want the git revision for versioning,
+# so shallow clones don't work.
 clone_depth: 1
 
 cache:
@@ -41,3 +45,10 @@ build_script:
     - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 test: off
+
+#notifications:
+#    - provider: Email
+#    to:
+#        -  
+#    on_build_failure: true
+#    on_build_status_changed: true

From d5196ac4fc3ea94646023e1ee0c59a9eeac39c55 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Sun, 27 Dec 2015 20:05:37 +0100
Subject: [PATCH 040/765] Let's throw in a build badge too

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f353cd76ef..585805368f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OpenMW
 ======
 
-[![Build Status](https://img.shields.io/travis/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
+[![Build Status](https://img.shields.io/travis/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/ace13/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
 
 OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 

From 05335491ac82a78f1fe050f3b84478df0e61442d Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 28 Dec 2015 05:42:21 +0100
Subject: [PATCH 041/765] Build without unity builds, how far will we get?

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1bc0d3ca69..3e3de6780c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM%
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -p %PLATFORM%
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From 42e3ff6f962dc68296b12ee693871d7f9201cc07 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Mon, 28 Dec 2015 09:01:08 +0100
Subject: [PATCH 042/765] Revert "Build without unity builds, how far will we
 get?"

This reverts commit 05335491ac82a78f1fe050f3b84478df0e61442d.
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3e3de6780c..1bc0d3ca69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -p %PLATFORM%
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM%
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32

From 7f7e8c63bf645e44930ef788b88a7f554de672ba Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 31 Dec 2015 00:37:47 +0100
Subject: [PATCH 043/765] Correct path to gamecontrollerdb.txt (Fixes #3112)

---
 apps/openmw/engine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b43fd2f530..3fcd46f7ca 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -474,8 +474,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     // find correct path to the game controller bindings
-    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.cfg";
-    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.cfg";
+    const std::string localdefault = mCfgMgr.getLocalPath().string() + "/gamecontrollerdb.txt";
+    const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/gamecontrollerdb.txt";
     std::string gameControllerdb;
     if (boost::filesystem::exists(localdefault))
         gameControllerdb = localdefault;

From 6fde02ea426ee583ece2c3d22a4d6717adcd9eb2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Dec 2015 15:22:19 +0100
Subject: [PATCH 044/765] LocalScripts: initialize mIter

---
 apps/openmw/mwworld/localscripts.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 46d0b3cc22..2004a2ff39 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -61,7 +61,10 @@ namespace
 
 }
 
-MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (store) {}
+MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (store)
+{
+    mIter = mScripts.end();
+}
 
 void MWWorld::LocalScripts::setIgnore (const ConstPtr& ptr)
 {

From 0333c4004733d3df5ed2fe81cc95b28dcbfe781b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 1 Jan 2016 02:59:14 +0100
Subject: [PATCH 045/765] Fix typo in SameRace dialogue function (function was
 inverted, Fixes #3116)

---
 apps/openmw/mwdialogue/filter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 43d979ea28..ce07593e6a 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -478,7 +478,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_SameRace:
 
-            return !Misc::StringUtils::ciEqual(mActor.get<ESM::NPC>()->mBase->mRace, player.get<ESM::NPC>()->mBase->mRace);
+            return Misc::StringUtils::ciEqual(mActor.get<ESM::NPC>()->mBase->mRace, player.get<ESM::NPC>()->mBase->mRace);
 
         case SelectWrapper::Function_SameFaction:
 

From a9f0f30bb879a2197d9abc9f65d74673bead6e51 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 1 Jan 2016 23:55:17 +0100
Subject: [PATCH 046/765] Reject conditions testing agaist Choice when not
 currently in a choice (Fixes #3117)

---
 apps/openmw/mwdialogue/filter.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index ce07593e6a..69df38ccfa 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -155,10 +155,13 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
 bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
 {
     if (select.isNpcOnly() && (mActor.getTypeName() != typeid (ESM::NPC).name()))
-        // If the actor is a creature, we do not test the conditions applicable
-        // only to NPCs.
+        // If the actor is a creature, we pass all conditions only applicable to NPCs.
         return true;
 
+    if (select.getFunction() == SelectWrapper::Function_Choice && mChoice == -1)
+        // If not currently in a choice, we reject all conditions that test against choices.
+        return false;
+
     switch (select.getType())
     {
         case SelectWrapper::Type_None: return true;

From 1905f0bf2dd8bb9000c033f89564ff3cac14f7ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jan 2016 00:49:53 +0100
Subject: [PATCH 047/765] Add support for placing BodyParts in a cell (Bug
 #3118)

---
 apps/openmw/CMakeLists.txt        |  2 +-
 apps/openmw/mwclass/bodypart.cpp  | 52 +++++++++++++++++++++++++++++++
 apps/openmw/mwclass/bodypart.hpp  | 31 ++++++++++++++++++
 apps/openmw/mwclass/classes.cpp   |  2 ++
 apps/openmw/mwworld/cellstore.cpp |  7 +++++
 apps/openmw/mwworld/cellstore.hpp | 10 ++++++
 apps/openmw/mwworld/esmstore.cpp  |  3 +-
 apps/openmw/mwworld/manualref.cpp |  1 +
 8 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 apps/openmw/mwclass/bodypart.cpp
 create mode 100644 apps/openmw/mwclass/bodypart.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 0113fed022..02cf6c87dd 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -75,7 +75,7 @@ add_openmw_dir (mwphysics
 
 add_openmw_dir (mwclass
     classes activator creature npc weapon armor potion apparatus book clothing container door
-    ingredient creaturelevlist itemlevlist light lockpick misc probe repair static actor
+    ingredient creaturelevlist itemlevlist light lockpick misc probe repair static actor bodypart
     )
 
 add_openmw_dir (mwmechanics
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
new file mode 100644
index 0000000000..be2b927cc2
--- /dev/null
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -0,0 +1,52 @@
+#include "bodypart.hpp"
+
+#include "../mwrender/renderinginterface.hpp"
+#include "../mwrender/objects.hpp"
+
+#include "../mwworld/cellstore.hpp"
+
+namespace MWClass
+{
+
+    MWWorld::Ptr BodyPart::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
+    {
+        const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
+
+        return MWWorld::Ptr(cell.insert(ref), &cell);
+    }
+
+    void BodyPart::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string &model, MWRender::RenderingInterface &renderingInterface) const
+    {
+        if (!model.empty()) {
+            renderingInterface.getObjects().insertModel(ptr, model);
+        }
+    }
+
+    void BodyPart::insertObject(const MWWorld::Ptr &ptr, const std::string &model, MWPhysics::PhysicsSystem &physics) const
+    {
+    }
+
+    std::string BodyPart::getName(const MWWorld::ConstPtr &ptr) const
+    {
+        return std::string();
+    }
+
+    void BodyPart::registerSelf()
+    {
+        boost::shared_ptr<MWWorld::Class> instance (new BodyPart);
+
+        registerClass (typeid (ESM::BodyPart).name(), instance);
+    }
+
+    std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
+    {
+        const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
+
+        const std::string &model = ref->mBase->mModel;
+        if (!model.empty()) {
+            return "meshes\\" + model;
+        }
+        return "";
+    }
+
+}
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
new file mode 100644
index 0000000000..79c7c860de
--- /dev/null
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -0,0 +1,31 @@
+#ifndef GAME_MWCLASS_BODYPART_H
+#define GAME_MWCLASS_BODYPART_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+
+    class BodyPart : public MWWorld::Class
+    {
+        virtual MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const;
+
+    public:
+
+        virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const;
+        ///< Add reference into a cell for rendering
+
+        virtual void insertObject(const MWWorld::Ptr& ptr, const std::string& model, MWPhysics::PhysicsSystem& physics) const;
+
+        virtual std::string getName (const MWWorld::ConstPtr& ptr) const;
+        ///< \return name (the one that is to be presented to the user; not the internal one);
+        /// can return an empty string.
+
+        static void registerSelf();
+
+        virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwclass/classes.cpp b/apps/openmw/mwclass/classes.cpp
index c303b23af0..a552dfebf0 100644
--- a/apps/openmw/mwclass/classes.cpp
+++ b/apps/openmw/mwclass/classes.cpp
@@ -20,6 +20,7 @@
 #include "probe.hpp"
 #include "repair.hpp"
 #include "static.hpp"
+#include "bodypart.hpp"
 
 namespace MWClass
 {
@@ -45,5 +46,6 @@ namespace MWClass
         Probe::registerSelf();
         Repair::registerSelf();
         Static::registerSelf();
+        BodyPart::registerSelf();
     }
 }
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 08f272ea2a..5b53643e89 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -591,6 +591,7 @@ namespace MWWorld
             case ESM::REC_REPA: mRepairs.load(ref, deleted, store); break;
             case ESM::REC_STAT: mStatics.load(ref, deleted, store); break;
             case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
+            case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
 
             case 0: std::cerr << "Cell reference " + ref.mRefID + " not found!\n"; break;
 
@@ -659,6 +660,7 @@ namespace MWWorld
         writeReferenceCollection<ESM::ObjectState> (writer, mRepairs);
         writeReferenceCollection<ESM::ObjectState> (writer, mStatics);
         writeReferenceCollection<ESM::ObjectState> (writer, mWeapons);
+        writeReferenceCollection<ESM::ObjectState> (writer, mBodyParts);
 
         for (MovedRefTracker::const_iterator it = mMovedToAnotherCell.begin(); it != mMovedToAnotherCell.end(); ++it)
         {
@@ -794,6 +796,11 @@ namespace MWWorld
                     readReferenceCollection<ESM::ObjectState> (reader, mWeapons, cref, contentFileMap);
                     break;
 
+                case ESM::REC_BODY:
+
+                    readReferenceCollection<ESM::ObjectState> (reader, mBodyParts, cref, contentFileMap);
+                    break;
+
                 default:
 
                     throw std::runtime_error ("unknown type in cell reference section");
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 27fe9ec036..faba76262b 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -31,6 +31,7 @@
 #include <components/esm/loadweap.hpp>
 #include <components/esm/loadnpc.hpp>
 #include <components/esm/loadmisc.hpp>
+#include <components/esm/loadbody.hpp>
 
 #include "../mwmechanics/pathgrid.hpp"  // TODO: maybe belongs in mwworld
 
@@ -97,6 +98,7 @@ namespace MWWorld
             CellRefList<ESM::Repair>            mRepairs;
             CellRefList<ESM::Static>            mStatics;
             CellRefList<ESM::Weapon>            mWeapons;
+            CellRefList<ESM::BodyPart>          mBodyParts;
 
             typedef std::map<LiveCellRefBase*, MWWorld::CellStore*> MovedRefTracker;
             // References owned by a different cell that have been moved here.
@@ -152,6 +154,7 @@ namespace MWWorld
                     forEachImp (visitor, mRepairs) &&
                     forEachImp (visitor, mStatics) &&
                     forEachImp (visitor, mWeapons) &&
+                    forEachImp (visitor, mBodyParts) &&
                     forEachImp (visitor, mCreatures) &&
                     forEachImp (visitor, mNpcs) &&
                     forEachImp (visitor, mCreatureLists);
@@ -518,6 +521,13 @@ namespace MWWorld
         return mWeapons;
     }
 
+    template<>
+    inline CellRefList<ESM::BodyPart>& CellStore::get<ESM::BodyPart>()
+    {
+        mHasState = true;
+        return mBodyParts;
+    }
+
     bool operator== (const CellStore& left, const CellStore& right);
     bool operator!= (const CellStore& left, const CellStore& right);
 }
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 1882c6e1aa..7a1f222c78 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -19,7 +19,8 @@ static bool isCacheableRecord(int id)
         id == ESM::REC_BOOK || id == ESM::REC_CLOT || id == ESM::REC_CONT || id == ESM::REC_CREA ||
         id == ESM::REC_DOOR || id == ESM::REC_INGR || id == ESM::REC_LEVC || id == ESM::REC_LEVI ||
         id == ESM::REC_LIGH || id == ESM::REC_LOCK || id == ESM::REC_MISC || id == ESM::REC_NPC_ ||
-        id == ESM::REC_PROB || id == ESM::REC_REPA || id == ESM::REC_STAT || id == ESM::REC_WEAP)
+        id == ESM::REC_PROB || id == ESM::REC_REPA || id == ESM::REC_STAT || id == ESM::REC_WEAP ||
+        id == ESM::REC_BODY)
     {
         return true;
     }
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index d6e40ad09e..c683f7e036 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -54,6 +54,7 @@ MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const std::string&
     case ESM::REC_REPA: create(store.get<ESM::Repair>(), lowerName, mRef, mPtr); break;
     case ESM::REC_STAT: create(store.get<ESM::Static>(), lowerName, mRef, mPtr); break;
     case ESM::REC_WEAP: create(store.get<ESM::Weapon>(), lowerName, mRef, mPtr); break;
+    case ESM::REC_BODY: create(store.get<ESM::BodyPart>(), lowerName, mRef, mPtr); break;
 
     case 0:
         throw std::logic_error("failed to create manual cell ref for " + lowerName + " (unknown ID)");

From 3ebfb479830c02ba1172de99341670f314c4d443 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jan 2016 01:12:44 +0100
Subject: [PATCH 048/765] Do not discard root node transformations if the root
 node is named 'bip01' (Bug #3118)

---
 components/nif/node.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 326e9802fd..17b58bd463 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -9,6 +9,8 @@
 #include "controller.hpp"
 #include "base.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Nif
 {
 
@@ -118,10 +120,10 @@ struct NiNode : Node
         children.read(nif);
         effects.read(nif);
 
-        // Discard tranformations for the root node, otherwise some meshes
+        // Discard transformations for the root node, otherwise some meshes
         // occasionally get wrong orientation. Only for NiNode-s for now, but
         // can be expanded if needed.
-        if (0 == recIndex)
+        if (0 == recIndex && !Misc::StringUtils::ciEqual(name, "bip01"))
         {
             static_cast<Nif::Node*>(this)->trafo = Nif::Transformation::getIdentity();
         }

From b1020dcd42798fc024a4660e7698ea88840337b7 Mon Sep 17 00:00:00 2001
From: Poncho <poncho@jBook.local>
Date: Sat, 2 Jan 2016 12:24:39 -0600
Subject: [PATCH 049/765] Use correct direction multipliers during awareness
 check

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b98e5daa36..b8dc90cf7a 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1435,7 +1435,7 @@ namespace MWMechanics
             osg::Vec3f observerDir = (observer.getRefData().getBaseNode()->getAttitude() * osg::Vec3f(0,1,0));
 
             float angleRadians = std::acos(observerDir * vec / (observerDir.length() * vec.length()));
-            if (angleRadians < osg::DegreesToRadians(90.f))
+            if (angleRadians > osg::DegreesToRadians(90.f))
                 y = obsTerm * observerStats.getFatigueTerm() * fSneakNoViewMult;
             else
                 y = obsTerm * observerStats.getFatigueTerm() * fSneakViewMult;

From ded0962130e14fb16a358a7ac2013601d6c59417 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jan 2016 20:52:22 +0100
Subject: [PATCH 050/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 292c1e9e3d..d4927ea92f 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -56,6 +56,7 @@ Programmers
     Jeffrey Haines (Jyby)
     Jengerer
     Jiří Kuneš (kunesj)
+    Joe Wilkerson (neuralroberts)
     Joel Graff (graffy)
     John Blomberg (fstp)
     Jordan Ayers

From e695619aa5bfe5d8a80580fbd322fac653f0048b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Jan 2016 00:02:58 +0100
Subject: [PATCH 051/765] ExprParser: Warn about ignored arguments

---
 components/compiler/exprparser.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index c0375b4366..d35b081677 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -804,6 +804,8 @@ namespace Compiler
                     if (optional)
                         ++optionalCount;
                 }
+                else
+                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
             }
             else if (*iter=='X')
             {
@@ -815,6 +817,8 @@ namespace Compiler
 
                 if (parser.isEmpty())
                     break;
+                else
+                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
             }
             else if (*iter=='z')
             {
@@ -825,6 +829,8 @@ namespace Compiler
 
                 if (discardParser.isEmpty())
                     break;
+                else
+                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
             }
             else if (*iter=='j')
             {

From 23cd2056bf838a07bb67ffdb9eda5081c9ae9c47 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Jan 2016 00:03:41 +0100
Subject: [PATCH 052/765] Ignore extra arguments in playSound and playSound3D.

A common mistake in mods is to use playSound with volume/pitch arguments, which only playSoundVP supports. Previously these extra arguments raised a parser error, making the respective mod unusable.
---
 components/compiler/extensions0.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 8f7650191a..8c76cdbb80 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -341,9 +341,9 @@ namespace Compiler
             extensions.registerInstruction ("say", "SS", opcodeSay, opcodeSayExplicit);
             extensions.registerFunction ("saydone", 'l', "", opcodeSayDone, opcodeSayDoneExplicit);
             extensions.registerInstruction ("streammusic", "S", opcodeStreamMusic);
-            extensions.registerInstruction ("playsound", "c", opcodePlaySound);
+            extensions.registerInstruction ("playsound", "cXX", opcodePlaySound);
             extensions.registerInstruction ("playsoundvp", "cff", opcodePlaySoundVP);
-            extensions.registerInstruction ("playsound3d", "c", opcodePlaySound3D,
+            extensions.registerInstruction ("playsound3d", "cXX", opcodePlaySound3D,
                 opcodePlaySound3DExplicit);
             extensions.registerInstruction ("playsound3dvp", "cff", opcodePlaySound3DVP,
                 opcodePlaySound3DVPExplicit);

From ea0be6e737d29b60a987c301f1cfb66174b881ad Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Jan 2016 00:08:05 +0100
Subject: [PATCH 053/765] Update ScriptArgs documentation

---
 components/compiler/extensions.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/compiler/extensions.hpp b/components/compiler/extensions.hpp
index 9fb9bdb95a..2adf25a57d 100644
--- a/components/compiler/extensions.hpp
+++ b/components/compiler/extensions.hpp
@@ -20,9 +20,9 @@ namespace Compiler
         l - Integer <BR>
         s - Short <BR>
         S - String, case preserved <BR>
-        x - Optional, ignored string argument
-        X - Optional, ignored numeric expression
-        z - Optional, ignored string or numeric argument
+        x - Optional, ignored string argument. Emits a parser warning when this argument is supplied. <BR>
+        X - Optional, ignored numeric expression. Emits a parser warning when this argument is supplied. <BR>
+        z - Optional, ignored string or numeric argument. Emits a parser warning when this argument is supplied. <BR>
         j - A piece of junk (either . or a specific keyword)
     **/
     typedef std::string ScriptArgs;

From 0597c8fd9c748b0da4c6df76530e16176266d17d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Jan 2016 16:43:20 +0100
Subject: [PATCH 054/765] Pass a Vec4f by reference

---
 components/sceneutil/lightcontroller.cpp | 2 +-
 components/sceneutil/lightcontroller.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index 511937a282..e3ea93843c 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -125,7 +125,7 @@ namespace SceneUtil
         traverse(node, nv);
     }
 
-    void LightController::setDiffuse(osg::Vec4f color)
+    void LightController::setDiffuse(const osg::Vec4f& color)
     {
         mDiffuseColor = color;
     }
diff --git a/components/sceneutil/lightcontroller.hpp b/components/sceneutil/lightcontroller.hpp
index f6e2fa9faf..8f70af343d 100644
--- a/components/sceneutil/lightcontroller.hpp
+++ b/components/sceneutil/lightcontroller.hpp
@@ -24,7 +24,7 @@ namespace SceneUtil
 
         void setType(LightType type);
 
-        void setDiffuse(osg::Vec4f color);
+        void setDiffuse(const osg::Vec4f& color);
 
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
 

From daa94cc50e46038ffde0f93a816ccc5c0ff55af8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Jan 2016 18:20:34 +0100
Subject: [PATCH 055/765] Fix cppcheck warnings

---
 apps/essimporter/importer.cpp                       |  2 +-
 apps/mwiniimporter/importer.cpp                     | 10 ++++++++--
 apps/opencs/model/doc/loader.cpp                    |  3 +--
 apps/opencs/model/tools/magiceffectcheck.cpp        |  2 +-
 apps/opencs/model/tools/search.cpp                  |  9 +++++----
 apps/opencs/model/tools/soundgencheck.cpp           |  2 +-
 apps/opencs/model/world/nestedcoladapterimp.cpp     |  6 +++---
 apps/opencs/model/world/refidadapterimp.cpp         |  6 +++---
 apps/opencs/view/world/datadisplaydelegate.cpp      |  2 +-
 apps/opencs/view/world/datadisplaydelegate.hpp      |  2 +-
 apps/opencs/view/world/dialoguesubview.cpp          |  2 --
 apps/openmw/mwmechanics/aicombat.cpp                |  1 -
 apps/openmw/mwmechanics/aifollow.cpp                |  4 +++-
 apps/openmw/mwphysics/physicssystem.cpp             |  3 +++
 apps/openmw/mwrender/sky.cpp                        |  2 +-
 components/contentselector/model/contentmodel.cpp   |  3 +--
 components/contentselector/model/loadordererror.hpp |  7 ++-----
 components/myguiplatform/myguiplatform.hpp          |  3 +++
 components/nifosg/controller.cpp                    |  2 +-
 components/sceneutil/riggeometry.cpp                |  2 +-
 components/sceneutil/workqueue.cpp                  |  4 ++--
 21 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 4fbf062170..3d94f2b90d 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -54,7 +54,7 @@ namespace
                 *(image->data(x,y)+2) = *it++;
                 *(image->data(x,y)+1) = *it++;
                 *image->data(x,y) = *it++;
-                it++; // skip alpha
+                ++it; // skip alpha
             }
         }
 
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index f90ba4184f..f2fcdb711a 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,5 +1,6 @@
 #include "importer.hpp"
 
+#include <ctime>
 #include <iostream>
 #include <string>
 #include <map>
@@ -897,8 +898,13 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
         boost::filesystem::path resolved = filename;
 #endif
         writeTime = boost::filesystem::last_write_time(resolved);
-        std::cout << "content file: " << resolved << " timestamp = (" << writeTime <<
-            ") " << asctime(localtime(&writeTime)) << std::endl;
+
+        // print timestamp
+        const int size=1024;
+        char timeStrBuffer[size];
+        if (std::strftime(timeStrBuffer, size, "%x %X", localtime(&writeTime)) > 0)
+            std::cout << "content file: " << resolved << " timestamp = (" << writeTime <<
+                ") " << timeStrBuffer << std::endl;
     }
     else
     {
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index cb3ff2cd0f..166e6f3dbf 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -45,13 +45,12 @@ void CSMDoc::Loader::load()
 
     bool done = false;
 
-    const int batchingSize = 50;
-
     try
     {
         if (iter->second.mRecordsLeft)
         {
             Messages messages (Message::Severity_Error);
+            const int batchingSize = 50;
             for (int i=0; i<batchingSize; ++i) // do not flood the system with update signals
                 if (document->getData().continueLoading (messages))
                 {
diff --git a/apps/opencs/model/tools/magiceffectcheck.cpp b/apps/opencs/model/tools/magiceffectcheck.cpp
index 5435881b34..ab8b3b68bd 100644
--- a/apps/opencs/model/tools/magiceffectcheck.cpp
+++ b/apps/opencs/model/tools/magiceffectcheck.cpp
@@ -7,7 +7,7 @@
 
 namespace
 {
-    void addMessageIfNotEmpty(CSMDoc::Messages &messages, const CSMWorld::UniversalId &id, const std::string text)
+    void addMessageIfNotEmpty(CSMDoc::Messages &messages, const CSMWorld::UniversalId &id, const std::string& text)
     {
         if (!text.empty())
         {
diff --git a/apps/opencs/model/tools/search.cpp b/apps/opencs/model/tools/search.cpp
index 0409199afe..0c068ba119 100644
--- a/apps/opencs/model/tools/search.cpp
+++ b/apps/opencs/model/tools/search.cpp
@@ -120,24 +120,25 @@ QString CSMTools::Search::flatten (const QString& text) const
     return flat;
 }
 
-CSMTools::Search::Search() : mType (Type_None), mPaddingBefore (10), mPaddingAfter (10) {}
+CSMTools::Search::Search() : mType (Type_None), mValue (0), mIdColumn (0), mTypeColumn (0),
+    mPaddingBefore (10), mPaddingAfter (10) {}
 
 CSMTools::Search::Search (Type type, const std::string& value)
-: mType (type), mText (value), mPaddingBefore (10), mPaddingAfter (10)
+: mType (type), mText (value), mValue (0), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
 {
     if (type!=Type_Text && type!=Type_Id)
         throw std::logic_error ("Invalid search parameter (string)");
 }
 
 CSMTools::Search::Search (Type type, const QRegExp& value)
-: mType (type), mRegExp (value), mPaddingBefore (10), mPaddingAfter (10)
+: mType (type), mRegExp (value), mValue (0), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
 {
     if (type!=Type_TextRegEx && type!=Type_IdRegEx)
         throw std::logic_error ("Invalid search parameter (RegExp)");
 }
 
 CSMTools::Search::Search (Type type, int value)
-: mType (type), mValue (value), mPaddingBefore (10), mPaddingAfter (10)
+: mType (type), mValue (value), mIdColumn (0), mTypeColumn (0), mPaddingBefore (10), mPaddingAfter (10)
 {
     if (type!=Type_RecordState)
         throw std::logic_error ("invalid search parameter (int)");
diff --git a/apps/opencs/model/tools/soundgencheck.cpp b/apps/opencs/model/tools/soundgencheck.cpp
index bdf89f19d2..a36c494a1a 100644
--- a/apps/opencs/model/tools/soundgencheck.cpp
+++ b/apps/opencs/model/tools/soundgencheck.cpp
@@ -26,7 +26,7 @@ void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages &messages
         return;
     }
 
-    const ESM::SoundGenerator soundGen = record.get();
+    const ESM::SoundGenerator& soundGen = record.get();
     CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_SoundGen, soundGen.mId);
 
     if (!soundGen.mCreature.empty())
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index bfacc15dc9..92b4b9e624 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -277,7 +277,7 @@ namespace CSMWorld
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::iterator iter = reactions.begin();
         for(int i = 0; i < rowToRemove; ++i)
-            iter++;
+            ++iter;
         reactions.erase(iter);
 
         record.setModified (faction);
@@ -314,7 +314,7 @@ namespace CSMWorld
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::const_iterator iter = reactions.begin();
         for(int i = 0; i < subRowIndex; ++i)
-            iter++;
+            ++iter;
         switch (subColIndex)
         {
             case 0: return QString((*iter).first.c_str());
@@ -337,7 +337,7 @@ namespace CSMWorld
         // WARNING: Assumed that the table view has the same order as std::map
         std::map<std::string, int>::iterator iter = reactions.begin();
         for(int i = 0; i < subRowIndex; ++i)
-            iter++;
+            ++iter;
 
         std::string factionId = (*iter).first;
         int reaction = (*iter).second;
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 90a710fc89..039624c84b 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1153,7 +1153,7 @@ QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData (const RefIdCol
     const Record<ESM::Creature>& record =
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
-    const ESM::Creature creature = record.get();
+    const ESM::Creature& creature = record.get();
 
     if (subColIndex == 0)
         return subRowIndex;
@@ -1259,7 +1259,7 @@ QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData (const RefIdColumn
     const Record<ESM::Creature>& record =
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
-    const ESM::Creature creature = record.get();
+    const ESM::Creature& creature = record.get();
 
     if (subRowIndex < 0 || subRowIndex > 2 || subColIndex < 0 || subColIndex > 2)
         throw std::runtime_error ("index out of range");
@@ -1337,7 +1337,7 @@ QVariant CSMWorld::CreatureMiscRefIdAdapter::getNestedData (const RefIdColumn *c
     const Record<ESM::Creature>& record =
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
-    const ESM::Creature creature = record.get();
+    const ESM::Creature& creature = record.get();
 
     switch (subColIndex)
     {
diff --git a/apps/opencs/view/world/datadisplaydelegate.cpp b/apps/opencs/view/world/datadisplaydelegate.cpp
index 51d7137ec5..9db16d593e 100644
--- a/apps/opencs/view/world/datadisplaydelegate.cpp
+++ b/apps/opencs/view/world/datadisplaydelegate.cpp
@@ -140,7 +140,7 @@ void CSVWorld::DataDisplayDelegate::settingChanged (const CSMPrefs::Setting *set
 }
 
 
-void CSVWorld::DataDisplayDelegateFactory::add (int enumValue, QString enumName, QString iconFilename)
+void CSVWorld::DataDisplayDelegateFactory::add (int enumValue, const QString& enumName, const QString& iconFilename)
 {
     mIcons.push_back (std::make_pair(enumValue, QIcon(iconFilename)));
     EnumDelegateFactory::add(enumValue, enumName);
diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp
index cde109fd4c..540216d78a 100755
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@@ -83,7 +83,7 @@ namespace CSVWorld
 
     protected:
 
-       void add (int enumValue,const  QString enumName, const QString iconFilename);
+       void add (int enumValue, const QString& enumName, const QString& iconFilename);
 
     };
 
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 25bd8e8ee4..0a79aac2b1 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -674,8 +674,6 @@ void CSVWorld::EditWidget::remake(int row)
                     {
                         mNestedTableMapper->addMapping (editor, col);
 
-                        std::string disString = tree->nestedHeaderData (i, col,
-                                    Qt::Horizontal, Qt::DisplayRole).toString().toStdString();
                         // Need to use Qt::DisplayRole in order to get the  correct string
                         // from CSMWorld::Columns
                         QLabel* label = new QLabel (tree->nestedHeaderData (i, col,
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 3cea00e45b..3aeeedad1f 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -305,7 +305,6 @@ namespace MWMechanics
         else
         {
             distantCombat = (rangeAttack > 500);
-            weapRange = 150.f;
         }
 
         
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index d9356da93f..1430d42f20 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -129,12 +129,14 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
 
     float dist = distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]);
-    const float threshold = 10;
 
     if (storage.mMoving)  //Stop when you get close
         storage.mMoving = (dist > followDistance);
     else
+    {
+        const float threshold = 10;
         storage.mMoving = (dist > followDistance + threshold);
+    }
 
     if(!storage.mMoving)
     {
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index f6883ae35d..57bf7919a8 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -506,6 +506,9 @@ namespace MWPhysics
     private:
         btHeightfieldTerrainShape* mShape;
         btCollisionObject* mCollisionObject;
+
+        void operator=(const HeightField&);
+        HeightField(const HeightField&);
     };
 
     // --------------------------------------------------------------
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 20e3dc07c7..635116db0a 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -366,7 +366,7 @@ public:
         for (unsigned int i=0; i<colors->size(); ++i)
         {
             float alpha = 1.f;
-            if (mMeshType == 0) alpha = i%2 ? 0.f : 1.f; // this is a cylinder, so every second vertex belongs to the bottom-most row
+            if (mMeshType == 0) alpha = (i%2) ? 0.f : 1.f; // this is a cylinder, so every second vertex belongs to the bottom-most row
             else if (mMeshType == 1)
             {
                 if (i>= 49 && i <= 64) alpha = 0.f; // bottom-most row
diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 8dc4351f6d..26f0a48069 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -110,12 +110,11 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
     bool gamefileChecked = (file->gameFiles().count() == 0);
     foreach (const QString &fileName, file->gameFiles())
     {
-        bool depFound = false;
         foreach (EsmFile *dependency, mFiles)
         {
             //compare filenames only.  Multiple instances
             //of the filename (with different paths) is not relevant here.
-            depFound = (dependency->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
+            bool depFound = (dependency->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
 
             if (!depFound)
                 continue;
diff --git a/components/contentselector/model/loadordererror.hpp b/components/contentselector/model/loadordererror.hpp
index 2b840cf69b..7067f1f22c 100644
--- a/components/contentselector/model/loadordererror.hpp
+++ b/components/contentselector/model/loadordererror.hpp
@@ -17,12 +17,9 @@ namespace ContentSelectorModel
             ErrorCode_LoadOrder          = 3
         };
 
-        inline LoadOrderError() : mErrorCode(ErrorCode_None) {};
+        inline LoadOrderError() : mErrorCode(ErrorCode_None) {}
         inline LoadOrderError(ErrorCode errorCode, QString fileName)
-        {
-            mErrorCode = errorCode;
-            mFileName = fileName;
-        }
+            : mErrorCode(errorCode), mFileName(fileName) {}
         inline ErrorCode errorCode() const { return mErrorCode; }
         inline QString fileName() const { return mFileName; }
         QString toolTip() const;
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index 56562e12a6..90d45ce204 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -47,6 +47,9 @@ namespace osgMyGUI
         DataManager* mDataManager;
         MyGUI::LogManager* mLogManager;
         LogFacility* mLogFacility;
+
+        void operator=(const Platform&);
+        Platform(const Platform&);
     };
 
 }
diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index 28f61e4b6c..d0abc9ead2 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -258,7 +258,7 @@ void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
         mat.setTrans(uTrans, vTrans, 0);
 
         // setting once is enough because all other texture units share the same TexMat (see setDefaults).
-        if (mTextureUnits.size())
+        if (!mTextureUnits.empty())
         {
             osg::TexMat* texMat = static_cast<osg::TexMat*>(stateset->getTextureAttribute(*mTextureUnits.begin(), osg::StateAttribute::TEXMAT));
             texMat->setMatrix(mat);
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 88b907fafa..be8d97a4cb 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -177,7 +177,7 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
         }
     }
 
-    for (Vertex2BoneMap::iterator it = vertex2BoneMap.begin(); it != vertex2BoneMap.end(); it++)
+    for (Vertex2BoneMap::iterator it = vertex2BoneMap.begin(); it != vertex2BoneMap.end(); ++it)
     {
         mBone2VertexMap[it->second].push_back(it->first);
     }
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index b642687f0f..26a392be45 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -59,7 +59,7 @@ WorkQueue::~WorkQueue()
 {
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
-        while (mQueue.size())
+        while (!mQueue.empty())
         {
             WorkItem* item = mQueue.front();
             delete item;
@@ -88,7 +88,7 @@ osg::ref_ptr<WorkTicket> WorkQueue::addWorkItem(WorkItem *item)
 WorkItem *WorkQueue::removeWorkItem()
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
-    while (!mQueue.size() && !mIsReleased)
+    while (mQueue.empty() && !mIsReleased)
     {
         mCondition.wait(&mMutex);
     }

From 6c676c861cad886b04f1da9c129e6b27315b6ea0 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 4 Jan 2016 18:03:47 +0100
Subject: [PATCH 056/765] increased version number

---
 CMakeLists.txt | 2 +-
 README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afe3ce4b70..f5422a1677 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 37)
+set(OPENMW_VERSION_MINOR 38)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
diff --git a/README.md b/README.md
index f353cd76ef..9cfb0440db 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ OpenMW is a recreation of the engine for the popular role-playing game Morrowind
 
 OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
 
-* Version: 0.37.0
+* Version: 0.38.0
 * License: GPL (see docs/license/GPL3.txt for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net

From fde831e2e03281b1461e317318ebb1be82785e00 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 4 Jan 2016 18:21:30 +0100
Subject: [PATCH 057/765] updated changelog

---
 CHANGELOG.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43e598566c..de4a6fc248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,77 @@
+0.38.0
+------
+
+    Bug #1699: Guard will continuously run into mudcrab
+    Bug #1934: Saw in Dome of Kasia doesnt harm the player
+    Bug #1962: Rat floats when killed near the door
+    Bug #1963: Kwama eggsacks pulse too fast
+    Bug #2198: NPC voice sound source should be placed at their head
+    Bug #2210: OpenMW installation wizard crashes...
+    Bug #2211: Editor: handle DELE subrecord at the end of a record
+    Bug #2413: ESM error Unknown subrecord in Grandmaster of Hlaalu
+    Bug #2537: Bloodmoon quest Ristaag: Sattir not consistently dying, plot fails to advance; same with Grerid
+    Bug #2697: "The Swimmer" moves away after leading you to underwater cave
+    Bug #2724: Loading previous save duplicates containers and harvestables
+    Bug #2769: Inventory doll - Cursor not respecting order of clothes
+    Bug #2865: Scripts silently fail when moving NPCs between cells.
+    Bug #2873: Starting a new game leads to CTD / Fatal Error
+    Bug #2918: Editor: it's not possible to create an omwaddon containing a dot in the file name
+    Bug #2933: Dialog box can't disable a npc if it is in another cell. (Rescue Madura Seran).
+    Bug #2942: atronach sign behavior (spell absorption) changes when trying to receive a blessing at "shrine of tribunal"
+    Bug #2952: Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
+    Bug #2961: ESM Error: Unknown subrecord if Deus Ex Machina mod is loaded
+    Bug #2972: Resurrecting the player via console does not work when health was 0
+    Bug #2986: Projectile weapons work underwater
+    Bug #2988: "Expected subrecord" bugs showing up.
+    Bug #2991: Can't use keywords in strings for MessageBox
+    Bug #2993: Tribunal:The Shrine of the Dead – Urvel Dulni can't stop to follow the player.
+    Bug #3008: NIFFile Error while loading meshes with a NiLODNode
+    Bug #3010: Engine: items should sink to the ground when dropped under water
+    Bug #3011: NIFFile Error while loading meshes with a NiPointLight
+    Bug #3016: Engine: something wrong with scripting - crash / fatal error
+    Bug #3020: Editor: verify does not check if given "item ID" (as content) for a "container" exists
+    Bug #3026: [MOD: Julan Ashlander Companion] Dialogue not triggering correctly
+    Bug #3028: Tooltips for Health, Magicka and Fatigue show in Options menu even when bars aren't visible
+    Bug #3034: Item count check dialogue option doesn't work (Guards accept gold even if you don't have enough)
+    Bug #3036: Owned tooltip color affects spell tooltips incorrrectly
+    Bug #3037: Fatal error loading old ES_Landscape.esp in Store<ESM::LandTexture>::search
+    Bug #3038: Player sounds come from underneath
+    Bug #3040: Execution of script failed: There is a message box already
+    Bug #3047: [MOD: Julan Ashlander Companion] Scripts KS_Bedscript or KS_JulanNight not working as intended
+    Bug #3048: Fatal Error
+    Bug #3051: High field of view results in first person rendering glitches
+    Bug #3053: Crash on new game at character class selection
+    Bug #3058: Physiched sleeves aren't rendered correctly.
+    Bug #3060: NPCs use wrong landing sound
+    Bug #3062: Mod support regression: Andromeda's fast travel.
+    Bug #3063: Missing Journal Textures without Tribunal and Bloodmoon installed
+    Bug #3077: repeated aifollow causes the distance to stack
+    Bug #3078: Creature Dialogues not showing when certain Function/Conditions are required.
+    Bug #3082: Crash when entering Holamayan Monastery with mesh replacer installed
+    Bug #3086: Party at Boro's House – Creature with Class don't talk under OpenMW
+    Bug #3089: Dreamers spawn too soon
+    Bug #3100: Certain controls erroneously work as a werewolf
+    Bug #3102: Multiple unique soultrap spell sources clone souls.
+    Bug #3105: Summoned creatures and objects disappear at midnight
+    Bug #3112: gamecontrollerdb file creation with wrong extension
+    Bug #3116: Dialogue Function "Same Race" is avoided
+    Bug #3117: Dialogue Bug: Choice conditions are tested when not in a choice
+    Bug #3118: Body Parts are not rendered when used in a pose.
+    Bug #3122: NPC direction is reversed during sneak awareness check
+    Feature #776: Sound effects from one direction don't necessarily affect both speakers in stereo
+    Feature #858: Different fov settings for hands and the game world
+    Feature #1176: Handle movement of objects between cells
+    Feature #2507: Editor: choosing colors for syntax highlighting
+    Feature #2867: Editor: hide script error list when there are no errors
+    Feature #2885: Accept a file format other than nif
+    Feature #2982: player->SetDelete 1 results in: PC can't move, menu can be opened
+    Feature #2996: Editor: make it possible to preset the height of the script check area in a script view
+    Feature #3014: Editor: Tooltips in 3D scene
+    Feature #3064: Werewolf field of view
+    Feature #3074: Quicksave indicator
+    Task #287: const version of Ptr
+    Task #2542: Editor: redo user settings system
+
 0.37.0
 ------
 

From e6619c5306a5305a5aebb2bc5a17db5538162391 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 4 Jan 2016 20:27:38 +0100
Subject: [PATCH 058/765] Rebuild actor animations on resurrection (Fixes
 #3124)

A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
---
 apps/openmw/mwscript/statsextensions.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index cdf60d3298..d5b64b7d73 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1125,10 +1125,16 @@ namespace MWScript
                         ptr.getClass().getCreatureStats(ptr).resurrect();
                     else if (ptr.getClass().getCreatureStats(ptr).isDead())
                     {
+                        bool wasEnabled = ptr.getRefData().isEnabled();
                         MWBase::Environment::get().getWorld()->undeleteObject(ptr);
-                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
                         MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
+
+                        // HACK: disable/enable object to re-add it to the scene properly (need a new Animation).
+                        MWBase::Environment::get().getWorld()->disable(ptr);
+                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
                         ptr.getRefData().setCustomData(NULL);
+                        if (wasEnabled)
+                            MWBase::Environment::get().getWorld()->enable(ptr);
                     }
                 }
         };

From 446c7147270ee69148a82d431309fdd3f8b458ce Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 4 Jan 2016 20:39:08 +0100
Subject: [PATCH 059/765] Fix a possible memory leak in error case

---
 apps/openmw/mwrender/npcanimation.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 4e367b3b18..a032896a71 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -352,13 +352,13 @@ public:
     virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
     {
         osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
-        osg::RefMatrix* projectionMatrix = new osg::RefMatrix(*cv->getProjectionMatrix());
         float fov, aspect, zNear, zFar;
-        if (projectionMatrix->getPerspective(fov, aspect, zNear, zFar))
+        if (cv->getProjectionMatrix()->getPerspective(fov, aspect, zNear, zFar))
         {
             fov = mFov;
-            projectionMatrix->makePerspective(fov, aspect, zNear, zFar);
-            cv->pushProjectionMatrix(projectionMatrix);
+            osg::RefMatrix* newProjectionMatrix = new osg::RefMatrix(*cv->getProjectionMatrix());
+            newProjectionMatrix->makePerspective(fov, aspect, zNear, zFar);
+            cv->pushProjectionMatrix(newProjectionMatrix);
             traverse(node, nv);
             cv->popProjectionMatrix();
         }

From 48f4fc34eba0386d53f19507ed423cfeeb6c6e8f Mon Sep 17 00:00:00 2001
From: sandstranger <sandstranger@gmail.com>
Date: Tue, 5 Jan 2016 15:37:17 +0300
Subject: [PATCH 060/765] build fixes for Android

---
 CMakeLists.txt        |  6 +++++-
 cmake/FindMyGUI.cmake | 11 ++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afe3ce4b70..fd7e3d564d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,11 @@ endif (APPLE)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
+if (ANDROID)
+    set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
+    set (OSG_PLUGINS_DIR CACHE STRING "")
+endif()
+
 # Version
 message(STATUS "Configuring OpenMW...")
 
@@ -157,7 +162,6 @@ if (WIN32)
 endif()
 
 if (ANDROID)
-    set(CMAKE_FIND_ROOT_PATH ${OPENMW_DEPENDENCIES_DIR} "${CMAKE_FIND_ROOT_PATH}")
     set(OPENGL_ES TRUE CACHE BOOL "enable opengl es support for android" FORCE)
 endif (ANDROID)
 
diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
index 6e93a92ce6..61a39e4d3a 100644
--- a/cmake/FindMyGUI.cmake
+++ b/cmake/FindMyGUI.cmake
@@ -71,7 +71,7 @@ ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
     IF(MYGUI_STATIC)
         # don't use pkgconfig on OS X, find freetype & append it's libs to resulting MYGUI_LIBRARIES
-        IF (NOT APPLE)
+        IF (NOT APPLE AND NOT ANDROID)
             PKG_SEARCH_MODULE(MYGUI MYGUIStatic MyGUIStatic)
             IF (MYGUI_INCLUDE_DIRS)
                 SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS})
@@ -84,15 +84,15 @@ ELSE (WIN32) #Unix
                 STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
                 STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
             ENDIF (MYGUI_INCLUDE_DIRS)
-        ELSE (NOT APPLE)
+        ELSE (NOT APPLE AND NOT ANDROID)
             SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${MYGUI_DEPENDENCIES_DIR})
-            FIND_PACKAGE(freetype)
+            FIND_PACKAGE(Freetype REQUIRED)
             FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngineStatic PATHS /usr/lib /usr/local/lib)
+            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngineStatic PATHS /usr/lib /usr/local/lib ${OPENMW_DEPENDENCIES_DIR})
             SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
             STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
             STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")
-        ENDIF (NOT APPLE)
+        ENDIF (NOT APPLE AND NOT ANDROID)
     ELSE(MYGUI_STATIC)
         PKG_SEARCH_MODULE(MYGUI MYGUI MyGUI)
         IF (MYGUI_INCLUDE_DIRS)
@@ -109,6 +109,7 @@ ELSE (WIN32) #Unix
     ENDIF(MYGUI_STATIC)
 ENDIF (WIN32)
 
+
 #Do some preparation
 IF (NOT WIN32) # This does not work on Windows for paths with spaces in them
 	SEPARATE_ARGUMENTS(MYGUI_INCLUDE_DIRS)

From 5952498e9e747dc8d7dc1a62866abbace2698cab Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 5 Jan 2016 16:53:51 +0100
Subject: [PATCH 061/765] Explicitely cast a size_t to int

---
 apps/openmw/mwgui/dialogue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index d325886316..040cd6d651 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -547,7 +547,7 @@ namespace MWGui
 
     void DialogueWindow::onScrollbarMoved(MyGUI::ScrollBar *sender, size_t pos)
     {
-        mHistory->setPosition(0, pos * -1);
+        mHistory->setPosition(0, static_cast<int>(pos) * -1);
     }
 
     void DialogueWindow::addResponse(const std::string &text, const std::string &title)

From d9d6228c94ac961fc98b4e214efe30f0882d79db Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 5 Jan 2016 16:54:09 +0100
Subject: [PATCH 062/765] Implement PageDisplay::_updateView (Fixes #3125)

---
 apps/openmw/mwgui/bookpage.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index b728b748f7..fe1e6aa0c1 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1222,6 +1222,11 @@ public:
 
     void _updateView ()
     {
+        _checkMargin();
+
+        if (mNode != NULL)
+            for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)
+                mNode->outOfDate (i->second->mRenderItem);
     }
 
     void _correctView()

From 745b29a99509197b0c0842403697f366b2a8b439 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 5 Jan 2016 17:01:21 +0100
Subject: [PATCH 063/765] Remove a debugging leftover

---
 apps/openmw/mwgui/bookpage.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index fe1e6aa0c1..8506f04edf 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1153,8 +1153,6 @@ public:
 
     void createDrawItem(MyGUI::ITexture* texture, MyGUI::ILayerNode* node)
     {
-        //test ();
-
         mNode = node;
 
         for (ActiveTextFormats::iterator i = mActiveTextFormats.begin (); i != mActiveTextFormats.end (); ++i)

From 466f91db673b6c58864228b49ae62224a3ab3381 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 6 Jan 2016 13:10:09 +0100
Subject: [PATCH 064/765] Fixed wrong GMST name for newly created game files
 (Fixes #3132)

---
 apps/opencs/model/doc/document.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 0e2d4e7d1a..8cafa7ae1f 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -1481,7 +1481,7 @@ void CSMDoc::Document::addGmsts()
         "sMagicWingedTwilightID",
         "sMagnitude",
         "sMagnitudeDes",
-        "sMake",
+        "sMake Enchantment",
         "sMap",
         "sMaster",
         "sMastPlugMismatchMsg",

From 210c77968a6542b401a8784c424b1b5935f631af Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 7 Jan 2016 15:38:23 +0100
Subject: [PATCH 065/765] Don't report warning about extra arguments, if there
 are no extra arguments (Fixes #3133)

---
 components/compiler/exprparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index d35b081677..c739048a61 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -791,7 +791,7 @@ namespace Compiler
                 if (*iter=='c') stringParser.smashCase();
                 scanner.scan (stringParser);
 
-                if (optional && stringParser.isEmpty())
+                if ((optional || *iter=='x') && stringParser.isEmpty())
                     break;
 
                 if (*iter!='x')

From f9607a47b319afcb4f02c51bf0ae3c57104b3119 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 7 Jan 2016 15:54:22 +0100
Subject: [PATCH 066/765] improved handling of extra arguments in StringParser

---
 components/compiler/exprparser.cpp   |  4 +++-
 components/compiler/stringparser.cpp | 27 ++++++++++++++++++++++-----
 components/compiler/stringparser.hpp | 11 +++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index c739048a61..37c20527ef 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -789,6 +789,7 @@ namespace Compiler
                     stringParser.setOptional (true);
 
                 if (*iter=='c') stringParser.smashCase();
+                if (*iter=='x') stringParser.discard();
                 scanner.scan (stringParser);
 
                 if ((optional || *iter=='x') && stringParser.isEmpty())
@@ -805,7 +806,8 @@ namespace Compiler
                         ++optionalCount;
                 }
                 else
-                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
+                    getErrorHandler().warning ("Ignoring extra argument",
+                        stringParser.getTokenLoc());
             }
             else if (*iter=='X')
             {
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index f8798eccd4..8041b0f024 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -13,7 +13,7 @@
 namespace Compiler
 {
     StringParser::StringParser (ErrorHandler& errorHandler, const Context& context, Literals& literals)
-    : Parser (errorHandler, context), mLiterals (literals), mState (StartState), mSmashCase (false)
+    : Parser (errorHandler, context), mLiterals (literals), mState (StartState), mSmashCase (false), mDiscard (false)
     {
 
     }
@@ -24,10 +24,15 @@ namespace Compiler
         if (mState==StartState || mState==CommaState)
         {
             start();
-            if (mSmashCase)
-                Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
-            else
-                Generator::pushString (mCode, mLiterals, name);
+            mTokenLoc = loc;
+
+            if (!mDiscard)
+            {
+                if (mSmashCase)
+                    Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
+                else
+                    Generator::pushString (mCode, mLiterals, name);
+            }
 
             return false;
         }
@@ -75,6 +80,8 @@ namespace Compiler
         mState = StartState;
         mCode.clear();
         mSmashCase = false;
+        mTokenLoc = TokenLoc();
+        mDiscard = false;
         Parser::reset();
     }
 
@@ -82,4 +89,14 @@ namespace Compiler
     {
         mSmashCase = true;
     }
+
+    const TokenLoc& StringParser::getTokenLoc() const
+    {
+        return mTokenLoc;
+    }
+
+    void StringParser::discard()
+    {
+        mDiscard = true;
+    }
 }
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index 52469128fd..72dab05801 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -6,6 +6,7 @@
 #include <components/interpreter/types.hpp>
 
 #include "parser.hpp"
+#include "tokenloc.hpp"
 
 namespace Compiler
 {
@@ -22,6 +23,8 @@ namespace Compiler
             State mState;
             std::vector<Interpreter::Type_Code> mCode;
             bool mSmashCase;
+            TokenLoc mTokenLoc;
+            bool mDiscard;
 
         public:
 
@@ -48,6 +51,14 @@ namespace Compiler
 
             void reset();
             ///< Reset parser to clean state (this includes the smashCase function).
+
+            /// Returns TokenLoc object for string. If no string has been parsed, the TokenLoc
+            /// object will be default initialised.
+            const TokenLoc& getTokenLoc() const;
+
+            /// If parsing a string, do not add it to the literal table and do not create code
+            /// for it.
+            void discard();
     };
 }
 

From 46e32de3501d170887d8d91bda62030e1f89d058 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 7 Jan 2016 16:01:01 +0100
Subject: [PATCH 067/765] improved handling of extra arguments in DiscardParser

---
 components/compiler/discardparser.cpp | 25 +++++++++++++++++++++++++
 components/compiler/discardparser.hpp |  7 ++++++-
 components/compiler/exprparser.cpp    |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/components/compiler/discardparser.cpp b/components/compiler/discardparser.cpp
index da114fb3dd..0e7c4718cb 100644
--- a/components/compiler/discardparser.cpp
+++ b/components/compiler/discardparser.cpp
@@ -14,6 +14,9 @@ namespace Compiler
     {
         if (mState==StartState || mState==CommaState || mState==MinusState)
         {
+            if (isEmpty())
+                mTokenLoc = loc;
+
             start();
             return false;
         }
@@ -25,6 +28,9 @@ namespace Compiler
     {
         if (mState==StartState || mState==CommaState || mState==MinusState)
         {
+            if (isEmpty())
+                mTokenLoc = loc;
+
             start();
             return false;
         }
@@ -37,6 +43,9 @@ namespace Compiler
     {
         if (mState==StartState || mState==CommaState)
         {
+            if (isEmpty())
+                mTokenLoc = loc;
+
             start();
             return false;
         }
@@ -48,12 +57,22 @@ namespace Compiler
     {
         if (code==Scanner::S_comma && mState==StartState)
         {
+            if (isEmpty())
+                mTokenLoc = loc;
+
+            start();
+
             mState = CommaState;
             return true;
         }
 
         if (code==Scanner::S_minus && (mState==StartState || mState==CommaState))
         {
+            if (isEmpty())
+                mTokenLoc = loc;
+
+            start();
+
             mState = MinusState;
             return true;
         }
@@ -64,6 +83,12 @@ namespace Compiler
     void DiscardParser::reset()
     {
         mState = StartState;
+        mTokenLoc = TokenLoc();
         Parser::reset();
     }
+
+    const TokenLoc& DiscardParser::getTokenLoc() const
+    {
+        return mTokenLoc;
+    }
 }
diff --git a/components/compiler/discardparser.hpp b/components/compiler/discardparser.hpp
index bee8a87bb2..2a7ed5544d 100644
--- a/components/compiler/discardparser.hpp
+++ b/components/compiler/discardparser.hpp
@@ -2,6 +2,7 @@
 #define COMPILER_DISCARDPARSER_H_INCLUDED
 
 #include "parser.hpp"
+#include "tokenloc.hpp"
 
 namespace Compiler
 {
@@ -14,6 +15,7 @@ namespace Compiler
             };
 
             State mState;
+            TokenLoc mTokenLoc;
 
         public:
 
@@ -38,8 +40,11 @@ namespace Compiler
 
             virtual void reset();
             ///< Reset parser to clean state.
+
+            /// Returns TokenLoc object for value. If no value has been parsed, the TokenLoc
+            /// object will be default initialised.
+            const TokenLoc& getTokenLoc() const;
     };
 }
 
 #endif
-
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 37c20527ef..7c61ad0ee5 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -832,7 +832,7 @@ namespace Compiler
                 if (discardParser.isEmpty())
                     break;
                 else
-                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
+                    getErrorHandler().warning("Ignoring extra argument", discardParser.getTokenLoc());
             }
             else if (*iter=='j')
             {

From ece40b1e96661c21a277d42349fd6b0cd28c5d86 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 7 Jan 2016 16:07:49 +0100
Subject: [PATCH 068/765] improved the remaining handling of extra arguments

---
 components/compiler/exprparser.cpp | 10 ++++++++--
 components/compiler/exprparser.hpp |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 7c61ad0ee5..0c8220e974 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -639,7 +639,8 @@ namespace Compiler
         if (code==Scanner::S_newline)
         {
             // end marker
-            mTokenLoc = loc;
+            if (mTokenLoc.mLiteral.empty())
+                mTokenLoc = loc;
             scanner.putbackSpecial (code, loc);
             return false;
         }
@@ -820,7 +821,7 @@ namespace Compiler
                 if (parser.isEmpty())
                     break;
                 else
-                    getErrorHandler().warning("Ignoring extra argument", mTokenLoc);
+                    getErrorHandler().warning("Ignoring extra argument", parser.getTokenLoc());
             }
             else if (*iter=='z')
             {
@@ -878,4 +879,9 @@ namespace Compiler
 
         return optionalCount;
     }
+
+    const TokenLoc& ExprParser::getTokenLoc() const
+    {
+        return mTokenLoc;
+    }
 }
diff --git a/components/compiler/exprparser.hpp b/components/compiler/exprparser.hpp
index 639ca65aab..dd8259ee17 100644
--- a/components/compiler/exprparser.hpp
+++ b/components/compiler/exprparser.hpp
@@ -103,6 +103,8 @@ namespace Compiler
             /// \param invert Store arguments in reverted order.
             /// \param ignoreKeyword A keyword that is seen as junk
             /// \return number of optional arguments
+
+            const TokenLoc& getTokenLoc() const;
     };
 }
 

From 7dd7be7f0ec646a8691877ad0e51defd103f00a5 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 10 Jan 2016 08:56:15 +0100
Subject: [PATCH 069/765] make scenes drop target for referenceables

---
 apps/opencs/view/render/instancemode.cpp      | 84 +++++++++++++++++++
 apps/opencs/view/render/instancemode.hpp      |  4 +
 .../view/render/pagedworldspacewidget.cpp     | 11 +++
 .../view/render/pagedworldspacewidget.hpp     |  2 +
 .../view/render/unpagedworldspacewidget.cpp   |  5 ++
 .../view/render/unpagedworldspacewidget.hpp   |  2 +
 apps/opencs/view/render/worldspacewidget.cpp  | 48 +++++++++++
 apps/opencs/view/render/worldspacewidget.hpp  | 13 +++
 8 files changed, 169 insertions(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index a4d147bb4d..6c3593369c 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -1,8 +1,13 @@
 
 #include "instancemode.hpp"
 
+#include <QDragEnterEvent>
+
 #include "../../model/prefs/state.hpp"
 
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/commands.hpp"
+
 #include "elements.hpp"
 #include "object.hpp"
 #include "worldspacewidget.hpp"
@@ -55,3 +60,82 @@ void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
         }
     }
 }
+
+void CSVRender::InstanceMode::dragEnterEvent (QDragEnterEvent *event)
+{
+    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
+    {
+        if (!mime->fromDocument (getWorldspaceWidget().getDocument()))
+            return;
+
+        /// \todo document check
+        if (mime->holdsType (CSMWorld::UniversalId::Type_Referenceable))
+            event->accept();
+    }
+}
+
+void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
+{
+    if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
+    {
+        CSMDoc::Document& document = getWorldspaceWidget().getDocument();
+
+        if (!mime->fromDocument (document))
+            return;
+
+        osg::Vec3f insertPoint = getWorldspaceWidget().getIntersectionPoint (event->pos());
+
+        std::string cellId = getWorldspaceWidget().getCellId (insertPoint);
+
+        bool dropped = false;
+
+        std::vector<CSMWorld::UniversalId> ids = mime->getData();
+
+        CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&> (
+            *document.getData().getTableModel (CSMWorld::UniversalId::Type_References));
+
+        CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
+            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+
+        for (std::vector<CSMWorld::UniversalId>::const_iterator iter (ids.begin());
+            iter!=ids.end(); ++iter)
+            if (mime->isReferencable (iter->getType()))
+            {
+                // create reference
+                std::auto_ptr<CSMWorld::CreateCommand> createCommand (
+                    new CSMWorld::CreateCommand (
+                    referencesTable, document.getData().getReferences().getNewId()));
+
+                 createCommand->addValue (referencesTable.findColumnIndex (
+                     CSMWorld::Columns::ColumnId_Cell), QString::fromUtf8 (cellId.c_str()));
+                 createCommand->addValue (referencesTable.findColumnIndex (
+                     CSMWorld::Columns::ColumnId_PositionXPos), insertPoint.x());
+                 createCommand->addValue (referencesTable.findColumnIndex (
+                     CSMWorld::Columns::ColumnId_PositionYPos), insertPoint.y());
+                 createCommand->addValue (referencesTable.findColumnIndex (
+                     CSMWorld::Columns::ColumnId_PositionZPos), insertPoint.z());
+                 createCommand->addValue (referencesTable.findColumnIndex (
+                     CSMWorld::Columns::ColumnId_ReferenceableId),
+                     QString::fromUtf8 (iter->getId().c_str()));
+
+                // increase reference count in cell
+                QModelIndex countIndex = cellTable.getModelIndex (cellId,
+                    cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter));
+
+                int count = cellTable.data (countIndex).toInt();
+
+                std::auto_ptr<CSMWorld::ModifyCommand> incrementCommand (
+                    new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
+
+                document.getUndoStack().beginMacro (createCommand->text());
+                document.getUndoStack().push (createCommand.release());
+                document.getUndoStack().push (incrementCommand.release());
+                document.getUndoStack().endMacro();
+
+                dropped = true;
+            }
+
+        if (dropped)
+            event->accept();
+    }
+}
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 66451bd996..7649c241ca 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -20,6 +20,10 @@ namespace CSVRender
             virtual void primarySelectPressed (osg::ref_ptr<TagBase> tag);
 
             virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
+
+            virtual void dragEnterEvent (QDragEnterEvent *event);
+
+            virtual void dropEvent (QDropEvent* event);
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index dae5990e6f..e30f238a29 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -504,6 +504,17 @@ void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
+{
+    const int cellSize = 8192;
+
+    CSMWorld::CellCoordinates cellCoordinates (
+        static_cast<int> (std::floor (point.x()/cellSize)),
+        static_cast<int> (std::floor (point.y()/cellSize)));
+
+    return cellCoordinates.getId (mWorldspace);
+}
+
 CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index e983fddd55..bc8e0da646 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -96,6 +96,8 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            virtual std::string getCellId (const osg::Vec3f& point) const;
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 68f068daca..701f508253 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -108,6 +108,11 @@ void CSVRender::UnpagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
+{
+    return mCellId;
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 9e6fa97f43..70a20c216d 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -46,6 +46,8 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            virtual std::string getCellId (const osg::Vec3f& point) const;
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index f0d3986414..0383b0bcfa 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -315,6 +315,54 @@ CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
     return mDocument;
 }
 
+osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& localPos,
+    unsigned int interactionMask, bool ignoreHidden) const
+{
+    // (0,0) is considered the lower left corner of an OpenGL window
+    int x = localPos.x();
+    int y = height() - localPos.y();
+
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (
+        new osgUtil::LineSegmentIntersector (osgUtil::Intersector::WINDOW, x, y));
+
+    intersector->setIntersectionLimit (osgUtil::LineSegmentIntersector::NO_LIMIT);
+    osgUtil::IntersectionVisitor visitor (intersector);
+
+    unsigned int mask = interactionMask;
+
+    if (ignoreHidden)
+        mask &= getVisibilityMask();
+
+    visitor.setTraversalMask (mask << 1);
+
+    mView->getCamera()->accept (visitor);
+
+    for (osgUtil::LineSegmentIntersector::Intersections::iterator iter = intersector->getIntersections().begin();
+         iter!=intersector->getIntersections().end(); ++iter)
+    {
+        // reject back-facing polygons
+        osg::Vec3f normal = osg::Matrix::transform3x3 (
+            iter->getWorldIntersectNormal(), mView->getCamera()->getViewMatrix());
+
+        if (normal.z()>=0)
+            return iter->getWorldIntersectPoint();
+    }
+
+    osg::Matrixd matrix;
+    matrix.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
+    matrix.preMult (mView->getCamera()->getProjectionMatrix());
+    matrix.preMult (mView->getCamera()->getViewMatrix());
+    matrix = osg::Matrixd::inverse (matrix);
+
+    osg::Vec3d start = matrix.preMult (intersector->getStart());
+    osg::Vec3d end = matrix.preMult (intersector->getEnd());
+
+    osg::Vec3d direction = end-start;
+    direction.normalize();
+
+    return start+direction * 50;
+}
+
 void CSVRender::WorldspaceWidget::dragEnterEvent (QDragEnterEvent* event)
 {
     const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 54376cee45..0edf9f0b29 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -127,6 +127,19 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask) = 0;
 
+            /// Return the next intersection point with scene elements matched by
+            /// \a interactionMask based on \a localPos and the camera vector.
+            /// If there is no such point, instead a point "in front" of \a localPos will be
+            /// returned.
+            ///
+            /// \param ignoreHidden ignore elements specified in interactionMask that are
+            /// flagged as not visible.
+            osg::Vec3f getIntersectionPoint (const QPoint& localPos,
+                unsigned int interactionMask = Element_Reference | Element_Terrain,
+                bool ignoreHidden = false) const;
+
+            virtual std::string getCellId (const osg::Vec3f& point) const = 0;
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);

From 5b9d6cce989720aa65828bcba8e13b78d10758af Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 11 Jan 2016 09:03:02 +0100
Subject: [PATCH 070/765] made drop distance configurable

---
 apps/opencs/model/prefs/state.cpp            | 5 +++++
 apps/opencs/view/render/worldspacewidget.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 8b827d0a2b..d2ad0f6ef2 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -190,6 +190,11 @@ void CSMPrefs::State::declare()
     declareBool ("scene-hide-basic", "Hide basic  3D scenes tooltips", false);
     declareInt ("scene-delay", "Tooltip delay in milliseconds", 500).
         setMin (1);
+
+    declareCategory ("Scene Drops");
+    declareInt ("distance", "Drop Distance", 50).
+        setTooltip ("If an instance drop can not be placed against another object at the "
+            "insert point, it will be placed by this distance from the insert point instead");
 }
 
 void CSMPrefs::State::declareCategory (const std::string& key)
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 0383b0bcfa..5361266897 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -360,7 +360,7 @@ osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& loca
     osg::Vec3d direction = end-start;
     direction.normalize();
 
-    return start+direction * 50;
+    return start + direction * CSMPrefs::get()["Scene Drops"]["distance"].toInt();
 }
 
 void CSVRender::WorldspaceWidget::dragEnterEvent (QDragEnterEvent* event)

From 190bf158878943f7ad358b8caed706f4f2b02fe7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 5 Jan 2016 22:37:36 +0100
Subject: [PATCH 071/765] SettingsWindow: support auto-updating of slider
 labels through the layout file

---
 apps/openmw/mwgui/settingswindow.cpp      | 53 ++++++++++-------------
 apps/openmw/mwgui/settingswindow.hpp      |  5 +--
 files/mygui/openmw_settings_window.layout |  7 ++-
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index fbfbd0e702..86ecd9dfb0 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -130,12 +130,14 @@ namespace MWGui
             if (type == sliderType)
             {
                 MyGUI::ScrollBar* scroll = current->castType<MyGUI::ScrollBar>();
+                std::string valueStr;
                 if (getSettingValueType(current) == "Float")
                 {
                     // TODO: ScrollBar isn't meant for this. should probably use a dedicated FloatSlider widget
                     float min,max;
                     getSettingMinMax(scroll, min, max);
                     float value = Settings::Manager::getFloat(getSettingName(current), getSettingCategory(current));
+                    valueStr = MyGUI::utility::toString((int)value);
                     value = std::max(min, std::min(value, max));
                     value = (value-min)/(max-min);
 
@@ -144,15 +146,30 @@ namespace MWGui
                 else
                 {
                     int value = Settings::Manager::getInt(getSettingName(current), getSettingCategory(current));
+                    valueStr = MyGUI::utility::toString(value);
                     scroll->setScrollPosition(value);
                 }
                 scroll->eventScrollChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onSliderChangePosition);
+                updateSliderLabel(scroll, valueStr);
             }
 
             configureWidgets(current);
         }
     }
 
+    void SettingsWindow::updateSliderLabel(MyGUI::ScrollBar *scroller, const std::string& value)
+    {
+        std::string labelWidgetName = scroller->getUserString("SettingLabelWidget");
+        if (!labelWidgetName.empty())
+        {
+            MyGUI::TextBox* textBox;
+            getWidget(textBox, labelWidgetName);
+            std::string labelCaption = scroller->getUserString("SettingLabelCaption");
+            boost::algorithm::replace_all(labelCaption, "%s", value);
+            textBox->setCaptionWithReplacing(labelCaption);
+        }
+    }
+
     SettingsWindow::SettingsWindow() :
         WindowBase("openmw_settings_window.layout"),
         mKeyboardMode(true)
@@ -167,17 +184,13 @@ namespace MWGui
         getWidget(mFullscreenButton, "FullscreenButton");
         getWidget(mVSyncButton, "VSyncButton");
         getWidget(mWindowBorderButton, "WindowBorderButton");
-        getWidget(mFOVSlider, "FOVSlider");
-        getWidget(mAnisotropySlider, "AnisotropySlider");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
-        getWidget(mAnisotropyLabel, "AnisotropyLabel");
         getWidget(mAnisotropyBox, "AnisotropyBox");
         getWidget(mShadersButton, "ShadersButton");
         getWidget(mShadowsEnabledButton, "ShadowsEnabledButton");
         getWidget(mShadowsTextureSize, "ShadowsTextureSize");
         getWidget(mControlsBox, "ControlsBox");
         getWidget(mResetControlsButton, "ResetControlsButton");
-        getWidget(mDifficultySlider, "DifficultySlider");
         getWidget(mKeyboardSwitch, "KeyboardButton");
         getWidget(mControllerSwitch, "ControllerButton");
         getWidget(mWaterTextureSize, "WaterTextureSize");
@@ -238,7 +251,6 @@ namespace MWGui
 
         std::string tmip = Settings::Manager::getString("texture mipmap", "General");
         mTextureFilteringButton->setCaption(textureMipmappingToStr(tmip));
-        mAnisotropyLabel->setCaption("Anisotropy (" + MyGUI::utility::toString(Settings::Manager::getInt("anisotropy", "General")) + ")");
 
         int waterTextureSize = Settings::Manager::getInt ("rtt size", "Water");
         if (waterTextureSize >= 512)
@@ -255,15 +267,6 @@ namespace MWGui
             mShadowsEnabledButton->setEnabled(false);
         }
 
-        MyGUI::TextBox* fovText;
-        getWidget(fovText, "FovText");
-        fovText->setCaption("Field of View (" + MyGUI::utility::toString(int(Settings::Manager::getInt("field of view", "Camera"))) + ")");
-
-        MyGUI::TextBox* diffText;
-        getWidget(diffText, "DifficultyText");
-
-        diffText->setCaptionWithReplacing("#{sDifficulty} (" + MyGUI::utility::toString(int(Settings::Manager::getInt("difficulty", "Game"))) + ")");
-
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -439,6 +442,7 @@ namespace MWGui
     {
         if (getSettingType(scroller) == "Slider")
         {
+            std::string valueStr;
             if (getSettingValueType(scroller) == "Float")
             {
                 float value = pos / float(scroller->getScrollRange()-1);
@@ -447,28 +451,15 @@ namespace MWGui
                 getSettingMinMax(scroller, min, max);
                 value = min + (max-min) * value;
                 Settings::Manager::setFloat(getSettingName(scroller), getSettingCategory(scroller), value);
-
-                if (scroller == mFOVSlider)
-                {
-                    MyGUI::TextBox* fovText;
-                    getWidget(fovText, "FovText");
-                    fovText->setCaption("Field of View (" + MyGUI::utility::toString(int(value)) + ")");
-                }
-                if (scroller == mDifficultySlider)
-                {
-                    MyGUI::TextBox* diffText;
-                    getWidget(diffText, "DifficultyText");
-                    diffText->setCaptionWithReplacing("#{sDifficulty} (" + MyGUI::utility::toString(int(value)) + ")");
-                }
+                valueStr = MyGUI::utility::toString(int(value));
             }
             else
             {
                 Settings::Manager::setInt(getSettingName(scroller), getSettingCategory(scroller), pos);
-                if (scroller == mAnisotropySlider)
-                {
-                    mAnisotropyLabel->setCaption("Anisotropy (" + MyGUI::utility::toString(pos) + ")");
-                }
+                valueStr = MyGUI::utility::toString(pos);
             }
+            updateSliderLabel(scroller, valueStr);
+
             apply();
         }
     }
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 99553808b4..4214653095 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -30,11 +30,7 @@ namespace MWGui
             MyGUI::Button* mFullscreenButton;
             MyGUI::Button* mVSyncButton;
             MyGUI::Button* mWindowBorderButton;
-            MyGUI::ScrollBar* mFOVSlider;
-            MyGUI::ScrollBar* mDifficultySlider;
-            MyGUI::ScrollBar* mAnisotropySlider;
             MyGUI::ComboBox* mTextureFilteringButton;
-            MyGUI::TextBox* mAnisotropyLabel;
             MyGUI::Widget* mAnisotropyBox;
             MyGUI::Button* mShadersButton;
 
@@ -76,6 +72,7 @@ namespace MWGui
             void apply();
 
             void configureWidgets(MyGUI::Widget* widget);
+            void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
         
         private:
             void resetScrollbars();
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 6d2424aa5b..cf7fe1be70 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -61,6 +61,8 @@
                         <UserString key="SettingValueType" value="Float"/>
                         <UserString key="SettingMin" value="-100"/>
                         <UserString key="SettingMax" value="100"/>
+                        <UserString key="SettingLabelWidget" value="DifficultyText"/>
+                        <UserString key="SettingLabelCaption" value="#{sDifficulty} (%s)"/>
                     </Widget>
                     <Widget type="TextBox" skin="SandText" position="0 38 352 16" align="Left Top">
                         <Property key="Caption" value="#{sEasy}"/>
@@ -274,7 +276,6 @@
                         </Widget>
 
                         <Widget type="TextBox" skin="NormalText" position="0 198 329 18" align="Left Top" name="FovText">
-                            <Property key="Caption" value="Field of View"/>
                         </Widget>
                         <Widget type="MWScrollBar" skin="MW_HScroll" position="0 222 329 18" align="HStretch Top" name="FOVSlider">
                             <Property key="Range" value="10000"/>
@@ -285,6 +286,8 @@
                             <UserString key="SettingValueType" value="Float"/>
                             <UserString key="SettingMin" value="30"/>
                             <UserString key="SettingMax" value="110"/>
+                            <UserString key="SettingLabelWidget" value="FovText"/>
+                            <UserString key="SettingLabelCaption" value="Field of View (%s)"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="0 246 329 18" align="Left Top">
                             <Property key="Caption" value="#{sLow}"/>
@@ -334,6 +337,8 @@
                                 <UserString key="SettingType" value="Slider"/>
                                 <UserString key="SettingCategory" value="General"/>
                                 <UserString key="SettingName" value="anisotropy"/>
+                                <UserString key="SettingLabelWidget" value="AnisotropyLabel"/>
+                                <UserString key="SettingLabelCaption" value="Anisotropy (%s)"/>
                             </Widget>
                         </Widget>
                         <Widget type="TextBox" skin="NormalText" position="4 130 322 18" align="Left Top">

From 4f8f166f69e6ce2ccecc0a2ce3d8dbc9919dc0cb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 5 Jan 2016 23:27:42 +0100
Subject: [PATCH 072/765] Fix GetPcInJail to work as in the original engine

---
 apps/openmw/mwbase/world.hpp            | 2 ++
 apps/openmw/mwscript/miscextensions.cpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp        | 8 ++++++++
 apps/openmw/mwworld/worldimp.hpp        | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index ebce2e1bf8..462d08727c 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -545,6 +545,8 @@ namespace MWBase
             virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target) = 0;
 
             virtual void removeContainerScripts(const MWWorld::Ptr& reference) = 0;
+
+            virtual bool isPlayerInJail() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 9c63511b27..593fdcca52 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1014,7 +1014,7 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime &runtime)
                 {
-                    runtime.push (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Jail));
+                    runtime.push (MWBase::Environment::get().getWorld()->isPlayerInJail());
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 15826009d6..19d90e2096 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2996,6 +2996,14 @@ namespace MWWorld
         }
     }
 
+    bool World::isPlayerInJail() const
+    {
+        if (mGoToJail)
+            return true;
+
+        return MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Jail);
+    }
+
     void World::spawnRandomCreature(const std::string &creatureList)
     {
         const ESM::CreatureLevList* list = getStore().get<ESM::CreatureLevList>().find(creatureList);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 4ed97759ef..5f0507acef 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -645,6 +645,8 @@ namespace MWWorld
 
             /// Return the distance between actor's weapon and target's collision box.
             virtual float getHitDistance(const MWWorld::ConstPtr& actor, const MWWorld::ConstPtr& target);
+
+            virtual bool isPlayerInJail() const;
     };
 }
 

From 0da6d249fe5748496d605ad19bc1243d96ad6549 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 7 Jan 2016 00:26:09 +0100
Subject: [PATCH 073/765] Fix the window pinning button's borders not accepting
 mouse clicks

---
 files/mygui/openmw_windows.skin.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index 682d89ebcc..22270bb9f6 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -11,41 +11,49 @@
 
     <!-- Define the borders for pin button (up) -->
     <Resource type="ResourceSkin" name="PU_B" size="12 2" texture="textures\menu_rightbuttonup_bottom.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 12 2">
             <State name="normal" offset="0 0 12 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_BR" size="2 2" texture="textures\menu_rightbuttonup_bottom_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_R" size="2 12" texture="textures\menu_rightbuttonup_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 12">
             <State name="normal" offset="0 0 2 12"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_TR" size="2 2" texture="textures\menu_rightbuttonup_top_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_T" size="12 2" texture="textures\menu_rightbuttonup_top.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 12 2">
             <State name="normal" offset="0 0 12 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_TL" size="2 2" texture="textures\menu_rightbuttonup_top_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_L" size="2 12" texture="textures\menu_rightbuttonup_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 12">
             <State name="normal" offset="0 0 2 12"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PU_BL" size="2 2" texture="textures\menu_rightbuttonup_bottom_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
@@ -53,41 +61,49 @@
 
     <!-- Define the borders for pin button (down) -->
     <Resource type="ResourceSkin" name="PD_B" size="12 2" texture="textures\menu_rightbuttondown_bottom.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 12 2">
             <State name="normal" offset="0 0 12 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_BR" size="2 2" texture="textures\menu_rightbuttondown_bottom_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_R" size="2 12" texture="textures\menu_rightbuttondown_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 12">
             <State name="normal" offset="0 0 2 12"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_TR" size="2 2" texture="textures\menu_rightbuttondown_top_right.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_T" size="12 2" texture="textures\menu_rightbuttondown_top.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 12 2">
             <State name="normal" offset="0 0 12 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_TL" size="2 2" texture="textures\menu_rightbuttondown_top_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_L" size="2 12" texture="textures\menu_rightbuttondown_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 12">
             <State name="normal" offset="0 0 2 12"/>
         </BasisSkin>
     </Resource>
     <Resource type="ResourceSkin" name="PD_BL" size="2 2" texture="textures\menu_rightbuttondown_bottom_left.dds">
+        <Property key="NeedMouse" value="false"/>
         <BasisSkin type="MainSkin" offset="0 0 2 2">
             <State name="normal" offset="0 0 2 2"/>
         </BasisSkin>

From 4690fd3f222b3363944df53ab15887a7cc2632c6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 7 Jan 2016 00:43:15 +0100
Subject: [PATCH 074/765] Change the local map exploration radius to better
 match the original engine

---
 apps/openmw/mwrender/localmap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 9d5950a90e..b3d19090fb 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -526,7 +526,7 @@ void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orient
     }
 
     // explore radius (squared)
-    const float exploreRadius = (mInterior ? 0.1f : 0.3f) * (sFogOfWarResolution-1); // explore radius from 0 to sFogOfWarResolution-1
+    const float exploreRadius = 0.17f * (sFogOfWarResolution-1); // explore radius from 0 to sFogOfWarResolution-1
     const float sqrExploreRadius = square(exploreRadius);
     const float exploreRadiusUV = exploreRadius / sFogOfWarResolution; // explore radius from 0 to 1 (UV space)
 

From ca4e859f613c4521cae17aa4ef19190391e5242c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 7 Jan 2016 00:45:12 +0100
Subject: [PATCH 075/765] Remove unused argument

---
 apps/openmw/mwgui/mapwindow.cpp   | 4 +---
 apps/openmw/mwgui/mapwindow.hpp   | 2 --
 apps/openmw/mwrender/localmap.cpp | 2 +-
 apps/openmw/mwrender/localmap.hpp | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 0ebb595ddf..bc8f415994 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -269,8 +269,6 @@ namespace MWGui
         // normalized cell coordinates
         float nX,nY;
 
-        markerPos.interior = mInterior;
-
         if (!mInterior)
         {
             int cellX, cellY;
@@ -1078,7 +1076,7 @@ namespace MWGui
     {
         if (!mLocalMapRender)
             return true;
-        return mLocalMapRender->isPositionExplored(nX, nY, cellX, cellY, interior);
+        return mLocalMapRender->isPositionExplored(nX, nY, cellX, cellY);
     }
 
 }
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index a41d5d5270..0ab38f1e3d 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -78,7 +78,6 @@ namespace MWGui
         {
             MarkerUserData(MWRender::LocalMap* map)
                 : mLocalMapRender(map)
-                , interior(false)
                 , cellX(0)
                 , cellY(0)
                 , nX(0.f)
@@ -89,7 +88,6 @@ namespace MWGui
             bool isPositionExplored() const;
 
             MWRender::LocalMap* mLocalMapRender;
-            bool interior;
             int cellX;
             int cellY;
             float nX;
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index b3d19090fb..200f484b57 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -478,7 +478,7 @@ osg::Vec2f LocalMap::interiorMapToWorldPosition (float nX, float nY, int x, int
     return pos;
 }
 
-bool LocalMap::isPositionExplored (float nX, float nY, int x, int y, bool interior)
+bool LocalMap::isPositionExplored (float nX, float nY, int x, int y)
 {
     const MapSegment& segment = mSegments[std::make_pair(x, y)];
     if (!segment.mFogOfWarImage)
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 72ee0354ed..59165013d6 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -99,7 +99,7 @@ namespace MWRender
         /**
          * Check if a given position is explored by the player (i.e. not obscured by fog of war)
          */
-        bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
+        bool isPositionExplored (float nX, float nY, int x, int y);
 
         osg::Group* getRoot();
 

From ef20962fc5f9d2ba19faa679cac1c4c02bbc87a4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 7 Jan 2016 01:08:30 +0100
Subject: [PATCH 076/765] Disable fog of war rendering on the HUD map by
 default

---
 apps/openmw/mwgui/hud.cpp       |  2 +-
 apps/openmw/mwgui/mapwindow.cpp | 11 ++++++-----
 apps/openmw/mwgui/mapwindow.hpp |  5 +++--
 files/settings-default.cfg      |  4 ++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index cf0fa3414a..8d6ce6beb4 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -69,7 +69,7 @@ namespace MWGui
 
     HUD::HUD(CustomMarkerCollection &customMarkers, DragAndDrop* dragAndDrop, MWRender::LocalMap* localMapRender)
         : Layout("openmw_hud.layout")
-        , LocalMapBase(customMarkers, localMapRender)
+        , LocalMapBase(customMarkers, localMapRender, Settings::Manager::getBool("local map hud fog of war", "Map"))
         , mHealth(NULL)
         , mMagicka(NULL)
         , mStamina(NULL)
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index bc8f415994..89f4d8cf37 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -156,7 +156,7 @@ namespace MWGui
 
     // ------------------------------------------------------
 
-    LocalMapBase::LocalMapBase(CustomMarkerCollection &markers, MWRender::LocalMap* localMapRender)
+    LocalMapBase::LocalMapBase(CustomMarkerCollection &markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled)
         : mLocalMapRender(localMapRender)
         , mCurX(0)
         , mCurY(0)
@@ -165,7 +165,8 @@ namespace MWGui
         , mCompass(NULL)
         , mPrefix()
         , mChanged(true)
-        , mFogOfWar(true)
+        , mFogOfWarToggled(true)
+        , mFogOfWarEnabled(fogOfWarEnabled)
         , mMapWidgetSize(0)
         , mCustomMarkers(markers)
         , mMarkerUpdateTimer(0.0f)
@@ -222,9 +223,9 @@ namespace MWGui
 
     bool LocalMapBase::toggleFogOfWar()
     {
-        mFogOfWar = !mFogOfWar;
+        mFogOfWarToggled = !mFogOfWarToggled;
         applyFogOfWar();
-        return mFogOfWar;
+        return mFogOfWarToggled;
     }
 
     void LocalMapBase::applyFogOfWar()
@@ -238,7 +239,7 @@ namespace MWGui
                 int y = mCurY + (-1*(my-1));
                 MyGUI::ImageBox* fog = mFogWidgets[my + 3*mx];
 
-                if (!mFogOfWar)
+                if (!mFogOfWarToggled || !mFogOfWarEnabled)
                 {
                     fog->setImageTexture("");
                     continue;
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 0ab38f1e3d..227a9e3f96 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -61,7 +61,7 @@ namespace MWGui
     class LocalMapBase
     {
     public:
-        LocalMapBase(CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender);
+        LocalMapBase(CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled = true);
         virtual ~LocalMapBase();
         void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize);
 
@@ -105,7 +105,8 @@ namespace MWGui
         MyGUI::ImageBox* mCompass;
         std::string mPrefix;
         bool mChanged;
-        bool mFogOfWar;
+        bool mFogOfWarToggled;
+        bool mFogOfWarEnabled;
 
         int mMapWidgetSize;
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 49c9c54191..6a2495e267 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -47,6 +47,10 @@ global map cell size = 18
 # cell, 256 is 1/8 cell.  See documentation for details. (e.g. 64 to 256).
 local map hud widget size = 256
 
+# Enables Fog of War rendering on the HUD map. Default is Off since with default settings
+# the map is so small that the fog would not obscure anything, just darken the edges slightly.
+local map hud fog of war = false
+
 # Resolution of local map in GUI window in pixels.  See documentation
 # for details which may affect cell load performance. (e.g. 128 to 1024).
 local map resolution = 256

From f315a4386fabeb6d96648e58a1c239c557d9257a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 11 Jan 2016 23:07:01 +0100
Subject: [PATCH 077/765] Accept an implicit reference in Journal (Fixes #3135)

---
 apps/openmw/mwbase/journal.hpp              | 3 ++-
 apps/openmw/mwdialogue/journalentry.cpp     | 8 ++++----
 apps/openmw/mwdialogue/journalentry.hpp     | 4 ++--
 apps/openmw/mwdialogue/journalimp.cpp       | 4 ++--
 apps/openmw/mwdialogue/journalimp.hpp       | 3 ++-
 apps/openmw/mwscript/dialogueextensions.cpp | 9 +++++++--
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwbase/journal.hpp b/apps/openmw/mwbase/journal.hpp
index 738014ba6e..cd87928903 100644
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@@ -50,8 +50,9 @@ namespace MWBase
 
             virtual ~Journal() {}
 
-            virtual void addEntry (const std::string& id, int index) = 0;
+            virtual void addEntry (const std::string& id, int index, const MWWorld::Ptr& actor) = 0;
             ///< Add a journal entry.
+            /// @param actor Used as context for replacing of escape sequences (%name, etc).
 
             virtual void setJournalIndex (const std::string& id, int index) = 0;
             ///< Set the journal index without adding an entry.
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 2f5f02b01f..9f74d0733d 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -102,8 +102,8 @@ namespace MWDialogue
     {}
 
     StampedJournalEntry::StampedJournalEntry (const std::string& topic, const std::string& infoId,
-        int day, int month, int dayOfMonth)
-    : JournalEntry (topic, infoId, MWWorld::Ptr()), mDay (day), mMonth (month), mDayOfMonth (dayOfMonth)
+        int day, int month, int dayOfMonth, const MWWorld::Ptr& actor)
+    : JournalEntry (topic, infoId, actor), mDay (day), mMonth (month), mDayOfMonth (dayOfMonth)
     {}
 
     StampedJournalEntry::StampedJournalEntry (const ESM::JournalEntry& record)
@@ -119,12 +119,12 @@ namespace MWDialogue
         entry.mDayOfMonth = mDayOfMonth;
     }
 
-    StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index)
+    StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index, const MWWorld::Ptr& actor)
     {
         int day = MWBase::Environment::get().getWorld()->getGlobalInt ("dayspassed");
         int month = MWBase::Environment::get().getWorld()->getGlobalInt ("month");
         int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalInt ("day");
 
-        return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth);
+        return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth, actor);
     }
 }
diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp
index 3ae3efcc8d..8711ab53a7 100644
--- a/apps/openmw/mwdialogue/journalentry.hpp
+++ b/apps/openmw/mwdialogue/journalentry.hpp
@@ -64,13 +64,13 @@ namespace MWDialogue
         StampedJournalEntry();
 
         StampedJournalEntry (const std::string& topic, const std::string& infoId,
-            int day, int month, int dayOfMonth);
+            int day, int month, int dayOfMonth, const MWWorld::Ptr& actor);
 
         StampedJournalEntry (const ESM::JournalEntry& record);
 
         void write (ESM::JournalEntry& entry) const;
 
-        static StampedJournalEntry makeFromQuest (const std::string& topic, int index);
+        static StampedJournalEntry makeFromQuest (const std::string& topic, int index, const MWWorld::Ptr& actor);
     };
 }
 
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index e6ffe22ab2..8ea72e3ba3 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -75,7 +75,7 @@ namespace MWDialogue
         mTopics.clear();
     }
 
-    void Journal::addEntry (const std::string& id, int index)
+    void Journal::addEntry (const std::string& id, int index, const MWWorld::Ptr& actor)
     {
         // bail out of we already have heard this...
         std::string infoId = JournalEntry::idFromIndex (id, index);
@@ -83,7 +83,7 @@ namespace MWDialogue
             if (i->mTopic == id && i->mInfoId == infoId)
                 return;
 
-        StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index);
+        StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index, actor);
 
         mJournal.push_back (entry);
 
diff --git a/apps/openmw/mwdialogue/journalimp.hpp b/apps/openmw/mwdialogue/journalimp.hpp
index 7f26a5bb90..c3e9406290 100644
--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@@ -29,8 +29,9 @@ namespace MWDialogue
 
             virtual void clear();
 
-            virtual void addEntry (const std::string& id, int index);
+            virtual void addEntry (const std::string& id, int index, const MWWorld::Ptr& actor);
             ///< Add a journal entry.
+            /// @param actor Used as context for replacing of escape sequences (%name, etc).
 
             virtual void setJournalIndex (const std::string& id, int index);
             ///< Set the journal index without adding an entry.
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index c305fb81fc..fcb7e8f3b2 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -22,12 +22,17 @@ namespace MWScript
 {
     namespace Dialogue
     {
+        template <class R>
         class OpJournal : public Interpreter::Opcode0
         {
             public:
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
+                    MWWorld::Ptr ptr = R()(runtime, false); // required=false
+                    if (ptr.isEmpty())
+                        ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
+
                     std::string quest = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
@@ -37,7 +42,7 @@ namespace MWScript
                     // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :(
                     try
                     {
-                        MWBase::Environment::get().getJournal()->addEntry (quest, index);
+                        MWBase::Environment::get().getJournal()->addEntry (quest, index, ptr);
                     }
                     catch (...)
                     {
@@ -270,7 +275,7 @@ namespace MWScript
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
-            interpreter.installSegment5 (Compiler::Dialogue::opcodeJournal, new OpJournal);
+            interpreter.installSegment5 (Compiler::Dialogue::opcodeJournal, new OpJournal<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Dialogue::opcodeSetJournalIndex, new OpSetJournalIndex);
             interpreter.installSegment5 (Compiler::Dialogue::opcodeGetJournalIndex, new OpGetJournalIndex);
             interpreter.installSegment5 (Compiler::Dialogue::opcodeAddTopic, new OpAddTopic);

From 6546c05428bb4820a337b079aa728b62adaaab5e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 12:46:06 +0100
Subject: [PATCH 078/765] Move Fallback map to components/

---
 apps/openmw/main.cpp                          | 34 +------------
 apps/openmw/mwbase/world.hpp                  |  8 +++-
 apps/openmw/mwgui/charactercreation.cpp       |  5 +-
 apps/openmw/mwgui/levelupdialog.cpp           |  3 +-
 apps/openmw/mwrender/animation.cpp            |  5 +-
 apps/openmw/mwrender/renderingmanager.cpp     |  4 +-
 apps/openmw/mwrender/renderingmanager.hpp     |  6 +--
 apps/openmw/mwrender/ripplesimulation.cpp     |  7 ++-
 apps/openmw/mwrender/ripplesimulation.hpp     |  6 +--
 apps/openmw/mwrender/sky.cpp                  |  7 ++-
 apps/openmw/mwrender/water.cpp                |  5 +-
 apps/openmw/mwrender/water.hpp                | 10 ++--
 apps/openmw/mwworld/weather.cpp               | 10 ++--
 apps/openmw/mwworld/weather.hpp               | 14 ++++--
 apps/openmw/mwworld/worldimp.cpp              |  2 +-
 apps/openmw/mwworld/worldimp.hpp              | 15 +++---
 components/CMakeLists.txt                     |  4 ++
 .../fallback}/fallback.cpp                    | 14 +++---
 .../fallback}/fallback.hpp                    | 11 +++--
 components/fallback/validate.hpp              | 48 +++++++++++++++++++
 20 files changed, 127 insertions(+), 91 deletions(-)
 rename {apps/openmw/mwworld => components/fallback}/fallback.cpp (75%)
 rename {apps/openmw/mwworld => components/fallback}/fallback.hpp (67%)
 create mode 100644 components/fallback/validate.hpp

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index c3f0f8688e..a4bf1fe5ba 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -3,6 +3,7 @@
 
 #include <components/version/version.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/fallback/validate.hpp>
 
 #include <SDL_messagebox.h>
 #include <SDL_main.h>
@@ -52,39 +53,8 @@ inline boost::filesystem::path lexical_cast<boost::filesystem::path, std::string
 } /* namespace boost */
 #endif /* (BOOST_VERSION <= 104600) */
 
-struct FallbackMap {
-    std::map<std::string,std::string> mMap;
-};
-
-void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap*, int)
-{
-    if(v.empty())
-    {
-        v = boost::any(FallbackMap());
-    }
-
-    FallbackMap *map = boost::any_cast<FallbackMap>(&v);
-
-    for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); ++it)
-    {
-        int sep = it->find(",");
-        if(sep < 1 || sep == (int)it->length()-1)
-#if (BOOST_VERSION < 104200)
-            throw boost::program_options::validation_error("invalid value");
-#else
-            throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
-#endif
-
-        std::string key(it->substr(0,sep));
-        std::string value(it->substr(sep+1));
-
-        if(map->mMap.find(key) == map->mMap.end())
-        {
-            map->mMap.insert(std::make_pair (key,value));
-        }
-    }
-}
 
+using namespace Fallback;
 
 /**
  * \brief Parses application command line and calls \ref Cfg::ConfigurationManager
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index ebce2e1bf8..801016e068 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -56,7 +56,6 @@ namespace MWMechanics
 
 namespace MWWorld
 {
-    class Fallback;
     class CellStore;
     class Player;
     class LocalScripts;
@@ -67,6 +66,11 @@ namespace MWWorld
     typedef std::vector<std::pair<MWWorld::Ptr,MWMechanics::Movement> > PtrMovementList;
 }
 
+namespace Fallback
+{
+    class Map;
+}
+
 namespace MWBase
 {
     /// \brief Interface for the World (implemented in MWWorld)
@@ -119,7 +123,7 @@ namespace MWBase
 
             virtual void adjustSky() = 0;
 
-            virtual const MWWorld::Fallback *getFallback () const = 0;
+            virtual const Fallback::Map *getFallback () const = 0;
 
             virtual MWWorld::Player& getPlayer() = 0;
             virtual MWWorld::Ptr getPlayerPtr() = 0;
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index d2ce35509d..8c2ec68813 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -1,5 +1,7 @@
 #include "charactercreation.hpp"
 
+#include <components/fallback/fallback.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -10,7 +12,6 @@
 #include "../mwmechanics/actorutil.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/fallback.hpp"
 #include "../mwworld/esmstore.hpp"
 
 #include "textinput.hpp"
@@ -32,7 +33,7 @@ namespace
     const ESM::Class::Specialization mSpecializations[3]={ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}; // The specialization for each answer
     Step sGenerateClassSteps(int number) {
         number++;
-        const MWWorld::Fallback* fallback=MWBase::Environment::get().getWorld()->getFallback();
+        const Fallback::Map* fallback=MWBase::Environment::get().getWorld()->getFallback();
         Step step = {fallback->getFallbackString("Question_"+MyGUI::utility::toString(number)+"_Question"),
         {fallback->getFallbackString("Question_"+MyGUI::utility::toString(number)+"_AnswerOne"),
         fallback->getFallbackString("Question_"+MyGUI::utility::toString(number)+"_AnswerTwo"),
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index c832a78792..4e8d0a02c4 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -4,13 +4,14 @@
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_EditBox.h>
 
+#include <components/fallback/fallback.hpp>
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/fallback.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 68a073731d..c2fc82881f 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -35,11 +35,12 @@
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
+#include <components/fallback/fallback.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/fallback.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
@@ -1113,7 +1114,7 @@ namespace MWRender
         osg::ref_ptr<osg::Light> light (new osg::Light);
         lightSource->setNodeMask(Mask_Lighting);
 
-        const MWWorld::Fallback* fallback = MWBase::Environment::get().getWorld()->getFallback();
+        const Fallback::Map* fallback = MWBase::Environment::get().getWorld()->getFallback();
 
         float radius = esmLight->mData.mRadius;
         lightSource->setRadius(radius);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index ee9d93c0f2..61ce626fde 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -30,8 +30,8 @@
 #include <components/terrain/terraingrid.hpp>
 
 #include <components/esm/loadcell.hpp>
+#include <components/fallback/fallback.hpp>
 
-#include "../mwworld/fallback.hpp"
 #include "../mwworld/cellstore.hpp"
 
 #include "sky.hpp"
@@ -126,7 +126,7 @@ namespace MWRender
     };
 
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
-                                       const MWWorld::Fallback* fallback, const std::string& resourcePath)
+                                       const Fallback::Map* fallback, const std::string& resourcePath)
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 58012078c4..3b583af89c 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -37,9 +37,9 @@ namespace Terrain
     class World;
 }
 
-namespace MWWorld
+namespace Fallback
 {
-    class Fallback;
+    class Map;
 }
 
 namespace MWRender
@@ -58,7 +58,7 @@ namespace MWRender
     {
     public:
         RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
-                         const MWWorld::Fallback* fallback, const std::string& resourcePath);
+                         const Fallback::Map* fallback, const std::string& resourcePath);
         ~RenderingManager();
 
         MWRender::Objects& getObjects();
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index f232ea475d..f74631c4a2 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -15,19 +15,18 @@
 #include <components/nifosg/controller.hpp>
 #include <components/resource/texturemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "vismask.hpp"
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
-#include "../mwworld/fallback.hpp"
-
 #include "../mwmechanics/actorutil.hpp"
 
 namespace
 {
-    void createWaterRippleStateSet(Resource::ResourceSystem* resourceSystem, const MWWorld::Fallback* fallback, osg::Node* node)
+    void createWaterRippleStateSet(Resource::ResourceSystem* resourceSystem, const Fallback::Map* fallback, osg::Node* node)
     {
         int rippleFrameCount = fallback->getFallbackInt("Water_RippleFrameCount");
         if (rippleFrameCount <= 0)
@@ -78,7 +77,7 @@ namespace
 namespace MWRender
 {
 
-RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Fallback* fallback)
+RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem* resourceSystem, const Fallback::Map* fallback)
     : mParent(parent)
 {
     osg::ref_ptr<osg::Geode> geode (new osg::Geode);
diff --git a/apps/openmw/mwrender/ripplesimulation.hpp b/apps/openmw/mwrender/ripplesimulation.hpp
index a4e12f2756..bca81c59b4 100644
--- a/apps/openmw/mwrender/ripplesimulation.hpp
+++ b/apps/openmw/mwrender/ripplesimulation.hpp
@@ -21,9 +21,9 @@ namespace Resource
     class ResourceSystem;
 }
 
-namespace MWWorld
+namespace Fallback
 {
-    class Fallback;
+    class Map;
 }
 
 namespace MWRender
@@ -40,7 +40,7 @@ namespace MWRender
     class RippleSimulation
     {
     public:
-        RippleSimulation(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const MWWorld::Fallback* fallback);
+        RippleSimulation(osg::Group* parent, Resource::ResourceSystem* resourceSystem, const Fallback::Map* fallback);
         ~RippleSimulation();
 
         /// @param dt Time since the last frame
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 635116db0a..efe797336d 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -33,6 +33,7 @@
 #include <components/resource/texturemanager.hpp>
 
 #include <components/vfs/manager.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
@@ -42,8 +43,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwworld/fallback.hpp"
-
 #include "vismask.hpp"
 #include "renderbin.hpp"
 
@@ -827,7 +826,7 @@ private:
             , mTimeOfDayFade(1.f)
             , mGlareView(1.f)
         {
-            const MWWorld::Fallback* fallback = MWBase::Environment::get().getWorld()->getFallback();
+            const Fallback::Map* fallback = MWBase::Environment::get().getWorld()->getFallback();
             mColor = fallback->getFallbackColour("Weather_Sun_Glare_Fader_Color");
             mSunGlareFaderMax = fallback->getFallbackFloat("Weather_Sun_Glare_Fader_Max");
             mSunGlareFaderAngleMax = fallback->getFallbackFloat("Weather_Sun_Glare_Fader_Angle_Max");
@@ -1161,7 +1160,7 @@ void SkyManager::create()
 
     mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getTextureManager()));
 
-    const MWWorld::Fallback* fallback=MWBase::Environment::get().getWorld()->getFallback();
+    const Fallback::Map* fallback=MWBase::Environment::get().getWorld()->getFallback();
     mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getTextureManager(), fallback->getFallbackFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
     mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getTextureManager(), fallback->getFallbackFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index cd1f4c5113..1b19246f5b 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -34,8 +34,9 @@
 
 #include <components/esm/loadcell.hpp>
 
+#include <components/fallback/fallback.hpp>
+
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/fallback.hpp"
 
 #include "vismask.hpp"
 #include "ripplesimulation.hpp"
@@ -457,7 +458,7 @@ public:
 };
 
 Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem *resourceSystem, osgUtil::IncrementalCompileOperation *ico,
-             const MWWorld::Fallback* fallback, const std::string& resourcePath)
+             const Fallback::Map* fallback, const std::string& resourcePath)
     : mParent(parent)
     , mSceneRoot(sceneRoot)
     , mResourceSystem(resourceSystem)
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index b26782873f..b02ee392c5 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -28,11 +28,15 @@ namespace Resource
 
 namespace MWWorld
 {
-    class Fallback;
     class CellStore;
     class Ptr;
 }
 
+namespace Fallback
+{
+    class Map;
+}
+
 namespace MWRender
 {
 
@@ -50,7 +54,7 @@ namespace MWRender
         osg::ref_ptr<osg::PositionAttitudeTransform> mWaterNode;
         osg::ref_ptr<osg::Geode> mWaterGeode;
         Resource::ResourceSystem* mResourceSystem;
-        const MWWorld::Fallback* mFallback;
+        const Fallback::Map* mFallback;
         osg::ref_ptr<osgUtil::IncrementalCompileOperation> mIncrementalCompileOperation;
 
         std::auto_ptr<RippleSimulation> mSimulation;
@@ -77,7 +81,7 @@ namespace MWRender
 
     public:
         Water(osg::Group* parent, osg::Group* sceneRoot,
-              Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, const MWWorld::Fallback* fallback,
+              Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, const Fallback::Map* fallback,
               const std::string& resourcePath);
         ~Water();
 
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 5ce3d5c2fe..c40913ff1b 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -6,6 +6,7 @@
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/savedgame.hpp>
 #include <components/esm/weatherstate.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -20,7 +21,6 @@
 
 #include "player.hpp"
 #include "esmstore.hpp"
-#include "fallback.hpp"
 #include "cellstore.hpp"
 
 #include <cmath>
@@ -100,7 +100,7 @@ template class TimeOfDayInterpolator<float>;
 template class TimeOfDayInterpolator<osg::Vec4f>;
 
 Weather::Weather(const std::string& name,
-                 const MWWorld::Fallback& fallback,
+                 const Fallback::Map& fallback,
                  float stormWindSpeed,
                  float rainSpeed,
                  const std::string& particleEffect)
@@ -327,7 +327,7 @@ void RegionWeather::chooseNewWeather()
     mWeather = i;
 }
 
-MoonModel::MoonModel(const std::string& name, const MWWorld::Fallback& fallback)
+MoonModel::MoonModel(const std::string& name, const Fallback::Map& fallback)
   : mFadeInStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Start"))
   , mFadeInFinish(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Finish"))
   , mFadeOutStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_Out_Start"))
@@ -496,7 +496,7 @@ inline float MoonModel::earlyMoonShadowAlpha(float angle) const
         return 0.0f;
 }
 
-WeatherManager::WeatherManager(MWRender::RenderingManager& rendering, const MWWorld::Fallback& fallback, MWWorld::ESMStore& store)
+WeatherManager::WeatherManager(MWRender::RenderingManager& rendering, const Fallback::Map& fallback, MWWorld::ESMStore& store)
     : mStore(store)
     , mRendering(rendering)
     , mSunriseTime(fallback.getFallbackFloat("Weather_Sunrise_Time"))
@@ -862,7 +862,7 @@ void WeatherManager::clear()
 }
 
 inline void WeatherManager::addWeather(const std::string& name,
-                                       const MWWorld::Fallback& fallback,
+                                       const Fallback::Map& fallback,
                                        const std::string& particleEffect)
 {
     static const float fStromWindSpeed = mStore.get<ESM::GameSetting>().find("fStromWindSpeed")->getFloat();
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index a5627a507c..0442007570 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -29,9 +29,13 @@ namespace Loading
     class Listener;
 }
 
+namespace Fallback
+{
+    class Map;
+}
+
 namespace MWWorld
 {
-    class Fallback;
     class TimeStamp;
 
 
@@ -66,7 +70,7 @@ namespace MWWorld
     {
     public:
         Weather(const std::string& name,
-                const MWWorld::Fallback& fallback,
+                const Fallback::Map& fallback,
                 float stormWindSpeed,
                 float rainSpeed,
                 const std::string& particleEffect);
@@ -172,7 +176,7 @@ namespace MWWorld
     class MoonModel
     {
     public:
-        MoonModel(const std::string& name, const MWWorld::Fallback& fallback);
+        MoonModel(const std::string& name, const Fallback::Map& fallback);
 
         MWRender::MoonState calculateState(const TimeStamp& gameTime) const;
 
@@ -203,7 +207,7 @@ namespace MWWorld
     public:
         // Have to pass fallback and Store, can't use singleton since World isn't fully constructed yet at the time
         WeatherManager(MWRender::RenderingManager& rendering,
-                       const MWWorld::Fallback& fallback,
+                       const Fallback::Map& fallback,
                        MWWorld::ESMStore& store);
         ~WeatherManager();
 
@@ -288,7 +292,7 @@ namespace MWWorld
         std::string mPlayingSoundID;
 
         void addWeather(const std::string& name,
-                        const MWWorld::Fallback& fallback,
+                        const Fallback::Map& fallback,
                         const std::string& particleEffect = "");
 
         void importRegions();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 15826009d6..789b1b64fa 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -511,7 +511,7 @@ namespace MWWorld
         return 0;
     }
 
-    const MWWorld::Fallback *World::getFallback() const
+    const Fallback::Map *World::getFallback() const
     {
         return &mFallback;
     }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 4ed97759ef..53d640871e 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -5,21 +5,20 @@
 
 #include <osg/ref_ptr>
 
+#include <components/settings/settings.hpp>
+#include <components/fallback/fallback.hpp>
+
+#include "../mwbase/world.hpp"
+
 #include "ptr.hpp"
 #include "scene.hpp"
 #include "esmstore.hpp"
 #include "cells.hpp"
 #include "localscripts.hpp"
 #include "timestamp.hpp"
-#include "fallback.hpp"
 #include "globals.hpp"
-
-#include "../mwbase/world.hpp"
-
 #include "contentloader.hpp"
 
-#include <components/settings/settings.hpp>
-
 namespace osg
 {
     class Group;
@@ -71,7 +70,7 @@ namespace MWWorld
     {
             Resource::ResourceSystem* mResourceSystem;
 
-            MWWorld::Fallback mFallback;
+            Fallback::Map mFallback;
             MWRender::RenderingManager* mRendering;
 
             MWWorld::WeatherManager* mWeatherManager;
@@ -210,7 +209,7 @@ namespace MWWorld
 
             virtual void adjustSky();
 
-            virtual const Fallback *getFallback() const;
+            virtual const Fallback::Map *getFallback() const;
 
             virtual Player& getPlayer();
             virtual MWWorld::Ptr getPlayerPtr();
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index bbbff234c4..af26fc9989 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -138,6 +138,10 @@ add_component_dir (version
     version
     )
 
+add_component_dir (fallback
+    fallback validate
+    )
+
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
     )
 
diff --git a/apps/openmw/mwworld/fallback.cpp b/components/fallback/fallback.cpp
similarity index 75%
rename from apps/openmw/mwworld/fallback.cpp
rename to components/fallback/fallback.cpp
index e810f8241b..3545956606 100644
--- a/apps/openmw/mwworld/fallback.cpp
+++ b/components/fallback/fallback.cpp
@@ -2,12 +2,12 @@
 
 #include <boost/lexical_cast.hpp>
 
-namespace MWWorld
+namespace Fallback
 {
-    Fallback::Fallback(const std::map<std::string,std::string>& fallback):mFallbackMap(fallback)
+    Map::Map(const std::map<std::string,std::string>& fallback):mFallbackMap(fallback)
     {}
 
-    std::string Fallback::getFallbackString(const std::string& fall) const
+    std::string Map::getFallbackString(const std::string& fall) const
     {
         std::map<std::string,std::string>::const_iterator it;
         if((it = mFallbackMap.find(fall)) == mFallbackMap.end())
@@ -16,7 +16,7 @@ namespace MWWorld
         }
         return it->second;
     }
-    float Fallback::getFallbackFloat(const std::string& fall) const
+    float Map::getFallbackFloat(const std::string& fall) const
     {
         std::string fallback=getFallbackString(fall);
         if(fallback.empty())
@@ -24,7 +24,7 @@ namespace MWWorld
         else
             return boost::lexical_cast<float>(fallback);
     }
-    int Fallback::getFallbackInt(const std::string& fall) const
+    int Map::getFallbackInt(const std::string& fall) const
     {
         std::string fallback=getFallbackString(fall);
         if(fallback.empty())
@@ -33,7 +33,7 @@ namespace MWWorld
             return boost::lexical_cast<int>(fallback);
     }
 
-    bool Fallback::getFallbackBool(const std::string& fall) const
+    bool Map::getFallbackBool(const std::string& fall) const
     {
         std::string fallback=getFallbackString(fall);
         if(fallback.empty())
@@ -41,7 +41,7 @@ namespace MWWorld
         else
             return boost::lexical_cast<bool>(fallback);
     }
-    osg::Vec4f Fallback::getFallbackColour(const std::string& fall) const
+    osg::Vec4f Map::getFallbackColour(const std::string& fall) const
     {
         std::string sum=getFallbackString(fall);
         if(sum.empty())
diff --git a/apps/openmw/mwworld/fallback.hpp b/components/fallback/fallback.hpp
similarity index 67%
rename from apps/openmw/mwworld/fallback.hpp
rename to components/fallback/fallback.hpp
index af47063ee8..b44483fbc1 100644
--- a/apps/openmw/mwworld/fallback.hpp
+++ b/components/fallback/fallback.hpp
@@ -1,18 +1,19 @@
-#ifndef GAME_MWWORLD_FALLBACK_H
-#define GAME_MWWORLD_FALLBACK_H
+#ifndef OPENMW_COMPONENTS_FALLBACK_H
+#define OPENMW_COMPONENTS_FALLBACK_H
 
 #include <map>
 #include <string>
 
 #include <osg/Vec4f>
 
-namespace MWWorld
+namespace Fallback
 {
-    class Fallback
+    /// @brief contains settings imported from the Morrowind INI file.
+    class Map
     {
             const std::map<std::string,std::string> mFallbackMap;
         public:
-            Fallback(const std::map<std::string,std::string>& fallback);
+            Map(const std::map<std::string,std::string>& fallback);
             std::string getFallbackString(const std::string& fall) const;
             float getFallbackFloat(const std::string& fall) const;
             int getFallbackInt(const std::string& fall) const;
diff --git a/components/fallback/validate.hpp b/components/fallback/validate.hpp
new file mode 100644
index 0000000000..3b6398d6a2
--- /dev/null
+++ b/components/fallback/validate.hpp
@@ -0,0 +1,48 @@
+#ifndef OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
+#define OPENMW_COMPONENTS_FALLBACK_VALIDATE_H
+
+#include <boost/program_options.hpp>
+
+// Parses and validates a fallback map from boost program_options.
+// Note: for boost to pick up the validate function, you need to pull in the namespace e.g.
+// by using namespace Fallback;
+
+namespace Fallback
+{
+
+    struct FallbackMap {
+        std::map<std::string,std::string> mMap;
+    };
+
+    void validate(boost::any &v, std::vector<std::string> const &tokens, FallbackMap*, int)
+    {
+        if(v.empty())
+        {
+            v = boost::any(FallbackMap());
+        }
+
+        FallbackMap *map = boost::any_cast<FallbackMap>(&v);
+
+        for(std::vector<std::string>::const_iterator it=tokens.begin(); it != tokens.end(); ++it)
+        {
+            int sep = it->find(",");
+            if(sep < 1 || sep == (int)it->length()-1)
+    #if (BOOST_VERSION < 104200)
+                throw boost::program_options::validation_error("invalid value");
+    #else
+                throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value);
+    #endif
+
+            std::string key(it->substr(0,sep));
+            std::string value(it->substr(sep+1));
+
+            if(map->mMap.find(key) == map->mMap.end())
+            {
+                map->mMap.insert(std::make_pair (key,value));
+            }
+        }
+    }
+
+}
+
+#endif

From 11496b8075afeee21c93d0837f71ccec47c6d08f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 12:58:36 +0100
Subject: [PATCH 079/765] Read fallback settings in OpenCS

---
 apps/opencs/editor.cpp                    | 8 ++++++++
 apps/opencs/model/doc/document.cpp        | 3 ++-
 apps/opencs/model/doc/document.hpp        | 8 +++++++-
 apps/opencs/model/doc/documentmanager.cpp | 7 ++++++-
 apps/opencs/model/doc/documentmanager.hpp | 4 ++++
 components/fallback/fallback.hpp          | 4 +++-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 92f1082b75..54e323956d 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -8,6 +8,8 @@
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
 
+#include <components/fallback/validate.hpp>
+
 #include <components/nifosg/nifloader.hpp>
 
 #include "model/doc/document.hpp"
@@ -17,6 +19,8 @@
 #include <Windows.h>
 #endif
 
+using namespace Fallback;
+
 CS::Editor::Editor ()
 : mSettingsState (mCfgMgr), mDocumentManager (mCfgMgr),
   mViewManager (mDocumentManager), mPid(""),
@@ -100,6 +104,8 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
     ("resources", boost::program_options::value<std::string>()->default_value("resources"))
     ("fallback-archive", boost::program_options::value<std::vector<std::string> >()->
         default_value(std::vector<std::string>(), "fallback-archive")->multitoken())
+    ("fallback", boost::program_options::value<FallbackMap>()->default_value(FallbackMap(), "")
+        ->multitoken()->composing(), "fallback values")
     ("script-blacklist", boost::program_options::value<std::vector<std::string> >()->default_value(std::vector<std::string>(), "")
         ->multitoken(), "exclude specified script from the verifier (if the use of the blacklist is enabled)")
     ("script-blacklist-use", boost::program_options::value<bool>()->implicit_value(true)
@@ -114,6 +120,8 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
 
     mDocumentManager.setResourceDir (mResources = variables["resources"].as<std::string>());
 
+    mDocumentManager.setFallbackMap (variables["fallback"].as<FallbackMap>().mMap);
+
     if (variables["script-blacklist-use"].as<bool>())
         mDocumentManager.setBlacklistedScripts (
             variables["script-blacklist"].as<std::vector<std::string> >());
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 8cafa7ae1f..59d66f36cc 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2247,6 +2247,7 @@ void CSMDoc::Document::createBase()
 CSMDoc::Document::Document (const VFS::Manager* vfs, const Files::ConfigurationManager& configuration,
     const std::vector< boost::filesystem::path >& files, bool new_,
     const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
+    const Fallback::Map* fallback,
     ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager,
     const std::vector<std::string>& blacklistedScripts)
 : mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager),
@@ -2255,7 +2256,7 @@ CSMDoc::Document::Document (const VFS::Manager* vfs, const Files::ConfigurationM
   (savePath.filename().string() + ".project")),
   mSavingOperation (*this, mProjectPath, encoding),
   mSaving (&mSavingOperation),
-  mResDir(resDir),
+  mResDir(resDir), mFallbackMap(fallback),
   mRunner (mProjectPath), mDirty (false), mIdCompletionManager(mData)
 {
     if (mContentFiles.empty())
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index 0e8ae6d454..41640f66d5 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -25,9 +25,13 @@
 
 class QAbstractItemModel;
 
+namespace Fallback
+{
+    class Map;
+}
+
 namespace VFS
 {
-
     class Manager;
 }
 
@@ -66,6 +70,7 @@ namespace CSMDoc
             Saving mSavingOperation;
             OperationHolder mSaving;
             boost::filesystem::path mResDir;
+            const Fallback::Map* mFallbackMap;
             Blacklist mBlacklist;
             Runner mRunner;
             bool mDirty;
@@ -101,6 +106,7 @@ namespace CSMDoc
             Document (const VFS::Manager* vfs, const Files::ConfigurationManager& configuration,
                 const std::vector< boost::filesystem::path >& files, bool new_,
                 const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
+                const Fallback::Map* fallback,
                 ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager,
                 const std::vector<std::string>& blacklistedScripts);
 
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 407a608cab..cbb255ebb9 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -64,7 +64,7 @@ CSMDoc::Document *CSMDoc::DocumentManager::makeDocument (
     const std::vector< boost::filesystem::path >& files,
     const boost::filesystem::path& savePath, bool new_)
 {
-    return new Document (mVFS, mConfiguration, files, new_, savePath, mResDir, mEncoding, mResourcesManager, mBlacklistedScripts);
+    return new Document (mVFS, mConfiguration, files, new_, savePath, mResDir, &mFallbackMap, mEncoding, mResourcesManager, mBlacklistedScripts);
 }
 
 void CSMDoc::DocumentManager::insertDocument (CSMDoc::Document *document)
@@ -100,6 +100,11 @@ void CSMDoc::DocumentManager::setResourceDir (const boost::filesystem::path& par
     mResDir = boost::filesystem::system_complete(parResDir);
 }
 
+void CSMDoc::DocumentManager::setFallbackMap(const std::map<std::string, std::string>& fallbackMap)
+{
+    mFallbackMap = Fallback::Map(fallbackMap);
+}
+
 void CSMDoc::DocumentManager::setEncoding (ToUTF8::FromType encoding)
 {
     mEncoding = encoding;
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
index 4f6b2b2c99..ed8e327d7b 100644
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -10,6 +10,7 @@
 #include <QThread>
 
 #include <components/to_utf8/to_utf8.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "../world/resourcesmanager.hpp"
 
@@ -67,6 +68,8 @@ namespace CSMDoc
 
             void setResourceDir (const boost::filesystem::path& parResDir);
 
+            void setFallbackMap (const std::map<std::string, std::string>& fallbackMap);
+
             void setEncoding (ToUTF8::FromType encoding);
 
             void setBlacklistedScripts (const std::vector<std::string>& scriptIds);
@@ -78,6 +81,7 @@ namespace CSMDoc
         private:
 
             boost::filesystem::path mResDir;
+            Fallback::Map mFallbackMap;
 
         private slots:
 
diff --git a/components/fallback/fallback.hpp b/components/fallback/fallback.hpp
index b44483fbc1..e649365317 100644
--- a/components/fallback/fallback.hpp
+++ b/components/fallback/fallback.hpp
@@ -11,9 +11,11 @@ namespace Fallback
     /// @brief contains settings imported from the Morrowind INI file.
     class Map
     {
-            const std::map<std::string,std::string> mFallbackMap;
+            std::map<std::string,std::string> mFallbackMap;
         public:
             Map(const std::map<std::string,std::string>& fallback);
+            Map() {}
+
             std::string getFallbackString(const std::string& fall) const;
             float getFallbackFloat(const std::string& fall) const;
             int getFallbackInt(const std::string& fall) const;

From fb849014bd2c413fe8bb9114ab99f5e31ada73b7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 13:09:53 +0100
Subject: [PATCH 080/765] Pass the fallback map to CSMWorld::Data

---
 apps/opencs/model/doc/document.cpp |  2 +-
 apps/opencs/model/world/data.cpp   | 10 ++++++++--
 apps/opencs/model/world/data.hpp   | 10 +++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 59d66f36cc..80c14bd985 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2250,7 +2250,7 @@ CSMDoc::Document::Document (const VFS::Manager* vfs, const Files::ConfigurationM
     const Fallback::Map* fallback,
     ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager,
     const std::vector<std::string>& blacklistedScripts)
-: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager),
+: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager, fallback),
   mTools (*this, encoding),
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 1f98b24757..6eccb74830 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -59,9 +59,10 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
     return number;
 }
 
-CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager)
+CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback)
 : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
-  mResourcesManager (resourcesManager), mReader (0), mDialogue (0), mReaderIndex(0), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
+  mResourcesManager (resourcesManager), mFallbackMap(fallback),
+  mReader (0), mDialogue (0), mReaderIndex(0), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
 {
     int index = 0;
 
@@ -1201,3 +1202,8 @@ const VFS::Manager* CSMWorld::Data::getVFS() const
 {
     return mResourcesManager.getVFS();
 }
+
+const Fallback::Map* CSMWorld::Data::getFallbackMap() const
+{
+    return mFallbackMap;
+}
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index c6623279a6..e5b8229c4f 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -58,6 +58,11 @@ namespace VFS
     class Manager;
 }
 
+namespace Fallback
+{
+    class Map;
+}
+
 namespace ESM
 {
     class ESMReader;
@@ -104,6 +109,7 @@ namespace CSMWorld
             IdCollection<ESM::Filter> mFilters;
             Collection<MetaData> mMetaData;
             const ResourcesManager& mResourcesManager;
+            const Fallback::Map* mFallbackMap;
             std::vector<QAbstractItemModel *> mModels;
             std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
             ESM::ESMReader *mReader;
@@ -132,12 +138,14 @@ namespace CSMWorld
 
         public:
 
-            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager);
+            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback);
 
             virtual ~Data();
 
             const VFS::Manager* getVFS() const;
 
+            const Fallback::Map* getFallbackMap() const;
+
             boost::shared_ptr<Resource::ResourceSystem> getResourceSystem();
 
             boost::shared_ptr<const Resource::ResourceSystem> getResourceSystem() const;

From 438b30d6f0a1d6726a80df7ef24e49fd5623c85a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 13:19:15 +0100
Subject: [PATCH 081/765] Move configureLight to a separate file

---
 apps/openmw/mwrender/animation.cpp    |  3 ++-
 components/CMakeLists.txt             |  3 ++-
 components/sceneutil/lightmanager.cpp | 24 --------------------
 components/sceneutil/lightmanager.hpp |  4 ----
 components/sceneutil/lightutil.cpp    | 32 +++++++++++++++++++++++++++
 components/sceneutil/lightutil.hpp    | 19 ++++++++++++++++
 6 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 components/sceneutil/lightutil.cpp
 create mode 100644 components/sceneutil/lightutil.hpp

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index c2fc82881f..6300d28cf1 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -30,8 +30,9 @@
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
-#include <components/sceneutil/util.hpp>
+#include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/lightcontroller.hpp>
+#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index af26fc9989..089779eda8 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -45,7 +45,8 @@ add_component_dir (resource
     )
 
 add_component_dir (sceneutil
-    clone attach lightmanager visitor util statesetupdater controller skeleton riggeometry lightcontroller positionattitudetransform
+    clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
+    lightmanager lightutil positionattitudetransform
     # not used yet
     #workqueue
     )
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 1706bb2b1e..f9182c1d2d 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -371,28 +371,4 @@ namespace SceneUtil
             traverse(node, nv);
     }
 
-    void configureLight(osg::Light *light, float radius, bool isExterior, bool outQuadInLin, bool useQuadratic,
-                        float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult, float linearValue)
-    {
-        bool quadratic = useQuadratic && (!outQuadInLin || isExterior);
-
-        float quadraticAttenuation = 0;
-        float linearAttenuation = 0;
-        if (quadratic)
-        {
-            float r = radius * quadraticRadiusMult;
-            quadraticAttenuation = quadraticValue / std::pow(r, 2);
-        }
-        if (useLinear)
-        {
-            float r = radius * linearRadiusMult;
-            linearAttenuation = linearValue / r;
-        }
-
-        light->setLinearAttenuation(linearAttenuation);
-        light->setQuadraticAttenuation(quadraticAttenuation);
-        light->setConstantAttenuation(0.f);
-
-    }
-
 }
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 3e6d3251bb..07b3b4a62e 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -168,10 +168,6 @@ namespace SceneUtil
         LightManager::LightList mLightList;
     };
 
-    /// @brief Configures a light's attenuation according to vanilla Morrowind attenuation settings.
-    void configureLight(osg::Light* light, float radius, bool isExterior, bool outQuadInLin, bool useQuadratic, float quadraticValue,
-                         float quadraticRadiusMult, bool useLinear, float linearRadiusMult, float linearValue);
-
 }
 
 #endif
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
new file mode 100644
index 0000000000..711a94ba8c
--- /dev/null
+++ b/components/sceneutil/lightutil.cpp
@@ -0,0 +1,32 @@
+#include "lightutil.hpp"
+
+#include <osg/Light>
+
+namespace SceneUtil
+{
+
+    void configureLight(osg::Light *light, float radius, bool isExterior, bool outQuadInLin, bool useQuadratic,
+                        float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult, float linearValue)
+    {
+        bool quadratic = useQuadratic && (!outQuadInLin || isExterior);
+
+        float quadraticAttenuation = 0;
+        float linearAttenuation = 0;
+        if (quadratic)
+        {
+            float r = radius * quadraticRadiusMult;
+            quadraticAttenuation = quadraticValue / std::pow(r, 2);
+        }
+        if (useLinear)
+        {
+            float r = radius * linearRadiusMult;
+            linearAttenuation = linearValue / r;
+        }
+
+        light->setLinearAttenuation(linearAttenuation);
+        light->setQuadraticAttenuation(quadraticAttenuation);
+        light->setConstantAttenuation(0.f);
+
+    }
+
+}
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
new file mode 100644
index 0000000000..09d23d4a21
--- /dev/null
+++ b/components/sceneutil/lightutil.hpp
@@ -0,0 +1,19 @@
+#ifndef OPENMW_COMPONENTS_LIGHTUTIL_H
+#define OPENMW_COMPONENTS_LIGHTUTIL_H
+
+namespace osg
+{
+    class Light;
+}
+
+namespace SceneUtil
+{
+
+    /// @brief Configures a light's attenuation according to vanilla Morrowind attenuation settings.
+    void configureLight(osg::Light* light, float radius, bool isExterior, bool outQuadInLin, bool useQuadratic,
+                        float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
+                        float linearValue);
+
+}
+
+#endif

From 3089aeccc4f82aebd9d5ae1801b3d9adcf5621eb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 13:37:55 +0100
Subject: [PATCH 082/765] Factor out SceneUtil::addLight

---
 apps/openmw/mwrender/animation.cpp | 66 +-------------------------
 components/sceneutil/lightutil.cpp | 75 ++++++++++++++++++++++++++++++
 components/sceneutil/lightutil.hpp | 21 +++++++--
 3 files changed, 94 insertions(+), 68 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 6300d28cf1..549d0eb8e6 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -6,7 +6,6 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
-#include <osg/ComputeBoundsVisitor>
 #include <osg/MatrixTransform>
 #include <osg/Geode>
 #include <osg/BlendFunc>
@@ -31,8 +30,6 @@
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
-#include <components/sceneutil/lightcontroller.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 
@@ -1088,38 +1085,7 @@ namespace MWRender
 
     void Animation::addExtraLight(osg::ref_ptr<osg::Group> parent, const ESM::Light *esmLight)
     {
-        SceneUtil::FindByNameVisitor visitor("AttachLight");
-        parent->accept(visitor);
-
-        osg::Group* attachTo = NULL;
-        if (visitor.mFoundNode)
-        {
-            attachTo = visitor.mFoundNode;
-        }
-        else
-        {
-            osg::ComputeBoundsVisitor computeBound;
-            computeBound.setTraversalMask(~Mask_ParticleSystem);
-            parent->accept(computeBound);
-
-            // PositionAttitudeTransform seems to be slightly faster than MatrixTransform
-            osg::ref_ptr<osg::PositionAttitudeTransform> trans(new osg::PositionAttitudeTransform);
-            trans->setPosition(computeBound.getBoundingBox().center());
-
-            parent->addChild(trans);
-
-            attachTo = trans;
-        }
-
-        osg::ref_ptr<SceneUtil::LightSource> lightSource = new SceneUtil::LightSource;
-        osg::ref_ptr<osg::Light> light (new osg::Light);
-        lightSource->setNodeMask(Mask_Lighting);
-
         const Fallback::Map* fallback = MWBase::Environment::get().getWorld()->getFallback();
-
-        float radius = esmLight->mData.mRadius;
-        lightSource->setRadius(radius);
-
         static bool outQuadInLin = fallback->getFallbackBool("LightAttenuation_OutQuadInLin");
         static bool useQuadratic = fallback->getFallbackBool("LightAttenuation_UseQuadratic");
         static float quadraticValue = fallback->getFallbackFloat("LightAttenuation_QuadraticValue");
@@ -1127,38 +1093,10 @@ namespace MWRender
         static bool useLinear = fallback->getFallbackBool("LightAttenuation_UseLinear");
         static float linearRadiusMult = fallback->getFallbackFloat("LightAttenuation_LinearRadiusMult");
         static float linearValue = fallback->getFallbackFloat("LightAttenuation_LinearValue");
-
         bool exterior = mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior();
 
-        SceneUtil::configureLight(light, radius, exterior, outQuadInLin, useQuadratic, quadraticValue,
-                                  quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
-
-        osg::Vec4f diffuse = SceneUtil::colourFromRGB(esmLight->mData.mColor);
-        if (esmLight->mData.mFlags & ESM::Light::Negative)
-        {
-            diffuse *= -1;
-            diffuse.a() = 1;
-        }
-        light->setDiffuse(diffuse);
-        light->setAmbient(osg::Vec4f(0,0,0,1));
-        light->setSpecular(osg::Vec4f(0,0,0,0));
-
-        lightSource->setLight(light);
-
-        osg::ref_ptr<SceneUtil::LightController> ctrl (new SceneUtil::LightController);
-        ctrl->setDiffuse(light->getDiffuse());
-        if (esmLight->mData.mFlags & ESM::Light::Flicker)
-            ctrl->setType(SceneUtil::LightController::LT_Flicker);
-        if (esmLight->mData.mFlags & ESM::Light::FlickerSlow)
-            ctrl->setType(SceneUtil::LightController::LT_FlickerSlow);
-        if (esmLight->mData.mFlags & ESM::Light::Pulse)
-            ctrl->setType(SceneUtil::LightController::LT_Pulse);
-        if (esmLight->mData.mFlags & ESM::Light::PulseSlow)
-            ctrl->setType(SceneUtil::LightController::LT_PulseSlow);
-
-        lightSource->addUpdateCallback(ctrl);
-
-        attachTo->addChild(lightSource);
+        SceneUtil::addLight(parent, esmLight, Mask_ParticleSystem, Mask_Lighting, exterior, outQuadInLin,
+                            useQuadratic, quadraticValue, quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
     }
 
     void Animation::addEffect (const std::string& model, int effectId, bool loop, const std::string& bonename, std::string texture)
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 711a94ba8c..00f7f4d13a 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -1,6 +1,16 @@
 #include "lightutil.hpp"
 
 #include <osg/Light>
+#include <osg/Group>
+#include <osg/ComputeBoundsVisitor>
+
+#include <components/esm/loadligh.hpp>
+
+#include "lightmanager.hpp"
+#include "lightcontroller.hpp"
+#include "util.hpp"
+#include "visitor.hpp"
+#include "positionattitudetransform.hpp"
 
 namespace SceneUtil
 {
@@ -29,4 +39,69 @@ namespace SceneUtil
 
     }
 
+    void addLight (osg::Group* node, const ESM::Light* esmLight, int partsysMask, int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
+                   float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
+                   float linearValue)
+    {
+        SceneUtil::FindByNameVisitor visitor("AttachLight");
+        node->accept(visitor);
+
+        osg::Group* attachTo = NULL;
+        if (visitor.mFoundNode)
+        {
+            attachTo = visitor.mFoundNode;
+        }
+        else
+        {
+            osg::ComputeBoundsVisitor computeBound;
+            computeBound.setTraversalMask(~partsysMask);
+            node->accept(computeBound);
+
+            // PositionAttitudeTransform seems to be slightly faster than MatrixTransform
+            osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans(new SceneUtil::PositionAttitudeTransform);
+            trans->setPosition(computeBound.getBoundingBox().center());
+
+            node->addChild(trans);
+
+            attachTo = trans;
+        }
+
+        osg::ref_ptr<SceneUtil::LightSource> lightSource (new SceneUtil::LightSource);
+        osg::ref_ptr<osg::Light> light (new osg::Light);
+        lightSource->setNodeMask(lightMask);
+
+        float radius = esmLight->mData.mRadius;
+        lightSource->setRadius(radius);
+
+        configureLight(light, radius, isExterior, outQuadInLin, useQuadratic, quadraticValue,
+                                  quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
+
+        osg::Vec4f diffuse = SceneUtil::colourFromRGB(esmLight->mData.mColor);
+        if (esmLight->mData.mFlags & ESM::Light::Negative)
+        {
+            diffuse *= -1;
+            diffuse.a() = 1;
+        }
+        light->setDiffuse(diffuse);
+        light->setAmbient(osg::Vec4f(0,0,0,1));
+        light->setSpecular(osg::Vec4f(0,0,0,0));
+
+        lightSource->setLight(light);
+
+        osg::ref_ptr<SceneUtil::LightController> ctrl (new SceneUtil::LightController);
+        ctrl->setDiffuse(light->getDiffuse());
+        if (esmLight->mData.mFlags & ESM::Light::Flicker)
+            ctrl->setType(SceneUtil::LightController::LT_Flicker);
+        if (esmLight->mData.mFlags & ESM::Light::FlickerSlow)
+            ctrl->setType(SceneUtil::LightController::LT_FlickerSlow);
+        if (esmLight->mData.mFlags & ESM::Light::Pulse)
+            ctrl->setType(SceneUtil::LightController::LT_Pulse);
+        if (esmLight->mData.mFlags & ESM::Light::PulseSlow)
+            ctrl->setType(SceneUtil::LightController::LT_PulseSlow);
+
+        lightSource->addUpdateCallback(ctrl);
+
+        attachTo->addChild(lightSource);
+    }
+
 }
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 09d23d4a21..f7879cd72e 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -2,6 +2,11 @@
 #define OPENMW_COMPONENTS_LIGHTUTIL_H
 
 namespace osg
+{
+    class Group;
+}
+
+namespace ESM
 {
     class Light;
 }
@@ -9,10 +14,18 @@ namespace osg
 namespace SceneUtil
 {
 
-    /// @brief Configures a light's attenuation according to vanilla Morrowind attenuation settings.
-    void configureLight(osg::Light* light, float radius, bool isExterior, bool outQuadInLin, bool useQuadratic,
-                        float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
-                        float linearValue);
+    /// @brief Convert an ESM::Light to a SceneUtil::LightSource, and add it to a sub graph.
+    /// @note If the sub graph contains a node named "AttachLight" (case insensitive), then the light is added to that.
+    /// Otherwise, the light is added in the center of the node's bounds.
+    /// @param node The sub graph to add a light to
+    /// @param esmLight The light definition coming from the game files containing radius, color, flicker, etc.
+    /// @param partsysMask Node mask to ignore when computing the sub graph's bounding box.
+    /// @param lightMask Mask to assign to the newly created LightSource.
+    /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
+    /// @par Attenuation parameters come from the game INI file.
+    void addLight (osg::Group* node, const ESM::Light* esmLight, int partsysMask, int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
+                   float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
+                   float linearValue);
 
 }
 

From ad2145b4634def65c7e7f8b7d2a2e5da15458242 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 14:34:39 +0100
Subject: [PATCH 083/765] OpenCS: use a separate enum for the toggle buttons

---
 apps/opencs/CMakeLists.txt                    |  2 +-
 apps/opencs/view/render/cell.cpp              |  6 ++---
 apps/opencs/view/render/cellarrow.cpp         |  7 +++--
 apps/opencs/view/render/elements.hpp          | 23 ----------------
 apps/opencs/view/render/instancemode.cpp      |  6 ++---
 apps/opencs/view/render/mask.hpp              | 27 +++++++++++++++++++
 apps/opencs/view/render/object.cpp            |  7 +++--
 .../view/render/pagedworldspacewidget.cpp     | 26 +++++++++---------
 apps/opencs/view/render/scenewidget.cpp       |  6 ++---
 apps/opencs/view/render/tagbase.cpp           |  6 ++---
 apps/opencs/view/render/tagbase.hpp           |  8 +++---
 .../view/render/unpagedworldspacewidget.cpp   |  6 ++---
 apps/opencs/view/render/worldspacewidget.cpp  | 18 ++++++-------
 apps/opencs/view/render/worldspacewidget.hpp  |  2 +-
 apps/opencs/view/widget/scenetooltoggle.cpp   | 14 +++++-----
 apps/opencs/view/widget/scenetooltoggle.hpp   | 10 +++----
 apps/opencs/view/widget/scenetooltoggle2.cpp  | 24 +++++++++++------
 apps/opencs/view/widget/scenetooltoggle2.hpp  | 21 +++++++++++----
 18 files changed, 120 insertions(+), 99 deletions(-)
 delete mode 100644 apps/opencs/view/render/elements.hpp
 create mode 100644 apps/opencs/view/render/mask.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0e9a49432b..8bb624704b 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -94,7 +94,7 @@ opencs_units_noqt (view/render
     )
 
 opencs_hdrs_noqt (view/render
-    elements
+    mask
     )
 
 
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index da40f7e7cb..40981164de 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -11,7 +11,7 @@
 #include "../../model/world/refcollection.hpp"
 #include "../../model/world/cellcoordinates.hpp"
 
-#include "elements.hpp"
+#include "mask.hpp"
 #include "terrainstorage.hpp"
 
 bool CSVRender::Cell::removeObject (const std::string& id)
@@ -80,7 +80,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
 
             if (esmLand.getLandData (ESM::Land::DATA_VHGT))
             {
-                mTerrain.reset(new Terrain::TerrainGrid(mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Element_Terrain<<1));
+                mTerrain.reset(new Terrain::TerrainGrid(mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Mask_Terrain));
                 mTerrain->loadCell(esmLand.mX,
                                    esmLand.mY);
             }
@@ -230,7 +230,7 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
 {
-    if (elementMask & Element_Reference)
+    if (elementMask & Mask_Reference)
     {
         for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
             iter!=mObjects.end(); ++iter)
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp
index 1356aa0fbd..6d8fa1c6c1 100644
--- a/apps/opencs/view/render/cellarrow.cpp
+++ b/apps/opencs/view/render/cellarrow.cpp
@@ -7,10 +7,10 @@
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
-#include "elements.hpp"
+#include "mask.hpp"
 
 CSVRender::CellArrowTag::CellArrowTag (CellArrow *arrow)
-: TagBase (Element_CellArrow), mArrow (arrow)
+: TagBase (Mask_CellArrow), mArrow (arrow)
 {}
 
 CSVRender::CellArrow *CSVRender::CellArrowTag::getCellArrow() const
@@ -165,8 +165,7 @@ CSVRender::CellArrow::CellArrow (osg::Group *cellNode, Direction direction,
 
     mParentNode->addChild (mBaseNode);
 
-    // 0x1 reserved for separating cull and update visitors
-    mBaseNode->setNodeMask (Element_CellArrow<<1);
+    mBaseNode->setNodeMask (Mask_CellArrow);
 
     adjustTransform();
     buildShape();
diff --git a/apps/opencs/view/render/elements.hpp b/apps/opencs/view/render/elements.hpp
deleted file mode 100644
index 5a37956e9e..0000000000
--- a/apps/opencs/view/render/elements.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef CSV_RENDER_ELEMENTS_H
-#define CSV_RENDER_ELEMENTS_H
-
-namespace CSVRender
-{
-    /// Visual elements in a scene
-    enum Elements
-    {
-        // elements that are part of the actual scene
-        Element_Reference = 0x1,
-        Element_Pathgrid = 0x2,
-        Element_Water = 0x4,
-        Element_Fog = 0x8,
-        Element_Terrain = 0x10,
-
-        // control elements
-        Element_CellMarker = 0x10000,
-        Element_CellArrow = 0x20000,
-        Element_CellBorder = 0x40000
-    };
-}
-
-#endif
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index a4d147bb4d..7f9e426c75 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -3,12 +3,12 @@
 
 #include "../../model/prefs/state.hpp"
 
-#include "elements.hpp"
+#include "mask.hpp"
 #include "object.hpp"
 #include "worldspacewidget.hpp"
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
-: EditMode (worldspaceWidget, QIcon (":placeholder"), Element_Reference, "Instance editing",
+: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
   parent)
 {
 
@@ -28,7 +28,7 @@ void CSVRender::InstanceMode::secondaryEditPressed (osg::ref_ptr<TagBase> tag)
 
 void CSVRender::InstanceMode::primarySelectPressed (osg::ref_ptr<TagBase> tag)
 {
-    getWorldspaceWidget().clearSelection (Element_Reference);
+    getWorldspaceWidget().clearSelection (Mask_Reference);
 
     if (tag)
     {
diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
new file mode 100644
index 0000000000..9e63cc9770
--- /dev/null
+++ b/apps/opencs/view/render/mask.hpp
@@ -0,0 +1,27 @@
+#ifndef CSV_RENDER_ELEMENTS_H
+#define CSV_RENDER_ELEMENTS_H
+
+namespace CSVRender
+{
+
+    /// @note Enumeration values can be changed freely, as long as they do not collide.
+    enum Mask
+    {
+        // internal use within NifLoader, do not change
+        Mask_UpdateVisitor = 0x1,
+
+        // elements that are part of the actual scene
+        Mask_Reference = 0x2,
+        Mask_Pathgrid = 0x4,
+        Mask_Water = 0x8,
+        Mask_Fog = 0x10,
+        Mask_Terrain = 0x20,
+
+        // control elements
+        Mask_CellMarker = 0x10000,
+        Mask_CellArrow = 0x20000,
+        Mask_CellBorder = 0x40000
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index c295a023a8..2ff80b38b5 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -19,7 +19,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/clone.hpp>
 
-#include "elements.hpp"
+#include "mask.hpp"
 
 namespace
 {
@@ -39,7 +39,7 @@ namespace
 
 
 CSVRender::ObjectTag::ObjectTag (Object* object)
-: TagBase (Element_Reference), mObject (object)
+: TagBase (Mask_Reference), mObject (object)
 {}
 
 QString CSVRender::ObjectTag::getToolTip (bool hideBasics) const
@@ -138,8 +138,7 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 
     parentNode->addChild(mBaseNode);
 
-    // 0x1 reserved for separating cull and update visitors
-    mBaseNode->setNodeMask(Element_Reference<<1);
+    mBaseNode->setNodeMask(Mask_Reference);
 
     if (referenceable)
     {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index dae5990e6f..e0707524db 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -18,7 +18,7 @@
 #include "../widget/scenetooltoggle2.hpp"
 
 #include "editmode.hpp"
-#include "elements.hpp"
+#include "mask.hpp"
 
 bool CSVRender::PagedWorldspaceWidget::adjustCells()
 {
@@ -126,8 +126,8 @@ void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
     WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (Element_Terrain, "Terrain");
-    tool->addButton (Element_Fog, "Fog", "", true);
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Terrain, Mask_Terrain, "Terrain");
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Fog, Mask_Fog, "Fog", "", true);
 }
 
 void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
@@ -137,22 +137,22 @@ void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
 
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain shape editing"),
+        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain shape editing"),
         "terrain-shape");
     tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain texture editing"),
+        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain texture editing"),
         "terrain-texture");
     tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain vertex paint editing"),
+        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain vertex paint editing"),
         "terrain-vertex");
     tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Element_Reference, "Terrain movement"),
+        new EditMode (this, QIcon (":placeholder"), Mask_Reference, "Terrain movement"),
         "terrain-move");
 }
 
 void CSVRender::PagedWorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)
 {
-    if (tag && tag->getElement()==Element_CellArrow)
+    if (tag && tag->getMask()==Mask_CellArrow)
     {
         if (button=="p-edit" || button=="s-edit")
         {
@@ -492,7 +492,7 @@ CSVRender::WorldspaceWidget::dropRequirments CSVRender::PagedWorldspaceWidget::g
 
 unsigned int CSVRender::PagedWorldspaceWidget::getVisibilityMask() const
 {
-    return WorldspaceWidget::getVisibilityMask() | mControlElements->getSelection();
+    return WorldspaceWidget::getVisibilityMask() | mControlElements->getSelectionMask();
 }
 
 void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
@@ -510,12 +510,12 @@ CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibil
     mControlElements = new CSVWidget::SceneToolToggle (parent,
         "Controls & Guides Visibility", ":placeholder");
 
-    mControlElements->addButton (":placeholder", Element_CellMarker, ":placeholder",
+    mControlElements->addButton (":placeholder", Mask_CellMarker, ":placeholder",
         "Cell marker");
-    mControlElements->addButton (":placeholder", Element_CellArrow, ":placeholder", "Cell arrows");
-    mControlElements->addButton (":placeholder", Element_CellBorder, ":placeholder", "Cell border");
+    mControlElements->addButton (":placeholder", Mask_CellArrow, ":placeholder", "Cell arrows");
+    mControlElements->addButton (":placeholder", Mask_CellBorder, ":placeholder", "Cell border");
 
-    mControlElements->setSelection (0xffffffff);
+    mControlElements->setSelectionMask (0xffffffff);
 
     connect (mControlElements, SIGNAL (selectionChanged()),
         this, SLOT (elementSelectionChanged()));
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index b1300a991f..d06a6b0011 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -18,6 +18,7 @@
 #include "../widget/scenetoolmode.hpp"
 
 #include "lighting.hpp"
+#include "mask.hpp"
 
 namespace CSVRender
 {
@@ -73,7 +74,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     // Press S to reveal profiling stats
     mView->addEventHandler(new osgViewer::StatsHandler);
 
-    mView->getCamera()->setCullMask(~(0x1));
+    mView->getCamera()->setCullMask(~(Mask_UpdateVisitor));
 
     viewer.addView(mView);
     viewer.setDone(false);
@@ -92,8 +93,7 @@ void RenderWidget::flagAsModified()
 
 void RenderWidget::setVisibilityMask(int mask)
 {
-    // 0x1 reserved for separating cull and update visitors
-    mView->getCamera()->setCullMask(mask<<1);
+    mView->getCamera()->setCullMask(mask);
 }
 
 bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
diff --git a/apps/opencs/view/render/tagbase.cpp b/apps/opencs/view/render/tagbase.cpp
index 79412c1321..3ddd68690f 100644
--- a/apps/opencs/view/render/tagbase.cpp
+++ b/apps/opencs/view/render/tagbase.cpp
@@ -1,11 +1,11 @@
 
 #include "tagbase.hpp"
 
-CSVRender::TagBase::TagBase (Elements element) : mElement (element) {}
+CSVRender::TagBase::TagBase (Mask mask) : mMask (mask) {}
 
-CSVRender::Elements CSVRender::TagBase::getElement() const
+CSVRender::Mask CSVRender::TagBase::getMask() const
 {
-    return mElement;
+    return mMask;
 }
 
 QString CSVRender::TagBase::getToolTip (bool hideBasics) const
diff --git a/apps/opencs/view/render/tagbase.hpp b/apps/opencs/view/render/tagbase.hpp
index 9f169c3b1a..d1ecd2cfd9 100644
--- a/apps/opencs/view/render/tagbase.hpp
+++ b/apps/opencs/view/render/tagbase.hpp
@@ -5,19 +5,19 @@
 
 #include <QString>
 
-#include "elements.hpp"
+#include "mask.hpp"
 
 namespace CSVRender
 {
     class TagBase : public osg::Referenced
     {
-            Elements mElement;
+            Mask mMask;
 
         public:
 
-            TagBase (Elements element);
+            TagBase (Mask mask);
 
-            Elements getElement() const;
+            Mask getMask() const;
 
             virtual QString getToolTip (bool hideBasics) const;
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 68f068daca..4b2ff9a5f0 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -17,7 +17,7 @@
 #include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
-#include "elements.hpp"
+#include "mask.hpp"
 
 void CSVRender::UnpagedWorldspaceWidget::update()
 {
@@ -166,8 +166,8 @@ void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
     WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (Element_Terrain, "Terrain", "", true);
-    tool->addButton (Element_Fog, "Fog");
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Terrain, Mask_Terrain, "Terrain", "", true);
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Fog, Mask_Fog, "Fog");
 }
 
 std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index f0d3986414..3b169b5c29 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -27,7 +27,7 @@
 #include "../widget/scenetoolrun.hpp"
 
 #include "object.hpp"
-#include "elements.hpp"
+#include "mask.hpp"
 #include "editmode.hpp"
 #include "instancemode.hpp"
 
@@ -160,7 +160,7 @@ CSVWidget::SceneToolToggle2 *CSVRender::WorldspaceWidget::makeSceneVisibilitySel
 
     addVisibilitySelectorButtons (mSceneElements);
 
-    mSceneElements->setSelection (0xffffffff);
+    mSceneElements->setSelectionMask (0xffffffff);
 
     connect (mSceneElements, SIGNAL (selectionChanged()),
         this, SLOT (elementSelectionChanged()));
@@ -275,12 +275,12 @@ bool CSVRender::WorldspaceWidget::handleDrop (const std::vector<CSMWorld::Univer
 
 unsigned int CSVRender::WorldspaceWidget::getVisibilityMask() const
 {
-    return mSceneElements->getSelection();
+    return mSceneElements->getSelectionMask();
 }
 
 void CSVRender::WorldspaceWidget::setInteractionMask (unsigned int mask)
 {
-    mInteractionMask = mask | Element_CellMarker | Element_CellArrow;
+    mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow;
 }
 
 unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const
@@ -296,9 +296,9 @@ void CSVRender::WorldspaceWidget::setEditLock (bool locked)
 void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
-    tool->addButton (Element_Reference, "Instances");
-    tool->addButton (Element_Water, "Water");
-    tool->addButton (Element_Pathgrid, "Pathgrid");
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Reference, Mask_Reference, "Instances");
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Water, Mask_Water, "Water");
+    tool->addButton (CSVWidget::SceneToolToggle2::Button_Pathgrid, Mask_Pathgrid, "Pathgrid");
 }
 
 void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
@@ -306,7 +306,7 @@ void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneTo
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (new InstanceMode (this, tool), "object");
     tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Element_Pathgrid, "Pathgrid editing"),
+        new EditMode (this, QIcon (":placeholder"), Mask_Pathgrid, "Pathgrid editing"),
         "pathgrid");
 }
 
@@ -404,7 +404,7 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const Q
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
 
-    visitor.setTraversalMask(getInteractionMask() << 1);
+    visitor.setTraversalMask(getInteractionMask());
 
     mView->getCamera()->accept(visitor);
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 54376cee45..07e505fe2c 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -11,7 +11,7 @@
 #include "../../model/world/tablemimedata.hpp"
 
 #include "scenewidget.hpp"
-#include "elements.hpp"
+#include "mask.hpp"
 
 namespace CSMPrefs
 {
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index d7251882a7..5919a280af 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -40,7 +40,7 @@ void CSVWidget::SceneToolToggle::adjustToolTip()
 
 void CSVWidget::SceneToolToggle::adjustIcon()
 {
-    unsigned int selection = getSelection();
+    unsigned int selection = getSelectionMask();
     if (!selection)
         setIcon (QIcon (QString::fromUtf8 (mEmptyIcon.c_str())));
     else
@@ -135,7 +135,7 @@ void CSVWidget::SceneToolToggle::showPanel (const QPoint& position)
         mFirst->setFocus (Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned int id,
+void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned int mask,
     const std::string& smallIcon, const QString& name, const QString& tooltip)
 {
     if (mButtons.size()>=9)
@@ -151,7 +151,7 @@ void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned in
     mLayout->addWidget (button);
 
     ButtonDesc desc;
-    desc.mId = id;
+    desc.mMask = mask;
     desc.mSmallIcon = smallIcon;
     desc.mName = name;
     desc.mIndex = mButtons.size();
@@ -164,23 +164,23 @@ void CSVWidget::SceneToolToggle::addButton (const std::string& icon, unsigned in
         mFirst = button;
 }
 
-unsigned int CSVWidget::SceneToolToggle::getSelection() const
+unsigned int CSVWidget::SceneToolToggle::getSelectionMask() const
 {
     unsigned int selection = 0;
 
     for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
         iter!=mButtons.end(); ++iter)
         if (iter->first->isChecked())
-            selection |= iter->second.mId;
+            selection |= iter->second.mMask;
 
     return selection;
 }
 
-void CSVWidget::SceneToolToggle::setSelection (unsigned int selection)
+void CSVWidget::SceneToolToggle::setSelectionMask (unsigned int selection)
 {
     for (std::map<PushButton *, ButtonDesc>::iterator iter (mButtons.begin());
         iter!=mButtons.end(); ++iter)
-        iter->first->setChecked (selection & iter->second.mId);
+        iter->first->setChecked (selection & iter->second.mMask);
 
     adjustToolTip();
     adjustIcon();
diff --git a/apps/opencs/view/widget/scenetooltoggle.hpp b/apps/opencs/view/widget/scenetooltoggle.hpp
index 55e6975249..68cd2362e6 100644
--- a/apps/opencs/view/widget/scenetooltoggle.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle.hpp
@@ -20,7 +20,7 @@ namespace CSVWidget
 
             struct ButtonDesc
             {
-                unsigned int mId;
+                unsigned int mMask;
                 std::string mSmallIcon;
                 QString mName;
                 int mIndex;
@@ -54,13 +54,13 @@ namespace CSVWidget
             /// \note The layout algorithm can not handle more than 9 buttons. To prevent this An
             /// attempt to add more will result in an exception being thrown.
             /// The small icons will be sized at (x-4)/3 (where x is the main icon size).
-            void addButton (const std::string& icon, unsigned int id,
+            void addButton (const std::string& icon, unsigned int mask,
                 const std::string& smallIcon, const QString& name, const QString& tooltip = "");
 
-            unsigned int getSelection() const;
+            unsigned int getSelectionMask() const;
 
-            /// \param or'ed button IDs. IDs that do not exist will be ignored.
-            void setSelection (unsigned int selection);
+            /// \param or'ed button masks. buttons that do not exist will be ignored.
+            void setSelectionMask (unsigned int selection);
 
         signals:
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index e0431476eb..3972aadaa3 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -41,8 +41,15 @@ void CSVWidget::SceneToolToggle2::adjustToolTip()
 
 void CSVWidget::SceneToolToggle2::adjustIcon()
 {
+    unsigned int buttonIds = 0;
+
+    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
+        iter!=mButtons.end(); ++iter)
+        if (iter->first->isChecked())
+            buttonIds |= iter->second.mButtonId;
+
     std::ostringstream stream;
-    stream << mCompositeIcon << getSelection();
+    stream << mCompositeIcon << buttonIds;
     setIcon (QIcon (QString::fromUtf8 (stream.str().c_str())));
 }
 
@@ -70,11 +77,11 @@ void CSVWidget::SceneToolToggle2::showPanel (const QPoint& position)
         mFirst->setFocus (Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
+void CSVWidget::SceneToolToggle2::addButton (ButtonId id, unsigned int mask,
     const QString& name, const QString& tooltip, bool disabled)
 {
     std::ostringstream stream;
-    stream << mSingleIcon << id;
+    stream << mSingleIcon << static_cast<unsigned int>(id);
 
     PushButton *button = new PushButton (QIcon (QPixmap (stream.str().c_str())),
         PushButton::Type_Toggle, tooltip.isEmpty() ? name: tooltip, mPanel);
@@ -89,7 +96,8 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
     mLayout->addWidget (button);
 
     ButtonDesc desc;
-    desc.mId = id;
+    desc.mButtonId = id;
+    desc.mMask = mask;
     desc.mName = name;
     desc.mIndex = mButtons.size();
 
@@ -101,23 +109,23 @@ void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
         mFirst = button;
 }
 
-unsigned int CSVWidget::SceneToolToggle2::getSelection() const
+unsigned int CSVWidget::SceneToolToggle2::getSelectionMask() const
 {
     unsigned int selection = 0;
 
     for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
         iter!=mButtons.end(); ++iter)
         if (iter->first->isChecked())
-            selection |= iter->second.mId;
+            selection |= iter->second.mMask;
 
     return selection;
 }
 
-void CSVWidget::SceneToolToggle2::setSelection (unsigned int selection)
+void CSVWidget::SceneToolToggle2::setSelectionMask (unsigned int selection)
 {
     for (std::map<PushButton *, ButtonDesc>::iterator iter (mButtons.begin());
         iter!=mButtons.end(); ++iter)
-        iter->first->setChecked (selection & iter->second.mId);
+        iter->first->setChecked (selection & iter->second.mMask);
 
     adjustToolTip();
     adjustIcon();
diff --git a/apps/opencs/view/widget/scenetooltoggle2.hpp b/apps/opencs/view/widget/scenetooltoggle2.hpp
index 0bae780f97..eea9c3ebc1 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.hpp
@@ -22,7 +22,8 @@ namespace CSVWidget
 
             struct ButtonDesc
             {
-                unsigned int mId;
+                unsigned int mButtonId;
+                unsigned int mMask;
                 QString mName;
                 int mIndex;
             };
@@ -53,15 +54,25 @@ namespace CSVWidget
 
             virtual void showPanel (const QPoint& position);
 
+            /// Visual elements in a scene
+            /// @note do not change the enumeration values, they are used in pre-existing button file names!
+            enum ButtonId
+            {
+                Button_Reference = 0x1,
+                Button_Pathgrid = 0x2,
+                Button_Water = 0x4,
+                Button_Fog = 0x8,
+                Button_Terrain = 0x10
+            };
             /// \attention After the last button has been added, setSelection must be called at
             /// least once to finalise the layout.
-            void addButton (unsigned int id,
+            void addButton (ButtonId buttonId, unsigned int mask,
                 const QString& name, const QString& tooltip = "", bool disabled = false);
 
-            unsigned int getSelection() const;
+            unsigned int getSelectionMask() const;
 
-            /// \param or'ed button IDs. IDs that do not exist will be ignored.
-            void setSelection (unsigned int selection);
+            /// \param or'ed button masks. buttons that do not exist will be ignored.
+            void setSelectionMask (unsigned int selection);
 
         signals:
 

From e7bb8878f3f0a162e89f804e49014615a1894251 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 14:39:48 +0100
Subject: [PATCH 084/765] OpenCS: add a mask for particle systems

---
 apps/opencs/view/render/mask.hpp        | 3 +++
 apps/opencs/view/render/scenewidget.cpp | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
index 9e63cc9770..984dccae4a 100644
--- a/apps/opencs/view/render/mask.hpp
+++ b/apps/opencs/view/render/mask.hpp
@@ -17,6 +17,9 @@ namespace CSVRender
         Mask_Fog = 0x10,
         Mask_Terrain = 0x20,
 
+        // used within models
+        Mask_ParticleSystem = 0x100,
+
         // control elements
         Mask_CellMarker = 0x10000,
         Mask_CellArrow = 0x20000,
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index d06a6b0011..d7138b392b 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -93,7 +93,7 @@ void RenderWidget::flagAsModified()
 
 void RenderWidget::setVisibilityMask(int mask)
 {
-    mView->getCamera()->setCullMask(mask);
+    mView->getCamera()->setCullMask(mask | Mask_ParticleSystem);
 }
 
 bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
@@ -167,6 +167,8 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
 
     setLighting(&mLightingDay);
 
+    mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
+
     /// \todo make shortcut configurable
     QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
     connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));

From 7f967153ef993752c65bcda70bb4724eb76025af Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 15:00:58 +0100
Subject: [PATCH 085/765] OpenCS: create light sources

---
 apps/opencs/view/render/object.cpp      | 30 ++++++++++++++++++++++++-
 apps/opencs/view/render/scenewidget.cpp |  5 ++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 2ff80b38b5..f202be4bc7 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -17,7 +17,9 @@
 #include "../../model/world/refidcollection.hpp"
 
 #include <components/resource/scenemanager.hpp>
-#include <components/sceneutil/clone.hpp>
+#include <components/sceneutil/lightutil.hpp>
+#include <components/sceneutil/lightmanager.hpp>
+#include <components/fallback/fallback.hpp>
 
 #include "mask.hpp"
 
@@ -62,6 +64,7 @@ void CSVRender::Object::update()
     const CSMWorld::RefIdCollection& referenceables = mData.getReferenceables();
 
     int index = referenceables.searchId (mReferenceableId);
+    const ESM::Light* light = NULL;
 
     if (index==-1)
         error = 1;
@@ -73,6 +76,14 @@ void CSVRender::Object::update()
             referenceables.findColumnIndex (CSMWorld::Columns::ColumnId_Model)).
             toString().toUtf8().constData();
 
+        int recordType =
+                referenceables.getData (index,
+                referenceables.findColumnIndex(CSMWorld::Columns::ColumnId_RecordType)).toInt();
+        if (recordType == CSMWorld::UniversalId::Type_Light)
+        {
+            light = &dynamic_cast<const CSMWorld::Record<ESM::Light>& >(referenceables.getRecord(index)).get();
+        }
+
         if (model.empty())
             error = 2;
     }
@@ -97,6 +108,21 @@ void CSVRender::Object::update()
             std::cerr << e.what() << std::endl;
         }
     }
+
+    if (light)
+    {
+        const Fallback::Map* fallback = mData.getFallbackMap();
+        static bool outQuadInLin = fallback->getFallbackBool("LightAttenuation_OutQuadInLin");
+        static bool useQuadratic = fallback->getFallbackBool("LightAttenuation_UseQuadratic");
+        static float quadraticValue = fallback->getFallbackFloat("LightAttenuation_QuadraticValue");
+        static float quadraticRadiusMult = fallback->getFallbackFloat("LightAttenuation_QuadraticRadiusMult");
+        static bool useLinear = fallback->getFallbackBool("LightAttenuation_UseLinear");
+        static float linearRadiusMult = fallback->getFallbackFloat("LightAttenuation_LinearRadiusMult");
+        static float linearValue = fallback->getFallbackFloat("LightAttenuation_LinearValue");
+        bool isExterior = false; // FIXME
+        SceneUtil::addLight(mBaseNode, light, Mask_ParticleSystem, ~0u, isExterior, outQuadInLin, useQuadratic,
+                            quadraticValue, quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
+    }
 }
 
 void CSVRender::Object::adjustTransform()
@@ -131,6 +157,8 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 : mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero)
 {
     mBaseNode = new osg::PositionAttitudeTransform;
+    mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
+
     mOutline = new osgFX::Scribe;
     mOutline->addChild(mBaseNode);
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index d7138b392b..c51b22e090 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -14,6 +14,7 @@
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/sceneutil/lightmanager.hpp>
 
 #include "../widget/scenetoolmode.hpp"
 
@@ -64,7 +65,9 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );
     mView->getCamera()->setProjectionMatrixAsPerspective(30.0f, static_cast<double>(traits->width)/static_cast<double>(traits->height), 1.0f, 10000.0f );
 
-    mRootNode = new osg::Group;
+    SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
+    lightMgr->setStartLight(1);
+    mRootNode = lightMgr;
 
     mView->getCamera()->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
     mView->getCamera()->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);

From 93cc08a09cd5f132e7e79ad28737c33df7852d9d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 23:14:32 +0100
Subject: [PATCH 086/765] Lighting fix for LightListCallbacks attached to a
 Transform node

---
 components/sceneutil/lightmanager.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index f9182c1d2d..64448e73e9 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -309,8 +309,15 @@ namespace SceneUtil
             const osg::RefMatrix* viewMatrix = cv->getCurrentRenderStage()->getInitialViewMatrix();
             const std::vector<LightManager::LightSourceViewBound>& lights = mLightManager->getLightsInViewSpace(cv->getCurrentCamera(), viewMatrix);
 
-            // we do the intersections in view space
-            osg::BoundingSphere nodeBound = node->getBound();
+            // get the node bounds in view space
+            // NB do not node->getBound() * modelView, that would apply the node's transformation twice
+            osg::BoundingSphere nodeBound;
+            osg::Group* group = node->asGroup();
+            if (group)
+            {
+                for (unsigned int i=0; i<group->getNumChildren(); ++i)
+                    nodeBound.expandBy(group->getChild(i)->getBound());
+            }
             osg::Matrixf mat = *cv->getModelViewMatrix();
             transformBoundingSphere(mat, nodeBound);
 

From e1c7165bfb37c881aeb753dd67479501620d14fb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 23:16:47 +0100
Subject: [PATCH 087/765] Fix bounds calculation for addLight to a transform
 node

---
 components/sceneutil/lightutil.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 00f7f4d13a..725157e230 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -55,7 +55,9 @@ namespace SceneUtil
         {
             osg::ComputeBoundsVisitor computeBound;
             computeBound.setTraversalMask(~partsysMask);
-            node->accept(computeBound);
+            // We want the bounds of all children of the node, ignoring the node's local transformation
+            // So do a traverse(), not accept()
+            computeBound.traverse(*node);
 
             // PositionAttitudeTransform seems to be slightly faster than MatrixTransform
             osg::ref_ptr<SceneUtil::PositionAttitudeTransform> trans(new SceneUtil::PositionAttitudeTransform);

From 458a305bff2bcdd9d82d347a13539c537cf14628 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 6 Jan 2016 23:20:26 +0100
Subject: [PATCH 088/765] OpenCS: add lighting mask

---
 apps/opencs/view/render/mask.hpp        | 2 ++
 apps/opencs/view/render/object.cpp      | 2 +-
 apps/opencs/view/render/scenewidget.cpp | 3 ++-
 components/sceneutil/lightutil.cpp      | 2 +-
 components/sceneutil/lightutil.hpp      | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
index 984dccae4a..d2dfef7b47 100644
--- a/apps/opencs/view/render/mask.hpp
+++ b/apps/opencs/view/render/mask.hpp
@@ -20,6 +20,8 @@ namespace CSVRender
         // used within models
         Mask_ParticleSystem = 0x100,
 
+        Mask_Lighting = 0x200,
+
         // control elements
         Mask_CellMarker = 0x10000,
         Mask_CellArrow = 0x20000,
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index f202be4bc7..1821da059e 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -120,7 +120,7 @@ void CSVRender::Object::update()
         static float linearRadiusMult = fallback->getFallbackFloat("LightAttenuation_LinearRadiusMult");
         static float linearValue = fallback->getFallbackFloat("LightAttenuation_LinearValue");
         bool isExterior = false; // FIXME
-        SceneUtil::addLight(mBaseNode, light, Mask_ParticleSystem, ~0u, isExterior, outQuadInLin, useQuadratic,
+        SceneUtil::addLight(mBaseNode, light, Mask_ParticleSystem, Mask_Lighting, isExterior, outQuadInLin, useQuadratic,
                             quadraticValue, quadraticRadiusMult, useLinear, linearRadiusMult, linearValue);
     }
 }
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index c51b22e090..e5b9171e09 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -67,6 +67,7 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
 
     SceneUtil::LightManager* lightMgr = new SceneUtil::LightManager;
     lightMgr->setStartLight(1);
+    lightMgr->setLightingMask(Mask_Lighting);
     mRootNode = lightMgr;
 
     mView->getCamera()->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
@@ -96,7 +97,7 @@ void RenderWidget::flagAsModified()
 
 void RenderWidget::setVisibilityMask(int mask)
 {
-    mView->getCamera()->setCullMask(mask | Mask_ParticleSystem);
+    mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
 }
 
 bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 725157e230..6499c54b1d 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -39,7 +39,7 @@ namespace SceneUtil
 
     }
 
-    void addLight (osg::Group* node, const ESM::Light* esmLight, int partsysMask, int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
+    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
                    float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
                    float linearValue)
     {
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index f7879cd72e..810ffa3187 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -23,7 +23,7 @@ namespace SceneUtil
     /// @param lightMask Mask to assign to the newly created LightSource.
     /// @param isExterior Is the light outside? May be used for deciding which attenuation settings to use.
     /// @par Attenuation parameters come from the game INI file.
-    void addLight (osg::Group* node, const ESM::Light* esmLight, int partsysMask, int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
+    void addLight (osg::Group* node, const ESM::Light* esmLight, unsigned int partsysMask, unsigned int lightMask, bool isExterior, bool outQuadInLin, bool useQuadratic,
                    float quadraticValue, float quadraticRadiusMult, bool useLinear, float linearRadiusMult,
                    float linearValue);
 

From 4e6a60672d3cc265f7532433f79f73eeb2e8bf03 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Jan 2016 00:31:34 +0100
Subject: [PATCH 089/765] When a spell explodes on an actor do not apply it to
 that actor twice (Fixes #3142)

---
 apps/openmw/mwbase/world.hpp              | 4 ++--
 apps/openmw/mwmechanics/spellcasting.cpp  | 2 +-
 apps/openmw/mwworld/projectilemanager.cpp | 3 ++-
 apps/openmw/mwworld/worldimp.cpp          | 7 +++++--
 apps/openmw/mwworld/worldimp.hpp          | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 462d08727c..a1580c434f 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -521,8 +521,8 @@ namespace MWBase
 
             virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos) = 0;
 
-            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects,
-                                       const MWWorld::Ptr& caster, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName) = 0;
+            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
+                                       const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName) = 0;
 
             virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor) = 0;
 
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index ab8784beb1..6073076e00 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -552,7 +552,7 @@ namespace MWMechanics
         }
 
         if (!exploded)
-            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, range, mId, mSourceName);
+            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, target, range, mId, mSourceName);
 
         if (!reflectedEffects.mList.empty())
             inflict(caster, target, reflectedEffects, range, true, exploded);
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 439ac19ec9..d1faf621c2 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -237,7 +237,8 @@ namespace MWWorld
 
             if (hit)
             {
-                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, ESM::RT_Target, it->mSpellId, it->mSourceName);
+                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, result.mHitObject,
+                                                                    ESM::RT_Target, it->mSpellId, it->mSourceName);
 
                 MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
                 mParent->removeChild(it->mNode);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 19d90e2096..810eff643e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3072,8 +3072,8 @@ namespace MWWorld
         mRendering->spawnEffect(model, textureOverride, worldPos);
     }
 
-    void World::explodeSpell(const osg::Vec3f &origin, const ESM::EffectList &effects, const Ptr &caster, ESM::RangeType rangeType,
-                             const std::string& id, const std::string& sourceName)
+    void World::explodeSpell(const osg::Vec3f &origin, const ESM::EffectList &effects, const Ptr &caster, const Ptr& ignore,
+                             ESM::RangeType rangeType, const std::string& id, const std::string& sourceName)
     {
         std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct> > toApply;
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = effects.mList.begin();
@@ -3121,6 +3121,9 @@ namespace MWWorld
             if (apply->first == caster)
                 continue;
 
+            if (apply->first == ignore)
+                continue;
+
             if (source.isEmpty())
                 source = apply->first;
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 5f0507acef..6eed4e4845 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -623,8 +623,8 @@ namespace MWWorld
 
             virtual void spawnEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPos);
 
-            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects,
-                                       const MWWorld::Ptr& caster, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName);
+            virtual void explodeSpell (const osg::Vec3f& origin, const ESM::EffectList& effects, const MWWorld::Ptr& caster,
+                                       const MWWorld::Ptr& ignore, ESM::RangeType rangeType, const std::string& id, const std::string& sourceName);
 
             virtual void activate (const MWWorld::Ptr& object, const MWWorld::Ptr& actor);
 

From ef1a1125e028573931604f5b459ec0f07d31ed28 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Jan 2016 17:10:23 +0100
Subject: [PATCH 090/765] Fix an error in restocking logic (Fixes #3131)

---
 apps/openmw/mwworld/containerstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index ab9fa46110..45390405e0 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -529,10 +529,10 @@ void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MW
         {
             std::map<std::string, int>::iterator listInMap = allowedForReplace.find(itemOrList);
 
-            int restockNum = it->mCount;
+            int restockNum = std::abs(it->mCount);
             //If we know we must restock less, take it into account
             if(listInMap != allowedForReplace.end())
-                restockNum += listInMap->second;//We add, because list items have negative count
+                restockNum -= std::min(restockNum, listInMap->second);
             //restock
             addInitialItem(itemOrList, owner, restockNum, true);
         }

From 471ad3fb0f0f4b332057e3fa7ee277dc780abcc2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Jan 2016 17:10:23 +0100
Subject: [PATCH 091/765] Fix an error in restocking logic (Fixes #3131)

---
 apps/openmw/mwworld/containerstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index ab9fa46110..45390405e0 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -529,10 +529,10 @@ void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MW
         {
             std::map<std::string, int>::iterator listInMap = allowedForReplace.find(itemOrList);
 
-            int restockNum = it->mCount;
+            int restockNum = std::abs(it->mCount);
             //If we know we must restock less, take it into account
             if(listInMap != allowedForReplace.end())
-                restockNum += listInMap->second;//We add, because list items have negative count
+                restockNum -= std::min(restockNum, listInMap->second);
             //restock
             addInitialItem(itemOrList, owner, restockNum, true);
         }

From 2ce2e8a1e7883fced661bd37bbbdba68ce389edd Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Mon, 11 Jan 2016 07:24:52 -0600
Subject: [PATCH 092/765] Add missing OOB slot check to InventoryStore.

---
 apps/openmw/mwworld/inventorystore.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index b82b798d11..dbd2c67940 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -523,6 +523,9 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
 
 MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, const MWWorld::Ptr& actor)
 {
+    if (slot<0 || slot>=static_cast<int> (mSlots.size()))
+        throw std::runtime_error ("slot number out of range");
+
     ContainerStoreIterator it = mSlots[slot];
 
     if (it != end())

From 6eba647a9d4b88925997aba9f2495f367857a519 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 14 Jan 2016 13:19:37 +0100
Subject: [PATCH 093/765] added accessor function for cell selection in paged
 worldspace

---
 apps/opencs/view/render/pagedworldspacewidget.cpp | 5 +++++
 apps/opencs/view/render/pagedworldspacewidget.hpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index e30f238a29..414076cea3 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -432,6 +432,11 @@ void CSVRender::PagedWorldspaceWidget::setCellSelection (const CSMWorld::CellSel
     emit cellSelectionChanged (mSelection);
 }
 
+const CSMWorld::CellSelection& CSVRender::PagedWorldspaceWidget::getCellSelection() const
+{
+    return mSelection;
+}
+
 std::pair< int, int > CSVRender::PagedWorldspaceWidget::getCoordinatesFromId (const std::string& record) const
 {
     std::istringstream stream (record.c_str());
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index bc8e0da646..647341d1f4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -80,6 +80,8 @@ namespace CSVRender
 
             void setCellSelection(const CSMWorld::CellSelection& selection);
 
+            const CSMWorld::CellSelection& getCellSelection() const;
+
             /// \return Drop handled?
             virtual bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
                 DropType type);

From 55627c08532356e348e115af58da90f9bb55af7d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 14 Jan 2016 13:20:01 +0100
Subject: [PATCH 094/765] handling drops into cells that do not exist or are
 not shown

---
 apps/opencs/model/prefs/state.cpp        | 13 ++++
 apps/opencs/view/render/instancemode.cpp | 84 ++++++++++++++++++++----
 2 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index d2ad0f6ef2..859fabd117 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -191,10 +191,23 @@ void CSMPrefs::State::declare()
     declareInt ("scene-delay", "Tooltip delay in milliseconds", 500).
         setMin (1);
 
+    EnumValue createAndInsert ("Create cell and insert");
+    EnumValue showAndInsert ("Show cell and insert");
+    EnumValue dontInsert ("Discard");
+    EnumValue insertAnyway ("Insert anyway");
+    EnumValues insertOutsideCell;
+    insertOutsideCell.add (createAndInsert).add (dontInsert).add (insertAnyway);
+    EnumValues insertOutsideVisibleCell;
+    insertOutsideVisibleCell.add (showAndInsert).add (dontInsert).add (insertAnyway);
+
     declareCategory ("Scene Drops");
     declareInt ("distance", "Drop Distance", 50).
         setTooltip ("If an instance drop can not be placed against another object at the "
             "insert point, it will be placed by this distance from the insert point instead");
+    declareEnum ("outside-drop", "Handling drops outside of cells", createAndInsert).
+        addValues (insertOutsideCell);
+    declareEnum ("outside-visible-drop", "Handling drops outside of visible cells", showAndInsert).
+        addValues (insertOutsideVisibleCell);
 }
 
 void CSMPrefs::State::declareCategory (const std::string& key)
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 6c3593369c..b6430036b4 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -6,11 +6,13 @@
 #include "../../model/prefs/state.hpp"
 
 #include "../../model/world/idtable.hpp"
+#include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 
 #include "elements.hpp"
 #include "object.hpp"
 #include "worldspacewidget.hpp"
+#include "pagedworldspacewidget.hpp"
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Element_Reference, "Instance editing",
@@ -68,7 +70,6 @@ void CSVRender::InstanceMode::dragEnterEvent (QDragEnterEvent *event)
         if (!mime->fromDocument (getWorldspaceWidget().getDocument()))
             return;
 
-        /// \todo document check
         if (mime->holdsType (CSMWorld::UniversalId::Type_Referenceable))
             event->accept();
     }
@@ -87,15 +88,68 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
 
         std::string cellId = getWorldspaceWidget().getCellId (insertPoint);
 
-        bool dropped = false;
+        CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
+            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
 
-        std::vector<CSMWorld::UniversalId> ids = mime->getData();
+        bool noCell = document.getData().getCells().searchId (cellId)==-1;
+
+        if (noCell)
+        {
+            std::string mode = CSMPrefs::get()["Scene Drops"]["outside-drop"].toString();
+
+            // target cell does not exist
+            if (mode=="Discard")
+                return;
+
+            if (mode=="Create cell and insert")
+            {
+                std::auto_ptr<CSMWorld::CreateCommand> createCommand (
+                    new CSMWorld::CreateCommand (cellTable, cellId));
+
+                int parentIndex = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
+                int index = cellTable.findNestedColumnIndex (parentIndex, CSMWorld::Columns::ColumnId_Interior);
+                createCommand->addNestedValue (parentIndex, index, false);
+
+                document.getUndoStack().push (createCommand.release());
+
+                if (CSVRender::PagedWorldspaceWidget *paged =
+                    dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+                {
+                    CSMWorld::CellSelection selection = paged->getCellSelection();
+                    selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
+                    paged->setCellSelection (selection);
+                }
+
+                noCell = false;
+            }
+        }
+        else if (CSVRender::PagedWorldspaceWidget *paged =
+            dynamic_cast<CSVRender::PagedWorldspaceWidget *> (&getWorldspaceWidget()))
+        {
+            CSMWorld::CellSelection selection = paged->getCellSelection();
+            if (!selection.has (CSMWorld::CellCoordinates::fromId (cellId).first))
+            {
+                // target cell exists, but is not shown
+                std::string mode =
+                    CSMPrefs::get()["Scene Drops"]["outside-visible-drop"].toString();
+
+                if (mode=="Discard")
+                    return;
+
+                if (mode=="Show cell and insert")
+                {
+                    selection.add (CSMWorld::CellCoordinates::fromId (cellId).first);
+                    paged->setCellSelection (selection);
+                }
+            }
+        }
 
         CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&> (
             *document.getData().getTableModel (CSMWorld::UniversalId::Type_References));
 
-        CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
-            *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
+        bool dropped = false;
+
+        std::vector<CSMWorld::UniversalId> ids = mime->getData();
 
         for (std::vector<CSMWorld::UniversalId>::const_iterator iter (ids.begin());
             iter!=ids.end(); ++iter)
@@ -118,18 +172,24 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                      CSMWorld::Columns::ColumnId_ReferenceableId),
                      QString::fromUtf8 (iter->getId().c_str()));
 
-                // increase reference count in cell
-                QModelIndex countIndex = cellTable.getModelIndex (cellId,
-                    cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter));
+                std::auto_ptr<CSMWorld::ModifyCommand> incrementCommand;
 
-                int count = cellTable.data (countIndex).toInt();
+                if (!noCell)
+                {
+                    // increase reference count in cell
+                    QModelIndex countIndex = cellTable.getModelIndex (cellId,
+                        cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter));
 
-                std::auto_ptr<CSMWorld::ModifyCommand> incrementCommand (
-                    new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
+                    int count = cellTable.data (countIndex).toInt();
+
+                    incrementCommand.reset (
+                        new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
+                }
 
                 document.getUndoStack().beginMacro (createCommand->text());
                 document.getUndoStack().push (createCommand.release());
-                document.getUndoStack().push (incrementCommand.release());
+                if (incrementCommand.get())
+                    document.getUndoStack().push (incrementCommand.release());
                 document.getUndoStack().endMacro();
 
                 dropped = true;

From 62fe47b144d8312f90b5d773c31712d876f76779 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 13 Jan 2016 15:37:43 +0100
Subject: [PATCH 095/765] Load default terrain if there is none defined

---
 components/esmterrain/storage.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index f0865a0a98..4be56d5e6a 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -14,6 +14,8 @@
 namespace ESMTerrain
 {
 
+    const float defaultHeight = -2048;
+
     Storage::Storage(const VFS::Manager *vfs)
         : mVFS(vfs)
     {
@@ -62,7 +64,9 @@ namespace ESMTerrain
             return true;
         }
 
-        return false;
+        min = defaultHeight;
+        max = defaultHeight;
+        return true;
     }
 
     void Storage::fixNormal (osg::Vec3f& normal, int cellX, int cellY, int col, int row)
@@ -203,7 +207,7 @@ namespace ESMTerrain
                         assert (vertX < numVerts);
                         assert (vertY < numVerts);
 
-                        float height = -2048;
+                        float height = defaultHeight;
                         if (heightData)
                             height = heightData->mHeights[col*ESM::Land::LAND_SIZE + row];
 
@@ -412,7 +416,7 @@ namespace ESMTerrain
 
         const ESM::Land* land = getLand(cellX, cellY);
         if (!land || !(land->mDataTypes&ESM::Land::DATA_VHGT))
-            return -2048;
+            return defaultHeight;
 
         // Mostly lifted from Ogre::Terrain::getHeightAtTerrainPosition
 

From 091ca9743e97f16368c028d15ab00ec113e50b64 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 14 Jan 2016 16:41:29 +0100
Subject: [PATCH 096/765] Do not write LandData twice (Fixes #3140)

---
 apps/opencs/model/doc/savingstages.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index db38c4779b..af9c380a31 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -394,10 +394,6 @@ void CSMDoc::WriteLandCollectionStage::perform (int stage, Messages& messages)
         CSMWorld::Land record = land.get();
         writer.startRecord (record.sRecordId);
         record.save (writer, land.mState == CSMWorld::RecordBase::State_Deleted);
-
-        if (const ESM::Land::LandData *data = record.getLandData (record.mDataTypes))
-            data->save (mState.getWriter());
-
         writer.endRecord (record.sRecordId);
     }
 }

From 0b84b3c2cf3253b0cf6c514485fd4601677859a4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 14 Jan 2016 17:41:39 +0100
Subject: [PATCH 097/765] Don't crash when region weather chances don't add to
 100

The invalid weather ID was resulting in out-of-bounds vector access later in the code.
---
 apps/openmw/mwworld/weather.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 5ce3d5c2fe..321637194e 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -321,10 +321,14 @@ void RegionWeather::chooseNewWeather()
     {
         sum += mChances[i];
         if(chance <= sum)
-            break;
+        {
+            mWeather = i;
+            return;
+        }
     }
 
-    mWeather = i;
+    // if we hit this path then the chances don't add to 100, choose a default weather instead
+    mWeather = 0;
 }
 
 MoonModel::MoonModel(const std::string& name, const MWWorld::Fallback& fallback)

From 4f2a031f4e66e50946ada6b20ada8f03d981fc6c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 14 Jan 2016 18:34:47 +0100
Subject: [PATCH 098/765] Improve error message

---
 apps/openmw/mwworld/containerstore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 45390405e0..d8c37061f9 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -627,7 +627,7 @@ int MWWorld::ContainerStore::getType (const ConstPtr& ptr)
         return Type_Weapon;
 
     throw std::runtime_error (
-        "Object of type " + ptr.getTypeName() + " can not be placed into a container");
+        "Object '" + ptr.getCellRef().getRefId() + "' of type " + ptr.getTypeName() + " can not be placed into a container");
 }
 
 MWWorld::Ptr MWWorld::ContainerStore::search (const std::string& id)

From c1901069be63ecd09b6c5d34d3e56807c3c05bb2 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 15 Jan 2016 12:07:25 +0100
Subject: [PATCH 099/765] added instance mode sub-modes

---
 apps/opencs/view/render/instancemode.cpp | 43 +++++++++++++++++++++++-
 apps/opencs/view/render/instancemode.hpp | 10 ++++++
 apps/opencs/view/world/scenesubview.cpp  |  2 +-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index b6430036b4..449d9d7a6f 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -9,6 +9,9 @@
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 
+#include "../widget/scenetoolbar.hpp"
+#include "../widget/scenetoolmode.hpp"
+
 #include "elements.hpp"
 #include "object.hpp"
 #include "worldspacewidget.hpp"
@@ -16,9 +19,47 @@
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Element_Reference, "Instance editing",
-  parent)
+  parent), mSubMode (0)
 {
+}
 
+void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
+{
+    if (!mSubMode)
+    {
+        mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode");
+        mSubMode->addButton (":placeholder", "move",
+            "Move selected instances"
+            "<ul><li>Use primary edit to move instances around freely</li>"
+            "<li>Use secondary edit to move instances around within the grid</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        mSubMode->addButton (":placeholder", "rotate",
+            "Rotate selected instances"
+            "<ul><li>Use primary edit to rotate instances freely</li>"
+            "<li>Use secondary edit to rotate instances within the grid</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        mSubMode->addButton (":placeholder", "scale",
+            "Scale selected instances"
+            "<ul><li>Use primary edit to scale instances freely</li>"
+            "<li>Use secondary edit to scale instances along the grid</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+    }
+
+    EditMode::activate (toolbar);
+
+    toolbar->addTool (mSubMode);
+}
+
+void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
+{
+    toolbar->removeTool (mSubMode);
+    delete mSubMode;
+    mSubMode = 0;
+
+    EditMode::deactivate (toolbar);
 }
 
 void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 7649c241ca..1eec62874d 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -3,16 +3,26 @@
 
 #include "editmode.hpp"
 
+namespace CSVWidget
+{
+    class SceneToolMode;
+}
+
 namespace CSVRender
 {
     class InstanceMode : public EditMode
     {
             Q_OBJECT
+            CSVWidget::SceneToolMode *mSubMode;
 
         public:
 
             InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent = 0);
 
+            virtual void activate (CSVWidget::SceneToolbar *toolbar);
+
+            virtual void deactivate (CSVWidget::SceneToolbar *toolbar);
+
             virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
 
             virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 44fe94d840..7014b14864 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -122,7 +122,7 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
     CSVWidget::SceneToolRun *runTool = widget->makeRunTool (toolbar);
     toolbar->addTool (runTool);
 
-    toolbar->addTool (widget->makeEditModeSelector (toolbar));
+    toolbar->addTool (widget->makeEditModeSelector (toolbar), runTool);
 
     return toolbar;
 }

From 18320b2cd03052dc70d8d710a91d8dd1e8bd2080 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 15 Jan 2016 15:49:10 +0100
Subject: [PATCH 100/765] Move the Button enum to WorldSpaceWidget

---
 apps/opencs/view/render/pagedworldspacewidget.cpp  |  4 ++--
 .../opencs/view/render/unpagedworldspacewidget.cpp |  4 ++--
 apps/opencs/view/render/worldspacewidget.cpp       |  6 +++---
 apps/opencs/view/render/worldspacewidget.hpp       | 11 +++++++++++
 apps/opencs/view/widget/scenetooltoggle2.cpp       |  4 ++--
 apps/opencs/view/widget/scenetooltoggle2.hpp       | 14 +++-----------
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index c6e422bd10..1880beab8b 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -126,8 +126,8 @@ void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
     WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Terrain, Mask_Terrain, "Terrain");
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Fog, Mask_Fog, "Fog", "", true);
+    tool->addButton (Button_Terrain, Mask_Terrain, "Terrain");
+    tool->addButton (Button_Fog, Mask_Fog, "Fog", "", true);
 }
 
 void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index e203a250ba..dad37c946b 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -171,8 +171,8 @@ void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
     WorldspaceWidget::addVisibilitySelectorButtons (tool);
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Terrain, Mask_Terrain, "Terrain", "", true);
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Fog, Mask_Fog, "Fog");
+    tool->addButton (Button_Terrain, Mask_Terrain, "Terrain", "", true);
+    tool->addButton (Button_Fog, Mask_Fog, "Fog");
 }
 
 std::string CSVRender::UnpagedWorldspaceWidget::getStartupInstruction()
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 800fd3d6e4..184477d6b2 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -296,9 +296,9 @@ void CSVRender::WorldspaceWidget::setEditLock (bool locked)
 void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Reference, Mask_Reference, "Instances");
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Water, Mask_Water, "Water");
-    tool->addButton (CSVWidget::SceneToolToggle2::Button_Pathgrid, Mask_Pathgrid, "Pathgrid");
+    tool->addButton (Button_Reference, Mask_Reference, "Instances");
+    tool->addButton (Button_Water, Mask_Water, "Water");
+    tool->addButton (Button_Pathgrid, Mask_Pathgrid, "Pathgrid");
 }
 
 void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 142ed04ca0..7a77edad42 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -142,6 +142,17 @@ namespace CSVRender
 
         protected:
 
+            /// Visual elements in a scene
+            /// @note do not change the enumeration values, they are used in pre-existing button file names!
+            enum ButtonId
+            {
+                Button_Reference = 0x1,
+                Button_Pathgrid = 0x2,
+                Button_Water = 0x4,
+                Button_Fog = 0x8,
+                Button_Terrain = 0x10
+            };
+
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
 
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 3972aadaa3..720da6a964 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -77,11 +77,11 @@ void CSVWidget::SceneToolToggle2::showPanel (const QPoint& position)
         mFirst->setFocus (Qt::OtherFocusReason);
 }
 
-void CSVWidget::SceneToolToggle2::addButton (ButtonId id, unsigned int mask,
+void CSVWidget::SceneToolToggle2::addButton (unsigned int id, unsigned int mask,
     const QString& name, const QString& tooltip, bool disabled)
 {
     std::ostringstream stream;
-    stream << mSingleIcon << static_cast<unsigned int>(id);
+    stream << mSingleIcon << id;
 
     PushButton *button = new PushButton (QIcon (QPixmap (stream.str().c_str())),
         PushButton::Type_Toggle, tooltip.isEmpty() ? name: tooltip, mPanel);
diff --git a/apps/opencs/view/widget/scenetooltoggle2.hpp b/apps/opencs/view/widget/scenetooltoggle2.hpp
index eea9c3ebc1..50337ac117 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.hpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.hpp
@@ -54,19 +54,11 @@ namespace CSVWidget
 
             virtual void showPanel (const QPoint& position);
 
-            /// Visual elements in a scene
-            /// @note do not change the enumeration values, they are used in pre-existing button file names!
-            enum ButtonId
-            {
-                Button_Reference = 0x1,
-                Button_Pathgrid = 0x2,
-                Button_Water = 0x4,
-                Button_Fog = 0x8,
-                Button_Terrain = 0x10
-            };
+            /// \param buttonId used to compose the icon filename
+            /// \param mask used for the reported getSelectionMask() / setSelectionMask()
             /// \attention After the last button has been added, setSelection must be called at
             /// least once to finalise the layout.
-            void addButton (ButtonId buttonId, unsigned int mask,
+            void addButton (unsigned int buttonId, unsigned int mask,
                 const QString& name, const QString& tooltip = "", bool disabled = false);
 
             unsigned int getSelectionMask() const;

From fbf07133ead40924b7ed57191505627fb632279c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 15 Jan 2016 16:31:24 +0100
Subject: [PATCH 101/765] Document usage of node masks

---
 apps/opencs/view/render/mask.hpp |  5 ++++-
 apps/openmw/mwrender/vismask.hpp | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/mask.hpp b/apps/opencs/view/render/mask.hpp
index d2dfef7b47..55b7c823f3 100644
--- a/apps/opencs/view/render/mask.hpp
+++ b/apps/opencs/view/render/mask.hpp
@@ -4,7 +4,10 @@
 namespace CSVRender
 {
 
-    /// @note Enumeration values can be changed freely, as long as they do not collide.
+    /// Node masks used on the OSG scene graph in OpenMW-CS.
+    /// @note See the respective file in OpenMW (apps/openmw/mwrender/vismask.hpp)
+    /// for general usage hints about node masks.
+    /// @copydoc MWRender::VisMask
     enum Mask
     {
         // internal use within NifLoader, do not change
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index dd6e85e2ca..81bb2f3440 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -5,6 +5,20 @@ namespace MWRender
 {
 
     /// Node masks used for controlling visibility of game objects.
+    /// @par Any node in the OSG scene graph can have a node mask. When traversing the scene graph,
+    /// the node visitor's traversal mask is OR'ed with the node mask. If the result of this test is
+    /// 0, then the node <i>and all its child nodes</i> are not processed.
+    /// @par Important traversal masks are the camera's cull mask (determines what is visible),
+    /// the update visitor mask (what is updated) and the intersection visitor mask (what is
+    /// selectable through mouse clicks or other intersection tests).
+    /// @par In practice, it can be useful to make a "hierarchy" out of the node masks - e.g. in OpenMW,
+    /// all 3D rendering nodes are child of a Scene Root node with Mask_Scene. When we do not want 3D rendering,
+    /// we can just omit Mask_Scene from the traversal mask, and do not need to omit all the individual
+    /// element masks (water, sky, terrain, etc.) since the traversal will already have stopped at the Scene root node.
+    /// @par The comments within the VisMask enum should give some hints as to what masks are commonly "child" of
+    /// another mask, or what type of node this mask is usually set on.
+    /// @note The mask values are not serialized within models, nor used in any other way that would break backwards
+    /// compatibility if the enumeration values were to be changed. Feel free to change them when it makes sense.
     enum VisMask
     {
         Mask_UpdateVisitor = 0x1, // reserved for separating UpdateVisitors from CullVisitors
@@ -24,8 +38,6 @@ namespace MWRender
         Mask_Sun = (1<<10),
         Mask_WeatherParticles = (1<<11),
 
-        // child of Water
-
         // top level masks
         Mask_Scene = (1<<12),
         Mask_GUI = (1<<13),

From 87beb7397070d65c3bf37d6b864f2bb904df69f5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 15 Jan 2016 16:34:57 +0100
Subject: [PATCH 102/765] Correction

---
 apps/openmw/mwrender/vismask.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index 81bb2f3440..ce13758e32 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -6,7 +6,7 @@ namespace MWRender
 
     /// Node masks used for controlling visibility of game objects.
     /// @par Any node in the OSG scene graph can have a node mask. When traversing the scene graph,
-    /// the node visitor's traversal mask is OR'ed with the node mask. If the result of this test is
+    /// the node visitor's traversal mask is bitwise AND'ed with the node mask. If the result of this test is
     /// 0, then the node <i>and all its child nodes</i> are not processed.
     /// @par Important traversal masks are the camera's cull mask (determines what is visible),
     /// the update visitor mask (what is updated) and the intersection visitor mask (what is

From a5411c1ec2551c4789a9ac17c84d147b3bea8d41 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Fri, 15 Jan 2016 20:51:39 -0500
Subject: [PATCH 103/765] Remove unused code

---
 apps/launcher/main.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 282b3fb89f..eadec64d0a 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -51,10 +51,6 @@ int main(int argc, char *argv[])
         if (result == Launcher::FirstRunDialogResultFailure)
             return 0;
 
-    //    if (!mainWin.setup()) {
-    //        return 0;
-    //    }
-
         if (result == Launcher::FirstRunDialogResultContinue)
             mainWin.show();
 

From e30a38a4c1cd13c1312112a44800d2222f99d367 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 16 Jan 2016 10:55:05 +0100
Subject: [PATCH 104/765] updated credits file

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index d4927ea92f..ce27280104 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -96,6 +96,7 @@ Programmers
     Pieter van der Kloet (pvdk)
     pkubik
     Radu-Marius Popovici (rpopovici)
+    rcutmore
     rdimesio
     riothamus
     Robert MacGregor (Ragora)

From 21d13a48faeb91a42634a288e66fd25e82ea00aa Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sat, 16 Jan 2016 06:43:45 -0500
Subject: [PATCH 105/765] Make setup method of MainDialog class private

---
 apps/launcher/maindialog.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index 0dfea48659..96b5c0b979 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -50,7 +50,6 @@ namespace Launcher
         explicit MainDialog(QWidget *parent = 0);
         ~MainDialog();
 
-        bool setup();
         FirstRunDialogResult showFirstRunDialog();
 
         bool reloadSettings();
@@ -65,6 +64,8 @@ namespace Launcher
         void wizardFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
     private:
+        bool setup();
+
         void createIcons();
         void createPages();
 

From 97bcdf7904e2146ff0167710c7ebd658a2f5696b Mon Sep 17 00:00:00 2001
From: "Hristos N. Triantafillou" <me@hristos.triantafillou.us>
Date: Sat, 16 Jan 2016 15:57:03 -0600
Subject: [PATCH 106/765] Properly find MyGUI in /usr/local/lib

---
 cmake/FindMyGUI.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
index 61a39e4d3a..85a1055f6b 100644
--- a/cmake/FindMyGUI.cmake
+++ b/cmake/FindMyGUI.cmake
@@ -101,7 +101,7 @@ ELSE (WIN32) #Unix
             SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
         ELSE (MYGUI_INCLUDE_DIRS)
             FIND_PATH(MYGUI_INCLUDE_DIRS MyGUI.h PATHS /usr/local/include /usr/include PATH_SUFFIXES MyGUI MYGUI)
-            FIND_LIBRARY(MYGUI_LIBRARIES mygui PATHS /usr/lib /usr/local/lib)
+            FIND_LIBRARY(MYGUI_LIBRARIES MyGUIEngine PATHS /usr/local/lib /usr/lib)
             SET(MYGUI_LIB_DIR ${MYGUI_LIBRARIES})
             STRING(REGEX REPLACE "(.*)/.*" "\\1" MYGUI_LIB_DIR "${MYGUI_LIB_DIR}")
             STRING(REGEX REPLACE ".*/" "" MYGUI_LIBRARIES "${MYGUI_LIBRARIES}")

From 259d51058a7cad81e4a121a14765e23290e91289 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 17 Jan 2016 00:09:58 +0100
Subject: [PATCH 107/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index ce27280104..bfbd14a5b8 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -48,6 +48,7 @@ Programmers
     Gašper Sedej
     gugus/gus
     Hallfaer Tuilinn
+    hristoast
     Internecine
     Jacob Essex (Yacoby)
     Jannik Heller (scrawl)

From 08b469c0d004cb87c9a5f90e32ca098a7e43f635 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 17 Jan 2016 14:18:49 -0500
Subject: [PATCH 108/765] Remove unused forward declarations in filedialog.hpp

---
 apps/opencs/view/doc/filedialog.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/opencs/view/doc/filedialog.hpp b/apps/opencs/view/doc/filedialog.hpp
index 6488365652..ca6145b9c6 100644
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@@ -14,9 +14,6 @@ Q_DECLARE_METATYPE (boost::filesystem::path)
 
 #include "ui_filedialog.h"
 
-class DataFilesModel;
-class PluginsProxyModel;
-
 namespace ContentSelectorView
 {
     class ContentSelector;

From 1d86f705baab74a592c4711689cc307a41e2518c Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 17 Jan 2016 21:55:03 -0500
Subject: [PATCH 109/765] gmst verifier

---
 apps/opencs/CMakeLists.txt               |    4 +-
 apps/opencs/model/doc/document.cpp       | 2008 +------------------
 apps/opencs/model/tools/gmstcheck.cpp    |   91 +
 apps/opencs/model/tools/gmstcheck.hpp    |   32 +
 apps/opencs/model/tools/tools.cpp        |    3 +
 apps/opencs/model/world/defaultgmsts.cpp | 2336 ++++++++++++++++++++++
 apps/opencs/model/world/defaultgmsts.hpp |   34 +
 7 files changed, 2514 insertions(+), 1994 deletions(-)
 create mode 100644 apps/opencs/model/tools/gmstcheck.cpp
 create mode 100644 apps/opencs/model/tools/gmstcheck.hpp
 create mode 100644 apps/opencs/model/world/defaultgmsts.cpp
 create mode 100644 apps/opencs/model/world/defaultgmsts.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 8bb624704b..0d621c83e6 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -26,7 +26,7 @@ opencs_units_noqt (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
     pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
-    idcompletionmanager metadata
+    idcompletionmanager metadata defaultgmsts
     )
 
 opencs_hdrs_noqt (model/world
@@ -42,7 +42,7 @@ opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages
+    mergestages gmstcheck
     )
 
 opencs_hdrs_noqt (model/tools
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 80c14bd985..ea1fbb3305 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -6,1925 +6,36 @@
 
 #include <boost/filesystem.hpp>
 
+#include "../world/defaultgmsts.hpp"
+
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
 #endif
 
 void CSMDoc::Document::addGmsts()
 {
-    static const char *gmstFloats[] =
-    {
-        "fAIFleeFleeMult",
-        "fAIFleeHealthMult",
-        "fAIMagicSpellMult",
-        "fAIMeleeArmorMult",
-        "fAIMeleeSummWeaponMult",
-        "fAIMeleeWeaponMult",
-        "fAIRangeMagicSpellMult",
-        "fAIRangeMeleeWeaponMult",
-        "fAlarmRadius",
-        "fAthleticsRunBonus",
-        "fAudioDefaultMaxDistance",
-        "fAudioDefaultMinDistance",
-        "fAudioMaxDistanceMult",
-        "fAudioMinDistanceMult",
-        "fAudioVoiceDefaultMaxDistance",
-        "fAudioVoiceDefaultMinDistance",
-        "fAutoPCSpellChance",
-        "fAutoSpellChance",
-        "fBargainOfferBase",
-        "fBargainOfferMulti",
-        "fBarterGoldResetDelay",
-        "fBaseRunMultiplier",
-        "fBlockStillBonus",
-        "fBribe1000Mod",
-        "fBribe100Mod",
-        "fBribe10Mod",
-        "fCombatAngleXY",
-        "fCombatAngleZ",
-        "fCombatArmorMinMult",
-        "fCombatBlockLeftAngle",
-        "fCombatBlockRightAngle",
-        "fCombatCriticalStrikeMult",
-        "fCombatDelayCreature",
-        "fCombatDelayNPC",
-        "fCombatDistance",
-        "fCombatDistanceWerewolfMod",
-        "fCombatForceSideAngle",
-        "fCombatInvisoMult",
-        "fCombatKODamageMult",
-        "fCombatTorsoSideAngle",
-        "fCombatTorsoStartPercent",
-        "fCombatTorsoStopPercent",
-        "fConstantEffectMult",
-        "fCorpseClearDelay",
-        "fCorpseRespawnDelay",
-        "fCrimeGoldDiscountMult",
-        "fCrimeGoldTurnInMult",
-        "fCrimeStealing",
-        "fDamageStrengthBase",
-        "fDamageStrengthMult",
-        "fDifficultyMult",
-        "fDiseaseXferChance",
-        "fDispAttacking",
-        "fDispBargainFailMod",
-        "fDispBargainSuccessMod",
-        "fDispCrimeMod",
-        "fDispDiseaseMod",
-        "fDispFactionMod",
-        "fDispFactionRankBase",
-        "fDispFactionRankMult",
-        "fDispositionMod",
-        "fDispPersonalityBase",
-        "fDispPersonalityMult",
-        "fDispPickPocketMod",
-        "fDispRaceMod",
-        "fDispStealing",
-        "fDispWeaponDrawn",
-        "fEffectCostMult",
-        "fElementalShieldMult",
-        "fEnchantmentChanceMult",
-        "fEnchantmentConstantChanceMult",
-        "fEnchantmentConstantDurationMult",
-        "fEnchantmentMult",
-        "fEnchantmentValueMult",
-        "fEncumberedMoveEffect",
-        "fEncumbranceStrMult",
-        "fEndFatigueMult",
-        "fFallAcroBase",
-        "fFallAcroMult",
-        "fFallDamageDistanceMin",
-        "fFallDistanceBase",
-        "fFallDistanceMult",
-        "fFatigueAttackBase",
-        "fFatigueAttackMult",
-        "fFatigueBase",
-        "fFatigueBlockBase",
-        "fFatigueBlockMult",
-        "fFatigueJumpBase",
-        "fFatigueJumpMult",
-        "fFatigueMult",
-        "fFatigueReturnBase",
-        "fFatigueReturnMult",
-        "fFatigueRunBase",
-        "fFatigueRunMult",
-        "fFatigueSneakBase",
-        "fFatigueSneakMult",
-        "fFatigueSpellBase",
-        "fFatigueSpellCostMult",
-        "fFatigueSpellMult",
-        "fFatigueSwimRunBase",
-        "fFatigueSwimRunMult",
-        "fFatigueSwimWalkBase",
-        "fFatigueSwimWalkMult",
-        "fFightDispMult",
-        "fFightDistanceMultiplier",
-        "fFightStealing",
-        "fFleeDistance",
-        "fGreetDistanceReset",
-        "fHandtoHandHealthPer",
-        "fHandToHandReach",
-        "fHoldBreathEndMult",
-        "fHoldBreathTime",
-        "fIdleChanceMultiplier",
-        "fIngredientMult",
-        "fInteriorHeadTrackMult",
-        "fJumpAcrobaticsBase",
-        "fJumpAcroMultiplier",
-        "fJumpEncumbranceBase",
-        "fJumpEncumbranceMultiplier",
-        "fJumpMoveBase",
-        "fJumpMoveMult",
-        "fJumpRunMultiplier",
-        "fKnockDownMult",
-        "fLevelMod",
-        "fLevelUpHealthEndMult",
-        "fLightMaxMod",
-        "fLuckMod",
-        "fMagesGuildTravel",
-        "fMagicCreatureCastDelay",
-        "fMagicDetectRefreshRate",
-        "fMagicItemConstantMult",
-        "fMagicItemCostMult",
-        "fMagicItemOnceMult",
-        "fMagicItemPriceMult",
-        "fMagicItemRechargePerSecond",
-        "fMagicItemStrikeMult",
-        "fMagicItemUsedMult",
-        "fMagicStartIconBlink",
-        "fMagicSunBlockedMult",
-        "fMajorSkillBonus",
-        "fMaxFlySpeed",
-        "fMaxHandToHandMult",
-        "fMaxHeadTrackDistance",
-        "fMaxWalkSpeed",
-        "fMaxWalkSpeedCreature",
-        "fMedMaxMod",
-        "fMessageTimePerChar",
-        "fMinFlySpeed",
-        "fMinHandToHandMult",
-        "fMinorSkillBonus",
-        "fMinWalkSpeed",
-        "fMinWalkSpeedCreature",
-        "fMiscSkillBonus",
-        "fNPCbaseMagickaMult",
-        "fNPCHealthBarFade",
-        "fNPCHealthBarTime",
-        "fPCbaseMagickaMult",
-        "fPerDieRollMult",
-        "fPersonalityMod",
-        "fPerTempMult",
-        "fPickLockMult",
-        "fPickPocketMod",
-        "fPotionMinUsefulDuration",
-        "fPotionStrengthMult",
-        "fPotionT1DurMult",
-        "fPotionT1MagMult",
-        "fPotionT4BaseStrengthMult",
-        "fPotionT4EquipStrengthMult",
-        "fProjectileMaxSpeed",
-        "fProjectileMinSpeed",
-        "fProjectileThrownStoreChance",
-        "fRepairAmountMult",
-        "fRepairMult",
-        "fReputationMod",
-        "fRestMagicMult",
-        "fSeriousWoundMult",
-        "fSleepRandMod",
-        "fSleepRestMod",
-        "fSneakBootMult",
-        "fSneakDistanceBase",
-        "fSneakDistanceMultiplier",
-        "fSneakNoViewMult",
-        "fSneakSkillMult",
-        "fSneakSpeedMultiplier",
-        "fSneakUseDelay",
-        "fSneakUseDist",
-        "fSneakViewMult",
-        "fSoulGemMult",
-        "fSpecialSkillBonus",
-        "fSpellMakingValueMult",
-        "fSpellPriceMult",
-        "fSpellValueMult",
-        "fStromWalkMult",
-        "fStromWindSpeed",
-        "fSuffocationDamage",
-        "fSwimHeightScale",
-        "fSwimRunAthleticsMult",
-        "fSwimRunBase",
-        "fSwimWalkAthleticsMult",
-        "fSwimWalkBase",
-        "fSwingBlockBase",
-        "fSwingBlockMult",
-        "fTargetSpellMaxSpeed",
-        "fThrownWeaponMaxSpeed",
-        "fThrownWeaponMinSpeed",
-        "fTrapCostMult",
-        "fTravelMult",
-        "fTravelTimeMult",
-        "fUnarmoredBase1",
-        "fUnarmoredBase2",
-        "fVanityDelay",
-        "fVoiceIdleOdds",
-        "fWaterReflectUpdateAlways",
-        "fWaterReflectUpdateSeldom",
-        "fWeaponDamageMult",
-        "fWeaponFatigueBlockMult",
-        "fWeaponFatigueMult",
-        "fWereWolfAcrobatics",
-        "fWereWolfAgility",
-        "fWereWolfAlchemy",
-        "fWereWolfAlteration",
-        "fWereWolfArmorer",
-        "fWereWolfAthletics",
-        "fWereWolfAxe",
-        "fWereWolfBlock",
-        "fWereWolfBluntWeapon",
-        "fWereWolfConjuration",
-        "fWereWolfDestruction",
-        "fWereWolfEnchant",
-        "fWereWolfEndurance",
-        "fWereWolfFatigue",
-        "fWereWolfHandtoHand",
-        "fWereWolfHealth",
-        "fWereWolfHeavyArmor",
-        "fWereWolfIllusion",
-        "fWereWolfIntellegence",
-        "fWereWolfLightArmor",
-        "fWereWolfLongBlade",
-        "fWereWolfLuck",
-        "fWereWolfMagicka",
-        "fWereWolfMarksman",
-        "fWereWolfMediumArmor",
-        "fWereWolfMerchantile",
-        "fWereWolfMysticism",
-        "fWereWolfPersonality",
-        "fWereWolfRestoration",
-        "fWereWolfRunMult",
-        "fWereWolfSecurity",
-        "fWereWolfShortBlade",
-        "fWereWolfSilverWeaponDamageMult",
-        "fWereWolfSneak",
-        "fWereWolfSpear",
-        "fWereWolfSpeechcraft",
-        "fWereWolfSpeed",
-        "fWereWolfStrength",
-        "fWereWolfUnarmored",
-        "fWereWolfWillPower",
-        "fWortChanceValue",
-        0
-    };
-
-    static const float gmstFloatsValues[] =
-    {
-        0.3,    // fAIFleeFleeMult
-        7.0,    // fAIFleeHealthMult
-        3.0,    // fAIMagicSpellMult
-        1.0,    // fAIMeleeArmorMult
-        1.0,    // fAIMeleeSummWeaponMult
-        2.0,    // fAIMeleeWeaponMult
-        5.0,    // fAIRangeMagicSpellMult
-        5.0,    // fAIRangeMeleeWeaponMult
-        2000.0, // fAlarmRadius
-        1.0,    // fAthleticsRunBonus
-        40.0,   // fAudioDefaultMaxDistance
-        5.0,    // fAudioDefaultMinDistance
-        50.0,   // fAudioMaxDistanceMult
-        20.0,   // fAudioMinDistanceMult
-        60.0,   // fAudioVoiceDefaultMaxDistance
-        10.0,   // fAudioVoiceDefaultMinDistance
-        50.0,   // fAutoPCSpellChance
-        80.0,   // fAutoSpellChance
-        50.0,   // fBargainOfferBase
-        -4.0,   // fBargainOfferMulti
-        24.0,   // fBarterGoldResetDelay
-        1.75,   // fBaseRunMultiplier
-        1.25,   // fBlockStillBonus
-        150.0,  // fBribe1000Mod
-        75.0,   // fBribe100Mod
-        35.0,   // fBribe10Mod
-        60.0,   // fCombatAngleXY
-        60.0,   // fCombatAngleZ
-        0.25,   // fCombatArmorMinMult
-        -90.0,  // fCombatBlockLeftAngle
-        30.0,   // fCombatBlockRightAngle
-        4.0,    // fCombatCriticalStrikeMult
-        0.1,    // fCombatDelayCreature
-        0.1,    // fCombatDelayNPC
-        128.0,  // fCombatDistance
-        0.3,    // fCombatDistanceWerewolfMod
-        30.0,   // fCombatForceSideAngle
-        0.2,    // fCombatInvisoMult
-        1.5,    // fCombatKODamageMult
-        45.0,   // fCombatTorsoSideAngle
-        0.3,    // fCombatTorsoStartPercent
-        0.8,    // fCombatTorsoStopPercent
-        15.0,   // fConstantEffectMult
-        72.0,   // fCorpseClearDelay
-        72.0,   // fCorpseRespawnDelay
-        0.5,    // fCrimeGoldDiscountMult
-        0.9,    // fCrimeGoldTurnInMult
-        1.0,    // fCrimeStealing
-        0.5,    // fDamageStrengthBase
-        0.1,    // fDamageStrengthMult
-        5.0,    // fDifficultyMult
-        2.5,    // fDiseaseXferChance
-        -10.0,  // fDispAttacking
-        -1.0,   // fDispBargainFailMod
-        1.0,    // fDispBargainSuccessMod
-        0.0,    // fDispCrimeMod
-        -10.0,  // fDispDiseaseMod
-        3.0,    // fDispFactionMod
-        1.0,    // fDispFactionRankBase
-        0.5,    // fDispFactionRankMult
-        1.0,    // fDispositionMod
-        50.0,   // fDispPersonalityBase
-        0.5,    // fDispPersonalityMult
-        -25.0,  // fDispPickPocketMod
-        5.0,    // fDispRaceMod
-        -0.5,   // fDispStealing
-        -5.0,   // fDispWeaponDrawn
-        0.5,    // fEffectCostMult
-        0.1,    // fElementalShieldMult
-        3.0,    // fEnchantmentChanceMult
-        0.5,    // fEnchantmentConstantChanceMult
-        100.0,  // fEnchantmentConstantDurationMult
-        0.1,    // fEnchantmentMult
-        1000.0, // fEnchantmentValueMult
-        0.3,    // fEncumberedMoveEffect
-        5.0,    // fEncumbranceStrMult
-        0.04,   // fEndFatigueMult
-        0.25,   // fFallAcroBase
-        0.01,   // fFallAcroMult
-        400.0,  // fFallDamageDistanceMin
-        0.0,    // fFallDistanceBase
-        0.07,   // fFallDistanceMult
-        2.0,    // fFatigueAttackBase
-        0.0,    // fFatigueAttackMult
-        1.25,   // fFatigueBase
-        4.0,    // fFatigueBlockBase
-        0.0,    // fFatigueBlockMult
-        5.0,    // fFatigueJumpBase
-        0.0,    // fFatigueJumpMult
-        0.5,    // fFatigueMult
-        2.5,    // fFatigueReturnBase
-        0.02,   // fFatigueReturnMult
-        5.0,    // fFatigueRunBase
-        2.0,    // fFatigueRunMult
-        1.5,    // fFatigueSneakBase
-        1.5,    // fFatigueSneakMult
-        0.0,    // fFatigueSpellBase
-        0.0,    // fFatigueSpellCostMult
-        0.0,    // fFatigueSpellMult
-        7.0,    // fFatigueSwimRunBase
-        0.0,    // fFatigueSwimRunMult
-        2.5,    // fFatigueSwimWalkBase
-        0.0,    // fFatigueSwimWalkMult
-        0.2,    // fFightDispMult
-        0.005,  // fFightDistanceMultiplier
-        50.0,   // fFightStealing
-        3000.0, // fFleeDistance
-        512.0,  // fGreetDistanceReset
-        0.1,    // fHandtoHandHealthPer
-        1.0,    // fHandToHandReach
-        0.5,    // fHoldBreathEndMult
-        20.0,   // fHoldBreathTime
-        0.75,   // fIdleChanceMultiplier
-        1.0,    // fIngredientMult
-        0.5,    // fInteriorHeadTrackMult
-        128.0,  // fJumpAcrobaticsBase
-        4.0,    // fJumpAcroMultiplier
-        0.5,    // fJumpEncumbranceBase
-        1.0,    // fJumpEncumbranceMultiplier
-        0.5,    // fJumpMoveBase
-        0.5,    // fJumpMoveMult
-        1.0,    // fJumpRunMultiplier
-        0.5,    // fKnockDownMult
-        5.0,    // fLevelMod
-        0.1,    // fLevelUpHealthEndMult
-        0.6,    // fLightMaxMod
-        10.0,   // fLuckMod
-        10.0,   // fMagesGuildTravel
-        1.5,    // fMagicCreatureCastDelay
-        0.0167, // fMagicDetectRefreshRate
-        1.0,    // fMagicItemConstantMult
-        1.0,    // fMagicItemCostMult
-        1.0,    // fMagicItemOnceMult
-        1.0,    // fMagicItemPriceMult
-        0.05,   // fMagicItemRechargePerSecond
-        1.0,    // fMagicItemStrikeMult
-        1.0,    // fMagicItemUsedMult
-        3.0,    // fMagicStartIconBlink
-        0.5,    // fMagicSunBlockedMult
-        0.75,   // fMajorSkillBonus
-        300.0,  // fMaxFlySpeed
-        0.5,    // fMaxHandToHandMult
-        400.0,  // fMaxHeadTrackDistance
-        200.0,  // fMaxWalkSpeed
-        300.0,  // fMaxWalkSpeedCreature
-        0.9,    // fMedMaxMod
-        0.1,    // fMessageTimePerChar
-        5.0,    // fMinFlySpeed
-        0.1,    // fMinHandToHandMult
-        1.0,    // fMinorSkillBonus
-        100.0,  // fMinWalkSpeed
-        5.0,    // fMinWalkSpeedCreature
-        1.25,   // fMiscSkillBonus
-        2.0,    // fNPCbaseMagickaMult
-        0.5,    // fNPCHealthBarFade
-        3.0,    // fNPCHealthBarTime
-        1.0,    // fPCbaseMagickaMult
-        0.3,    // fPerDieRollMult
-        5.0,    // fPersonalityMod
-        1.0,    // fPerTempMult
-        -1.0,   // fPickLockMult
-        0.3,    // fPickPocketMod
-        20.0,   // fPotionMinUsefulDuration
-        0.5,    // fPotionStrengthMult
-        0.5,    // fPotionT1DurMult
-        1.5,    // fPotionT1MagMult
-        20.0,   // fPotionT4BaseStrengthMult
-        12.0,   // fPotionT4EquipStrengthMult
-        3000.0, // fProjectileMaxSpeed
-        400.0,  // fProjectileMinSpeed
-        25.0,   // fProjectileThrownStoreChance
-        3.0,    // fRepairAmountMult
-        1.0,    // fRepairMult
-        1.0,    // fReputationMod
-        0.15,   // fRestMagicMult
-        0.0,    // fSeriousWoundMult
-        0.25,   // fSleepRandMod
-        0.3,    // fSleepRestMod
-        -1.0,   // fSneakBootMult
-        0.5,    // fSneakDistanceBase
-        0.002,  // fSneakDistanceMultiplier
-        0.5,    // fSneakNoViewMult
-        1.0,    // fSneakSkillMult
-        0.75,   // fSneakSpeedMultiplier
-        1.0,    // fSneakUseDelay
-        500.0,  // fSneakUseDist
-        1.5,    // fSneakViewMult
-        3.0,    // fSoulGemMult
-        0.8,    // fSpecialSkillBonus
-        7.0,    // fSpellMakingValueMult
-        2.0,    // fSpellPriceMult
-        10.0,   // fSpellValueMult
-        0.25,   // fStromWalkMult
-        0.7,    // fStromWindSpeed
-        3.0,    // fSuffocationDamage
-        0.9,    // fSwimHeightScale
-        0.1,    // fSwimRunAthleticsMult
-        0.5,    // fSwimRunBase
-        0.02,   // fSwimWalkAthleticsMult
-        0.5,    // fSwimWalkBase
-        1.0,    // fSwingBlockBase
-        1.0,    // fSwingBlockMult
-        1000.0, // fTargetSpellMaxSpeed
-        1000.0, // fThrownWeaponMaxSpeed
-        300.0,  // fThrownWeaponMinSpeed
-        0.0,    // fTrapCostMult
-        4000.0, // fTravelMult
-        16000.0,// fTravelTimeMult
-        0.1,    // fUnarmoredBase1
-        0.065,  // fUnarmoredBase2
-        30.0,   // fVanityDelay
-        10.0,   // fVoiceIdleOdds
-        0.0,    // fWaterReflectUpdateAlways
-        10.0,   // fWaterReflectUpdateSeldom
-        0.1,    // fWeaponDamageMult
-        1.0,    // fWeaponFatigueBlockMult
-        0.25,   // fWeaponFatigueMult
-        150.0,  // fWereWolfAcrobatics
-        150.0,  // fWereWolfAgility
-        1.0,    // fWereWolfAlchemy
-        1.0,    // fWereWolfAlteration
-        1.0,    // fWereWolfArmorer
-        150.0,  // fWereWolfAthletics
-        1.0,    // fWereWolfAxe
-        1.0,    // fWereWolfBlock
-        1.0,    // fWereWolfBluntWeapon
-        1.0,    // fWereWolfConjuration
-        1.0,    // fWereWolfDestruction
-        1.0,    // fWereWolfEnchant
-        150.0,  // fWereWolfEndurance
-        400.0,  // fWereWolfFatigue
-        100.0,  // fWereWolfHandtoHand
-        2.0,    // fWereWolfHealth
-        1.0,    // fWereWolfHeavyArmor
-        1.0,    // fWereWolfIllusion
-        1.0,    // fWereWolfIntellegence
-        1.0,    // fWereWolfLightArmor
-        1.0,    // fWereWolfLongBlade
-        1.0,    // fWereWolfLuck
-        100.0,  // fWereWolfMagicka
-        1.0,    // fWereWolfMarksman
-        1.0,    // fWereWolfMediumArmor
-        1.0,    // fWereWolfMerchantile
-        1.0,    // fWereWolfMysticism
-        1.0,    // fWereWolfPersonality
-        1.0,    // fWereWolfRestoration
-        1.5,    // fWereWolfRunMult
-        1.0,    // fWereWolfSecurity
-        1.0,    // fWereWolfShortBlade
-        1.5,    // fWereWolfSilverWeaponDamageMult
-        1.0,    // fWereWolfSneak
-        1.0,    // fWereWolfSpear
-        1.0,    // fWereWolfSpeechcraft
-        150.0,  // fWereWolfSpeed
-        150.0,  // fWereWolfStrength
-        100.0,  // fWereWolfUnarmored
-        1.0,    // fWereWolfWillPower
-        15.0,   // fWortChanceValue
-    };
-
-    static const char *gmstIntegers[] =
-    {
-        "i1stPersonSneakDelta",
-        "iAlarmAttack",
-        "iAlarmKilling",
-        "iAlarmPickPocket",
-        "iAlarmStealing",
-        "iAlarmTresspass",
-        "iAlchemyMod",
-        "iAutoPCSpellMax",
-        "iAutoRepFacMod",
-        "iAutoRepLevMod",
-        "iAutoSpellAlterationMax",
-        "iAutoSpellAttSkillMin",
-        "iAutoSpellConjurationMax",
-        "iAutoSpellDestructionMax",
-        "iAutoSpellIllusionMax",
-        "iAutoSpellMysticismMax",
-        "iAutoSpellRestorationMax",
-        "iAutoSpellTimesCanCast",
-        "iBarterFailDisposition",
-        "iBarterSuccessDisposition",
-        "iBaseArmorSkill",
-        "iBlockMaxChance",
-        "iBlockMinChance",
-        "iBootsWeight",
-        "iCrimeAttack",
-        "iCrimeKilling",
-        "iCrimePickPocket",
-        "iCrimeThreshold",
-        "iCrimeThresholdMultiplier",
-        "iCrimeTresspass",
-        "iCuirassWeight",
-        "iDaysinPrisonMod",
-        "iDispAttackMod",
-        "iDispKilling",
-        "iDispTresspass",
-        "iFightAlarmMult",
-        "iFightAttack",
-        "iFightAttacking",
-        "iFightDistanceBase",
-        "iFightKilling",
-        "iFightPickpocket",
-        "iFightTrespass",
-        "iFlee",
-        "iGauntletWeight",
-        "iGreavesWeight",
-        "iGreetDistanceMultiplier",
-        "iGreetDuration",
-        "iHelmWeight",
-        "iKnockDownOddsBase",
-        "iKnockDownOddsMult",
-        "iLevelUp01Mult",
-        "iLevelUp02Mult",
-        "iLevelUp03Mult",
-        "iLevelUp04Mult",
-        "iLevelUp05Mult",
-        "iLevelUp06Mult",
-        "iLevelUp07Mult",
-        "iLevelUp08Mult",
-        "iLevelUp09Mult",
-        "iLevelUp10Mult",
-        "iLevelupMajorMult",
-        "iLevelupMajorMultAttribute",
-        "iLevelupMinorMult",
-        "iLevelupMinorMultAttribute",
-        "iLevelupMiscMultAttriubte",
-        "iLevelupSpecialization",
-        "iLevelupTotal",
-        "iMagicItemChargeConst",
-        "iMagicItemChargeOnce",
-        "iMagicItemChargeStrike",
-        "iMagicItemChargeUse",
-        "iMaxActivateDist",
-        "iMaxInfoDist",
-        "iMonthsToRespawn",
-        "iNumberCreatures",
-        "iPauldronWeight",
-        "iPerMinChance",
-        "iPerMinChange",
-        "iPickMaxChance",
-        "iPickMinChance",
-        "iShieldWeight",
-        "iSoulAmountForConstantEffect",
-        "iTrainingMod",
-        "iVoiceAttackOdds",
-        "iVoiceHitOdds",
-        "iWereWolfBounty",
-        "iWereWolfFightMod",
-        "iWereWolfFleeMod",
-        "iWereWolfLevelToAttack",
-        0
-    };
-
-    static const int gmstIntegersValues[] =
-    {
-        10,     // i1stPersonSneakDelta
-        50,     // iAlarmAttack
-        90,     // iAlarmKilling
-        20,     // iAlarmPickPocket
-        1,      // iAlarmStealing
-        5,      // iAlarmTresspass
-        2,      // iAlchemyMod
-        100,    // iAutoPCSpellMax
-        2,      // iAutoRepFacMod
-        0,      // iAutoRepLevMod
-        5,      // iAutoSpellAlterationMax
-        70,     // iAutoSpellAttSkillMin
-        2,      // iAutoSpellConjurationMax
-        5,      // iAutoSpellDestructionMax
-        5,      // iAutoSpellIllusionMax
-        5,      // iAutoSpellMysticismMax
-        5,      // iAutoSpellRestorationMax
-        3,      // iAutoSpellTimesCanCast
-        -1,     // iBarterFailDisposition
-        1,      // iBarterSuccessDisposition
-        30,     // iBaseArmorSkill
-        50,     // iBlockMaxChance
-        10,     // iBlockMinChance
-        20,     // iBootsWeight
-        40,     // iCrimeAttack
-        1000,   // iCrimeKilling
-        25,     // iCrimePickPocket
-        1000,   // iCrimeThreshold
-        10,     // iCrimeThresholdMultiplier
-        5,      // iCrimeTresspass
-        30,     // iCuirassWeight
-        100,    // iDaysinPrisonMod
-        -50,    // iDispAttackMod
-        -50,    // iDispKilling
-        -20,    // iDispTresspass
-        1,      // iFightAlarmMult
-        100,    // iFightAttack
-        50,     // iFightAttacking
-        20,     // iFightDistanceBase
-        50,     // iFightKilling
-        25,     // iFightPickpocket
-        25,     // iFightTrespass
-        0,      // iFlee
-        5,      // iGauntletWeight
-        15,     // iGreavesWeight
-        6,      // iGreetDistanceMultiplier
-        4,      // iGreetDuration
-        5,      // iHelmWeight
-        50,     // iKnockDownOddsBase
-        50,     // iKnockDownOddsMult
-        2,      // iLevelUp01Mult
-        2,      // iLevelUp02Mult
-        2,      // iLevelUp03Mult
-        2,      // iLevelUp04Mult
-        3,      // iLevelUp05Mult
-        3,      // iLevelUp06Mult
-        3,      // iLevelUp07Mult
-        4,      // iLevelUp08Mult
-        4,      // iLevelUp09Mult
-        5,      // iLevelUp10Mult
-        1,      // iLevelupMajorMult
-        1,      // iLevelupMajorMultAttribute
-        1,      // iLevelupMinorMult
-        1,      // iLevelupMinorMultAttribute
-        1,      // iLevelupMiscMultAttriubte
-        1,      // iLevelupSpecialization
-        10,     // iLevelupTotal
-        10,     // iMagicItemChargeConst
-        1,      // iMagicItemChargeOnce
-        10,     // iMagicItemChargeStrike
-        5,      // iMagicItemChargeUse
-        192,    // iMaxActivateDist
-        192,    // iMaxInfoDist
-        4,      // iMonthsToRespawn
-        1,      // iNumberCreatures
-        10,     // iPauldronWeight
-        5,      // iPerMinChance
-        10,     // iPerMinChange
-        75,     // iPickMaxChance
-        5,      // iPickMinChance
-        15,     // iShieldWeight
-        400,    // iSoulAmountForConstantEffect
-        10,     // iTrainingMod
-        10,     // iVoiceAttackOdds
-        30,     // iVoiceHitOdds
-        10000,  // iWereWolfBounty
-        100,    // iWereWolfFightMod
-        100,    // iWereWolfFleeMod
-        20,     // iWereWolfLevelToAttack
-    };
-
-    static const char *gmstStrings[] =
-    {
-        "s3dAudio",
-        "s3dHardware",
-        "s3dSoftware",
-        "sAbsorb",
-        "sAcrobat",
-        "sActivate",
-        "sActivateXbox",
-        "sActorInCombat",
-        "sAdmire",
-        "sAdmireFail",
-        "sAdmireSuccess",
-        "sAgent",
-        "sAgiDesc",
-        "sAIDistance",
-        "sAlembic",
-        "sAllTab",
-        "sAlways",
-        "sAlways_Run",
-        "sand",
-        "sApparatus",
-        "sApparelTab",
-        "sArcher",
-        "sArea",
-        "sAreaDes",
-        "sArmor",
-        "sArmorRating",
-        "sAsk",
-        "sAssassin",
-        "sAt",
-        "sAttack",
-        "sAttributeAgility",
-        "sAttributeEndurance",
-        "sAttributeIntelligence",
-        "sAttributeListTitle",
-        "sAttributeLuck",
-        "sAttributePersonality",
-        "sAttributesMenu1",
-        "sAttributeSpeed",
-        "sAttributeStrength",
-        "sAttributeWillpower",
-        "sAudio",
-        "sAuto_Run",
-        "sBack",
-        "sBackspace",
-        "sBackXbox",
-        "sBarbarian",
-        "sBard",
-        "sBarter",
-        "sBarterDialog1",
-        "sBarterDialog10",
-        "sBarterDialog11",
-        "sBarterDialog12",
-        "sBarterDialog2",
-        "sBarterDialog3",
-        "sBarterDialog4",
-        "sBarterDialog5",
-        "sBarterDialog6",
-        "sBarterDialog7",
-        "sBarterDialog8",
-        "sBarterDialog9",
-        "sBattlemage",
-        "sBestAttack",
-        "sBirthSign",
-        "sBirthsignmenu1",
-        "sBirthsignmenu2",
-        "sBlocks",
-        "sBonusSkillTitle",
-        "sBookPageOne",
-        "sBookPageTwo",
-        "sBookSkillMessage",
-        "sBounty",
-        "sBreath",
-        "sBribe 10 Gold",
-        "sBribe 100 Gold",
-        "sBribe 1000 Gold",
-        "sBribeFail",
-        "sBribeSuccess",
-        "sBuy",
-        "sBye",
-        "sCalcinator",
-        "sCancel",
-        "sCantEquipWeapWarning",
-        "sCastCost",
-        "sCaughtStealingMessage",
-        "sCenter",
-        "sChangedMastersMsg",
-        "sCharges",
-        "sChooseClassMenu1",
-        "sChooseClassMenu2",
-        "sChooseClassMenu3",
-        "sChooseClassMenu4",
-        "sChop",
-        "sClass",
-        "sClassChoiceMenu1",
-        "sClassChoiceMenu2",
-        "sClassChoiceMenu3",
-        "sClose",
-        "sCompanionShare",
-        "sCompanionWarningButtonOne",
-        "sCompanionWarningButtonTwo",
-        "sCompanionWarningMessage",
-        "sCondition",
-        "sConsoleTitle",
-        "sContainer",
-        "sContentsMessage1",
-        "sContentsMessage2",
-        "sContentsMessage3",
-        "sControlerVibration",
-        "sControls",
-        "sControlsMenu1",
-        "sControlsMenu2",
-        "sControlsMenu3",
-        "sControlsMenu4",
-        "sControlsMenu5",
-        "sControlsMenu6",
-        "sCostChance",
-        "sCostCharge",
-        "sCreate",
-        "sCreateClassMenu1",
-        "sCreateClassMenu2",
-        "sCreateClassMenu3",
-        "sCreateClassMenuHelp1",
-        "sCreateClassMenuHelp2",
-        "sCreateClassMenuWarning",
-        "sCreatedEffects",
-        "sCrimeHelp",
-        "sCrimeMessage",
-        "sCrouch_Sneak",
-        "sCrouchXbox",
-        "sCrusader",
-        "sCursorOff",
-        "sCustom",
-        "sCustomClassName",
-        "sDamage",
-        "sDark_Gamma",
-        "sDay",
-        "sDefaultCellname",
-        "sDelete",
-        "sDeleteGame",
-        "sDeleteNote",
-        "sDeleteSpell",
-        "sDeleteSpellError",
-        "sDetail_Level",
-        "sDialogMenu1",
-        "sDialogText1Xbox",
-        "sDialogText2Xbox",
-        "sDialogText3Xbox",
-        "sDifficulty",
-        "sDisposeCorpseFail",
-        "sDisposeofCorpse",
-        "sDone",
-        "sDoYouWantTo",
-        "sDrain",
-        "sDrop",
-        "sDuration",
-        "sDurationDes",
-        "sEasy",
-        "sEditNote",
-        "sEffectAbsorbAttribute",
-        "sEffectAbsorbFatigue",
-        "sEffectAbsorbHealth",
-        "sEffectAbsorbSkill",
-        "sEffectAbsorbSpellPoints",
-        "sEffectAlmsiviIntervention",
-        "sEffectBlind",
-        "sEffectBoundBattleAxe",
-        "sEffectBoundBoots",
-        "sEffectBoundCuirass",
-        "sEffectBoundDagger",
-        "sEffectBoundGloves",
-        "sEffectBoundHelm",
-        "sEffectBoundLongbow",
-        "sEffectBoundLongsword",
-        "sEffectBoundMace",
-        "sEffectBoundShield",
-        "sEffectBoundSpear",
-        "sEffectBurden",
-        "sEffectCalmCreature",
-        "sEffectCalmHumanoid",
-        "sEffectChameleon",
-        "sEffectCharm",
-        "sEffectCommandCreatures",
-        "sEffectCommandHumanoids",
-        "sEffectCorpus",
-        "sEffectCureBlightDisease",
-        "sEffectCureCommonDisease",
-        "sEffectCureCorprusDisease",
-        "sEffectCureParalyzation",
-        "sEffectCurePoison",
-        "sEffectDamageAttribute",
-        "sEffectDamageFatigue",
-        "sEffectDamageHealth",
-        "sEffectDamageMagicka",
-        "sEffectDamageSkill",
-        "sEffectDemoralizeCreature",
-        "sEffectDemoralizeHumanoid",
-        "sEffectDetectAnimal",
-        "sEffectDetectEnchantment",
-        "sEffectDetectKey",
-        "sEffectDisintegrateArmor",
-        "sEffectDisintegrateWeapon",
-        "sEffectDispel",
-        "sEffectDivineIntervention",
-        "sEffectDrainAttribute",
-        "sEffectDrainFatigue",
-        "sEffectDrainHealth",
-        "sEffectDrainSkill",
-        "sEffectDrainSpellpoints",
-        "sEffectExtraSpell",
-        "sEffectFeather",
-        "sEffectFireDamage",
-        "sEffectFireShield",
-        "sEffectFortifyAttackBonus",
-        "sEffectFortifyAttribute",
-        "sEffectFortifyFatigue",
-        "sEffectFortifyHealth",
-        "sEffectFortifyMagickaMultiplier",
-        "sEffectFortifySkill",
-        "sEffectFortifySpellpoints",
-        "sEffectFrenzyCreature",
-        "sEffectFrenzyHumanoid",
-        "sEffectFrostDamage",
-        "sEffectFrostShield",
-        "sEffectInvisibility",
-        "sEffectJump",
-        "sEffectLevitate",
-        "sEffectLight",
-        "sEffectLightningShield",
-        "sEffectLock",
-        "sEffectMark",
-        "sEffectNightEye",
-        "sEffectOpen",
-        "sEffectParalyze",
-        "sEffectPoison",
-        "sEffectRallyCreature",
-        "sEffectRallyHumanoid",
-        "sEffectRecall",
-        "sEffectReflect",
-        "sEffectRemoveCurse",
-        "sEffectResistBlightDisease",
-        "sEffectResistCommonDisease",
-        "sEffectResistCorprusDisease",
-        "sEffectResistFire",
-        "sEffectResistFrost",
-        "sEffectResistMagicka",
-        "sEffectResistNormalWeapons",
-        "sEffectResistParalysis",
-        "sEffectResistPoison",
-        "sEffectResistShock",
-        "sEffectRestoreAttribute",
-        "sEffectRestoreFatigue",
-        "sEffectRestoreHealth",
-        "sEffectRestoreSkill",
-        "sEffectRestoreSpellPoints",
-        "sEffects",
-        "sEffectSanctuary",
-        "sEffectShield",
-        "sEffectShockDamage",
-        "sEffectSilence",
-        "sEffectSlowFall",
-        "sEffectSoultrap",
-        "sEffectSound",
-        "sEffectSpellAbsorption",
-        "sEffectStuntedMagicka",
-        "sEffectSummonAncestralGhost",
-        "sEffectSummonBonelord",
-        "sEffectSummonCenturionSphere",
-        "sEffectSummonClannfear",
-        "sEffectSummonCreature01",
-        "sEffectSummonCreature02",
-        "sEffectSummonCreature03",
-        "sEffectSummonCreature04",
-        "sEffectSummonCreature05",
-        "sEffectSummonDaedroth",
-        "sEffectSummonDremora",
-        "sEffectSummonFabricant",
-        "sEffectSummonFlameAtronach",
-        "sEffectSummonFrostAtronach",
-        "sEffectSummonGoldensaint",
-        "sEffectSummonGreaterBonewalker",
-        "sEffectSummonHunger",
-        "sEffectSummonLeastBonewalker",
-        "sEffectSummonScamp",
-        "sEffectSummonSkeletalMinion",
-        "sEffectSummonStormAtronach",
-        "sEffectSummonWingedTwilight",
-        "sEffectSunDamage",
-        "sEffectSwiftSwim",
-        "sEffectTelekinesis",
-        "sEffectTurnUndead",
-        "sEffectVampirism",
-        "sEffectWaterBreathing",
-        "sEffectWaterWalking",
-        "sEffectWeaknessToBlightDisease",
-        "sEffectWeaknessToCommonDisease",
-        "sEffectWeaknessToCorprusDisease",
-        "sEffectWeaknessToFire",
-        "sEffectWeaknessToFrost",
-        "sEffectWeaknessToMagicka",
-        "sEffectWeaknessToNormalWeapons",
-        "sEffectWeaknessToPoison",
-        "sEffectWeaknessToShock",
-        "sEnableJoystick",
-        "sEnchanting",
-        "sEnchantItems",
-        "sEnchantmentHelp1",
-        "sEnchantmentHelp10",
-        "sEnchantmentHelp2",
-        "sEnchantmentHelp3",
-        "sEnchantmentHelp4",
-        "sEnchantmentHelp5",
-        "sEnchantmentHelp6",
-        "sEnchantmentHelp7",
-        "sEnchantmentHelp8",
-        "sEnchantmentHelp9",
-        "sEnchantmentMenu1",
-        "sEnchantmentMenu10",
-        "sEnchantmentMenu11",
-        "sEnchantmentMenu12",
-        "sEnchantmentMenu2",
-        "sEnchantmentMenu3",
-        "sEnchantmentMenu4",
-        "sEnchantmentMenu5",
-        "sEnchantmentMenu6",
-        "sEnchantmentMenu7",
-        "sEnchantmentMenu8",
-        "sEnchantmentMenu9",
-        "sEncumbrance",
-        "sEndDesc",
-        "sEquip",
-        "sExitGame",
-        "sExpelled",
-        "sExpelledMessage",
-        "sFace",
-        "sFaction",
-        "sFar",
-        "sFast",
-        "sFatDesc",
-        "sFatigue",
-        "sFavoriteSkills",
-        "sfeet",
-        "sFileSize",
-        "sfootarea",
-        "sFootsteps",
-        "sfor",
-        "sFortify",
-        "sForward",
-        "sForwardXbox",
-        "sFull",
-        "sGame",
-        "sGameWithoutLauncherXbox",
-        "sGamma_Correction",
-        "sGeneralMastPlugMismatchMsg",
-        "sGold",
-        "sGoodbye",
-        "sGoverningAttribute",
-        "sgp",
-        "sHair",
-        "sHard",
-        "sHeal",
-        "sHealer",
-        "sHealth",
-        "sHealthDesc",
-        "sHealthPerHourOfRest",
-        "sHealthPerLevel",
-        "sHeavy",
-        "sHigh",
-        "sin",
-        "sInfo",
-        "sInfoRefusal",
-        "sIngredients",
-        "sInPrisonTitle",
-        "sInputMenu1",
-        "sIntDesc",
-        "sIntimidate",
-        "sIntimidateFail",
-        "sIntimidateSuccess",
-        "sInvalidSaveGameMsg",
-        "sInvalidSaveGameMsgXBOX",
-        "sInventory",
-        "sInventoryMenu1",
-        "sInventoryMessage1",
-        "sInventoryMessage2",
-        "sInventoryMessage3",
-        "sInventoryMessage4",
-        "sInventoryMessage5",
-        "sInventorySelectNoIngredients",
-        "sInventorySelectNoItems",
-        "sInventorySelectNoSoul",
-        "sItem",
-        "sItemCastConstant",
-        "sItemCastOnce",
-        "sItemCastWhenStrikes",
-        "sItemCastWhenUsed",
-        "sItemName",
-        "sJournal",
-        "sJournalCmd",
-        "sJournalEntry",
-        "sJournalXbox",
-        "sJoystickHatShort",
-        "sJoystickNotFound",
-        "sJoystickShort",
-        "sJump",
-        "sJumpXbox",
-        "sKeyName_00",
-        "sKeyName_01",
-        "sKeyName_02",
-        "sKeyName_03",
-        "sKeyName_04",
-        "sKeyName_05",
-        "sKeyName_06",
-        "sKeyName_07",
-        "sKeyName_08",
-        "sKeyName_09",
-        "sKeyName_0A",
-        "sKeyName_0B",
-        "sKeyName_0C",
-        "sKeyName_0D",
-        "sKeyName_0E",
-        "sKeyName_0F",
-        "sKeyName_10",
-        "sKeyName_11",
-        "sKeyName_12",
-        "sKeyName_13",
-        "sKeyName_14",
-        "sKeyName_15",
-        "sKeyName_16",
-        "sKeyName_17",
-        "sKeyName_18",
-        "sKeyName_19",
-        "sKeyName_1A",
-        "sKeyName_1B",
-        "sKeyName_1C",
-        "sKeyName_1D",
-        "sKeyName_1E",
-        "sKeyName_1F",
-        "sKeyName_20",
-        "sKeyName_21",
-        "sKeyName_22",
-        "sKeyName_23",
-        "sKeyName_24",
-        "sKeyName_25",
-        "sKeyName_26",
-        "sKeyName_27",
-        "sKeyName_28",
-        "sKeyName_29",
-        "sKeyName_2A",
-        "sKeyName_2B",
-        "sKeyName_2C",
-        "sKeyName_2D",
-        "sKeyName_2E",
-        "sKeyName_2F",
-        "sKeyName_30",
-        "sKeyName_31",
-        "sKeyName_32",
-        "sKeyName_33",
-        "sKeyName_34",
-        "sKeyName_35",
-        "sKeyName_36",
-        "sKeyName_37",
-        "sKeyName_38",
-        "sKeyName_39",
-        "sKeyName_3A",
-        "sKeyName_3B",
-        "sKeyName_3C",
-        "sKeyName_3D",
-        "sKeyName_3E",
-        "sKeyName_3F",
-        "sKeyName_40",
-        "sKeyName_41",
-        "sKeyName_42",
-        "sKeyName_43",
-        "sKeyName_44",
-        "sKeyName_45",
-        "sKeyName_46",
-        "sKeyName_47",
-        "sKeyName_48",
-        "sKeyName_49",
-        "sKeyName_4A",
-        "sKeyName_4B",
-        "sKeyName_4C",
-        "sKeyName_4D",
-        "sKeyName_4E",
-        "sKeyName_4F",
-        "sKeyName_50",
-        "sKeyName_51",
-        "sKeyName_52",
-        "sKeyName_53",
-        "sKeyName_54",
-        "sKeyName_55",
-        "sKeyName_56",
-        "sKeyName_57",
-        "sKeyName_58",
-        "sKeyName_59",
-        "sKeyName_5A",
-        "sKeyName_5B",
-        "sKeyName_5C",
-        "sKeyName_5D",
-        "sKeyName_5E",
-        "sKeyName_5F",
-        "sKeyName_60",
-        "sKeyName_61",
-        "sKeyName_62",
-        "sKeyName_63",
-        "sKeyName_64",
-        "sKeyName_65",
-        "sKeyName_66",
-        "sKeyName_67",
-        "sKeyName_68",
-        "sKeyName_69",
-        "sKeyName_6A",
-        "sKeyName_6B",
-        "sKeyName_6C",
-        "sKeyName_6D",
-        "sKeyName_6E",
-        "sKeyName_6F",
-        "sKeyName_70",
-        "sKeyName_71",
-        "sKeyName_72",
-        "sKeyName_73",
-        "sKeyName_74",
-        "sKeyName_75",
-        "sKeyName_76",
-        "sKeyName_77",
-        "sKeyName_78",
-        "sKeyName_79",
-        "sKeyName_7A",
-        "sKeyName_7B",
-        "sKeyName_7C",
-        "sKeyName_7D",
-        "sKeyName_7E",
-        "sKeyName_7F",
-        "sKeyName_80",
-        "sKeyName_81",
-        "sKeyName_82",
-        "sKeyName_83",
-        "sKeyName_84",
-        "sKeyName_85",
-        "sKeyName_86",
-        "sKeyName_87",
-        "sKeyName_88",
-        "sKeyName_89",
-        "sKeyName_8A",
-        "sKeyName_8B",
-        "sKeyName_8C",
-        "sKeyName_8D",
-        "sKeyName_8E",
-        "sKeyName_8F",
-        "sKeyName_90",
-        "sKeyName_91",
-        "sKeyName_92",
-        "sKeyName_93",
-        "sKeyName_94",
-        "sKeyName_95",
-        "sKeyName_96",
-        "sKeyName_97",
-        "sKeyName_98",
-        "sKeyName_99",
-        "sKeyName_9A",
-        "sKeyName_9B",
-        "sKeyName_9C",
-        "sKeyName_9D",
-        "sKeyName_9E",
-        "sKeyName_9F",
-        "sKeyName_A0",
-        "sKeyName_A1",
-        "sKeyName_A2",
-        "sKeyName_A3",
-        "sKeyName_A4",
-        "sKeyName_A5",
-        "sKeyName_A6",
-        "sKeyName_A7",
-        "sKeyName_A8",
-        "sKeyName_A9",
-        "sKeyName_AA",
-        "sKeyName_AB",
-        "sKeyName_AC",
-        "sKeyName_AD",
-        "sKeyName_AE",
-        "sKeyName_AF",
-        "sKeyName_B0",
-        "sKeyName_B1",
-        "sKeyName_B2",
-        "sKeyName_B3",
-        "sKeyName_B4",
-        "sKeyName_B5",
-        "sKeyName_B6",
-        "sKeyName_B7",
-        "sKeyName_B8",
-        "sKeyName_B9",
-        "sKeyName_BA",
-        "sKeyName_BB",
-        "sKeyName_BC",
-        "sKeyName_BD",
-        "sKeyName_BE",
-        "sKeyName_BF",
-        "sKeyName_C0",
-        "sKeyName_C1",
-        "sKeyName_C2",
-        "sKeyName_C3",
-        "sKeyName_C4",
-        "sKeyName_C5",
-        "sKeyName_C6",
-        "sKeyName_C7",
-        "sKeyName_C8",
-        "sKeyName_C9",
-        "sKeyName_CA",
-        "sKeyName_CB",
-        "sKeyName_CC",
-        "sKeyName_CD",
-        "sKeyName_CE",
-        "sKeyName_CF",
-        "sKeyName_D0",
-        "sKeyName_D1",
-        "sKeyName_D2",
-        "sKeyName_D3",
-        "sKeyName_D4",
-        "sKeyName_D5",
-        "sKeyName_D6",
-        "sKeyName_D7",
-        "sKeyName_D8",
-        "sKeyName_D9",
-        "sKeyName_DA",
-        "sKeyName_DB",
-        "sKeyName_DC",
-        "sKeyName_DD",
-        "sKeyName_DE",
-        "sKeyName_DF",
-        "sKeyName_E0",
-        "sKeyName_E1",
-        "sKeyName_E2",
-        "sKeyName_E3",
-        "sKeyName_E4",
-        "sKeyName_E5",
-        "sKeyName_E6",
-        "sKeyName_E7",
-        "sKeyName_E8",
-        "sKeyName_E9",
-        "sKeyName_EA",
-        "sKeyName_EB",
-        "sKeyName_EC",
-        "sKeyName_ED",
-        "sKeyName_EE",
-        "sKeyName_EF",
-        "sKeyName_F0",
-        "sKeyName_F1",
-        "sKeyName_F2",
-        "sKeyName_F3",
-        "sKeyName_F4",
-        "sKeyName_F5",
-        "sKeyName_F6",
-        "sKeyName_F7",
-        "sKeyName_F8",
-        "sKeyName_F9",
-        "sKeyName_FA",
-        "sKeyName_FB",
-        "sKeyName_FC",
-        "sKeyName_FD",
-        "sKeyName_FE",
-        "sKeyName_FF",
-        "sKeyUsed",
-        "sKilledEssential",
-        "sKnight",
-        "sLeft",
-        "sLess",
-        "sLevel",
-        "sLevelProgress",
-        "sLevels",
-        "sLevelUp",
-        "sLevelUpMenu1",
-        "sLevelUpMenu2",
-        "sLevelUpMenu3",
-        "sLevelUpMenu4",
-        "sLevelUpMsg",
-        "sLevitateDisabled",
-        "sLight",
-        "sLight_Gamma",
-        "sLoadFailedMessage",
-        "sLoadGame",
-        "sLoadingErrorsMsg",
-        "sLoadingMessage1",
-        "sLoadingMessage14",
-        "sLoadingMessage15",
-        "sLoadingMessage2",
-        "sLoadingMessage3",
-        "sLoadingMessage4",
-        "sLoadingMessage5",
-        "sLoadingMessage9",
-        "sLoadLastSaveMsg",
-        "sLocal",
-        "sLockFail",
-        "sLockImpossible",
-        "sLockLevel",
-        "sLockSuccess",
-        "sLookDownXbox",
-        "sLookUpXbox",
-        "sLow",
-        "sLucDesc",
-        "sMagDesc",
-        "sMage",
-        "sMagic",
-        "sMagicAncestralGhostID",
-        "sMagicBonelordID",
-        "sMagicBoundBattleAxeID",
-        "sMagicBoundBootsID",
-        "sMagicBoundCuirassID",
-        "sMagicBoundDaggerID",
-        "sMagicBoundHelmID",
-        "sMagicBoundLeftGauntletID",
-        "sMagicBoundLongbowID",
-        "sMagicBoundLongswordID",
-        "sMagicBoundMaceID",
-        "sMagicBoundRightGauntletID",
-        "sMagicBoundShieldID",
-        "sMagicBoundSpearID",
-        "sMagicCannotRecast",
-        "sMagicCenturionSphereID",
-        "sMagicClannfearID",
-        "sMagicContractDisease",
-        "sMagicCorprusWorsens",
-        "sMagicCreature01ID",
-        "sMagicCreature02ID",
-        "sMagicCreature03ID",
-        "sMagicCreature04ID",
-        "sMagicCreature05ID",
-        "sMagicDaedrothID",
-        "sMagicDremoraID",
-        "sMagicEffects",
-        "sMagicFabricantID",
-        "sMagicFlameAtronachID",
-        "sMagicFrostAtronachID",
-        "sMagicGoldenSaintID",
-        "sMagicGreaterBonewalkerID",
-        "sMagicHungerID",
-        "sMagicInsufficientCharge",
-        "sMagicInsufficientSP",
-        "sMagicInvalidEffect",
-        "sMagicInvalidTarget",
-        "sMagicItem",
-        "sMagicLeastBonewalkerID",
-        "sMagicLockSuccess",
-        "sMagicMenu",
-        "sMagicOpenSuccess",
-        "sMagicPCResisted",
-        "sMagicScampID",
-        "sMagicSelectTitle",
-        "sMagicSkeletalMinionID",
-        "sMagicSkillFail",
-        "sMagicStormAtronachID",
-        "sMagicTab",
-        "sMagicTargetResisted",
-        "sMagicTargetResistsWeapons",
-        "sMagicWingedTwilightID",
-        "sMagnitude",
-        "sMagnitudeDes",
-        "sMake Enchantment",
-        "sMap",
-        "sMaster",
-        "sMastPlugMismatchMsg",
-        "sMaximumSaveGameMessage",
-        "sMaxSale",
-        "sMedium",
-        "sMenu_Help_Delay",
-        "sMenu_Mode",
-        "sMenuModeXbox",
-        "sMenuNextXbox",
-        "sMenuPrevXbox",
-        "sMenus",
-        "sMessage1",
-        "sMessage2",
-        "sMessage3",
-        "sMessage4",
-        "sMessage5",
-        "sMessageQuestionAnswer1",
-        "sMessageQuestionAnswer2",
-        "sMessageQuestionAnswer3",
-        "sMiscTab",
-        "sMissingMastersMsg",
-        "sMonk",
-        "sMonthEveningstar",
-        "sMonthFirstseed",
-        "sMonthFrostfall",
-        "sMonthHeartfire",
-        "sMonthLastseed",
-        "sMonthMidyear",
-        "sMonthMorningstar",
-        "sMonthRainshand",
-        "sMonthSecondseed",
-        "sMonthSunsdawn",
-        "sMonthSunsdusk",
-        "sMonthSunsheight",
-        "sMore",
-        "sMortar",
-        "sMouse",
-        "sMouseFlip",
-        "sMouseWheelDownShort",
-        "sMouseWheelUpShort",
-        "sMove",
-        "sMoveDownXbox",
-        "sMoveUpXbox",
-        "sMusic",
-        "sName",
-        "sNameTitle",
-        "sNear",
-        "sNeedOneSkill",
-        "sNeedTwoSkills",
-        "sNewGame",
-        "sNext",
-        "sNextRank",
-        "sNextSpell",
-        "sNextSpellXbox",
-        "sNextWeapon",
-        "sNextWeaponXbox",
-        "sNightblade",
-        "sNo",
-        "sNoName",
-        "sNone",
-        "sNotifyMessage1",
-        "sNotifyMessage10",
-        "sNotifyMessage11",
-        "sNotifyMessage12",
-        "sNotifyMessage13",
-        "sNotifyMessage14",
-        "sNotifyMessage15",
-        "sNotifyMessage16",
-        "sNotifyMessage16_a",
-        "sNotifyMessage17",
-        "sNotifyMessage18",
-        "sNotifyMessage19",
-        "sNotifyMessage2",
-        "sNotifyMessage20",
-        "sNotifyMessage21",
-        "sNotifyMessage22",
-        "sNotifyMessage23",
-        "sNotifyMessage24",
-        "sNotifyMessage25",
-        "sNotifyMessage26",
-        "sNotifyMessage27",
-        "sNotifyMessage28",
-        "sNotifyMessage29",
-        "sNotifyMessage3",
-        "sNotifyMessage30",
-        "sNotifyMessage31",
-        "sNotifyMessage32",
-        "sNotifyMessage33",
-        "sNotifyMessage34",
-        "sNotifyMessage35",
-        "sNotifyMessage36",
-        "sNotifyMessage37",
-        "sNotifyMessage38",
-        "sNotifyMessage39",
-        "sNotifyMessage4",
-        "sNotifyMessage40",
-        "sNotifyMessage41",
-        "sNotifyMessage42",
-        "sNotifyMessage43",
-        "sNotifyMessage44",
-        "sNotifyMessage45",
-        "sNotifyMessage46",
-        "sNotifyMessage47",
-        "sNotifyMessage48",
-        "sNotifyMessage49",
-        "sNotifyMessage4XBOX",
-        "sNotifyMessage5",
-        "sNotifyMessage50",
-        "sNotifyMessage51",
-        "sNotifyMessage52",
-        "sNotifyMessage53",
-        "sNotifyMessage54",
-        "sNotifyMessage55",
-        "sNotifyMessage56",
-        "sNotifyMessage57",
-        "sNotifyMessage58",
-        "sNotifyMessage59",
-        "sNotifyMessage6",
-        "sNotifyMessage60",
-        "sNotifyMessage61",
-        "sNotifyMessage62",
-        "sNotifyMessage63",
-        "sNotifyMessage64",
-        "sNotifyMessage65",
-        "sNotifyMessage66",
-        "sNotifyMessage67",
-        "sNotifyMessage6a",
-        "sNotifyMessage7",
-        "sNotifyMessage8",
-        "sNotifyMessage9",
-        "sOff",
-        "sOffer",
-        "sOfferMenuTitle",
-        "sOK",
-        "sOn",
-        "sOnce",
-        "sOneHanded",
-        "sOnetypeEffectMessage",
-        "sonword",
-        "sOptions",
-        "sOptionsMenuXbox",
-        "spercent",
-        "sPerDesc",
-        "sPersuasion",
-        "sPersuasionMenuTitle",
-        "sPickUp",
-        "sPilgrim",
-        "spoint",
-        "spoints",
-        "sPotionSuccess",
-        "sPowerAlreadyUsed",
-        "sPowers",
-        "sPreferences",
-        "sPrefs",
-        "sPrev",
-        "sPrevSpell",
-        "sPrevSpellXbox",
-        "sPrevWeapon",
-        "sPrevWeaponXbox",
-        "sProfitValue",
-        "sQuality",
-        "sQuanityMenuMessage01",
-        "sQuanityMenuMessage02",
-        "sQuestionDeleteSpell",
-        "sQuestionMark",
-        "sQuick0Xbox",
-        "sQuick10Cmd",
-        "sQuick1Cmd",
-        "sQuick2Cmd",
-        "sQuick3Cmd",
-        "sQuick4Cmd",
-        "sQuick4Xbox",
-        "sQuick5Cmd",
-        "sQuick5Xbox",
-        "sQuick6Cmd",
-        "sQuick6Xbox",
-        "sQuick7Cmd",
-        "sQuick7Xbox",
-        "sQuick8Cmd",
-        "sQuick8Xbox",
-        "sQuick9Cmd",
-        "sQuick9Xbox",
-        "sQuick_Save",
-        "sQuickLoadCmd",
-        "sQuickLoadXbox",
-        "sQuickMenu",
-        "sQuickMenu1",
-        "sQuickMenu2",
-        "sQuickMenu3",
-        "sQuickMenu4",
-        "sQuickMenu5",
-        "sQuickMenu6",
-        "sQuickMenuInstruc",
-        "sQuickMenuTitle",
-        "sQuickSaveCmd",
-        "sQuickSaveXbox",
-        "sRace",
-        "sRaceMenu1",
-        "sRaceMenu2",
-        "sRaceMenu3",
-        "sRaceMenu4",
-        "sRaceMenu5",
-        "sRaceMenu6",
-        "sRaceMenu7",
-        "sRacialTraits",
-        "sRange",
-        "sRangeDes",
-        "sRangeSelf",
-        "sRangeTarget",
-        "sRangeTouch",
-        "sReady_Magic",
-        "sReady_Weapon",
-        "sReadyItemXbox",
-        "sReadyMagicXbox",
-        "sRechargeEnchantment",
-        "sRender_Distance",
-        "sRepair",
-        "sRepairFailed",
-        "sRepairServiceTitle",
-        "sRepairSuccess",
-        "sReputation",
-        "sResChangeWarning",
-        "sRest",
-        "sRestIllegal",
-        "sRestKey",
-        "sRestMenu1",
-        "sRestMenu2",
-        "sRestMenu3",
-        "sRestMenu4",
-        "sRestMenuXbox",
-        "sRestore",
-        "sRetort",
-        "sReturnToGame",
-        "sRight",
-        "sRogue",
-        "sRun",
-        "sRunXbox",
-        "sSave",
-        "sSaveGame",
-        "sSaveGameDenied",
-        "sSaveGameFailed",
-        "sSaveGameNoMemory",
-        "sSaveGameTooBig",
-        "sSaveMenu1",
-        "sSaveMenuHelp01",
-        "sSaveMenuHelp02",
-        "sSaveMenuHelp03",
-        "sSaveMenuHelp04",
-        "sSaveMenuHelp05",
-        "sSaveMenuHelp06",
-        "sSchool",
-        "sSchoolAlteration",
-        "sSchoolConjuration",
-        "sSchoolDestruction",
-        "sSchoolIllusion",
-        "sSchoolMysticism",
-        "sSchoolRestoration",
-        "sScout",
-        "sScrolldown",
-        "sScrollup",
-        "ssecond",
-        "sseconds",
-        "sSeldom",
-        "sSelect",
-        "sSell",
-        "sSellerGold",
-        "sService",
-        "sServiceRefusal",
-        "sServiceRepairTitle",
-        "sServiceSpellsTitle",
-        "sServiceTrainingTitle",
-        "sServiceTrainingWords",
-        "sServiceTravelTitle",
-        "sSetValueMessage01",
-        "sSex",
-        "sShadows",
-        "sShadowText",
-        "sShift",
-        "sSkill",
-        "sSkillAcrobatics",
-        "sSkillAlchemy",
-        "sSkillAlteration",
-        "sSkillArmorer",
-        "sSkillAthletics",
-        "sSkillAxe",
-        "sSkillBlock",
-        "sSkillBluntweapon",
-        "sSkillClassMajor",
-        "sSkillClassMinor",
-        "sSkillClassMisc",
-        "sSkillConjuration",
-        "sSkillDestruction",
-        "sSkillEnchant",
-        "sSkillHandtohand",
-        "sSkillHeavyarmor",
-        "sSkillIllusion",
-        "sSkillLightarmor",
-        "sSkillLongblade",
-        "sSkillMarksman",
-        "sSkillMaxReached",
-        "sSkillMediumarmor",
-        "sSkillMercantile",
-        "sSkillMysticism",
-        "sSkillProgress",
-        "sSkillRestoration",
-        "sSkillSecurity",
-        "sSkillShortblade",
-        "sSkillsMenu1",
-        "sSkillsMenuReputationHelp",
-        "sSkillSneak",
-        "sSkillSpear",
-        "sSkillSpeechcraft",
-        "sSkillUnarmored",
-        "sSlash",
-        "sSleepInterrupt",
-        "sSlideLeftXbox",
-        "sSlideRightXbox",
-        "sSlow",
-        "sSorceror",
-        "sSoulGem",
-        "sSoulGemsWithSouls",
-        "sSoultrapSuccess",
-        "sSpace",
-        "sSpdDesc",
-        "sSpecialization",
-        "sSpecializationCombat",
-        "sSpecializationMagic",
-        "sSpecializationMenu1",
-        "sSpecializationStealth",
-        "sSpellmaking",
-        "sSpellmakingHelp1",
-        "sSpellmakingHelp2",
-        "sSpellmakingHelp3",
-        "sSpellmakingHelp4",
-        "sSpellmakingHelp5",
-        "sSpellmakingHelp6",
-        "sSpellmakingMenu1",
-        "sSpellmakingMenuTitle",
-        "sSpells",
-        "sSpellServiceTitle",
-        "sSpellsword",
-        "sStartCell",
-        "sStartCellError",
-        "sStartError",
-        "sStats",
-        "sStrafe",
-        "sStrDesc",
-        "sStrip",
-        "sSubtitles",
-        "sSystemMenuXbox",
-        "sTake",
-        "sTakeAll",
-        "sTargetCriticalStrike",
-        "sTaunt",
-        "sTauntFail",
-        "sTauntSuccess",
-        "sTeleportDisabled",
-        "sThief",
-        "sThrust",
-        "sTo",
-        "sTogglePOVCmd",
-        "sTogglePOVXbox",
-        "sToggleRunXbox",
-        "sTopics",
-        "sTotalCost",
-        "sTotalSold",
-        "sTraining",
-        "sTrainingServiceTitle",
-        "sTraits",
-        "sTransparency_Menu",
-        "sTrapFail",
-        "sTrapImpossible",
-        "sTrapped",
-        "sTrapSuccess",
-        "sTravel",
-        "sTravelServiceTitle",
-        "sTurn",
-        "sTurnLeftXbox",
-        "sTurnRightXbox",
-        "sTwoHanded",
-        "sType",
-        "sTypeAbility",
-        "sTypeBlightDisease",
-        "sTypeCurse",
-        "sTypeDisease",
-        "sTypePower",
-        "sTypeSpell",
-        "sUnequip",
-        "sUnlocked",
-        "sUntilHealed",
-        "sUse",
-        "sUserDefinedClass",
-        "sUses",
-        "sUseXbox",
-        "sValue",
-        "sVideo",
-        "sVideoWarning",
-        "sVoice",
-        "sWait",
-        "sWarrior",
-        "sWaterReflectUpdate",
-        "sWaterTerrainReflect",
-        "sWeaponTab",
-        "sWeight",
-        "sWerewolfAlarmMessage",
-        "sWerewolfPopup",
-        "sWerewolfRefusal",
-        "sWerewolfRestMessage",
-        "sWilDesc",
-        "sWitchhunter",
-        "sWorld",
-        "sWornTab",
-        "sXStrafe",
-        "sXTimes",
-        "sXTimesINT",
-        "sYes",
-        "sYourGold",
-        0
-    };
-
-    for (int i=0; gmstFloats[i]; i++)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::FloatCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = gmstFloats[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::Floats[i];
         gmst.mValue.setType (ESM::VT_Float);
-        gmst.mValue.setFloat (gmstFloatsValues[i]);
+        gmst.mValue.setFloat (CSMWorld::DefaultGMSTs::FloatsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
 
-    for (int i=0; gmstIntegers[i]; i++)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::IntCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = gmstIntegers[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::Ints[i];
         gmst.mValue.setType (ESM::VT_Int);
-        gmst.mValue.setInteger (gmstIntegersValues[i]);
+        gmst.mValue.setInteger (CSMWorld::DefaultGMSTs::IntsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
 
-    for (int i=0; gmstStrings[i]; i++)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::StringCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = gmstStrings[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::Strings[i];
         gmst.mValue.setType (ESM::VT_String);
         gmst.mValue.setString ("");
         getData().getGmsts().add (gmst);
@@ -1933,115 +44,28 @@ void CSMDoc::Document::addGmsts()
 
 void CSMDoc::Document::addOptionalGmsts()
 {
-    static const char *sFloats[] =
-    {
-        "fCombatDistanceWerewolfMod",
-        "fFleeDistance",
-        "fWereWolfAcrobatics",
-        "fWereWolfAgility",
-        "fWereWolfAlchemy",
-        "fWereWolfAlteration",
-        "fWereWolfArmorer",
-        "fWereWolfAthletics",
-        "fWereWolfAxe",
-        "fWereWolfBlock",
-        "fWereWolfBluntWeapon",
-        "fWereWolfConjuration",
-        "fWereWolfDestruction",
-        "fWereWolfEnchant",
-        "fWereWolfEndurance",
-        "fWereWolfFatigue",
-        "fWereWolfHandtoHand",
-        "fWereWolfHealth",
-        "fWereWolfHeavyArmor",
-        "fWereWolfIllusion",
-        "fWereWolfIntellegence",
-        "fWereWolfLightArmor",
-        "fWereWolfLongBlade",
-        "fWereWolfLuck",
-        "fWereWolfMagicka",
-        "fWereWolfMarksman",
-        "fWereWolfMediumArmor",
-        "fWereWolfMerchantile",
-        "fWereWolfMysticism",
-        "fWereWolfPersonality",
-        "fWereWolfRestoration",
-        "fWereWolfRunMult",
-        "fWereWolfSecurity",
-        "fWereWolfShortBlade",
-        "fWereWolfSilverWeaponDamageMult",
-        "fWereWolfSneak",
-        "fWereWolfSpear",
-        "fWereWolfSpeechcraft",
-        "fWereWolfSpeed",
-        "fWereWolfStrength",
-        "fWereWolfUnarmored",
-        "fWereWolfWillPower",
-        0
-    };
-
-    static const char *sIntegers[] =
-    {
-        "iWereWolfBounty",
-        "iWereWolfFightMod",
-        "iWereWolfFleeMod",
-        "iWereWolfLevelToAttack",
-        0
-    };
-
-    static const char *sStrings[] =
-    {
-        "sCompanionShare",
-        "sCompanionWarningButtonOne",
-        "sCompanionWarningButtonTwo",
-        "sCompanionWarningMessage",
-        "sDeleteNote",
-        "sEditNote",
-        "sEffectSummonCreature01",
-        "sEffectSummonCreature02",
-        "sEffectSummonCreature03",
-        "sEffectSummonCreature04",
-        "sEffectSummonCreature05",
-        "sEffectSummonFabricant",
-        "sLevitateDisabled",
-        "sMagicCreature01ID",
-        "sMagicCreature02ID",
-        "sMagicCreature03ID",
-        "sMagicCreature04ID",
-        "sMagicCreature05ID",
-        "sMagicFabricantID",
-        "sMaxSale",
-        "sProfitValue",
-        "sTeleportDisabled",
-        "sWerewolfAlarmMessage",
-        "sWerewolfPopup",
-        "sWerewolfRefusal",
-        "sWerewolfRestMessage",
-        0
-    };
-
-    for (int i=0; sFloats[i]; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalFloatCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = sFloats[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::OptionalFloats[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_Float);
         addOptionalGmst (gmst);
     }
 
-    for (int i=0; sIntegers[i]; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalIntCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = sIntegers[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::OptionalInts[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_Int);
         addOptionalGmst (gmst);
     }
 
-    for (int i=0; sStrings[i]; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalStringCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = sStrings[i];
+        gmst.mId = CSMWorld::DefaultGMSTs::OptionalStrings[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_String);
         gmst.mValue.setString ("<no text>");
diff --git a/apps/opencs/model/tools/gmstcheck.cpp b/apps/opencs/model/tools/gmstcheck.cpp
new file mode 100644
index 0000000000..6c17ff3a5a
--- /dev/null
+++ b/apps/opencs/model/tools/gmstcheck.cpp
@@ -0,0 +1,91 @@
+#include "gmstcheck.hpp"
+
+#include "../world/defaultgmsts.hpp"
+
+CSMTools::GMSTCheckStage::GMSTCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings)
+    : mGameSettings(gameSettings)
+{}
+
+int CSMTools::GMSTCheckStage::setup()
+{
+    return mGameSettings.getSize();
+}
+
+void CSMTools::GMSTCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<ESM::GameSetting>& record = mGameSettings.getRecord (stage);
+    
+    if (record.isDeleted())
+        return;
+    
+    const ESM::GameSetting& gmst = record.get();
+    
+    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Gmst, gmst.mId);
+    
+    // Test for empty string
+    if (gmst.mValue.getType() == ESM::VT_String && gmst.mValue.getString().empty())
+        messages.add(id, gmst.mId + " is an empty string", "", CSMDoc::Message::Severity_Warning);
+    
+    // Checking type and limits
+    // optimization - compare it to lists based on naming convention (f-float,i-int,s-string)
+    if (gmst.mId[0] == 'f')
+    {
+        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::FloatCount; ++i)
+        {
+            if (gmst.mId == CSMWorld::DefaultGMSTs::Floats[i])
+            {
+                if (gmst.mValue.getType() != ESM::VT_Float)
+                    messages.add(id, "The type of " + gmst.mId + " is incorrect", 
+                                 "Change the GMST type to a float", CSMDoc::Message::Severity_Error);
+                
+                if (gmst.mValue.getFloat() < CSMWorld::DefaultGMSTs::FloatLimits[i*2])
+                    messages.add(id, gmst.mId + " is less than the suggested range", "Change the value",
+                                 CSMDoc::Message::Severity_Warning);
+                
+                if (gmst.mValue.getFloat() > CSMWorld::DefaultGMSTs::FloatLimits[i*2+1])
+                    messages.add(id, gmst.mId + " is more than the suggested range", "Change the value",
+                                 CSMDoc::Message::Severity_Warning);
+                
+                break; // for loop
+            }
+        }
+    }
+    else if (gmst.mId[0] == 'i')
+    {
+        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::IntCount; ++i)
+        {   
+            if (gmst.mId == CSMWorld::DefaultGMSTs::Ints[i])
+            {
+                if (gmst.mValue.getType() != ESM::VT_Int)
+                    messages.add(id, "The type of " + gmst.mId + " is incorrect",
+                                 "Change the GMST type to an int", CSMDoc::Message::Severity_Error);
+                
+                if (gmst.mValue.getInteger() < CSMWorld::DefaultGMSTs::IntLimits[i*2])
+                    messages.add(id, gmst.mId + " is less than the suggested range", "Change the value",
+                                 CSMDoc::Message::Severity_Warning);
+                
+                if (gmst.mValue.getInteger() > CSMWorld::DefaultGMSTs::IntLimits[i*2+1])
+                    messages.add(id, gmst.mId + " is more than the suggested range", "Change the value",
+                                 CSMDoc::Message::Severity_Warning);
+                
+                break; // for loop
+            }
+        }
+    }
+    else if (gmst.mId[0] == 's')
+    {
+        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::StringCount; ++i)
+        {
+            if (gmst.mId == CSMWorld::DefaultGMSTs::Strings[i])
+            {
+                ESM::VarType type = gmst.mValue.getType();
+                
+                if (type != ESM::VT_String && type != ESM::VT_None)
+                    messages.add(id, "The type of " + gmst.mId + " is incorrect", 
+                                "Change the GMST type to a string", CSMDoc::Message::Severity_Error);
+                
+                break; // for loop
+            }
+        }
+    }
+}
diff --git a/apps/opencs/model/tools/gmstcheck.hpp b/apps/opencs/model/tools/gmstcheck.hpp
new file mode 100644
index 0000000000..ca1564d9e8
--- /dev/null
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@@ -0,0 +1,32 @@
+#ifndef CSM_TOOLS_GMSTCHECK_H
+#define CSM_TOOLS_GMSTCHECK_H
+
+#include <components/esm/loadgmst.hpp>
+
+#include "../world/idcollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMTools
+{
+    /// \brief VerifyStage: make sure that GMSTs are alright
+    class GMSTCheckStage : public CSMDoc::Stage
+    {
+    public:
+        
+        GMSTCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings);
+        
+        virtual int setup();
+        ///< \return number of steps
+
+        virtual void perform(int stage, CSMDoc::Messages& messages);
+        ///< Messages resulting from this stage will be appended to \a messages
+        
+    private:
+        
+        const CSMWorld::IdCollection<ESM::GameSetting>& mGameSettings;
+        
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 608ed9922f..9f36193ef1 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -29,6 +29,7 @@
 #include "soundgencheck.hpp"
 #include "magiceffectcheck.hpp"
 #include "mergeoperation.hpp"
+#include "gmstcheck.hpp"
 
 CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
 {
@@ -110,6 +111,8 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
                                                                     mData.getReferenceables(),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Icons),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Textures)));
+        
+        mVerifierOperation->appendStage (new GMSTCheckStage (mData.getGmsts()));
 
         mVerifier.setOperation (mVerifierOperation);
     }
diff --git a/apps/opencs/model/world/defaultgmsts.cpp b/apps/opencs/model/world/defaultgmsts.cpp
new file mode 100644
index 0000000000..ef3d536b1e
--- /dev/null
+++ b/apps/opencs/model/world/defaultgmsts.cpp
@@ -0,0 +1,2336 @@
+#include "defaultgmsts.hpp"
+
+#include <limits>
+
+const float FInf = std::numeric_limits<float>::infinity();
+const float FEps = std::numeric_limits<float>::epsilon();
+
+const int IMax = std::numeric_limits<int>::max();
+const int IMin = std::numeric_limits<int>::min();
+
+const char* CSMWorld::DefaultGMSTs::Floats[CSMWorld::DefaultGMSTs::FloatCount] =
+{
+    "fAIFleeFleeMult",
+    "fAIFleeHealthMult",
+    "fAIMagicSpellMult",
+    "fAIMeleeArmorMult",
+    "fAIMeleeSummWeaponMult",
+    "fAIMeleeWeaponMult",
+    "fAIRangeMagicSpellMult",
+    "fAIRangeMeleeWeaponMult",
+    "fAlarmRadius",
+    "fAthleticsRunBonus",
+    "fAudioDefaultMaxDistance",
+    "fAudioDefaultMinDistance",
+    "fAudioMaxDistanceMult",
+    "fAudioMinDistanceMult",
+    "fAudioVoiceDefaultMaxDistance",
+    "fAudioVoiceDefaultMinDistance",
+    "fAutoPCSpellChance",
+    "fAutoSpellChance",
+    "fBargainOfferBase",
+    "fBargainOfferMulti",
+    "fBarterGoldResetDelay",
+    "fBaseRunMultiplier",
+    "fBlockStillBonus",
+    "fBribe1000Mod",
+    "fBribe100Mod",
+    "fBribe10Mod",
+    "fCombatAngleXY",
+    "fCombatAngleZ",
+    "fCombatArmorMinMult",
+    "fCombatBlockLeftAngle",
+    "fCombatBlockRightAngle",
+    "fCombatCriticalStrikeMult",
+    "fCombatDelayCreature",
+    "fCombatDelayNPC",
+    "fCombatDistance",
+    "fCombatDistanceWerewolfMod",
+    "fCombatForceSideAngle",
+    "fCombatInvisoMult",
+    "fCombatKODamageMult",
+    "fCombatTorsoSideAngle",
+    "fCombatTorsoStartPercent",
+    "fCombatTorsoStopPercent",
+    "fConstantEffectMult",
+    "fCorpseClearDelay",
+    "fCorpseRespawnDelay",
+    "fCrimeGoldDiscountMult",
+    "fCrimeGoldTurnInMult",
+    "fCrimeStealing",
+    "fDamageStrengthBase",
+    "fDamageStrengthMult",
+    "fDifficultyMult",
+    "fDiseaseXferChance",
+    "fDispAttacking",
+    "fDispBargainFailMod",
+    "fDispBargainSuccessMod",
+    "fDispCrimeMod",
+    "fDispDiseaseMod",
+    "fDispFactionMod",
+    "fDispFactionRankBase",
+    "fDispFactionRankMult",
+    "fDispositionMod",
+    "fDispPersonalityBase",
+    "fDispPersonalityMult",
+    "fDispPickPocketMod",
+    "fDispRaceMod",
+    "fDispStealing",
+    "fDispWeaponDrawn",
+    "fEffectCostMult",
+    "fElementalShieldMult",
+    "fEnchantmentChanceMult",
+    "fEnchantmentConstantChanceMult",
+    "fEnchantmentConstantDurationMult",
+    "fEnchantmentMult",
+    "fEnchantmentValueMult",
+    "fEncumberedMoveEffect",
+    "fEncumbranceStrMult",
+    "fEndFatigueMult",
+    "fFallAcroBase",
+    "fFallAcroMult",
+    "fFallDamageDistanceMin",
+    "fFallDistanceBase",
+    "fFallDistanceMult",
+    "fFatigueAttackBase",
+    "fFatigueAttackMult",
+    "fFatigueBase",
+    "fFatigueBlockBase",
+    "fFatigueBlockMult",
+    "fFatigueJumpBase",
+    "fFatigueJumpMult",
+    "fFatigueMult",
+    "fFatigueReturnBase",
+    "fFatigueReturnMult",
+    "fFatigueRunBase",
+    "fFatigueRunMult",
+    "fFatigueSneakBase",
+    "fFatigueSneakMult",
+    "fFatigueSpellBase",
+    "fFatigueSpellCostMult",
+    "fFatigueSpellMult",
+    "fFatigueSwimRunBase",
+    "fFatigueSwimRunMult",
+    "fFatigueSwimWalkBase",
+    "fFatigueSwimWalkMult",
+    "fFightDispMult",
+    "fFightDistanceMultiplier",
+    "fFightStealing",
+    "fFleeDistance",
+    "fGreetDistanceReset",
+    "fHandtoHandHealthPer",
+    "fHandToHandReach",
+    "fHoldBreathEndMult",
+    "fHoldBreathTime",
+    "fIdleChanceMultiplier",
+    "fIngredientMult",
+    "fInteriorHeadTrackMult",
+    "fJumpAcrobaticsBase",
+    "fJumpAcroMultiplier",
+    "fJumpEncumbranceBase",
+    "fJumpEncumbranceMultiplier",
+    "fJumpMoveBase",
+    "fJumpMoveMult",
+    "fJumpRunMultiplier",
+    "fKnockDownMult",
+    "fLevelMod",
+    "fLevelUpHealthEndMult",
+    "fLightMaxMod",
+    "fLuckMod",
+    "fMagesGuildTravel",
+    "fMagicCreatureCastDelay",
+    "fMagicDetectRefreshRate",
+    "fMagicItemConstantMult",
+    "fMagicItemCostMult",
+    "fMagicItemOnceMult",
+    "fMagicItemPriceMult",
+    "fMagicItemRechargePerSecond",
+    "fMagicItemStrikeMult",
+    "fMagicItemUsedMult",
+    "fMagicStartIconBlink",
+    "fMagicSunBlockedMult",
+    "fMajorSkillBonus",
+    "fMaxFlySpeed",
+    "fMaxHandToHandMult",
+    "fMaxHeadTrackDistance",
+    "fMaxWalkSpeed",
+    "fMaxWalkSpeedCreature",
+    "fMedMaxMod",
+    "fMessageTimePerChar",
+    "fMinFlySpeed",
+    "fMinHandToHandMult",
+    "fMinorSkillBonus",
+    "fMinWalkSpeed",
+    "fMinWalkSpeedCreature",
+    "fMiscSkillBonus",
+    "fNPCbaseMagickaMult",
+    "fNPCHealthBarFade",
+    "fNPCHealthBarTime",
+    "fPCbaseMagickaMult",
+    "fPerDieRollMult",
+    "fPersonalityMod",
+    "fPerTempMult",
+    "fPickLockMult",
+    "fPickPocketMod",
+    "fPotionMinUsefulDuration",
+    "fPotionStrengthMult",
+    "fPotionT1DurMult",
+    "fPotionT1MagMult",
+    "fPotionT4BaseStrengthMult",
+    "fPotionT4EquipStrengthMult",
+    "fProjectileMaxSpeed",
+    "fProjectileMinSpeed",
+    "fProjectileThrownStoreChance",
+    "fRepairAmountMult",
+    "fRepairMult",
+    "fReputationMod",
+    "fRestMagicMult",
+    "fSeriousWoundMult",
+    "fSleepRandMod",
+    "fSleepRestMod",
+    "fSneakBootMult",
+    "fSneakDistanceBase",
+    "fSneakDistanceMultiplier",
+    "fSneakNoViewMult",
+    "fSneakSkillMult",
+    "fSneakSpeedMultiplier",
+    "fSneakUseDelay",
+    "fSneakUseDist",
+    "fSneakViewMult",
+    "fSoulGemMult",
+    "fSpecialSkillBonus",
+    "fSpellMakingValueMult",
+    "fSpellPriceMult",
+    "fSpellValueMult",
+    "fStromWalkMult",
+    "fStromWindSpeed",
+    "fSuffocationDamage",
+    "fSwimHeightScale",
+    "fSwimRunAthleticsMult",
+    "fSwimRunBase",
+    "fSwimWalkAthleticsMult",
+    "fSwimWalkBase",
+    "fSwingBlockBase",
+    "fSwingBlockMult",
+    "fTargetSpellMaxSpeed",
+    "fThrownWeaponMaxSpeed",
+    "fThrownWeaponMinSpeed",
+    "fTrapCostMult",
+    "fTravelMult",
+    "fTravelTimeMult",
+    "fUnarmoredBase1",
+    "fUnarmoredBase2",
+    "fVanityDelay",
+    "fVoiceIdleOdds",
+    "fWaterReflectUpdateAlways",
+    "fWaterReflectUpdateSeldom",
+    "fWeaponDamageMult",
+    "fWeaponFatigueBlockMult",
+    "fWeaponFatigueMult",
+    "fWereWolfAcrobatics",
+    "fWereWolfAgility",
+    "fWereWolfAlchemy",
+    "fWereWolfAlteration",
+    "fWereWolfArmorer",
+    "fWereWolfAthletics",
+    "fWereWolfAxe",
+    "fWereWolfBlock",
+    "fWereWolfBluntWeapon",
+    "fWereWolfConjuration",
+    "fWereWolfDestruction",
+    "fWereWolfEnchant",
+    "fWereWolfEndurance",
+    "fWereWolfFatigue",
+    "fWereWolfHandtoHand",
+    "fWereWolfHealth",
+    "fWereWolfHeavyArmor",
+    "fWereWolfIllusion",
+    "fWereWolfIntellegence",
+    "fWereWolfLightArmor",
+    "fWereWolfLongBlade",
+    "fWereWolfLuck",
+    "fWereWolfMagicka",
+    "fWereWolfMarksman",
+    "fWereWolfMediumArmor",
+    "fWereWolfMerchantile",
+    "fWereWolfMysticism",
+    "fWereWolfPersonality",
+    "fWereWolfRestoration",
+    "fWereWolfRunMult",
+    "fWereWolfSecurity",
+    "fWereWolfShortBlade",
+    "fWereWolfSilverWeaponDamageMult",
+    "fWereWolfSneak",
+    "fWereWolfSpear",
+    "fWereWolfSpeechcraft",
+    "fWereWolfSpeed",
+    "fWereWolfStrength",
+    "fWereWolfUnarmored",
+    "fWereWolfWillPower",
+    "fWortChanceValue"
+};
+
+const char * CSMWorld::DefaultGMSTs::Ints[CSMWorld::DefaultGMSTs::IntCount] =
+{
+    "i1stPersonSneakDelta",
+    "iAlarmAttack",
+    "iAlarmKilling",
+    "iAlarmPickPocket",
+    "iAlarmStealing",
+    "iAlarmTresspass",
+    "iAlchemyMod",
+    "iAutoPCSpellMax",
+    "iAutoRepFacMod",
+    "iAutoRepLevMod",
+    "iAutoSpellAlterationMax",
+    "iAutoSpellAttSkillMin",
+    "iAutoSpellConjurationMax",
+    "iAutoSpellDestructionMax",
+    "iAutoSpellIllusionMax",
+    "iAutoSpellMysticismMax",
+    "iAutoSpellRestorationMax",
+    "iAutoSpellTimesCanCast",
+    "iBarterFailDisposition",
+    "iBarterSuccessDisposition",
+    "iBaseArmorSkill",
+    "iBlockMaxChance",
+    "iBlockMinChance",
+    "iBootsWeight",
+    "iCrimeAttack",
+    "iCrimeKilling",
+    "iCrimePickPocket",
+    "iCrimeThreshold",
+    "iCrimeThresholdMultiplier",
+    "iCrimeTresspass",
+    "iCuirassWeight",
+    "iDaysinPrisonMod",
+    "iDispAttackMod",
+    "iDispKilling",
+    "iDispTresspass",
+    "iFightAlarmMult",
+    "iFightAttack",
+    "iFightAttacking",
+    "iFightDistanceBase",
+    "iFightKilling",
+    "iFightPickpocket",
+    "iFightTrespass",
+    "iFlee",
+    "iGauntletWeight",
+    "iGreavesWeight",
+    "iGreetDistanceMultiplier",
+    "iGreetDuration",
+    "iHelmWeight",
+    "iKnockDownOddsBase",
+    "iKnockDownOddsMult",
+    "iLevelUp01Mult",
+    "iLevelUp02Mult",
+    "iLevelUp03Mult",
+    "iLevelUp04Mult",
+    "iLevelUp05Mult",
+    "iLevelUp06Mult",
+    "iLevelUp07Mult",
+    "iLevelUp08Mult",
+    "iLevelUp09Mult",
+    "iLevelUp10Mult",
+    "iLevelupMajorMult",
+    "iLevelupMajorMultAttribute",
+    "iLevelupMinorMult",
+    "iLevelupMinorMultAttribute",
+    "iLevelupMiscMultAttriubte",
+    "iLevelupSpecialization",
+    "iLevelupTotal",
+    "iMagicItemChargeConst",
+    "iMagicItemChargeOnce",
+    "iMagicItemChargeStrike",
+    "iMagicItemChargeUse",
+    "iMaxActivateDist",
+    "iMaxInfoDist",
+    "iMonthsToRespawn",
+    "iNumberCreatures",
+    "iPauldronWeight",
+    "iPerMinChance",
+    "iPerMinChange",
+    "iPickMaxChance",
+    "iPickMinChance",
+    "iShieldWeight",
+    "iSoulAmountForConstantEffect",
+    "iTrainingMod",
+    "iVoiceAttackOdds",
+    "iVoiceHitOdds",
+    "iWereWolfBounty",
+    "iWereWolfFightMod",
+    "iWereWolfFleeMod",
+    "iWereWolfLevelToAttack"
+};
+
+const char * CSMWorld::DefaultGMSTs::Strings[CSMWorld::DefaultGMSTs::StringCount] =
+{
+    "s3dAudio",
+    "s3dHardware",
+    "s3dSoftware",
+    "sAbsorb",
+    "sAcrobat",
+    "sActivate",
+    "sActivateXbox",
+    "sActorInCombat",
+    "sAdmire",
+    "sAdmireFail",
+    "sAdmireSuccess",
+    "sAgent",
+    "sAgiDesc",
+    "sAIDistance",
+    "sAlembic",
+    "sAllTab",
+    "sAlways",
+    "sAlways_Run",
+    "sand",
+    "sApparatus",
+    "sApparelTab",
+    "sArcher",
+    "sArea",
+    "sAreaDes",
+    "sArmor",
+    "sArmorRating",
+    "sAsk",
+    "sAssassin",
+    "sAt",
+    "sAttack",
+    "sAttributeAgility",
+    "sAttributeEndurance",
+    "sAttributeIntelligence",
+    "sAttributeListTitle",
+    "sAttributeLuck",
+    "sAttributePersonality",
+    "sAttributesMenu1",
+    "sAttributeSpeed",
+    "sAttributeStrength",
+    "sAttributeWillpower",
+    "sAudio",
+    "sAuto_Run",
+    "sBack",
+    "sBackspace",
+    "sBackXbox",
+    "sBarbarian",
+    "sBard",
+    "sBarter",
+    "sBarterDialog1",
+    "sBarterDialog10",
+    "sBarterDialog11",
+    "sBarterDialog12",
+    "sBarterDialog2",
+    "sBarterDialog3",
+    "sBarterDialog4",
+    "sBarterDialog5",
+    "sBarterDialog6",
+    "sBarterDialog7",
+    "sBarterDialog8",
+    "sBarterDialog9",
+    "sBattlemage",
+    "sBestAttack",
+    "sBirthSign",
+    "sBirthsignmenu1",
+    "sBirthsignmenu2",
+    "sBlocks",
+    "sBonusSkillTitle",
+    "sBookPageOne",
+    "sBookPageTwo",
+    "sBookSkillMessage",
+    "sBounty",
+    "sBreath",
+    "sBribe 10 Gold",
+    "sBribe 100 Gold",
+    "sBribe 1000 Gold",
+    "sBribeFail",
+    "sBribeSuccess",
+    "sBuy",
+    "sBye",
+    "sCalcinator",
+    "sCancel",
+    "sCantEquipWeapWarning",
+    "sCastCost",
+    "sCaughtStealingMessage",
+    "sCenter",
+    "sChangedMastersMsg",
+    "sCharges",
+    "sChooseClassMenu1",
+    "sChooseClassMenu2",
+    "sChooseClassMenu3",
+    "sChooseClassMenu4",
+    "sChop",
+    "sClass",
+    "sClassChoiceMenu1",
+    "sClassChoiceMenu2",
+    "sClassChoiceMenu3",
+    "sClose",
+    "sCompanionShare",
+    "sCompanionWarningButtonOne",
+    "sCompanionWarningButtonTwo",
+    "sCompanionWarningMessage",
+    "sCondition",
+    "sConsoleTitle",
+    "sContainer",
+    "sContentsMessage1",
+    "sContentsMessage2",
+    "sContentsMessage3",
+    "sControlerVibration",
+    "sControls",
+    "sControlsMenu1",
+    "sControlsMenu2",
+    "sControlsMenu3",
+    "sControlsMenu4",
+    "sControlsMenu5",
+    "sControlsMenu6",
+    "sCostChance",
+    "sCostCharge",
+    "sCreate",
+    "sCreateClassMenu1",
+    "sCreateClassMenu2",
+    "sCreateClassMenu3",
+    "sCreateClassMenuHelp1",
+    "sCreateClassMenuHelp2",
+    "sCreateClassMenuWarning",
+    "sCreatedEffects",
+    "sCrimeHelp",
+    "sCrimeMessage",
+    "sCrouch_Sneak",
+    "sCrouchXbox",
+    "sCrusader",
+    "sCursorOff",
+    "sCustom",
+    "sCustomClassName",
+    "sDamage",
+    "sDark_Gamma",
+    "sDay",
+    "sDefaultCellname",
+    "sDelete",
+    "sDeleteGame",
+    "sDeleteNote",
+    "sDeleteSpell",
+    "sDeleteSpellError",
+    "sDetail_Level",
+    "sDialogMenu1",
+    "sDialogText1Xbox",
+    "sDialogText2Xbox",
+    "sDialogText3Xbox",
+    "sDifficulty",
+    "sDisposeCorpseFail",
+    "sDisposeofCorpse",
+    "sDone",
+    "sDoYouWantTo",
+    "sDrain",
+    "sDrop",
+    "sDuration",
+    "sDurationDes",
+    "sEasy",
+    "sEditNote",
+    "sEffectAbsorbAttribute",
+    "sEffectAbsorbFatigue",
+    "sEffectAbsorbHealth",
+    "sEffectAbsorbSkill",
+    "sEffectAbsorbSpellPoints",
+    "sEffectAlmsiviIntervention",
+    "sEffectBlind",
+    "sEffectBoundBattleAxe",
+    "sEffectBoundBoots",
+    "sEffectBoundCuirass",
+    "sEffectBoundDagger",
+    "sEffectBoundGloves",
+    "sEffectBoundHelm",
+    "sEffectBoundLongbow",
+    "sEffectBoundLongsword",
+    "sEffectBoundMace",
+    "sEffectBoundShield",
+    "sEffectBoundSpear",
+    "sEffectBurden",
+    "sEffectCalmCreature",
+    "sEffectCalmHumanoid",
+    "sEffectChameleon",
+    "sEffectCharm",
+    "sEffectCommandCreatures",
+    "sEffectCommandHumanoids",
+    "sEffectCorpus",
+    "sEffectCureBlightDisease",
+    "sEffectCureCommonDisease",
+    "sEffectCureCorprusDisease",
+    "sEffectCureParalyzation",
+    "sEffectCurePoison",
+    "sEffectDamageAttribute",
+    "sEffectDamageFatigue",
+    "sEffectDamageHealth",
+    "sEffectDamageMagicka",
+    "sEffectDamageSkill",
+    "sEffectDemoralizeCreature",
+    "sEffectDemoralizeHumanoid",
+    "sEffectDetectAnimal",
+    "sEffectDetectEnchantment",
+    "sEffectDetectKey",
+    "sEffectDisintegrateArmor",
+    "sEffectDisintegrateWeapon",
+    "sEffectDispel",
+    "sEffectDivineIntervention",
+    "sEffectDrainAttribute",
+    "sEffectDrainFatigue",
+    "sEffectDrainHealth",
+    "sEffectDrainSkill",
+    "sEffectDrainSpellpoints",
+    "sEffectExtraSpell",
+    "sEffectFeather",
+    "sEffectFireDamage",
+    "sEffectFireShield",
+    "sEffectFortifyAttackBonus",
+    "sEffectFortifyAttribute",
+    "sEffectFortifyFatigue",
+    "sEffectFortifyHealth",
+    "sEffectFortifyMagickaMultiplier",
+    "sEffectFortifySkill",
+    "sEffectFortifySpellpoints",
+    "sEffectFrenzyCreature",
+    "sEffectFrenzyHumanoid",
+    "sEffectFrostDamage",
+    "sEffectFrostShield",
+    "sEffectInvisibility",
+    "sEffectJump",
+    "sEffectLevitate",
+    "sEffectLight",
+    "sEffectLightningShield",
+    "sEffectLock",
+    "sEffectMark",
+    "sEffectNightEye",
+    "sEffectOpen",
+    "sEffectParalyze",
+    "sEffectPoison",
+    "sEffectRallyCreature",
+    "sEffectRallyHumanoid",
+    "sEffectRecall",
+    "sEffectReflect",
+    "sEffectRemoveCurse",
+    "sEffectResistBlightDisease",
+    "sEffectResistCommonDisease",
+    "sEffectResistCorprusDisease",
+    "sEffectResistFire",
+    "sEffectResistFrost",
+    "sEffectResistMagicka",
+    "sEffectResistNormalWeapons",
+    "sEffectResistParalysis",
+    "sEffectResistPoison",
+    "sEffectResistShock",
+    "sEffectRestoreAttribute",
+    "sEffectRestoreFatigue",
+    "sEffectRestoreHealth",
+    "sEffectRestoreSkill",
+    "sEffectRestoreSpellPoints",
+    "sEffects",
+    "sEffectSanctuary",
+    "sEffectShield",
+    "sEffectShockDamage",
+    "sEffectSilence",
+    "sEffectSlowFall",
+    "sEffectSoultrap",
+    "sEffectSound",
+    "sEffectSpellAbsorption",
+    "sEffectStuntedMagicka",
+    "sEffectSummonAncestralGhost",
+    "sEffectSummonBonelord",
+    "sEffectSummonCenturionSphere",
+    "sEffectSummonClannfear",
+    "sEffectSummonCreature01",
+    "sEffectSummonCreature02",
+    "sEffectSummonCreature03",
+    "sEffectSummonCreature04",
+    "sEffectSummonCreature05",
+    "sEffectSummonDaedroth",
+    "sEffectSummonDremora",
+    "sEffectSummonFabricant",
+    "sEffectSummonFlameAtronach",
+    "sEffectSummonFrostAtronach",
+    "sEffectSummonGoldensaint",
+    "sEffectSummonGreaterBonewalker",
+    "sEffectSummonHunger",
+    "sEffectSummonLeastBonewalker",
+    "sEffectSummonScamp",
+    "sEffectSummonSkeletalMinion",
+    "sEffectSummonStormAtronach",
+    "sEffectSummonWingedTwilight",
+    "sEffectSunDamage",
+    "sEffectSwiftSwim",
+    "sEffectTelekinesis",
+    "sEffectTurnUndead",
+    "sEffectVampirism",
+    "sEffectWaterBreathing",
+    "sEffectWaterWalking",
+    "sEffectWeaknessToBlightDisease",
+    "sEffectWeaknessToCommonDisease",
+    "sEffectWeaknessToCorprusDisease",
+    "sEffectWeaknessToFire",
+    "sEffectWeaknessToFrost",
+    "sEffectWeaknessToMagicka",
+    "sEffectWeaknessToNormalWeapons",
+    "sEffectWeaknessToPoison",
+    "sEffectWeaknessToShock",
+    "sEnableJoystick",
+    "sEnchanting",
+    "sEnchantItems",
+    "sEnchantmentHelp1",
+    "sEnchantmentHelp10",
+    "sEnchantmentHelp2",
+    "sEnchantmentHelp3",
+    "sEnchantmentHelp4",
+    "sEnchantmentHelp5",
+    "sEnchantmentHelp6",
+    "sEnchantmentHelp7",
+    "sEnchantmentHelp8",
+    "sEnchantmentHelp9",
+    "sEnchantmentMenu1",
+    "sEnchantmentMenu10",
+    "sEnchantmentMenu11",
+    "sEnchantmentMenu12",
+    "sEnchantmentMenu2",
+    "sEnchantmentMenu3",
+    "sEnchantmentMenu4",
+    "sEnchantmentMenu5",
+    "sEnchantmentMenu6",
+    "sEnchantmentMenu7",
+    "sEnchantmentMenu8",
+    "sEnchantmentMenu9",
+    "sEncumbrance",
+    "sEndDesc",
+    "sEquip",
+    "sExitGame",
+    "sExpelled",
+    "sExpelledMessage",
+    "sFace",
+    "sFaction",
+    "sFar",
+    "sFast",
+    "sFatDesc",
+    "sFatigue",
+    "sFavoriteSkills",
+    "sfeet",
+    "sFileSize",
+    "sfootarea",
+    "sFootsteps",
+    "sfor",
+    "sFortify",
+    "sForward",
+    "sForwardXbox",
+    "sFull",
+    "sGame",
+    "sGameWithoutLauncherXbox",
+    "sGamma_Correction",
+    "sGeneralMastPlugMismatchMsg",
+    "sGold",
+    "sGoodbye",
+    "sGoverningAttribute",
+    "sgp",
+    "sHair",
+    "sHard",
+    "sHeal",
+    "sHealer",
+    "sHealth",
+    "sHealthDesc",
+    "sHealthPerHourOfRest",
+    "sHealthPerLevel",
+    "sHeavy",
+    "sHigh",
+    "sin",
+    "sInfo",
+    "sInfoRefusal",
+    "sIngredients",
+    "sInPrisonTitle",
+    "sInputMenu1",
+    "sIntDesc",
+    "sIntimidate",
+    "sIntimidateFail",
+    "sIntimidateSuccess",
+    "sInvalidSaveGameMsg",
+    "sInvalidSaveGameMsgXBOX",
+    "sInventory",
+    "sInventoryMenu1",
+    "sInventoryMessage1",
+    "sInventoryMessage2",
+    "sInventoryMessage3",
+    "sInventoryMessage4",
+    "sInventoryMessage5",
+    "sInventorySelectNoIngredients",
+    "sInventorySelectNoItems",
+    "sInventorySelectNoSoul",
+    "sItem",
+    "sItemCastConstant",
+    "sItemCastOnce",
+    "sItemCastWhenStrikes",
+    "sItemCastWhenUsed",
+    "sItemName",
+    "sJournal",
+    "sJournalCmd",
+    "sJournalEntry",
+    "sJournalXbox",
+    "sJoystickHatShort",
+    "sJoystickNotFound",
+    "sJoystickShort",
+    "sJump",
+    "sJumpXbox",
+    "sKeyName_00",
+    "sKeyName_01",
+    "sKeyName_02",
+    "sKeyName_03",
+    "sKeyName_04",
+    "sKeyName_05",
+    "sKeyName_06",
+    "sKeyName_07",
+    "sKeyName_08",
+    "sKeyName_09",
+    "sKeyName_0A",
+    "sKeyName_0B",
+    "sKeyName_0C",
+    "sKeyName_0D",
+    "sKeyName_0E",
+    "sKeyName_0F",
+    "sKeyName_10",
+    "sKeyName_11",
+    "sKeyName_12",
+    "sKeyName_13",
+    "sKeyName_14",
+    "sKeyName_15",
+    "sKeyName_16",
+    "sKeyName_17",
+    "sKeyName_18",
+    "sKeyName_19",
+    "sKeyName_1A",
+    "sKeyName_1B",
+    "sKeyName_1C",
+    "sKeyName_1D",
+    "sKeyName_1E",
+    "sKeyName_1F",
+    "sKeyName_20",
+    "sKeyName_21",
+    "sKeyName_22",
+    "sKeyName_23",
+    "sKeyName_24",
+    "sKeyName_25",
+    "sKeyName_26",
+    "sKeyName_27",
+    "sKeyName_28",
+    "sKeyName_29",
+    "sKeyName_2A",
+    "sKeyName_2B",
+    "sKeyName_2C",
+    "sKeyName_2D",
+    "sKeyName_2E",
+    "sKeyName_2F",
+    "sKeyName_30",
+    "sKeyName_31",
+    "sKeyName_32",
+    "sKeyName_33",
+    "sKeyName_34",
+    "sKeyName_35",
+    "sKeyName_36",
+    "sKeyName_37",
+    "sKeyName_38",
+    "sKeyName_39",
+    "sKeyName_3A",
+    "sKeyName_3B",
+    "sKeyName_3C",
+    "sKeyName_3D",
+    "sKeyName_3E",
+    "sKeyName_3F",
+    "sKeyName_40",
+    "sKeyName_41",
+    "sKeyName_42",
+    "sKeyName_43",
+    "sKeyName_44",
+    "sKeyName_45",
+    "sKeyName_46",
+    "sKeyName_47",
+    "sKeyName_48",
+    "sKeyName_49",
+    "sKeyName_4A",
+    "sKeyName_4B",
+    "sKeyName_4C",
+    "sKeyName_4D",
+    "sKeyName_4E",
+    "sKeyName_4F",
+    "sKeyName_50",
+    "sKeyName_51",
+    "sKeyName_52",
+    "sKeyName_53",
+    "sKeyName_54",
+    "sKeyName_55",
+    "sKeyName_56",
+    "sKeyName_57",
+    "sKeyName_58",
+    "sKeyName_59",
+    "sKeyName_5A",
+    "sKeyName_5B",
+    "sKeyName_5C",
+    "sKeyName_5D",
+    "sKeyName_5E",
+    "sKeyName_5F",
+    "sKeyName_60",
+    "sKeyName_61",
+    "sKeyName_62",
+    "sKeyName_63",
+    "sKeyName_64",
+    "sKeyName_65",
+    "sKeyName_66",
+    "sKeyName_67",
+    "sKeyName_68",
+    "sKeyName_69",
+    "sKeyName_6A",
+    "sKeyName_6B",
+    "sKeyName_6C",
+    "sKeyName_6D",
+    "sKeyName_6E",
+    "sKeyName_6F",
+    "sKeyName_70",
+    "sKeyName_71",
+    "sKeyName_72",
+    "sKeyName_73",
+    "sKeyName_74",
+    "sKeyName_75",
+    "sKeyName_76",
+    "sKeyName_77",
+    "sKeyName_78",
+    "sKeyName_79",
+    "sKeyName_7A",
+    "sKeyName_7B",
+    "sKeyName_7C",
+    "sKeyName_7D",
+    "sKeyName_7E",
+    "sKeyName_7F",
+    "sKeyName_80",
+    "sKeyName_81",
+    "sKeyName_82",
+    "sKeyName_83",
+    "sKeyName_84",
+    "sKeyName_85",
+    "sKeyName_86",
+    "sKeyName_87",
+    "sKeyName_88",
+    "sKeyName_89",
+    "sKeyName_8A",
+    "sKeyName_8B",
+    "sKeyName_8C",
+    "sKeyName_8D",
+    "sKeyName_8E",
+    "sKeyName_8F",
+    "sKeyName_90",
+    "sKeyName_91",
+    "sKeyName_92",
+    "sKeyName_93",
+    "sKeyName_94",
+    "sKeyName_95",
+    "sKeyName_96",
+    "sKeyName_97",
+    "sKeyName_98",
+    "sKeyName_99",
+    "sKeyName_9A",
+    "sKeyName_9B",
+    "sKeyName_9C",
+    "sKeyName_9D",
+    "sKeyName_9E",
+    "sKeyName_9F",
+    "sKeyName_A0",
+    "sKeyName_A1",
+    "sKeyName_A2",
+    "sKeyName_A3",
+    "sKeyName_A4",
+    "sKeyName_A5",
+    "sKeyName_A6",
+    "sKeyName_A7",
+    "sKeyName_A8",
+    "sKeyName_A9",
+    "sKeyName_AA",
+    "sKeyName_AB",
+    "sKeyName_AC",
+    "sKeyName_AD",
+    "sKeyName_AE",
+    "sKeyName_AF",
+    "sKeyName_B0",
+    "sKeyName_B1",
+    "sKeyName_B2",
+    "sKeyName_B3",
+    "sKeyName_B4",
+    "sKeyName_B5",
+    "sKeyName_B6",
+    "sKeyName_B7",
+    "sKeyName_B8",
+    "sKeyName_B9",
+    "sKeyName_BA",
+    "sKeyName_BB",
+    "sKeyName_BC",
+    "sKeyName_BD",
+    "sKeyName_BE",
+    "sKeyName_BF",
+    "sKeyName_C0",
+    "sKeyName_C1",
+    "sKeyName_C2",
+    "sKeyName_C3",
+    "sKeyName_C4",
+    "sKeyName_C5",
+    "sKeyName_C6",
+    "sKeyName_C7",
+    "sKeyName_C8",
+    "sKeyName_C9",
+    "sKeyName_CA",
+    "sKeyName_CB",
+    "sKeyName_CC",
+    "sKeyName_CD",
+    "sKeyName_CE",
+    "sKeyName_CF",
+    "sKeyName_D0",
+    "sKeyName_D1",
+    "sKeyName_D2",
+    "sKeyName_D3",
+    "sKeyName_D4",
+    "sKeyName_D5",
+    "sKeyName_D6",
+    "sKeyName_D7",
+    "sKeyName_D8",
+    "sKeyName_D9",
+    "sKeyName_DA",
+    "sKeyName_DB",
+    "sKeyName_DC",
+    "sKeyName_DD",
+    "sKeyName_DE",
+    "sKeyName_DF",
+    "sKeyName_E0",
+    "sKeyName_E1",
+    "sKeyName_E2",
+    "sKeyName_E3",
+    "sKeyName_E4",
+    "sKeyName_E5",
+    "sKeyName_E6",
+    "sKeyName_E7",
+    "sKeyName_E8",
+    "sKeyName_E9",
+    "sKeyName_EA",
+    "sKeyName_EB",
+    "sKeyName_EC",
+    "sKeyName_ED",
+    "sKeyName_EE",
+    "sKeyName_EF",
+    "sKeyName_F0",
+    "sKeyName_F1",
+    "sKeyName_F2",
+    "sKeyName_F3",
+    "sKeyName_F4",
+    "sKeyName_F5",
+    "sKeyName_F6",
+    "sKeyName_F7",
+    "sKeyName_F8",
+    "sKeyName_F9",
+    "sKeyName_FA",
+    "sKeyName_FB",
+    "sKeyName_FC",
+    "sKeyName_FD",
+    "sKeyName_FE",
+    "sKeyName_FF",
+    "sKeyUsed",
+    "sKilledEssential",
+    "sKnight",
+    "sLeft",
+    "sLess",
+    "sLevel",
+    "sLevelProgress",
+    "sLevels",
+    "sLevelUp",
+    "sLevelUpMenu1",
+    "sLevelUpMenu2",
+    "sLevelUpMenu3",
+    "sLevelUpMenu4",
+    "sLevelUpMsg",
+    "sLevitateDisabled",
+    "sLight",
+    "sLight_Gamma",
+    "sLoadFailedMessage",
+    "sLoadGame",
+    "sLoadingErrorsMsg",
+    "sLoadingMessage1",
+    "sLoadingMessage14",
+    "sLoadingMessage15",
+    "sLoadingMessage2",
+    "sLoadingMessage3",
+    "sLoadingMessage4",
+    "sLoadingMessage5",
+    "sLoadingMessage9",
+    "sLoadLastSaveMsg",
+    "sLocal",
+    "sLockFail",
+    "sLockImpossible",
+    "sLockLevel",
+    "sLockSuccess",
+    "sLookDownXbox",
+    "sLookUpXbox",
+    "sLow",
+    "sLucDesc",
+    "sMagDesc",
+    "sMage",
+    "sMagic",
+    "sMagicAncestralGhostID",
+    "sMagicBonelordID",
+    "sMagicBoundBattleAxeID",
+    "sMagicBoundBootsID",
+    "sMagicBoundCuirassID",
+    "sMagicBoundDaggerID",
+    "sMagicBoundHelmID",
+    "sMagicBoundLeftGauntletID",
+    "sMagicBoundLongbowID",
+    "sMagicBoundLongswordID",
+    "sMagicBoundMaceID",
+    "sMagicBoundRightGauntletID",
+    "sMagicBoundShieldID",
+    "sMagicBoundSpearID",
+    "sMagicCannotRecast",
+    "sMagicCenturionSphereID",
+    "sMagicClannfearID",
+    "sMagicContractDisease",
+    "sMagicCorprusWorsens",
+    "sMagicCreature01ID",
+    "sMagicCreature02ID",
+    "sMagicCreature03ID",
+    "sMagicCreature04ID",
+    "sMagicCreature05ID",
+    "sMagicDaedrothID",
+    "sMagicDremoraID",
+    "sMagicEffects",
+    "sMagicFabricantID",
+    "sMagicFlameAtronachID",
+    "sMagicFrostAtronachID",
+    "sMagicGoldenSaintID",
+    "sMagicGreaterBonewalkerID",
+    "sMagicHungerID",
+    "sMagicInsufficientCharge",
+    "sMagicInsufficientSP",
+    "sMagicInvalidEffect",
+    "sMagicInvalidTarget",
+    "sMagicItem",
+    "sMagicLeastBonewalkerID",
+    "sMagicLockSuccess",
+    "sMagicMenu",
+    "sMagicOpenSuccess",
+    "sMagicPCResisted",
+    "sMagicScampID",
+    "sMagicSelectTitle",
+    "sMagicSkeletalMinionID",
+    "sMagicSkillFail",
+    "sMagicStormAtronachID",
+    "sMagicTab",
+    "sMagicTargetResisted",
+    "sMagicTargetResistsWeapons",
+    "sMagicWingedTwilightID",
+    "sMagnitude",
+    "sMagnitudeDes",
+    "sMake Enchantment",
+    "sMap",
+    "sMaster",
+    "sMastPlugMismatchMsg",
+    "sMaximumSaveGameMessage",
+    "sMaxSale",
+    "sMedium",
+    "sMenu_Help_Delay",
+    "sMenu_Mode",
+    "sMenuModeXbox",
+    "sMenuNextXbox",
+    "sMenuPrevXbox",
+    "sMenus",
+    "sMessage1",
+    "sMessage2",
+    "sMessage3",
+    "sMessage4",
+    "sMessage5",
+    "sMessageQuestionAnswer1",
+    "sMessageQuestionAnswer2",
+    "sMessageQuestionAnswer3",
+    "sMiscTab",
+    "sMissingMastersMsg",
+    "sMonk",
+    "sMonthEveningstar",
+    "sMonthFirstseed",
+    "sMonthFrostfall",
+    "sMonthHeartfire",
+    "sMonthLastseed",
+    "sMonthMidyear",
+    "sMonthMorningstar",
+    "sMonthRainshand",
+    "sMonthSecondseed",
+    "sMonthSunsdawn",
+    "sMonthSunsdusk",
+    "sMonthSunsheight",
+    "sMore",
+    "sMortar",
+    "sMouse",
+    "sMouseFlip",
+    "sMouseWheelDownShort",
+    "sMouseWheelUpShort",
+    "sMove",
+    "sMoveDownXbox",
+    "sMoveUpXbox",
+    "sMusic",
+    "sName",
+    "sNameTitle",
+    "sNear",
+    "sNeedOneSkill",
+    "sNeedTwoSkills",
+    "sNewGame",
+    "sNext",
+    "sNextRank",
+    "sNextSpell",
+    "sNextSpellXbox",
+    "sNextWeapon",
+    "sNextWeaponXbox",
+    "sNightblade",
+    "sNo",
+    "sNoName",
+    "sNone",
+    "sNotifyMessage1",
+    "sNotifyMessage10",
+    "sNotifyMessage11",
+    "sNotifyMessage12",
+    "sNotifyMessage13",
+    "sNotifyMessage14",
+    "sNotifyMessage15",
+    "sNotifyMessage16",
+    "sNotifyMessage16_a",
+    "sNotifyMessage17",
+    "sNotifyMessage18",
+    "sNotifyMessage19",
+    "sNotifyMessage2",
+    "sNotifyMessage20",
+    "sNotifyMessage21",
+    "sNotifyMessage22",
+    "sNotifyMessage23",
+    "sNotifyMessage24",
+    "sNotifyMessage25",
+    "sNotifyMessage26",
+    "sNotifyMessage27",
+    "sNotifyMessage28",
+    "sNotifyMessage29",
+    "sNotifyMessage3",
+    "sNotifyMessage30",
+    "sNotifyMessage31",
+    "sNotifyMessage32",
+    "sNotifyMessage33",
+    "sNotifyMessage34",
+    "sNotifyMessage35",
+    "sNotifyMessage36",
+    "sNotifyMessage37",
+    "sNotifyMessage38",
+    "sNotifyMessage39",
+    "sNotifyMessage4",
+    "sNotifyMessage40",
+    "sNotifyMessage41",
+    "sNotifyMessage42",
+    "sNotifyMessage43",
+    "sNotifyMessage44",
+    "sNotifyMessage45",
+    "sNotifyMessage46",
+    "sNotifyMessage47",
+    "sNotifyMessage48",
+    "sNotifyMessage49",
+    "sNotifyMessage4XBOX",
+    "sNotifyMessage5",
+    "sNotifyMessage50",
+    "sNotifyMessage51",
+    "sNotifyMessage52",
+    "sNotifyMessage53",
+    "sNotifyMessage54",
+    "sNotifyMessage55",
+    "sNotifyMessage56",
+    "sNotifyMessage57",
+    "sNotifyMessage58",
+    "sNotifyMessage59",
+    "sNotifyMessage6",
+    "sNotifyMessage60",
+    "sNotifyMessage61",
+    "sNotifyMessage62",
+    "sNotifyMessage63",
+    "sNotifyMessage64",
+    "sNotifyMessage65",
+    "sNotifyMessage66",
+    "sNotifyMessage67",
+    "sNotifyMessage6a",
+    "sNotifyMessage7",
+    "sNotifyMessage8",
+    "sNotifyMessage9",
+    "sOff",
+    "sOffer",
+    "sOfferMenuTitle",
+    "sOK",
+    "sOn",
+    "sOnce",
+    "sOneHanded",
+    "sOnetypeEffectMessage",
+    "sonword",
+    "sOptions",
+    "sOptionsMenuXbox",
+    "spercent",
+    "sPerDesc",
+    "sPersuasion",
+    "sPersuasionMenuTitle",
+    "sPickUp",
+    "sPilgrim",
+    "spoint",
+    "spoints",
+    "sPotionSuccess",
+    "sPowerAlreadyUsed",
+    "sPowers",
+    "sPreferences",
+    "sPrefs",
+    "sPrev",
+    "sPrevSpell",
+    "sPrevSpellXbox",
+    "sPrevWeapon",
+    "sPrevWeaponXbox",
+    "sProfitValue",
+    "sQuality",
+    "sQuanityMenuMessage01",
+    "sQuanityMenuMessage02",
+    "sQuestionDeleteSpell",
+    "sQuestionMark",
+    "sQuick0Xbox",
+    "sQuick10Cmd",
+    "sQuick1Cmd",
+    "sQuick2Cmd",
+    "sQuick3Cmd",
+    "sQuick4Cmd",
+    "sQuick4Xbox",
+    "sQuick5Cmd",
+    "sQuick5Xbox",
+    "sQuick6Cmd",
+    "sQuick6Xbox",
+    "sQuick7Cmd",
+    "sQuick7Xbox",
+    "sQuick8Cmd",
+    "sQuick8Xbox",
+    "sQuick9Cmd",
+    "sQuick9Xbox",
+    "sQuick_Save",
+    "sQuickLoadCmd",
+    "sQuickLoadXbox",
+    "sQuickMenu",
+    "sQuickMenu1",
+    "sQuickMenu2",
+    "sQuickMenu3",
+    "sQuickMenu4",
+    "sQuickMenu5",
+    "sQuickMenu6",
+    "sQuickMenuInstruc",
+    "sQuickMenuTitle",
+    "sQuickSaveCmd",
+    "sQuickSaveXbox",
+    "sRace",
+    "sRaceMenu1",
+    "sRaceMenu2",
+    "sRaceMenu3",
+    "sRaceMenu4",
+    "sRaceMenu5",
+    "sRaceMenu6",
+    "sRaceMenu7",
+    "sRacialTraits",
+    "sRange",
+    "sRangeDes",
+    "sRangeSelf",
+    "sRangeTarget",
+    "sRangeTouch",
+    "sReady_Magic",
+    "sReady_Weapon",
+    "sReadyItemXbox",
+    "sReadyMagicXbox",
+    "sRechargeEnchantment",
+    "sRender_Distance",
+    "sRepair",
+    "sRepairFailed",
+    "sRepairServiceTitle",
+    "sRepairSuccess",
+    "sReputation",
+    "sResChangeWarning",
+    "sRest",
+    "sRestIllegal",
+    "sRestKey",
+    "sRestMenu1",
+    "sRestMenu2",
+    "sRestMenu3",
+    "sRestMenu4",
+    "sRestMenuXbox",
+    "sRestore",
+    "sRetort",
+    "sReturnToGame",
+    "sRight",
+    "sRogue",
+    "sRun",
+    "sRunXbox",
+    "sSave",
+    "sSaveGame",
+    "sSaveGameDenied",
+    "sSaveGameFailed",
+    "sSaveGameNoMemory",
+    "sSaveGameTooBig",
+    "sSaveMenu1",
+    "sSaveMenuHelp01",
+    "sSaveMenuHelp02",
+    "sSaveMenuHelp03",
+    "sSaveMenuHelp04",
+    "sSaveMenuHelp05",
+    "sSaveMenuHelp06",
+    "sSchool",
+    "sSchoolAlteration",
+    "sSchoolConjuration",
+    "sSchoolDestruction",
+    "sSchoolIllusion",
+    "sSchoolMysticism",
+    "sSchoolRestoration",
+    "sScout",
+    "sScrolldown",
+    "sScrollup",
+    "ssecond",
+    "sseconds",
+    "sSeldom",
+    "sSelect",
+    "sSell",
+    "sSellerGold",
+    "sService",
+    "sServiceRefusal",
+    "sServiceRepairTitle",
+    "sServiceSpellsTitle",
+    "sServiceTrainingTitle",
+    "sServiceTrainingWords",
+    "sServiceTravelTitle",
+    "sSetValueMessage01",
+    "sSex",
+    "sShadows",
+    "sShadowText",
+    "sShift",
+    "sSkill",
+    "sSkillAcrobatics",
+    "sSkillAlchemy",
+    "sSkillAlteration",
+    "sSkillArmorer",
+    "sSkillAthletics",
+    "sSkillAxe",
+    "sSkillBlock",
+    "sSkillBluntweapon",
+    "sSkillClassMajor",
+    "sSkillClassMinor",
+    "sSkillClassMisc",
+    "sSkillConjuration",
+    "sSkillDestruction",
+    "sSkillEnchant",
+    "sSkillHandtohand",
+    "sSkillHeavyarmor",
+    "sSkillIllusion",
+    "sSkillLightarmor",
+    "sSkillLongblade",
+    "sSkillMarksman",
+    "sSkillMaxReached",
+    "sSkillMediumarmor",
+    "sSkillMercantile",
+    "sSkillMysticism",
+    "sSkillProgress",
+    "sSkillRestoration",
+    "sSkillSecurity",
+    "sSkillShortblade",
+    "sSkillsMenu1",
+    "sSkillsMenuReputationHelp",
+    "sSkillSneak",
+    "sSkillSpear",
+    "sSkillSpeechcraft",
+    "sSkillUnarmored",
+    "sSlash",
+    "sSleepInterrupt",
+    "sSlideLeftXbox",
+    "sSlideRightXbox",
+    "sSlow",
+    "sSorceror",
+    "sSoulGem",
+    "sSoulGemsWithSouls",
+    "sSoultrapSuccess",
+    "sSpace",
+    "sSpdDesc",
+    "sSpecialization",
+    "sSpecializationCombat",
+    "sSpecializationMagic",
+    "sSpecializationMenu1",
+    "sSpecializationStealth",
+    "sSpellmaking",
+    "sSpellmakingHelp1",
+    "sSpellmakingHelp2",
+    "sSpellmakingHelp3",
+    "sSpellmakingHelp4",
+    "sSpellmakingHelp5",
+    "sSpellmakingHelp6",
+    "sSpellmakingMenu1",
+    "sSpellmakingMenuTitle",
+    "sSpells",
+    "sSpellServiceTitle",
+    "sSpellsword",
+    "sStartCell",
+    "sStartCellError",
+    "sStartError",
+    "sStats",
+    "sStrafe",
+    "sStrDesc",
+    "sStrip",
+    "sSubtitles",
+    "sSystemMenuXbox",
+    "sTake",
+    "sTakeAll",
+    "sTargetCriticalStrike",
+    "sTaunt",
+    "sTauntFail",
+    "sTauntSuccess",
+    "sTeleportDisabled",
+    "sThief",
+    "sThrust",
+    "sTo",
+    "sTogglePOVCmd",
+    "sTogglePOVXbox",
+    "sToggleRunXbox",
+    "sTopics",
+    "sTotalCost",
+    "sTotalSold",
+    "sTraining",
+    "sTrainingServiceTitle",
+    "sTraits",
+    "sTransparency_Menu",
+    "sTrapFail",
+    "sTrapImpossible",
+    "sTrapped",
+    "sTrapSuccess",
+    "sTravel",
+    "sTravelServiceTitle",
+    "sTurn",
+    "sTurnLeftXbox",
+    "sTurnRightXbox",
+    "sTwoHanded",
+    "sType",
+    "sTypeAbility",
+    "sTypeBlightDisease",
+    "sTypeCurse",
+    "sTypeDisease",
+    "sTypePower",
+    "sTypeSpell",
+    "sUnequip",
+    "sUnlocked",
+    "sUntilHealed",
+    "sUse",
+    "sUserDefinedClass",
+    "sUses",
+    "sUseXbox",
+    "sValue",
+    "sVideo",
+    "sVideoWarning",
+    "sVoice",
+    "sWait",
+    "sWarrior",
+    "sWaterReflectUpdate",
+    "sWaterTerrainReflect",
+    "sWeaponTab",
+    "sWeight",
+    "sWerewolfAlarmMessage",
+    "sWerewolfPopup",
+    "sWerewolfRefusal",
+    "sWerewolfRestMessage",
+    "sWilDesc",
+    "sWitchhunter",
+    "sWorld",
+    "sWornTab",
+    "sXStrafe",
+    "sXTimes",
+    "sXTimesINT",
+    "sYes",
+    "sYourGold"
+};
+
+const char * CSMWorld::DefaultGMSTs::OptionalFloats[CSMWorld::DefaultGMSTs::OptionalFloatCount] =
+{
+    "fCombatDistanceWerewolfMod",
+    "fFleeDistance",
+    "fWereWolfAcrobatics",
+    "fWereWolfAgility",
+    "fWereWolfAlchemy",
+    "fWereWolfAlteration",
+    "fWereWolfArmorer",
+    "fWereWolfAthletics",
+    "fWereWolfAxe",
+    "fWereWolfBlock",
+    "fWereWolfBluntWeapon",
+    "fWereWolfConjuration",
+    "fWereWolfDestruction",
+    "fWereWolfEnchant",
+    "fWereWolfEndurance",
+    "fWereWolfFatigue",
+    "fWereWolfHandtoHand",
+    "fWereWolfHealth",
+    "fWereWolfHeavyArmor",
+    "fWereWolfIllusion",
+    "fWereWolfIntellegence",
+    "fWereWolfLightArmor",
+    "fWereWolfLongBlade",
+    "fWereWolfLuck",
+    "fWereWolfMagicka",
+    "fWereWolfMarksman",
+    "fWereWolfMediumArmor",
+    "fWereWolfMerchantile",
+    "fWereWolfMysticism",
+    "fWereWolfPersonality",
+    "fWereWolfRestoration",
+    "fWereWolfRunMult",
+    "fWereWolfSecurity",
+    "fWereWolfShortBlade",
+    "fWereWolfSilverWeaponDamageMult",
+    "fWereWolfSneak",
+    "fWereWolfSpear",
+    "fWereWolfSpeechcraft",
+    "fWereWolfSpeed",
+    "fWereWolfStrength",
+    "fWereWolfUnarmored",
+    "fWereWolfWillPower"
+};
+
+const char * CSMWorld::DefaultGMSTs::OptionalInts[CSMWorld::DefaultGMSTs::OptionalIntCount] =
+{
+    "iWereWolfBounty",
+    "iWereWolfFightMod",
+    "iWereWolfFleeMod",
+    "iWereWolfLevelToAttack"
+};
+
+const char * CSMWorld::DefaultGMSTs::OptionalStrings[CSMWorld::DefaultGMSTs::OptionalStringCount] =
+{
+    "sCompanionShare",
+    "sCompanionWarningButtonOne",
+    "sCompanionWarningButtonTwo",
+    "sCompanionWarningMessage",
+    "sDeleteNote",
+    "sEditNote",
+    "sEffectSummonCreature01",
+    "sEffectSummonCreature02",
+    "sEffectSummonCreature03",
+    "sEffectSummonCreature04",
+    "sEffectSummonCreature05",
+    "sEffectSummonFabricant",
+    "sLevitateDisabled",
+    "sMagicCreature01ID",
+    "sMagicCreature02ID",
+    "sMagicCreature03ID",
+    "sMagicCreature04ID",
+    "sMagicCreature05ID",
+    "sMagicFabricantID",
+    "sMaxSale",
+    "sProfitValue",
+    "sTeleportDisabled",
+    "sWerewolfAlarmMessage",
+    "sWerewolfPopup",
+    "sWerewolfRefusal",
+    "sWerewolfRestMessage"
+};
+
+const float CSMWorld::DefaultGMSTs::FloatsDefaultValues[CSMWorld::DefaultGMSTs::FloatCount] =
+{
+    0.3,    // fAIFleeFleeMult
+    7.0,    // fAIFleeHealthMult
+    3.0,    // fAIMagicSpellMult
+    1.0,    // fAIMeleeArmorMult
+    1.0,    // fAIMeleeSummWeaponMult
+    2.0,    // fAIMeleeWeaponMult
+    5.0,    // fAIRangeMagicSpellMult
+    5.0,    // fAIRangeMeleeWeaponMult
+    2000.0, // fAlarmRadius
+    1.0,    // fAthleticsRunBonus
+    40.0,   // fAudioDefaultMaxDistance
+    5.0,    // fAudioDefaultMinDistance
+    50.0,   // fAudioMaxDistanceMult
+    20.0,   // fAudioMinDistanceMult
+    60.0,   // fAudioVoiceDefaultMaxDistance
+    10.0,   // fAudioVoiceDefaultMinDistance
+    50.0,   // fAutoPCSpellChance
+    80.0,   // fAutoSpellChance
+    50.0,   // fBargainOfferBase
+    -4.0,   // fBargainOfferMulti
+    24.0,   // fBarterGoldResetDelay
+    1.75,   // fBaseRunMultiplier
+    1.25,   // fBlockStillBonus
+    150.0,  // fBribe1000Mod
+    75.0,   // fBribe100Mod
+    35.0,   // fBribe10Mod
+    60.0,   // fCombatAngleXY
+    60.0,   // fCombatAngleZ
+    0.25,   // fCombatArmorMinMult
+    -90.0,  // fCombatBlockLeftAngle
+    30.0,   // fCombatBlockRightAngle
+    4.0,    // fCombatCriticalStrikeMult
+    0.1,    // fCombatDelayCreature
+    0.1,    // fCombatDelayNPC
+    128.0,  // fCombatDistance
+    0.3,    // fCombatDistanceWerewolfMod
+    30.0,   // fCombatForceSideAngle
+    0.2,    // fCombatInvisoMult
+    1.5,    // fCombatKODamageMult
+    45.0,   // fCombatTorsoSideAngle
+    0.3,    // fCombatTorsoStartPercent
+    0.8,    // fCombatTorsoStopPercent
+    15.0,   // fConstantEffectMult
+    72.0,   // fCorpseClearDelay
+    72.0,   // fCorpseRespawnDelay
+    0.5,    // fCrimeGoldDiscountMult
+    0.9,    // fCrimeGoldTurnInMult
+    1.0,    // fCrimeStealing
+    0.5,    // fDamageStrengthBase
+    0.1,    // fDamageStrengthMult
+    5.0,    // fDifficultyMult
+    2.5,    // fDiseaseXferChance
+    -10.0,  // fDispAttacking
+    -1.0,   // fDispBargainFailMod
+    1.0,    // fDispBargainSuccessMod
+    0.0,    // fDispCrimeMod
+    -10.0,  // fDispDiseaseMod
+    3.0,    // fDispFactionMod
+    1.0,    // fDispFactionRankBase
+    0.5,    // fDispFactionRankMult
+    1.0,    // fDispositionMod
+    50.0,   // fDispPersonalityBase
+    0.5,    // fDispPersonalityMult
+    -25.0,  // fDispPickPocketMod
+    5.0,    // fDispRaceMod
+    -0.5,   // fDispStealing
+    -5.0,   // fDispWeaponDrawn
+    0.5,    // fEffectCostMult
+    0.1,    // fElementalShieldMult
+    3.0,    // fEnchantmentChanceMult
+    0.5,    // fEnchantmentConstantChanceMult
+    100.0,  // fEnchantmentConstantDurationMult
+    0.1,    // fEnchantmentMult
+    1000.0, // fEnchantmentValueMult
+    0.3,    // fEncumberedMoveEffect
+    5.0,    // fEncumbranceStrMult
+    0.04,   // fEndFatigueMult
+    0.25,   // fFallAcroBase
+    0.01,   // fFallAcroMult
+    400.0,  // fFallDamageDistanceMin
+    0.0,    // fFallDistanceBase
+    0.07,   // fFallDistanceMult
+    2.0,    // fFatigueAttackBase
+    0.0,    // fFatigueAttackMult
+    1.25,   // fFatigueBase
+    4.0,    // fFatigueBlockBase
+    0.0,    // fFatigueBlockMult
+    5.0,    // fFatigueJumpBase
+    0.0,    // fFatigueJumpMult
+    0.5,    // fFatigueMult
+    2.5,    // fFatigueReturnBase
+    0.02,   // fFatigueReturnMult
+    5.0,    // fFatigueRunBase
+    2.0,    // fFatigueRunMult
+    1.5,    // fFatigueSneakBase
+    1.5,    // fFatigueSneakMult
+    0.0,    // fFatigueSpellBase
+    0.0,    // fFatigueSpellCostMult
+    0.0,    // fFatigueSpellMult
+    7.0,    // fFatigueSwimRunBase
+    0.0,    // fFatigueSwimRunMult
+    2.5,    // fFatigueSwimWalkBase
+    0.0,    // fFatigueSwimWalkMult
+    0.2,    // fFightDispMult
+    0.005,  // fFightDistanceMultiplier
+    50.0,   // fFightStealing
+    3000.0, // fFleeDistance
+    512.0,  // fGreetDistanceReset
+    0.1,    // fHandtoHandHealthPer
+    1.0,    // fHandToHandReach
+    0.5,    // fHoldBreathEndMult
+    20.0,   // fHoldBreathTime
+    0.75,   // fIdleChanceMultiplier
+    1.0,    // fIngredientMult
+    0.5,    // fInteriorHeadTrackMult
+    128.0,  // fJumpAcrobaticsBase
+    4.0,    // fJumpAcroMultiplier
+    0.5,    // fJumpEncumbranceBase
+    1.0,    // fJumpEncumbranceMultiplier
+    0.5,    // fJumpMoveBase
+    0.5,    // fJumpMoveMult
+    1.0,    // fJumpRunMultiplier
+    0.5,    // fKnockDownMult
+    5.0,    // fLevelMod
+    0.1,    // fLevelUpHealthEndMult
+    0.6,    // fLightMaxMod
+    10.0,   // fLuckMod
+    10.0,   // fMagesGuildTravel
+    1.5,    // fMagicCreatureCastDelay
+    0.0167, // fMagicDetectRefreshRate
+    1.0,    // fMagicItemConstantMult
+    1.0,    // fMagicItemCostMult
+    1.0,    // fMagicItemOnceMult
+    1.0,    // fMagicItemPriceMult
+    0.05,   // fMagicItemRechargePerSecond
+    1.0,    // fMagicItemStrikeMult
+    1.0,    // fMagicItemUsedMult
+    3.0,    // fMagicStartIconBlink
+    0.5,    // fMagicSunBlockedMult
+    0.75,   // fMajorSkillBonus
+    300.0,  // fMaxFlySpeed
+    0.5,    // fMaxHandToHandMult
+    400.0,  // fMaxHeadTrackDistance
+    200.0,  // fMaxWalkSpeed
+    300.0,  // fMaxWalkSpeedCreature
+    0.9,    // fMedMaxMod
+    0.1,    // fMessageTimePerChar
+    5.0,    // fMinFlySpeed
+    0.1,    // fMinHandToHandMult
+    1.0,    // fMinorSkillBonus
+    100.0,  // fMinWalkSpeed
+    5.0,    // fMinWalkSpeedCreature
+    1.25,   // fMiscSkillBonus
+    2.0,    // fNPCbaseMagickaMult
+    0.5,    // fNPCHealthBarFade
+    3.0,    // fNPCHealthBarTime
+    1.0,    // fPCbaseMagickaMult
+    0.3,    // fPerDieRollMult
+    5.0,    // fPersonalityMod
+    1.0,    // fPerTempMult
+    -1.0,   // fPickLockMult
+    0.3,    // fPickPocketMod
+    20.0,   // fPotionMinUsefulDuration
+    0.5,    // fPotionStrengthMult
+    0.5,    // fPotionT1DurMult
+    1.5,    // fPotionT1MagMult
+    20.0,   // fPotionT4BaseStrengthMult
+    12.0,   // fPotionT4EquipStrengthMult
+    3000.0, // fProjectileMaxSpeed
+    400.0,  // fProjectileMinSpeed
+    25.0,   // fProjectileThrownStoreChance
+    3.0,    // fRepairAmountMult
+    1.0,    // fRepairMult
+    1.0,    // fReputationMod
+    0.15,   // fRestMagicMult
+    0.0,    // fSeriousWoundMult
+    0.25,   // fSleepRandMod
+    0.3,    // fSleepRestMod
+    -1.0,   // fSneakBootMult
+    0.5,    // fSneakDistanceBase
+    0.002,  // fSneakDistanceMultiplier
+    0.5,    // fSneakNoViewMult
+    1.0,    // fSneakSkillMult
+    0.75,   // fSneakSpeedMultiplier
+    1.0,    // fSneakUseDelay
+    500.0,  // fSneakUseDist
+    1.5,    // fSneakViewMult
+    3.0,    // fSoulGemMult
+    0.8,    // fSpecialSkillBonus
+    7.0,    // fSpellMakingValueMult
+    2.0,    // fSpellPriceMult
+    10.0,   // fSpellValueMult
+    0.25,   // fStromWalkMult
+    0.7,    // fStromWindSpeed
+    3.0,    // fSuffocationDamage
+    0.9,    // fSwimHeightScale
+    0.1,    // fSwimRunAthleticsMult
+    0.5,    // fSwimRunBase
+    0.02,   // fSwimWalkAthleticsMult
+    0.5,    // fSwimWalkBase
+    1.0,    // fSwingBlockBase
+    1.0,    // fSwingBlockMult
+    1000.0, // fTargetSpellMaxSpeed
+    1000.0, // fThrownWeaponMaxSpeed
+    300.0,  // fThrownWeaponMinSpeed
+    0.0,    // fTrapCostMult
+    4000.0, // fTravelMult
+    16000.0,// fTravelTimeMult
+    0.1,    // fUnarmoredBase1
+    0.065,  // fUnarmoredBase2
+    30.0,   // fVanityDelay
+    10.0,   // fVoiceIdleOdds
+    0.0,    // fWaterReflectUpdateAlways
+    10.0,   // fWaterReflectUpdateSeldom
+    0.1,    // fWeaponDamageMult
+    1.0,    // fWeaponFatigueBlockMult
+    0.25,   // fWeaponFatigueMult
+    150.0,  // fWereWolfAcrobatics
+    150.0,  // fWereWolfAgility
+    1.0,    // fWereWolfAlchemy
+    1.0,    // fWereWolfAlteration
+    1.0,    // fWereWolfArmorer
+    150.0,  // fWereWolfAthletics
+    1.0,    // fWereWolfAxe
+    1.0,    // fWereWolfBlock
+    1.0,    // fWereWolfBluntWeapon
+    1.0,    // fWereWolfConjuration
+    1.0,    // fWereWolfDestruction
+    1.0,    // fWereWolfEnchant
+    150.0,  // fWereWolfEndurance
+    400.0,  // fWereWolfFatigue
+    100.0,  // fWereWolfHandtoHand
+    2.0,    // fWereWolfHealth
+    1.0,    // fWereWolfHeavyArmor
+    1.0,    // fWereWolfIllusion
+    1.0,    // fWereWolfIntellegence
+    1.0,    // fWereWolfLightArmor
+    1.0,    // fWereWolfLongBlade
+    1.0,    // fWereWolfLuck
+    100.0,  // fWereWolfMagicka
+    1.0,    // fWereWolfMarksman
+    1.0,    // fWereWolfMediumArmor
+    1.0,    // fWereWolfMerchantile
+    1.0,    // fWereWolfMysticism
+    1.0,    // fWereWolfPersonality
+    1.0,    // fWereWolfRestoration
+    1.5,    // fWereWolfRunMult
+    1.0,    // fWereWolfSecurity
+    1.0,    // fWereWolfShortBlade
+    1.5,    // fWereWolfSilverWeaponDamageMult
+    1.0,    // fWereWolfSneak
+    1.0,    // fWereWolfSpear
+    1.0,    // fWereWolfSpeechcraft
+    150.0,  // fWereWolfSpeed
+    150.0,  // fWereWolfStrength
+    100.0,  // fWereWolfUnarmored
+    1.0,    // fWereWolfWillPower
+    15.0   // fWortChanceValue
+};
+
+const int CSMWorld::DefaultGMSTs::IntsDefaultValues[CSMWorld::DefaultGMSTs::IntCount] =
+{
+    10,     // i1stPersonSneakDelta
+    50,     // iAlarmAttack
+    90,     // iAlarmKilling
+    20,     // iAlarmPickPocket
+    1,      // iAlarmStealing
+    5,      // iAlarmTresspass
+    2,      // iAlchemyMod
+    100,    // iAutoPCSpellMax
+    2,      // iAutoRepFacMod
+    0,      // iAutoRepLevMod
+    5,      // iAutoSpellAlterationMax
+    70,     // iAutoSpellAttSkillMin
+    2,      // iAutoSpellConjurationMax
+    5,      // iAutoSpellDestructionMax
+    5,      // iAutoSpellIllusionMax
+    5,      // iAutoSpellMysticismMax
+    5,      // iAutoSpellRestorationMax
+    3,      // iAutoSpellTimesCanCast
+    -1,     // iBarterFailDisposition
+    1,      // iBarterSuccessDisposition
+    30,     // iBaseArmorSkill
+    50,     // iBlockMaxChance
+    10,     // iBlockMinChance
+    20,     // iBootsWeight
+    40,     // iCrimeAttack
+    1000,   // iCrimeKilling
+    25,     // iCrimePickPocket
+    1000,   // iCrimeThreshold
+    10,     // iCrimeThresholdMultiplier
+    5,      // iCrimeTresspass
+    30,     // iCuirassWeight
+    100,    // iDaysinPrisonMod
+    -50,    // iDispAttackMod
+    -50,    // iDispKilling
+    -20,    // iDispTresspass
+    1,      // iFightAlarmMult
+    100,    // iFightAttack
+    50,     // iFightAttacking
+    20,     // iFightDistanceBase
+    50,     // iFightKilling
+    25,     // iFightPickpocket
+    25,     // iFightTrespass
+    0,      // iFlee
+    5,      // iGauntletWeight
+    15,     // iGreavesWeight
+    6,      // iGreetDistanceMultiplier
+    4,      // iGreetDuration
+    5,      // iHelmWeight
+    50,     // iKnockDownOddsBase
+    50,     // iKnockDownOddsMult
+    2,      // iLevelUp01Mult
+    2,      // iLevelUp02Mult
+    2,      // iLevelUp03Mult
+    2,      // iLevelUp04Mult
+    3,      // iLevelUp05Mult
+    3,      // iLevelUp06Mult
+    3,      // iLevelUp07Mult
+    4,      // iLevelUp08Mult
+    4,      // iLevelUp09Mult
+    5,      // iLevelUp10Mult
+    1,      // iLevelupMajorMult
+    1,      // iLevelupMajorMultAttribute
+    1,      // iLevelupMinorMult
+    1,      // iLevelupMinorMultAttribute
+    1,      // iLevelupMiscMultAttriubte
+    1,      // iLevelupSpecialization
+    10,     // iLevelupTotal
+    10,     // iMagicItemChargeConst
+    1,      // iMagicItemChargeOnce
+    10,     // iMagicItemChargeStrike
+    5,      // iMagicItemChargeUse
+    192,    // iMaxActivateDist
+    192,    // iMaxInfoDist
+    4,      // iMonthsToRespawn
+    1,      // iNumberCreatures
+    10,     // iPauldronWeight
+    5,      // iPerMinChance
+    10,     // iPerMinChange
+    75,     // iPickMaxChance
+    5,      // iPickMinChance
+    15,     // iShieldWeight
+    400,    // iSoulAmountForConstantEffect
+    10,     // iTrainingMod
+    10,     // iVoiceAttackOdds
+    30,     // iVoiceHitOdds
+    10000,  // iWereWolfBounty
+    100,    // iWereWolfFightMod
+    100,    // iWereWolfFleeMod
+    20     // iWereWolfLevelToAttack
+};
+
+const float CSMWorld::DefaultGMSTs::FloatLimits[CSMWorld::DefaultGMSTs::FloatCount * 2] =
+{
+    -FInf,      FInf,       // fAIFleeFleeMult
+    -FInf,      FInf,       // fAIFleeHealthMult
+    -FInf,      FInf,       // fAIMagicSpellMult
+    -FInf,      FInf,       // fAIMeleeArmorMult
+    -FInf,      FInf,       // fAIMeleeSummWeaponMult
+    -FInf,      FInf,       // fAIMeleeWeaponMult
+    -FInf,      FInf,       // fAIRangeMagicSpellMult
+    -FInf,      FInf,       // fAIRangeMeleeWeaponMult
+    0,          FInf,       // fAlarmRadius
+    -FInf,      FInf,       // fAthleticsRunBonus
+    0,          FInf,       // fAudioDefaultMaxDistance
+    0,          FInf,       // fAudioDefaultMinDistance
+    0,          FInf,       // fAudioMaxDistanceMult
+    0,          FInf,       // fAudioMinDistanceMult
+    0,          FInf,       // fAudioVoiceDefaultMaxDistance
+    0,          FInf,       // fAudioVoiceDefaultMinDistance
+    0,          FInf,       // fAutoPCSpellChance
+    0,          FInf,       // fAutoSpellChance
+    -FInf,      FInf,       // fBargainOfferBase
+    -FInf,      0,          // fBargainOfferMulti
+    -FInf,      FInf,       // fBarterGoldResetDelay
+    0,          FInf,       // fBaseRunMultiplier
+    -FInf,      FInf,       // fBlockStillBonus
+    0,          FInf,       // fBribe1000Mod
+    0,          FInf,       // fBribe100Mod
+    0,          FInf,       // fBribe10Mod
+    0,          FInf,       // fCombatAngleXY
+    0,          FInf,       // fCombatAngleZ
+    0,          1,          // fCombatArmorMinMult
+    -180,       0,          // fCombatBlockLeftAngle
+    0,          180,        // fCombatBlockRightAngle
+    0,          FInf,       // fCombatCriticalStrikeMult
+    0,          FInf,       // fCombatDelayCreature
+    0,          FInf,       // fCombatDelayNPC
+    0,          FInf,       // fCombatDistance
+    -FInf,      FInf,       // fCombatDistanceWerewolfMod
+    -FInf,      FInf,       // fCombatForceSideAngle
+    0,          FInf,       // fCombatInvisoMult
+    0,          FInf,       // fCombatKODamageMult
+    -FInf,      FInf,       // fCombatTorsoSideAngle
+    -FInf,      FInf,       // fCombatTorsoStartPercent
+    -FInf,      FInf,       // fCombatTorsoStopPercent
+    -FInf,      FInf,       // fConstantEffectMult
+    -FInf,      FInf,       // fCorpseClearDelay
+    -FInf,      FInf,       // fCorpseRespawnDelay
+    0,          1,          // fCrimeGoldDiscountMult
+    0,          FInf,       // fCrimeGoldTurnInMult
+    0,          FInf,       // fCrimeStealing
+    0,          FInf,       // fDamageStrengthBase
+    0,          FInf,       // fDamageStrengthMult
+    -FInf,      FInf,       // fDifficultyMult
+    0,          FInf,       // fDiseaseXferChance
+    -FInf,      0,          // fDispAttacking
+    -FInf,      FInf,       // fDispBargainFailMod
+    -FInf,      FInf,       // fDispBargainSuccessMod
+    -FInf,      0,          // fDispCrimeMod
+    -FInf,      0,          // fDispDiseaseMod
+    0,          FInf,       // fDispFactionMod
+    0,          FInf,       // fDispFactionRankBase
+    0,          FInf,       // fDispFactionRankMult
+    0,          FInf,       // fDispositionMod
+    0,          FInf,       // fDispPersonalityBase
+    0,          FInf,       // fDispPersonalityMult
+    -FInf,      0,          // fDispPickPocketMod
+    0,          FInf,       // fDispRaceMod
+    -FInf,      0,          // fDispStealing
+    -FInf,      0,          // fDispWeaponDrawn
+    0,          FInf,       // fEffectCostMult
+    0,          FInf,       // fElementalShieldMult
+    FEps,       FInf,       // fEnchantmentChanceMult
+    0,          FInf,       // fEnchantmentConstantChanceMult
+    0,          FInf,       // fEnchantmentConstantDurationMult
+    0,          FInf,       // fEnchantmentMult
+    0,          FInf,       // fEnchantmentValueMult
+    0,          FInf,       // fEncumberedMoveEffect
+    0,          FInf,       // fEncumbranceStrMult
+    0,          FInf,       // fEndFatigueMult
+    -FInf,      FInf,       // fFallAcroBase
+    0,          FInf,       // fFallAcroMult
+    0,          FInf,       // fFallDamageDistanceMin
+    -FInf,      FInf,       // fFallDistanceBase
+    0,          FInf,       // fFallDistanceMult
+    -FInf,      FInf,       // fFatigueAttackBase
+    0,          FInf,       // fFatigueAttackMult
+    0,          FInf,       // fFatigueBase
+    0,          FInf,       // fFatigueBlockBase
+    0,          FInf,       // fFatigueBlockMult
+    0,          FInf,       // fFatigueJumpBase
+    0,          FInf,       // fFatigueJumpMult
+    0,          FInf,       // fFatigueMult
+    -FInf,      FInf,       // fFatigueReturnBase
+    0,          FInf,       // fFatigueReturnMult
+    -FInf,      FInf,       // fFatigueRunBase
+    0,          FInf,       // fFatigueRunMult
+    -FInf,      FInf,       // fFatigueSneakBase
+    0,          FInf,       // fFatigueSneakMult
+    -FInf,      FInf,       // fFatigueSpellBase
+    -FInf,      FInf,       // fFatigueSpellCostMult
+    0,          FInf,       // fFatigueSpellMult
+    -FInf,      FInf,       // fFatigueSwimRunBase
+    0,          FInf,       // fFatigueSwimRunMult
+    -FInf,      FInf,       // fFatigueSwimWalkBase
+    0,          FInf,       // fFatigueSwimWalkMult
+    -FInf,      FInf,       // fFightDispMult
+    -FInf,      FInf,       // fFightDistanceMultiplier
+    -FInf,      FInf,       // fFightStealing
+    -FInf,      FInf,       // fFleeDistance
+    -FInf,      FInf,       // fGreetDistanceReset
+    0,          FInf,       // fHandtoHandHealthPer
+    0,          FInf,       // fHandToHandReach
+    -FInf,      FInf,       // fHoldBreathEndMult
+    0,          FInf,       // fHoldBreathTime
+    0,          FInf,       // fIdleChanceMultiplier
+    -FInf,      FInf,       // fIngredientMult
+    0,          FInf,       // fInteriorHeadTrackMult
+    -FInf,      FInf,       // fJumpAcrobaticsBase
+    0,          FInf,       // fJumpAcroMultiplier
+    -FInf,      FInf,       // fJumpEncumbranceBase
+    0,          FInf,       // fJumpEncumbranceMultiplier
+    -FInf,      FInf,       // fJumpMoveBase
+    0,          FInf,       // fJumpMoveMult
+    0,          FInf,       // fJumpRunMultiplier
+    -FInf,      FInf,       // fKnockDownMult
+    0,          FInf,       // fLevelMod
+    0,          FInf,       // fLevelUpHealthEndMult
+    0,          FInf,       // fLightMaxMod
+    0,          FInf,       // fLuckMod
+    0,          FInf,       // fMagesGuildTravel
+    -FInf,      FInf,       // fMagicCreatureCastDelay
+    -FInf,      FInf,       // fMagicDetectRefreshRate
+    -FInf,      FInf,       // fMagicItemConstantMult
+    -FInf,      FInf,       // fMagicItemCostMult
+    -FInf,      FInf,       // fMagicItemOnceMult
+    -FInf,      FInf,       // fMagicItemPriceMult
+    0,          FInf,       // fMagicItemRechargePerSecond
+    -FInf,      FInf,       // fMagicItemStrikeMult
+    -FInf,      FInf,       // fMagicItemUsedMult
+    0,          FInf,       // fMagicStartIconBlink
+    0,          FInf,       // fMagicSunBlockedMult
+    FEps,       FInf,       // fMajorSkillBonus
+    0,          FInf,       // fMaxFlySpeed
+    0,          FInf,       // fMaxHandToHandMult
+    0,          FInf,       // fMaxHeadTrackDistance
+    0,          FInf,       // fMaxWalkSpeed
+    0,          FInf,       // fMaxWalkSpeedCreature
+    0,          FInf,       // fMedMaxMod
+    0,          FInf,       // fMessageTimePerChar
+    0,          FInf,       // fMinFlySpeed
+    0,          FInf,       // fMinHandToHandMult
+    FEps,       FInf,       // fMinorSkillBonus
+    0,          FInf,       // fMinWalkSpeed
+    0,          FInf,       // fMinWalkSpeedCreature
+    FEps,       FInf,       // fMiscSkillBonus
+    0,          FInf,       // fNPCbaseMagickaMult
+    0,          FInf,       // fNPCHealthBarFade
+    0,          FInf,       // fNPCHealthBarTime
+    0,          FInf,       // fPCbaseMagickaMult
+    0,          FInf,       // fPerDieRollMult
+    0,          FInf,       // fPersonalityMod
+    0,          FInf,       // fPerTempMult
+    -FInf,      0,          // fPickLockMult
+    0,          FInf,       // fPickPocketMod
+    -FInf,      FInf,       // fPotionMinUsefulDuration
+    0,          FInf,       // fPotionStrengthMult
+    FEps,       FInf,       // fPotionT1DurMult
+    FEps,       FInf,       // fPotionT1MagMult
+    -FInf,      FInf,       // fPotionT4BaseStrengthMult
+    -FInf,      FInf,       // fPotionT4EquipStrengthMult
+    0,          FInf,       // fProjectileMaxSpeed
+    0,          FInf,       // fProjectileMinSpeed
+    0,          FInf,       // fProjectileThrownStoreChance
+    0,          FInf,       // fRepairAmountMult
+    0,          FInf,       // fRepairMult
+    0,          FInf,       // fReputationMod
+    0,          FInf,       // fRestMagicMult
+    -FInf,      FInf,       // fSeriousWoundMult
+    0,          FInf,       // fSleepRandMod
+    0,          FInf,       // fSleepRestMod
+    -FInf,      0,          // fSneakBootMult
+    -FInf,      FInf,       // fSneakDistanceBase
+    0,          FInf,       // fSneakDistanceMultiplier
+    0,          FInf,       // fSneakNoViewMult
+    0,          FInf,       // fSneakSkillMult
+    0,          FInf,       // fSneakSpeedMultiplier
+    0,          FInf,       // fSneakUseDelay
+    0,          FInf,       // fSneakUseDist
+    0,          FInf,       // fSneakViewMult
+    0,          FInf,       // fSoulGemMult
+    0,          FInf,       // fSpecialSkillBonus
+    0,          FInf,       // fSpellMakingValueMult
+    -FInf,      FInf,       // fSpellPriceMult
+    0,          FInf,       // fSpellValueMult
+    0,          FInf,       // fStromWalkMult
+    0,          FInf,       // fStromWindSpeed
+    0,          FInf,       // fSuffocationDamage
+    0,          FInf,       // fSwimHeightScale
+    0,          FInf,       // fSwimRunAthleticsMult
+    0,          FInf,       // fSwimRunBase
+    -FInf,      FInf,       // fSwimWalkAthleticsMult
+    -FInf,      FInf,       // fSwimWalkBase
+    0,          FInf,       // fSwingBlockBase
+    0,          FInf,       // fSwingBlockMult
+    0,          FInf,       // fTargetSpellMaxSpeed
+    0,          FInf,       // fThrownWeaponMaxSpeed
+    0,          FInf,       // fThrownWeaponMinSpeed
+    0,          FInf,       // fTrapCostMult
+    0,          FInf,       // fTravelMult
+    0,          FInf,       // fTravelTimeMult
+    0,          FInf,       // fUnarmoredBase1
+    0,          FInf,       // fUnarmoredBase2
+    0,          FInf,       // fVanityDelay
+    0,          FInf,       // fVoiceIdleOdds
+    -FInf,      FInf,       // fWaterReflectUpdateAlways
+    -FInf,      FInf,       // fWaterReflectUpdateSeldom
+    0,          FInf,       // fWeaponDamageMult
+    0,          FInf,       // fWeaponFatigueBlockMult
+    0,          FInf,       // fWeaponFatigueMult
+    0,          FInf,       // fWereWolfAcrobatics
+    -FInf,      FInf,       // fWereWolfAgility
+    -FInf,      FInf,       // fWereWolfAlchemy
+    -FInf,      FInf,       // fWereWolfAlteration
+    -FInf,      FInf,       // fWereWolfArmorer
+    -FInf,      FInf,       // fWereWolfAthletics
+    -FInf,      FInf,       // fWereWolfAxe
+    -FInf,      FInf,       // fWereWolfBlock
+    -FInf,      FInf,       // fWereWolfBluntWeapon
+    -FInf,      FInf,       // fWereWolfConjuration
+    -FInf,      FInf,       // fWereWolfDestruction
+    -FInf,      FInf,       // fWereWolfEnchant
+    -FInf,      FInf,       // fWereWolfEndurance
+    -FInf,      FInf,       // fWereWolfFatigue
+    -FInf,      FInf,       // fWereWolfHandtoHand
+    -FInf,      FInf,       // fWereWolfHealth
+    -FInf,      FInf,       // fWereWolfHeavyArmor
+    -FInf,      FInf,       // fWereWolfIllusion
+    -FInf,      FInf,       // fWereWolfIntellegence
+    -FInf,      FInf,       // fWereWolfLightArmor
+    -FInf,      FInf,       // fWereWolfLongBlade
+    -FInf,      FInf,       // fWereWolfLuck
+    -FInf,      FInf,       // fWereWolfMagicka
+    -FInf,      FInf,       // fWereWolfMarksman
+    -FInf,      FInf,       // fWereWolfMediumArmor
+    -FInf,      FInf,       // fWereWolfMerchantile
+    -FInf,      FInf,       // fWereWolfMysticism
+    -FInf,      FInf,       // fWereWolfPersonality
+    -FInf,      FInf,       // fWereWolfRestoration
+    0,          FInf,       // fWereWolfRunMult
+    -FInf,      FInf,       // fWereWolfSecurity
+    -FInf,      FInf,       // fWereWolfShortBlade
+    -FInf,      FInf,       // fWereWolfSilverWeaponDamageMult
+    -FInf,      FInf,       // fWereWolfSneak
+    -FInf,      FInf,       // fWereWolfSpear
+    -FInf,      FInf,       // fWereWolfSpeechcraft
+    -FInf,      FInf,       // fWereWolfSpeed
+    -FInf,      FInf,       // fWereWolfStrength
+    -FInf,      FInf,       // fWereWolfUnarmored
+    -FInf,      FInf,       // fWereWolfWillPower
+    0,          FInf        // fWortChanceValue
+};
+
+const int CSMWorld::DefaultGMSTs::IntLimits[CSMWorld::DefaultGMSTs::IntCount * 2] =
+{
+    IMin,    IMax,  // i1stPersonSneakDelta
+    IMin,    IMax,  // iAlarmAttack
+    IMin,    IMax,  // iAlarmKilling
+    IMin,    IMax,  // iAlarmPickPocket
+    IMin,    IMax,  // iAlarmStealing
+    IMin,    IMax,  // iAlarmTresspass
+    IMin,    IMax,  // iAlchemyMod
+    0,       IMax,  // iAutoPCSpellMax
+    IMin,    IMax,  // iAutoRepFacMod
+    IMin,    IMax,  // iAutoRepLevMod
+    IMin,    IMax,  // iAutoSpellAlterationMax
+    0,       IMax,  // iAutoSpellAttSkillMin
+    IMin,    IMax,  // iAutoSpellConjurationMax
+    IMin,    IMax,  // iAutoSpellDestructionMax
+    IMin,    IMax,  // iAutoSpellIllusionMax
+    IMin,    IMax,  // iAutoSpellMysticismMax
+    IMin,    IMax,  // iAutoSpellRestorationMax
+    0,       IMax,  // iAutoSpellTimesCanCast
+    IMin,    0,     // iBarterFailDisposition
+    0,       IMax,  // iBarterSuccessDisposition
+    1,       IMax,  // iBaseArmorSkill
+    0,       IMax,  // iBlockMaxChance
+    0,       IMax,  // iBlockMinChance
+    0,       IMax,  // iBootsWeight
+    IMin,    IMax,  // iCrimeAttack
+    IMin,    IMax,  // iCrimeKilling
+    IMin,    IMax,  // iCrimePickPocket
+    0,       IMax,  // iCrimeThreshold
+    0,       IMax,  // iCrimeThresholdMultiplier
+    IMin,    IMax,  // iCrimeTresspass
+    0,       IMax,  // iCuirassWeight
+    1,       IMax,  // iDaysinPrisonMod
+    IMin,    0,     // iDispAttackMod
+    IMin,    0,     // iDispKilling
+    IMin,    0,     // iDispTresspass
+    IMin,    IMax,  // iFightAlarmMult
+    IMin,    IMax,  // iFightAttack
+    IMin,    IMax,  // iFightAttacking
+    0,       IMax,  // iFightDistanceBase
+    IMin,    IMax,  // iFightKilling
+    IMin,    IMax,  // iFightPickpocket
+    IMin,    IMax,  // iFightTrespass
+    IMin,    IMax,  // iFlee
+    0,       IMax,  // iGauntletWeight
+    0,       IMax,  // iGreavesWeight
+    0,       IMax,  // iGreetDistanceMultiplier
+    0,       IMax,  // iGreetDuration
+    0,       IMax,  // iHelmWeight
+    IMin,    IMax,  // iKnockDownOddsBase
+    IMin,    IMax,  // iKnockDownOddsMult
+    IMin,    IMax,  // iLevelUp01Mult
+    IMin,    IMax,  // iLevelUp02Mult
+    IMin,    IMax,  // iLevelUp03Mult
+    IMin,    IMax,  // iLevelUp04Mult
+    IMin,    IMax,  // iLevelUp05Mult
+    IMin,    IMax,  // iLevelUp06Mult
+    IMin,    IMax,  // iLevelUp07Mult
+    IMin,    IMax,  // iLevelUp08Mult
+    IMin,    IMax,  // iLevelUp09Mult
+    IMin,    IMax,  // iLevelUp10Mult
+    IMin,    IMax,  // iLevelupMajorMult
+    IMin,    IMax,  // iLevelupMajorMultAttribute
+    IMin,    IMax,  // iLevelupMinorMult
+    IMin,    IMax,  // iLevelupMinorMultAttribute
+    IMin,    IMax,  // iLevelupMiscMultAttriubte
+    IMin,    IMax,  // iLevelupSpecialization
+    IMin,    IMax,  // iLevelupTotal
+    IMin,    IMax,  // iMagicItemChargeConst
+    IMin,    IMax,  // iMagicItemChargeOnce
+    IMin,    IMax,  // iMagicItemChargeStrike
+    IMin,    IMax,  // iMagicItemChargeUse
+    IMin,    IMax,  // iMaxActivateDist
+    IMin,    IMax,  // iMaxInfoDist
+    0,       IMax,  // iMonthsToRespawn
+    0,       IMax,  // iNumberCreatures
+    0,       IMax,  // iPauldronWeight
+    0,       IMax,  // iPerMinChance
+    0,       IMax,  // iPerMinChange
+    0,       IMax,  // iPickMaxChance
+    0,       IMax,  // iPickMinChance
+    0,       IMax,  // iShieldWeight
+    0,       IMax,  // iSoulAmountForConstantEffect
+    0,       IMax,  // iTrainingMod
+    0,       IMax,  // iVoiceAttackOdds
+    0,       IMax,  // iVoiceHitOdds
+    IMin,    IMax,  // iWereWolfBounty
+    IMin,    IMax,  // iWereWolfFightMod
+    IMin,    IMax,  // iWereWolfFleeMod
+    IMin,    IMax   // iWereWolfLevelToAttack
+};
diff --git a/apps/opencs/model/world/defaultgmsts.hpp b/apps/opencs/model/world/defaultgmsts.hpp
new file mode 100644
index 0000000000..ba65be805a
--- /dev/null
+++ b/apps/opencs/model/world/defaultgmsts.hpp
@@ -0,0 +1,34 @@
+#ifndef CSM_WORLD_DEFAULTGMSTS_H
+#define CSM_WORLD_DEFAULTGMSTS_H
+
+#include <cstddef>
+
+namespace CSMWorld {
+    namespace DefaultGMSTs {
+        
+        const size_t FloatCount = 258;
+        const size_t IntCount = 89;
+        const size_t StringCount = 1174;
+        
+        const size_t OptionalFloatCount = 42;
+        const size_t OptionalIntCount = 4;
+        const size_t OptionalStringCount = 26;
+        
+        extern const char* Floats[];
+        extern const char * Ints[];
+        extern const char * Strings[];
+        
+        extern const char * OptionalFloats[];
+        extern const char * OptionalInts[];
+        extern const char * OptionalStrings[];
+
+        extern const float FloatsDefaultValues[];
+        extern const int IntsDefaultValues[];
+
+        extern const float FloatLimits[];
+        extern const int IntLimits[];
+
+    }
+}
+
+#endif

From bbda5fe634aafc3104a47ee02d0f0bc236274cba Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 18 Jan 2016 12:34:33 -0500
Subject: [PATCH 110/765] Removed hints from error messages and fixed naming to
 match conventions

---
 apps/opencs/model/doc/document.cpp       | 28 ++++-----
 apps/opencs/model/tools/gmstcheck.cpp    | 78 +++++++++++++++++-------
 apps/opencs/model/tools/gmstcheck.hpp    |  6 +-
 apps/opencs/model/tools/tools.cpp        |  2 +-
 apps/opencs/model/world/defaultgmsts.cpp | 20 +++---
 apps/opencs/model/world/defaultgmsts.hpp |  2 +-
 6 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index ea1fbb3305..19891363fa 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -14,28 +14,28 @@
 
 void CSMDoc::Document::addGmsts()
 {
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::FloatCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::FloatCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::Floats[i];
+        gmst.mId = CSMWorld::DefaultGmsts::Floats[i];
         gmst.mValue.setType (ESM::VT_Float);
-        gmst.mValue.setFloat (CSMWorld::DefaultGMSTs::FloatsDefaultValues[i]);
+        gmst.mValue.setFloat (CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::IntCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::IntCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::Ints[i];
+        gmst.mId = CSMWorld::DefaultGmsts::Ints[i];
         gmst.mValue.setType (ESM::VT_Int);
-        gmst.mValue.setInteger (CSMWorld::DefaultGMSTs::IntsDefaultValues[i]);
+        gmst.mValue.setInteger (CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
         getData().getGmsts().add (gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::StringCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::StringCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::Strings[i];
+        gmst.mId = CSMWorld::DefaultGmsts::Strings[i];
         gmst.mValue.setType (ESM::VT_String);
         gmst.mValue.setString ("");
         getData().getGmsts().add (gmst);
@@ -44,28 +44,28 @@ void CSMDoc::Document::addGmsts()
 
 void CSMDoc::Document::addOptionalGmsts()
 {
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalFloatCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalFloatCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::OptionalFloats[i];
+        gmst.mId = CSMWorld::DefaultGmsts::OptionalFloats[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_Float);
         addOptionalGmst (gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalIntCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalIntCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::OptionalInts[i];
+        gmst.mId = CSMWorld::DefaultGmsts::OptionalInts[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_Int);
         addOptionalGmst (gmst);
     }
 
-    for (size_t i=0; i < CSMWorld::DefaultGMSTs::OptionalStringCount; ++i)
+    for (size_t i=0; i < CSMWorld::DefaultGmsts::OptionalStringCount; ++i)
     {
         ESM::GameSetting gmst;
-        gmst.mId = CSMWorld::DefaultGMSTs::OptionalStrings[i];
+        gmst.mId = CSMWorld::DefaultGmsts::OptionalStrings[i];
         gmst.blank();
         gmst.mValue.setType (ESM::VT_String);
         gmst.mValue.setString ("<no text>");
diff --git a/apps/opencs/model/tools/gmstcheck.cpp b/apps/opencs/model/tools/gmstcheck.cpp
index 6c17ff3a5a..0c32c00564 100644
--- a/apps/opencs/model/tools/gmstcheck.cpp
+++ b/apps/opencs/model/tools/gmstcheck.cpp
@@ -1,17 +1,19 @@
 #include "gmstcheck.hpp"
 
+#include <sstream>
+
 #include "../world/defaultgmsts.hpp"
 
-CSMTools::GMSTCheckStage::GMSTCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings)
+CSMTools::GmstCheckStage::GmstCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings)
     : mGameSettings(gameSettings)
 {}
 
-int CSMTools::GMSTCheckStage::setup()
+int CSMTools::GmstCheckStage::setup()
 {
     return mGameSettings.getSize();
 }
 
-void CSMTools::GMSTCheckStage::perform(int stage, CSMDoc::Messages& messages)
+void CSMTools::GmstCheckStage::perform(int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::GameSetting>& record = mGameSettings.getRecord (stage);
     
@@ -30,20 +32,25 @@ void CSMTools::GMSTCheckStage::perform(int stage, CSMDoc::Messages& messages)
     // optimization - compare it to lists based on naming convention (f-float,i-int,s-string)
     if (gmst.mId[0] == 'f')
     {
-        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::FloatCount; ++i)
+        for (size_t i = 0; i < CSMWorld::DefaultGmsts::FloatCount; ++i)
         {
-            if (gmst.mId == CSMWorld::DefaultGMSTs::Floats[i])
+            if (gmst.mId == CSMWorld::DefaultGmsts::Floats[i])
             {
                 if (gmst.mValue.getType() != ESM::VT_Float)
-                    messages.add(id, "The type of " + gmst.mId + " is incorrect", 
-                                 "Change the GMST type to a float", CSMDoc::Message::Severity_Error);
+                {
+                    std::ostringstream stream;
+                    stream << "Expected float type for " << gmst.mId << " but found "
+                        << varTypeToString(gmst.mValue.getType()) << " type";
+                    
+                    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+                }
                 
-                if (gmst.mValue.getFloat() < CSMWorld::DefaultGMSTs::FloatLimits[i*2])
-                    messages.add(id, gmst.mId + " is less than the suggested range", "Change the value",
+                if (gmst.mValue.getFloat() < CSMWorld::DefaultGmsts::FloatLimits[i*2])
+                    messages.add(id, gmst.mId + " is less than the suggested range", "",
                                  CSMDoc::Message::Severity_Warning);
                 
-                if (gmst.mValue.getFloat() > CSMWorld::DefaultGMSTs::FloatLimits[i*2+1])
-                    messages.add(id, gmst.mId + " is more than the suggested range", "Change the value",
+                if (gmst.mValue.getFloat() > CSMWorld::DefaultGmsts::FloatLimits[i*2+1])
+                    messages.add(id, gmst.mId + " is more than the suggested range", "",
                                  CSMDoc::Message::Severity_Warning);
                 
                 break; // for loop
@@ -52,20 +59,25 @@ void CSMTools::GMSTCheckStage::perform(int stage, CSMDoc::Messages& messages)
     }
     else if (gmst.mId[0] == 'i')
     {
-        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::IntCount; ++i)
+        for (size_t i = 0; i < CSMWorld::DefaultGmsts::IntCount; ++i)
         {   
-            if (gmst.mId == CSMWorld::DefaultGMSTs::Ints[i])
+            if (gmst.mId == CSMWorld::DefaultGmsts::Ints[i])
             {
                 if (gmst.mValue.getType() != ESM::VT_Int)
-                    messages.add(id, "The type of " + gmst.mId + " is incorrect",
-                                 "Change the GMST type to an int", CSMDoc::Message::Severity_Error);
+                {
+                    std::ostringstream stream;
+                    stream << "Expected int type for " << gmst.mId << " but found "
+                        << varTypeToString(gmst.mValue.getType()) << " type";
+                    
+                    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+                }
                 
-                if (gmst.mValue.getInteger() < CSMWorld::DefaultGMSTs::IntLimits[i*2])
-                    messages.add(id, gmst.mId + " is less than the suggested range", "Change the value",
+                if (gmst.mValue.getInteger() < CSMWorld::DefaultGmsts::IntLimits[i*2])
+                    messages.add(id, gmst.mId + " is less than the suggested range", "",
                                  CSMDoc::Message::Severity_Warning);
                 
-                if (gmst.mValue.getInteger() > CSMWorld::DefaultGMSTs::IntLimits[i*2+1])
-                    messages.add(id, gmst.mId + " is more than the suggested range", "Change the value",
+                if (gmst.mValue.getInteger() > CSMWorld::DefaultGmsts::IntLimits[i*2+1])
+                    messages.add(id, gmst.mId + " is more than the suggested range", "",
                                  CSMDoc::Message::Severity_Warning);
                 
                 break; // for loop
@@ -74,18 +86,38 @@ void CSMTools::GMSTCheckStage::perform(int stage, CSMDoc::Messages& messages)
     }
     else if (gmst.mId[0] == 's')
     {
-        for (size_t i = 0; i < CSMWorld::DefaultGMSTs::StringCount; ++i)
+        for (size_t i = 0; i < CSMWorld::DefaultGmsts::StringCount; ++i)
         {
-            if (gmst.mId == CSMWorld::DefaultGMSTs::Strings[i])
+            if (gmst.mId == CSMWorld::DefaultGmsts::Strings[i])
             {
                 ESM::VarType type = gmst.mValue.getType();
                 
                 if (type != ESM::VT_String && type != ESM::VT_None)
-                    messages.add(id, "The type of " + gmst.mId + " is incorrect", 
-                                "Change the GMST type to a string", CSMDoc::Message::Severity_Error);
+                {
+                    std::ostringstream stream;
+                    stream << "Expected string or none type for " << gmst.mId << " but found "
+                        << varTypeToString(gmst.mValue.getType()) << " type";
+                    
+                    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+                }
                 
                 break; // for loop
             }
         }
     }
 }
+
+std::string CSMTools::GmstCheckStage::varTypeToString(ESM::VarType type)
+{
+    switch (type)
+    {
+        case ESM::VT_Unknown: return "unknown";
+        case ESM::VT_None: return "none";
+        case ESM::VT_Short: return "short";
+        case ESM::VT_Int: return "int";
+        case ESM::VT_Long: return "long";
+        case ESM::VT_Float: return "float";
+        case ESM::VT_String: return "string";
+        default: return "unhandled";
+    }
+}
diff --git a/apps/opencs/model/tools/gmstcheck.hpp b/apps/opencs/model/tools/gmstcheck.hpp
index ca1564d9e8..0d4f7f2046 100644
--- a/apps/opencs/model/tools/gmstcheck.hpp
+++ b/apps/opencs/model/tools/gmstcheck.hpp
@@ -10,11 +10,11 @@
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that GMSTs are alright
-    class GMSTCheckStage : public CSMDoc::Stage
+    class GmstCheckStage : public CSMDoc::Stage
     {
     public:
         
-        GMSTCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings);
+        GmstCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings);
         
         virtual int setup();
         ///< \return number of steps
@@ -26,6 +26,8 @@ namespace CSMTools
         
         const CSMWorld::IdCollection<ESM::GameSetting>& mGameSettings;
         
+        std::string varTypeToString(ESM::VarType);
+        
     };
 }
 
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 9f36193ef1..e750092b93 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -112,7 +112,7 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Icons),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Textures)));
         
-        mVerifierOperation->appendStage (new GMSTCheckStage (mData.getGmsts()));
+        mVerifierOperation->appendStage (new GmstCheckStage (mData.getGmsts()));
 
         mVerifier.setOperation (mVerifierOperation);
     }
diff --git a/apps/opencs/model/world/defaultgmsts.cpp b/apps/opencs/model/world/defaultgmsts.cpp
index ef3d536b1e..f44e98411c 100644
--- a/apps/opencs/model/world/defaultgmsts.cpp
+++ b/apps/opencs/model/world/defaultgmsts.cpp
@@ -8,7 +8,7 @@ const float FEps = std::numeric_limits<float>::epsilon();
 const int IMax = std::numeric_limits<int>::max();
 const int IMin = std::numeric_limits<int>::min();
 
-const char* CSMWorld::DefaultGMSTs::Floats[CSMWorld::DefaultGMSTs::FloatCount] =
+const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] =
 {
     "fAIFleeFleeMult",
     "fAIFleeHealthMult",
@@ -270,7 +270,7 @@ const char* CSMWorld::DefaultGMSTs::Floats[CSMWorld::DefaultGMSTs::FloatCount] =
     "fWortChanceValue"
 };
 
-const char * CSMWorld::DefaultGMSTs::Ints[CSMWorld::DefaultGMSTs::IntCount] =
+const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
 {
     "i1stPersonSneakDelta",
     "iAlarmAttack",
@@ -363,7 +363,7 @@ const char * CSMWorld::DefaultGMSTs::Ints[CSMWorld::DefaultGMSTs::IntCount] =
     "iWereWolfLevelToAttack"
 };
 
-const char * CSMWorld::DefaultGMSTs::Strings[CSMWorld::DefaultGMSTs::StringCount] =
+const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] =
 {
     "s3dAudio",
     "s3dHardware",
@@ -1541,7 +1541,7 @@ const char * CSMWorld::DefaultGMSTs::Strings[CSMWorld::DefaultGMSTs::StringCount
     "sYourGold"
 };
 
-const char * CSMWorld::DefaultGMSTs::OptionalFloats[CSMWorld::DefaultGMSTs::OptionalFloatCount] =
+const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] =
 {
     "fCombatDistanceWerewolfMod",
     "fFleeDistance",
@@ -1587,7 +1587,7 @@ const char * CSMWorld::DefaultGMSTs::OptionalFloats[CSMWorld::DefaultGMSTs::Opti
     "fWereWolfWillPower"
 };
 
-const char * CSMWorld::DefaultGMSTs::OptionalInts[CSMWorld::DefaultGMSTs::OptionalIntCount] =
+const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] =
 {
     "iWereWolfBounty",
     "iWereWolfFightMod",
@@ -1595,7 +1595,7 @@ const char * CSMWorld::DefaultGMSTs::OptionalInts[CSMWorld::DefaultGMSTs::Option
     "iWereWolfLevelToAttack"
 };
 
-const char * CSMWorld::DefaultGMSTs::OptionalStrings[CSMWorld::DefaultGMSTs::OptionalStringCount] =
+const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] =
 {
     "sCompanionShare",
     "sCompanionWarningButtonOne",
@@ -1625,7 +1625,7 @@ const char * CSMWorld::DefaultGMSTs::OptionalStrings[CSMWorld::DefaultGMSTs::Opt
     "sWerewolfRestMessage"
 };
 
-const float CSMWorld::DefaultGMSTs::FloatsDefaultValues[CSMWorld::DefaultGMSTs::FloatCount] =
+const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] =
 {
     0.3,    // fAIFleeFleeMult
     7.0,    // fAIFleeHealthMult
@@ -1887,7 +1887,7 @@ const float CSMWorld::DefaultGMSTs::FloatsDefaultValues[CSMWorld::DefaultGMSTs::
     15.0   // fWortChanceValue
 };
 
-const int CSMWorld::DefaultGMSTs::IntsDefaultValues[CSMWorld::DefaultGMSTs::IntCount] =
+const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] =
 {
     10,     // i1stPersonSneakDelta
     50,     // iAlarmAttack
@@ -1980,7 +1980,7 @@ const int CSMWorld::DefaultGMSTs::IntsDefaultValues[CSMWorld::DefaultGMSTs::IntC
     20     // iWereWolfLevelToAttack
 };
 
-const float CSMWorld::DefaultGMSTs::FloatLimits[CSMWorld::DefaultGMSTs::FloatCount * 2] =
+const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] =
 {
     -FInf,      FInf,       // fAIFleeFleeMult
     -FInf,      FInf,       // fAIFleeHealthMult
@@ -2242,7 +2242,7 @@ const float CSMWorld::DefaultGMSTs::FloatLimits[CSMWorld::DefaultGMSTs::FloatCou
     0,          FInf        // fWortChanceValue
 };
 
-const int CSMWorld::DefaultGMSTs::IntLimits[CSMWorld::DefaultGMSTs::IntCount * 2] =
+const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] =
 {
     IMin,    IMax,  // i1stPersonSneakDelta
     IMin,    IMax,  // iAlarmAttack
diff --git a/apps/opencs/model/world/defaultgmsts.hpp b/apps/opencs/model/world/defaultgmsts.hpp
index ba65be805a..a2888ed6ac 100644
--- a/apps/opencs/model/world/defaultgmsts.hpp
+++ b/apps/opencs/model/world/defaultgmsts.hpp
@@ -4,7 +4,7 @@
 #include <cstddef>
 
 namespace CSMWorld {
-    namespace DefaultGMSTs {
+    namespace DefaultGmsts {
         
         const size_t FloatCount = 258;
         const size_t IntCount = 89;

From c82d9a1e873feae70a845feae26b6cbb5572de79 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Mon, 18 Jan 2016 19:56:35 -0600
Subject: [PATCH 111/765] Adjust ContainerStore / InventoryStore to allow
 partial unequip of items.

---
 apps/openmw/mwworld/containerstore.cpp | 12 +++++++-----
 apps/openmw/mwworld/containerstore.hpp |  6 ++++--
 apps/openmw/mwworld/inventorystore.cpp | 27 ++++++++++++++++++++++++++
 apps/openmw/mwworld/inventorystore.hpp |  9 +++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 45390405e0..e07ba433ac 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -136,16 +136,18 @@ int MWWorld::ContainerStore::count(const std::string &id)
     return total;
 }
 
-void MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container, int count)
 {
-    if (ptr.getRefData().getCount() <= 1)
-        return;
-    MWWorld::ContainerStoreIterator it = addNewStack(ptr, ptr.getRefData().getCount()-1);
+    if (ptr.getRefData().getCount() <= count)
+        return end();
+    MWWorld::ContainerStoreIterator it = addNewStack(ptr, ptr.getRefData().getCount()-count);
     const std::string script = it->getClass().getScript(*it);
     if (!script.empty())
         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, *it);
 
-    remove(ptr, ptr.getRefData().getCount()-1, container);
+    remove(ptr, ptr.getRefData().getCount()-count, container);
+
+    return it;
 }
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::restack(const MWWorld::Ptr& item)
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index b7ec4bb74e..6a8fc47616 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -130,8 +130,10 @@ namespace MWWorld
             ///
             /// @return the number of items actually removed
 
-            void unstack (const Ptr& ptr, const Ptr& container);
-            ///< Unstack an item in this container. The item's count will be set to 1, then a new stack will be added with (origCount-1).
+            ContainerStoreIterator unstack (const Ptr& ptr, const Ptr& container, int count = 1);
+            ///< Unstack an item in this container. The item's count will be set to count, then a new stack will be added with (origCount-count).
+            ///
+            /// @return an iterator to the new stack, or end() if no new stack was created.
 
             MWWorld::ContainerStoreIterator restack (const MWWorld::Ptr& item);
             ///< Attempt to re-stack an item in this container.
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index dbd2c67940..2c994f1467 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -574,6 +574,33 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItem(const MWWor
     throw std::runtime_error ("attempt to unequip an item that is not currently equipped");
 }
 
+MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipItemQuantity(const Ptr& item, const Ptr& actor, int count)
+{
+    if (!isEquipped(item))
+        throw std::runtime_error ("attempt to unequip an item that is not currently equipped");
+    if (count <= 0)
+        throw std::runtime_error ("attempt to unequip nothing (count <= 0)");
+    if (count > item.getRefData().getCount())
+        throw std::runtime_error ("attempt to unequip more items than equipped");
+
+    if (count == item.getRefData().getCount())
+        return unequipItem(item, actor);
+
+    // Move items to an existing stack if possible, otherwise split count items out into a new stack.
+    // Moving counts manually here, since ContainerStore's restack can't target unequipped stacks.
+    for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter)
+    {
+        if (stacks(*iter, item) && !isEquipped(*iter))
+        {
+            iter->getRefData().setCount(iter->getRefData().getCount() + count);
+            item.getRefData().setCount(item.getRefData().getCount() - count);
+            return iter;
+        }
+    }
+
+    return unstack(item, actor, item.getRefData().getCount() - count);
+}
+
 MWWorld::InventoryStoreListener* MWWorld::InventoryStore::getListener()
 {
     return mListener;
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 28c44bcec1..2d7c9f6e9c 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -188,6 +188,15 @@ namespace MWWorld
             /// (it can be re-stacked so its count may be different than when it
             /// was equipped).
 
+            ContainerStoreIterator unequipItemQuantity(const Ptr& item, const Ptr& actor, int count);
+            ///< Unequip a specific quantity of an item identified by its Ptr.
+            /// An exception is thrown if the item is not currently equipped,
+            /// if count <= 0, or if count > the item stack size.
+            ///
+            /// @return an iterator to the unequipped items that were previously
+            /// in the slot (they can be re-stacked so its count may be different
+            /// than the requested count).
+
             void setListener (InventoryStoreListener* listener, const Ptr& actor);
             ///< Set a listener for various events, see \a InventoryStoreListener
 

From 1ff49cc637134e75e1101bbd14bcbffe2f4d3b24 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Mon, 18 Jan 2016 19:58:19 -0600
Subject: [PATCH 112/765] Improve Drop command behavior.  (Fixes #1544)

---
 apps/openmw/mwscript/miscextensions.cpp | 35 +++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 593fdcca52..51f0c6c55b 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -21,6 +21,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
 
@@ -509,13 +510,43 @@ namespace MWScript
                     if (amount == 0)
                         return;
 
-                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
+                    // Prefer dropping unequipped items first; re-stack if possible by unequipping items before dropping them.
+                    MWWorld::InventoryStore *invStorePtr = 0;
+                    if (ptr.getClass().hasInventoryStore(ptr)) {
+                        invStorePtr = &ptr.getClass().getInventoryStore(ptr);
 
+                        int numNotEquipped = invStorePtr->count(item);
+                        for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                        {
+                            MWWorld::ContainerStoreIterator it = invStorePtr->getSlot (slot);
+                            if (it != invStorePtr->end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
+                            {
+                                numNotEquipped -= it->getRefData().getCount();
+                            }
+                        }
+
+                        for (int slot = 0; slot < MWWorld::InventoryStore::Slots && amount > numNotEquipped; ++slot)
+                        {
+                            MWWorld::ContainerStoreIterator it = invStorePtr->getSlot (slot);
+                            if (it != invStorePtr->end() && ::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item))
+                            {
+                                int numToRemove = it->getRefData().getCount();
+                                if (numToRemove > amount - numNotEquipped)
+                                {
+                                    numToRemove = amount - numNotEquipped;
+                                }
+                                invStorePtr->unequipItemQuantity(*it, ptr, numToRemove);
+                                numNotEquipped += numToRemove;
+                            }
+                        }
+                    }
 
                     int toRemove = amount;
+                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
                     for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
                     {
-                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item))
+                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), item)
+                                && (!invStorePtr || !invStorePtr->isEquipped(*iter)))
                         {
                             int removed = store.remove(*iter, toRemove, ptr);
                             MWWorld::Ptr dropped = MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter, removed);

From 5699cf7f0988d904fe4170124c9aec4faa729df7 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Mon, 18 Jan 2016 20:00:18 -0600
Subject: [PATCH 113/765] Barter:  Leave unsold projectiles equipped.

---
 apps/openmw/mwgui/inventorywindow.cpp | 10 ++++++----
 apps/openmw/mwgui/inventorywindow.hpp |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 7678cb006c..facb17d66c 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -265,18 +265,20 @@ namespace MWGui
         }
     }
 
-    void InventoryWindow::ensureSelectedItemUnequipped()
+    void InventoryWindow::ensureSelectedItemUnequipped(int count)
     {
         const ItemStack& item = mTradeModel->getItem(mSelectedItem);
         if (item.mType == ItemStack::Type_Equipped)
         {
             MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
-            MWWorld::Ptr newStack = *invStore.unequipItem(item.mBase, mPtr);
+            MWWorld::Ptr newStack = *invStore.unequipItemQuantity(item.mBase, mPtr, count);
 
             // The unequipped item was re-stacked. We have to update the index
             // since the item pointed does not exist anymore.
             if (item.mBase != newStack)
             {
+                updateItemView();  // Unequipping can produce a new stack, not yet in the window...
+
                 // newIndex will store the index of the ItemStack the item was stacked on
                 int newIndex = -1;
                 for (size_t i=0; i < mTradeModel->getItemCount(); ++i)
@@ -298,14 +300,14 @@ namespace MWGui
 
     void InventoryWindow::dragItem(MyGUI::Widget* sender, int count)
     {
-        ensureSelectedItemUnequipped();
+        ensureSelectedItemUnequipped(count);
         mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count);
         notifyContentChanged();
     }
 
     void InventoryWindow::sellItem(MyGUI::Widget* sender, int count)
     {
-        ensureSelectedItemUnequipped();
+        ensureSelectedItemUnequipped(count);
         const ItemStack& item = mTradeModel->getItem(mSelectedItem);
         std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index a8a1b15a13..b7ae067ace 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -126,8 +126,8 @@ namespace MWGui
 
             void adjustPanes();
 
-            /// Unequips mSelectedItem, if it is equipped, and then updates mSelectedItem in case it was re-stacked
-            void ensureSelectedItemUnequipped();
+            /// Unequips count items from mSelectedItem, if it is equipped, and then updates mSelectedItem in case the items were re-stacked
+            void ensureSelectedItemUnequipped(int count);
     };
 }
 

From 19b39de351d9329a10dc42e2906e919018100661 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 19 Jan 2016 11:15:36 +0100
Subject: [PATCH 114/765] use trusty

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0910ac5462..10b47ee7dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ os:
  - linux
 # - osx
 language: cpp
+sudo: required
+dist: trusty
 branches:
   only:
     - master

From 0305ae369327ad39a354a5b7f91abaed424b0287 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 19 Jan 2016 12:17:13 +0100
Subject: [PATCH 115/765] added selection mode UI

---
 apps/opencs/CMakeLists.txt                    |  2 +-
 apps/opencs/view/render/instancemode.cpp      | 23 +++++++++++++---
 apps/opencs/view/render/instancemode.hpp      |  3 +++
 .../view/render/instanceselectionmode.cpp     | 27 +++++++++++++++++++
 .../view/render/instanceselectionmode.hpp     | 19 +++++++++++++
 5 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 apps/opencs/view/render/instanceselectionmode.cpp
 create mode 100644 apps/opencs/view/render/instanceselectionmode.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0e9a49432b..ae4bbd66cf 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -85,7 +85,7 @@ opencs_units (view/widget
 
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
-    previewwidget editmode instancemode
+    previewwidget editmode instancemode instanceselectionmode
     )
 
 opencs_units_noqt (view/render
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 449d9d7a6f..53ebc70525 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -16,10 +16,11 @@
 #include "object.hpp"
 #include "worldspacewidget.hpp"
 #include "pagedworldspacewidget.hpp"
+#include "instanceselectionmode.hpp"
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Element_Reference, "Instance editing",
-  parent), mSubMode (0)
+  parent), mSubMode (0), mSelectionMode (0)
 {
 }
 
@@ -48,16 +49,30 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
             "<font color=Red>Not implemented yet</font color>");
     }
 
+    if (!mSelectionMode)
+        mSelectionMode = new InstanceSelectionMode (toolbar);
+
     EditMode::activate (toolbar);
 
     toolbar->addTool (mSubMode);
+    toolbar->addTool (mSelectionMode);
 }
 
 void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
 {
-    toolbar->removeTool (mSubMode);
-    delete mSubMode;
-    mSubMode = 0;
+    if (mSelectionMode)
+    {
+        toolbar->removeTool (mSelectionMode);
+        delete mSelectionMode;
+        mSelectionMode = 0;
+    }
+
+    if (mSubMode)
+    {
+        toolbar->removeTool (mSubMode);
+        delete mSubMode;
+        mSubMode = 0;
+    }
 
     EditMode::deactivate (toolbar);
 }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 1eec62874d..78836878a4 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -10,10 +10,13 @@ namespace CSVWidget
 
 namespace CSVRender
 {
+    class InstanceSelectionMode;
+
     class InstanceMode : public EditMode
     {
             Q_OBJECT
             CSVWidget::SceneToolMode *mSubMode;
+            InstanceSelectionMode *mSelectionMode;
 
         public:
 
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
new file mode 100644
index 0000000000..9fd8259991
--- /dev/null
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -0,0 +1,27 @@
+
+#include "instanceselectionmode.hpp"
+
+CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar *parent)
+: CSVWidget::SceneToolMode (parent, "Selection Mode")
+{
+    addButton (":placeholder", "cube-centre",
+        "Centred cube"
+        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection cube outwards</li>"
+        "<li>The selection cube is aligned to the word space axis</li>"
+        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+        "</ul>"
+        "<font color=Red>Not implemented yet</font color>");
+    addButton (":placeholder", "cube-corner",
+        "Cube corner to corner"
+        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from one corner of the selection cube to the opposite corner</li>"
+        "<li>The selection cube is aligned to the word space axis</li>"
+        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+        "</ul>"
+        "<font color=Red>Not implemented yet</font color>");
+    addButton (":placeholder", "sphere",
+        "Centred sphere"
+        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection sphere outwards</li>"
+        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+        "</ul>"
+        "<font color=Red>Not implemented yet</font color>");
+}
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
new file mode 100644
index 0000000000..e823de2135
--- /dev/null
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -0,0 +1,19 @@
+#ifndef CSV_RENDER_INSTANCE_SELECTION_MODE_H
+#define CSV_RENDER_INSTANCE_SELECTION_MODE_H
+
+#include "../widget/scenetoolmode.hpp"
+
+namespace CSVRender
+{
+    class InstanceSelectionMode : public CSVWidget::SceneToolMode
+    {
+            Q_OBJECT
+
+        public:
+
+            InstanceSelectionMode (CSVWidget::SceneToolbar *parent);
+
+    };
+}
+
+#endif

From eee972a1a4414a065e55153fe88413f7e6229cfc Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 19 Jan 2016 12:47:11 +0100
Subject: [PATCH 116/765] added scene tool mode context menu feature

---
 apps/opencs/view/widget/scenetoolmode.cpp | 17 +++++++++++++++++
 apps/opencs/view/widget/scenetoolmode.hpp | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index a93bb05567..efb508f9db 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -3,10 +3,24 @@
 #include <QHBoxLayout>
 #include <QFrame>
 #include <QSignalMapper>
+#include <QMenu>
+#include <QContextMenuEvent>
 
 #include "scenetoolbar.hpp"
 #include "modebutton.hpp"
 
+void CSVWidget::SceneToolMode::contextMenuEvent (QContextMenuEvent *event)
+{
+    QMenu menu (this);
+    if (createContextMenu (&menu))
+        menu.exec (event->globalPos());
+}
+
+bool CSVWidget::SceneToolMode::createContextMenu (QMenu *menu)
+{
+    return false;
+}
+
 void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
 {
     QString toolTip = mToolTip;
@@ -15,6 +29,9 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
 
     toolTip += "<p>(left click to change mode)";
 
+    if (createContextMenu (0))
+        toolTip += "<br>(right click to access context menu)";
+
     setToolTip (toolTip);
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 6828a22691..43cd4a7d75 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -6,6 +6,7 @@
 #include <map>
 
 class QHBoxLayout;
+class QMenu;
 
 namespace CSVWidget
 {
@@ -29,6 +30,16 @@ namespace CSVWidget
 
             void adjustToolTip (const ModeButton *activeMode);
 
+            virtual void contextMenuEvent (QContextMenuEvent *event);
+
+            /// Add context menu items to \a menu. Default-implementation: return false
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu *menu);
+
         public:
 
             SceneToolMode (SceneToolbar *parent, const QString& toolTip);

From ecbcd6b1717718d1ccaa3e18d7ad930eb2244f61 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 19 Jan 2016 12:52:30 +0100
Subject: [PATCH 117/765] allow mode buttons to setup the context menu

---
 apps/opencs/view/widget/modebutton.cpp    |  5 +++++
 apps/opencs/view/widget/modebutton.hpp    | 10 ++++++++++
 apps/opencs/view/widget/scenetoolmode.cpp |  3 +++
 apps/opencs/view/widget/scenetoolmode.hpp |  3 ++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/widget/modebutton.cpp b/apps/opencs/view/widget/modebutton.cpp
index 7c62f6bb16..88f0502479 100644
--- a/apps/opencs/view/widget/modebutton.cpp
+++ b/apps/opencs/view/widget/modebutton.cpp
@@ -7,3 +7,8 @@ CSVWidget::ModeButton::ModeButton (const QIcon& icon, const QString& tooltip, QW
 void CSVWidget::ModeButton::activate (SceneToolbar *toolbar) {}
 
 void CSVWidget::ModeButton::deactivate (SceneToolbar *toolbar) {}
+
+bool CSVWidget::ModeButton::createContextMenu (QMenu *menu)
+{
+    return false;
+}
diff --git a/apps/opencs/view/widget/modebutton.hpp b/apps/opencs/view/widget/modebutton.hpp
index ac14afc952..1615ff298a 100644
--- a/apps/opencs/view/widget/modebutton.hpp
+++ b/apps/opencs/view/widget/modebutton.hpp
@@ -3,6 +3,8 @@
 
 #include "pushbutton.hpp"
 
+class QMenu;
+
 namespace CSVWidget
 {
     class SceneToolbar;
@@ -22,6 +24,14 @@ namespace CSVWidget
 
             /// Default-Implementation: do nothing
             virtual void deactivate (SceneToolbar *toolbar);
+
+            /// Add context menu items to \a menu. Default-implementation: return false
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu *menu);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index efb508f9db..125f4ac79a 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -18,6 +18,9 @@ void CSVWidget::SceneToolMode::contextMenuEvent (QContextMenuEvent *event)
 
 bool CSVWidget::SceneToolMode::createContextMenu (QMenu *menu)
 {
+    if (mCurrent)
+        return mCurrent->createContextMenu (menu);
+
     return false;
 }
 
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 43cd4a7d75..3aa8e6799a 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -32,7 +32,8 @@ namespace CSVWidget
 
             virtual void contextMenuEvent (QContextMenuEvent *event);
 
-            /// Add context menu items to \a menu. Default-implementation: return false
+            /// Add context menu items to \a menu. Default-implementation: Pass on request to
+            /// current mode button or return false, if there is no current mode button.
             ///
             /// \attention menu can be a 0-pointer
             ///

From 45e6974266f6df4c9185bf2b225309d19d969078 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 19 Jan 2016 14:25:20 +0100
Subject: [PATCH 118/765] added select all and clear selection features

---
 apps/opencs/view/render/instancemode.cpp      |  3 +-
 .../view/render/instanceselectionmode.cpp     | 37 ++++++++++++++++++-
 .../view/render/instanceselectionmode.hpp     | 23 +++++++++++-
 .../view/render/pagedworldspacewidget.cpp     |  9 +++++
 .../view/render/pagedworldspacewidget.hpp     |  3 ++
 .../view/render/unpagedworldspacewidget.cpp   |  6 +++
 .../view/render/unpagedworldspacewidget.hpp   |  3 ++
 apps/opencs/view/render/worldspacewidget.hpp  |  3 ++
 8 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index ff49e0286e..4b6b2e41f8 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -9,7 +9,6 @@
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
 
-
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
 
@@ -52,7 +51,7 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     }
 
     if (!mSelectionMode)
-        mSelectionMode = new InstanceSelectionMode (toolbar);
+        mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget());
 
     EditMode::activate (toolbar);
 
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 9fd8259991..794a150d20 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -1,8 +1,25 @@
 
 #include "instanceselectionmode.hpp"
 
-CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar *parent)
-: CSVWidget::SceneToolMode (parent, "Selection Mode")
+#include <QMenu>
+#include <QAction>
+
+#include "worldspacewidget.hpp"
+
+bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
+{
+    if (menu)
+    {
+        menu->addAction (mSelectAll);
+        menu->addAction (mDeselectAll);
+    }
+
+    return true;
+}
+
+CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar *parent,
+    WorldspaceWidget& worldspaceWidget)
+: CSVWidget::SceneToolMode (parent, "Selection Mode"), mWorldspaceWidget (worldspaceWidget)
 {
     addButton (":placeholder", "cube-centre",
         "Centred cube"
@@ -24,4 +41,20 @@ CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar
         "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
         "</ul>"
         "<font color=Red>Not implemented yet</font color>");
+
+    mSelectAll = new QAction ("Select all Instances", this);
+    mDeselectAll = new QAction ("Clear selection", this);
+
+    connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
+    connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));
+}
+
+void CSVRender::InstanceSelectionMode::selectAll()
+{
+    mWorldspaceWidget.selectAll (Mask_Reference);
+}
+
+void CSVRender::InstanceSelectionMode::clearSelection()
+{
+    mWorldspaceWidget.clearSelection (Mask_Reference);
 }
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index e823de2135..6b3a4e37da 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -3,16 +3,37 @@
 
 #include "../widget/scenetoolmode.hpp"
 
+class QAction;
+
 namespace CSVRender
 {
+    class WorldspaceWidget;
+
     class InstanceSelectionMode : public CSVWidget::SceneToolMode
     {
             Q_OBJECT
 
+            WorldspaceWidget& mWorldspaceWidget;
+            QAction *mSelectAll;
+            QAction *mDeselectAll;
+
+            /// Add context menu items to \a menu.
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu *menu);
+
         public:
 
-            InstanceSelectionMode (CSVWidget::SceneToolbar *parent);
+            InstanceSelectionMode (CSVWidget::SceneToolbar *parent, WorldspaceWidget& worldspaceWidget);
 
+        private slots:
+
+            void selectAll();
+
+            void clearSelection();
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 1880beab8b..ccb3efb1d6 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -509,6 +509,15 @@ void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::selectAll (int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->setSelection (elementMask, Cell::Selection_All);
+
+    flagAsModified();
+}
+
 std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     const int cellSize = 8192;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 647341d1f4..3f9e605af9 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -98,6 +98,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAll (int elementMask);
+
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
         protected:
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index dad37c946b..48180f8665 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -108,6 +108,12 @@ void CSVRender::UnpagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::selectAll (int elementMask)
+{
+    mCell->setSelection (elementMask, Cell::Selection_All);
+    flagAsModified();
+}
+
 std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     return mCellId;
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 70a20c216d..8971f22a84 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -46,6 +46,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAll (int elementMask);
+
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
         private:
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 7a77edad42..13e66b7f03 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -127,6 +127,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask) = 0;
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAll (int elementMask) = 0;
+
             /// Return the next intersection point with scene elements matched by
             /// \a interactionMask based on \a localPos and the camera vector.
             /// If there is no such point, instead a point "in front" of \a localPos will be

From f0971ee8ad2f1e4d0a67a9aa6d5c6916c25ec91b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 20 Jan 2016 04:07:07 +0100
Subject: [PATCH 119/765] Implement Fixme script instruction

---
 apps/openmw/mwscript/docs/vmformat.txt            |  4 +++-
 apps/openmw/mwscript/transformationextensions.cpp | 14 ++++++++++++++
 apps/openmw/mwworld/worldimp.cpp                  |  3 ++-
 components/compiler/extensions0.cpp               |  1 +
 components/compiler/opcodes.hpp                   |  2 ++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 42c204ecb0..93219c649b 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -447,5 +447,7 @@ op 0x20002fe: RemoveFromLevItem
 op 0x20002ff: SetFactionReaction
 op 0x2000300: EnableLevelupMenu
 op 0x2000301: ToggleScripts
+op 0x2000302: Fixme
+op 0x2000303: Fixme, explicit
 
-opcodes 0x2000302-0x3ffffff unused
+opcodes 0x2000304-0x3ffffff unused
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 60847e745b..64c126de12 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -734,6 +734,18 @@ namespace MWScript
             }
         };
 
+        template <class R>
+        class OpFixme : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                MWWorld::Ptr ptr = R()(runtime);
+                MWBase::Environment::get().getWorld()->fixPosition(ptr);
+            }
+        };
+
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
             interpreter.installSegment5(Compiler::Transformation::opcodeSetScale,new OpSetScale<ImplicitRef>);
@@ -774,6 +786,8 @@ namespace MWScript
             interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingAngle, new OpGetStartingAngle<ImplicitRef>);
             interpreter.installSegment5(Compiler::Transformation::opcodeGetStartingAngleExplicit, new OpGetStartingAngle<ExplicitRef>);
             interpreter.installSegment5(Compiler::Transformation::opcodeResetActors, new OpResetActors);
+            interpreter.installSegment5(Compiler::Transformation::opcodeFixme, new OpFixme<ImplicitRef>);
+            interpreter.installSegment5(Compiler::Transformation::opcodeFixmeExplicit, new OpFixme<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c566a32b53..014c6b2002 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1311,7 +1311,8 @@ namespace MWWorld
         actor.getRefData().setPosition(pos);
 
         osg::Vec3f traced = mPhysics->traceDown(actor, dist*1.1f);
-        moveObject(actor, actor.getCell(), traced.x(), traced.y(), traced.z());
+        if (traced != pos.asVec3())
+            moveObject(actor, actor.getCell(), traced.x(), traced.y(), traced.z());
     }
 
     void World::rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust)
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 8c76cdbb80..6916945f93 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -541,6 +541,7 @@ namespace Compiler
             extensions.registerInstruction("moveworld","cf",opcodeMoveWorld,opcodeMoveWorldExplicit);
             extensions.registerFunction("getstartingangle",'f',"c",opcodeGetStartingAngle,opcodeGetStartingAngleExplicit);
             extensions.registerInstruction("resetactors","",opcodeResetActors);
+            extensions.registerInstruction("fixme","",opcodeFixme, opcodeFixmeExplicit);
             extensions.registerInstruction("ra","",opcodeResetActors);
         }
     }
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index e7d51d934d..feed5513e3 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -498,6 +498,8 @@ namespace Compiler
         const int opcodeMoveWorld = 0x2000208;
         const int opcodeMoveWorldExplicit = 0x2000209;
         const int opcodeResetActors = 0x20002f4;
+        const int opcodeFixme = 0x2000302;
+        const int opcodeFixmeExplicit = 0x2000303;
     }
 
     namespace User

From 339fbe23a7c0f1d89e683f6fa41728a7b5c3d428 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 20 Jan 2016 14:03:51 +0100
Subject: [PATCH 120/765] remove precise cruft

---
 CI/before_install.linux.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index 6e288aa149..1c02bc8d99 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -1,22 +1,17 @@
 #!/bin/sh
 
 if [ "${ANALYZE}" ]; then
-  if [ $(lsb_release -sc) = "precise" ]; then
-    echo "yes" | sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-  fi
   echo "yes" | sudo add-apt-repository "deb http://llvm.org/apt/`lsb_release -sc`/ llvm-toolchain-`lsb_release -sc`-3.6 main"
   wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
 fi
 
 echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
 echo "yes" | sudo apt-add-repository ppa:openmw/openmw
-echo "yes" | sudo apt-add-repository ppa:boost-latest/ppa
 sudo apt-get update -qq
 sudo apt-get install -qq libgtest-dev google-mock
-sudo apt-get install -qq libboost-filesystem1.55-dev libboost-program-options1.55-dev libboost-system1.55-dev libboost-thread1.55-dev
-sudo apt-get install -qq ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
+sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev
+sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
 sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev
-sudo apt-get install -qq cmake-data #workaround for broken osgqt cmake script in ubuntu 12.04
 if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build

From b8d19eb9cd09324b456c23a3f968a51d03432596 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 20 Jan 2016 14:30:33 +0100
Subject: [PATCH 121/765] make use of 2 dedicated cores while assuming both are
 blocked on I/O

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 10b47ee7dd..3a76944fbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ before_script:
  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./CI/before_script.osx.sh; fi
 script:
  - cd ./build
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j2; fi
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j3; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi

From 10609ca5d1d9e6abaa76978a06b830eaaa217530 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 21 Jan 2016 09:22:42 +0100
Subject: [PATCH 122/765] how much memory in our vm?

---
 CI/before_script.linux.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 71ddd20407..17667ad28a 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+free -m
 mkdir build
 cd build
 export CODE_COVERAGE=1

From 89512af808d78cf21e2e6553d155d1d341c4e54d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 21 Jan 2016 14:33:26 +0100
Subject: [PATCH 123/765] Increase number of jobs for coverity scan build to 2,
 enable OpenMW-CS build

As of the recent travis migration we should have enough memory to not run out... hopefully.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a76944fbe..e314d8e7b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ addons:
       name: "OpenMW/openmw"
       description: "<Your project description here>"
     notification_email: scrawl@baseoftrash.de
-    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE -DBUILD_OPENCS=FALSE"
-    build_command:   "make"
+    build_command_prepend: "cmake . -DBUILD_UNITTESTS=FALSE"
+    build_command:   "make -j2"
     branch_pattern: coverity_scan
 matrix:
   include:

From b0431833a1c8c077d2858faa62b96d9564efc3be Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 21 Jan 2016 16:08:04 +0100
Subject: [PATCH 124/765] Fix some defects reported by Coverity CI

---
 apps/opencs/model/doc/messages.cpp              | 2 +-
 apps/opencs/model/doc/messages.hpp              | 3 ---
 apps/opencs/model/doc/operationholder.cpp       | 4 +++-
 apps/opencs/model/tools/reportmodel.cpp         | 2 +-
 apps/opencs/model/tools/reportmodel.hpp         | 2 +-
 apps/opencs/model/world/commands.cpp            | 2 +-
 apps/opencs/view/render/worldspacewidget.cpp    | 5 +++--
 apps/opencs/view/world/table.cpp                | 2 +-
 apps/opencs/view/world/tablebottombox.cpp       | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp                | 4 +++-
 11 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp
index 86e96a88d6..76bbb6f227 100644
--- a/apps/opencs/model/doc/messages.cpp
+++ b/apps/opencs/model/doc/messages.cpp
@@ -1,6 +1,6 @@
 #include "messages.hpp"
 
-CSMDoc::Message::Message() {}
+CSMDoc::Message::Message() : mSeverity(Severity_Default){}
 
 CSMDoc::Message::Message (const CSMWorld::UniversalId& id, const std::string& message,
     const std::string& hint, Severity severity)
diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp
index 429feae4ec..4041e1a678 100644
--- a/apps/opencs/model/doc/messages.hpp
+++ b/apps/opencs/model/doc/messages.hpp
@@ -39,9 +39,6 @@ namespace CSMDoc
     {
         public:
 
-            // \deprecated Use CSMDoc::Message directly instead.
-            typedef CSMDoc::Message Message;
-
             typedef std::vector<Message> Collection;
 
             typedef Collection::const_iterator Iterator;
diff --git a/apps/opencs/model/doc/operationholder.cpp b/apps/opencs/model/doc/operationholder.cpp
index 5fcf24fe4f..ccbed6c8ba 100644
--- a/apps/opencs/model/doc/operationholder.cpp
+++ b/apps/opencs/model/doc/operationholder.cpp
@@ -2,7 +2,9 @@
 
 #include "operation.hpp"
 
-CSMDoc::OperationHolder::OperationHolder (Operation *operation) : mRunning (false)
+CSMDoc::OperationHolder::OperationHolder (Operation *operation)
+    : mOperation(NULL)
+    , mRunning (false)
 {
     if (operation)
         setOperation (operation);
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 77a14de841..49de1d6512 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -182,7 +182,7 @@ int CSMTools::ReportModel::countErrors() const
 {
     int count = 0;
 
-    for (std::vector<CSMDoc::Messages::Message>::const_iterator iter (mRows.begin());
+    for (std::vector<CSMDoc::Message>::const_iterator iter (mRows.begin());
         iter!=mRows.end(); ++iter)
         if (iter->mSeverity==CSMDoc::Message::Severity_Error ||
             iter->mSeverity==CSMDoc::Message::Severity_SeriousError)
diff --git a/apps/opencs/model/tools/reportmodel.hpp b/apps/opencs/model/tools/reportmodel.hpp
index 5704970f55..61b4e63074 100644
--- a/apps/opencs/model/tools/reportmodel.hpp
+++ b/apps/opencs/model/tools/reportmodel.hpp
@@ -16,7 +16,7 @@ namespace CSMTools
     {
             Q_OBJECT
 
-            std::vector<CSMDoc::Messages::Message> mRows;
+            std::vector<CSMDoc::Message> mRows;
 
             // Fixed columns
             enum Columns
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index d510cd1038..097e83f7ca 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -14,7 +14,7 @@
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false)
+    : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
     {
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 184477d6b2..af90af50cc 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -33,8 +33,9 @@
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
 : SceneWidget (document.getData().getResourceSystem(), parent), mSceneElements(0), mRun(0), mDocument(document),
-  mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false),
-  mToolTipPos (-1, -1)
+  mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false), mDragX(0), mDragY(0), mDragFactor(0),
+  mDragWheelFactor(0), mDragShiftFactor(0),
+  mToolTipPos (-1, -1), mShowToolTips(false), mToolTipDelay(0)
 {
     setAcceptDrops(true);
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 95dfa10340..26746e8c91 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -231,7 +231,7 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
 CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     bool createAndDelete, bool sorting, CSMDoc::Document& document)
 : DragRecordTable(document), mCreateAction (0),
-  mCloneAction(0),mRecordStatusDisplay (0)
+  mCloneAction(0), mRecordStatusDisplay (0), mJumpToAddedRecord(false), mUnselectAfterJump(false)
 {
     mModel = &dynamic_cast<CSMWorld::IdTableBase&> (*mDocument.getData().getTableModel (id));
 
diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index eed522227e..5a25bbc53e 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -76,7 +76,7 @@ CSVWorld::TableBottomBox::TableBottomBox (const CreatorFactoryBase& creatorFacto
                                           CSMDoc::Document& document, 
                                           const CSMWorld::UniversalId& id, 
                                           QWidget *parent)
-: QWidget (parent), mShowStatusBar (false), mEditMode(EditMode_None), mHasPosition(false)
+: QWidget (parent), mShowStatusBar (false), mEditMode(EditMode_None), mHasPosition(false), mRow(0), mColumn(0)
 {
     for (int i=0; i<4; ++i)
         mStatusCount[i] = 0;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b8dc90cf7a..84da270ebb 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1556,7 +1556,7 @@ namespace MWMechanics
                     (target == getPlayer() &&
                      MWBase::Environment::get().getWorld()->getGlobalInt("pcknownwerewolf")))
             {
-                const ESM::GameSetting * iWerewolfFightMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().search("iWerewolfFightMod");
+                const ESM::GameSetting * iWerewolfFightMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iWerewolfFightMod");
                 fight += iWerewolfFightMod->getInt();
             }
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 014c6b2002..afb5be9d35 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -433,7 +433,7 @@ namespace MWWorld
         // Werewolf (BM)
         gmst["fWereWolfRunMult"] = ESM::Variant(1.f);
         gmst["fWereWolfSilverWeaponDamageMult"] = ESM::Variant(1.f);
-
+        gmst["iWerewolfFightMod"] = ESM::Variant(1);
 
         std::map<std::string, ESM::Variant> globals;
         // vanilla Morrowind does not define dayspassed.
@@ -1745,6 +1745,8 @@ namespace MWWorld
                 {
                     cellid.mWorldspace = ref.mRef.getDestCell();
                     cellid.mPaged = false;
+                    cellid.mIndex.mX = 0;
+                    cellid.mIndex.mY = 0;
                 }
                 else
                 {

From ffcb6ec3819a3b3c0b66829bc2341c090254f737 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 21 Jan 2016 23:38:23 +0100
Subject: [PATCH 125/765] Change the default near clip distance to 1 (Fixes
 #3155)

---
 files/settings-default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 6a2495e267..e4a8387b4b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -14,7 +14,7 @@
 [Camera]
 
 # Near clipping plane (>0.0, e.g. 0.01 to 18.0).
-near clip = 5.0
+near clip = 1
 
 # Cull objects smaller than one pixel.
 small feature culling = true

From 07a4c0bf739ced2b2975e9c6507584d6fc4afc8e Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Sat, 23 Jan 2016 01:20:31 +0100
Subject: [PATCH 126/765] version bump to 0.38

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f353cd76ef..9cfb0440db 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ OpenMW is a recreation of the engine for the popular role-playing game Morrowind
 
 OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
 
-* Version: 0.37.0
+* Version: 0.38.0
 * License: GPL (see docs/license/GPL3.txt for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net

From b93b97575eafe176d405d047040fa13b4ddd80e4 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 24 Jan 2016 11:54:53 -0500
Subject: [PATCH 127/765] Improve start script creation (Fixes #3024)

Improved start script creation by updating input to be a drop target
and adding auto-completion.
---
 apps/opencs/view/world/startscriptcreator.cpp | 132 ++++++++++++++++--
 apps/opencs/view/world/startscriptcreator.hpp |  70 ++++++++--
 apps/opencs/view/world/subviews.cpp           |   7 +-
 3 files changed, 186 insertions(+), 23 deletions(-)

diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 69b1b3ff12..57ac34b8f0 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -1,20 +1,130 @@
 #include "startscriptcreator.hpp"
 
-CSVWorld::StartScriptCreator::StartScriptCreator(CSMWorld::Data &data, QUndoStack &undoStack, const CSMWorld::UniversalId &id, bool relaxedIdRules):
-    GenericCreator (data, undoStack, id, true)
-{}
+#include <QLabel>
+
+#include "../../model/doc/document.hpp"
+
+#include "../../model/world/columns.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/data.hpp"
+#include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/idtable.hpp"
+
+#include "../widget/droplineedit.hpp"
+
+std::string CSVWorld::StartScriptCreator::getId() const
+{
+    return mScript->text().toUtf8().constData();
+}
+
+CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
+{
+    return dynamic_cast<CSMWorld::IdTable&> (
+        *getData().getTableModel(getCollectionId())
+    );
+}
+
+void CSVWorld::StartScriptCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
+{
+    CSMWorld::IdTable& table = getStartScriptsTable();
+    int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+
+    // Set script ID to be added to start scripts table.
+    command.addValue(column, mScript->text());
+}
+
+CSVWorld::StartScriptCreator::StartScriptCreator(
+    CSMWorld::Data &data,
+    QUndoStack &undoStack,
+    const CSMWorld::UniversalId &id,
+    CSMWorld::IdCompletionManager& completionManager
+) : GenericCreator(data, undoStack, id, true)
+{
+    setManualEditing(false);
+
+    // Add script ID input label.
+    QLabel *label = new QLabel("Script ID", this);
+    insertBeforeButtons(label, false);
+
+    // Add script ID input with auto-completion.
+    CSMWorld::ColumnBase::Display displayType = CSMWorld::ColumnBase::Display_Script;
+    mScript = new CSVWidget::DropLineEdit(displayType, this);
+    mScript->setCompleter(completionManager.getCompleter(displayType).get());
+    insertBeforeButtons(mScript, true);
+
+    connect(mScript, SIGNAL (textChanged(const QString&)), this, SLOT (scriptChanged()));
+}
+
+void CSVWorld::StartScriptCreator::cloneMode(
+    const std::string& originId,
+    const CSMWorld::UniversalId::Type type)
+{
+    CSVWorld::GenericCreator::cloneMode(originId, type);
+
+    // Look up cloned record in start scripts table and set script ID text.
+    CSMWorld::IdTable& table = getStartScriptsTable();
+    int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
+    mScript->setText(table.data(table.getModelIndex(originId, column)).toString());
+}
 
 std::string CSVWorld::StartScriptCreator::getErrors() const
 {
-    std::string errors;
+    std::string scriptId = getId();
 
-    errors = getIdValidatorResult();
-    if (errors.length() > 0)
-        return errors;
-    else if (getData().getScripts().searchId(getId()) == -1)
-        errors = "Script ID not found";
-    else if (getData().getStartScripts().searchId(getId()) > -1 )
-        errors = "Script with this ID already registered as Start Script";
+    // Check user input for any errors.
+    std::string errors;
+    if (scriptId.empty())
+    {
+        if (!errors.empty())
+        {
+            errors += "<br>";
+        }
+        errors += "No Script ID entered";
+    }
+    else if (getData().getScripts().searchId(scriptId) == -1)
+    {
+        if (!errors.empty())
+        {
+            errors += "<br>";
+        }
+        errors += "Script ID not found";
+    }
+    else if (getData().getStartScripts().searchId(scriptId) > -1)
+    {
+        if (!errors.empty())
+        {
+            errors += "<br>";
+        }
+        errors += "Script with this ID already registered as Start Script";
+    }
 
     return errors;
 }
+
+void CSVWorld::StartScriptCreator::focus()
+{
+    mScript->setFocus();
+}
+
+void CSVWorld::StartScriptCreator::reset()
+{
+    CSVWorld::GenericCreator::reset();
+    mScript->setText("");
+}
+
+void CSVWorld::StartScriptCreator::scriptChanged()
+{
+    update();
+}
+
+CSVWorld::Creator *CSVWorld::StartScriptCreatorFactory::makeCreator(
+    CSMDoc::Document& document,
+    const CSMWorld::UniversalId& id) const
+{
+    return new StartScriptCreator(
+        document.getData(),
+        document.getUndoStack(),
+        id,
+        document.getIdCompletionManager()
+    );
+}
diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp
index 07fe8ff3d3..745dce819e 100644
--- a/apps/opencs/view/world/startscriptcreator.hpp
+++ b/apps/opencs/view/world/startscriptcreator.hpp
@@ -3,23 +3,77 @@
 
 #include "genericcreator.hpp"
 
-namespace CSVWorld {
+namespace CSMWorld
+{
+    class IdCompletionManager;
+    class IdTable;
+}
 
+namespace CSVWidget
+{
+    class DropLineEdit;
+}
+
+namespace CSVWorld
+{
+    /// \brief Record creator for start scripts.
     class StartScriptCreator : public GenericCreator
     {
         Q_OBJECT
 
-        public:
-            StartScriptCreator(CSMWorld::Data& data, QUndoStack& undoStack,
-                               const CSMWorld::UniversalId& id, bool relaxedIdRules = false);
+        CSVWidget::DropLineEdit *mScript;
 
+        private:
+
+            /// \return script ID entered by user.
+            virtual std::string getId() const;
+
+            /// \return reference to table containing start scripts.
+            CSMWorld::IdTable& getStartScriptsTable() const;
+
+            /// \brief Add user input to command for creating start script.
+            /// \param command Creation command to configure.
+            virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
+
+        public:
+
+            StartScriptCreator(
+                CSMWorld::Data& data,
+                QUndoStack& undoStack,
+                const CSMWorld::UniversalId& id,
+                CSMWorld::IdCompletionManager& completionManager);
+
+            /// \brief Set script ID input widget to ID of record to be cloned.
+            /// \param originId Script ID to be cloned.
+            /// \param type Type of record to be cloned.
+            virtual void cloneMode(
+                const std::string& originId,
+                const CSMWorld::UniversalId::Type type);
+
+            /// \return Formatted error descriptions for current user input.
             virtual std::string getErrors() const;
-            ///< Return formatted error descriptions for the current state of the creator. if an empty
-            /// string is returned, there is no error.
+
+            /// \brief Set focus to script ID input widget.
+            virtual void focus();
+
+            /// \brief Clear script ID input widget.
+            virtual void reset();
+
+        private slots:
+
+            /// \brief Check user input for any errors.
+            void scriptChanged();
      };
 
+     /// \brief Creator factory for start script record creator.
+     class StartScriptCreatorFactory : public CreatorFactoryBase
+     {
+        public:
+
+            virtual Creator *makeCreator(
+                CSMDoc::Document& document,
+                const CSMWorld::UniversalId& id) const;
+     };
 }
 
-
-
 #endif // STARTSCRIPTCREATOR_HPP
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 88375caafc..650f344ed9 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -52,7 +52,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
             new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator> >);
 
     manager.add (CSMWorld::UniversalId::Type_StartScripts,
-        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<StartScriptCreator> >);
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, StartScriptCreatorFactory>);
 
     manager.add (CSMWorld::UniversalId::Type_Cells,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<CellCreator> >);
@@ -136,8 +136,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
             CreatorFactory<GenericCreator> > (false));
 
     manager.add (CSMWorld::UniversalId::Type_StartScript,
-        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
-        CreatorFactory<StartScriptCreator> > (false));
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, StartScriptCreatorFactory>(false));
 
     manager.add (CSMWorld::UniversalId::Type_Skill,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, NullCreatorFactory > (false));
@@ -177,7 +176,7 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 
     manager.add (CSMWorld::UniversalId::Type_MetaData,
         new CSVDoc::SubViewFactory<SimpleDialogueSubView >);
-        
+
     //preview
     manager.add (CSMWorld::UniversalId::Type_Preview, new CSVDoc::SubViewFactory<PreviewSubView>);
 }

From fbca094dda2a23860a74561dd994de8b0dab33aa Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 24 Jan 2016 20:15:27 -0500
Subject: [PATCH 128/765] Fix input validation in StartScriptCreator

---
 apps/opencs/view/world/startscriptcreator.cpp | 18 +++---------------
 apps/opencs/view/world/startscriptcreator.hpp |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 57ac34b8f0..7495da035e 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -75,27 +75,15 @@ std::string CSVWorld::StartScriptCreator::getErrors() const
     std::string errors;
     if (scriptId.empty())
     {
-        if (!errors.empty())
-        {
-            errors += "<br>";
-        }
-        errors += "No Script ID entered";
+        errors = "No Script ID entered";
     }
     else if (getData().getScripts().searchId(scriptId) == -1)
     {
-        if (!errors.empty())
-        {
-            errors += "<br>";
-        }
-        errors += "Script ID not found";
+        errors = "Script ID not found";
     }
     else if (getData().getStartScripts().searchId(scriptId) > -1)
     {
-        if (!errors.empty())
-        {
-            errors += "<br>";
-        }
-        errors += "Script with this ID already registered as Start Script";
+        errors = "Script with this ID already registered as Start Script";
     }
 
     return errors;
diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp
index 745dce819e..473e2fd5f6 100644
--- a/apps/opencs/view/world/startscriptcreator.hpp
+++ b/apps/opencs/view/world/startscriptcreator.hpp
@@ -50,7 +50,7 @@ namespace CSVWorld
                 const std::string& originId,
                 const CSMWorld::UniversalId::Type type);
 
-            /// \return Formatted error descriptions for current user input.
+            /// \return Error description for current user input.
             virtual std::string getErrors() const;
 
             /// \brief Set focus to script ID input widget.

From 0659687bfbdf859414313aed33d9da7cef80efec Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <git@tobik.me>
Date: Mon, 25 Jan 2016 14:13:16 +0100
Subject: [PATCH 129/765] Some fixes for building on FreeBSD

---
 apps/essimporter/converter.hpp            | 2 +-
 apps/essimporter/convertinventory.cpp     | 1 +
 apps/openmw/crashcatcher.cpp              | 2 +-
 apps/openmw/mwmechanics/spells.cpp        | 2 +-
 apps/openmw/mwmechanics/spells.hpp        | 2 +-
 apps/openmw/mwworld/projectilemanager.hpp | 1 +
 apps/openmw/mwworld/refdata.hpp           | 1 +
 apps/openmw/mwworld/worldimp.cpp          | 4 ++++
 components/esm/spellstate.cpp             | 6 +++---
 components/esm/spellstate.hpp             | 2 +-
 components/resource/bulletshape.cpp       | 1 +
 components/sceneutil/lightcontroller.cpp  | 1 +
 components/sceneutil/lightutil.cpp        | 1 +
 13 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index f364e166c8..81b2bec14a 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -121,7 +121,7 @@ public:
         {
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
             mContext->mPlayerBase = npc;
-            std::map<const int, float> empty;
+            std::map<int, float> empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
diff --git a/apps/essimporter/convertinventory.cpp b/apps/essimporter/convertinventory.cpp
index f476fe1ee2..0799c8d113 100644
--- a/apps/essimporter/convertinventory.cpp
+++ b/apps/essimporter/convertinventory.cpp
@@ -1,6 +1,7 @@
 #include "convertinventory.hpp"
 
 #include <components/misc/stringops.hpp>
+#include <cstdlib>
 
 namespace ESSImport
 {
diff --git a/apps/openmw/crashcatcher.cpp b/apps/openmw/crashcatcher.cpp
index 0b4ff6304f..cafd0e08a1 100644
--- a/apps/openmw/crashcatcher.cpp
+++ b/apps/openmw/crashcatcher.cpp
@@ -24,7 +24,7 @@
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
-#elif defined (__APPLE__)
+#elif defined (__APPLE__) || defined (__FreeBSD__)
 #include <signal.h>
 #endif
 
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index a88b6b2633..2f87d04463 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -44,7 +44,7 @@ namespace MWMechanics
     {
         if (mSpells.find (spell)==mSpells.end())
         {
-            std::map<const int, float> random;
+            std::map<int, float> random;
 
             // Determine the random magnitudes (unless this is a castable spell, in which case
             // they will be determined when the spell is cast)
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 1b1993d5ef..a46988c4c5 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -33,7 +33,7 @@ namespace MWMechanics
 
             typedef const ESM::Spell* SpellKey;
 
-            typedef std::map<SpellKey, std::map<const int, float> > TContainer; // ID, <effect index, normalised random magnitude>
+            typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
             typedef TContainer::const_iterator TIterator;
 
             struct CorprusStats
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 74d4c1dc53..02ac6cb55d 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include <osg/observer_ptr>
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index 28d2dad4c9..d87ffdb70e 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -5,6 +5,7 @@
 
 #include "../mwscript/locals.hpp"
 
+#include <string>
 #include <osg/Vec3f>
 
 namespace SceneUtil
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index afb5be9d35..37743bceb0 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -108,7 +108,11 @@ namespace MWWorld
         }
 
         private:
+#ifdef HAVE_UNORDERED_MAP
+          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
+#else
           typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
+#endif
           LoadersContainer mLoaders;
     };
 
diff --git a/components/esm/spellstate.cpp b/components/esm/spellstate.cpp
index 3ed3329b46..8845842e9f 100644
--- a/components/esm/spellstate.cpp
+++ b/components/esm/spellstate.cpp
@@ -12,7 +12,7 @@ namespace ESM
         {
             std::string id = esm.getHString();
 
-            std::map<const int, float> random;
+            std::map<int, float> random;
             while (esm.isNextSub("INDX"))
             {
                 int index;
@@ -73,8 +73,8 @@ namespace ESM
         {
             esm.writeHNString("SPEL", it->first);
 
-            const std::map<const int, float>& random = it->second;
-            for (std::map<const int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
+            const std::map<int, float>& random = it->second;
+            for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
             {
                 esm.writeHNT("INDX", rIt->first);
                 esm.writeHNT("RAND", rIt->second);
diff --git a/components/esm/spellstate.hpp b/components/esm/spellstate.hpp
index 028e6a3878..503c3aea9f 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm/spellstate.hpp
@@ -28,7 +28,7 @@ namespace ESM
             float mMagnitude;
         };
 
-        typedef std::map<std::string, std::map<const int, float> > TContainer;
+        typedef std::map<std::string, std::map<int, float> > TContainer;
         TContainer mSpells;
 
         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 968dbe6c67..0cbc63a229 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -1,6 +1,7 @@
 #include "bulletshape.hpp"
 
 #include <stdexcept>
+#include <string>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index e3ea93843c..47575e2e6d 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -2,6 +2,7 @@
 
 #include <cmath>
 
+#include <osg/observer_ptr>
 #include <osg/NodeVisitor>
 
 #include <components/sceneutil/lightmanager.hpp>
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 6499c54b1d..979d41181b 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -1,5 +1,6 @@
 #include "lightutil.hpp"
 
+#include <osg/observer_ptr>
 #include <osg/Light>
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>

From c1f0aa7260059007262aa1f4d21555fb1827c10b Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 25 Jan 2016 14:55:02 +0100
Subject: [PATCH 130/765] added delete selection item to selection mode button
 menu

---
 apps/opencs/view/render/cell.cpp              | 13 ++++++++++
 apps/opencs/view/render/cell.hpp              |  4 +++
 .../view/render/instanceselectionmode.cpp     | 26 +++++++++++++++++++
 .../view/render/instanceselectionmode.hpp     |  3 +++
 apps/opencs/view/render/object.cpp            |  5 ++++
 apps/opencs/view/render/object.hpp            |  2 ++
 .../view/render/pagedworldspacewidget.cpp     | 17 ++++++++++++
 .../view/render/pagedworldspacewidget.hpp     |  3 +++
 .../view/render/unpagedworldspacewidget.cpp   |  6 +++++
 .../view/render/unpagedworldspacewidget.hpp   |  3 +++
 apps/opencs/view/render/worldspacewidget.hpp  |  3 +++
 11 files changed, 85 insertions(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 40981164de..4372018fb8 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -276,3 +276,16 @@ bool CSVRender::Cell::isDeleted() const
 {
     return mDeleted;
 }
+
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<TagBase> > result;
+
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+            if (iter->second->getSelected())
+                result.push_back (iter->second->getTag());
+
+    return result;
+}
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 59f4cafee4..3e51bb3342 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -31,6 +31,8 @@ namespace CSMWorld
 
 namespace CSVRender
 {
+    class TagBase;
+
     class Cell
     {
             CSMWorld::Data& mData;
@@ -99,6 +101,8 @@ namespace CSVRender
             CSMWorld::CellCoordinates getCoordinates() const;
 
             bool isDeleted() const;
+
+            std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) const;
     };
 }
 
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 794a150d20..754123d2d9 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -4,7 +4,11 @@
 #include <QMenu>
 #include <QAction>
 
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/commands.hpp"
+
 #include "worldspacewidget.hpp"
+#include "object.hpp"
 
 bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
 {
@@ -12,6 +16,7 @@ bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
     {
         menu->addAction (mSelectAll);
         menu->addAction (mDeselectAll);
+        menu->addAction (mDeleteSelection);
     }
 
     return true;
@@ -44,9 +49,11 @@ CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar
 
     mSelectAll = new QAction ("Select all Instances", this);
     mDeselectAll = new QAction ("Clear selection", this);
+    mDeleteSelection = new QAction ("Delete selection", this);
 
     connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
     connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));
+    connect (mDeleteSelection, SIGNAL (triggered ()), this, SLOT (deleteSelection()));
 }
 
 void CSVRender::InstanceSelectionMode::selectAll()
@@ -58,3 +65,22 @@ void CSVRender::InstanceSelectionMode::clearSelection()
 {
     mWorldspaceWidget.clearSelection (Mask_Reference);
 }
+
+void CSVRender::InstanceSelectionMode::deleteSelection()
+{
+    std::vector<osg::ref_ptr<TagBase> > selection =
+        mWorldspaceWidget.getSelection (Mask_Reference);
+
+    CSMWorld::IdTable& referencesTable =
+            dynamic_cast<CSMWorld::IdTable&> (*mWorldspaceWidget.getDocument().getData().
+            getTableModel (CSMWorld::UniversalId::Type_References));
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+        iter!=selection.end(); ++iter)
+    {
+        CSMWorld::DeleteCommand *command = new CSMWorld::DeleteCommand (referencesTable,
+            static_cast<ObjectTag *> (iter->get())->mObject->getReferenceId());
+
+        mWorldspaceWidget.getDocument().getUndoStack().push (command);
+    }
+}
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index 6b3a4e37da..07b774543d 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -16,6 +16,7 @@ namespace CSVRender
             WorldspaceWidget& mWorldspaceWidget;
             QAction *mSelectAll;
             QAction *mDeselectAll;
+            QAction *mDeleteSelection;
 
             /// Add context menu items to \a menu.
             ///
@@ -34,6 +35,8 @@ namespace CSVRender
             void selectAll();
 
             void clearSelection();
+
+            void deleteSelection();
     };
 }
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 1821da059e..dcf217a364 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -284,3 +284,8 @@ std::string CSVRender::Object::getReferenceableId() const
 {
     return mReferenceableId;
 }
+
+osg::ref_ptr<CSVRender::TagBase> CSVRender::Object::getTag() const
+{
+    return static_cast<CSVRender::TagBase *> (mBaseNode->getUserData());
+}
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index e7638e7a99..4a89fe201f 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -114,6 +114,8 @@ namespace CSVRender
             std::string getReferenceId() const;
 
             std::string getReferenceableId() const;
+
+            osg::ref_ptr<TagBase> getTag() const;
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index ccb3efb1d6..ef5c4e868a 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -529,6 +529,23 @@ std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point
     return cellCoordinates.getId (mWorldspace);
 }
 
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getSelection (
+    unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<CSVRender::TagBase> > result;
+
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+    {
+        std::vector<osg::ref_ptr<CSVRender::TagBase> > cellResult =
+            iter->second->getSelection (elementMask);
+
+        result.insert (result.end(), cellResult.begin(), cellResult.end());
+    }
+
+    return result;
+}
+
 CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 3f9e605af9..bd4233a644 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -103,6 +103,9 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
+                const;
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 48180f8665..a026a24732 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -119,6 +119,12 @@ std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& poi
     return mCellId;
 }
 
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getSelection (
+    unsigned int elementMask) const
+{
+    return mCell->getSelection (elementMask);
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 8971f22a84..3aea8dee4a 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -51,6 +51,9 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
+                const;
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 13e66b7f03..cd031fcba4 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -143,6 +143,9 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const = 0;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
+                const = 0;
+
         protected:
 
             /// Visual elements in a scene

From 790367b980ef6980b62abb30b61890100c7aca60 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 25 Jan 2016 16:12:20 +0100
Subject: [PATCH 131/765] fixed object removal via setting state to delete

---
 apps/opencs/view/render/cell.cpp | 40 +++++++++++++++++++++-----------
 apps/opencs/view/render/cell.hpp |  4 ++++
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 4372018fb8..758498de16 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -22,11 +22,18 @@ bool CSVRender::Cell::removeObject (const std::string& id)
     if (iter==mObjects.end())
         return false;
 
-    delete iter->second;
-    mObjects.erase (iter);
+    removeObject (iter);
     return true;
 }
 
+std::map<std::string, CSVRender::Object *>::iterator CSVRender::Cell::removeObject (
+    std::map<std::string, Object *>::iterator iter)
+{
+    delete iter->second;
+    mObjects.erase (iter++);
+    return iter;
+}
+
 bool CSVRender::Cell::addObjects (int start, int end)
 {
     bool modified = false;
@@ -161,8 +168,8 @@ bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
     // perform update and remove where needed
     bool modified = false;
 
-    for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
-        iter!=mObjects.end(); ++iter)
+    std::map<std::string, Object *>::iterator iter = mObjects.begin();
+    while (iter!=mObjects.end())
     {
         if (iter->second->referenceDataChanged (topLeft, bottomRight))
             modified = true;
@@ -171,23 +178,30 @@ bool CSVRender::Cell::referenceDataChanged (const QModelIndex& topLeft,
 
         if (iter2!=ids.end())
         {
-            if (iter2->second)
-            {
-                removeObject (iter->first);
-                modified = true;
-            }
-
+            bool deleted = iter2->second;
             ids.erase (iter2);
+
+            if (deleted)
+            {
+                iter = removeObject (iter);
+                modified = true;
+                continue;
+            }
         }
+
+        ++iter;
     }
 
     // add new objects
     for (std::map<std::string, bool>::iterator iter (ids.begin()); iter!=ids.end(); ++iter)
     {
-        mObjects.insert (std::make_pair (
-            iter->first, new Object (mData, mCellNode, iter->first, false)));
+        if (!iter->second)
+        {
+            mObjects.insert (std::make_pair (
+                iter->first, new Object (mData, mCellNode, iter->first, false)));
 
-        modified = true;
+            modified = true;
+        }
     }
 
     return modified;
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 3e51bb3342..9f062b4392 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -49,6 +49,10 @@ namespace CSVRender
             /// \return Was the object deleted?
             bool removeObject (const std::string& id);
 
+            // Remove object and return iterator to next object.
+            std::map<std::string, Object *>::iterator removeObject (
+                std::map<std::string, Object *>::iterator iter);
+
             /// Add objects from reference table that are within this cell.
             ///
             /// \return Have any objects been added?

From 39e1b06101ab6947fec43470fa0225060a9cc80b Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 25 Jan 2016 16:18:55 +0100
Subject: [PATCH 132/765] fixed deletion of objects that are selected (was
 leaving a node behind)

---
 apps/opencs/view/render/object.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index dcf217a364..b980b658a4 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -187,6 +187,7 @@ CSVRender::Object::~Object()
     clear();
 
     mParentNode->removeChild(mBaseNode);
+    mParentNode->removeChild(mOutline);
 }
 
 void CSVRender::Object::setSelected(bool selected)

From b393d34ebb84f056a20aaa495c5b9509d2334837 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 25 Jan 2016 16:39:20 +0100
Subject: [PATCH 133/765] updated credits file

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index bfbd14a5b8..83a625406e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -113,6 +113,7 @@ Programmers
     Stefan Galowicz (bogglez)
     Stanislav Bobrov (Jiub)
     Sylvain Thesnieres (Garvek)
+    t6
     terrorfisch
     Thomas Luppi (Digmaster)
     Tom Mason (wheybags)

From 48f53e23bfaba6ea8aa32536aeb5386e5e03a4c3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 25 Jan 2016 16:59:31 +0100
Subject: [PATCH 134/765] Allow alternate mesh formats for marker_error

---
 components/resource/scenemanager.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 1d1c5a3656..e142826490 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -201,10 +201,22 @@ namespace Resource
             }
             catch (std::exception& e)
             {
-                std::cerr << "Failed to load '" << name << "': " << e.what() << ", using marker_error.nif instead" << std::endl;
-                Files::IStreamPtr file = mVFS->get("meshes/marker_error.nif");
-                normalized = "meshes/marker_error.nif";
-                loaded = load(file, normalized, mTextureManager, mNifFileManager);
+                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", 0 };
+
+                for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
+                {
+                    normalized = "meshes/marker_error." + std::string(sMeshTypes[i]);
+                    if (mVFS->exists(normalized))
+                    {
+                        std::cerr << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead" << std::endl;
+                        Files::IStreamPtr file = mVFS->get(normalized);
+                        loaded = load(file, normalized, mTextureManager, mNifFileManager);
+                        break;
+                    }
+                }
+
+                if (!loaded)
+                    throw;
             }
 
             osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());

From fc6fe9acfb3f70d65c97fc45d9d3b0a8b1b16236 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 25 Jan 2016 18:52:20 +0100
Subject: [PATCH 135/765] Do not crash ModVertexAlphaVisitor when there are no
 vertex colors

---
 apps/openmw/mwrender/sky.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index efe797336d..692e3655a0 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -374,8 +374,13 @@ public:
             }
             else if (mMeshType == 2)
             {
-                osg::Vec4Array* origColors = static_cast<osg::Vec4Array*>(geom->getColorArray());
-                alpha = ((*origColors)[i].x() == 1.f) ? 1.f : 0.f;
+                if (geom->getColorArray())
+                {
+                    osg::Vec4Array* origColors = static_cast<osg::Vec4Array*>(geom->getColorArray());
+                    alpha = ((*origColors)[i].x() == 1.f) ? 1.f : 0.f;
+                }
+                else
+                    alpha = 1.f;
             }
 
             (*colors)[i] = osg::Vec4f(0.f, 0.f, 0.f, alpha);

From aec8c3846103da0d65ca772d859c501f2d6d9c57 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 25 Jan 2016 21:03:33 +0100
Subject: [PATCH 136/765] Move observer_ptr include where it belongs

---
 apps/openmw/mwrender/sky.cpp              | 1 +
 apps/openmw/mwworld/projectilemanager.hpp | 1 -
 components/sceneutil/lightcontroller.cpp  | 1 -
 components/sceneutil/lightmanager.hpp     | 1 +
 components/sceneutil/lightutil.cpp        | 1 -
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 692e3655a0..513fc74a34 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -17,6 +17,7 @@
 #include <osg/MatrixTransform>
 #include <osg/BlendFunc>
 #include <osg/AlphaFunc>
+#include <osg/observer_ptr>
 
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
index 02ac6cb55d..74d4c1dc53 100644
--- a/apps/openmw/mwworld/projectilemanager.hpp
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -3,7 +3,6 @@
 
 #include <string>
 
-#include <osg/observer_ptr>
 #include <osg/ref_ptr>
 #include <osg/PositionAttitudeTransform>
 
diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp
index 47575e2e6d..e3ea93843c 100644
--- a/components/sceneutil/lightcontroller.cpp
+++ b/components/sceneutil/lightcontroller.cpp
@@ -2,7 +2,6 @@
 
 #include <cmath>
 
-#include <osg/observer_ptr>
 #include <osg/NodeVisitor>
 
 #include <components/sceneutil/lightmanager.hpp>
diff --git a/components/sceneutil/lightmanager.hpp b/components/sceneutil/lightmanager.hpp
index 07b3b4a62e..0d8610eadb 100644
--- a/components/sceneutil/lightmanager.hpp
+++ b/components/sceneutil/lightmanager.hpp
@@ -5,6 +5,7 @@
 
 #include <osg/Group>
 #include <osg/NodeVisitor>
+#include <osg/observer_ptr>
 
 namespace SceneUtil
 {
diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp
index 979d41181b..6499c54b1d 100644
--- a/components/sceneutil/lightutil.cpp
+++ b/components/sceneutil/lightutil.cpp
@@ -1,6 +1,5 @@
 #include "lightutil.hpp"
 
-#include <osg/observer_ptr>
 #include <osg/Light>
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>

From d9290b0ee0fa25c6655a4b054f979ea6ed186f07 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 25 Jan 2016 21:13:38 +0100
Subject: [PATCH 137/765] Array fix

---
 components/resource/scenemanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e142826490..43ece41f35 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -201,7 +201,7 @@ namespace Resource
             }
             catch (std::exception& e)
             {
-                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2", 0 };
+                static const char * const sMeshTypes[] = { "nif", "osg", "osgt", "osgb", "osgx", "osg2" };
 
                 for (unsigned int i=0; i<sizeof(sMeshTypes)/sizeof(sMeshTypes[0]); ++i)
                 {

From d5ef40aeb7738b2c5be6207e4d03a91782760903 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Jan 2016 10:51:47 +0100
Subject: [PATCH 138/765] minor improvements to wording of instance selection
 menu items

---
 apps/opencs/view/render/instanceselectionmode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 754123d2d9..2fd91c8e2d 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -47,9 +47,9 @@ CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar
         "</ul>"
         "<font color=Red>Not implemented yet</font color>");
 
-    mSelectAll = new QAction ("Select all Instances", this);
+    mSelectAll = new QAction ("Select all instances", this);
     mDeselectAll = new QAction ("Clear selection", this);
-    mDeleteSelection = new QAction ("Delete selection", this);
+    mDeleteSelection = new QAction ("Delete selected instances", this);
 
     connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
     connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));

From 1d0ef97bf6bc566fa817e51179467a854c925365 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Jan 2016 11:31:37 +0100
Subject: [PATCH 139/765] added select all of same ID item to selection mode
 button menu

---
 apps/opencs/view/render/cell.cpp              | 22 +++++++++++++++++++
 apps/opencs/view/render/cell.hpp              |  4 ++++
 .../view/render/instanceselectionmode.cpp     |  9 +++++++-
 .../view/render/instanceselectionmode.hpp     |  3 +++
 .../view/render/pagedworldspacewidget.cpp     |  9 ++++++++
 .../view/render/pagedworldspacewidget.hpp     |  6 +++++
 .../view/render/unpagedworldspacewidget.cpp   |  6 +++++
 .../view/render/unpagedworldspacewidget.hpp   |  6 +++++
 apps/opencs/view/render/worldspacewidget.hpp  |  6 +++++
 9 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 758498de16..bd85c8a142 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -263,6 +263,28 @@ void CSVRender::Cell::setSelection (int elementMask, Selection mode)
     }
 }
 
+void CSVRender::Cell::selectAllWithSameParentId (int elementMask)
+{
+    std::set<std::string> ids;
+
+    for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+    {
+        if (iter->second->getSelected())
+            ids.insert (iter->second->getReferenceableId());
+    }
+
+    for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+        iter!=mObjects.end(); ++iter)
+    {
+        if (!iter->second->getSelected() &&
+            ids.find (iter->second->getReferenceableId())!=ids.end())
+        {
+            iter->second->setSelected (true);
+        }
+    }
+}
+
 void CSVRender::Cell::setCellArrows (int mask)
 {
     for (int i=0; i<4; ++i)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 9f062b4392..85b9bf21b4 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -99,6 +99,10 @@ namespace CSVRender
 
             void setSelection (int elementMask, Selection mode);
 
+            // Select everything that references the same ID as at least one of the elements
+            // already selected
+            void selectAllWithSameParentId (int elementMask);
+
             void setCellArrows (int mask);
 
             /// Returns 0, 0 in case of an unpaged cell.
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 2fd91c8e2d..5c3aaa8d16 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -16,6 +16,7 @@ bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
     {
         menu->addAction (mSelectAll);
         menu->addAction (mDeselectAll);
+        menu->addAction (mSelectSame);
         menu->addAction (mDeleteSelection);
     }
 
@@ -50,10 +51,11 @@ CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar
     mSelectAll = new QAction ("Select all instances", this);
     mDeselectAll = new QAction ("Clear selection", this);
     mDeleteSelection = new QAction ("Delete selected instances", this);
-
+    mSelectSame = new QAction ("Extend selection to instances with same object ID", this);
     connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
     connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));
     connect (mDeleteSelection, SIGNAL (triggered ()), this, SLOT (deleteSelection()));
+    connect (mSelectSame, SIGNAL (triggered ()), this, SLOT (selectSame()));
 }
 
 void CSVRender::InstanceSelectionMode::selectAll()
@@ -84,3 +86,8 @@ void CSVRender::InstanceSelectionMode::deleteSelection()
         mWorldspaceWidget.getDocument().getUndoStack().push (command);
     }
 }
+
+void CSVRender::InstanceSelectionMode::selectSame()
+{
+    mWorldspaceWidget.selectAllWithSameParentId (Mask_Reference);
+}
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index 07b774543d..cac2ca8c20 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -17,6 +17,7 @@ namespace CSVRender
             QAction *mSelectAll;
             QAction *mDeselectAll;
             QAction *mDeleteSelection;
+            QAction *mSelectSame;
 
             /// Add context menu items to \a menu.
             ///
@@ -37,6 +38,8 @@ namespace CSVRender
             void clearSelection();
 
             void deleteSelection();
+
+            void selectSame();
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index ef5c4e868a..d71446d0b3 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -518,6 +518,15 @@ void CSVRender::PagedWorldspaceWidget::selectAll (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::selectAllWithSameParentId (int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->selectAllWithSameParentId (elementMask);
+
+    flagAsModified();
+}
+
 std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     const int cellSize = 8192;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index bd4233a644..419a2a46a2 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -101,6 +101,12 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
+            // Select everything that references the same ID as at least one of the elements
+            // already selected
+            //
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAllWithSameParentId (int elementMask);
+
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index a026a24732..8d65c36948 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -114,6 +114,12 @@ void CSVRender::UnpagedWorldspaceWidget::selectAll (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::selectAllWithSameParentId (int elementMask)
+{
+    mCell->selectAllWithSameParentId (elementMask);
+    flagAsModified();
+}
+
 std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& point) const
 {
     return mCellId;
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 3aea8dee4a..a4c517948d 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -49,6 +49,12 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
+            // Select everything that references the same ID as at least one of the elements
+            // already selected
+            //
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAllWithSameParentId (int elementMask);
+
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index cd031fcba4..ac6426b42e 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -130,6 +130,12 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask) = 0;
 
+            // Select everything that references the same ID as at least one of the elements
+            // already selected
+            //
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void selectAllWithSameParentId (int elementMask) = 0;
+
             /// Return the next intersection point with scene elements matched by
             /// \a interactionMask based on \a localPos and the camera vector.
             /// If there is no such point, instead a point "in front" of \a localPos will be

From 4caf44f06156e91920d4e931a617ea8c93693245 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Tue, 26 Jan 2016 07:48:55 -0500
Subject: [PATCH 140/765] Remove unused code in apps/opencs/view/world/table
 files

---
 apps/opencs/view/world/table.cpp | 7 -------
 apps/opencs/view/world/table.hpp | 2 --
 2 files changed, 9 deletions(-)

diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 26746e8c91..45e50dba7b 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -2,7 +2,6 @@
 
 #include <QHeaderView>
 #include <QAction>
-#include <QApplication>
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QString>
@@ -12,7 +11,6 @@
 
 #include "../../model/doc/document.hpp"
 
-#include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/infotableproxymodel.hpp"
 #include "../../model/world/idtableproxymodel.hpp"
@@ -20,13 +18,10 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/record.hpp"
 #include "../../model/world/columns.hpp"
-#include "../../model/world/tablemimedata.hpp"
-#include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/commanddispatcher.hpp"
 
 #include "../../model/prefs/state.hpp"
 
-#include "recordstatusdelegate.hpp"
 #include "tableeditidaction.hpp"
 #include "util.hpp"
 
@@ -339,8 +334,6 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     connect (mProxyModel, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
         this, SLOT (tableSizeUpdate()));
 
-    //connect (mProxyModel, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
-    //    this, SLOT (rowsInsertedEvent(const QModelIndex&, int, int)));
     connect (mProxyModel, SIGNAL (rowAdded (const std::string &)),
         this, SLOT (rowAdded (const std::string &)));
 
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index 53249f66fe..768ff185d5 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -11,7 +11,6 @@
 #include "../../model/world/universalid.hpp"
 #include "dragrecordtable.hpp"
 
-class QUndoStack;
 class QAction;
 
 namespace CSMDoc
@@ -21,7 +20,6 @@ namespace CSMDoc
 
 namespace CSMWorld
 {
-    class Data;
     class IdTableProxyModel;
     class IdTableBase;
     class CommandDispatcher;

From d43315fe4e4869fc026587a1cd468a4bf485dfde Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Thu, 28 Jan 2016 06:28:31 -0500
Subject: [PATCH 141/765] Add script editor line wrapping (Feature #2926)

Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
---
 apps/opencs/model/prefs/state.cpp     |  2 ++
 apps/opencs/view/world/scriptedit.cpp | 51 +++++++++++++++++++--------
 apps/opencs/view/world/scriptedit.hpp | 10 +++++-
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 859fabd117..fd777b1331 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -133,6 +133,8 @@ void CSMPrefs::State::declare()
     declareBool ("show-linenum", "Show Line Numbers", true).
         setTooltip ("Show line numbers to the left of the script editor window."
         "The current row and column numbers of the text cursor are shown at the bottom.");
+    declareBool ("wrap-lines", "Wrap Lines", false).
+        setTooltip ("Wrap lines longer than width of script editor.");
     declareBool ("mono-font", "Use monospace font", true);
     EnumValue warningsNormal ("Normal", "Report warnings as warning");
     declareEnum ("warnings", "Warning Mode", warningsNormal).
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 9f1abcf970..d0146445ac 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -38,20 +38,20 @@ bool CSVWorld::ScriptEdit::event (QEvent *event)
     return QPlainTextEdit::event (event);
 }
 
-CSVWorld::ScriptEdit::ScriptEdit (const CSMDoc::Document& document, ScriptHighlighter::Mode mode,
-    QWidget* parent)
-    : QPlainTextEdit (parent),
-    mChangeLocked (0),
+CSVWorld::ScriptEdit::ScriptEdit(
+    const CSMDoc::Document& document,
+    ScriptHighlighter::Mode mode,
+    QWidget* parent
+) : QPlainTextEdit(parent),
+    mChangeLocked(0),
     mShowLineNum(false),
     mLineNumberArea(0),
     mDefaultFont(font()),
     mMonoFont(QFont("Monospace")),
-    mDocument (document),
+    mDocument(document),
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
-
 {
-//    setAcceptRichText (false);
-    setLineWrapMode (QPlainTextEdit::NoWrap);
+    wrapLines(false);
     setTabStopWidth (4);
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
@@ -194,14 +194,37 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
-void CSVWorld::ScriptEdit::settingChanged (const CSMPrefs::Setting *setting)
+void CSVWorld::ScriptEdit::wrapLines(bool wrap)
 {
-    if (mHighlighter->settingChanged (setting))
+    if (wrap)
+    {
+        setLineWrapMode(QPlainTextEdit::WidgetWidth);
+    }
+    else
+    {
+        setLineWrapMode(QPlainTextEdit::NoWrap);
+    }
+}
+
+void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
+{
+    // Determine which setting was changed.
+    if (mHighlighter->settingChanged(setting))
+    {
         updateHighlighting();
-    else if (*setting=="Scripts/mono-font")
-        setFont (setting->isTrue() ? mMonoFont : mDefaultFont);
-    else if (*setting=="Scripts/show-linenum")
-        showLineNum (setting->isTrue());
+    }
+    else if (*setting == "Scripts/mono-font")
+    {
+        setFont(setting->isTrue() ? mMonoFont : mDefaultFont);
+    }
+    else if (*setting == "Scripts/show-linenum")
+    {
+        showLineNum(setting->isTrue());
+    }
+    else if (*setting == "Scripts/wrap-lines")
+    {
+        wrapLines(setting->isTrue());
+    }
 }
 
 void CSVWorld::ScriptEdit::idListChanged()
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 941a6295d8..1f03f050a2 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -22,6 +22,7 @@ namespace CSVWorld
 {
     class LineNumberArea;
 
+    /// \brief Editor for scripts.
     class ScriptEdit : public QPlainTextEdit
     {
             Q_OBJECT
@@ -77,6 +78,7 @@ namespace CSVWorld
             virtual void resizeEvent(QResizeEvent *e);
 
         private:
+
             QVector<CSMWorld::UniversalId::Type> mAllowedTypes;
             const CSMDoc::Document& mDocument;
             const QRegExp mWhiteListQoutes;
@@ -89,9 +91,15 @@ namespace CSVWorld
 
             bool stringNeedsQuote(const std::string& id) const;
 
+            /// \brief Turn line wrapping in script editor on or off.
+            /// \param wrap Whether or not to wrap lines.
+            void wrapLines(bool wrap);
+
         private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
+            /// \brief Update editor when related setting is changed.
+            /// \param setting Setting that was changed.
+            void settingChanged(const CSMPrefs::Setting *setting);
 
             void idListChanged();
 

From 776c715ccd419f1e77a8445e2ddd31692efcc942 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Fri, 29 Jan 2016 17:00:18 +0100
Subject: [PATCH 142/765] Move NoTraverseCallback to mwrender/util.hpp

---
 apps/openmw/mwrender/renderingmanager.cpp | 10 +---------
 apps/openmw/mwrender/util.hpp             | 11 ++++++++++-
 apps/openmw/mwrender/water.cpp            | 11 +----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 61ce626fde..c8d0925b0b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -42,6 +42,7 @@
 #include "camera.hpp"
 #include "water.hpp"
 #include "terrainstorage.hpp"
+#include "util.hpp"
 
 namespace MWRender
 {
@@ -504,15 +505,6 @@ namespace MWRender
         mutable bool mDone;
     };
 
-
-    class NoTraverseCallback : public osg::NodeCallback
-    {
-    public:
-        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-        {
-        }
-    };
-
     void RenderingManager::screenshot(osg::Image *image, int w, int h)
     {
         osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
diff --git a/apps/openmw/mwrender/util.hpp b/apps/openmw/mwrender/util.hpp
index d078f0d982..815e345962 100644
--- a/apps/openmw/mwrender/util.hpp
+++ b/apps/openmw/mwrender/util.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_MWRENDER_UTIL_H
 #define OPENMW_MWRENDER_UTIL_H
 
+#include <osg/NodeCallback>
 #include <osg/ref_ptr>
 #include <string>
 
@@ -16,9 +17,17 @@ namespace Resource
 
 namespace MWRender
 {
-
     void overrideTexture(const std::string& texture, Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Node> node);
 
+    // Node callback to entirely skip the traversal.
+    class NoTraverseCallback : public osg::NodeCallback
+    {
+    public:
+        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            // no traverse()
+        }
+    };
 }
 
 #endif
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 1b19246f5b..b2bef71220 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -41,6 +41,7 @@
 #include "vismask.hpp"
 #include "ripplesimulation.hpp"
 #include "renderbin.hpp"
+#include "util.hpp"
 
 namespace
 {
@@ -210,16 +211,6 @@ private:
     osg::Plane mPlane;
 };
 
-// Node callback to entirely skip the traversal.
-class NoTraverseCallback : public osg::NodeCallback
-{
-public:
-    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-    {
-        // no traverse()
-    }
-};
-
 /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
 /// The offset works around graphics artifacts that occured with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
 /// Must be added as a Cull callback.

From 2fed863941ca4e21ade52413d79869bc2e07ad12 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 30 Jan 2016 21:17:56 +0100
Subject: [PATCH 143/765] Use the travis-ci status badge directly instead of
 the shields.io version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b55a89945e..6095fc3784 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OpenMW
 ======
 
-[![Build Status](https://img.shields.io/travis/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/ace13/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
+[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](hgttps://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/ace13/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
 
 OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 

From ad748700d5a814cbbe576091897d5b028181a751 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 30 Jan 2016 23:14:17 +0100
Subject: [PATCH 144/765] Update badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6095fc3784..9de814fd01 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 OpenMW
 ======
 
-[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](hgttps://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/ace13/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
+[![Build Status](https://api.travis-ci.org/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/scrawl/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
 
 OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 

From d28e7db65cce9b437f2594a0295a5e7fb3122aaa Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 31 Jan 2016 08:45:05 -0500
Subject: [PATCH 145/765] Fix tooltip spelling errors in WorldspaceWidget

---
 apps/opencs/view/render/worldspacewidget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index af90af50cc..6ba6e95432 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -125,16 +125,16 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
         "First Person"
         "<ul><li>Mouse-Look while holding the left button</li>"
         "<li>WASD movement keys</li>"
-        "<li>Mouse wheel moves the camera forawrd/backward</li>"
-        "<li>Stafing (also vertically) by holding the left mouse button and control</li>"
+        "<li>Mouse wheel moves the camera forward/backward</li>"
+        "<li>Strafing (also vertically) by holding the left mouse button and control</li>"
         "<li>Camera is held upright</li>"
         "<li>Hold shift to speed up movement</li>"
         "</ul>");
     tool->addButton (":scenetoolbar/free-camera", "free",
         "Free Camera"
         "<ul><li>Mouse-Look while holding the left button</li>"
-        "<li>Stafing (also vertically) via WASD or by holding the left mouse button and control</li>"
-        "<li>Mouse wheel moves the camera forawrd/backward</li>"
+        "<li>Strafing (also vertically) via WASD or by holding the left mouse button and control</li>"
+        "<li>Mouse wheel moves the camera forward/backward</li>"
         "<li>Roll camera with Q and E keys</li>"
         "<li>Hold shift to speed up movement</li>"
         "</ul>");
@@ -144,7 +144,7 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
         "<li>Rotate around the centre point via WASD or by moving the mouse while holding the left button</li>"
         "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
         "<li>Roll camera with Q and E keys</li>"
-        "<li>Stafing (also vertically) by holding the left mouse button and control (includes relocation of the centre point)</li>"
+        "<li>Strafing (also vertically) by holding the left mouse button and control (includes relocation of the centre point)</li>"
         "<li>Hold shift to speed up movement</li>"
         "</ul>");
 

From d12f24c32166c891f403accce717f9190dee8134 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 26 Jan 2016 19:41:05 +0100
Subject: [PATCH 146/765] Fix typo

---
 apps/opencs/model/prefs/state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index fd777b1331..772047961c 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -140,7 +140,7 @@ void CSMPrefs::State::declare()
     declareEnum ("warnings", "Warning Mode", warningsNormal).
         addValue ("Ignore", "Do not report warning").
         addValue (warningsNormal).
-        addValue ("Strcit", "Promote warning to an error");
+        addValue ("Strict", "Promote warning to an error");
     declareBool ("toolbar", "Show toolbar", true);
     declareInt ("compile-delay", "Delay between updating of source errors", 100).
         setTooltip ("Delay in milliseconds").

From 6b48acaf0e29232150c9beaf3faaf4fe97c44672 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 21:01:17 +0100
Subject: [PATCH 147/765] Don't optimize TriShapes with controllers (Fixes
 #3143)

---
 components/nifosg/nifloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 5c28bbc7e6..f4dae52c30 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -394,7 +394,10 @@ namespace NifOsg
             if (node->getDataVariance() == osg::Object::STATIC
                     // For TriShapes, we can only collapse the node, but not completely remove it,
                     // if the link to animated collision shapes is supposed to stay intact.
-                    && (nifNode->recType != Nif::RC_NiTriShape || !skipMeshes))
+                    && (nifNode->recType != Nif::RC_NiTriShape || !skipMeshes)
+                    // Don't optimize drawables with controllers, that creates issues when we want to deep copy controllers without deep copying the drawable that holds the controller.
+                    // A deep copy of controllers may be needed to independently animate multiple copies of the same mesh.
+                    && !node->getUpdateCallback())
             {
                 if (node->getNumParents() && nifNode->trafo.isIdentity())
                 {

From 8360cccce7c2b95144b3eec9a607a253db7af63d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 21:02:48 +0100
Subject: [PATCH 148/765] Don't clone Drawable UpdateCallbacks twice

The Drawable copy constructor takes care of that already.
---
 components/sceneutil/clone.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index a372b1ebd8..26f3f5c7cd 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -81,8 +81,6 @@ namespace SceneUtil
 #endif
 
             osg::Drawable* cloned = osg::clone(drawable, copyop);
-            if (cloned->getUpdateCallback())
-                cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));
             return cloned;
         }
         if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable))

From c403a6b113a371bc469656486d5ea113bafb60aa Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 22:30:08 +0100
Subject: [PATCH 149/765] Don't apply constant magic effects to dead actors
 (Fixes #3174)

---
 apps/openmw/mwworld/inventorystore.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 2c994f1467..318b7c5ec9 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -345,6 +345,9 @@ void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
 
     mMagicEffects = MWMechanics::MagicEffects();
 
+    if (actor.getClass().getCreatureStats(actor).isDead())
+        return;
+
     for (TSlots::const_iterator iter (mSlots.begin()); iter!=mSlots.end(); ++iter)
     {
         if (*iter==end())

From c34314ae2671e90ded053a060f6dccc6e1aed283 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 22:52:28 +0100
Subject: [PATCH 150/765] When an actor dies purge all spell effects cast by
 that actor (Fixes #3175)

---
 apps/openmw/mwmechanics/activespells.cpp | 4 +---
 apps/openmw/mwmechanics/actors.cpp       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 6a247622c5..c98f7d8293 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -274,9 +274,7 @@ namespace MWMechanics
             for (std::vector<ActiveEffect>::iterator effectIt = it->second.mEffects.begin();
                  effectIt != it->second.mEffects.end();)
             {
-                const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectId);
-                if (effect->mData.mFlags & ESM::MagicEffect::CasterLinked
-                        && it->second.mCasterActorId == casterActorId)
+                if (it->second.mCasterActorId == casterActorId)
                     effectIt = it->second.mEffects.erase(effectIt);
                 else
                     ++effectIt;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 4046010d79..5d75cea35b 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1209,7 +1209,7 @@ namespace MWMechanics
 
                 ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
 
-                // Make sure spell effects with CasterLinked flag are removed
+                // Make sure spell effects are removed
                 for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
                 {
                     MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();

From 832eaae27b6933d256b4bb61a3224d4dc4bc0052 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 22:57:08 +0100
Subject: [PATCH 151/765] Do not apply effects with CasterLinked flag when
 there is no valid caster

---
 apps/openmw/mwmechanics/spellcasting.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 6073076e00..4c51388356 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -378,6 +378,11 @@ namespace MWMechanics
             if (!checkEffectTarget(effectIt->mEffectID, target, castByPlayer))
                 continue;
 
+            // caster needs to be an actor for linked effects (e.g. Absorb)
+            if (magicEffect->mData.mFlags & ESM::MagicEffect::CasterLinked
+                    && (caster.isEmpty() || !caster.getClass().isActor()))
+                continue;
+
             // If player is healing someone, show the target's HP bar
             if (castByPlayer && target != caster
                     && effectIt->mEffectID == ESM::MagicEffect::RestoreHealth

From dda4273349cb79ceafedd8a18678478aafc49f19 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 1 Feb 2016 23:13:43 +0100
Subject: [PATCH 152/765] Actors that start the game as dead do not float to
 the surface (Fixes #3177)

This has a minor bug (can you spot it?) that affects the vanilla engine as well, unfortunately not so simple to fix.
---
 apps/openmw/mwmechanics/character.cpp   | 7 ++++++-
 apps/openmw/mwmechanics/character.hpp   | 1 +
 apps/openmw/mwphysics/physicssystem.cpp | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index db1b82ba6e..67707d0287 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -668,6 +668,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mHasMovedInXY(false)
     , mMovementAnimationControlled(true)
     , mDeathState(CharState_None)
+    , mFloatToSurface(true)
     , mHitState(CharState_None)
     , mUpperBodyState(UpperCharState_Nothing)
     , mJumpState(JumpState_None)
@@ -716,6 +717,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
             // Set the death state, but don't play it yet
             // We will play it in the first frame, but only if no script set the skipAnim flag
             mDeathState = static_cast<CharacterState>(CharState_Death1 + mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation());
+            mFloatToSurface = false;
         }
     }
     else
@@ -1864,7 +1866,7 @@ void CharacterController::update(float duration)
         {
             playDeath(1.f, mDeathState);
         }
-
+        // We must always queue movement, even if there is none, to apply gravity.
         world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
     }
 
@@ -1897,6 +1899,9 @@ void CharacterController::update(float duration)
     if (mSkipAnim)
         mAnimation->updateEffects(duration);
 
+    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead())
+        moved.z() = 1.0;
+
     // Update movement
     if(mMovementAnimationControlled && mPtr.getClass().isActor())
         world->queueMovement(mPtr, moved);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 5e43bc2b73..6db661ca54 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -160,6 +160,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     CharacterState mDeathState;
     std::string mCurrentDeath;
+    bool mFloatToSurface;
 
     CharacterState mHitState;
     std::string mCurrentHit;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 57bf7919a8..c99456ae52 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -289,8 +289,8 @@ namespace MWPhysics
                 }
             }
 
-            // dead actors underwater will float to the surface
-            if (ptr.getClass().getCreatureStats(ptr).isDead() && position.z() < swimlevel)
+            // dead actors underwater will float to the surface, if the CharacterController tells us to do so
+            if (movement.z() > 0 && ptr.getClass().getCreatureStats(ptr).isDead() && position.z() < swimlevel)
                 velocity = osg::Vec3f(0,0,1) * 25;
 
             ptr.getClass().getMovementSettings(ptr).mPosition[2] = 0;

From 50ed061154322bf5d5b00b71c13930848d315b4b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 2 Feb 2016 00:39:37 +0100
Subject: [PATCH 153/765] AiWander: reset mAllowedNodes on cell change (Fixes
 #3176, Fixes #3130)

---
 apps/openmw/mwmechanics/aiwander.cpp | 2 ++
 apps/openmw/mwmechanics/aiwander.hpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index a3fdc69ccc..8231e572e8 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -730,6 +730,8 @@ namespace MWMechanics
         const ESM::Pathgrid *
             pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
 
+        mAllowedNodes.clear();
+
         // If there is no path this actor doesn't go anywhere. See:
         // https://forum.openmw.org/viewtopic.php?t=1556
         // http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index b0fabfce3b..683c04bb0d 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -120,16 +120,20 @@ namespace MWMechanics
             MWWorld::TimeStamp mStartTime;
 
             // allowed pathgrid nodes based on mDistance from the spawn point
+            // in local coordinates of mCell
+            // FIXME: move to AiWanderStorage
             std::vector<ESM::Pathgrid::Point> mAllowedNodes;
 
             void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell);
 
+            // FIXME: move to AiWanderStorage
             ESM::Pathgrid::Point mCurrentNode;
             bool mTrimCurrentNode;
             void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
                                   const PathFinder& pathfinder);
 
 
+            // FIXME: move to AiWanderStorage
 //             ObstacleCheck mObstacleCheck;
             float mDoorCheckDuration;
             int mStuckCount;

From 59d2de118f8f9f1bc6493ab3eab10c0d35d26448 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 2 Feb 2016 00:50:21 +0100
Subject: [PATCH 154/765] Avoid directly iterating the actor map (Fixes #3173)

---
 apps/openmw/mwmechanics/actors.cpp | 37 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 5d75cea35b..f9c70e7ae6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -982,8 +982,11 @@ namespace MWMechanics
 
             /// \todo move update logic to Actor class where appropriate
 
+            // make a copy of the map to avoid invalidated iterators when an actor moves during the update
+            PtrActorMap actors = mActors;
+
              // AI and magic effects update
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
             {
                 bool inProcessingRange = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
                         <= sqrProcessingDistance;
@@ -996,6 +999,11 @@ namespace MWMechanics
                 if (!iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
                     updateActor(iter->first, duration);
+                    if (MWBase::Environment::get().getWorld()->hasCellChanged())
+                    {
+                        return; // for now abort update of the old cell when cell changes by teleportation magic effect
+                                // a better solution might be to apply cell changes at the end of the frame
+                    }
                     if (MWBase::Environment::get().getMechanicsManager()->isAIActive() && inProcessingRange)
                     {
                         if (timerUpdateAITargets == 0)
@@ -1003,7 +1011,7 @@ namespace MWMechanics
                             if (iter->first != player)
                                 adjustCommandedActor(iter->first);
 
-                            for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
+                            for(PtrActorMap::iterator it(actors.begin()); it != actors.end(); ++it)
                             {
                                 if (it->first == iter->first || iter->first == player) // player is not AI-controlled
                                     continue;
@@ -1015,7 +1023,7 @@ namespace MWMechanics
                             float sqrHeadTrackDistance = std::numeric_limits<float>::max();
                             MWWorld::Ptr headTrackTarget;
 
-                            for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
+                            for(PtrActorMap::iterator it(actors.begin()); it != actors.end(); ++it)
                             {
                                 if (it->first == iter->first)
                                     continue;
@@ -1050,12 +1058,12 @@ namespace MWMechanics
             // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
             // so updating VFX immediately after that would just remove the particle effects instantly.
             // There needs to be a magic effect update in between.
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
                 iter->second->getCharacterController()->updateContinuousVfx();
 
             // Animation/movement update
             CharacterController* playerCharacter = NULL;
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
             {
                 if (iter->first != player &&
                         (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
@@ -1065,20 +1073,10 @@ namespace MWMechanics
                 if (iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
                     iter->second->getCharacterController()->skipAnim();
 
-                // Handle player last, in case a cell transition occurs by casting a teleportation spell
-                // (would invalidate the iterator)
-                if (iter->first == getPlayer())
-                {
-                    playerCharacter = iter->second->getCharacterController();
-                    continue;
-                }
                 iter->second->getCharacterController()->update(duration);
             }
 
-            if (playerCharacter)
-                playerCharacter->update(duration);
-
-            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
             {
                 const MWWorld::Class &cls = iter->first.getClass();
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
@@ -1136,7 +1134,7 @@ namespace MWMechanics
 
                     bool detected = false;
 
-                    for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+                    for (PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
                     {
                         if (iter->first == player)  // not the player
                             continue;
@@ -1179,7 +1177,8 @@ namespace MWMechanics
 
     void Actors::killDeadActors()
     {
-        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        PtrActorMap actors = mActors;
+        for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
         {
             const MWWorld::Class &cls = iter->first.getClass();
             CreatureStats &stats = cls.getCreatureStats(iter->first);
@@ -1210,7 +1209,7 @@ namespace MWMechanics
                 ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
 
                 // Make sure spell effects are removed
-                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
+                for (PtrActorMap::iterator iter2(actors.begin());iter2 != actors.end();++iter2)
                 {
                     MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
                     spells.purge(stats.getActorId());

From 145756c0a1a39d378f09a981c7b05d3dc0a07368 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 2 Feb 2016 15:55:19 +0100
Subject: [PATCH 155/765] Partly revert "Avoid directly iterating the actor map
 (Fixes #3173)"

Caused issues when a summoned creature is removed as part of the magic effect update.

Fixes #3178
---
 apps/openmw/mwmechanics/actors.cpp | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f9c70e7ae6..70aab95dfe 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -982,11 +982,8 @@ namespace MWMechanics
 
             /// \todo move update logic to Actor class where appropriate
 
-            // make a copy of the map to avoid invalidated iterators when an actor moves during the update
-            PtrActorMap actors = mActors;
-
              // AI and magic effects update
-            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
                 bool inProcessingRange = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
                         <= sqrProcessingDistance;
@@ -1011,7 +1008,7 @@ namespace MWMechanics
                             if (iter->first != player)
                                 adjustCommandedActor(iter->first);
 
-                            for(PtrActorMap::iterator it(actors.begin()); it != actors.end(); ++it)
+                            for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
                             {
                                 if (it->first == iter->first || iter->first == player) // player is not AI-controlled
                                     continue;
@@ -1023,7 +1020,7 @@ namespace MWMechanics
                             float sqrHeadTrackDistance = std::numeric_limits<float>::max();
                             MWWorld::Ptr headTrackTarget;
 
-                            for(PtrActorMap::iterator it(actors.begin()); it != actors.end(); ++it)
+                            for(PtrActorMap::iterator it(mActors.begin()); it != mActors.end(); ++it)
                             {
                                 if (it->first == iter->first)
                                     continue;
@@ -1058,12 +1055,12 @@ namespace MWMechanics
             // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
             // so updating VFX immediately after that would just remove the particle effects instantly.
             // There needs to be a magic effect update in between.
-            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
                 iter->second->getCharacterController()->updateContinuousVfx();
 
             // Animation/movement update
             CharacterController* playerCharacter = NULL;
-            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
                 if (iter->first != player &&
                         (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
@@ -1073,10 +1070,20 @@ namespace MWMechanics
                 if (iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
                     iter->second->getCharacterController()->skipAnim();
 
+                // Handle player last, in case a cell transition occurs by casting a teleportation spell
+                // (would invalidate the iterator)
+                if (iter->first == getPlayer())
+                {
+                    playerCharacter = iter->second->getCharacterController();
+                    continue;
+                }
                 iter->second->getCharacterController()->update(duration);
             }
 
-            for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+            if (playerCharacter)
+                playerCharacter->update(duration);
+
+            for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
                 const MWWorld::Class &cls = iter->first.getClass();
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
@@ -1134,7 +1141,7 @@ namespace MWMechanics
 
                     bool detected = false;
 
-                    for (PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+                    for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
                     {
                         if (iter->first == player)  // not the player
                             continue;
@@ -1177,8 +1184,7 @@ namespace MWMechanics
 
     void Actors::killDeadActors()
     {
-        PtrActorMap actors = mActors;
-        for(PtrActorMap::iterator iter(actors.begin()); iter != actors.end(); ++iter)
+        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
         {
             const MWWorld::Class &cls = iter->first.getClass();
             CreatureStats &stats = cls.getCreatureStats(iter->first);
@@ -1209,7 +1215,7 @@ namespace MWMechanics
                 ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
 
                 // Make sure spell effects are removed
-                for (PtrActorMap::iterator iter2(actors.begin());iter2 != actors.end();++iter2)
+                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
                 {
                     MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
                     spells.purge(stats.getActorId());

From 7aeafd3bb9403104134c0a22b32925fafd9ec976 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 19 Jan 2016 14:51:37 +0100
Subject: [PATCH 156/765] Revert "Apply the AiTravel maxRange to AiEscort as
 well (Fixes #2697)"

This reverts commit 1f543b4d79744886aa9a03ad7fcff6d97dc5f70c.
---
 apps/openmw/mwmechanics/aiescort.cpp  |  3 ---
 apps/openmw/mwmechanics/aipackage.hpp |  9 ---------
 apps/openmw/mwmechanics/aitravel.cpp  | 12 ++++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index baf4f1be77..fffab8d77d 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -75,9 +75,6 @@ namespace MWMechanics
                 return true;
         }
 
-        if (!isWithinMaxRange(osg::Vec3f(mX, mY, mZ), actor.getRefData().getPosition().asVec3()))
-            return false;
-
         if (!mCellId.empty() && mCellId != actor.getCell()->getCell()->getCellId().mWorldspace)
             return false; // Not in the correct cell, pause and rely on the player to go back through a teleport door
 
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 76f89dff4e..07df933e27 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -97,19 +97,10 @@ namespace MWMechanics
 
             ESM::Pathgrid::Point mPrevDest;
 
-            bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2) const
-            {
-                // Maximum travel distance for vanilla compatibility.
-                // Was likely meant to prevent NPCs walking into non-loaded exterior cells, but for some reason is used in interior cells as well.
-                // We can make this configurable at some point, but the default *must* be the below value. Anything else will break shoddily-written content (*cough* MW *cough*) in bizarre ways.
-                return (pos1 - pos2).length2() <= 7168*7168;
-            }
-
         private:
             bool isNearInactiveCell(const ESM::Position& actorPos);
 
     };
-
 }
 
 #endif
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index c29861f4ee..1585a3007f 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -13,6 +13,18 @@
 #include "movement.hpp"
 #include "creaturestats.hpp"
 
+namespace
+{
+
+bool isWithinMaxRange(const osg::Vec3f& pos1, const osg::Vec3f& pos2)
+{
+    // Maximum travel distance for vanilla compatibility.
+    // Was likely meant to prevent NPCs walking into non-loaded exterior cells, but for some reason is used in interior cells as well.
+    // We can make this configurable at some point, but the default *must* be the below value. Anything else will break shoddily-written content (*cough* MW *cough*) in bizarre ways.
+    return (pos1 - pos2).length2() <= 7168*7168;
+}
+
+}
 
 namespace MWMechanics
 {

From d3b76b70063da765b107a766142a681bd7ad5f73 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 19 Jan 2016 14:51:42 +0100
Subject: [PATCH 157/765] Don't stack Ai packages (Fixes #3101, Fixes #3080,
 Fixes #2697)

---
 apps/openmw/mwmechanics/aiavoiddoor.hpp |   3 +
 apps/openmw/mwmechanics/aicombat.hpp    |   3 +
 apps/openmw/mwmechanics/aipackage.cpp   |  10 ++
 apps/openmw/mwmechanics/aipackage.hpp   |   8 ++
 apps/openmw/mwmechanics/aipursue.hpp    |   3 +
 apps/openmw/mwmechanics/aisequence.cpp  | 137 +++++++++++++-----------
 6 files changed, 101 insertions(+), 63 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 9d63c63e08..41c41b1f57 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -26,6 +26,9 @@ namespace MWMechanics
 
             virtual unsigned int getPriority() const;
 
+            virtual bool canCancel() const { return false; }
+            virtual bool shouldCancelPreviousAi() const { return false; }
+
         private:
             float mDuration;
             MWWorld::ConstPtr mDoorPtr;
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 93d6305291..2b364001ff 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -53,6 +53,9 @@ namespace MWMechanics
 
             virtual void writeState(ESM::AiSequence::AiSequence &sequence) const;
 
+            virtual bool canCancel() const { return false; }
+            virtual bool shouldCancelPreviousAi() const { return false; }
+
         protected:
             virtual bool doesPathNeedRecalc(ESM::Pathgrid::Point dest, const ESM::Cell *cell);
 
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index cb2b002f6c..58ba7dfe8e 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -35,6 +35,16 @@ bool MWMechanics::AiPackage::followTargetThroughDoors() const
     return false;
 }
 
+bool MWMechanics::AiPackage::canCancel() const
+{
+    return true;
+}
+
+bool MWMechanics::AiPackage::shouldCancelPreviousAi() const
+{
+    return true;
+}
+
 MWMechanics::AiPackage::AiPackage() : mTimer(0.26f) { //mTimer starts at .26 to force initial pathbuild
 
 }
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 07df933e27..72bb4487ce 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -39,6 +39,8 @@ namespace MWMechanics
                 TypeIdEscort = 2,
                 TypeIdFollow = 3,
                 TypeIdActivate = 4,
+
+                // These 3 are not really handled as Ai Packages in the MW engine
                 TypeIdCombat = 5,
                 TypeIdPursue = 6,
                 TypeIdAvoidDoor = 7
@@ -78,6 +80,12 @@ namespace MWMechanics
             /// Return true if the actor should follow the target through teleport doors (default false)
             virtual bool followTargetThroughDoors() const;
 
+            /// Can this Ai package be canceled? (default true)
+            virtual bool canCancel() const;
+
+            /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
+            virtual bool shouldCancelPreviousAi() const;
+
             bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
 
         protected:
diff --git a/apps/openmw/mwmechanics/aipursue.hpp b/apps/openmw/mwmechanics/aipursue.hpp
index 813b87cff0..cb93e9636a 100644
--- a/apps/openmw/mwmechanics/aipursue.hpp
+++ b/apps/openmw/mwmechanics/aipursue.hpp
@@ -38,6 +38,9 @@ namespace MWMechanics
 
             virtual void writeState (ESM::AiSequence::AiSequence& sequence) const;
 
+            virtual bool canCancel() const { return false; }
+            virtual bool shouldCancelPreviousAi() const { return false; }
+
         private:
 
             int mTargetActorId; // The actor to pursue
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index d55dc240e0..04ac96b11b 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -153,83 +153,86 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
 {
     if(actor != getPlayer())
     {
-        if (!mPackages.empty())
+        if (mPackages.empty())
         {
-            MWMechanics::AiPackage* package = mPackages.front();
-            mLastAiPackage = package->getTypeId();
+            mLastAiPackage = -1;
+            return;
+        }
 
-            // if active package is combat one, choose nearest target
-            if (mLastAiPackage == AiPackage::TypeIdCombat)
+        MWMechanics::AiPackage* package = mPackages.front();
+        mLastAiPackage = package->getTypeId();
+
+        // if active package is combat one, choose nearest target
+        if (mLastAiPackage == AiPackage::TypeIdCombat)
+        {
+            std::list<AiPackage *>::iterator itActualCombat;
+
+            float nearestDist = std::numeric_limits<float>::max();
+            osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
+
+            for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
             {
-                std::list<AiPackage *>::iterator itActualCombat;
+                if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break;
 
-                float nearestDist = std::numeric_limits<float>::max();
-                osg::Vec3f vActorPos = actor.getRefData().getPosition().asVec3();
+                MWWorld::Ptr target = static_cast<const AiCombat *>(*it)->getTarget();
 
-                for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
+                // target disappeared (e.g. summoned creatures)
+                if (target.isEmpty())
                 {
-                    if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break;
-
-                    MWWorld::Ptr target = static_cast<const AiCombat *>(*it)->getTarget();
-
-                    // target disappeared (e.g. summoned creatures)
-                    if (target.isEmpty())
-                    {
-                        delete *it;
-                        it = mPackages.erase(it);
-                    }
-                    else
-                    {
-                        const ESM::Position &targetPos = target.getRefData().getPosition();
-
-                        float distTo = (targetPos.asVec3() - vActorPos).length();
-
-                        // Small threshold for changing target
-                        if (it == mPackages.begin())
-                            distTo = std::max(0.f, distTo - 50.f);
-
-                        if (distTo < nearestDist)
-                        {
-                            nearestDist = distTo;
-                            itActualCombat = it;
-                        }
-                        ++it;
-                    }
+                    delete *it;
+                    it = mPackages.erase(it);
                 }
-
-                if (!mPackages.empty())
+                else
                 {
-                    if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
+                    const ESM::Position &targetPos = target.getRefData().getPosition();
+
+                    float distTo = (targetPos.asVec3() - vActorPos).length();
+
+                    // Small threshold for changing target
+                    if (it == mPackages.begin())
+                        distTo = std::max(0.f, distTo - 50.f);
+
+                    if (distTo < nearestDist)
                     {
-                        // move combat package with nearest target to the front
-                        mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
+                        nearestDist = distTo;
+                        itActualCombat = it;
                     }
-
-                    package = mPackages.front();
-                    mLastAiPackage = package->getTypeId();
-                }
-                else 
-                {
-                    mDone = true;
-                    return;
+                    ++it;
                 }
             }
 
-            if (package->execute (actor,characterController,state,duration))
+            if (!mPackages.empty())
             {
-                // To account for the rare case where AiPackage::execute() queued another AI package
-                // (e.g. AiPursue executing a dialogue script that uses startCombat)
-                std::list<MWMechanics::AiPackage*>::iterator toRemove =
-                        std::find(mPackages.begin(), mPackages.end(), package);
-                mPackages.erase(toRemove);
-                delete package;
-                mDone = true;
+                if (nearestDist < std::numeric_limits<float>::max() && mPackages.begin() != itActualCombat)
+                {
+                    // move combat package with nearest target to the front
+                    mPackages.splice(mPackages.begin(), mPackages, itActualCombat);
+                }
+
+                package = mPackages.front();
+                mLastAiPackage = package->getTypeId();
             }
             else
             {
-                mDone = false;
+                mDone = true;
+                return;
             }
         }
+
+        if (package->execute (actor,characterController,state,duration))
+        {
+            // To account for the rare case where AiPackage::execute() queued another AI package
+            // (e.g. AiPursue executing a dialogue script that uses startCombat)
+            std::list<MWMechanics::AiPackage*>::iterator toRemove =
+                    std::find(mPackages.begin(), mPackages.end(), package);
+            mPackages.erase(toRemove);
+            delete package;
+            mDone = true;
+        }
+        else
+        {
+            mDone = false;
+        }
     }
 }
 
@@ -251,11 +254,6 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         // Notify AiWander of our current position so we can return to it after combat finished
         for (std::list<AiPackage *>::const_iterator iter (mPackages.begin()); iter!=mPackages.end(); ++iter)
         {
-            if((*iter)->getTypeId() == AiPackage::TypeIdPursue && package.getTypeId() == AiPackage::TypeIdPursue
-                && static_cast<const AiPursue*>(*iter)->getTarget() == static_cast<const AiPursue*>(&package)->getTarget())
-            {
-                return; // target is already pursued
-            }
             if((*iter)->getTypeId() == AiPackage::TypeIdCombat && package.getTypeId() == AiPackage::TypeIdCombat
                 && static_cast<const AiCombat*>(*iter)->getTarget() == static_cast<const AiCombat*>(&package)->getTarget())
             {
@@ -266,6 +264,19 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         }
     }
 
+    // remove previous packages if required
+    if (package.shouldCancelPreviousAi())
+    {
+        for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
+        {
+            if((*it)->canCancel())
+                it = mPackages.erase(it);
+            else
+                ++it;
+        }
+    }
+
+    // insert new package in correct place depending on priority
     for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end(); ++it)
     {
         if((*it)->getPriority() <= package.getPriority())

From b9d1d6144a337e7d54eb4c9b4f1af785ffe0ed31 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 2 Feb 2016 22:49:48 +0100
Subject: [PATCH 158/765] Don't reveal unknown potion effects in alchemy window
 (Fixes #3146)

---
 apps/openmw/mwclass/potion.cpp      | 15 +++------------
 apps/openmw/mwgui/alchemywindow.cpp |  4 ++++
 apps/openmw/mwmechanics/alchemy.cpp | 10 ++++++++++
 apps/openmw/mwmechanics/alchemy.hpp |  3 +++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 40b4d62342..c26b925f6f 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -20,7 +20,7 @@
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/alchemy.hpp"
 
 namespace MWClass
 {
@@ -124,17 +124,8 @@ namespace MWClass
 
         // hide effects the player doesnt know about
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats (player);
-        int alchemySkill = npcStats.getSkill (ESM::Skill::Alchemy).getBase();
-        int i=0;
-        static const float fWortChanceValue =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWortChanceValue")->getFloat();
-        for (MWGui::Widgets::SpellEffectList::iterator it = info.effects.begin(); it != info.effects.end(); ++it)
-        {
-            it->mKnown = (i <= 1 && alchemySkill >= fWortChanceValue)
-                 || (i <= 3 && alchemySkill >= fWortChanceValue*2);
-            ++i;
-        }
+        for (unsigned int i=0; i<info.effects.size(); ++i)
+            info.effects[i].mKnown = MWMechanics::Alchemy::knownEffect(i, player);
 
         info.isPotion = true;
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index d12c22e06d..3299846b7e 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -216,6 +216,7 @@ namespace MWGui
 
         std::set<MWMechanics::EffectKey> effectIds = mAlchemy->listEffects();
         Widgets::SpellEffectList list;
+        unsigned int effectIndex=0;
         for (std::set<MWMechanics::EffectKey>::iterator it = effectIds.begin(); it != effectIds.end(); ++it)
         {
             Widgets::SpellEffectParams params;
@@ -228,7 +229,10 @@ namespace MWGui
             params.mIsConstant = true;
             params.mNoTarget = true;
 
+            params.mKnown = mAlchemy->knownEffect(effectIndex, MWBase::Environment::get().getWorld()->getPlayerPtr());
+
             list.push_back(params);
+            ++effectIndex;
         }
 
         while (mEffectsBox->getChildCount())
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index d39c881506..d02376d232 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -451,6 +451,16 @@ MWMechanics::Alchemy::TEffectsIterator MWMechanics::Alchemy::endEffects() const
     return mEffects.end();
 }
 
+bool MWMechanics::Alchemy::knownEffect(unsigned int potionEffectIndex, const MWWorld::Ptr &npc)
+{
+    MWMechanics::NpcStats& npcStats = npc.getClass().getNpcStats(npc);
+    int alchemySkill = npcStats.getSkill (ESM::Skill::Alchemy).getBase();
+    static const float fWortChanceValue =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWortChanceValue")->getFloat();
+    return (potionEffectIndex <= 1 && alchemySkill >= fWortChanceValue)
+            || (potionEffectIndex <= 3 && alchemySkill >= fWortChanceValue*2);
+}
+
 MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& name)
 {
     if (mTools[ESM::Apparatus::MortarPestle].isEmpty())
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index caba26f149..f351881e0d 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -80,6 +80,9 @@ namespace MWMechanics
 
         public:
 
+            static bool knownEffect (unsigned int potionEffectIndex, const MWWorld::Ptr& npc);
+            ///< Does npc have sufficient alchemy skill to know about this potion effect?
+
             void setAlchemist (const MWWorld::Ptr& npc);
             ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
             /// there is no alchemist (alchemy session has ended).

From 5878291064e73b3c6a0a59c16db92031d45a076e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 14:40:21 +0100
Subject: [PATCH 159/765] Fix the path correction for animation sources
 provided in NPC record (Fixes #2444)

---
 apps/openmw/mwrender/npcanimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index a032896a71..c8d7c79c5d 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -473,7 +473,7 @@ void NpcAnimation::updateNpcBase()
             else if(!mNpc->isMale() && !isBeast)
                 addAnimSource("meshes\\xbase_anim_female.nif");
             if(mNpc->mModel.length() > 0)
-                addAnimSource("meshes\\x"+mNpc->mModel);
+                addAnimSource(Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS()));
         }
     }
     else

From 74c18f532e30455a440dc87feac329ce14be1941 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 14:40:59 +0100
Subject: [PATCH 160/765] Fix comment

---
 apps/openmw/mwrender/animation.hpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 213e33f673..992462e1f1 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -292,9 +292,10 @@ protected:
      */
     void setObjectRoot(const std::string &model, bool forceskeleton, bool baseonly, bool isCreature);
 
-    /* Adds the keyframe controllers in the specified model as a new animation source. Note that
-     * the filename portion of the provided model name will be prepended with 'x', and the .nif
-     * extension will be replaced with .kf. */
+    /** Adds the keyframe controllers in the specified model as a new animation source. Note that the .nif
+     * file extension will be replaced with .kf.
+     * @note Later added animation sources have the highest priority when it comes to finding a particular animation.
+    */
     void addAnimSource(const std::string &model);
 
     /** Adds an additional light to the given node using the specified ESM record. */

From aa9905b0eb2fa0ae6425ca5d192af67931b5620f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 15:24:28 +0100
Subject: [PATCH 161/765] Do not crash when the water normal map is missing
 (Fixes #3179)

---
 apps/openmw/mwrender/water.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index b2bef71220..c7f2c9cc6e 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -578,12 +578,13 @@ void Water::createShaderWaterStateSet(osg::Node* node, Reflection* reflection, R
     osg::ref_ptr<osg::Shader> fragmentShader (readShader(osg::Shader::FRAGMENT, mResourcePath + "/shaders/water_fragment.glsl", defineMap));
 
     osg::ref_ptr<osg::Texture2D> normalMap (new osg::Texture2D(readPngImage(mResourcePath + "/shaders/water_nm.png")));
+    if (normalMap->getImage())
+        normalMap->getImage()->flipVertical();
     normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
     normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
     normalMap->setMaxAnisotropy(16);
     normalMap->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
     normalMap->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-    normalMap->getImage()->flipVertical();
 
     osg::ref_ptr<osg::StateSet> shaderStateset = new osg::StateSet;
     shaderStateset->addUniform(new osg::Uniform("normalMap", 0));

From 187d2bccda53da425f49bc7e652bee29c63822cf Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 16:06:25 +0100
Subject: [PATCH 162/765] Warn about adding a local script twice (Bug #2806)

---
 apps/openmw/mwworld/localscripts.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 2004a2ff39..374f5c632a 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -110,6 +110,14 @@ void MWWorld::LocalScripts::add (const std::string& scriptName, const Ptr& ptr)
         {
             ptr.getRefData().setLocals (*script);
 
+            for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin(); iter!=mScripts.end(); ++iter)
+                if (iter->second==ptr)
+                {
+                    std::cout << "warning, tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl;
+                    remove(ptr);
+                    break;
+                }
+
             mScripts.push_back (std::make_pair (scriptName, ptr));
         }
         catch (const std::exception& exception)

From cc3563359e3ab2d7e3b02feb0b62533ed03e3d64 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 16:09:20 +0100
Subject: [PATCH 163/765] Refactor local script iteration (Fixes #2806, Fixes
 #3108)

This should be much safer. Don't use recursion. Don't fail if mIgnore happens to be in the list twice. Don't rely on preconditions / assertions.
---
 apps/openmw/engine.cpp               |  6 ++----
 apps/openmw/mwworld/localscripts.cpp | 28 ++++++++--------------------
 apps/openmw/mwworld/localscripts.hpp |  8 +++-----
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 3fcd46f7ca..f347bc3506 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -69,11 +69,9 @@ void OMW::Engine::executeLocalScripts()
     MWWorld::LocalScripts& localScripts = mEnvironment.getWorld()->getLocalScripts();
 
     localScripts.startIteration();
-
-    while (!localScripts.isFinished())
+    std::pair<std::string, MWWorld::Ptr> script;
+    while (localScripts.getNext(script))
     {
-        std::pair<std::string, MWWorld::Ptr> script = localScripts.getNext();
-
         MWScript::InterpreterContext interpreterContext (
             &script.second.getRefData().getLocals(), script.second);
         mEnvironment.getScriptManager()->run (script.first, interpreterContext);
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 374f5c632a..7ccc213c45 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -76,32 +76,20 @@ void MWWorld::LocalScripts::startIteration()
     mIter = mScripts.begin();
 }
 
-bool MWWorld::LocalScripts::isFinished() const
+bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
 {
-    if (mIter==mScripts.end())
-        return true;
-
-    if (!mIgnore.isEmpty() && mIter->second==mIgnore)
+    while (mIter!=mScripts.end())
     {
-        std::list<std::pair<std::string, Ptr> >::iterator iter = mIter;
-        return ++iter==mScripts.end();
+        std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
+        if (mIgnore.isEmpty() || iter->second!=mIgnore)
+        {
+            script = *iter;
+            return true;
+        }
     }
-
     return false;
 }
 
-std::pair<std::string, MWWorld::Ptr> MWWorld::LocalScripts::getNext()
-{
-    assert (!isFinished());
-
-    std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
-
-    if (mIgnore.isEmpty() || iter->second!=mIgnore)
-        return *iter;
-
-    return getNext();
-}
-
 void MWWorld::LocalScripts::add (const std::string& scriptName, const Ptr& ptr)
 {
     if (const ESM::Script *script = mStore.get<ESM::Script>().search (scriptName))
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 6ef4633a1d..6c2118ea8e 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -31,11 +31,9 @@ namespace MWWorld
             void startIteration();
             ///< Set the iterator to the begin of the script list.
 
-            bool isFinished() const;
-            ///< Is iteration finished?
-
-            std::pair<std::string, Ptr> getNext();
-            ///< Get next local script (must not be called if isFinished())
+            bool getNext(std::pair<std::string, Ptr>& script);
+            ///< Get next local script
+            /// @return Did we get a script?
 
             void add (const std::string& scriptName, const Ptr& ptr);
             ///< Add script to collection of active local scripts.

From 06ed20abf8e9b59384c3221dd2c390d205296ae8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 18:53:38 +0100
Subject: [PATCH 164/765] Use the initial pose of a MorphGeometry for object
 placement (Fixes #3136)

---
 components/nifosg/nifloader.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f4dae52c30..280985f7ef 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -999,7 +999,7 @@ namespace NifOsg
                     continue;
                 if(ctrl->recType == Nif::RC_NiGeomMorpherController)
                 {
-                    geometry = handleMorphGeometry(static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr()));
+                    geometry = handleMorphGeometry(static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr()), triShape, parentNode, composite, boundTextures, animflags);
 
                     osg::ref_ptr<GeomMorpherController> morphctrl = new GeomMorpherController(
                                 static_cast<const Nif::NiGeomMorpherController*>(ctrl.getPtr())->data.getPtr());
@@ -1010,9 +1010,10 @@ namespace NifOsg
             }
 
             if (!geometry.get())
+            {
                 geometry = new osg::Geometry;
-
-            triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
+                triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
+            }
 
 #if OSG_VERSION_LESS_THAN(3,3,3)
             osg::ref_ptr<osg::Geode> geode (new osg::Geode);
@@ -1046,7 +1047,7 @@ namespace NifOsg
 #endif
         }
 
-        osg::ref_ptr<osg::Geometry> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher)
+        osg::ref_ptr<osg::Geometry> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher, const Nif::NiTriShape *triShape, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<int>& boundTextures, int animflags)
         {
             osg::ref_ptr<osgAnimation::MorphGeometry> morphGeom = new osgAnimation::MorphGeometry;
             morphGeom->setMethod(osgAnimation::MorphGeometry::RELATIVE);
@@ -1056,6 +1057,8 @@ namespace NifOsg
             morphGeom->setUpdateCallback(NULL);
             morphGeom->setCullCallback(new UpdateMorphGeometry);
 
+            triShapeToGeometry(triShape, morphGeom, parentNode, composite, boundTextures, animflags);
+
             const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->data.getPtr()->mMorphs;
             if (!morphs.size())
                 return morphGeom;
@@ -1096,6 +1099,10 @@ namespace NifOsg
                 box.expandBy(vertBounds[i]);
             }
 
+            // For the initial bounding box (used for object placement) use the default pose, fire off a bounding compute to set this initial box
+            morphGeom->getBoundingBox();
+
+            // Now set up the callback so that we get properly enlarged bounds if/when the mesh starts animating
             morphGeom->setComputeBoundingBoxCallback(new StaticBoundingBoxCallback(box));
 
             return morphGeom;

From 2eda495f8940a76c5dbd31052d6b54ccbd3e9b76 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 19:05:15 +0100
Subject: [PATCH 165/765] Build fix for OSG 3.2

---
 components/nifosg/nifloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 280985f7ef..79f8379532 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1100,7 +1100,7 @@ namespace NifOsg
             }
 
             // For the initial bounding box (used for object placement) use the default pose, fire off a bounding compute to set this initial box
-            morphGeom->getBoundingBox();
+            morphGeom->getBound();
 
             // Now set up the callback so that we get properly enlarged bounds if/when the mesh starts animating
             morphGeom->setComputeBoundingBoxCallback(new StaticBoundingBoxCallback(box));

From 69c2c4fcc170d4b82b5de0cdc5f36df2dbef0994 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 3 Feb 2016 19:12:46 +0100
Subject: [PATCH 166/765] updateMergedRefs before reading MVRF tags (Fixes
 #3161)

---
 apps/openmw/mwworld/cellstore.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 5b53643e89..5c8d07f86c 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -807,6 +807,10 @@ namespace MWWorld
             }
         }
 
+        // Do another update here to make sure objects referred to by MVRF tags can be found
+        // This update is only needed for old saves that used the old copy&delete way of moving objects
+        updateMergedRefs();
+
         while (reader.isNextSub("MVRF"))
         {
             reader.cacheSubName();
@@ -848,8 +852,6 @@ namespace MWWorld
 
             moveTo(MWWorld::Ptr(movedRef, this), otherCell);
         }
-
-        updateMergedRefs();
     }
 
     bool operator== (const CellStore& left, const CellStore& right)

From 41ebf62fb13785fd9b2be138aa694bfa63dcf8b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 00:25:14 +0100
Subject: [PATCH 167/765] Accept a const CellStore in getNorthVector

---
 apps/openmw/mwbase/world.hpp     | 2 +-
 apps/openmw/mwworld/worldimp.cpp | 4 ++--
 apps/openmw/mwworld/worldimp.hpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 06a8ffa352..c2a7de72b2 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -141,7 +141,7 @@ namespace MWBase
 
             virtual bool isCellQuasiExterior() const = 0;
 
-            virtual osg::Vec2f getNorthVector (MWWorld::CellStore* cell) = 0;
+            virtual osg::Vec2f getNorthVector (const MWWorld::CellStore* cell) = 0;
             ///< get north vector for given interior cell
 
             virtual void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out) = 0;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 37743bceb0..a556aabf7c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1710,9 +1710,9 @@ namespace MWWorld
         mWeatherManager->modRegion(regionid, chances);
     }
 
-    osg::Vec2f World::getNorthVector (CellStore* cell)
+    osg::Vec2f World::getNorthVector (const CellStore* cell)
     {
-        MWWorld::Ptr northmarker = cell->search("northmarker");
+        MWWorld::ConstPtr northmarker = cell->searchConst("northmarker");
 
         if (northmarker.isEmpty())
             return osg::Vec2f(0, 1);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index a9dce46e87..487d4ed04d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -227,7 +227,7 @@ namespace MWWorld
 
             virtual bool isCellQuasiExterior() const;
 
-            virtual osg::Vec2f getNorthVector (CellStore* cell);
+            virtual osg::Vec2f getNorthVector (const CellStore* cell);
             ///< get north vector for given interior cell
 
             virtual void getDoorMarkers (MWWorld::CellStore* cell, std::vector<DoorMarker>& out);

From 300379617e9a604e20dff39962f18ab8b33b7494 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 00:25:47 +0100
Subject: [PATCH 168/765] Accept a const CellStore in
 findInteriorPositionInWorldSpace

---
 apps/openmw/mwbase/world.hpp     | 2 +-
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 apps/openmw/mwworld/worldimp.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index c2a7de72b2..119ce6b217 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -489,7 +489,7 @@ namespace MWBase
             // Are we in an exterior or pseudo-exterior cell and it's night?
             virtual bool isDark() const = 0;
 
-            virtual bool findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
+            virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result) = 0;
 
             /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
             /// @note id must be lower case
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a556aabf7c..9064dc94cd 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2654,7 +2654,7 @@ namespace MWWorld
         }
     }
 
-    bool World::findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, osg::Vec3f& result)
+    bool World::findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result)
     {
         if (cell->isExterior())
             return false;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 487d4ed04d..8c56443f79 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -592,7 +592,7 @@ namespace MWWorld
             // Are we in an exterior or pseudo-exterior cell and it's night?
             virtual bool isDark() const;
 
-            virtual bool findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, osg::Vec3f& result);
+            virtual bool findInteriorPositionInWorldSpace(const MWWorld::CellStore* cell, osg::Vec3f& result);
 
             /// Teleports \a ptr to the closest reference of \a id (e.g. DivineMarker, PrisonMarker, TempleMarker)
             /// @note id must be lower case

From bd655c20fd2a7c23b83106a5349f718972827883 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 00:39:52 +0100
Subject: [PATCH 169/765] Refactor local map updates

We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.

Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
---
 apps/openmw/mwbase/windowmanager.hpp   |  3 +--
 apps/openmw/mwgui/mapwindow.cpp        | 20 +++++++++++++++++
 apps/openmw/mwgui/mapwindow.hpp        |  6 +++++
 apps/openmw/mwgui/windowmanagerimp.cpp | 20 ++++++++---------
 apps/openmw/mwgui/windowmanagerimp.hpp |  3 +--
 apps/openmw/mwrender/localmap.cpp      | 16 +++++++------
 apps/openmw/mwrender/localmap.hpp      |  6 ++---
 apps/openmw/mwworld/scene.cpp          | 31 +-------------------------
 apps/openmw/mwworld/scene.hpp          |  2 --
 9 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index f364ada7ac..2d4c0e2cab 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -176,7 +176,7 @@ namespace MWBase
             virtual void updateSkillArea() = 0;
             ///< update display of skills, factions, birth sign, reputation and bounty
 
-            virtual void changeCell(MWWorld::CellStore* cell) = 0;
+            virtual void changeCell(const MWWorld::CellStore* cell) = 0;
             ///< change the active cell
 
             virtual void setFocusObject(const MWWorld::Ptr& focus) = 0;
@@ -354,7 +354,6 @@ namespace MWBase
             virtual std::string correctBookartPath(const std::string& path, int width, int height) = 0;
             virtual std::string correctTexturePath(const std::string& path) = 0;
 
-            virtual void requestMap(std::set<MWWorld::CellStore*> cells) = 0;
             virtual void removeCell(MWWorld::CellStore* cell) = 0;
             virtual void writeFog(MWWorld::CellStore* cell) = 0;
     };
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 89f4d8cf37..469564d9d2 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -454,6 +454,26 @@ namespace MWGui
         updateCustomMarkers();
     }
 
+    void LocalMapBase::requestMapRender(const MWWorld::CellStore *cell)
+    {
+        std::set<const MWWorld::CellStore*> cells;
+        if (!cell->isExterior())
+            cells.insert(cell);
+        else
+        {
+            for (int dX=-1; dX<2; ++dX)
+            {
+                for (int dY=-1; dY<2; ++dY)
+                {
+                    const MWWorld::CellStore* gridCell = MWBase::Environment::get().getWorld()->getExterior (cell->getCell()->getGridX()+dX, cell->getCell()->getGridY()+dY);
+                    cells.insert(gridCell);
+                }
+            }
+        }
+
+        mLocalMapRender->requestMap(cells);
+    }
+
     void LocalMapBase::redraw()
     {
         // Redraw children in proper order
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 227a9e3f96..96fd3c9942 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -23,6 +23,11 @@ namespace ESM
     class ESMWriter;
 }
 
+namespace MWWorld
+{
+    class CellStore;
+}
+
 namespace Loading
 {
     class Listener;
@@ -67,6 +72,7 @@ namespace MWGui
 
         void setCellPrefix(const std::string& prefix);
         void setActiveCell(const int x, const int y, bool interior=false);
+        void requestMapRender(const MWWorld::CellStore* cell);
         void setPlayerDir(const float x, const float y);
         void setPlayerPos(int cellX, int cellY, const float nx, const float ny);
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f151bee80b..90c0494f6d 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -926,7 +926,7 @@ namespace MWGui
         if (!mLocalMapRender)
             return;
 
-        MWWorld::Ptr player = MWMechanics::getPlayer();
+        MWWorld::ConstPtr player = MWMechanics::getPlayer();
 
         osg::Vec3f playerPosition = player.getRefData().getPosition().asVec3();
         osg::Quat playerOrientation (-player.getRefData().getPosition().rot[2], osg::Vec3(0,0,1));
@@ -938,10 +938,9 @@ namespace MWGui
 
         if (!player.getCell()->isExterior())
         {
-            mMap->setActiveCell(x, y, true);
-            mHud->setActiveCell(x, y, true);
+            setActiveMap(x, y, true);
         }
-        // else: need to know the current grid center, call setActiveCell from MWWorld::Scene
+        // else: need to know the current grid center, call setActiveMap from changeCell
 
         mMap->setPlayerDir(playerdirection.x(), playerdirection.y());
         mMap->setPlayerPos(x, y, u, v);
@@ -1007,8 +1006,10 @@ namespace MWGui
         mDebugWindow->onFrame(frameDuration);
     }
 
-    void WindowManager::changeCell(MWWorld::CellStore* cell)
+    void WindowManager::changeCell(const MWWorld::CellStore* cell)
     {
+        mMap->requestMapRender(cell);
+
         std::string name = MWBase::Environment::get().getWorld()->getCellName (cell);
 
         mMap->setCellName( name );
@@ -1020,6 +1021,8 @@ namespace MWGui
                 mMap->addVisitedLocation (name, cell->getCell()->getGridX (), cell->getCell()->getGridY ());
 
             mMap->cellExplored (cell->getCell()->getGridX(), cell->getCell()->getGridY());
+
+            setActiveMap(cell->getCell()->getGridX(), cell->getCell()->getGridY(), false);
         }
         else
         {
@@ -1032,6 +1035,8 @@ namespace MWGui
             else
                 MWBase::Environment::get().getWorld()->getPlayer().setLastKnownExteriorPosition(worldPos);
             mMap->setGlobalMapPlayerPosition(worldPos.x(), worldPos.y());
+
+            setActiveMap(0, 0, true);
         }
     }
 
@@ -2078,11 +2083,6 @@ namespace MWGui
         tex->unlock();
     }
 
-    void WindowManager::requestMap(std::set<MWWorld::CellStore*> cells)
-    {
-        mLocalMapRender->requestMap(cells);
-    }
-
     void WindowManager::removeCell(MWWorld::CellStore *cell)
     {
         mLocalMapRender->removeCell(cell);
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 6edb4660cf..3cdba8a87f 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -204,7 +204,7 @@ namespace MWGui
     virtual void configureSkills (const SkillList& major, const SkillList& minor); ///< configure skill groups, each set contains the skill ID for that group.
     virtual void updateSkillArea();                                                ///< update display of skills, factions, birth sign, reputation and bounty
 
-    virtual void changeCell(MWWorld::CellStore* cell); ///< change the active cell
+    virtual void changeCell(const MWWorld::CellStore* cell); ///< change the active cell
 
     virtual void setFocusObject(const MWWorld::Ptr& focus);
     virtual void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y);
@@ -375,7 +375,6 @@ namespace MWGui
     virtual std::string correctBookartPath(const std::string& path, int width, int height);
     virtual std::string correctTexturePath(const std::string& path);
 
-    void requestMap(std::set<MWWorld::CellStore*> cells);
     void removeCell(MWWorld::CellStore* cell);
     void writeFog(MWWorld::CellStore* cell);
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 200f484b57..4efcf5d1b4 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -229,11 +229,11 @@ void LocalMap::setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int
     segment.mMapTexture = texture;
 }
 
-void LocalMap::requestMap(std::set<MWWorld::CellStore*> cells)
+void LocalMap::requestMap(std::set<const MWWorld::CellStore*> cells)
 {
-    for (std::set<MWWorld::CellStore*>::iterator it = cells.begin(); it != cells.end(); ++it)
+    for (std::set<const MWWorld::CellStore*>::iterator it = cells.begin(); it != cells.end(); ++it)
     {
-        MWWorld::CellStore* cell = *it;
+        const MWWorld::CellStore* cell = *it;
         if (cell->isExterior())
             requestExteriorMap(cell);
         else
@@ -296,7 +296,7 @@ void LocalMap::cleanupCameras()
     mCamerasPendingRemoval.clear();
 }
 
-void LocalMap::requestExteriorMap(MWWorld::CellStore* cell)
+void LocalMap::requestExteriorMap(const MWWorld::CellStore* cell)
 {
     mInterior = false;
 
@@ -321,7 +321,7 @@ void LocalMap::requestExteriorMap(MWWorld::CellStore* cell)
     }
 }
 
-void LocalMap::requestInteriorMap(MWWorld::CellStore* cell)
+void LocalMap::requestInteriorMap(const MWWorld::CellStore* cell)
 {
     osg::ComputeBoundsVisitor computeBoundsVisitor;
     computeBoundsVisitor.setTraversalMask(Mask_Scene|Mask_Terrain);
@@ -375,6 +375,7 @@ void LocalMap::requestInteriorMap(MWWorld::CellStore* cell)
     // If they changed by too much (for bounds, < padding is considered acceptable) then parts of the interior might not
     // be covered by the map anymore.
     // The following code detects this, and discards the CellStore's fog state if it needs to.
+    bool cellHasValidFog = false;
     if (cell->getFog())
     {
         ESM::FogState* fog = cell->getFog();
@@ -390,13 +391,14 @@ void LocalMap::requestInteriorMap(MWWorld::CellStore* cell)
                 || std::abs(mAngle - fog->mNorthMarkerAngle) > osg::DegreesToRadians(5.f))
         {
             // Nuke it
-            cell->setFog(NULL);
+            cellHasValidFog = false;
         }
         else
         {
             // Looks sane, use it
             mBounds = osg::BoundingBox(newMin, newMax);
             mAngle = fog->mNorthMarkerAngle;
+            cellHasValidFog = true;
         }
     }
 
@@ -434,7 +436,7 @@ void LocalMap::requestInteriorMap(MWWorld::CellStore* cell)
             MapSegment& segment = mSegments[std::make_pair(x,y)];
             if (!segment.mFogOfWarImage)
             {
-                if (!cell->getFog())
+                if (!cellHasValidFog)
                     segment.initFogOfWar();
                 else
                 {
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 59165013d6..52f570b0b1 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -52,7 +52,7 @@ namespace MWRender
         /**
          * Request a map render for the given cells. Render textures will be immediately created and can be retrieved with the getMapTexture function.
          */
-        void requestMap (std::set<MWWorld::CellStore*> cells);
+        void requestMap (std::set<const MWWorld::CellStore*> cells);
 
         /**
          * Remove map and fog textures for the given cell.
@@ -146,8 +146,8 @@ namespace MWRender
         float mAngle;
         const osg::Vec2f rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle);
 
-        void requestExteriorMap(MWWorld::CellStore* cell);
-        void requestInteriorMap(MWWorld::CellStore* cell);
+        void requestExteriorMap(const MWWorld::CellStore* cell);
+        void requestInteriorMap(const MWWorld::CellStore* cell);
 
         osg::ref_ptr<osg::Camera> createOrthographicCamera(float left, float top, float width, float height, const osg::Vec3d& upVector, float zmin, float zmax);
         void setupRenderToTexture(osg::ref_ptr<osg::Camera> camera, int x, int y);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 15b3c057bc..dc93c3b1d7 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -179,27 +179,6 @@ namespace MWWorld
 
     void Scene::update (float duration, bool paused)
     {
-        if (mNeedMapUpdate)
-        {
-            // Note: exterior cell maps must be updated, even if they were visited before, because the set of surrounding cells might be different
-            // (and objects in a different cell can "bleed" into another cells map if they cross the border)
-            std::set<MWWorld::CellStore*> cellsToUpdate;
-            for (CellStoreCollection::iterator active = mActiveCells.begin(); active!=mActiveCells.end(); ++active)
-            {
-                cellsToUpdate.insert(*active);
-            }
-            MWBase::Environment::get().getWindowManager()->requestMap(cellsToUpdate);
-
-            mNeedMapUpdate = false;
-
-            if (mCurrentCell->isExterior())
-            {
-                int cellX, cellY;
-                getGridCenter(cellX, cellY);
-                MWBase::Environment::get().getWindowManager()->setActiveMap(cellX,cellY,false);
-            }
-        }
-
         mRendering.update (duration, paused);
     }
 
@@ -410,10 +389,6 @@ namespace MWWorld
 
         mCellChanged = true;
 
-        // Delay the map update until scripts have been given a chance to run.
-        // If we don't do this, objects that should be disabled will still appear on the map.
-        mNeedMapUpdate = true;
-
         mRendering.getResourceSystem()->clearCache();
     }
 
@@ -449,7 +424,7 @@ namespace MWWorld
     }
 
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics)
-    : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering), mNeedMapUpdate(false)
+    : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering)
     {
     }
 
@@ -527,10 +502,6 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
-        // Delay the map update until scripts have been given a chance to run.
-        // If we don't do this, objects that should be disabled will still appear on the map.
-        mNeedMapUpdate = true;
-
         mRendering.getResourceSystem()->clearCache();
     }
 
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 439c8d72c3..c6de3ebdf7 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -58,8 +58,6 @@ namespace MWWorld
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
 
-            bool mNeedMapUpdate;
-
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center

From 7d647088ab577357d48e437ef6579a60102e5006 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 01:18:44 +0100
Subject: [PATCH 170/765] Make the local map cell distance configurable

---
 apps/openmw/mwgui/hud.cpp         |  2 +-
 apps/openmw/mwgui/mapwindow.cpp   | 59 ++++++++++++++++---------------
 apps/openmw/mwgui/mapwindow.hpp   |  5 ++-
 apps/openmw/mwrender/localmap.cpp |  5 +--
 apps/openmw/mwrender/localmap.hpp |  2 ++
 files/settings-default.cfg        |  5 +++
 6 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 8d6ce6beb4..b5c8dc8bb6 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -159,7 +159,7 @@ namespace MWGui
 
         getWidget(mCrosshair, "Crosshair");
 
-        LocalMapBase::init(mMinimap, mCompass, Settings::Manager::getInt("local map hud widget size", "Map"));
+        LocalMapBase::init(mMinimap, mCompass, Settings::Manager::getInt("local map hud widget size", "Map"), Settings::Manager::getInt("local map cell distance", "Map"));
 
         mMainWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onWorldClicked);
         mMainWidget->eventMouseMove += MyGUI::newDelegate(this, &HUD::onWorldMouseOver);
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 469564d9d2..3b5f0d8aab 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -181,20 +181,22 @@ namespace MWGui
         mCustomMarkers.eventMarkersChanged -= MyGUI::newDelegate(this, &LocalMapBase::updateCustomMarkers);
     }
 
-    void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize)
+    void LocalMapBase::init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize, int cellDistance)
     {
         mLocalMap = widget;
         mCompass = compass;
         mMapWidgetSize = mapWidgetSize;
+        mCellDistance = cellDistance;
+        mNumCells = cellDistance * 2 + 1;
 
-        mLocalMap->setCanvasSize(mMapWidgetSize*3, mMapWidgetSize*3);
+        mLocalMap->setCanvasSize(mMapWidgetSize*mNumCells, mMapWidgetSize*mNumCells);
 
         mCompass->setDepth(Local_CompassLayer);
         mCompass->setNeedMouseFocus(false);
 
-        for (int mx=0; mx<3; ++mx)
+        for (int mx=0; mx<mNumCells; ++mx)
         {
-            for (int my=0; my<3; ++my)
+            for (int my=0; my<mNumCells; ++my)
             {
                 MyGUI::ImageBox* map = mLocalMap->createWidget<MyGUI::ImageBox>("ImageBox",
                     MyGUI::IntCoord(mx*mMapWidgetSize, my*mMapWidgetSize, mMapWidgetSize, mMapWidgetSize),
@@ -231,13 +233,13 @@ namespace MWGui
     void LocalMapBase::applyFogOfWar()
     {
         TextureVector fogTextures;
-        for (int mx=0; mx<3; ++mx)
+        for (int mx=0; mx<mNumCells; ++mx)
         {
-            for (int my=0; my<3; ++my)
+            for (int my=0; my<mNumCells; ++my)
             {
-                int x = mCurX + (mx-1);
-                int y = mCurY + (-1*(my-1));
-                MyGUI::ImageBox* fog = mFogWidgets[my + 3*mx];
+                int x = mCurX + (mx - mCellDistance);
+                int y = mCurY + (-1*(my - mCellDistance));
+                MyGUI::ImageBox* fog = mFogWidgets[my + mNumCells*mx];
 
                 if (!mFogOfWarToggled || !mFogOfWarEnabled)
                 {
@@ -284,8 +286,8 @@ namespace MWGui
             markerPos.cellX = cellX;
             markerPos.cellY = cellY;
 
-            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (1 + cellDx) * mMapWidgetSize),
-                                        static_cast<int>(nY * mMapWidgetSize - (cellDy-1) * mMapWidgetSize));
+            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (mCellDistance + cellDx) * mMapWidgetSize),
+                                        static_cast<int>(nY * mMapWidgetSize + (mCellDistance - cellDy) * mMapWidgetSize));
         }
         else
         {
@@ -297,8 +299,8 @@ namespace MWGui
             markerPos.cellY = cellY;
 
             // Image space is -Y up, cells are Y up
-            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (1 + (cellX - mCurX)) * mMapWidgetSize),
-                                        static_cast<int>(nY * mMapWidgetSize + (1-(cellY-mCurY)) * mMapWidgetSize));
+            widgetPos = MyGUI::IntPoint(static_cast<int>(nX * mMapWidgetSize + (mCellDistance + (cellX - mCurX)) * mMapWidgetSize),
+                                        static_cast<int>(nY * mMapWidgetSize + (mCellDistance - (cellY - mCurY)) * mMapWidgetSize));
         }
 
         markerPos.nX = nX;
@@ -312,9 +314,9 @@ namespace MWGui
             MyGUI::Gui::getInstance().destroyWidget(*it);
         mCustomMarkerWidgets.clear();
 
-        for (int dX = -1; dX <= 1; ++dX)
+        for (int dX = -mCellDistance; dX <= mCellDistance; ++dX)
         {
-            for (int dY =-1; dY <= 1; ++dY)
+            for (int dY =-mCellDistance; dY <= mCellDistance; ++dY)
             {
                 ESM::CellId cellId;
                 cellId.mPaged = !mInterior;
@@ -372,14 +374,14 @@ namespace MWGui
 
         // Update the map textures
         TextureVector textures;
-        for (int mx=0; mx<3; ++mx)
+        for (int mx=0; mx<mNumCells; ++mx)
         {
-            for (int my=0; my<3; ++my)
+            for (int my=0; my<mNumCells; ++my)
             {
-                int mapX = x + (mx-1);
-                int mapY = y + (-1*(my-1));
+                int mapX = x + (mx - mCellDistance);
+                int mapY = y + (-1*(my - mCellDistance));
 
-                MyGUI::ImageBox* box = mMapWidgets[my + 3*mx];
+                MyGUI::ImageBox* box = mMapWidgets[my + mNumCells*mx];
 
                 osg::ref_ptr<osg::Texture2D> texture = mLocalMapRender->getMapTexture(mapX, mapY);
                 if (texture)
@@ -406,9 +408,9 @@ namespace MWGui
         }
         else
         {
-            for (int dX=-1; dX<2; ++dX)
+            for (int dX=-mCellDistance; dX<=mCellDistance; ++dX)
             {
-                for (int dY=-1; dY<2; ++dY)
+                for (int dY=-mCellDistance; dY<=mCellDistance; ++dY)
                 {
                     MWWorld::CellStore* cell = world->getExterior (mCurX+dX, mCurY+dY);
                     world->getDoorMarkers(cell, doors);
@@ -461,9 +463,9 @@ namespace MWGui
             cells.insert(cell);
         else
         {
-            for (int dX=-1; dX<2; ++dX)
+            for (int dX=-mCellDistance; dX<=mCellDistance; ++dX)
             {
-                for (int dY=-1; dY<2; ++dY)
+                for (int dY=-mCellDistance; dY<=mCellDistance; ++dY)
                 {
                     const MWWorld::CellStore* gridCell = MWBase::Environment::get().getWorld()->getExterior (cell->getCell()->getGridX()+dX, cell->getCell()->getGridY()+dY);
                     cells.insert(gridCell);
@@ -482,7 +484,7 @@ namespace MWGui
 
     void LocalMapBase::setPlayerPos(int cellX, int cellY, const float nx, const float ny)
     {
-        MyGUI::IntPoint pos(static_cast<int>(mMapWidgetSize + nx*mMapWidgetSize - 16), static_cast<int>(mMapWidgetSize + ny*mMapWidgetSize - 16));
+        MyGUI::IntPoint pos(static_cast<int>(mMapWidgetSize * mCellDistance + nx*mMapWidgetSize - 16), static_cast<int>(mMapWidgetSize * mCellDistance + ny*mMapWidgetSize - 16));
         pos.left += (cellX - mCurX) * mMapWidgetSize;
         pos.top -= (cellY - mCurY) * mMapWidgetSize;
 
@@ -663,7 +665,8 @@ namespace MWGui
         mEventBoxLocal->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
         mEventBoxLocal->eventMouseButtonDoubleClick += MyGUI::newDelegate(this, &MapWindow::onMapDoubleClicked);
 
-        LocalMapBase::init(mLocalMap, mPlayerArrowLocal, Settings::Manager::getInt("local map widget size", "Map"));    }
+        LocalMapBase::init(mLocalMap, mPlayerArrowLocal, Settings::Manager::getInt("local map widget size", "Map"), Settings::Manager::getInt("local map cell distance", "Map"));
+    }
 
     void MapWindow::onNoteEditOk()
     {
@@ -707,8 +710,8 @@ namespace MWGui
         MyGUI::IntPoint clickedPos = MyGUI::InputManager::getInstance().getMousePosition();
 
         MyGUI::IntPoint widgetPos = clickedPos - mEventBoxLocal->getAbsolutePosition();
-        int x = int(widgetPos.left/float(mMapWidgetSize))-1;
-        int y = (int(widgetPos.top/float(mMapWidgetSize))-1)*-1;
+        int x = int(widgetPos.left/float(mMapWidgetSize))-mCellDistance;
+        int y = (int(widgetPos.top/float(mMapWidgetSize))-mCellDistance)*-1;
         float nX = widgetPos.left/float(mMapWidgetSize) - int(widgetPos.left/float(mMapWidgetSize));
         float nY = widgetPos.top/float(mMapWidgetSize) - int(widgetPos.top/float(mMapWidgetSize));
         x += mCurX;
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 96fd3c9942..773522903a 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -68,7 +68,7 @@ namespace MWGui
     public:
         LocalMapBase(CustomMarkerCollection& markers, MWRender::LocalMap* localMapRender, bool fogOfWarEnabled = true);
         virtual ~LocalMapBase();
-        void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize);
+        void init(MyGUI::ScrollView* widget, MyGUI::ImageBox* compass, int mapWidgetSize, int cellDistance);
 
         void setCellPrefix(const std::string& prefix);
         void setActiveCell(const int x, const int y, bool interior=false);
@@ -116,6 +116,9 @@ namespace MWGui
 
         int mMapWidgetSize;
 
+        int mNumCells; // for convenience, mCellDistance * 2 + 1
+        int mCellDistance;
+
         // Stores markers that were placed by a player. May be shared between multiple map views.
         CustomMarkerCollection& mCustomMarkers;
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 4efcf5d1b4..fd224ba415 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -72,6 +72,7 @@ LocalMap::LocalMap(osgViewer::Viewer* viewer)
     : mViewer(viewer)
     , mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
     , mMapWorldSize(8192.f)
+    , mCellDistance(Settings::Manager::getInt("local map cell distance", "Map"))
     , mAngle(0.f)
     , mInterior(false)
 {
@@ -533,9 +534,9 @@ void LocalMap::updatePlayer (const osg::Vec3f& position, const osg::Quat& orient
     const float exploreRadiusUV = exploreRadius / sFogOfWarResolution; // explore radius from 0 to 1 (UV space)
 
     // change the affected fog of war textures (in a 3x3 grid around the player)
-    for (int mx = -1; mx<2; ++mx)
+    for (int mx = -mCellDistance; mx<=mCellDistance; ++mx)
     {
-        for (int my = -1; my<2; ++my)
+        for (int my = -mCellDistance; my<=mCellDistance; ++my)
         {
             // is this texture affected at all?
             bool affected = false;
diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp
index 52f570b0b1..d946f4c2b6 100644
--- a/apps/openmw/mwrender/localmap.hpp
+++ b/apps/openmw/mwrender/localmap.hpp
@@ -143,6 +143,8 @@ namespace MWRender
         // size of a map segment (for exteriors, 1 cell)
         float mMapWorldSize;
 
+        int mCellDistance;
+
         float mAngle;
         const osg::Vec2f rotatePoint(const osg::Vec2f& point, const osg::Vec2f& center, const float angle);
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index e4a8387b4b..dddf1a29b9 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -58,6 +58,11 @@ local map resolution = 256
 # Size of local map in GUI window in pixels.  (e.g. 256 to 1024).
 local map widget size = 512
 
+# Similar to "[Cells] exterior cell load distance", controls
+# how many cells are rendered on the local map. Values higher than the default
+# may result in longer loading times.
+local map cell distance = 1
+
 [GUI]
 
 # Scales GUI window and widget size. (<1.0 is smaller, >1.0 is larger).

From 8e5398d85b72e951a3804df4922a47a5a95e6ce2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 14:35:29 +0100
Subject: [PATCH 171/765] Add missing initializations

---
 apps/openmw/mwgui/mapwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 3b5f0d8aab..362d2d9e00 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -168,6 +168,8 @@ namespace MWGui
         , mFogOfWarToggled(true)
         , mFogOfWarEnabled(fogOfWarEnabled)
         , mMapWidgetSize(0)
+        , mNumCells(0)
+        , mCellDistance(0)
         , mCustomMarkers(markers)
         , mMarkerUpdateTimer(0.0f)
         , mLastDirectionX(0.0f)

From c9a67ab42357bdb28d63e243946dc734a9030610 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 18:29:33 +0100
Subject: [PATCH 172/765] Do not add scripts from levelled creatures twice (Bug
 #2806)

Do not insert objects from within a CellStore visitor
---
 apps/openmw/mwworld/cellstore.hpp |  3 ++
 apps/openmw/mwworld/scene.cpp     | 70 ++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index faba76262b..2f483f0ba7 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -246,6 +246,7 @@ namespace MWWorld
             /// Call visitor (MWWorld::Ptr) for each reference. visitor must return a bool. Returning
             /// false will abort the iteration.
             /// \note Prefer using forEachConst when possible.
+            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
             /// \attention This function also lists deleted (count 0) objects!
             /// \return Iteration completed?
             template<class Visitor>
@@ -269,6 +270,7 @@ namespace MWWorld
 
             /// Call visitor (MWWorld::ConstPtr) for each reference. visitor must return a bool. Returning
             /// false will abort the iteration.
+            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
             /// \attention This function also lists deleted (count 0) objects!
             /// \return Iteration completed?
             template<class Visitor>
@@ -291,6 +293,7 @@ namespace MWWorld
 
             /// Call visitor (ref) for each reference of given type. visitor must return a bool. Returning
             /// false will abort the iteration.
+            /// \note Do not modify this cell (i.e. remove/add objects) during the forEach, doing this may result in unintended behaviour.
             /// \attention This function also lists deleted (count 0) objects!
             /// \return Iteration completed?
             template <class T, class Visitor>
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index dc93c3b1d7..618a219f31 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -86,10 +86,13 @@ namespace
         MWPhysics::PhysicsSystem& mPhysics;
         MWRender::RenderingManager& mRendering;
 
+        std::vector<MWWorld::Ptr> mToInsert;
+
         InsertVisitor (MWWorld::CellStore& cell, bool rescale, Loading::Listener& loadingListener,
             MWPhysics::PhysicsSystem& physics, MWRender::RenderingManager& rendering);
 
         bool operator() (const MWWorld::Ptr& ptr);
+        void insert();
     };
 
     InsertVisitor::InsertVisitor (MWWorld::CellStore& cell, bool rescale,
@@ -102,33 +105,43 @@ namespace
 
     bool InsertVisitor::operator() (const MWWorld::Ptr& ptr)
     {
-        if (mRescale)
-        {
-            if (ptr.getCellRef().getScale()<0.5)
-                ptr.getCellRef().setScale(0.5);
-            else if (ptr.getCellRef().getScale()>2)
-                ptr.getCellRef().setScale(2);
-        }
-
-        if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
-        {
-            try
-            {
-                addObject(ptr, mPhysics, mRendering);
-                updateObjectRotation(ptr, mPhysics, mRendering, false);
-            }
-            catch (const std::exception& e)
-            {
-                std::string error ("error during rendering '" + ptr.getCellRef().getRefId() + "': ");
-                std::cerr << error + e.what() << std::endl;
-            }
-        }
-
-        mLoadingListener.increaseProgress (1);
-
+        // do not insert directly as we can't modify the cell from within the visitation
+        // CreatureLevList::insertObjectRendering may spawn a new creature
+        mToInsert.push_back(ptr);
         return true;
     }
 
+    void InsertVisitor::insert()
+    {
+        for (std::vector<MWWorld::Ptr>::iterator it = mToInsert.begin(); it != mToInsert.end(); ++it)
+        {
+            MWWorld::Ptr ptr = *it;
+            if (mRescale)
+            {
+                if (ptr.getCellRef().getScale()<0.5)
+                    ptr.getCellRef().setScale(0.5);
+                else if (ptr.getCellRef().getScale()>2)
+                    ptr.getCellRef().setScale(2);
+            }
+
+            if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
+            {
+                try
+                {
+                    addObject(ptr, mPhysics, mRendering);
+                    updateObjectRotation(ptr, mPhysics, mRendering, false);
+                }
+                catch (const std::exception& e)
+                {
+                    std::string error ("error during rendering '" + ptr.getCellRef().getRefId() + "': ");
+                    std::cerr << error + e.what() << std::endl;
+                }
+            }
+
+            mLoadingListener.increaseProgress (1);
+        }
+    }
+
     struct AdjustPositionVisitor
     {
         bool operator() (const MWWorld::Ptr& ptr)
@@ -248,6 +261,10 @@ namespace MWWorld
 
             cell->respawn();
 
+            // register local scripts
+            // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
+            MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
+
             // ... then references. This is important for adjustPosition to work correctly.
             /// \todo rescale depending on the state of a new GMST
             insertCell (*cell, true, loadingListener);
@@ -267,10 +284,6 @@ namespace MWWorld
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
                 mRendering.configureAmbient(cell->getCell());
         }
-
-        // register local scripts
-        // ??? Should this go into the above if block ???
-        MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
     }
 
     void Scene::changeToVoid()
@@ -534,6 +547,7 @@ namespace MWWorld
     {
         InsertVisitor insertVisitor (cell, rescale, *loadingListener, *mPhysics, mRendering);
         cell.forEach (insertVisitor);
+        insertVisitor.insert();
 
         // do adjustPosition (snapping actors to ground) after objects are loaded, so we don't depend on the loading order
         AdjustPositionVisitor adjustPosVisitor;

From b06730ac612cadfa81c382712fe5d22a69c16c79 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 21:02:02 +0100
Subject: [PATCH 173/765] Fix terrain textureCompileDummy

---
 components/terrain/terraingrid.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index aa82e0bd65..fb037c003c 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -133,12 +133,12 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
 
         // For compiling textures, I don't think the osgFX::Effect does it correctly
         osg::ref_ptr<osg::Node> textureCompileDummy (new osg::Node);
-
+        unsigned int dummyTextureCounter = 0;
         std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
         for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
         {
             layerTextures.push_back(mResourceSystem->getTextureManager()->getTexture2D(it->mDiffuseMap, osg::Texture::REPEAT, osg::Texture::REPEAT));
-            textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(0, layerTextures.back());
+            textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
         }
 
         std::vector<osg::ref_ptr<osg::Texture2D> > blendmapTextures;
@@ -153,7 +153,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setResizeNonPowerOfTwoHint(false);
             blendmapTextures.push_back(texture);
 
-            textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(0, layerTextures.back());
+            textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
         }
 
         // use texture coordinates for both texture units, the layer texture and blend texture

From 5b972ee7776e198c374f8ff76d3cae1682175397 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 18:51:51 +0100
Subject: [PATCH 174/765] Move texture filtering settings to SceneManager

Practical benefits:

- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
---
 apps/openmw/engine.cpp                    |   6 +-
 apps/openmw/mwrender/animation.cpp        |   4 +-
 apps/openmw/mwrender/renderingmanager.cpp |   2 +-
 components/nifosg/controller.hpp          |   2 +
 components/resource/scenemanager.cpp      | 207 ++++++++++++++++++++++
 components/resource/scenemanager.hpp      |  31 ++++
 components/resource/texturemanager.cpp    |  92 ----------
 components/resource/texturemanager.hpp    |  17 --
 8 files changed, 247 insertions(+), 114 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f347bc3506..d96bf16e4e 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -20,7 +20,7 @@
 #include <components/sdlutil/imagetosurface.hpp>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/compiler/extensions0.hpp>
 
@@ -448,8 +448,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
 
     mResourceSystem.reset(new Resource::ResourceSystem(mVFS.get()));
-    mResourceSystem->getTextureManager()->setUnRefImageDataAfterApply(true);
-    mResourceSystem->getTextureManager()->setFilterSettings(
+    mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(true);
+    mResourceSystem->getSceneManager()->setFilterSettings(
         Settings::Manager::getString("texture mag filter", "General"),
         Settings::Manager::getString("texture min filter", "General"),
         Settings::Manager::getString("texture mipmap", "General"),
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 549d0eb8e6..a7bb3f1281 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1059,7 +1059,9 @@ namespace MWRender
             stream << i;
             stream << ".dds";
 
-            textures.push_back(mResourceSystem->getTextureManager()->getTexture2D(stream.str(), osg::Texture2D::REPEAT, osg::Texture2D::REPEAT));
+            osg::ref_ptr<osg::Texture2D> tex = mResourceSystem->getTextureManager()->getTexture2D(stream.str(), osg::Texture2D::REPEAT, osg::Texture2D::REPEAT);
+            mResourceSystem->getSceneManager()->applyFilterSettings(tex);
+            textures.push_back(tex);
         }
 
         osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(glowColor, textures));
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c8d0925b0b..755a8019b1 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -776,7 +776,7 @@ namespace MWRender
 
     void RenderingManager::updateTextureFiltering()
     {
-        mResourceSystem->getTextureManager()->setFilterSettings(
+        mResourceSystem->getSceneManager()->setFilterSettings(
             Settings::Manager::getString("texture mag filter", "General"),
             Settings::Manager::getString("texture min filter", "General"),
             Settings::Manager::getString("texture mipmap", "General"),
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index e1e969d066..0b633a1224 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -305,6 +305,8 @@ namespace NifOsg
 
         META_Object(NifOsg, FlipController)
 
+        std::vector<osg::ref_ptr<osg::Texture2D> >& getTextures() { return mTextures; }
+
         virtual void apply(osg::StateSet *stateset, osg::NodeVisitor *nv);
     };
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 43ece41f35..80e6f737df 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -9,6 +9,8 @@
 
 #include <osgUtil/IncrementalCompileOperation>
 
+#include <osgViewer/Viewer>
+
 #include <osgDB/SharedStateManager>
 #include <osgDB/Registry>
 
@@ -19,6 +21,7 @@
 
 #include <components/sceneutil/clone.hpp>
 #include <components/sceneutil/util.hpp>
+#include <components/sceneutil/controller.hpp>
 
 #include "texturemanager.hpp"
 #include "niffilemanager.hpp"
@@ -105,10 +108,123 @@ namespace
 namespace Resource
 {
 
+    /// Set texture filtering settings on textures contained in a FlipController.
+    class SetFilterSettingsControllerVisitor : public SceneUtil::ControllerVisitor
+    {
+    public:
+        SetFilterSettingsControllerVisitor(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
+            : mMinFilter(minFilter)
+            , mMagFilter(magFilter)
+            , mMaxAnisotropy(maxAnisotropy)
+        {
+        }
+
+        virtual void visit(osg::Node& node, SceneUtil::Controller& ctrl)
+        {
+            if (NifOsg::FlipController* flipctrl = dynamic_cast<NifOsg::FlipController*>(&ctrl))
+            {
+                for (std::vector<osg::ref_ptr<osg::Texture2D> >::iterator it = flipctrl->getTextures().begin(); it != flipctrl->getTextures().end(); ++it)
+                {
+                    osg::Texture* tex = *it;
+                    tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
+                    tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
+                    tex->setMaxAnisotropy(mMaxAnisotropy);
+                    mTexturesProcessed.insert(tex);
+                }
+            }
+        }
+
+        const std::set<osg::ref_ptr<osg::Texture> >& getTexturesProcessed()
+        {
+            return mTexturesProcessed;
+        }
+
+    private:
+        osg::Texture::FilterMode mMinFilter;
+        osg::Texture::FilterMode mMagFilter;
+        int mMaxAnisotropy;
+        std::set<osg::ref_ptr<osg::Texture> > mTexturesProcessed;
+    };
+
+    /// Set texture filtering settings on textures contained in StateSets.
+    class SetFilterSettingsVisitor : public osg::NodeVisitor
+    {
+    public:
+        SetFilterSettingsVisitor(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mMinFilter(minFilter)
+            , mMagFilter(magFilter)
+            , mMaxAnisotropy(maxAnisotropy)
+        {
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            osg::StateSet* stateset = node.getStateSet();
+            if (stateset)
+                apply(stateset);
+            traverse(node);
+        }
+
+        virtual void apply(osg::Geode& geode)
+        {
+            osg::StateSet* stateset = geode.getStateSet();
+            if (stateset)
+                apply(stateset);
+
+            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
+            {
+                osg::Drawable* drw = geode.getDrawable(i);
+                stateset = drw->getStateSet();
+                if (stateset)
+                    apply(stateset);
+            }
+        }
+
+        void apply(osg::StateSet* stateset)
+        {
+            const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
+            for(unsigned int unit=0;unit<texAttributes.size();++unit)
+            {
+                osg::StateAttribute *texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+                apply(texture);
+            }
+        }
+
+        void apply(osg::StateAttribute* attr)
+        {
+            osg::Texture* tex = attr->asTexture();
+            if (tex)
+            {
+                tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
+                tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
+                tex->setMaxAnisotropy(mMaxAnisotropy);
+                mTexturesProcessed.insert(tex);
+            }
+        }
+
+        const std::set<osg::ref_ptr<osg::Texture> >& getTexturesProcessed()
+        {
+            return mTexturesProcessed;
+        }
+
+    private:
+        osg::Texture::FilterMode mMinFilter;
+        osg::Texture::FilterMode mMagFilter;
+        int mMaxAnisotropy;
+        std::set<osg::ref_ptr<osg::Texture> > mTexturesProcessed;
+    };
+
+
+
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::TextureManager* textureManager, Resource::NifFileManager* nifFileManager)
         : mVFS(vfs)
         , mTextureManager(textureManager)
         , mNifFileManager(nifFileManager)
+        , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
+        , mMagFilter(osg::Texture::LINEAR)
+        , mMaxAnisotropy(1)
+        , mUnRefImageDataAfterApply(false)
         , mParticleSystemMask(~0u)
     {
     }
@@ -219,6 +335,17 @@ namespace Resource
                     throw;
             }
 
+            // set filtering settings
+            SetFilterSettingsVisitor setFilterSettingsVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
+            loaded->accept(setFilterSettingsVisitor);
+            SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
+            loaded->accept(setFilterSettingsControllerVisitor);
+
+            // remember which textures we set a filtering setting on so we can re-apply it when the setting changes
+            mTexturesWithFilterSetting.insert(setFilterSettingsVisitor.getTexturesProcessed().begin(), setFilterSettingsVisitor.getTexturesProcessed().end());
+            mTexturesWithFilterSetting.insert(setFilterSettingsControllerVisitor.getTexturesProcessed().begin(), setFilterSettingsControllerVisitor.getTexturesProcessed().end());
+
+            // share state
             osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
 
             if (mIncrementalCompileOperation)
@@ -285,4 +412,84 @@ namespace Resource
         mParticleSystemMask = mask;
     }
 
+    void SceneManager::setFilterSettings(const std::string &magfilter, const std::string &minfilter,
+                                           const std::string &mipmap, int maxAnisotropy,
+                                           osgViewer::Viewer *viewer)
+    {
+        osg::Texture::FilterMode min = osg::Texture::LINEAR;
+        osg::Texture::FilterMode mag = osg::Texture::LINEAR;
+
+        if(magfilter == "nearest")
+            mag = osg::Texture::NEAREST;
+        else if(magfilter != "linear")
+            std::cerr<< "Invalid texture mag filter: "<<magfilter <<std::endl;
+
+        if(minfilter == "nearest")
+            min = osg::Texture::NEAREST;
+        else if(minfilter != "linear")
+            std::cerr<< "Invalid texture min filter: "<<minfilter <<std::endl;
+
+        if(mipmap == "nearest")
+        {
+            if(min == osg::Texture::NEAREST)
+                min = osg::Texture::NEAREST_MIPMAP_NEAREST;
+            else if(min == osg::Texture::LINEAR)
+                min = osg::Texture::LINEAR_MIPMAP_NEAREST;
+        }
+        else if(mipmap != "none")
+        {
+            if(mipmap != "linear")
+                std::cerr<< "Invalid texture mipmap: "<<mipmap <<std::endl;
+            if(min == osg::Texture::NEAREST)
+                min = osg::Texture::NEAREST_MIPMAP_LINEAR;
+            else if(min == osg::Texture::LINEAR)
+                min = osg::Texture::LINEAR_MIPMAP_LINEAR;
+        }
+
+        if(viewer) viewer->stopThreading();
+        setFilterSettings(min, mag, maxAnisotropy);
+        if(viewer) viewer->startThreading();
+    }
+
+    void SceneManager::applyFilterSettings(osg::Texture *tex)
+    {
+        tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
+        tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
+        tex->setMaxAnisotropy(mMaxAnisotropy);
+        mTexturesWithFilterSetting.insert(tex);
+    }
+
+    void SceneManager::setUnRefImageDataAfterApply(bool unref)
+    {
+        mUnRefImageDataAfterApply = unref;
+    }
+
+    void SceneManager::setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
+    {
+        mMinFilter = minFilter;
+        mMagFilter = magFilter;
+        mMaxAnisotropy = std::max(1, maxAnisotropy);
+
+        for (std::set<osg::ref_ptr<osg::Texture> >::const_iterator it = mTexturesWithFilterSetting.begin(); it != mTexturesWithFilterSetting.end(); ++it)
+        {
+            (*it)->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
+            (*it)->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
+            (*it)->setMaxAnisotropy(mMaxAnisotropy);
+        }
+    }
+
+    void SceneManager::clearCache()
+    {
+        // clear textures that are no longer referenced
+        for (std::set<osg::ref_ptr<osg::Texture> >::const_iterator it = mTexturesWithFilterSetting.begin(); it != mTexturesWithFilterSetting.end();)
+        {
+            osg::Texture* tex = *it;
+            if (tex->referenceCount() <= 1)
+                mTexturesWithFilterSetting.erase(it++);
+            else
+                ++it;
+        }
+
+    }
+
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 67fa2ab433..df330af5b5 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -6,6 +6,7 @@
 
 #include <osg/ref_ptr>
 #include <osg/Node>
+#include <osg/Texture>
 
 namespace Resource
 {
@@ -23,6 +24,11 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
+namespace osgViewer
+{
+    class Viewer;
+}
+
 namespace Resource
 {
 
@@ -69,11 +75,30 @@ namespace Resource
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
 
+        void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
+                               const std::string &mipmap, int maxAnisotropy,
+                               osgViewer::Viewer *viewer);
+
+        /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate / createInstance)
+        /// the filter settings are applied automatically. This method is provided for textures that were created outside of the SceneManager.
+        void applyFilterSettings (osg::Texture* tex);
+
+        /// Keep a copy of the texture data around in system memory? This is needed when using multiple graphics contexts,
+        /// otherwise should be disabled to reduce memory usage.
+        void setUnRefImageDataAfterApply(bool unref);
+
+        void clearCache();
+
     private:
         const VFS::Manager* mVFS;
         Resource::TextureManager* mTextureManager;
         Resource::NifFileManager* mNifFileManager;
 
+        osg::Texture::FilterMode mMinFilter;
+        osg::Texture::FilterMode mMagFilter;
+        int mMaxAnisotropy;
+        bool mUnRefImageDataAfterApply;
+
         osg::ref_ptr<osgUtil::IncrementalCompileOperation> mIncrementalCompileOperation;
 
         unsigned int mParticleSystemMask;
@@ -82,8 +107,14 @@ namespace Resource
         typedef std::map<std::string, osg::ref_ptr<const osg::Node> > Index;
         Index mIndex;
 
+        std::set<osg::ref_ptr<osg::Texture> > mTexturesWithFilterSetting;
+
         SceneManager(const SceneManager&);
         void operator = (const SceneManager&);
+
+        /// @warning It is unsafe to call this function when a draw thread is using the textures. Call stopThreading() first!
+        void setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode maxFilter, int maxAnisotropy);
+
     };
 
 }
diff --git a/components/resource/texturemanager.cpp b/components/resource/texturemanager.cpp
index d7f3fc61a1..b49c6bb094 100644
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/texturemanager.cpp
@@ -3,7 +3,6 @@
 #include <osgDB/Registry>
 #include <osg/GLExtensions>
 #include <osg/Version>
-#include <osgViewer/Viewer>
 
 #include <stdexcept>
 
@@ -47,11 +46,7 @@ namespace Resource
 
     TextureManager::TextureManager(const VFS::Manager *vfs)
         : mVFS(vfs)
-        , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
-        , mMagFilter(osg::Texture::LINEAR)
-        , mMaxAnisotropy(1)
         , mWarningTexture(createWarningTexture())
-        , mUnRefImageDataAfterApply(false)
     {
 
     }
@@ -61,88 +56,6 @@ namespace Resource
 
     }
 
-    void TextureManager::setUnRefImageDataAfterApply(bool unref)
-    {
-        mUnRefImageDataAfterApply = unref;
-    }
-
-    void TextureManager::setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                                           const std::string &mipmap, int maxAnisotropy,
-                                           osgViewer::Viewer *viewer)
-    {
-        osg::Texture::FilterMode min = osg::Texture::LINEAR;
-        osg::Texture::FilterMode mag = osg::Texture::LINEAR;
-
-        if(magfilter == "nearest")
-            mag = osg::Texture::NEAREST;
-        else if(magfilter != "linear")
-            std::cerr<< "Invalid texture mag filter: "<<magfilter <<std::endl;
-
-        if(minfilter == "nearest")
-            min = osg::Texture::NEAREST;
-        else if(minfilter != "linear")
-            std::cerr<< "Invalid texture min filter: "<<minfilter <<std::endl;
-
-        if(mipmap == "nearest")
-        {
-            if(min == osg::Texture::NEAREST)
-                min = osg::Texture::NEAREST_MIPMAP_NEAREST;
-            else if(min == osg::Texture::LINEAR)
-                min = osg::Texture::LINEAR_MIPMAP_NEAREST;
-        }
-        else if(mipmap != "none")
-        {
-            if(mipmap != "linear")
-                std::cerr<< "Invalid texture mipmap: "<<mipmap <<std::endl;
-            if(min == osg::Texture::NEAREST)
-                min = osg::Texture::NEAREST_MIPMAP_LINEAR;
-            else if(min == osg::Texture::LINEAR)
-                min = osg::Texture::LINEAR_MIPMAP_LINEAR;
-        }
-
-        if(viewer) viewer->stopThreading();
-        setFilterSettings(min, mag, maxAnisotropy);
-        if(viewer) viewer->startThreading();
-    }
-
-    void TextureManager::setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
-    {
-        mMinFilter = minFilter;
-        mMagFilter = magFilter;
-        mMaxAnisotropy = std::max(1, maxAnisotropy);
-
-        for (std::map<MapKey, osg::ref_ptr<osg::Texture2D> >::iterator it = mTextures.begin(); it != mTextures.end(); ++it)
-        {
-            osg::ref_ptr<osg::Texture2D> tex = it->second;
-
-            // Keep mip-mapping disabled if the texture creator explicitely requested no mipmapping.
-            osg::Texture::FilterMode oldMin = tex->getFilter(osg::Texture::MIN_FILTER);
-            if (oldMin == osg::Texture::LINEAR || oldMin == osg::Texture::NEAREST)
-            {
-                osg::Texture::FilterMode newMin = osg::Texture::LINEAR;
-                switch (mMinFilter)
-                {
-                case osg::Texture::LINEAR:
-                case osg::Texture::LINEAR_MIPMAP_LINEAR:
-                case osg::Texture::LINEAR_MIPMAP_NEAREST:
-                    newMin = osg::Texture::LINEAR;
-                    break;
-                case osg::Texture::NEAREST:
-                case osg::Texture::NEAREST_MIPMAP_LINEAR:
-                case osg::Texture::NEAREST_MIPMAP_NEAREST:
-                    newMin = osg::Texture::NEAREST;
-                    break;
-                }
-                tex->setFilter(osg::Texture::MIN_FILTER, newMin);
-            }
-            else
-                tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
-
-            tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
-            tex->setMaxAnisotropy(static_cast<float>(mMaxAnisotropy));
-        }
-    }
-
     /*
     osg::ref_ptr<osg::Image> TextureManager::getImage(const std::string &filename)
     {
@@ -295,11 +208,6 @@ namespace Resource
             texture->setImage(image);
             texture->setWrap(osg::Texture::WRAP_S, wrapS);
             texture->setWrap(osg::Texture::WRAP_T, wrapT);
-            texture->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
-            texture->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
-            texture->setMaxAnisotropy(mMaxAnisotropy);
-
-            texture->setUnRefImageDataAfterApply(mUnRefImageDataAfterApply);
 
             mTextures.insert(std::make_pair(key, texture));
             return texture;
diff --git a/components/resource/texturemanager.hpp b/components/resource/texturemanager.hpp
index e12dfa0900..61a727b5ee 100644
--- a/components/resource/texturemanager.hpp
+++ b/components/resource/texturemanager.hpp
@@ -28,14 +28,6 @@ namespace Resource
         TextureManager(const VFS::Manager* vfs);
         ~TextureManager();
 
-        void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                               const std::string &mipmap, int maxAnisotropy,
-                               osgViewer::Viewer *view);
-
-        /// Keep a copy of the texture data around in system memory? This is needed when using multiple graphics contexts,
-        /// otherwise should be disabled to reduce memory usage.
-        void setUnRefImageDataAfterApply(bool unref);
-
         /// Create or retrieve a Texture2D using the specified image filename, and wrap parameters.
         /// Returns the dummy texture if the given texture is not found.
         osg::ref_ptr<osg::Texture2D> getTexture2D(const std::string& filename, osg::Texture::WrapMode wrapS, osg::Texture::WrapMode wrapT);
@@ -50,10 +42,6 @@ namespace Resource
     private:
         const VFS::Manager* mVFS;
 
-        osg::Texture::FilterMode mMinFilter;
-        osg::Texture::FilterMode mMagFilter;
-        int mMaxAnisotropy;
-
         typedef std::pair<std::pair<int, int>, std::string> MapKey;
 
         std::map<std::string, osg::ref_ptr<osg::Image> > mImages;
@@ -62,11 +50,6 @@ namespace Resource
 
         osg::ref_ptr<osg::Texture2D> mWarningTexture;
 
-        bool mUnRefImageDataAfterApply;
-
-        /// @warning It is unsafe to call this function when a draw thread is using the textures. Call stopThreading() first!
-        void setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode maxFilter, int maxAnisotropy);
-
         TextureManager(const TextureManager&);
         void operator = (const TextureManager&);
     };

From e2ee1d5689e1803cd7f63b94dbcfb7ff70b07f13 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 18:58:22 +0100
Subject: [PATCH 175/765] Use separate textures for the MyGUI RenderManager

This means we can more reliably set the filter parameters.

I believe this commit creates a regression where non-DDS GUI textures would display upside down, which will be addressed by further refactoring in the next commits.
---
 components/myguiplatform/myguitexture.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 50ac5c1f34..a42568cf85 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -86,7 +86,9 @@ namespace osgMyGUI
         if (!mTextureManager)
             throw std::runtime_error("No texturemanager set");
 
-        mTexture = mTextureManager->getTexture2D(fname, osg::Texture2D::CLAMP_TO_EDGE, osg::Texture2D::CLAMP_TO_EDGE);
+        mTexture = new osg::Texture2D(mTextureManager->getImage(fname));
+        mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         // disable mip-maps
         mTexture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
 

From 6ac688c0e2e16e4eec74ed5ef2d6a1a05a367d66 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 19:28:52 +0100
Subject: [PATCH 176/765] Change the way that texture filtering setting changes
 are applied at runtime to not require keeping a reference to textures

The references would be difficult to clean up because there may or may not be another reference to the texture in the osgDB::SharedStateManager.
---
 components/resource/scenemanager.cpp | 68 ++++++++--------------------
 components/resource/scenemanager.hpp |  6 +--
 2 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 80e6f737df..df103f50c9 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -129,21 +129,14 @@ namespace Resource
                     tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
                     tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
                     tex->setMaxAnisotropy(mMaxAnisotropy);
-                    mTexturesProcessed.insert(tex);
                 }
             }
         }
 
-        const std::set<osg::ref_ptr<osg::Texture> >& getTexturesProcessed()
-        {
-            return mTexturesProcessed;
-        }
-
     private:
         osg::Texture::FilterMode mMinFilter;
         osg::Texture::FilterMode mMagFilter;
         int mMaxAnisotropy;
-        std::set<osg::ref_ptr<osg::Texture> > mTexturesProcessed;
     };
 
     /// Set texture filtering settings on textures contained in StateSets.
@@ -199,20 +192,12 @@ namespace Resource
                 tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
                 tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
                 tex->setMaxAnisotropy(mMaxAnisotropy);
-                mTexturesProcessed.insert(tex);
             }
         }
-
-        const std::set<osg::ref_ptr<osg::Texture> >& getTexturesProcessed()
-        {
-            return mTexturesProcessed;
-        }
-
     private:
         osg::Texture::FilterMode mMinFilter;
         osg::Texture::FilterMode mMagFilter;
         int mMaxAnisotropy;
-        std::set<osg::ref_ptr<osg::Texture> > mTexturesProcessed;
     };
 
 
@@ -341,10 +326,6 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
-            // remember which textures we set a filtering setting on so we can re-apply it when the setting changes
-            mTexturesWithFilterSetting.insert(setFilterSettingsVisitor.getTexturesProcessed().begin(), setFilterSettingsVisitor.getTexturesProcessed().end());
-            mTexturesWithFilterSetting.insert(setFilterSettingsControllerVisitor.getTexturesProcessed().begin(), setFilterSettingsControllerVisitor.getTexturesProcessed().end());
-
             // share state
             osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
 
@@ -447,7 +428,26 @@ namespace Resource
         }
 
         if(viewer) viewer->stopThreading();
-        setFilterSettings(min, mag, maxAnisotropy);
+
+        mMinFilter = min;
+        mMagFilter = mag;
+        mMaxAnisotropy = std::max(1, maxAnisotropy);
+
+        SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
+        SetFilterSettingsVisitor setFilterSettingsVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
+        if (viewer && viewer->getSceneData())
+        {
+            viewer->getSceneData()->accept(setFilterSettingsControllerVisitor);
+            viewer->getSceneData()->accept(setFilterSettingsVisitor);
+        }
+
+        for (Index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
+        {
+            osg::Node* node = it->second;
+            node->accept(setFilterSettingsControllerVisitor);
+            node->accept(setFilterSettingsVisitor);
+        }
+
         if(viewer) viewer->startThreading();
     }
 
@@ -456,7 +456,6 @@ namespace Resource
         tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
         tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
         tex->setMaxAnisotropy(mMaxAnisotropy);
-        mTexturesWithFilterSetting.insert(tex);
     }
 
     void SceneManager::setUnRefImageDataAfterApply(bool unref)
@@ -464,32 +463,5 @@ namespace Resource
         mUnRefImageDataAfterApply = unref;
     }
 
-    void SceneManager::setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode magFilter, int maxAnisotropy)
-    {
-        mMinFilter = minFilter;
-        mMagFilter = magFilter;
-        mMaxAnisotropy = std::max(1, maxAnisotropy);
-
-        for (std::set<osg::ref_ptr<osg::Texture> >::const_iterator it = mTexturesWithFilterSetting.begin(); it != mTexturesWithFilterSetting.end(); ++it)
-        {
-            (*it)->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
-            (*it)->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
-            (*it)->setMaxAnisotropy(mMaxAnisotropy);
-        }
-    }
-
-    void SceneManager::clearCache()
-    {
-        // clear textures that are no longer referenced
-        for (std::set<osg::ref_ptr<osg::Texture> >::const_iterator it = mTexturesWithFilterSetting.begin(); it != mTexturesWithFilterSetting.end();)
-        {
-            osg::Texture* tex = *it;
-            if (tex->referenceCount() <= 1)
-                mTexturesWithFilterSetting.erase(it++);
-            else
-                ++it;
-        }
-
-    }
 
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index df330af5b5..ae5fa2db6e 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -87,8 +87,6 @@ namespace Resource
         /// otherwise should be disabled to reduce memory usage.
         void setUnRefImageDataAfterApply(bool unref);
 
-        void clearCache();
-
     private:
         const VFS::Manager* mVFS;
         Resource::TextureManager* mTextureManager;
@@ -104,11 +102,9 @@ namespace Resource
         unsigned int mParticleSystemMask;
 
         // observer_ptr?
-        typedef std::map<std::string, osg::ref_ptr<const osg::Node> > Index;
+        typedef std::map<std::string, osg::ref_ptr<osg::Node> > Index;
         Index mIndex;
 
-        std::set<osg::ref_ptr<osg::Texture> > mTexturesWithFilterSetting;
-
         SceneManager(const SceneManager&);
         void operator = (const SceneManager&);
 

From e8662bea3133ba9dbb09b86c3abb1af39425e90d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 20:23:41 +0100
Subject: [PATCH 177/765] Change the way that image origin is converted to
 OpenGL's lower-left convention

Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
---
 apps/openmw/mwgui/inventorywindow.cpp          |  6 +++---
 apps/openmw/mwgui/loadingscreen.cpp            |  2 +-
 apps/openmw/mwgui/mapwindow.cpp                |  8 ++++----
 apps/openmw/mwgui/race.cpp                     |  2 +-
 apps/openmw/mwgui/savegamedialog.cpp           |  2 +-
 apps/openmw/mwgui/videowidget.cpp              |  2 +-
 apps/openmw/mwrender/characterpreview.cpp      |  2 +-
 .../myguiplatform/myguirendermanager.cpp       |  7 +++++++
 components/myguiplatform/myguitexture.cpp      |  2 ++
 components/nif/data.cpp                        | 10 ++++++++--
 components/resource/texturemanager.cpp         | 18 +++---------------
 components/resource/texturemanager.hpp         |  6 ++++++
 components/sdlutil/sdlcursormanager.cpp        |  2 +-
 files/mygui/openmw_pointer.xml                 |  4 ++--
 14 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index facb17d66c..4599132e3d 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -87,7 +87,7 @@ namespace MWGui
 
         mAvatarImage->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onAvatarClicked);
         mAvatarImage->setRenderItemTexture(mPreviewTexture.get());
-        mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+        mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
         getWidget(mItemView, "ItemView");
         mItemView->eventItemClicked += MyGUI::newDelegate(this, &InventoryWindow::onItemSelected);
@@ -403,8 +403,8 @@ namespace MWGui
         int height = std::min(mPreview->getTextureHeight(), size.height);
         mPreview->setViewport(width, height);
 
-        mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, height/float(mPreview->getTextureHeight()),
-                                                                     width/float(mPreview->getTextureWidth()), 0.f));
+        mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f,
+                                                                     width/float(mPreview->getTextureWidth()), height/float(mPreview->getTextureHeight())));
     }
 
     void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index e32140cb35..6385eb2c6e 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -164,7 +164,7 @@ namespace MWGui
             mBackgroundImage->setBackgroundImage("");
 
             mBackgroundImage->setRenderItemTexture(mGuiTexture.get());
-            mBackgroundImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+            mBackgroundImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
         }
 
         setVisible(true);
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 362d2d9e00..1b8d5ab43e 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -254,7 +254,7 @@ namespace MWGui
                 {
                     boost::shared_ptr<MyGUI::ITexture> myguitex (new osgMyGUI::OSGTexture(tex));
                     fog->setRenderItemTexture(myguitex.get());
-                    fog->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
+                    fog->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
                     fogTextures.push_back(myguitex);
                 }
                 else
@@ -391,7 +391,7 @@ namespace MWGui
                     boost::shared_ptr<MyGUI::ITexture> guiTex (new osgMyGUI::OSGTexture(texture));
                     textures.push_back(guiTex);
                     box->setRenderItemTexture(guiTex.get());
-                    box->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+                    box->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
                 }
                 else
                     box->setRenderItemTexture(NULL);
@@ -770,11 +770,11 @@ namespace MWGui
 
         mGlobalMapTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getBaseTexture()));
         mGlobalMapImage->setRenderItemTexture(mGlobalMapTexture.get());
-        mGlobalMapImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+        mGlobalMapImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
         mGlobalMapOverlayTexture.reset(new osgMyGUI::OSGTexture(mGlobalMapRender->getOverlayTexture()));
         mGlobalMapOverlay->setRenderItemTexture(mGlobalMapOverlayTexture.get());
-        mGlobalMapOverlay->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+        mGlobalMapOverlay->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
     }
 
     MapWindow::~MapWindow()
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index a65379fca4..aa229de72d 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -142,7 +142,7 @@ namespace MWGui
 
         mPreviewTexture.reset(new osgMyGUI::OSGTexture(mPreview->getTexture()));
         mPreviewImage->setRenderItemTexture(mPreviewTexture.get());
-        mPreviewImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+        mPreviewImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
 
         const ESM::NPC& proto = mPreview->getPrototype();
         setRaceId(proto.mRace);
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 53c2807374..9de2374add 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -422,6 +422,6 @@ namespace MWGui
         mScreenshotTexture.reset(new osgMyGUI::OSGTexture(texture));
 
         mScreenshot->setRenderItemTexture(mScreenshotTexture.get());
-        mScreenshot->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
+        mScreenshot->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
     }
 }
diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index d28ea0b660..5a4bb981f4 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -50,7 +50,7 @@ void VideoWidget::playVideo(const std::string &video)
     mTexture.reset(new osgMyGUI::OSGTexture(texture));
 
     setRenderItemTexture(mTexture.get());
-    getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));
+    getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
 }
 
 int VideoWidget::getVideoWidth()
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index a6f68b5d4c..2588540540 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -194,7 +194,7 @@ namespace MWRender
         sizeX = std::max(sizeX, 0);
         sizeY = std::max(sizeY, 0);
 
-        mCamera->setViewport(0, 0, std::min(mSizeX, sizeX), std::min(mSizeY, sizeY));
+        mCamera->setViewport(0, mSizeY-sizeY, std::min(mSizeX, sizeX), std::min(mSizeY, sizeY));
 
         redraw();
     }
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 5bd56dc8f4..f5bebd560f 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -9,6 +9,7 @@
 #include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Texture2D>
+#include <osg/TexMat>
 
 #include <osgViewer/Viewer>
 
@@ -189,6 +190,12 @@ public:
         mStateSet->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON);
         mStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         mStateSet->setMode(GL_BLEND, osg::StateAttribute::ON);
+
+        // need to flip tex coords since MyGUI uses DirectX convention of top left image origin
+        osg::Matrix flipMat;
+        flipMat.preMultTranslate(osg::Vec3f(0,1,0));
+        flipMat.preMultScale(osg::Vec3f(1,-1,1));
+        mStateSet->setTextureAttribute(0, new osg::TexMat(flipMat), osg::StateAttribute::ON);
     }
     Drawable(const Drawable &copy, const osg::CopyOp &copyop=osg::CopyOp::SHALLOW_COPY)
         : osg::Drawable(copy, copyop)
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index a42568cf85..3560a3ae3b 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -145,6 +145,8 @@ namespace osgMyGUI
         if (!mLockedImage.valid())
             throw std::runtime_error("Texture not locked");
 
+        mLockedImage->flipVertical();
+
         // mTexture might be in use by the draw thread, so create a new texture instead and use that.
         osg::ref_ptr<osg::Texture2D> newTexture = new osg::Texture2D;
         newTexture->setTextureSize(getWidth(), getHeight());
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 5a60ab8a5e..08c268dde1 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -65,8 +65,14 @@ void ShapeData::read(NIFStream *nif)
         uvlist.resize(uvs);
         for(int i = 0;i < uvs;i++)
         {
-            uvlist[i] = new osg::Vec2Array(osg::Array::BIND_PER_VERTEX);
-            nif->getVector2s(uvlist[i], verts);
+            osg::Vec2Array* list = uvlist[i] = new osg::Vec2Array(osg::Array::BIND_PER_VERTEX);
+            nif->getVector2s(list, verts);
+
+            // flip the texture coordinates to convert them to the OpenGL convention of bottom-left image origin
+            for (unsigned int uv=0; uv<list->size(); ++uv)
+            {
+                (*list)[uv] = osg::Vec2((*list)[uv].x(), 1.f - (*list)[uv].y());
+            }
         }
     }
 }
diff --git a/components/resource/texturemanager.cpp b/components/resource/texturemanager.cpp
index b49c6bb094..709b925f12 100644
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/texturemanager.cpp
@@ -47,8 +47,8 @@ namespace Resource
     TextureManager::TextureManager(const VFS::Manager *vfs)
         : mVFS(vfs)
         , mWarningTexture(createWarningTexture())
+        , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba"))
     {
-
     }
 
     TextureManager::~TextureManager()
@@ -116,8 +116,6 @@ namespace Resource
                 return NULL;
             }
 
-            osg::ref_ptr<osgDB::Options> opts (new osgDB::Options);
-            opts->setOptionString("dds_dxt1_detect_rgba"); // tx_creature_werewolf.dds isn't loading in the correct format without this option
             size_t extPos = normalized.find_last_of('.');
             std::string ext;
             if (extPos != std::string::npos && extPos+1 < normalized.size())
@@ -129,7 +127,7 @@ namespace Resource
                 return NULL;
             }
 
-            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, opts);
+            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, mOptions);
             if (!result.success())
             {
                 std::cerr << "Error loading " << filename << ": " << result.message() << " code " << result.status() << std::endl;
@@ -170,8 +168,6 @@ namespace Resource
                 return mWarningTexture;
             }
 
-            osg::ref_ptr<osgDB::Options> opts (new osgDB::Options);
-            opts->setOptionString("dds_dxt1_detect_rgba"); // tx_creature_werewolf.dds isn't loading in the correct format without this option
             size_t extPos = normalized.find_last_of('.');
             std::string ext;
             if (extPos != std::string::npos && extPos+1 < normalized.size())
@@ -183,7 +179,7 @@ namespace Resource
                 return mWarningTexture;
             }
 
-            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, opts);
+            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, mOptions);
             if (!result.success())
             {
                 std::cerr << "Error loading " << filename << ": " << result.message() << " code " << result.status() << std::endl;
@@ -196,14 +192,6 @@ namespace Resource
                 return mWarningTexture;
             }
 
-            // We need to flip images, because the Morrowind texture coordinates use the DirectX convention (top-left image origin),
-            // but OpenGL uses bottom left as the image origin.
-            // For some reason this doesn't concern DDS textures, which are already flipped when loaded.
-            if (ext != "dds")
-            {
-                image->flipVertical();
-            }
-
             osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
             texture->setImage(image);
             texture->setWrap(osg::Texture::WRAP_S, wrapS);
diff --git a/components/resource/texturemanager.hpp b/components/resource/texturemanager.hpp
index 61a727b5ee..cb2711aa73 100644
--- a/components/resource/texturemanager.hpp
+++ b/components/resource/texturemanager.hpp
@@ -18,6 +18,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osgDB
+{
+    class Options;
+}
+
 namespace Resource
 {
 
@@ -49,6 +54,7 @@ namespace Resource
         std::map<MapKey, osg::ref_ptr<osg::Texture2D> > mTextures;
 
         osg::ref_ptr<osg::Texture2D> mWarningTexture;
+        osg::ref_ptr<osgDB::Options> mOptions;
 
         TextureManager(const TextureManager&);
         void operator = (const TextureManager&);
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index 9ecef04839..afe2406096 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -231,7 +231,7 @@ namespace SDLUtil
             return;
         }
 
-        SDL_Surface* surf = SDLUtil::imageToSurface(decompressed, false);
+        SDL_Surface* surf = SDLUtil::imageToSurface(decompressed, true);
 
         //set the cursor and store it for later
         SDL_Cursor* curs = SDL_CreateColorCursor(surf, hotspot_x, hotspot_y);
diff --git a/files/mygui/openmw_pointer.xml b/files/mygui/openmw_pointer.xml
index a55a5453c0..4a2f818600 100644
--- a/files/mygui/openmw_pointer.xml
+++ b/files/mygui/openmw_pointer.xml
@@ -23,13 +23,13 @@
         <Property key="Point" value="17 15"/>
         <Property key="Size" value="32 32"/>
         <Property key="Resource" value="HResizePointerImage"/>
-        <Property key="Rotation" value="45"/>
+        <Property key="Rotation" value="-45"/>
     </Resource>
     <Resource type="ResourceImageSetPointer" name="dresize2">
         <Property key="Point" value="15 15"/>
         <Property key="Size" value="32 32"/>
         <Property key="Resource" value="HResizePointerImage"/>
-        <Property key="Rotation" value="-45"/>
+        <Property key="Rotation" value="45"/>
     </Resource>
     <Resource type="ResourceImageSetPointer" name="drop_ground">
         <Property key="Point" value="0 24"/>

From 31988ca4cc643e9b1e76597f8574a30216513cc9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 21:07:08 +0100
Subject: [PATCH 178/765] Add a dont_override_filter description for textures
 that should be left alone

---
 components/resource/scenemanager.cpp | 7 +++++++
 components/terrain/terraingrid.cpp   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index df103f50c9..065187c79e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -189,6 +189,13 @@ namespace Resource
             osg::Texture* tex = attr->asTexture();
             if (tex)
             {
+                if (tex->getUserDataContainer())
+                {
+                    const std::vector<std::string>& descriptions = tex->getUserDataContainer()->getDescriptions();
+                    if (std::find(descriptions.begin(), descriptions.end(), "dont_override_filter") != descriptions.end())
+                        return;
+                }
+
                 tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
                 tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
                 tex->setMaxAnisotropy(mMaxAnisotropy);
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index fb037c003c..b7d7277301 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -151,6 +151,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
             texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
             texture->setResizeNonPowerOfTwoHint(false);
+            texture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
             blendmapTextures.push_back(texture);
 
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());

From 71401aafe7eaef6b864fb0b1e6ad86f89e9a70c3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 21:08:32 +0100
Subject: [PATCH 179/765] Handle multipass techniques in
 SetFilterSettingsVisitor

---
 components/resource/scenemanager.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 065187c79e..e3f38e8867 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -6,6 +6,7 @@
 #include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
+#include <osgFX/Effect>
 
 #include <osgUtil/IncrementalCompileOperation>
 
@@ -153,12 +154,29 @@ namespace Resource
 
         virtual void apply(osg::Node& node)
         {
+            if (osgFX::Effect* effect = dynamic_cast<osgFX::Effect*>(&node))
+                apply(*effect);
+
             osg::StateSet* stateset = node.getStateSet();
             if (stateset)
                 apply(stateset);
+
             traverse(node);
         }
 
+        void apply(osgFX::Effect& effect)
+        {
+            for (int i =0; i<effect.getNumTechniques(); ++i)
+            {
+                osgFX::Technique* tech = effect.getTechnique(i);
+                for (int pass=0; pass<tech->getNumPasses(); ++pass)
+                {
+                    if (tech->getPassStateSet(pass))
+                        apply(tech->getPassStateSet(pass));
+                }
+            }
+        }
+
         virtual void apply(osg::Geode& geode)
         {
             osg::StateSet* stateset = geode.getStateSet();

From fbd4ad9b0cac68457a33834ee7482c08d95e3c01 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 22:46:15 +0100
Subject: [PATCH 180/765] Flip terrain textures

---
 components/esmterrain/storage.cpp  | 4 ++--
 components/terrain/buffercache.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 4be56d5e6a..267b831ec5 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -399,9 +399,9 @@ namespace ESMTerrain
                     int channel = pack ? std::max(0, (layerIndex-1) % 4) : 0;
 
                     if (blendIndex == i)
-                        pData[y*blendmapSize*channels + x*channels + channel] = 255;
+                        pData[(blendmapSize - y - 1)*blendmapSize*channels + x*channels + channel] = 255;
                     else
-                        pData[y*blendmapSize*channels + x*channels + channel] = 0;
+                        pData[(blendmapSize - y - 1)*blendmapSize*channels + x*channels + channel] = 0;
                 }
             }
 
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index a64f8ffd1d..f9c860d47b 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -193,7 +193,7 @@ namespace Terrain
             for (unsigned int row = 0; row < mNumVerts; ++row)
             {
                 uvs->push_back(osg::Vec2f(col / static_cast<float>(mNumVerts-1),
-                                          row / static_cast<float>(mNumVerts-1)));
+                                          ((mNumVerts-1) - row) / static_cast<float>(mNumVerts-1)));
             }
         }
 

From 6ef848b7c50497438dd0cf85a17709a7bb0dfb75 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 22:58:02 +0100
Subject: [PATCH 181/765] Remove TextureManager::getTexture2D

Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.

This is closer to what the OSG serializer does.

Streamlines the TextureManager and will make it easier to multithread.
---
 apps/openmw/mwgui/windowmanagerimp.cpp    |  6 +-
 apps/openmw/mwrender/animation.cpp        |  5 +-
 apps/openmw/mwrender/renderingmanager.cpp |  7 +++
 apps/openmw/mwrender/renderingmanager.hpp |  2 +
 apps/openmw/mwrender/ripplesimulation.cpp |  7 ++-
 apps/openmw/mwrender/sky.cpp              | 42 ++++++++-----
 apps/openmw/mwrender/util.cpp             |  6 +-
 apps/openmw/mwrender/water.cpp            |  8 ++-
 apps/openmw/mwworld/scene.cpp             |  4 +-
 components/nifosg/nifloader.cpp           | 11 ++--
 components/resource/texturemanager.cpp    | 75 ++---------------------
 components/resource/texturemanager.hpp    | 13 ++--
 components/terrain/terraingrid.cpp        | 30 ++++++++-
 components/terrain/terraingrid.hpp        |  6 ++
 components/terrain/world.hpp              |  2 +
 15 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 90c0494f6d..346c672f79 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2015,9 +2015,9 @@ namespace MWGui
                 continue;
             std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
 
-            osg::ref_ptr<osg::Texture2D> tex = mResourceSystem->getTextureManager()->getTexture2D(tex_name, osg::Texture::CLAMP, osg::Texture::CLAMP);
+            osg::ref_ptr<osg::Image> image = mResourceSystem->getTextureManager()->getImage(tex_name);
 
-            if(tex.valid())
+            if(image.valid())
             {
                 //everything looks good, send it to the cursor manager
                 Uint8 size_x = imgSetPointer->getSize().width;
@@ -2026,7 +2026,7 @@ namespace MWGui
                 Uint8 hotspot_y = imgSetPointer->getHotSpot().top;
                 int rotation = imgSetPointer->getRotation();
 
-                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, tex->getImage(), size_x, size_y, hotspot_x, hotspot_y);
+                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, size_x, size_y, hotspot_x, hotspot_y);
             }
         }
     }
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index a7bb3f1281..35602fa172 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1059,7 +1059,10 @@ namespace MWRender
             stream << i;
             stream << ".dds";
 
-            osg::ref_ptr<osg::Texture2D> tex = mResourceSystem->getTextureManager()->getTexture2D(stream.str(), osg::Texture2D::REPEAT, osg::Texture2D::REPEAT);
+            osg::ref_ptr<osg::Image> image = mResourceSystem->getTextureManager()->getImage(stream.str());
+            osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(image));
+            tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
+            tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
             mResourceSystem->getSceneManager()->applyFilterSettings(tex);
             textures.push_back(tex);
         }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 755a8019b1..2237d81252 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -231,6 +231,13 @@ namespace MWRender
         return mResourceSystem;
     }
 
+    void RenderingManager::clearCache()
+    {
+        mResourceSystem->clearCache();
+        if (mTerrain.get())
+            mTerrain->clearCache();
+    }
+
     osg::Group* RenderingManager::getLightRoot()
     {
         return mLightRoot.get();
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 3b583af89c..550e48e636 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -65,6 +65,8 @@ namespace MWRender
 
         Resource::ResourceSystem* getResourceSystem();
 
+        void clearCache();
+
         osg::Group* getLightRoot();
 
         void setNightEyeFactor(float factor);
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index f74631c4a2..603cd397b1 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -15,6 +15,7 @@
 #include <components/nifosg/controller.hpp>
 #include <components/resource/texturemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
+#include <components/resource/scenemanager.hpp>
 #include <components/fallback/fallback.hpp>
 
 #include "vismask.hpp"
@@ -39,7 +40,11 @@ namespace
         {
             std::ostringstream texname;
             texname << "textures/water/" << tex << std::setw(2) << std::setfill('0') << i << ".dds";
-            textures.push_back(resourceSystem->getTextureManager()->getTexture2D(texname.str(), osg::Texture::REPEAT, osg::Texture::REPEAT));
+            osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(resourceSystem->getTextureManager()->getImage(texname.str())));
+            tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+            tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+            resourceSystem->getSceneManager()->applyFilterSettings(tex);
+            textures.push_back(tex);
         }
 
         osg::ref_ptr<NifOsg::FlipController> controller (new NifOsg::FlipController(0, 0.3f/rippleFrameCount, textures));
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 513fc74a34..2a25baea90 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -476,9 +476,9 @@ public:
         mTransform->addUpdateCallback(mUpdater);
         mTransform->setNodeMask(Mask_Sun);
 
-        osg::ref_ptr<osg::Texture2D> sunTex = textureManager.getTexture2D("textures/tx_sun_05.dds",
-                                                                        osg::Texture::CLAMP,
-                                                                        osg::Texture::CLAMP);
+        osg::ref_ptr<osg::Texture2D> sunTex (new osg::Texture2D(textureManager.getImage("textures/tx_sun_05.dds")));
+        sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
         mGeode->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
 
@@ -604,9 +604,9 @@ private:
 
     void createSunFlash(Resource::TextureManager& textureManager)
     {
-        osg::ref_ptr<osg::Texture2D> tex = textureManager.getTexture2D("textures/tx_sun_flash_grey_05.dds",
-                                                                        osg::Texture::CLAMP,
-                                                                        osg::Texture::CLAMP);
+        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(textureManager.getImage("textures/tx_sun_flash_grey_05.dds")));
+        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
         osg::ref_ptr<osg::PositionAttitudeTransform> transform (new osg::PositionAttitudeTransform);
         const float scale = 2.6f;
@@ -1055,8 +1055,12 @@ private:
 
         void setTextures(const std::string& phaseTex, const std::string& circleTex)
         {
-            mPhaseTex = mTextureManager.getTexture2D(phaseTex, osg::Texture::CLAMP, osg::Texture::CLAMP);
-            mCircleTex = mTextureManager.getTexture2D(circleTex, osg::Texture::CLAMP, osg::Texture::CLAMP);
+            mPhaseTex = new osg::Texture2D(mTextureManager.getImage(phaseTex));
+            mPhaseTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mPhaseTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mCircleTex = new osg::Texture2D(mTextureManager.getImage(circleTex));
+            mCircleTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            mCircleTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
             reset();
         }
@@ -1342,8 +1346,12 @@ void SkyManager::createRain()
     mRainParticleSystem->setAlignVectorY(osg::Vec3f(0,0,-1));
 
     osg::ref_ptr<osg::StateSet> stateset (mRainParticleSystem->getOrCreateStateSet());
-    stateset->setTextureAttributeAndModes(0, mSceneManager->getTextureManager()->getTexture2D("textures/tx_raindrop_01.dds",
-        osg::Texture::CLAMP, osg::Texture::CLAMP), osg::StateAttribute::ON);
+
+    osg::ref_ptr<osg::Texture2D> raindropTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage("textures/tx_raindrop_01.dds")));
+    raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+    raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+
+    stateset->setTextureAttributeAndModes(0, raindropTex, osg::StateAttribute::ON);
     stateset->setNestRenderBins(false);
     stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
     stateset->setMode(GL_CULL_FACE, osg::StateAttribute::OFF);
@@ -1549,8 +1557,11 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
         std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
 
-        mCloudUpdater->setTexture(mSceneManager->getTextureManager()->getTexture2D(texture,
-                                                                                   osg::Texture::REPEAT, osg::Texture::REPEAT));
+        osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage(texture)));
+        cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+        cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+
+        mCloudUpdater->setTexture(cloudTex);
     }
 
     if (mNextClouds != weather.mNextCloudTexture)
@@ -1561,8 +1572,11 @@ void SkyManager::setWeather(const WeatherResult& weather)
         {
             std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
-            mCloudUpdater2->setTexture(mSceneManager->getTextureManager()->getTexture2D(texture,
-                                                                                       osg::Texture::REPEAT, osg::Texture::REPEAT));
+            osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage(texture)));
+            cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+            cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+
+            mCloudUpdater2->setTexture(cloudTex);
         }
     }
 
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index e1af1c3393..df6a0497f1 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -15,8 +15,10 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
         return;
     std::string correctedTexture = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
     // Not sure if wrap settings should be pulled from the overridden texture?
-    osg::ref_ptr<osg::Texture2D> tex = resourceSystem->getTextureManager()->getTexture2D(correctedTexture, osg::Texture2D::CLAMP,
-                                                                                          osg::Texture2D::CLAMP);
+    osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getTextureManager()->getImage(correctedTexture));
+    tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+    tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+
     osg::ref_ptr<osg::StateSet> stateset;
     if (node->getStateSet())
         stateset = static_cast<osg::StateSet*>(node->getStateSet()->clone(osg::CopyOp::SHALLOW_COPY));
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index c7f2c9cc6e..ff31564119 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -317,6 +317,7 @@ public:
         mRefractionTexture->setInternalFormat(GL_RGB);
         mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mRefractionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mRefractionTexture);
 
@@ -328,6 +329,7 @@ public:
         mRefractionDepthTexture->setSourceType(GL_UNSIGNED_INT);
         mRefractionDepthTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionDepthTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        mRefractionDepthTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
     }
@@ -388,6 +390,7 @@ public:
         mReflectionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
         mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mReflectionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mReflectionTexture);
 
@@ -553,7 +556,10 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     {
         std::ostringstream texname;
         texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-        textures.push_back(mResourceSystem->getTextureManager()->getTexture2D(texname.str(), osg::Texture::REPEAT, osg::Texture::REPEAT));
+        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getTextureManager()->getImage(texname.str())));
+        tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+        tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+        textures.push_back(tex);
     }
 
     if (!textures.size())
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 618a219f31..f30e6efe10 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -402,7 +402,7 @@ namespace MWWorld
 
         mCellChanged = true;
 
-        mRendering.getResourceSystem()->clearCache();
+        mRendering.clearCache();
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -515,7 +515,7 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
-        mRendering.getResourceSystem()->clearCache();
+        mRendering.clearCache();
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 79f8379532..190fd020fe 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -709,7 +709,9 @@ namespace NifOsg
                         }
 
                         std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, textureManager->getVFS());
-                        osg::ref_ptr<osg::Texture2D> texture = textureManager->getTexture2D(filename, wrapS, wrapT);
+                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(textureManager->getImage(filename)));
+                        texture->setWrap(osg::Texture::WRAP_S, wrapS);
+                        texture->setWrap(osg::Texture::WRAP_T, wrapT);
                         textures.push_back(texture);
                     }
                     osg::ref_ptr<FlipController> callback(new FlipController(flipctrl, textures));
@@ -1376,9 +1378,10 @@ namespace NifOsg
                         int wrapT = (clamp) & 0x1;
                         int wrapS = (clamp >> 1) & 0x1;
 
-                        osg::ref_ptr<osg::Texture2D> texture2d = textureManager->getTexture2D(filename,
-                              wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP,
-                              wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+                        // create a new texture, will later attempt to share using the SharedStateManager
+                        osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(textureManager->getImage(filename)));
+                        texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+                        texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
 
                         int texUnit = boundTextures.size();
 
diff --git a/components/resource/texturemanager.cpp b/components/resource/texturemanager.cpp
index 709b925f12..b3f23ab406 100644
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/texturemanager.cpp
@@ -4,8 +4,6 @@
 #include <osg/GLExtensions>
 #include <osg/Version>
 
-#include <stdexcept>
-
 #include <components/vfs/manager.hpp>
 
 #ifdef OSG_LIBRARY_STATIC
@@ -47,6 +45,7 @@ namespace Resource
     TextureManager::TextureManager(const VFS::Manager *vfs)
         : mVFS(vfs)
         , mWarningTexture(createWarningTexture())
+        , mWarningImage(mWarningTexture->getImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba"))
     {
     }
@@ -56,13 +55,6 @@ namespace Resource
 
     }
 
-    /*
-    osg::ref_ptr<osg::Image> TextureManager::getImage(const std::string &filename)
-    {
-
-    }
-    */
-
     bool checkSupported(osg::Image* image, const std::string& filename)
     {
         switch(image->getPixelFormat())
@@ -113,7 +105,7 @@ namespace Resource
             catch (std::exception& e)
             {
                 std::cerr << "Failed to open image: " << e.what() << std::endl;
-                return NULL;
+                return mWarningImage;
             }
 
             size_t extPos = normalized.find_last_of('.');
@@ -124,20 +116,20 @@ namespace Resource
             if (!reader)
             {
                 std::cerr << "Error loading " << filename << ": no readerwriter for '" << ext << "' found" << std::endl;
-                return NULL;
+                return mWarningImage;
             }
 
             osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, mOptions);
             if (!result.success())
             {
                 std::cerr << "Error loading " << filename << ": " << result.message() << " code " << result.status() << std::endl;
-                return NULL;
+                return mWarningImage;
             }
 
             osg::Image* image = result.getImage();
             if (!checkSupported(image, filename))
             {
-                return NULL;
+                return mWarningImage;
             }
 
             mImages.insert(std::make_pair(normalized, image));
@@ -145,63 +137,6 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Texture2D> TextureManager::getTexture2D(const std::string &filename, osg::Texture::WrapMode wrapS, osg::Texture::WrapMode wrapT)
-    {
-        std::string normalized = filename;
-        mVFS->normalizeFilename(normalized);
-        MapKey key = std::make_pair(std::make_pair(wrapS, wrapT), normalized);
-        std::map<MapKey, osg::ref_ptr<osg::Texture2D> >::iterator found = mTextures.find(key);
-        if (found != mTextures.end())
-        {
-            return found->second;
-        }
-        else
-        {
-            Files::IStreamPtr stream;
-            try
-            {
-                stream = mVFS->get(normalized.c_str());
-            }
-            catch (std::exception& e)
-            {
-                std::cerr << "Failed to open texture: " << e.what() << std::endl;
-                return mWarningTexture;
-            }
-
-            size_t extPos = normalized.find_last_of('.');
-            std::string ext;
-            if (extPos != std::string::npos && extPos+1 < normalized.size())
-                ext = normalized.substr(extPos+1);
-            osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
-            if (!reader)
-            {
-                std::cerr << "Error loading " << filename << ": no readerwriter for '" << ext << "' found" << std::endl;
-                return mWarningTexture;
-            }
-
-            osgDB::ReaderWriter::ReadResult result = reader->readImage(*stream, mOptions);
-            if (!result.success())
-            {
-                std::cerr << "Error loading " << filename << ": " << result.message() << " code " << result.status() << std::endl;
-                return mWarningTexture;
-            }
-
-            osg::Image* image = result.getImage();
-            if (!checkSupported(image, filename))
-            {
-                return mWarningTexture;
-            }
-
-            osg::ref_ptr<osg::Texture2D> texture(new osg::Texture2D);
-            texture->setImage(image);
-            texture->setWrap(osg::Texture::WRAP_S, wrapS);
-            texture->setWrap(osg::Texture::WRAP_T, wrapT);
-
-            mTextures.insert(std::make_pair(key, texture));
-            return texture;
-        }
-    }
-
     osg::Texture2D* TextureManager::getWarningTexture()
     {
         return mWarningTexture.get();
diff --git a/components/resource/texturemanager.hpp b/components/resource/texturemanager.hpp
index cb2711aa73..0290d2340b 100644
--- a/components/resource/texturemanager.hpp
+++ b/components/resource/texturemanager.hpp
@@ -26,18 +26,15 @@ namespace osgDB
 namespace Resource
 {
 
-    /// @brief Handles loading/caching of Images and Texture StateAttributes.
+    /// @brief Handles loading/caching of Images.
     class TextureManager
     {
     public:
         TextureManager(const VFS::Manager* vfs);
         ~TextureManager();
 
-        /// Create or retrieve a Texture2D using the specified image filename, and wrap parameters.
-        /// Returns the dummy texture if the given texture is not found.
-        osg::ref_ptr<osg::Texture2D> getTexture2D(const std::string& filename, osg::Texture::WrapMode wrapS, osg::Texture::WrapMode wrapT);
-
         /// Create or retrieve an Image
+        /// Returns the dummy image if the given image is not found.
         osg::ref_ptr<osg::Image> getImage(const std::string& filename);
 
         const VFS::Manager* getVFS() { return mVFS; }
@@ -47,13 +44,11 @@ namespace Resource
     private:
         const VFS::Manager* mVFS;
 
-        typedef std::pair<std::pair<int, int>, std::string> MapKey;
-
+        // TODO: use ObjectCache
         std::map<std::string, osg::ref_ptr<osg::Image> > mImages;
 
-        std::map<MapKey, osg::ref_ptr<osg::Texture2D> > mTextures;
-
         osg::ref_ptr<osg::Texture2D> mWarningTexture;
+        osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
 
         TextureManager(const TextureManager&);
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index b7d7277301..58675a7140 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -4,6 +4,7 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/texturemanager.hpp>
+#include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
@@ -134,10 +135,19 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
         // For compiling textures, I don't think the osgFX::Effect does it correctly
         osg::ref_ptr<osg::Node> textureCompileDummy (new osg::Node);
         unsigned int dummyTextureCounter = 0;
+
         std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
         for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
         {
-            layerTextures.push_back(mResourceSystem->getTextureManager()->getTexture2D(it->mDiffuseMap, osg::Texture::REPEAT, osg::Texture::REPEAT));
+            osg::ref_ptr<osg::Texture2D> tex = mTextureCache[it->mDiffuseMap];
+            if (!tex)
+            {
+                tex = new osg::Texture2D(mResourceSystem->getTextureManager()->getImage(it->mDiffuseMap));
+                tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                mTextureCache[it->mDiffuseMap] = tex;
+            }
+            layerTextures.push_back(tex);
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
         }
 
@@ -148,15 +158,18 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setImage(*it);
             texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
-            texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
             texture->setResizeNonPowerOfTwoHint(false);
             texture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
             blendmapTextures.push_back(texture);
+            mResourceSystem->getSceneManager()->applyFilterSettings(texture);
 
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
         }
 
+        // SharedStatemanager->share(textureCompileDummy);
+
+        // Remove unrefImageDataAfterApply for better state sharing
+
         // use texture coordinates for both texture units, the layer texture and blend texture
         for (unsigned int i=0; i<2; ++i)
             geometry->setTexCoordArray(i, mCache.getUVBuffer());
@@ -226,4 +239,15 @@ void TerrainGrid::unloadCell(int x, int y)
     mGrid.erase(it);
 }
 
+void TerrainGrid::clearCache()
+{
+    for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
+    {
+        if (it->second->referenceCount() <= 1)
+            mTextureCache.erase(it++);
+        else
+            ++it;
+    }
+}
+
 }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 169a9a6228..81bfc4211e 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -27,12 +27,18 @@ namespace Terrain
         virtual void loadCell(int x, int y);
         virtual void unloadCell(int x, int y);
 
+        /// Clear cached textures that are no longer referenced
+        void clearCache();
+
     private:
         osg::ref_ptr<osg::Node> buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
 
         // split each ESM::Cell into mNumSplits*mNumSplits terrain chunks
         unsigned int mNumSplits;
 
+        typedef std::map<std::string, osg::ref_ptr<osg::Texture2D> >  TextureCache;
+        TextureCache mTextureCache;
+
         typedef std::map<std::pair<int, int>, GridElement*> Grid;
         Grid mGrid;
 
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 4212f2a0c2..bd5d0a4661 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -39,6 +39,8 @@ namespace Terrain
               Storage* storage, int nodeMask);
         virtual ~World();
 
+        virtual void clearCache() {}
+
         float getHeightAt (const osg::Vec3f& worldPos);
 
         // This is only a hint and may be ignored by the implementation.

From f99f403dda1160ed25172571b1dc22aa48f6b8f3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:03:53 +0100
Subject: [PATCH 182/765] Rename TextureManager to ImageManager

---
 apps/openmw/mwgui/windowmanagerimp.cpp             |  2 +-
 apps/openmw/mwrender/animation.cpp                 |  2 +-
 apps/openmw/mwrender/renderingmanager.cpp          |  2 +-
 apps/openmw/mwrender/ripplesimulation.cpp          |  2 +-
 apps/openmw/mwrender/sky.cpp                       | 14 +++++++-------
 apps/openmw/mwrender/util.cpp                      |  2 +-
 apps/openmw/mwrender/water.cpp                     |  2 +-
 components/CMakeLists.txt                          |  2 +-
 components/myguiplatform/myguiplatform.cpp         |  2 +-
 components/myguiplatform/myguiplatform.hpp         |  4 ++--
 components/myguiplatform/myguirendermanager.cpp    |  4 ++--
 components/myguiplatform/myguirendermanager.hpp    |  6 +++---
 components/myguiplatform/myguitexture.cpp          |  4 ++--
 components/myguiplatform/myguitexture.hpp          |  6 +++---
 components/nifosg/nifloader.cpp                    | 14 +++++++-------
 components/nifosg/nifloader.hpp                    |  4 ++--
 .../{texturemanager.cpp => imagemanager.cpp}       | 10 +++++-----
 .../{texturemanager.hpp => imagemanager.hpp}       | 10 +++++-----
 components/resource/resourcesystem.cpp             |  6 +++---
 components/resource/resourcesystem.hpp             |  6 +++---
 components/resource/scenemanager.cpp               | 12 ++++++------
 components/resource/scenemanager.hpp               |  8 ++++----
 components/terrain/terraingrid.cpp                 |  2 +-
 23 files changed, 63 insertions(+), 63 deletions(-)
 rename components/resource/{texturemanager.cpp => imagemanager.cpp} (94%)
 rename components/resource/{texturemanager.hpp => imagemanager.hpp} (83%)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 346c672f79..d053d8bfde 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -28,7 +28,7 @@
 #include <components/fontloader/fontloader.hpp>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 #include <components/translation/translation.hpp>
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 35602fa172..2c5831dae1 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -19,7 +19,7 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/keyframemanager.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 #include <components/nifosg/nifloader.hpp> // KeyframeHolder
 #include <components/nifosg/controller.hpp>
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 2237d81252..d1b5f6fda6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -17,7 +17,7 @@
 #include <osgViewer/Viewer>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 
 #include <components/settings/settings.hpp>
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 603cd397b1..6cfcbc498e 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -13,7 +13,7 @@
 
 #include <components/misc/rng.hpp>
 #include <components/nifosg/controller.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
 #include <components/fallback/fallback.hpp>
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 2a25baea90..0f70e2c026 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -31,7 +31,7 @@
 #include <components/misc/resourcehelpers.hpp>
 
 #include <components/resource/scenemanager.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 #include <components/vfs/manager.hpp>
 #include <components/fallback/fallback.hpp>
@@ -134,7 +134,7 @@ private:
 class AtmosphereNightUpdater : public SceneUtil::StateSetUpdater
 {
 public:
-    AtmosphereNightUpdater(Resource::TextureManager* textureManager)
+    AtmosphereNightUpdater(Resource::ImageManager* textureManager)
     {
         // we just need a texture, its contents don't really matter
         mTexture = textureManager->getWarningTexture();
@@ -469,7 +469,7 @@ const float CelestialBody::mDistance = 1000.0f;
 class Sun : public CelestialBody
 {
 public:
-    Sun(osg::Group* parentNode, Resource::TextureManager& textureManager)
+    Sun(osg::Group* parentNode, Resource::ImageManager& textureManager)
         : CelestialBody(parentNode, 1.0f, 1)
         , mUpdater(new Updater)
     {
@@ -602,7 +602,7 @@ private:
         return oqn;
     }
 
-    void createSunFlash(Resource::TextureManager& textureManager)
+    void createSunFlash(Resource::ImageManager& textureManager)
     {
         osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(textureManager.getImage("textures/tx_sun_flash_grey_05.dds")));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -932,7 +932,7 @@ public:
         Type_Secunda
     };
 
-    Moon(osg::Group* parentNode, Resource::TextureManager& textureManager, float scaleFactor, Type type)
+    Moon(osg::Group* parentNode, Resource::ImageManager& textureManager, float scaleFactor, Type type)
         : CelestialBody(parentNode, scaleFactor, 2)
         , mType(type)
         , mPhase(MoonState::Phase_Unspecified)
@@ -1001,7 +1001,7 @@ public:
 private:
     struct Updater : public SceneUtil::StateSetUpdater
     {
-        Resource::TextureManager& mTextureManager;
+        Resource::ImageManager& mTextureManager;
         osg::ref_ptr<osg::Texture2D> mPhaseTex;
         osg::ref_ptr<osg::Texture2D> mCircleTex;
         float mTransparency;
@@ -1009,7 +1009,7 @@ private:
         osg::Vec4f mAtmosphereColor;
         osg::Vec4f mMoonColor;
 
-        Updater(Resource::TextureManager& textureManager)
+        Updater(Resource::ImageManager& textureManager)
             : mTextureManager(textureManager)
             , mPhaseTex()
             , mCircleTex()
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index df6a0497f1..3c8d1408af 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -3,7 +3,7 @@
 #include <osg/Node>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 
 namespace MWRender
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index ff31564119..7d1221a53e 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -25,7 +25,7 @@
 #include <osgUtil/CullVisitor>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 #include <components/nifosg/controller.hpp>
 #include <components/sceneutil/controller.hpp>
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 089779eda8..0b54ddeb73 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -41,7 +41,7 @@ add_component_dir (vfs
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager texturemanager resourcesystem bulletshapemanager bulletshape niffilemanager objectcache
+    scenemanager keyframemanager imagemanager resourcesystem bulletshapemanager bulletshape niffilemanager objectcache
     )
 
 add_component_dir (sceneutil
diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp
index 22b88438f6..491af84868 100644
--- a/components/myguiplatform/myguiplatform.cpp
+++ b/components/myguiplatform/myguiplatform.cpp
@@ -7,7 +7,7 @@
 namespace osgMyGUI
 {
 
-Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::TextureManager *textureManager, float uiScalingFactor)
+Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::ImageManager *textureManager, float uiScalingFactor)
     : mRenderManager(nullptr)
     , mDataManager(nullptr)
     , mLogManager(nullptr)
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index 90d45ce204..b3f9597982 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -13,7 +13,7 @@ namespace osg
 }
 namespace Resource
 {
-    class TextureManager;
+    class ImageManager;
 }
 namespace MyGUI
 {
@@ -30,7 +30,7 @@ namespace osgMyGUI
     class Platform
     {
     public:
-        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::TextureManager* textureManager, float uiScalingFactor);
+        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* textureManager, float uiScalingFactor);
 
         ~Platform();
 
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index f5bebd560f..23d004f478 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -15,7 +15,7 @@
 
 #include <osgGA/GUIEventHandler>
 
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 #include "myguitexture.hpp"
 
@@ -353,7 +353,7 @@ void OSGVertexBuffer::create()
 
 // ---------------------------------------------------------------------------
 
-RenderManager::RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::TextureManager* textureManager, float scalingFactor)
+RenderManager::RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* textureManager, float scalingFactor)
   : mViewer(viewer)
   , mSceneRoot(sceneroot)
   , mTextureManager(textureManager)
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index f2251cdb04..b1aa0d3f0f 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -7,7 +7,7 @@
 
 namespace Resource
 {
-    class TextureManager;
+    class ImageManager;
 }
 
 namespace osgViewer
@@ -33,7 +33,7 @@ class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
     osg::ref_ptr<osgViewer::Viewer> mViewer;
     osg::ref_ptr<osg::Group> mSceneRoot;
     osg::ref_ptr<Drawable> mDrawable;
-    Resource::TextureManager* mTextureManager;
+    Resource::ImageManager* mTextureManager;
 
     MyGUI::IntSize mViewSize;
     bool mUpdate;
@@ -54,7 +54,7 @@ class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
     void destroyAllResources();
 
 public:
-    RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::TextureManager* textureManager, float scalingFactor);
+    RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* textureManager, float scalingFactor);
     virtual ~RenderManager();
 
     void initialise();
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 3560a3ae3b..904ed6abf7 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -5,12 +5,12 @@
 
 #include <osg/Texture2D>
 
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 namespace osgMyGUI
 {
 
-    OSGTexture::OSGTexture(const std::string &name, Resource::TextureManager* textureManager)
+    OSGTexture::OSGTexture(const std::string &name, Resource::ImageManager* textureManager)
       : mName(name)
       , mTextureManager(textureManager)
       , mFormat(MyGUI::PixelFormat::Unknow)
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index de385e94d6..21bc899928 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -13,7 +13,7 @@ namespace osg
 
 namespace Resource
 {
-    class TextureManager;
+    class ImageManager;
 }
 
 namespace osgMyGUI
@@ -21,7 +21,7 @@ namespace osgMyGUI
 
     class OSGTexture : public MyGUI::ITexture {
         std::string mName;
-        Resource::TextureManager* mTextureManager;
+        Resource::ImageManager* mTextureManager;
 
         osg::ref_ptr<osg::Image> mLockedImage;
         osg::ref_ptr<osg::Texture2D> mTexture;
@@ -30,7 +30,7 @@ namespace osgMyGUI
         size_t mNumElemBytes;
 
     public:
-        OSGTexture(const std::string &name, Resource::TextureManager* textureManager);
+        OSGTexture(const std::string &name, Resource::ImageManager* textureManager);
         OSGTexture(osg::Texture2D* texture);
         virtual ~OSGTexture();
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 190fd020fe..d09c34aa58 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -11,7 +11,7 @@
 // resource
 #include <components/misc/stringops.hpp>
 #include <components/misc/resourcehelpers.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 
 // skel
 #include <osgAnimation/MorphGeometry>
@@ -343,7 +343,7 @@ namespace NifOsg
             }
         }
 
-        osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::TextureManager* textureManager)
+        osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::ImageManager* textureManager)
         {
             if (nif->numRoots() < 1)
                 nif->fail("Found no root nodes");
@@ -369,7 +369,7 @@ namespace NifOsg
             return created;
         }
 
-        void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::TextureManager* textureManager, std::vector<int>& boundTextures, int animflags)
+        void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, std::vector<int>& boundTextures, int animflags)
         {
             const Nif::PropertyList& props = nifNode->props;
             for (size_t i = 0; i <props.length();++i)
@@ -440,7 +440,7 @@ namespace NifOsg
             return lod;
         }
 
-        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::TextureManager* textureManager,
+        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* textureManager,
                                 std::vector<int> boundTextures, int animflags, int particleflags, bool skipMeshes, TextKeyMap* textKeys, osg::Node* rootNode=NULL)
         {
             osg::ref_ptr<osg::Group> node = new osg::MatrixTransform(nifNode->trafo.toMatrix());
@@ -682,7 +682,7 @@ namespace NifOsg
             }
         }
 
-        void handleTextureControllers(const Nif::Property *texProperty, SceneUtil::CompositeStateSetUpdater* composite, Resource::TextureManager* textureManager, osg::StateSet *stateset, int animflags)
+        void handleTextureControllers(const Nif::Property *texProperty, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, osg::StateSet *stateset, int animflags)
         {
             for (Nif::ControllerPtr ctrl = texProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
@@ -1244,7 +1244,7 @@ namespace NifOsg
         }
 
         void handleProperty(const Nif::Property *property,
-                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::TextureManager* textureManager, std::vector<int>& boundTextures, int animflags)
+                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, std::vector<int>& boundTextures, int animflags)
         {
             switch (property->recType)
             {
@@ -1543,7 +1543,7 @@ namespace NifOsg
 
     };
 
-    osg::ref_ptr<osg::Node> Loader::load(Nif::NIFFilePtr file, Resource::TextureManager* textureManager)
+    osg::ref_ptr<osg::Node> Loader::load(Nif::NIFFilePtr file, Resource::ImageManager* textureManager)
     {
         LoaderImpl impl(file->getFilename());
         return impl.load(file, textureManager);
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index e15df53028..afc912ed38 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -15,7 +15,7 @@ namespace osg
 
 namespace Resource
 {
-    class TextureManager;
+    class ImageManager;
 }
 
 namespace NifOsg
@@ -62,7 +62,7 @@ namespace NifOsg
     {
     public:
         /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton if so.
-        static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::TextureManager* textureManager);
+        static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::ImageManager* textureManager);
 
         /// Load keyframe controllers from the given kf file.
         static void loadKf(Nif::NIFFilePtr kf, KeyframeHolder& target);
diff --git a/components/resource/texturemanager.cpp b/components/resource/imagemanager.cpp
similarity index 94%
rename from components/resource/texturemanager.cpp
rename to components/resource/imagemanager.cpp
index b3f23ab406..8b14e72376 100644
--- a/components/resource/texturemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -1,4 +1,4 @@
-#include "texturemanager.hpp"
+#include "imagemanager.hpp"
 
 #include <osgDB/Registry>
 #include <osg/GLExtensions>
@@ -42,7 +42,7 @@ namespace
 namespace Resource
 {
 
-    TextureManager::TextureManager(const VFS::Manager *vfs)
+    ImageManager::ImageManager(const VFS::Manager *vfs)
         : mVFS(vfs)
         , mWarningTexture(createWarningTexture())
         , mWarningImage(mWarningTexture->getImage())
@@ -50,7 +50,7 @@ namespace Resource
     {
     }
 
-    TextureManager::~TextureManager()
+    ImageManager::~ImageManager()
     {
 
     }
@@ -88,7 +88,7 @@ namespace Resource
         return true;
     }
 
-    osg::ref_ptr<osg::Image> TextureManager::getImage(const std::string &filename)
+    osg::ref_ptr<osg::Image> ImageManager::getImage(const std::string &filename)
     {
         std::string normalized = filename;
         mVFS->normalizeFilename(normalized);
@@ -137,7 +137,7 @@ namespace Resource
         }
     }
 
-    osg::Texture2D* TextureManager::getWarningTexture()
+    osg::Texture2D* ImageManager::getWarningTexture()
     {
         return mWarningTexture.get();
     }
diff --git a/components/resource/texturemanager.hpp b/components/resource/imagemanager.hpp
similarity index 83%
rename from components/resource/texturemanager.hpp
rename to components/resource/imagemanager.hpp
index 0290d2340b..14d0b673e3 100644
--- a/components/resource/texturemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -27,11 +27,11 @@ namespace Resource
 {
 
     /// @brief Handles loading/caching of Images.
-    class TextureManager
+    class ImageManager
     {
     public:
-        TextureManager(const VFS::Manager* vfs);
-        ~TextureManager();
+        ImageManager(const VFS::Manager* vfs);
+        ~ImageManager();
 
         /// Create or retrieve an Image
         /// Returns the dummy image if the given image is not found.
@@ -51,8 +51,8 @@ namespace Resource
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
 
-        TextureManager(const TextureManager&);
-        void operator = (const TextureManager&);
+        ImageManager(const ImageManager&);
+        void operator = (const ImageManager&);
     };
 
 }
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 2ce8d22e6a..89a4b2cb3b 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -1,7 +1,7 @@
 #include "resourcesystem.hpp"
 
 #include "scenemanager.hpp"
-#include "texturemanager.hpp"
+#include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "keyframemanager.hpp"
 
@@ -13,7 +13,7 @@ namespace Resource
     {
         mNifFileManager.reset(new NifFileManager(vfs));
         mKeyframeManager.reset(new KeyframeManager(vfs));
-        mTextureManager.reset(new TextureManager(vfs));
+        mTextureManager.reset(new ImageManager(vfs));
         mSceneManager.reset(new SceneManager(vfs, mTextureManager.get(), mNifFileManager.get()));
     }
 
@@ -27,7 +27,7 @@ namespace Resource
         return mSceneManager.get();
     }
 
-    TextureManager* ResourceSystem::getTextureManager()
+    ImageManager* ResourceSystem::getTextureManager()
     {
         return mTextureManager.get();
     }
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 3e1a793cac..7c4d83b7da 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -12,7 +12,7 @@ namespace Resource
 {
 
     class SceneManager;
-    class TextureManager;
+    class ImageManager;
     class NifFileManager;
     class KeyframeManager;
 
@@ -26,7 +26,7 @@ namespace Resource
         ~ResourceSystem();
 
         SceneManager* getSceneManager();
-        TextureManager* getTextureManager();
+        ImageManager* getTextureManager();
         NifFileManager* getNifFileManager();
         KeyframeManager* getKeyframeManager();
 
@@ -37,7 +37,7 @@ namespace Resource
 
     private:
         std::auto_ptr<SceneManager> mSceneManager;
-        std::auto_ptr<TextureManager> mTextureManager;
+        std::auto_ptr<ImageManager> mTextureManager;
         std::auto_ptr<NifFileManager> mNifFileManager;
         std::auto_ptr<KeyframeManager> mKeyframeManager;
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e3f38e8867..287186887b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -24,7 +24,7 @@
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/controller.hpp>
 
-#include "texturemanager.hpp"
+#include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 
 namespace
@@ -227,7 +227,7 @@ namespace Resource
 
 
 
-    SceneManager::SceneManager(const VFS::Manager *vfs, Resource::TextureManager* textureManager, Resource::NifFileManager* nifFileManager)
+    SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* textureManager, Resource::NifFileManager* nifFileManager)
         : mVFS(vfs)
         , mTextureManager(textureManager)
         , mNifFileManager(nifFileManager)
@@ -249,7 +249,7 @@ namespace Resource
     class ImageReadCallback : public osgDB::ReadFileCallback
     {
     public:
-        ImageReadCallback(Resource::TextureManager* textureMgr)
+        ImageReadCallback(Resource::ImageManager* textureMgr)
             : mTextureManager(textureMgr)
         {
         }
@@ -267,7 +267,7 @@ namespace Resource
         }
 
     private:
-        Resource::TextureManager* mTextureManager;
+        Resource::ImageManager* mTextureManager;
     };
 
     std::string getFileExtension(const std::string& file)
@@ -278,7 +278,7 @@ namespace Resource
         return std::string();
     }
 
-    osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::TextureManager* textureMgr, Resource::NifFileManager* nifFileManager)
+    osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* textureMgr, Resource::NifFileManager* nifFileManager)
     {
         std::string ext = getFileExtension(normalizedFilename);
         if (ext == "nif")
@@ -408,7 +408,7 @@ namespace Resource
         return mVFS;
     }
 
-    Resource::TextureManager* SceneManager::getTextureManager()
+    Resource::ImageManager* SceneManager::getTextureManager()
     {
         return mTextureManager;
     }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index ae5fa2db6e..6eadf7b45e 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -10,7 +10,7 @@
 
 namespace Resource
 {
-    class TextureManager;
+    class ImageManager;
     class NifFileManager;
 }
 
@@ -36,7 +36,7 @@ namespace Resource
     class SceneManager
     {
     public:
-        SceneManager(const VFS::Manager* vfs, Resource::TextureManager* textureManager, Resource::NifFileManager* nifFileManager);
+        SceneManager(const VFS::Manager* vfs, Resource::ImageManager* textureManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
         /// Get a read-only copy of this scene "template"
@@ -70,7 +70,7 @@ namespace Resource
 
         const VFS::Manager* getVFS() const;
 
-        Resource::TextureManager* getTextureManager();
+        Resource::ImageManager* getTextureManager();
 
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
@@ -89,7 +89,7 @@ namespace Resource
 
     private:
         const VFS::Manager* mVFS;
-        Resource::TextureManager* mTextureManager;
+        Resource::ImageManager* mTextureManager;
         Resource::NifFileManager* mNifFileManager;
 
         osg::Texture::FilterMode mMinFilter;
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 58675a7140..094023f388 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include <components/resource/resourcesystem.hpp>
-#include <components/resource/texturemanager.hpp>
+#include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
 
 #include <components/sceneutil/lightmanager.hpp>

From 5ee3d1698fd10584b07213f74c0a2a97b0fb06a9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:05:37 +0100
Subject: [PATCH 183/765] Remove getWarningTexture in favor of getWarningImage

---
 apps/openmw/mwrender/sky.cpp         |  2 +-
 components/resource/imagemanager.cpp | 14 +++++---------
 components/resource/imagemanager.hpp |  3 +--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 0f70e2c026..69fbb23799 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -137,7 +137,7 @@ public:
     AtmosphereNightUpdater(Resource::ImageManager* textureManager)
     {
         // we just need a texture, its contents don't really matter
-        mTexture = textureManager->getWarningTexture();
+        mTexture = new osg::Texture2D(textureManager->getWarningImage());
     }
 
     void setFade(const float fade)
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 8b14e72376..e1c0572c73 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -17,7 +17,7 @@ USE_OSGPLUGIN(jpeg)
 namespace
 {
 
-    osg::ref_ptr<osg::Texture2D> createWarningTexture()
+    osg::ref_ptr<osg::Image> createWarningImage()
     {
         osg::ref_ptr<osg::Image> warningImage = new osg::Image;
 
@@ -31,10 +31,7 @@ namespace
             data[3*i+1] = (0);
             data[3*i+2] = (255);
         }
-
-        osg::ref_ptr<osg::Texture2D> warningTexture = new osg::Texture2D;
-        warningTexture->setImage(warningImage);
-        return warningTexture;
+        return warningImage;
     }
 
 }
@@ -44,8 +41,7 @@ namespace Resource
 
     ImageManager::ImageManager(const VFS::Manager *vfs)
         : mVFS(vfs)
-        , mWarningTexture(createWarningTexture())
-        , mWarningImage(mWarningTexture->getImage())
+        , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba"))
     {
     }
@@ -137,9 +133,9 @@ namespace Resource
         }
     }
 
-    osg::Texture2D* ImageManager::getWarningTexture()
+    osg::Image *ImageManager::getWarningImage()
     {
-        return mWarningTexture.get();
+        return mWarningImage;
     }
 
 }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index 14d0b673e3..ee0c0f2e2f 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -39,7 +39,7 @@ namespace Resource
 
         const VFS::Manager* getVFS() { return mVFS; }
 
-        osg::Texture2D* getWarningTexture();
+        osg::Image* getWarningImage();
 
     private:
         const VFS::Manager* mVFS;
@@ -47,7 +47,6 @@ namespace Resource
         // TODO: use ObjectCache
         std::map<std::string, osg::ref_ptr<osg::Image> > mImages;
 
-        osg::ref_ptr<osg::Texture2D> mWarningTexture;
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
 

From 9e53e12c70f38c6de9d2ea515a58746c413dd753 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:10:27 +0100
Subject: [PATCH 184/765] More renaming of TextureManager -> ImageManager

---
 apps/openmw/mwgui/windowmanagerimp.cpp        |  4 +-
 apps/openmw/mwrender/animation.cpp            |  2 +-
 apps/openmw/mwrender/ripplesimulation.cpp     |  2 +-
 apps/openmw/mwrender/sky.cpp                  | 42 +++++++++----------
 apps/openmw/mwrender/util.cpp                 |  2 +-
 apps/openmw/mwrender/water.cpp                |  2 +-
 components/myguiplatform/myguiplatform.cpp    |  4 +-
 components/myguiplatform/myguiplatform.hpp    |  2 +-
 .../myguiplatform/myguirendermanager.cpp      |  6 +--
 .../myguiplatform/myguirendermanager.hpp      |  4 +-
 components/myguiplatform/myguitexture.cpp     | 12 +++---
 components/myguiplatform/myguitexture.hpp     |  4 +-
 components/nifosg/nifloader.cpp               | 32 +++++++-------
 components/nifosg/nifloader.hpp               |  2 +-
 components/resource/imagemanager.hpp          |  4 +-
 components/resource/resourcesystem.cpp        |  8 ++--
 components/resource/resourcesystem.hpp        |  4 +-
 components/resource/scenemanager.cpp          | 26 ++++++------
 components/resource/scenemanager.hpp          |  6 +--
 components/terrain/terraingrid.cpp            |  2 +-
 20 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index d053d8bfde..03fbc92382 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -194,7 +194,7 @@ namespace MWGui
       , mVersionDescription(versionDescription)
     {
         float uiScale = Settings::Manager::getFloat("scaling factor", "GUI");
-        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getTextureManager(), uiScale);
+        mGuiPlatform = new osgMyGUI::Platform(viewer, guiRoot, resourceSystem->getImageManager(), uiScale);
         mGuiPlatform->initialise(resourcePath, logpath);
 
         mGui = new MyGUI::Gui;
@@ -2015,7 +2015,7 @@ namespace MWGui
                 continue;
             std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;
 
-            osg::ref_ptr<osg::Image> image = mResourceSystem->getTextureManager()->getImage(tex_name);
+            osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(tex_name);
 
             if(image.valid())
             {
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 2c5831dae1..b7c0c0a365 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1059,7 +1059,7 @@ namespace MWRender
             stream << i;
             stream << ".dds";
 
-            osg::ref_ptr<osg::Image> image = mResourceSystem->getTextureManager()->getImage(stream.str());
+            osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(stream.str());
             osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(image));
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index 6cfcbc498e..f43f1ee5c3 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -40,7 +40,7 @@ namespace
         {
             std::ostringstream texname;
             texname << "textures/water/" << tex << std::setw(2) << std::setfill('0') << i << ".dds";
-            osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(resourceSystem->getTextureManager()->getImage(texname.str())));
+            osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(resourceSystem->getImageManager()->getImage(texname.str())));
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
             resourceSystem->getSceneManager()->applyFilterSettings(tex);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 69fbb23799..0d3bf1a666 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -134,10 +134,10 @@ private:
 class AtmosphereNightUpdater : public SceneUtil::StateSetUpdater
 {
 public:
-    AtmosphereNightUpdater(Resource::ImageManager* textureManager)
+    AtmosphereNightUpdater(Resource::ImageManager* imageManager)
     {
         // we just need a texture, its contents don't really matter
-        mTexture = new osg::Texture2D(textureManager->getWarningImage());
+        mTexture = new osg::Texture2D(imageManager->getWarningImage());
     }
 
     void setFade(const float fade)
@@ -469,14 +469,14 @@ const float CelestialBody::mDistance = 1000.0f;
 class Sun : public CelestialBody
 {
 public:
-    Sun(osg::Group* parentNode, Resource::ImageManager& textureManager)
+    Sun(osg::Group* parentNode, Resource::ImageManager& imageManager)
         : CelestialBody(parentNode, 1.0f, 1)
         , mUpdater(new Updater)
     {
         mTransform->addUpdateCallback(mUpdater);
         mTransform->setNodeMask(Mask_Sun);
 
-        osg::ref_ptr<osg::Texture2D> sunTex (new osg::Texture2D(textureManager.getImage("textures/tx_sun_05.dds")));
+        osg::ref_ptr<osg::Texture2D> sunTex (new osg::Texture2D(imageManager.getImage("textures/tx_sun_05.dds")));
         sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -498,7 +498,7 @@ public:
         mOcclusionQueryVisiblePixels = createOcclusionQueryNode(queryNode, true);
         mOcclusionQueryTotalPixels = createOcclusionQueryNode(queryNode, false);
 
-        createSunFlash(textureManager);
+        createSunFlash(imageManager);
         createSunGlare();
     }
 
@@ -602,9 +602,9 @@ private:
         return oqn;
     }
 
-    void createSunFlash(Resource::ImageManager& textureManager)
+    void createSunFlash(Resource::ImageManager& imageManager)
     {
-        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(textureManager.getImage("textures/tx_sun_flash_grey_05.dds")));
+        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(imageManager.getImage("textures/tx_sun_flash_grey_05.dds")));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -932,11 +932,11 @@ public:
         Type_Secunda
     };
 
-    Moon(osg::Group* parentNode, Resource::ImageManager& textureManager, float scaleFactor, Type type)
+    Moon(osg::Group* parentNode, Resource::ImageManager& imageManager, float scaleFactor, Type type)
         : CelestialBody(parentNode, scaleFactor, 2)
         , mType(type)
         , mPhase(MoonState::Phase_Unspecified)
-        , mUpdater(new Updater(textureManager))
+        , mUpdater(new Updater(imageManager))
     {
         setPhase(MoonState::Phase_Full);
         setVisible(true);
@@ -1001,7 +1001,7 @@ public:
 private:
     struct Updater : public SceneUtil::StateSetUpdater
     {
-        Resource::ImageManager& mTextureManager;
+        Resource::ImageManager& mImageManager;
         osg::ref_ptr<osg::Texture2D> mPhaseTex;
         osg::ref_ptr<osg::Texture2D> mCircleTex;
         float mTransparency;
@@ -1009,8 +1009,8 @@ private:
         osg::Vec4f mAtmosphereColor;
         osg::Vec4f mMoonColor;
 
-        Updater(Resource::ImageManager& textureManager)
-            : mTextureManager(textureManager)
+        Updater(Resource::ImageManager& imageManager)
+            : mImageManager(imageManager)
             , mPhaseTex()
             , mCircleTex()
             , mTransparency(1.0f)
@@ -1055,10 +1055,10 @@ private:
 
         void setTextures(const std::string& phaseTex, const std::string& circleTex)
         {
-            mPhaseTex = new osg::Texture2D(mTextureManager.getImage(phaseTex));
+            mPhaseTex = new osg::Texture2D(mImageManager.getImage(phaseTex));
             mPhaseTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             mPhaseTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            mCircleTex = new osg::Texture2D(mTextureManager.getImage(circleTex));
+            mCircleTex = new osg::Texture2D(mImageManager.getImage(circleTex));
             mCircleTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             mCircleTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -1165,14 +1165,14 @@ void SkyManager::create()
     atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     ModVertexAlphaVisitor modStars(2);
     atmosphereNight->accept(modStars);
-    mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getTextureManager());
+    mAtmosphereNightUpdater = new AtmosphereNightUpdater(mSceneManager->getImageManager());
     atmosphereNight->addUpdateCallback(mAtmosphereNightUpdater);
 
-    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getTextureManager()));
+    mSun.reset(new Sun(mEarlyRenderBinRoot, *mSceneManager->getImageManager()));
 
     const Fallback::Map* fallback=MWBase::Environment::get().getWorld()->getFallback();
-    mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getTextureManager(), fallback->getFallbackFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
-    mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getTextureManager(), fallback->getFallbackFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
+    mMasser.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), fallback->getFallbackFloat("Moons_Masser_Size")/125, Moon::Type_Masser));
+    mSecunda.reset(new Moon(mEarlyRenderBinRoot, *mSceneManager->getImageManager(), fallback->getFallbackFloat("Moons_Secunda_Size")/125, Moon::Type_Secunda));
 
     mCloudNode = new osg::PositionAttitudeTransform;
     mEarlyRenderBinRoot->addChild(mCloudNode);
@@ -1347,7 +1347,7 @@ void SkyManager::createRain()
 
     osg::ref_ptr<osg::StateSet> stateset (mRainParticleSystem->getOrCreateStateSet());
 
-    osg::ref_ptr<osg::Texture2D> raindropTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage("textures/tx_raindrop_01.dds")));
+    osg::ref_ptr<osg::Texture2D> raindropTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage("textures/tx_raindrop_01.dds")));
     raindropTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     raindropTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
@@ -1557,7 +1557,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
 
         std::string texture = Misc::ResourceHelpers::correctTexturePath(mClouds, mSceneManager->getVFS());
 
-        osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage(texture)));
+        osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture)));
         cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
@@ -1572,7 +1572,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
         {
             std::string texture = Misc::ResourceHelpers::correctTexturePath(mNextClouds, mSceneManager->getVFS());
 
-            osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getTextureManager()->getImage(texture)));
+            osg::ref_ptr<osg::Texture2D> cloudTex (new osg::Texture2D(mSceneManager->getImageManager()->getImage(texture)));
             cloudTex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
             cloudTex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
 
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 3c8d1408af..0e1eaf0f4b 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -15,7 +15,7 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
         return;
     std::string correctedTexture = Misc::ResourceHelpers::correctTexturePath(texture, resourceSystem->getVFS());
     // Not sure if wrap settings should be pulled from the overridden texture?
-    osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getTextureManager()->getImage(correctedTexture));
+    osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
     tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 7d1221a53e..0e4f1a974b 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -556,7 +556,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
     {
         std::ostringstream texname;
         texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
-        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getTextureManager()->getImage(texname.str())));
+        osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(mResourceSystem->getImageManager()->getImage(texname.str())));
         tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
         tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
         textures.push_back(tex);
diff --git a/components/myguiplatform/myguiplatform.cpp b/components/myguiplatform/myguiplatform.cpp
index 491af84868..dfb2e6539d 100644
--- a/components/myguiplatform/myguiplatform.cpp
+++ b/components/myguiplatform/myguiplatform.cpp
@@ -7,14 +7,14 @@
 namespace osgMyGUI
 {
 
-Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::ImageManager *textureManager, float uiScalingFactor)
+Platform::Platform(osgViewer::Viewer *viewer, osg::Group *guiRoot, Resource::ImageManager *imageManager, float uiScalingFactor)
     : mRenderManager(nullptr)
     , mDataManager(nullptr)
     , mLogManager(nullptr)
     , mLogFacility(nullptr)
 {
     mLogManager = new MyGUI::LogManager();
-    mRenderManager = new RenderManager(viewer, guiRoot, textureManager, uiScalingFactor);
+    mRenderManager = new RenderManager(viewer, guiRoot, imageManager, uiScalingFactor);
     mDataManager = new DataManager();
 }
 
diff --git a/components/myguiplatform/myguiplatform.hpp b/components/myguiplatform/myguiplatform.hpp
index b3f9597982..5ffbe0be70 100644
--- a/components/myguiplatform/myguiplatform.hpp
+++ b/components/myguiplatform/myguiplatform.hpp
@@ -30,7 +30,7 @@ namespace osgMyGUI
     class Platform
     {
     public:
-        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* textureManager, float uiScalingFactor);
+        Platform(osgViewer::Viewer* viewer, osg::Group* guiRoot, Resource::ImageManager* imageManager, float uiScalingFactor);
 
         ~Platform();
 
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 23d004f478..5d2e3a9aed 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -353,10 +353,10 @@ void OSGVertexBuffer::create()
 
 // ---------------------------------------------------------------------------
 
-RenderManager::RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* textureManager, float scalingFactor)
+RenderManager::RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* imageManager, float scalingFactor)
   : mViewer(viewer)
   , mSceneRoot(sceneroot)
-  , mTextureManager(textureManager)
+  , mImageManager(imageManager)
   , mUpdate(false)
   , mIsInitialise(false)
   , mInvScalingFactor(1.f)
@@ -523,7 +523,7 @@ MyGUI::ITexture* RenderManager::createTexture(const std::string &name)
         mTextures.erase(item);
     }
 
-    OSGTexture* texture = new OSGTexture(name, mTextureManager);
+    OSGTexture* texture = new OSGTexture(name, mImageManager);
     mTextures.insert(std::make_pair(name, texture));
     return texture;
 }
diff --git a/components/myguiplatform/myguirendermanager.hpp b/components/myguiplatform/myguirendermanager.hpp
index b1aa0d3f0f..4a0aae3cda 100644
--- a/components/myguiplatform/myguirendermanager.hpp
+++ b/components/myguiplatform/myguirendermanager.hpp
@@ -33,7 +33,7 @@ class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
     osg::ref_ptr<osgViewer::Viewer> mViewer;
     osg::ref_ptr<osg::Group> mSceneRoot;
     osg::ref_ptr<Drawable> mDrawable;
-    Resource::ImageManager* mTextureManager;
+    Resource::ImageManager* mImageManager;
 
     MyGUI::IntSize mViewSize;
     bool mUpdate;
@@ -54,7 +54,7 @@ class RenderManager : public MyGUI::RenderManager, public MyGUI::IRenderTarget
     void destroyAllResources();
 
 public:
-    RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* textureManager, float scalingFactor);
+    RenderManager(osgViewer::Viewer *viewer, osg::Group *sceneroot, Resource::ImageManager* imageManager, float scalingFactor);
     virtual ~RenderManager();
 
     void initialise();
diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 904ed6abf7..2ba78c26b3 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -10,9 +10,9 @@
 namespace osgMyGUI
 {
 
-    OSGTexture::OSGTexture(const std::string &name, Resource::ImageManager* textureManager)
+    OSGTexture::OSGTexture(const std::string &name, Resource::ImageManager* imageManager)
       : mName(name)
-      , mTextureManager(textureManager)
+      , mImageManager(imageManager)
       , mFormat(MyGUI::PixelFormat::Unknow)
       , mUsage(MyGUI::TextureUsage::Default)
       , mNumElemBytes(0)
@@ -20,7 +20,7 @@ namespace osgMyGUI
     }
 
     OSGTexture::OSGTexture(osg::Texture2D *texture)
-        : mTextureManager(NULL)
+        : mImageManager(NULL)
         , mTexture(texture)
         , mFormat(MyGUI::PixelFormat::Unknow)
         , mUsage(MyGUI::TextureUsage::Default)
@@ -83,10 +83,10 @@ namespace osgMyGUI
 
     void OSGTexture::loadFromFile(const std::string &fname)
     {
-        if (!mTextureManager)
-            throw std::runtime_error("No texturemanager set");
+        if (!mImageManager)
+            throw std::runtime_error("No imagemanager set");
 
-        mTexture = new osg::Texture2D(mTextureManager->getImage(fname));
+        mTexture = new osg::Texture2D(mImageManager->getImage(fname));
         mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
         // disable mip-maps
diff --git a/components/myguiplatform/myguitexture.hpp b/components/myguiplatform/myguitexture.hpp
index 21bc899928..101e2135bf 100644
--- a/components/myguiplatform/myguitexture.hpp
+++ b/components/myguiplatform/myguitexture.hpp
@@ -21,7 +21,7 @@ namespace osgMyGUI
 
     class OSGTexture : public MyGUI::ITexture {
         std::string mName;
-        Resource::ImageManager* mTextureManager;
+        Resource::ImageManager* mImageManager;
 
         osg::ref_ptr<osg::Image> mLockedImage;
         osg::ref_ptr<osg::Texture2D> mTexture;
@@ -30,7 +30,7 @@ namespace osgMyGUI
         size_t mNumElemBytes;
 
     public:
-        OSGTexture(const std::string &name, Resource::ImageManager* textureManager);
+        OSGTexture(const std::string &name, Resource::ImageManager* imageManager);
         OSGTexture(osg::Texture2D* texture);
         virtual ~OSGTexture();
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index d09c34aa58..6c6061063e 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -343,7 +343,7 @@ namespace NifOsg
             }
         }
 
-        osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::ImageManager* textureManager)
+        osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::ImageManager* imageManager)
         {
             if (nif->numRoots() < 1)
                 nif->fail("Found no root nodes");
@@ -356,7 +356,7 @@ namespace NifOsg
 
             osg::ref_ptr<TextKeyMapHolder> textkeys (new TextKeyMapHolder);
 
-            osg::ref_ptr<osg::Node> created = handleNode(nifNode, NULL, textureManager, std::vector<int>(), 0, 0, false, &textkeys->mTextKeys);
+            osg::ref_ptr<osg::Node> created = handleNode(nifNode, NULL, imageManager, std::vector<int>(), 0, 0, false, &textkeys->mTextKeys);
 
             if (nif->getUseSkinning())
             {
@@ -369,13 +369,13 @@ namespace NifOsg
             return created;
         }
 
-        void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, std::vector<int>& boundTextures, int animflags)
+        void applyNodeProperties(const Nif::Node *nifNode, osg::Node *applyTo, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
             const Nif::PropertyList& props = nifNode->props;
             for (size_t i = 0; i <props.length();++i)
             {
                 if (!props[i].empty())
-                    handleProperty(props[i].getPtr(), applyTo, composite, textureManager, boundTextures, animflags);
+                    handleProperty(props[i].getPtr(), applyTo, composite, imageManager, boundTextures, animflags);
             }
         }
 
@@ -440,7 +440,7 @@ namespace NifOsg
             return lod;
         }
 
-        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* textureManager,
+        osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
                                 std::vector<int> boundTextures, int animflags, int particleflags, bool skipMeshes, TextKeyMap* textKeys, osg::Node* rootNode=NULL)
         {
             osg::ref_ptr<osg::Group> node = new osg::MatrixTransform(nifNode->trafo.toMatrix());
@@ -542,7 +542,7 @@ namespace NifOsg
 
             osg::ref_ptr<SceneUtil::CompositeStateSetUpdater> composite = new SceneUtil::CompositeStateSetUpdater;
 
-            applyNodeProperties(nifNode, node, composite, textureManager, boundTextures, animflags);
+            applyNodeProperties(nifNode, node, composite, imageManager, boundTextures, animflags);
 
             if (nifNode->recType == Nif::RC_NiTriShape && !skipMeshes)
             {
@@ -588,7 +588,7 @@ namespace NifOsg
                 {
                     if(!children[i].empty())
                     {
-                        handleNode(children[i].getPtr(), node, textureManager, boundTextures, animflags, particleflags, skipMeshes, textKeys, rootNode);
+                        handleNode(children[i].getPtr(), node, imageManager, boundTextures, animflags, particleflags, skipMeshes, textKeys, rootNode);
                     }
                 }
             }
@@ -682,7 +682,7 @@ namespace NifOsg
             }
         }
 
-        void handleTextureControllers(const Nif::Property *texProperty, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, osg::StateSet *stateset, int animflags)
+        void handleTextureControllers(const Nif::Property *texProperty, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, osg::StateSet *stateset, int animflags)
         {
             for (Nif::ControllerPtr ctrl = texProperty->controller; !ctrl.empty(); ctrl = ctrl->next)
             {
@@ -708,8 +708,8 @@ namespace NifOsg
                             wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                         }
 
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, textureManager->getVFS());
-                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(textureManager->getImage(filename)));
+                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
+                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(imageManager->getImage(filename)));
                         texture->setWrap(osg::Texture::WRAP_S, wrapS);
                         texture->setWrap(osg::Texture::WRAP_T, wrapT);
                         textures.push_back(texture);
@@ -1244,7 +1244,7 @@ namespace NifOsg
         }
 
         void handleProperty(const Nif::Property *property,
-                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* textureManager, std::vector<int>& boundTextures, int animflags)
+                            osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
             switch (property->recType)
             {
@@ -1372,14 +1372,14 @@ namespace NifOsg
                             continue;
                         }
 
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, textureManager->getVFS());
+                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
 
                         unsigned int clamp = static_cast<unsigned int>(tex.clamp);
                         int wrapT = (clamp) & 0x1;
                         int wrapS = (clamp >> 1) & 0x1;
 
                         // create a new texture, will later attempt to share using the SharedStateManager
-                        osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(textureManager->getImage(filename)));
+                        osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(imageManager->getImage(filename)));
                         texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
                         texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
 
@@ -1423,7 +1423,7 @@ namespace NifOsg
 
                         boundTextures.push_back(tex.uvSet);
                     }
-                    handleTextureControllers(texprop, composite, textureManager, stateset, animflags);
+                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
                 }
                 break;
             }
@@ -1543,10 +1543,10 @@ namespace NifOsg
 
     };
 
-    osg::ref_ptr<osg::Node> Loader::load(Nif::NIFFilePtr file, Resource::ImageManager* textureManager)
+    osg::ref_ptr<osg::Node> Loader::load(Nif::NIFFilePtr file, Resource::ImageManager* imageManager)
     {
         LoaderImpl impl(file->getFilename());
-        return impl.load(file, textureManager);
+        return impl.load(file, imageManager);
     }
 
     void Loader::loadKf(Nif::NIFFilePtr kf, KeyframeHolder& target)
diff --git a/components/nifosg/nifloader.hpp b/components/nifosg/nifloader.hpp
index afc912ed38..d2d5e7b2d8 100644
--- a/components/nifosg/nifloader.hpp
+++ b/components/nifosg/nifloader.hpp
@@ -62,7 +62,7 @@ namespace NifOsg
     {
     public:
         /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton if so.
-        static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::ImageManager* textureManager);
+        static osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr file, Resource::ImageManager* imageManager);
 
         /// Load keyframe controllers from the given kf file.
         static void loadKf(Nif::NIFFilePtr kf, KeyframeHolder& target);
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index ee0c0f2e2f..3b2bacc131 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_RESOURCE_TEXTUREMANAGER_H
-#define OPENMW_COMPONENTS_RESOURCE_TEXTUREMANAGER_H
+#ifndef OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
+#define OPENMW_COMPONENTS_RESOURCE_IMAGEMANAGER_H
 
 #include <string>
 #include <map>
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 89a4b2cb3b..d39a723d6b 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -13,8 +13,8 @@ namespace Resource
     {
         mNifFileManager.reset(new NifFileManager(vfs));
         mKeyframeManager.reset(new KeyframeManager(vfs));
-        mTextureManager.reset(new ImageManager(vfs));
-        mSceneManager.reset(new SceneManager(vfs, mTextureManager.get(), mNifFileManager.get()));
+        mImageManager.reset(new ImageManager(vfs));
+        mSceneManager.reset(new SceneManager(vfs, mImageManager.get(), mNifFileManager.get()));
     }
 
     ResourceSystem::~ResourceSystem()
@@ -27,9 +27,9 @@ namespace Resource
         return mSceneManager.get();
     }
 
-    ImageManager* ResourceSystem::getTextureManager()
+    ImageManager* ResourceSystem::getImageManager()
     {
-        return mTextureManager.get();
+        return mImageManager.get();
     }
 
     NifFileManager* ResourceSystem::getNifFileManager()
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 7c4d83b7da..13a96e8c7f 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -26,7 +26,7 @@ namespace Resource
         ~ResourceSystem();
 
         SceneManager* getSceneManager();
-        ImageManager* getTextureManager();
+        ImageManager* getImageManager();
         NifFileManager* getNifFileManager();
         KeyframeManager* getKeyframeManager();
 
@@ -37,7 +37,7 @@ namespace Resource
 
     private:
         std::auto_ptr<SceneManager> mSceneManager;
-        std::auto_ptr<ImageManager> mTextureManager;
+        std::auto_ptr<ImageManager> mImageManager;
         std::auto_ptr<NifFileManager> mNifFileManager;
         std::auto_ptr<KeyframeManager> mKeyframeManager;
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 287186887b..dd48478778 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -227,9 +227,9 @@ namespace Resource
 
 
 
-    SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* textureManager, Resource::NifFileManager* nifFileManager)
+    SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : mVFS(vfs)
-        , mTextureManager(textureManager)
+        , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
         , mMagFilter(osg::Texture::LINEAR)
@@ -249,8 +249,8 @@ namespace Resource
     class ImageReadCallback : public osgDB::ReadFileCallback
     {
     public:
-        ImageReadCallback(Resource::ImageManager* textureMgr)
-            : mTextureManager(textureMgr)
+        ImageReadCallback(Resource::ImageManager* imageMgr)
+            : mImageManager(imageMgr)
         {
         }
 
@@ -258,7 +258,7 @@ namespace Resource
         {
             try
             {
-                return osgDB::ReaderWriter::ReadResult(mTextureManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
+                return osgDB::ReaderWriter::ReadResult(mImageManager->getImage(filename), osgDB::ReaderWriter::ReadResult::FILE_LOADED);
             }
             catch (std::exception& e)
             {
@@ -267,7 +267,7 @@ namespace Resource
         }
 
     private:
-        Resource::ImageManager* mTextureManager;
+        Resource::ImageManager* mImageManager;
     };
 
     std::string getFileExtension(const std::string& file)
@@ -278,11 +278,11 @@ namespace Resource
         return std::string();
     }
 
-    osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* textureMgr, Resource::NifFileManager* nifFileManager)
+    osg::ref_ptr<osg::Node> load (Files::IStreamPtr file, const std::string& normalizedFilename, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
     {
         std::string ext = getFileExtension(normalizedFilename);
         if (ext == "nif")
-            return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), textureMgr);
+            return NifOsg::Loader::load(nifFileManager->get(normalizedFilename), imageManager);
         else
         {
             osgDB::ReaderWriter* reader = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
@@ -297,7 +297,7 @@ namespace Resource
             // Set a ReadFileCallback so that image files referenced in the model are read from our virtual file system instead of the osgDB.
             // Note, for some formats (.obj/.mtl) that reference other (non-image) files a findFileCallback would be necessary.
             // but findFileCallback does not support virtual files, so we can't implement it.
-            options->setReadFileCallback(new ImageReadCallback(textureMgr));
+            options->setReadFileCallback(new ImageReadCallback(imageManager));
 
             osgDB::ReaderWriter::ReadResult result = reader->readNode(*file, options);
             if (!result.success())
@@ -323,7 +323,7 @@ namespace Resource
             {
                 Files::IStreamPtr file = mVFS->get(normalized);
 
-                loaded = load(file, normalized, mTextureManager, mNifFileManager);
+                loaded = load(file, normalized, mImageManager, mNifFileManager);
             }
             catch (std::exception& e)
             {
@@ -336,7 +336,7 @@ namespace Resource
                     {
                         std::cerr << "Failed to load '" << name << "': " << e.what() << ", using marker_error." << sMeshTypes[i] << " instead" << std::endl;
                         Files::IStreamPtr file = mVFS->get(normalized);
-                        loaded = load(file, normalized, mTextureManager, mNifFileManager);
+                        loaded = load(file, normalized, mImageManager, mNifFileManager);
                         break;
                     }
                 }
@@ -408,9 +408,9 @@ namespace Resource
         return mVFS;
     }
 
-    Resource::ImageManager* SceneManager::getTextureManager()
+    Resource::ImageManager* SceneManager::getImageManager()
     {
-        return mTextureManager;
+        return mImageManager;
     }
 
     void SceneManager::setParticleSystemMask(unsigned int mask)
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 6eadf7b45e..3dd37111d9 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -36,7 +36,7 @@ namespace Resource
     class SceneManager
     {
     public:
-        SceneManager(const VFS::Manager* vfs, Resource::ImageManager* textureManager, Resource::NifFileManager* nifFileManager);
+        SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
         /// Get a read-only copy of this scene "template"
@@ -70,7 +70,7 @@ namespace Resource
 
         const VFS::Manager* getVFS() const;
 
-        Resource::ImageManager* getTextureManager();
+        Resource::ImageManager* getImageManager();
 
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
@@ -89,7 +89,7 @@ namespace Resource
 
     private:
         const VFS::Manager* mVFS;
-        Resource::ImageManager* mTextureManager;
+        Resource::ImageManager* mImageManager;
         Resource::NifFileManager* mNifFileManager;
 
         osg::Texture::FilterMode mMinFilter;
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 094023f388..2efbf1b9ea 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -142,7 +142,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             osg::ref_ptr<osg::Texture2D> tex = mTextureCache[it->mDiffuseMap];
             if (!tex)
             {
-                tex = new osg::Texture2D(mResourceSystem->getTextureManager()->getImage(it->mDiffuseMap));
+                tex = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mDiffuseMap));
                 tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
                 tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
                 mTextureCache[it->mDiffuseMap] = tex;

From 499beda6656e37b45aa35549126023fd4898ceb2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:20:13 +0100
Subject: [PATCH 185/765] Clear terrain texture cache before applying filter
 settings

---
 apps/openmw/mwrender/renderingmanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index d1b5f6fda6..9b7ced4b58 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -783,6 +783,9 @@ namespace MWRender
 
     void RenderingManager::updateTextureFiltering()
     {
+        if (mTerrain.get())
+            mTerrain->clearCache();
+
         mResourceSystem->getSceneManager()->setFilterSettings(
             Settings::Manager::getString("texture mag filter", "General"),
             Settings::Manager::getString("texture min filter", "General"),

From 9e5225bb6f952b50402063783374ffcd7a91be23 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:21:54 +0100
Subject: [PATCH 186/765] Do not unref a Texture's image data after applying it

---
 apps/openmw/engine.cpp             | 2 +-
 components/terrain/terraingrid.cpp | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d96bf16e4e..d30d0961aa 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -448,7 +448,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     VFS::registerArchives(mVFS.get(), mFileCollections, mArchives, true);
 
     mResourceSystem.reset(new Resource::ResourceSystem(mVFS.get()));
-    mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(true);
+    mResourceSystem->getSceneManager()->setUnRefImageDataAfterApply(false); // keep to Off for now to allow better state sharing
     mResourceSystem->getSceneManager()->setFilterSettings(
         Settings::Manager::getString("texture mag filter", "General"),
         Settings::Manager::getString("texture min filter", "General"),
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 2efbf1b9ea..eb085ca426 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -166,10 +166,6 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
         }
 
-        // SharedStatemanager->share(textureCompileDummy);
-
-        // Remove unrefImageDataAfterApply for better state sharing
-
         // use texture coordinates for both texture units, the layer texture and blend texture
         for (unsigned int i=0; i<2; ++i)
             geometry->setTexCoordArray(i, mCache.getUVBuffer());

From a72af4a1a38e9a39057dce2951cd6a0817025810 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:25:01 +0100
Subject: [PATCH 187/765] cout that should be cerr

---
 apps/openmw/mwworld/localscripts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 7ccc213c45..f0174ac522 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -101,7 +101,7 @@ void MWWorld::LocalScripts::add (const std::string& scriptName, const Ptr& ptr)
             for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin(); iter!=mScripts.end(); ++iter)
                 if (iter->second==ptr)
                 {
-                    std::cout << "warning, tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl;
+                    std::cerr << "warning, tried to add local script twice for " << ptr.getCellRef().getRefId() << std::endl;
                     remove(ptr);
                     break;
                 }

From 6c1c653cbab3fe0228303ccf50c40c93dfa9c370 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:31:59 +0100
Subject: [PATCH 188/765] Use the osgDB::ObjectCache in ImageManager

Should be thread safe now.
---
 components/resource/imagemanager.cpp | 16 ++++++++++++----
 components/resource/imagemanager.hpp |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index e1c0572c73..bd422fe2a6 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -6,6 +6,8 @@
 
 #include <components/vfs/manager.hpp>
 
+#include "objectcache.hpp"
+
 #ifdef OSG_LIBRARY_STATIC
 // This list of plugins should match with the list in the top-level CMakelists.txt.
 USE_OSGPLUGIN(png)
@@ -41,6 +43,7 @@ namespace Resource
 
     ImageManager::ImageManager(const VFS::Manager *vfs)
         : mVFS(vfs)
+        , mCache(new osgDB::ObjectCache)
         , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba"))
     {
@@ -88,9 +91,10 @@ namespace Resource
     {
         std::string normalized = filename;
         mVFS->normalizeFilename(normalized);
-        std::map<std::string, osg::ref_ptr<osg::Image> >::iterator found = mImages.find(normalized);
-        if (found != mImages.end())
-            return found->second;
+
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+        if (obj)
+            return osg::ref_ptr<osg::Image>(static_cast<osg::Image*>(obj.get()));
         else
         {
             Files::IStreamPtr stream;
@@ -101,6 +105,7 @@ namespace Resource
             catch (std::exception& e)
             {
                 std::cerr << "Failed to open image: " << e.what() << std::endl;
+                mCache->addEntryToObjectCache(normalized, mWarningImage);
                 return mWarningImage;
             }
 
@@ -112,6 +117,7 @@ namespace Resource
             if (!reader)
             {
                 std::cerr << "Error loading " << filename << ": no readerwriter for '" << ext << "' found" << std::endl;
+                mCache->addEntryToObjectCache(normalized, mWarningImage);
                 return mWarningImage;
             }
 
@@ -119,16 +125,18 @@ namespace Resource
             if (!result.success())
             {
                 std::cerr << "Error loading " << filename << ": " << result.message() << " code " << result.status() << std::endl;
+                mCache->addEntryToObjectCache(normalized, mWarningImage);
                 return mWarningImage;
             }
 
             osg::Image* image = result.getImage();
             if (!checkSupported(image, filename))
             {
+                mCache->addEntryToObjectCache(normalized, mWarningImage);
                 return mWarningImage;
             }
 
-            mImages.insert(std::make_pair(normalized, image));
+            mCache->addEntryToObjectCache(normalized, image);
             return image;
         }
     }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index 3b2bacc131..bc1d7b4e4b 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -21,12 +21,14 @@ namespace VFS
 namespace osgDB
 {
     class Options;
+    class ObjectCache;
 }
 
 namespace Resource
 {
 
     /// @brief Handles loading/caching of Images.
+    /// @note May be used from any thread.
     class ImageManager
     {
     public:
@@ -44,8 +46,7 @@ namespace Resource
     private:
         const VFS::Manager* mVFS;
 
-        // TODO: use ObjectCache
-        std::map<std::string, osg::ref_ptr<osg::Image> > mImages;
+        osg::ref_ptr<osgDB::ObjectCache> mCache;
 
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;

From 909c4d96b64e5fa6f85a959f59964927a28730b6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 5 Feb 2016 23:59:37 +0100
Subject: [PATCH 189/765] Use the osgDB::ObjectCache in BulletShapeManager

---
 components/resource/bulletshape.cpp        |  8 ++++++++
 components/resource/bulletshape.hpp        |  8 ++++++--
 components/resource/bulletshapemanager.cpp | 21 ++++++++++++++-------
 components/resource/bulletshapemanager.hpp |  8 ++++++--
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 0cbc63a229..baff86a794 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -17,6 +17,14 @@ BulletShape::BulletShape()
 
 }
 
+BulletShape::BulletShape(const BulletShape &copy, const osg::CopyOp &copyop)
+    : mCollisionShape(duplicateCollisionShape(copy.mCollisionShape))
+    , mCollisionBoxHalfExtents(copy.mCollisionBoxHalfExtents)
+    , mCollisionBoxTranslate(copy.mCollisionBoxTranslate)
+    , mAnimatedShapes(copy.mAnimatedShapes)
+{
+}
+
 BulletShape::~BulletShape()
 {
     deleteShape(mCollisionShape);
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index cfae27eac4..a007bad310 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <osg/Referenced>
+#include <osg/Object>
 #include <osg/ref_ptr>
 #include <osg/Vec3f>
 
@@ -15,12 +15,15 @@ namespace Resource
 {
 
     class BulletShapeInstance;
-    class BulletShape : public osg::Referenced
+    class BulletShape : public osg::Object
     {
     public:
         BulletShape();
+        BulletShape(const BulletShape& copy, const osg::CopyOp& copyop);
         virtual ~BulletShape();
 
+        META_Object(Resource, BulletShape)
+
         btCollisionShape* mCollisionShape;
 
         // Used for actors. Note, ideally actors would use a separate loader - as it is
@@ -42,6 +45,7 @@ namespace Resource
         btCollisionShape* getCollisionShape();
 
     private:
+
         void deleteShape(btCollisionShape* shape);
     };
 
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 4cbe62f3c3..2ab7b243aa 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -13,6 +13,7 @@
 #include "bulletshape.hpp"
 #include "scenemanager.hpp"
 #include "niffilemanager.hpp"
+#include "objectcache.hpp"
 
 
 namespace Resource
@@ -99,6 +100,7 @@ BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs, SceneManager* sc
     : mVFS(vfs)
     , mSceneManager(sceneMgr)
     , mNifFileManager(nifFileManager)
+    , mCache(new osgDB::ObjectCache)
 {
 
 }
@@ -114,8 +116,10 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
     mVFS->normalizeFilename(normalized);
 
     osg::ref_ptr<BulletShape> shape;
-    Index::iterator it = mIndex.find(normalized);
-    if (it == mIndex.end())
+    osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+    if (obj)
+        shape = osg::ref_ptr<BulletShape>(static_cast<BulletShape*>(obj.get()));
+    else
     {
         size_t extPos = normalized.find_last_of('.');
         std::string ext;
@@ -137,16 +141,19 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
             node->accept(visitor);
             shape = visitor.getShape();
             if (!shape)
+            {
+                mCache->addEntryToObjectCache(normalized, NULL);
                 return osg::ref_ptr<BulletShapeInstance>();
+            }
         }
 
-        mIndex[normalized] = shape;
+        mCache->addEntryToObjectCache(normalized, shape);
     }
+
+    if (shape)
+        return shape->makeInstance();
     else
-        shape = it->second;
-
-    osg::ref_ptr<BulletShapeInstance> instance = shape->makeInstance();
-    return instance;
+        return osg::ref_ptr<BulletShapeInstance>();
 }
 
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index ac1523495c..d9293896b0 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -13,6 +13,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osgDB
+{
+    class ObjectCache;
+}
+
 namespace Resource
 {
     class SceneManager;
@@ -34,8 +39,7 @@ namespace Resource
         SceneManager* mSceneManager;
         NifFileManager* mNifFileManager;
 
-        typedef std::map<std::string, osg::ref_ptr<BulletShape> > Index;
-        Index mIndex;
+        osg::ref_ptr<osgDB::ObjectCache> mCache;
     };
 
 }

From ea1efaac0cc5b7d228a90a99757594fe25e10cab Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Feb 2016 00:15:12 +0100
Subject: [PATCH 190/765] Use the osgDB::ObjectCache in SceneManager, cleanup

---
 components/resource/bulletshapemanager.hpp |  3 +++
 components/resource/keyframemanager.hpp    |  2 +-
 components/resource/niffilemanager.hpp     |  2 +-
 components/resource/scenemanager.cpp       | 27 +++++++++-------------
 components/resource/scenemanager.hpp       | 23 ++++++++++--------
 5 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index d9293896b0..c8db8849e7 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -26,6 +26,9 @@ namespace Resource
     class BulletShape;
     class BulletShapeInstance;
 
+    /// Handles loading, caching and "instancing" of bullet shapes.
+    /// A shape 'instance' is a clone of another shape, with the goal of setting a different scale on this instance.
+    /// @note May be used from any thread.
     class BulletShapeManager
     {
     public:
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 5032d0e389..5a5cb36284 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -23,6 +23,7 @@ namespace Resource
 {
 
     /// @brief Managing of keyframe resources
+    /// @note May be used from any thread.
     class KeyframeManager
     {
     public:
@@ -32,7 +33,6 @@ namespace Resource
         void clearCache();
 
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
-        /// @note This method is safe to call from any thread.
         /// @note Throws an exception if the resource is not found.
         osg::ref_ptr<const NifOsg::KeyframeHolder> get(const std::string& name);
 
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index 90ad9fc294..4551cf2275 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -19,7 +19,7 @@ namespace Resource
 {
 
     /// @brief Handles caching of NIFFiles.
-    /// @note The NifFileManager is completely thread safe.
+    /// @note May be used from any thread.
     class NifFileManager
     {
     public:
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index dd48478778..95e03b3894 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -26,10 +26,12 @@
 
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
+#include "objectcache.hpp"
 
 namespace
 {
 
+    /// @todo Do this in updateCallback so that animations are accounted for.
     class InitWorldSpaceParticlesVisitor : public osg::NodeVisitor
     {
     public:
@@ -236,6 +238,7 @@ namespace Resource
         , mMaxAnisotropy(1)
         , mUnRefImageDataAfterApply(false)
         , mParticleSystemMask(~0u)
+        , mCache(new osgDB::ObjectCache)
     {
     }
 
@@ -315,8 +318,10 @@ namespace Resource
         std::string normalized = name;
         mVFS->normalizeFilename(normalized);
 
-        Index::iterator it = mIndex.find(normalized);
-        if (it == mIndex.end())
+        osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(normalized);
+        if (obj)
+            return osg::ref_ptr<const osg::Node>(static_cast<osg::Node*>(obj.get()));
+        else
         {
             osg::ref_ptr<osg::Node> loaded;
             try
@@ -357,11 +362,9 @@ namespace Resource
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
 
-            mIndex[normalized] = loaded;
+            mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
         }
-        else
-            return it->second;
     }
 
     osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string &name)
@@ -386,10 +389,7 @@ namespace Resource
 
     void SceneManager::releaseGLObjects(osg::State *state)
     {
-        for (Index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
-        {
-            it->second->releaseGLObjects(state);
-        }
+        mCache->releaseGLObjects(state);
     }
 
     void SceneManager::setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation *ico)
@@ -458,6 +458,8 @@ namespace Resource
         mMagFilter = mag;
         mMaxAnisotropy = std::max(1, maxAnisotropy);
 
+        mCache->clear();
+
         SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
         SetFilterSettingsVisitor setFilterSettingsVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
         if (viewer && viewer->getSceneData())
@@ -466,13 +468,6 @@ namespace Resource
             viewer->getSceneData()->accept(setFilterSettingsVisitor);
         }
 
-        for (Index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
-        {
-            osg::Node* node = it->second;
-            node->accept(setFilterSettingsControllerVisitor);
-            node->accept(setFilterSettingsVisitor);
-        }
-
         if(viewer) viewer->startThreading();
     }
 
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 3dd37111d9..32bd806603 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -24,6 +24,11 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
+namespace osgDB
+{
+    class ObjectCache;
+}
+
 namespace osgViewer
 {
     class Viewer;
@@ -32,7 +37,8 @@ namespace osgViewer
 namespace Resource
 {
 
-    /// @brief Handles loading and caching of scenes, e.g. NIF files
+    /// @brief Handles loading and caching of scenes, e.g. .nif files or .osg files
+    /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more details.
     class SceneManager
     {
     public:
@@ -42,20 +48,24 @@ namespace Resource
         /// Get a read-only copy of this scene "template"
         /// @note If the given filename does not exist or fails to load, an error marker mesh will be used instead.
         ///  If even the error marker mesh can not be found, an exception is thrown.
+        /// @note Thread safe.
         osg::ref_ptr<const osg::Node> getTemplate(const std::string& name);
 
         /// Create an instance of the given scene template
         /// @see getTemplate
+        /// @note Thread safe.
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
         /// Create an instance of the given scene template and immediately attach it to a parent node
         /// @see getTemplate
+        /// @note Not thread safe, unless parentNode is not part of the main scene graph yet.
         osg::ref_ptr<osg::Node> createInstance(const std::string& name, osg::Group* parentNode);
 
         /// Attach the given scene instance to the given parent node
         /// @note You should have the parentNode in its intended position before calling this method,
         ///       so that world space particles of the \a instance get transformed correctly.
         /// @note Assumes the given instance was not attached to any parents before.
+        /// @note Not thread safe, unless parentNode is not part of the main scene graph yet.
         void attachTo(osg::Node* instance, osg::Group* parentNode) const;
 
         /// Manually release created OpenGL objects for the given graphics context. This may be required
@@ -75,11 +85,12 @@ namespace Resource
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
 
+        /// @param viewer used to apply the new filter settings to the existing scene graph. If there is no scene yet, you can pass a NULL viewer.
         void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
                                const std::string &mipmap, int maxAnisotropy,
                                osgViewer::Viewer *viewer);
 
-        /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate / createInstance)
+        /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate or createInstance)
         /// the filter settings are applied automatically. This method is provided for textures that were created outside of the SceneManager.
         void applyFilterSettings (osg::Texture* tex);
 
@@ -101,16 +112,10 @@ namespace Resource
 
         unsigned int mParticleSystemMask;
 
-        // observer_ptr?
-        typedef std::map<std::string, osg::ref_ptr<osg::Node> > Index;
-        Index mIndex;
+        osg::ref_ptr<osgDB::ObjectCache> mCache;
 
         SceneManager(const SceneManager&);
         void operator = (const SceneManager&);
-
-        /// @warning It is unsafe to call this function when a draw thread is using the textures. Call stopThreading() first!
-        void setFilterSettings(osg::Texture::FilterMode minFilter, osg::Texture::FilterMode maxFilter, int maxAnisotropy);
-
     };
 
 }

From c4658a0ef7f119713909a0fd105465a6f61d00ad Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@Aleksandars-iMac.local>
Date: Fri, 5 Feb 2016 23:06:18 +0100
Subject: [PATCH 191/765] Add OpenMW CS manual to the repository.

The manual depends on Sphinx to build. A makefile and a Windows batch
script are included for building, both were automatically generated by
Sphinx. I have left all settings at their default and I have tested that
HTML and PDF output build properly.
---
 .gitignore                                    |   1 +
 AUTHORS.md                                    |   1 +
 docs/cs-manual/Makefile                       | 216 +++++++++++
 docs/cs-manual/make.bat                       | 263 +++++++++++++
 .../_static/images/chapter-1/add-record.png   | Bin 0 -> 106549 bytes
 .../_static/images/chapter-1/edit-record.png  | Bin 0 -> 191171 bytes
 .../_static/images/chapter-1/new-project.png  | Bin 0 -> 70819 bytes
 .../_static/images/chapter-1/objects.png      | Bin 0 -> 97097 bytes
 .../images/chapter-1/opening-dialogue.png     | Bin 0 -> 92302 bytes
 docs/cs-manual/source/conf.py                 | 358 ++++++++++++++++++
 .../source/files-and-directories.rst          | 224 +++++++++++
 docs/cs-manual/source/foreword.rst            |  21 +
 docs/cs-manual/source/index.rst               |  30 ++
 docs/cs-manual/source/starting-dialog.rst     |  40 ++
 docs/cs-manual/source/tour.rst                | 223 +++++++++++
 15 files changed, 1377 insertions(+)
 create mode 100644 docs/cs-manual/Makefile
 create mode 100644 docs/cs-manual/make.bat
 create mode 100644 docs/cs-manual/source/_static/images/chapter-1/add-record.png
 create mode 100644 docs/cs-manual/source/_static/images/chapter-1/edit-record.png
 create mode 100644 docs/cs-manual/source/_static/images/chapter-1/new-project.png
 create mode 100644 docs/cs-manual/source/_static/images/chapter-1/objects.png
 create mode 100644 docs/cs-manual/source/_static/images/chapter-1/opening-dialogue.png
 create mode 100644 docs/cs-manual/source/conf.py
 create mode 100644 docs/cs-manual/source/files-and-directories.rst
 create mode 100644 docs/cs-manual/source/foreword.rst
 create mode 100644 docs/cs-manual/source/index.rst
 create mode 100644 docs/cs-manual/source/starting-dialog.rst
 create mode 100644 docs/cs-manual/source/tour.rst

diff --git a/.gitignore b/.gitignore
index e1abcaa639..51b8c1f0f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ prebuilt
 
 ## doxygen
 Doxygen
+!docs/cs-manual/Makefile
 
 ## ides/editors
 *~
diff --git a/AUTHORS.md b/AUTHORS.md
index 83a625406e..79cb87e64e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -128,6 +128,7 @@ Manual
 
     Bodillium
     Cramal
+    Alejandro Sanchez (HiPhish)
     sir_herrbatka
 
 Packagers
diff --git a/docs/cs-manual/Makefile b/docs/cs-manual/Makefile
new file mode 100644
index 0000000000..9d62dc5abb
--- /dev/null
+++ b/docs/cs-manual/Makefile
@@ -0,0 +1,216 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/*
+
+.PHONY: html
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: dirhtml
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OpenMWCSManual.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OpenMWCSManual.qhc"
+
+.PHONY: applehelp
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/OpenMWCSManual"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OpenMWCSManual"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: latex
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/cs-manual/make.bat b/docs/cs-manual/make.bat
new file mode 100644
index 0000000000..744d600076
--- /dev/null
+++ b/docs/cs-manual/make.bat
@@ -0,0 +1,263 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+set I18NSPHINXOPTS=%SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\OpenMWCSManual.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\OpenMWCSManual.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+:end
diff --git a/docs/cs-manual/source/_static/images/chapter-1/add-record.png b/docs/cs-manual/source/_static/images/chapter-1/add-record.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0a110b7c584bfae3ea9341ba215babc59a48b98
GIT binary patch
literal 106549
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

literal 0
HcmV?d00001

diff --git a/docs/cs-manual/source/_static/images/chapter-1/edit-record.png b/docs/cs-manual/source/_static/images/chapter-1/edit-record.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db3d1bd671ee306a588be1476bf5a5244f982d3
GIT binary patch
literal 191171
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%0D_bfZ6>4o>%Sgpy29BXGO?
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
RG1}jwhdK|+?md0|{{W`xbXWiY

literal 0
HcmV?d00001

diff --git a/docs/cs-manual/source/_static/images/chapter-1/new-project.png b/docs/cs-manual/source/_static/images/chapter-1/new-project.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5097db9c06f0f98e002e5ff01f6383eb899b87a
GIT binary patch
literal 70819
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

literal 0
HcmV?d00001

diff --git a/docs/cs-manual/source/_static/images/chapter-1/objects.png b/docs/cs-manual/source/_static/images/chapter-1/objects.png
new file mode 100644
index 0000000000000000000000000000000000000000..f36a7289ca58a0626dcd4556421350b3a493d421
GIT binary patch
literal 97097
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
HfBk;}BOo6T

literal 0
HcmV?d00001

diff --git a/docs/cs-manual/source/_static/images/chapter-1/opening-dialogue.png b/docs/cs-manual/source/_static/images/chapter-1/opening-dialogue.png
new file mode 100644
index 0000000000000000000000000000000000000000..5356c2695616e8c23f117da9d74615d4b3ef38b1
GIT binary patch
literal 92302
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

literal 0
HcmV?d00001

diff --git a/docs/cs-manual/source/conf.py b/docs/cs-manual/source/conf.py
new file mode 100644
index 0000000000..28931a4a0d
--- /dev/null
+++ b/docs/cs-manual/source/conf.py
@@ -0,0 +1,358 @@
+# -*- coding: utf-8 -*-
+#
+# OpenMW CS Manual documentation build configuration file, created by
+# sphinx-quickstart on Fri Feb  5 21:28:27 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'OpenMW CS Manual'
+copyright = u'2016, The OpenMW Project'
+author = u'HiPhish'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = u'0.0'
+# The full version, including alpha/beta/rc tags.
+release = u'0.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'OpenMWCSManualdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'OpenMWCSManual.tex', u'OpenMW CS Manual Documentation',
+     u'HiPhish', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'openmwcsmanual', u'OpenMW CS Manual Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'OpenMWCSManual', u'OpenMW CS Manual Documentation',
+     author, 'OpenMWCSManual', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
+
+
+# -- Options for Epub output ----------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+epub_author = author
+epub_publisher = author
+epub_copyright = copyright
+
+# The basename for the epub file. It defaults to the project name.
+#epub_basename = project
+
+# The HTML theme for the epub output. Since the default themes are not
+# optimized for small screen space, using the same theme for HTML and epub
+# output is usually not wise. This defaults to 'epub', a theme designed to save
+# visual space.
+#epub_theme = 'epub'
+
+# The language of the text. It defaults to the language option
+# or 'en' if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# A tuple containing the cover image and cover page html template filenames.
+#epub_cover = ()
+
+# A sequence of (type, uri, title) tuples for the guide element of content.opf.
+#epub_guide = ()
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files that should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True
+
+# Choose between 'default' and 'includehidden'.
+#epub_tocscope = 'default'
+
+# Fix unsupported image types using the Pillow.
+#epub_fix_images = False
+
+# Scale large images.
+#epub_max_image_width = 0
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#epub_show_urls = 'inline'
+
+# If false, no index is generated.
+#epub_use_index = True
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
diff --git a/docs/cs-manual/source/files-and-directories.rst b/docs/cs-manual/source/files-and-directories.rst
new file mode 100644
index 0000000000..34680fa945
--- /dev/null
+++ b/docs/cs-manual/source/files-and-directories.rst
@@ -0,0 +1,224 @@
+Files and Directories
+#####################
+
+In this chapter of the manual we will cover the usage of files and directories
+by OpenMW CS. Files and directories are file system concepts of your operating
+system, so we will not be going into specifics about that, we will only focus
+on what is relevant to OpenMW CS.
+
+
+Basics
+******
+
+
+Directories
+===========
+
+OpenMW and OpenMW CS us multiple directories on the file system. First of all
+there is a *user directory* that holds configuration files and a number of
+different sub-directories. The location of the user directory is hard-coded
+into the CS and depends on your operating system.
+
+================  =========================================
+Operating System  User Dircetory
+================  =========================================
+GNU/Linux         ``<whatever>``
+OS X              ``~/Library/Application Support/openmw/``
+Windows           ``<whatever>``
+================  =========================================
+
+In addition to to this single hard-coded directory both OpenMW and OpenMW CS
+need a place to seek for a actuals data files of the game: textures, 3D models,
+sounds and record files that store objects in game; dialogues an so one. These
+files are called *content files*. We support multiple such paths (we call them
+*data paths*) as specified in the configuration. Usually one data path points
+to the directory where the original Morrowind game is either installed or
+unpacked to. You are free to specify as many data paths as you would like,
+however, there is one special data path that, as described later, which is used
+to store newly created content files.
+
+
+Content files
+=============
+
+The original Morrowind engine by Bethesda Softworks uses two types of content
+files: `esm` (master) and `esp` (plugin). The distinction between those two is
+not clear, and often confusing. One would expect the `esm` (master) file to be
+used to specify one master, which is then modified by the `esp` plugins. And
+indeed: this is the basic idea. However, the official expansions were also made
+as ESM files, even though they could essentially be described as really large
+plugins, and therefore would rather use `esp` files. There were technical
+reasons behind this decision – somewhat valid in the case of the original
+engine, but clearly it is better to create a system that can be used in a more
+sensible way.  OpenMW achieves this with our own content file types.
+
+We support both ESM and ESP files, but in order to make use of new features in
+OpenMW one should consider using new file types designed with our engine in
+mind: *game* files and *addon* files, collectively called *content files*.
+
+
+OpenMW content files
+--------------------
+
+The concepts of *Game* and *Addon* files are somewhat similar to the old
+concept of *ESM* and *ESP*, but more strictly enforced. It is quite
+straight-formward: If you want to make new game using OpenMW as the engine (a
+so called *total conversion*) you should create a game file. If you want to
+create an addon for an existing game file create an addon file. Nothing else
+matters; the only distinction you should consider is if your project is about
+changing another game or creating a new one. Simple as that.
+
+Another simple thing about content files are the extensions: we are using
+``.omwaddon`` for addon files and ``.omwgame`` for game files.
+
+
+Morrowind content files
+-----------------------
+
+Using our content files is recommended for projects that are intended to used
+with the OpenMW engine. However, some players might wish to still use the
+original Morrowind engine. In addition thousands of *ESP*/*ESM* files were
+created since 2002, some of them with really outstanding content. Because of
+this OpenMW CS simply has no other choice but to support *ESP*/*ESM* files. If
+you decid to choose *ESP*/*ESM* file instead of using our own content file
+types you are most likely aimng at compatibility with the original engine. This
+subject is covered in it own chapter of this manual.
+
+
+.. TODO This paragraph sounds weird
+
+The actual creation of new files is described in the next chapter. Here we are
+going to focus only on the details you need to know in order to create your
+first OpenMW CS file while fully understanding your needs. For now let’s jut
+remember that content files are created inside the user directory in the the
+``data`` subdirectory (that is the one special data directory mentioned
+earlier).
+
+
+Dependencies
+------------
+
+Since an addon is supposed to change the game it follows that it also depends
+on the said game to work. We can conceptualise this with an examples: your
+modification is the changing prize of an iron sword, but what if there is no
+iron sword in game? That's right: we get nonsense. What you want to do is tie
+your addon to the files you are changing. Those can be either game files (for
+example when making an expansion island for a game) or other addon files
+(making a house on said island). Obviously It is a good idea to be dependent
+only on files that are really changed in your addon, but sadly there is no
+other way to achieve this than knowing what you want to do. Again, please
+remember that this section of the manual does not cover creating the content
+files – it is only a theoretical introduction to the subject. For now just keep
+in mind that dependencies exist, and is up to you to decide whether your
+content file should depend on other content files.
+
+Game files are not intend to have any dependencies for a very simple reasons:
+the player is using only one game file (excluding original and the dirty
+ESP/ESM system) at a time and therefore no game file can depend on other game
+file, and since a game file makes the base for addon files it can not depend on
+addon files.
+
+
+Project files
+-------------
+
+Project files act as containers for data not used by the OpenMW game engine
+itself, but still useful for OpenMW CS. The shining example of this data
+category are without doubt record filters (described in a later chapter of the
+manual). As a mod author you probably do not need or want to distribute project
+files at all, they are meant to be used only by you and your team.
+
+.. TODO "you and your team": is that correct?
+
+As you would imagine, project files make sense only in combination with actual
+content files. In fact, each time you start to work on new content file and a
+project file was not found, one will be created. The extensio of project files
+is ``.project``. The whole name of the project file is the whole name of the
+content file with appended extension. For instance a ``swords.omwaddon`` file
+is associated with a ``swords.omwaddon.project`` file.
+
+Project files are stored inside the user directory, in the ``projects``
+subdirectory. This is the path location for both freshly created project files,
+and a place where OpenMW CS looks for already existing files.
+
+
+Resource files
+==============
+
+.. TODO  This paragraph sounds weird 
+
+Unless we are talking about a fully text based game, like Zork or Rogue, one
+would expect that a video game is using some media files: 3D models with
+textures, images acting as icons, sounds and anything else. Since content
+files, no matter whether they are *ESP*, *ESM* or new OpenMW file type, do not
+contain any of those, it is clear that they have to be delivered with a
+different file. It is also clear that this, let’s call it “resources file“,
+has to be supported by the engine. Without code handling those files it is
+nothing more than a mathematical abstraction – something, that lacks meaning
+for human beings.  Therefore this section must cover ways to add resources
+files to your content file, and point out what is supported. We are going to do
+just that.  Later, you will learn how to make use of those files in your
+content.
+
+
+Audio
+-----
+
+OpenMW uses FFmpeg_ for audio playback, and so we support every audio type
+supported by that library. This makes a huge list. Below is only small portion
+of the supported file types.
+
+mp3 (MPEG-1 Part 3 Layer 3)
+   A popular audio file format and de facto standard for storing audio. Used by
+   the Morrowind game.
+
+ogg
+   An open source, multimedia container file using a high quality Vorbis_ audio
+   codec. Recommended.
+
+
+Video
+-----
+
+Video As in the case of audio files, we are using FFmepg to decode video files.
+The list of supported files is long, we will cover only the most significant.
+
+bik
+   Videos used by the original Morrowind game.
+
+mp4
+   A multimedia container which use more advanced codecs (MPEG-4 Parts 2, 3 and
+   10) with a better audio and video compression rate, but also requiring more
+   CPU intensive decoding – this makes it probably less suited for storing
+   sounds in computer games, but good for videos.
+
+webm
+   A new, shiny and open source video format with excellent compression. It
+   needs quite a lot of processing power to be decoded, but since game logic is
+   not running during cutscenes we can recommend it for use with OpenMW.
+
+ogv
+   Alternative, open source container using Theora_ codec for video and Vorbis for audio.
+
+
+
+Textures and images
+-------------------
+
+The original Morrowind game uses *DDS* and *TGA* files for all kinds of two
+dimensional images and textures alike. In addition, the engine supported *BMP*
+files for some reason (*BMP* is a terrible format for a video game). We also
+support an extended set of image files – including *JPEG* and *PNG*. *JPEG* and
+*PNG* files can be useful in some cases, for instance a *JPEG* file is a valid
+option for skybox texture and *PNG* can useful for masks. However, please keep
+in mind that *JPEG* images can grow to large sizes quickly and are not the best
+option with a DirectX rendering backend. You probably still want to use *DDS*
+files for textures.
+
+
+
+.. Hyperlink targets for the entire document
+
+.. _FFmpeg: http://ffmpeg.org
+.. _Vorbis: http://www.vorbis.com
+.. _Theora: http://www.theora.org
diff --git a/docs/cs-manual/source/foreword.rst b/docs/cs-manual/source/foreword.rst
new file mode 100644
index 0000000000..613eca5e34
--- /dev/null
+++ b/docs/cs-manual/source/foreword.rst
@@ -0,0 +1,21 @@
+Foreword
+########
+
+<Some introductory lines here, explain nomenclature and abbreviations>
+
+
+How to read the manual
+**********************
+
+The manual can be roughly divided into two parts: a tutorial part consisting of
+the first two (three) chapters and the reference manual. We recommend all
+readers to work through the tutorials first, there you will be guided through
+the creation of a fairly simple mod where you can familiarise yourself with the
+record-based interface. The tutorials are very simple and teach you only what
+is necessary for the task, each one can be completed in under half an hour. It
+is strongly recommended to do the tutorials in order.
+
+When you are familiar with the CS in general and want to write your own mods it
+is time to move on to the reference part of the manual. The reference chapters
+can be read out of order, each one covers only one topic.
+
diff --git a/docs/cs-manual/source/index.rst b/docs/cs-manual/source/index.rst
new file mode 100644
index 0000000000..ce50b8c95a
--- /dev/null
+++ b/docs/cs-manual/source/index.rst
@@ -0,0 +1,30 @@
+.. OpenMW CS Manual documentation master file, created by
+   sphinx-quickstart on Fri Feb  5 21:28:27 2016.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+#####################
+OpenMW CS user manual
+#####################
+
+The following document is the complete user manual for *OpenMW CS*, the
+construction set for the OpenMW game engine. It is intended to serve both as an
+introduction and a reference for the application. Even if you are familiar with
+modding *The Elder Scrolls III: Morrowind* you should at least read the first
+few chapters to familiarise yourself with the new interface.
+
+.. warning::
+   OpenMW CS is still software in development. The manual does not cover any of
+   its shortcomings, it is written as if everything was working as inteded.
+   Please report any software problems as bugs in the software, not errors in
+   the manual.
+
+.. toctree::
+   :caption: Table of Contents
+   :maxdepth: 2
+
+   foreword
+   tour
+   files-and-directories
+   starting-dialog
+
diff --git a/docs/cs-manual/source/starting-dialog.rst b/docs/cs-manual/source/starting-dialog.rst
new file mode 100644
index 0000000000..02a65ff213
--- /dev/null
+++ b/docs/cs-manual/source/starting-dialog.rst
@@ -0,0 +1,40 @@
+OpenMW CS Starting Dialog
+#########################
+
+In this chapter we will cover starting up OpenMW CS and the starting interface.
+Start the CS the way intended for your operating system and you will be
+presented with window and three main buttons and a small button with a
+wrench-icon. The wrench will open the configuration dialog which we will cover
+later. The three main buttons are the following:
+
+Create A New Game
+   Choose this option if you want to create an original game that does not
+   depend on any other content files. The distinction between game and addon in
+   the original Morrowind engine was somewhat blurry, but OpenMW is very strict
+   about it: regardless of how large your addon is, if it depends on another
+   content file it is not an original game.
+
+Create A New Addon
+   Choose this option if you want to create an extension to an existing game.
+   An addon can depend on other addons as well optionally, but it *must* depend
+   on a game.
+
+Edit A Content File
+   Choose this option is you wish to edit an existing content file, regardless
+   of whether it is a game or an addon.
+
+Whether you create a game or an addon, a data file and a project file will be
+generated for you in you user directory.
+
+You will have to choose a name for your content file and if you chose to create
+an addon you will also have to chose a number of dependencies. You have to
+choose exactly one game and you can choose an arbitrary amount of addon
+dependencies.  For the sake of simplicity and maintainability choose only the
+addons you actually want to depend on. Also keep in mind that your dependencies
+might have dependencies of their own, you have to depend on those as well. If
+one of your dependencies nees something it will be indicated by a warning sign
+and automatically include its dependencies when you choose it.
+
+If you want to edit an existing content file you will be presented with a
+similar dialog, except you don't get to choose a file name (because you are
+editing files that already exist).
diff --git a/docs/cs-manual/source/tour.rst b/docs/cs-manual/source/tour.rst
new file mode 100644
index 0000000000..0e92fe6faa
--- /dev/null
+++ b/docs/cs-manual/source/tour.rst
@@ -0,0 +1,223 @@
+A Tour through OpenMW CS: making a magic ring
+#############################################
+
+In this first chapter we will create a mod that adds a new ring with a simple
+enchantment to the game. The ring will give its wearer a permanent Night Vision
+effect while being worn. You don't need prior knowledge about modding
+Morrowind, but you should be familiar with the game itself. There will be no
+scripting necessary, we chan achieve everything using just what the base game
+offers out of the box. Before continuing make sure that OpenMW is properly
+installed and playable.
+
+
+Adding the ring to the game's records
+*************************************
+
+In this first section we will define what our new ring is, what it looks like
+and what it does. Getting it to work is the first step before we go further.
+
+
+Starting up OpenMW CS
+=====================
+
+We will start by launching OpenMW CS, the location of the program depends on
+your operating system. You will be presented with a dialogue with three
+options: create a new game, create a new addon, edit a content file.
+
+.. figure:: ./_static/images/chapter-1/opening-dialogue.png
+   :alt: Opening dialogue with three option and setting button (the wrench)
+
+The first option is for creating an entirely new game, that's not what we want.
+We want to edit an existing game, so choose the second one. When you save your
+addon you can use the third option to open it again.
+
+You will be presented with another window where you get to chose the content to
+edit and the name of your project. We have to chose at least a base game, and
+optionally a number of other addons we want to depend on. The name of the
+project is arbitrary, it will be used to identify the addon later in the OpenMW
+launcher.
+
+.. figure:: ./_static/images/chapter-1/new-project.png
+   :alt: Creation dialogue for a new project, pick content modules and name
+
+Choose Morrowind as your content file and enter `Ring of Night Vision` as the
+name. We could also chose further content files as dependencies if we wanted
+to, but for this mod the base game is enough.
+
+Once the addon has been created you will be presented with a table. If you see
+a blank window rather than a table choose *World* → *Objects* from the menu.
+
+.. figure:: ./_static/images/chapter-1/objects.png
+   :alt: The table showing all objet records in the game.
+
+Let's talk about the interface for a second. Every window in OpenMW CS has
+*panels*, these are often but not always tables. You can close a panel by
+clicking the small "X" on the title bar of the panel, or you can detach it by
+either dragging the title bar or clicking the icon with the two windows. A
+detached panel can be re-attached to a window by dragging it by the title bar
+on top of the window.
+
+Now let's look at the panel itself: we have a filter text field, a very large
+table and a status bar. The filter will be very useful when we want to find an
+entry in the table, but for now it is irrelevant. The table you are looking at
+contains all objects in the game, these can be items, NPCs, creatures,
+whatever. Every object is an entry in that table, visible as a row. The columns
+of the table are the attributes of each object.
+
+Morrowind uses something called a *relational database* for game data. If you
+are not familiar with the term, it means that every type of thing can be
+expressed as a *table*: there is a table for objects, a table for enchantments,
+a table for icons, one for meshes, and so on. Properties of an entry must be
+simple values, like numbers or text strings. If we want a more complicated
+property we need to reference an entry from another table. There are a few
+exceptions to this though, some tables do have subtables. The effects of
+enchantments are one of those exceptions.
+
+
+Defining a new record
+=====================
+
+Enough talk, let's create the new ring now. Right-click anywhere in the objects
+table, choose `Add Record` and the status bar will change into an input field.
+We need to enter an *ID* (short for *identifier*) and pick the type. The
+identifier is a unique name by which the ring can later be identified; I have
+chosen `ring_night_vision`. For the type choose *Clothing*.
+
+.. figure:: ./_static/images/chapter-1/add-record.png
+   :alt: Enter the ID and type of the new ring
+
+The table should jump right to our newly created record, if not read further
+below how to use filters to find a record by ID. Notice that the *Modified*
+column now shows that this record is new. Records can also be *Base*
+(unmodified), *Modified* and *Deleted*. The other fields are still empty since
+we created this record from nothing. We can double-click a table cell while
+holding Shift to edit it (this is a configurable shortcut), but there is a
+better way: right-click the row of our new record and chose *Edit Record*, a
+new panel will open.
+
+We can right-click the row of our new record and chose *Edit Record*, a
+new panel will open. Alternatively we can also define a configurable shortcut
+instead of using the context menu; the default is double-clicking while
+holding down the shift key.
+
+
+.. figure:: ./_static/images/chapter-1/edit-record.png
+   :alt: Edit the properties of the record in a separate panel
+
+You can set the name, weight and coin value as you like, I chose `Ring of Night
+Vision`, `0.1` and `2500` respectively. Make sure you set the *Clothing Type*
+to *Ring*. We could set the other properties manually as well, but unless you
+have an exceptional memory for identifiers and never make typos that's not
+feasible. What we are going to do instead is find the records we want in their
+respective tables and assign them from there.
+
+
+Finding records using filters
+=============================
+
+We will add an icon first. Open the *Icons* table the same way you opened the
+*Objects* table: in the menu click *Assets* → *Icons*. If the window gets too
+crowded remember that you can detach panels. The table is huge and not every
+ring icon starts with "ring", so we have to use filters to find what we want.
+
+Filters are a central element of OpenMW CS and a major departure from how the
+original Morrowind CS was used. In fact, filters are so important that they
+have their own table as well. We won't be going that far for now though. There
+are three types of filters: *Project filters* are part of the project and are
+stored in the project file, *session filter* are only valid until you exit the
+CS, and finally *instant filter* which are used only once and typed directly
+into the *Filter* field.
+
+For this tutorial we will only use instant filters. We type the definition of
+the filter directly into the filter field rather than the name of an existing
+filter. To signify that we are using an instant filter the have to use `!` as
+the first character. Type the following into the field:
+
+.. code:: 
+
+   !string("id", ".*ring.*")
+
+A filter is defined by a number of *queries* which can be logically linked. For
+now all that matters is that the `string(<property>, <pattern>)` query will check
+whether `<propery>` matches `<pattern>`. The pattern is a regular expression,
+if you don't know about them you should learn their syntax. For now all that
+matters is that `.` stands for any character and `*` stands for any amount,
+even zero. In other words, we are looking for all entries which have an ID that
+contains the word "ring" somewhere in it. This is a pretty dumb pattern because
+it will also match words like "ringmail", but it's good enough for now.
+
+If you have typed the filter definition properly the text should change from
+red to black and our table will be narrowed down a lot. Browse for an icon you
+like and drag & drop its table row onto the *Icon* field of our new ring.
+
+That's it, you have now assigned a reference to an entry in another table to
+the ring entry in the *Objects* table. Repeat the same process for the 3D
+model, you can find the *Meshes* table under *Assets* → *Meshes*.
+
+
+Adding the enchantment
+======================
+
+Putting everything you have learned so far to practice we can add the final and
+most important part to our new ring: the enchantment. You know enough to
+perform the following steps without guidance: Open the *Enchantments* table
+(*Mechanics* → *Enchantments*) and create a new entry with the ID `Cats Eye`.
+Edit it so that it has *Constant Effect* enchantment type.
+
+To add an effect to the enchantment right-click the *Magic Effects* table and
+choose *Add new row*. You can edit the effects by right-clicking their table
+cells.  Set the effect to *NightEye*, range to *Self*, and both magnitudes to
+`50`. The other properties are irrelevant.
+
+Once you are done add the new enchantment to our ring. That's it, we now have a
+complete enchanted ring to play with. Let's take it for a test ride.
+
+
+Playing your new addon
+======================
+
+Launch OpenMW and in the launcher under *Data Files* check your addon. Load a
+game and open the console. We have only defined the ring, but we haven't placed
+any instance of it anywhere in the game world, so we have to create one. In the
+console type:
+
+.. code::
+
+   player->AddItem "ring_night_vision" 1
+
+The part in quotation marks is the ID of our ring, you have to adjust it if you
+chose a different ID. Exit the console and you should find a new ring in your
+inventory. Equip it and you will instantly receive the *Night Vision* effect
+for your character.
+
+
+Conclusion
+==========
+
+In this tutorial we have learned how to create a new addon, what tables are and
+how to create new records. We have also taken a very brief glimpse at the
+syntax of filters, a feature you will be using a lot when creating larger mods.
+
+This mod is a pure addition, it does not change any of the existing records.
+However, if you want to actually present appealing content to the player rather
+than just offering abstract definitions you will have to change the game's
+content. In the next tutorial we will learn how to place the ring in the game
+world so the player can find it legitimately.
+
+
+
+Adding the ring to the game's world
+***********************************
+
+Now that we have defined the ring it is time add it to the game world so the
+player can find it legitimately. We will add the ring to a merchant, place it
+in a chest and put it somewhere in plain sight. To this end we will have to
+actually modify the contents of the game.
+
+
+Subsection to come...
+=====================
+
+
+
+

From e02f35264fd2e8f78d258d73cb5f6c709b110e64 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Feb 2016 15:08:12 +0100
Subject: [PATCH 192/765] Work around OSG 3.2 not respecting the
 DEEP_COPY_CALLBACK flag (Fixes #3183)

---
 components/sceneutil/clone.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 26f3f5c7cd..784195e7ef 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -81,6 +81,11 @@ namespace SceneUtil
 #endif
 
             osg::Drawable* cloned = osg::clone(drawable, copyop);
+#if OSG_VERSION_LESS_THAN(3,3,3)
+            // work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag
+            if (cloned->getUpdateCallback())
+                cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));
+#endif
             return cloned;
         }
         if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable))

From df57d4bfba49b41b692c7db85b9ef774fa772570 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Feb 2016 16:57:54 +0100
Subject: [PATCH 193/765] Use a common base class for resource managers

Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
---
 apps/openmw/mwphysics/physicssystem.cpp    |  5 +++
 apps/openmw/mwphysics/physicssystem.hpp    |  1 +
 apps/openmw/mwrender/renderingmanager.cpp  |  2 +-
 components/CMakeLists.txt                  |  2 +-
 components/resource/bulletshapemanager.cpp |  3 +-
 components/resource/bulletshapemanager.hpp | 16 +-------
 components/resource/imagemanager.cpp       |  3 +-
 components/resource/imagemanager.hpp       | 16 ++------
 components/resource/keyframemanager.cpp    |  3 +-
 components/resource/keyframemanager.hpp    | 19 +---------
 components/resource/niffilemanager.cpp     | 10 +----
 components/resource/niffilemanager.hpp     | 20 +---------
 components/resource/resourcemanager.cpp    | 34 +++++++++++++++++
 components/resource/resourcemanager.hpp    | 43 ++++++++++++++++++++++
 components/resource/resourcesystem.cpp     | 29 ++++++++++++++-
 components/resource/resourcesystem.hpp     | 17 ++++++++-
 components/resource/scenemanager.cpp       |  9 +----
 components/resource/scenemanager.hpp       | 19 ++--------
 components/vfs/manager.hpp                 |  6 +++
 19 files changed, 152 insertions(+), 105 deletions(-)
 create mode 100644 components/resource/resourcemanager.cpp
 create mode 100644 components/resource/resourcemanager.hpp

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index c99456ae52..11d6d286a4 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -640,12 +640,15 @@ namespace MWPhysics
 
     PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
         : mShapeManager(new Resource::BulletShapeManager(resourceSystem->getVFS(), resourceSystem->getSceneManager(), resourceSystem->getNifFileManager()))
+        , mResourceSystem(resourceSystem)
         , mDebugDrawEnabled(false)
         , mTimeAccum(0.0f)
         , mWaterHeight(0)
         , mWaterEnabled(false)
         , mParentNode(parentNode)
     {
+        mResourceSystem->addResourceManager(mShapeManager.get());
+
         mCollisionConfiguration = new btDefaultCollisionConfiguration();
         mDispatcher = new btCollisionDispatcher(mCollisionConfiguration);
         mBroadphase = new btDbvtBroadphase();
@@ -659,6 +662,8 @@ namespace MWPhysics
 
     PhysicsSystem::~PhysicsSystem()
     {
+        mResourceSystem->removeResourceManager(mShapeManager.get());
+
         if (mWaterCollisionObject.get())
             mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get());
 
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index f53d7e3d9b..4263bc0ec3 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -169,6 +169,7 @@ namespace MWPhysics
             btCollisionWorld* mCollisionWorld;
 
             std::auto_ptr<Resource::BulletShapeManager> mShapeManager;
+            Resource::ResourceSystem* mResourceSystem;
 
             typedef std::map<MWWorld::ConstPtr, Object*> ObjectMap;
             ObjectMap mObjects;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 9b7ced4b58..d4199d5f6c 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -233,7 +233,7 @@ namespace MWRender
 
     void RenderingManager::clearCache()
     {
-        mResourceSystem->clearCache();
+        mResourceSystem->updateCache(mViewer->getFrameStamp()->getReferenceTime());
         if (mTerrain.get())
             mTerrain->clearCache();
     }
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0b54ddeb73..42323a68a0 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -41,7 +41,7 @@ add_component_dir (vfs
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager resourcesystem bulletshapemanager bulletshape niffilemanager objectcache
+    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache resourcesystem resourcemanager
     )
 
 add_component_dir (sceneutil
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 2ab7b243aa..b5581cce24 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -97,10 +97,9 @@ private:
 };
 
 BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager)
-    : mVFS(vfs)
+    : ResourceManager(vfs)
     , mSceneManager(sceneMgr)
     , mNifFileManager(nifFileManager)
-    , mCache(new osgDB::ObjectCache)
 {
 
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index c8db8849e7..576268f753 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -7,16 +7,7 @@
 #include <osg/ref_ptr>
 
 #include "bulletshape.hpp"
-
-namespace VFS
-{
-    class Manager;
-}
-
-namespace osgDB
-{
-    class ObjectCache;
-}
+#include "resourcemanager.hpp"
 
 namespace Resource
 {
@@ -29,7 +20,7 @@ namespace Resource
     /// Handles loading, caching and "instancing" of bullet shapes.
     /// A shape 'instance' is a clone of another shape, with the goal of setting a different scale on this instance.
     /// @note May be used from any thread.
-    class BulletShapeManager
+    class BulletShapeManager : public ResourceManager
     {
     public:
         BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager);
@@ -38,11 +29,8 @@ namespace Resource
         osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
 
     private:
-        const VFS::Manager* mVFS;
         SceneManager* mSceneManager;
         NifFileManager* mNifFileManager;
-
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
     };
 
 }
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index bd422fe2a6..79da7d7abf 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -42,8 +42,7 @@ namespace Resource
 {
 
     ImageManager::ImageManager(const VFS::Manager *vfs)
-        : mVFS(vfs)
-        , mCache(new osgDB::ObjectCache)
+        : ResourceManager(vfs)
         , mWarningImage(createWarningImage())
         , mOptions(new osgDB::Options("dds_flip dds_dxt1_detect_rgba"))
     {
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
index bc1d7b4e4b..8d9ad2c327 100644
--- a/components/resource/imagemanager.hpp
+++ b/components/resource/imagemanager.hpp
@@ -8,20 +8,16 @@
 #include <osg/Image>
 #include <osg/Texture2D>
 
+#include "resourcemanager.hpp"
+
 namespace osgViewer
 {
     class Viewer;
 }
 
-namespace VFS
-{
-    class Manager;
-}
-
 namespace osgDB
 {
     class Options;
-    class ObjectCache;
 }
 
 namespace Resource
@@ -29,7 +25,7 @@ namespace Resource
 
     /// @brief Handles loading/caching of Images.
     /// @note May be used from any thread.
-    class ImageManager
+    class ImageManager : public ResourceManager
     {
     public:
         ImageManager(const VFS::Manager* vfs);
@@ -39,15 +35,9 @@ namespace Resource
         /// Returns the dummy image if the given image is not found.
         osg::ref_ptr<osg::Image> getImage(const std::string& filename);
 
-        const VFS::Manager* getVFS() { return mVFS; }
-
         osg::Image* getWarningImage();
 
     private:
-        const VFS::Manager* mVFS;
-
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
-
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;
 
diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
index 7e948dcb03..4392f84c19 100644
--- a/components/resource/keyframemanager.cpp
+++ b/components/resource/keyframemanager.cpp
@@ -9,8 +9,7 @@ namespace Resource
 {
 
     KeyframeManager::KeyframeManager(const VFS::Manager* vfs)
-        : mCache(new osgDB::ObjectCache)
-        , mVFS(vfs)
+        : ResourceManager(vfs)
     {
     }
 
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
index 5a5cb36284..1c2c219bb1 100644
--- a/components/resource/keyframemanager.hpp
+++ b/components/resource/keyframemanager.hpp
@@ -4,15 +4,7 @@
 #include <osg/ref_ptr>
 #include <string>
 
-namespace VFS
-{
-    class Manager;
-}
-
-namespace osgDB
-{
-    class ObjectCache;
-}
+#include "resourcemanager.hpp"
 
 namespace NifOsg
 {
@@ -24,22 +16,15 @@ namespace Resource
 
     /// @brief Managing of keyframe resources
     /// @note May be used from any thread.
-    class KeyframeManager
+    class KeyframeManager : public ResourceManager
     {
     public:
         KeyframeManager(const VFS::Manager* vfs);
         ~KeyframeManager();
 
-        void clearCache();
-
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
         /// @note Throws an exception if the resource is not found.
         osg::ref_ptr<const NifOsg::KeyframeHolder> get(const std::string& name);
-
-    private:
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
-
-        const VFS::Manager* mVFS;
     };
 
 }
diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index 1d8019b69d..3c7437520b 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -29,9 +29,9 @@ namespace Resource
     };
 
     NifFileManager::NifFileManager(const VFS::Manager *vfs)
-        : mVFS(vfs)
+        : ResourceManager(vfs, 0.0) // NIF files aren't needed any more when the converted objects are cached in SceneManager / BulletShapeManager,
+                                    // so we'll use expiryDelay of 0 to instantly delete NIF files after use.
     {
-        mCache = new osgDB::ObjectCache;
     }
 
     NifFileManager::~NifFileManager()
@@ -39,12 +39,6 @@ namespace Resource
 
     }
 
-    void NifFileManager::clearCache()
-    {
-        // NIF files aren't needed any more when the converted objects are cached in SceneManager / BulletShapeManager,
-        // so we'll simply drop all nif files here, unlikely to need them again
-        mCache->clear();
-    }
 
     Nif::NIFFilePtr NifFileManager::get(const std::string &name)
     {
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
index 4551cf2275..4b43ff24bf 100644
--- a/components/resource/niffilemanager.hpp
+++ b/components/resource/niffilemanager.hpp
@@ -5,39 +5,23 @@
 
 #include <components/nif/niffile.hpp>
 
-namespace VFS
-{
-    class Manager;
-}
-
-namespace osgDB
-{
-    class ObjectCache;
-}
+#include "resourcemanager.hpp"
 
 namespace Resource
 {
 
     /// @brief Handles caching of NIFFiles.
     /// @note May be used from any thread.
-    class NifFileManager
+    class NifFileManager : public ResourceManager
     {
     public:
         NifFileManager(const VFS::Manager* vfs);
         ~NifFileManager();
 
-        void clearCache();
-
         /// Retrieve a NIF file from the cache, or load it from the VFS if not cached yet.
         /// @note For performance reasons the NifFileManager does not handle case folding, needs
         /// to be done in advance by other managers accessing the NifFileManager.
         Nif::NIFFilePtr get(const std::string& name);
-
-    private:
-        // Use the osgDB::ObjectCache so objects are retrieved in thread safe way
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
-
-        const VFS::Manager* mVFS;
     };
 
 }
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
new file mode 100644
index 0000000000..60233baa0d
--- /dev/null
+++ b/components/resource/resourcemanager.cpp
@@ -0,0 +1,34 @@
+#include "resourcemanager.hpp"
+
+#include "objectcache.hpp"
+
+namespace Resource
+{
+
+    ResourceManager::ResourceManager(const VFS::Manager *vfs, const double expiryDelay)
+        : mVFS(vfs)
+        , mCache(new osgDB::ObjectCache)
+        , mExpiryDelay(expiryDelay)
+    {
+
+    }
+
+    void ResourceManager::updateCache(double referenceTime)
+    {
+        // NOTE: we could clear the cache from the background thread if the deletion proves too much of an overhead
+        // idea: customize objectCache to not hold a lock while doing the actual deletion
+        mCache->updateTimeStampOfObjectsInCacheWithExternalReferences(referenceTime);
+        mCache->removeExpiredObjectsInCache(referenceTime - mExpiryDelay);
+    }
+
+    void ResourceManager::clearCache()
+    {
+        mCache->clear();
+    }
+
+    const VFS::Manager* ResourceManager::getVFS() const
+    {
+        return mVFS;
+    }
+
+}
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
new file mode 100644
index 0000000000..e45a2e9cb7
--- /dev/null
+++ b/components/resource/resourcemanager.hpp
@@ -0,0 +1,43 @@
+#ifndef OPENMW_COMPONENTS_RESOURCE_MANAGER_H
+#define OPENMW_COMPONENTS_RESOURCE_MANAGER_H
+
+#include <osg/ref_ptr>
+
+namespace VFS
+{
+    class Manager;
+}
+
+namespace osgDB
+{
+    class ObjectCache;
+}
+
+namespace Resource
+{
+
+    /// @brief Base class for managers that require a virtual file system and object cache.
+    /// @par This base class implements clearing of the cache, but populating it and what it's used for is up to the individual sub classes.
+    class ResourceManager
+    {
+    public:
+        /// @param expiryDelay how long to keep objects in cache after no longer being referenced.
+        ResourceManager(const VFS::Manager* vfs, const double expiryDelay = 300.0);
+
+        /// Clear cache entries that have not been referenced for longer than expiryDelay.
+        virtual void updateCache(double referenceTime);
+
+        /// Clear all cache entries regardless of having external references.
+        virtual void clearCache();
+
+        const VFS::Manager* getVFS() const;
+
+    protected:
+        const VFS::Manager* mVFS;
+        osg::ref_ptr<osgDB::ObjectCache> mCache;
+        double mExpiryDelay;
+    };
+
+}
+
+#endif
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index d39a723d6b..f499c0016b 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -15,11 +15,21 @@ namespace Resource
         mKeyframeManager.reset(new KeyframeManager(vfs));
         mImageManager.reset(new ImageManager(vfs));
         mSceneManager.reset(new SceneManager(vfs, mImageManager.get(), mNifFileManager.get()));
+
+        addResourceManager(mNifFileManager.get());
+        addResourceManager(mKeyframeManager.get());
+        // note, scene references images so add images afterwards for correct implementation of updateCache()
+        addResourceManager(mSceneManager.get());
+        addResourceManager(mImageManager.get());
     }
 
     ResourceSystem::~ResourceSystem()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
+
+        mResourceManagers.clear();
+
+        // no delete, all handled by auto_ptr
     }
 
     SceneManager* ResourceSystem::getSceneManager()
@@ -42,9 +52,24 @@ namespace Resource
         return mKeyframeManager.get();
     }
 
-    void ResourceSystem::clearCache()
+    void ResourceSystem::updateCache(double referenceTime)
     {
-        mNifFileManager->clearCache();
+        osg::Timer timer;
+        for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+            (*it)->updateCache(referenceTime);
+        std::cout << "updateCache took " << timer.time_m() << " ms" << std::endl;
+    }
+
+    void ResourceSystem::addResourceManager(ResourceManager *resourceMgr)
+    {
+        mResourceManagers.push_back(resourceMgr);
+    }
+
+    void ResourceSystem::removeResourceManager(ResourceManager *resourceMgr)
+    {
+        std::vector<ResourceManager*>::iterator found = std::find(mResourceManagers.begin(), mResourceManagers.end(), resourceMgr);
+        if (found != mResourceManagers.end())
+            mResourceManagers.erase(found);
     }
 
     const VFS::Manager* ResourceSystem::getVFS() const
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 13a96e8c7f..30607432da 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_COMPONENTS_RESOURCE_RESOURCESYSTEM_H
 
 #include <memory>
+#include <vector>
 
 namespace VFS
 {
@@ -15,6 +16,7 @@ namespace Resource
     class ImageManager;
     class NifFileManager;
     class KeyframeManager;
+    class ResourceManager;
 
     /// @brief Wrapper class that constructs and provides access to the most commonly used resource subsystems.
     /// @par Resource subsystems can be used with multiple OpenGL contexts, just like the OSG equivalents, but
@@ -31,8 +33,17 @@ namespace Resource
         KeyframeManager* getKeyframeManager();
 
         /// Indicates to each resource manager to clear the cache, i.e. to drop cached objects that are no longer referenced.
-        void clearCache();
+        /// @note May be called from any thread if you do not add or remove resource managers at that point.
+        void updateCache(double referenceTime);
 
+        /// Add this ResourceManager to be handled by the ResourceSystem.
+        /// @note Does not transfer ownership.
+        void addResourceManager(ResourceManager* resourceMgr);
+        /// @note Do nothing if resourceMgr does not exist.
+        /// @note Does not delete resourceMgr.
+        void removeResourceManager(ResourceManager* resourceMgr);
+
+        /// @note May be called from any thread.
         const VFS::Manager* getVFS() const;
 
     private:
@@ -41,6 +52,10 @@ namespace Resource
         std::auto_ptr<NifFileManager> mNifFileManager;
         std::auto_ptr<KeyframeManager> mKeyframeManager;
 
+        // Store the base classes separately to get convenient access to the common interface
+        // Here users can register their own resourcemanager as well
+        std::vector<ResourceManager*> mResourceManagers;
+
         const VFS::Manager* mVFS;
 
         ResourceSystem(const ResourceSystem&);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 95e03b3894..4ed14241a2 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -230,7 +230,7 @@ namespace Resource
 
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
-        : mVFS(vfs)
+        : ResourceManager(vfs)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
@@ -238,7 +238,6 @@ namespace Resource
         , mMaxAnisotropy(1)
         , mUnRefImageDataAfterApply(false)
         , mParticleSystemMask(~0u)
-        , mCache(new osgDB::ObjectCache)
     {
     }
 
@@ -403,11 +402,6 @@ namespace Resource
         node->accept(visitor);
     }
 
-    const VFS::Manager* SceneManager::getVFS() const
-    {
-        return mVFS;
-    }
-
     Resource::ImageManager* SceneManager::getImageManager()
     {
         return mImageManager;
@@ -483,5 +477,4 @@ namespace Resource
         mUnRefImageDataAfterApply = unref;
     }
 
-
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 32bd806603..173131e666 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -8,27 +8,19 @@
 #include <osg/Node>
 #include <osg/Texture>
 
+#include "resourcemanager.hpp"
+
 namespace Resource
 {
     class ImageManager;
     class NifFileManager;
 }
 
-namespace VFS
-{
-    class Manager;
-}
-
 namespace osgUtil
 {
     class IncrementalCompileOperation;
 }
 
-namespace osgDB
-{
-    class ObjectCache;
-}
-
 namespace osgViewer
 {
     class Viewer;
@@ -39,7 +31,7 @@ namespace Resource
 
     /// @brief Handles loading and caching of scenes, e.g. .nif files or .osg files
     /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more details.
-    class SceneManager
+    class SceneManager : public ResourceManager
     {
     public:
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
@@ -78,8 +70,6 @@ namespace Resource
         /// @note SceneManager::attachTo calls this method automatically, only needs to be called by users if manually attaching
         void notifyAttached(osg::Node* node) const;
 
-        const VFS::Manager* getVFS() const;
-
         Resource::ImageManager* getImageManager();
 
         /// @param mask The node mask to apply to loaded particle system nodes.
@@ -99,7 +89,6 @@ namespace Resource
         void setUnRefImageDataAfterApply(bool unref);
 
     private:
-        const VFS::Manager* mVFS;
         Resource::ImageManager* mImageManager;
         Resource::NifFileManager* mNifFileManager;
 
@@ -112,8 +101,6 @@ namespace Resource
 
         unsigned int mParticleSystemMask;
 
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
-
         SceneManager(const SceneManager&);
         void operator = (const SceneManager&);
     };
diff --git a/components/vfs/manager.hpp b/components/vfs/manager.hpp
index f74914977a..6592a65a88 100644
--- a/components/vfs/manager.hpp
+++ b/components/vfs/manager.hpp
@@ -16,6 +16,7 @@ namespace VFS
     /// @par Various archive types (e.g. directories on the filesystem, or compressed archives)
     /// can be registered, and will be merged into a single file tree. If the same filename is
     /// contained in multiple archives, the last added archive will have priority.
+    /// @par Most of the methods in this class are considered thread-safe, see each method documentation for details.
     class Manager
     {
     public:
@@ -33,20 +34,25 @@ namespace VFS
         void buildIndex();
 
         /// Does a file with this name exist?
+        /// @note May be called from any thread once the index has been built.
         bool exists(const std::string& name) const;
 
         /// Get a complete list of files from all archives
+        /// @note May be called from any thread once the index has been built.
         const std::map<std::string, File*>& getIndex() const;
 
         /// Normalize the given filename, making slashes/backslashes consistent, and lower-casing if mStrict is false.
+        /// @note May be called from any thread once the index has been built.
         void normalizeFilename(std::string& name) const;
 
         /// Retrieve a file by name.
         /// @note Throws an exception if the file can not be found.
+        /// @note May be called from any thread once the index has been built.
         Files::IStreamPtr get(const std::string& name) const;
 
         /// Retrieve a file by name (name is already normalized).
         /// @note Throws an exception if the file can not be found.
+        /// @note May be called from any thread once the index has been built.
         Files::IStreamPtr getNormalized(const std::string& normalizedName) const;
 
     private:

From b7e69cbc64fafd1f8ae255c4425f0e3b5cdcdd6e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Feb 2016 22:29:06 +0100
Subject: [PATCH 194/765] Refactor WorkQueue, merge WorkTicket and WorkItem

Allow the caller to hold on to the WorkItem. This makes it possible for a derived WorkItem to store the result of the work within the WorkItem itself.
---
 components/sceneutil/workqueue.cpp | 39 ++++++-------
 components/sceneutil/workqueue.hpp | 89 ++++++++++++++----------------
 2 files changed, 59 insertions(+), 69 deletions(-)

diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index 26a392be45..bb1d1f1f70 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -1,9 +1,11 @@
 #include "workqueue.hpp"
 
+#include <iostream>
+
 namespace SceneUtil
 {
 
-void WorkTicket::waitTillDone()
+void WorkItem::waitTillDone()
 {
     if (mDone > 0)
         return;
@@ -15,7 +17,7 @@ void WorkTicket::waitTillDone()
     }
 }
 
-void WorkTicket::signalDone()
+void WorkItem::signalDone()
 {
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
@@ -25,23 +27,16 @@ void WorkTicket::signalDone()
 }
 
 WorkItem::WorkItem()
-    : mTicket(new WorkTicket)
 {
-    mTicket->setThreadSafeRefUnref(true);
 }
 
 WorkItem::~WorkItem()
 {
 }
 
-void WorkItem::doWork()
+bool WorkItem::isDone() const
 {
-    mTicket->signalDone();
-}
-
-osg::ref_ptr<WorkTicket> WorkItem::getTicket()
-{
-    return mTicket;
+    return (mDone > 0);
 }
 
 WorkQueue::WorkQueue(int workerThreads)
@@ -60,11 +55,7 @@ WorkQueue::~WorkQueue()
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         while (!mQueue.empty())
-        {
-            WorkItem* item = mQueue.front();
-            delete item;
             mQueue.pop();
-        }
         mIsReleased = true;
         mCondition.broadcast();
     }
@@ -76,16 +67,20 @@ WorkQueue::~WorkQueue()
     }
 }
 
-osg::ref_ptr<WorkTicket> WorkQueue::addWorkItem(WorkItem *item)
+void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item)
 {
-    osg::ref_ptr<WorkTicket> ticket = item->getTicket();
+    if (item->isDone())
+    {
+        std::cerr << "warning, trying to add a work item that is already completed" << std::endl;
+        return;
+    }
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
     mQueue.push(item);
     mCondition.signal();
-    return ticket;
 }
 
-WorkItem *WorkQueue::removeWorkItem()
+osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
     while (mQueue.empty() && !mIsReleased)
@@ -94,7 +89,7 @@ WorkItem *WorkQueue::removeWorkItem()
     }
     if (mQueue.size())
     {
-        WorkItem* item = mQueue.front();
+        osg::ref_ptr<WorkItem> item = mQueue.front();
         mQueue.pop();
         return item;
     }
@@ -111,11 +106,11 @@ void WorkThread::run()
 {
     while (true)
     {
-        WorkItem* item = mWorkQueue->removeWorkItem();
+        osg::ref_ptr<WorkItem> item = mWorkQueue->removeWorkItem();
         if (!item)
             return;
         item->doWork();
-        delete item;
+        item->signalDone();
     }
 }
 
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index 492bbd090e..06489dfbbc 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -14,37 +14,61 @@
 namespace SceneUtil
 {
 
-    class WorkTicket : public osg::Referenced
-    {
-    public:
-        void waitTillDone();
-
-        void signalDone();
-
-    private:
-        OpenThreads::Atomic mDone;
-        OpenThreads::Mutex mMutex;
-        OpenThreads::Condition mCondition;
-    };
-
-    class WorkItem
+    class WorkItem : public osg::Referenced
     {
     public:
         WorkItem();
         virtual ~WorkItem();
 
         /// Override in a derived WorkItem to perform actual work.
-        /// By default, just signals the ticket that the work is done.
-        virtual void doWork();
+        virtual void doWork() {}
 
-        osg::ref_ptr<WorkTicket> getTicket();
+        bool isDone() const;
+
+        /// Wait until the work is completed. Usually called from the main thread.
+        void waitTillDone();
+
+        /// Internal use by the WorkQueue.
+        void signalDone();
 
     protected:
-        osg::ref_ptr<WorkTicket> mTicket;
+        OpenThreads::Atomic mDone;
+        OpenThreads::Mutex mMutex;
+        OpenThreads::Condition mCondition;
     };
 
     class WorkQueue;
+    class WorkThread;
 
+    /// @brief A work queue that users can push work items onto, to be completed by one or more background threads.
+    /// @note Work items will be processed in the order that they were given in, however
+    /// if multiple work threads are involved then it is possible for a later item to complete before earlier items.
+    class WorkQueue : public osg::Referenced
+    {
+    public:
+        WorkQueue(int numWorkerThreads=1);
+        ~WorkQueue();
+
+        /// Add a new work item to the back of the queue.
+        /// @par The work item's waitTillDone() method may be used by the caller to wait until the work is complete.
+        void addWorkItem(osg::ref_ptr<WorkItem> item);
+
+        /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
+        /// If the workqueue is in the process of being destroyed, may return NULL.
+        /// @par Used internally by the WorkThread.
+        osg::ref_ptr<WorkItem> removeWorkItem();
+
+    private:
+        bool mIsReleased;
+        std::queue<osg::ref_ptr<WorkItem> > mQueue;
+
+        OpenThreads::Mutex mMutex;
+        OpenThreads::Condition mCondition;
+
+        std::vector<WorkThread*> mThreads;
+    };
+
+    /// Internally used by WorkQueue.
     class WorkThread : public OpenThreads::Thread
     {
     public:
@@ -56,35 +80,6 @@ namespace SceneUtil
         WorkQueue* mWorkQueue;
     };
 
-    /// @brief A work queue that users can push work items onto, to be completed by one or more background threads.
-    class WorkQueue
-    {
-    public:
-        WorkQueue(int numWorkerThreads=1);
-        ~WorkQueue();
-
-        /// Add a new work item to the back of the queue.
-        /// @par The returned WorkTicket may be used by the caller to wait until the work is complete.
-        osg::ref_ptr<WorkTicket> addWorkItem(WorkItem* item);
-
-        /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
-        /// If the workqueue is in the process of being destroyed, may return NULL.
-        /// @note The caller must free the returned WorkItem
-        WorkItem* removeWorkItem();
-
-        void runThread();
-
-    private:
-        bool mIsReleased;
-        std::queue<WorkItem*> mQueue;
-
-        OpenThreads::Mutex mMutex;
-        OpenThreads::Condition mCondition;
-
-        std::vector<WorkThread*> mThreads;
-    };
-
-
 
 }
 

From e055ae094aeab055caecb04c3d898656c656406b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Feb 2016 23:30:41 +0100
Subject: [PATCH 195/765] Improve const-correctness in BulletShapeManager

Sadly, two const_cast's are needed to work around Bullet API quirks.
---
 components/resource/bulletshape.cpp        | 26 ++++++++++------------
 components/resource/bulletshape.hpp        |  8 +++----
 components/resource/bulletshapemanager.cpp |  9 ++++++--
 components/resource/bulletshapemanager.hpp |  3 +++
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index baff86a794..6855429c36 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -45,11 +45,11 @@ void BulletShape::deleteShape(btCollisionShape* shape)
     }
 }
 
-btCollisionShape* BulletShape::duplicateCollisionShape(btCollisionShape *shape) const
+btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *shape) const
 {
     if(shape->isCompound())
     {
-        btCompoundShape *comp = static_cast<btCompoundShape*>(shape);
+        const btCompoundShape *comp = static_cast<const btCompoundShape*>(shape);
         btCompoundShape *newShape = new btCompoundShape;
 
         int numShapes = comp->getNumChildShapes();
@@ -63,29 +63,27 @@ btCollisionShape* BulletShape::duplicateCollisionShape(btCollisionShape *shape)
         return newShape;
     }
 
-    if(btBvhTriangleMeshShape* trishape = dynamic_cast<btBvhTriangleMeshShape*>(shape))
+    if(const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
     {
 #if BT_BULLET_VERSION >= 283
-        btScaledBvhTriangleMeshShape* newShape = new btScaledBvhTriangleMeshShape(trishape, btVector3(1.f, 1.f, 1.f));
+        btScaledBvhTriangleMeshShape* newShape = new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
 #else
         // work around btScaledBvhTriangleMeshShape bug ( https://code.google.com/p/bullet/issues/detail?id=371 ) in older bullet versions
-        btTriangleMesh* oldMesh = static_cast<btTriangleMesh*>(trishape->getMeshInterface());
+        const btTriangleMesh* oldMesh = static_cast<const btTriangleMesh*>(trishape->getMeshInterface());
         btTriangleMesh* newMesh = new btTriangleMesh(*oldMesh);
 
         // Do not build a new bvh (not needed, since it's the same as the original shape's bvh)
-        bool buildBvh = true;
-        if (trishape->getOptimizedBvh())
-            buildBvh = false;
-        TriangleMeshShape* newShape = new TriangleMeshShape(newMesh, true, buildBvh);
+        btOptimizedBvh* bvh = const_cast<btBvhTriangleMeshShape*>(trishape)->getOptimizedBvh();
+        TriangleMeshShape* newShape = new TriangleMeshShape(newMesh, true, bvh == NULL);
         // Set original shape's bvh via pointer
         // The pointer is safe because the BulletShapeInstance keeps a ref_ptr to the original BulletShape
-        if (!buildBvh)
-            newShape->setOptimizedBvh(trishape->getOptimizedBvh());
+        if (bvh)
+            newShape->setOptimizedBvh(bvh);
 #endif
         return newShape;
     }
 
-    if (btBoxShape* boxshape = dynamic_cast<btBoxShape*>(shape))
+    if (const btBoxShape* boxshape = dynamic_cast<const btBoxShape*>(shape))
     {
         return new btBoxShape(*boxshape);
     }
@@ -98,13 +96,13 @@ btCollisionShape *BulletShape::getCollisionShape()
     return mCollisionShape;
 }
 
-osg::ref_ptr<BulletShapeInstance> BulletShape::makeInstance()
+osg::ref_ptr<BulletShapeInstance> BulletShape::makeInstance() const
 {
     osg::ref_ptr<BulletShapeInstance> instance (new BulletShapeInstance(this));
     return instance;
 }
 
-BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<BulletShape> source)
+BulletShapeInstance::BulletShapeInstance(osg::ref_ptr<const BulletShape> source)
     : BulletShape()
     , mSource(source)
 {
diff --git a/components/resource/bulletshape.hpp b/components/resource/bulletshape.hpp
index a007bad310..a418bb28ce 100644
--- a/components/resource/bulletshape.hpp
+++ b/components/resource/bulletshape.hpp
@@ -38,9 +38,9 @@ namespace Resource
         // we store the node's record index mapped to the child index of the shape in the btCompoundShape.
         std::map<int, int> mAnimatedShapes;
 
-        osg::ref_ptr<BulletShapeInstance> makeInstance();
+        osg::ref_ptr<BulletShapeInstance> makeInstance() const;
 
-        btCollisionShape* duplicateCollisionShape(btCollisionShape* shape) const;
+        btCollisionShape* duplicateCollisionShape(const btCollisionShape* shape) const;
 
         btCollisionShape* getCollisionShape();
 
@@ -55,10 +55,10 @@ namespace Resource
     class BulletShapeInstance : public BulletShape
     {
     public:
-        BulletShapeInstance(osg::ref_ptr<BulletShape> source);
+        BulletShapeInstance(osg::ref_ptr<const BulletShape> source);
 
     private:
-        osg::ref_ptr<BulletShape> mSource;
+        osg::ref_ptr<const BulletShape> mSource;
     };
 
     // Subclass btBhvTriangleMeshShape to auto-delete the meshInterface
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index b5581cce24..cb57d686ff 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -109,7 +109,7 @@ BulletShapeManager::~BulletShapeManager()
 
 }
 
-osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string &name)
+osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &name)
 {
     std::string normalized = name;
     mVFS->normalizeFilename(normalized);
@@ -142,13 +142,18 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
             if (!shape)
             {
                 mCache->addEntryToObjectCache(normalized, NULL);
-                return osg::ref_ptr<BulletShapeInstance>();
+                return osg::ref_ptr<BulletShape>();
             }
         }
 
         mCache->addEntryToObjectCache(normalized, shape);
     }
+    return shape;
+}
 
+osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string &name)
+{
+    osg::ref_ptr<const BulletShape> shape = getShape(name);
     if (shape)
         return shape->makeInstance();
     else
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 576268f753..4c0cb1fd29 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -26,6 +26,9 @@ namespace Resource
         BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager);
         ~BulletShapeManager();
 
+        osg::ref_ptr<const BulletShape> getShape(const std::string& name);
+
+        /// Shorthand for getShape(name)->makeInstance();
         osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
 
     private:

From 6f9ca0f68fd76bfd1abef2f9e5ae0131b8a64e89 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 00:07:02 +0100
Subject: [PATCH 196/765] Add basic cell preloader class

Not properly in use yet, but seems to be working.
---
 apps/openmw/CMakeLists.txt              |   1 +
 apps/openmw/mwphysics/physicssystem.cpp |   5 +
 apps/openmw/mwphysics/physicssystem.hpp |   2 +
 apps/openmw/mwworld/cellpreloader.cpp   | 148 ++++++++++++++++++++++++
 apps/openmw/mwworld/cellpreloader.hpp   |  60 ++++++++++
 apps/openmw/mwworld/cellstore.cpp       |   5 +
 apps/openmw/mwworld/cellstore.hpp       |   3 +
 components/CMakeLists.txt               |   4 +-
 components/resource/resourcesystem.cpp  |   3 +
 9 files changed, 228 insertions(+), 3 deletions(-)
 create mode 100644 apps/openmw/mwworld/cellpreloader.cpp
 create mode 100644 apps/openmw/mwworld/cellpreloader.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 02cf6c87dd..f2540c7395 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -67,6 +67,7 @@ add_openmw_dir (mwworld
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     store esmstore recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
     contentloader esmloader actiontrap cellreflist cellref physicssystem weather projectilemanager
+    cellpreloader
     )
 
 add_openmw_dir (mwphysics
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 11d6d286a4..6417968d3a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -690,6 +690,11 @@ namespace MWPhysics
         delete mBroadphase;
     }
 
+    Resource::BulletShapeManager *PhysicsSystem::getShapeManager()
+    {
+        return mShapeManager.get();
+    }
+
     bool PhysicsSystem::toggleDebugRendering()
     {
         mDebugDrawEnabled = !mDebugDrawEnabled;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 4263bc0ec3..a866717c76 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -53,6 +53,8 @@ namespace MWPhysics
             PhysicsSystem (Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
             ~PhysicsSystem ();
 
+            Resource::BulletShapeManager* getShapeManager();
+
             void enableWater(float height);
             void setWaterHeight(float height);
             void disableWater();
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
new file mode 100644
index 0000000000..dd6850abae
--- /dev/null
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -0,0 +1,148 @@
+#include "cellpreloader.hpp"
+
+#include <iostream>
+
+#include <components/resource/scenemanager.hpp>
+#include <components/resource/bulletshapemanager.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "cellstore.hpp"
+#include "manualref.hpp"
+#include "class.hpp"
+
+namespace MWWorld
+{
+
+    struct ListModelsVisitor
+    {
+        ListModelsVisitor(std::vector<std::string>& out)
+            : mOut(out)
+        {
+        }
+
+        virtual bool operator()(const MWWorld::ConstPtr& ptr)
+        {
+            std::string model = ptr.getClass().getModel(ptr);
+            if (!model.empty())
+                mOut.push_back(model);
+            return true;
+        }
+
+        std::vector<std::string>& mOut;
+    };
+
+    class PreloadItem : public SceneUtil::WorkItem
+    {
+    public:
+        /// Constructor to be called from the main thread.
+        PreloadItem(const MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager)
+            : mSceneManager(sceneManager)
+            , mBulletShapeManager(bulletShapeManager)
+        {
+            if (cell->getState() == MWWorld::CellStore::State_Loaded)
+            {
+                ListModelsVisitor visitor (mMeshes);
+                cell->forEachConst(visitor);
+            }
+            else
+            {
+                const std::vector<std::string>& objectIds = cell->getPreloadedIds();
+
+                // could possibly build the model list in the worker thread if we manage to make the Store thread safe
+                for (std::vector<std::string>::const_iterator it = objectIds.begin(); it != objectIds.end(); ++it)
+                {
+                    MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), *it);
+                    std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
+                    if (!model.empty())
+                        mMeshes.push_back(model);
+                }
+            }
+        }
+
+        /// Preload work to be called from the worker thread.
+        virtual void doWork()
+        {
+            for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
+            {
+                try
+                {
+                    mPreloadedNodes.push_back(mSceneManager->getTemplate(*it));
+                    mPreloadedShapes.push_back(mBulletShapeManager->getShape(*it));
+
+                    // TODO: do a createInstance() and hold on to it since we can make use of it when the cell goes active
+                }
+                catch (std::exception& e)
+                {
+                    // ignore error for now, would spam the log too much
+                    // error will be shown when visiting the cell
+                }
+            }
+        }
+
+    private:
+        typedef std::vector<std::string> MeshList;
+        MeshList mMeshes;
+        Resource::SceneManager* mSceneManager;
+        Resource::BulletShapeManager* mBulletShapeManager;
+
+        // keep a ref to the loaded object to make sure it stays loaded as long as this cell is in the preloaded state
+        std::vector<osg::ref_ptr<const osg::Node> > mPreloadedNodes;
+        std::vector<osg::ref_ptr<const Resource::BulletShape> > mPreloadedShapes;
+    };
+
+    CellPreloader::CellPreloader(Resource::SceneManager *sceneManager, Resource::BulletShapeManager* bulletShapeManager)
+        : mSceneManager(sceneManager)
+        , mBulletShapeManager(bulletShapeManager)
+    {
+        mWorkQueue = new SceneUtil::WorkQueue;
+    }
+
+    void CellPreloader::preload(const CellStore *cell, double timestamp)
+    {
+        if (!mWorkQueue)
+        {
+            std::cerr << "can't preload, no work queue set " << std::endl;
+            return;
+        }
+        if (cell->getState() == CellStore::State_Unloaded)
+        {
+            std::cerr << "can't preload objects for unloaded cell" << std::endl;
+            return;
+        }
+
+        PreloadMap::iterator found = mPreloadCells.find(cell);
+        if (found != mPreloadCells.end())
+        {
+            // already preloaded, nothing to do other than updating the timestamp
+            found->second.mTimeStamp = timestamp;
+            return;
+        }
+
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mSceneManager, mBulletShapeManager));
+        mWorkQueue->addWorkItem(item);
+
+        mPreloadCells[cell] = PreloadEntry(timestamp, item);
+    }
+
+    void CellPreloader::updateCache(double timestamp)
+    {
+        // time (in seconds) to keep a preloaded cell in cache after it's no longer needed
+        const double expiryTime = 60.0;
+
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
+        {
+            if (it->second.mTimeStamp < timestamp - expiryTime)
+                mPreloadCells.erase(it++);
+            else
+                ++it;
+        }
+    }
+
+    void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
+    {
+        mWorkQueue = workQueue;
+    }
+
+}
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
new file mode 100644
index 0000000000..7e02cb7d10
--- /dev/null
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -0,0 +1,60 @@
+#ifndef OPENMW_MWWORLD_CELLPRELOADER_H
+#define OPENMW_MWWORLD_CELLPRELOADER_H
+
+#include <map>
+#include <osg/ref_ptr>
+#include <components/sceneutil/workqueue.hpp>
+
+namespace Resource
+{
+    class SceneManager;
+    class BulletShapeManager;
+}
+
+namespace MWWorld
+{
+    class CellStore;
+
+    class CellPreloader
+    {
+    public:
+        CellPreloader(Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager);
+
+        /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
+        /// @note The cell itself must be in State_Loaded or State_Preloaded.
+        void preload(const MWWorld::CellStore* cell, double timestamp);
+
+        /// Removes preloaded cells that have not had a preload request for a while.
+        void updateCache(double timestamp);
+
+        void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
+
+    private:
+        Resource::SceneManager* mSceneManager;
+        Resource::BulletShapeManager* mBulletShapeManager;
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+
+        struct PreloadEntry
+        {
+            PreloadEntry(double timestamp, osg::ref_ptr<SceneUtil::WorkItem> workItem)
+                : mTimeStamp(timestamp)
+                , mWorkItem(workItem)
+            {
+            }
+            PreloadEntry()
+                : mTimeStamp(0.0)
+            {
+            }
+
+            double mTimeStamp;
+            osg::ref_ptr<SceneUtil::WorkItem> mWorkItem;
+        };
+        typedef std::map<const MWWorld::CellStore*, PreloadEntry> PreloadMap;
+
+        // Cells that are currently being preloaded, or have already finished preloading
+        PreloadMap mPreloadCells;
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 5c8d07f86c..dcaa73e933 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -333,6 +333,11 @@ namespace MWWorld
         return mState;
     }
 
+    const std::vector<std::string> &CellStore::getPreloadedIds() const
+    {
+        return mIds;
+    }
+
     bool CellStore::hasState() const
     {
         return mHasState;
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 2f483f0ba7..d753c97457 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -204,6 +204,9 @@ namespace MWWorld
 
             State getState() const;
 
+            const std::vector<std::string>& getPreloadedIds() const;
+            ///< Get Ids of objects in this cell, only valid in State_Preloaded
+
             bool hasState() const;
             ///< Does this cell have state that needs to be stored in a saved game file?
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 42323a68a0..26e8f7b6a3 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -46,9 +46,7 @@ add_component_dir (resource
 
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
-    lightmanager lightutil positionattitudetransform
-    # not used yet
-    #workqueue
+    lightmanager lightutil positionattitudetransform workqueue
     )
 
 add_component_dir (nif
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index f499c0016b..68ed136440 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -54,6 +54,9 @@ namespace Resource
 
     void ResourceSystem::updateCache(double referenceTime)
     {
+        // TODO: call updateCache from the worker thread so the main thread isn't held up by the delete operations
+        // change ObjectCache to not hold lock while the unref happens
+
         osg::Timer timer;
         for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
             (*it)->updateCache(referenceTime);

From d855a13b4435d989ebf46346e71437782c231a7f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 00:36:31 +0100
Subject: [PATCH 197/765] Clear the resource cache from the worker thread

---
 apps/openmw/mwrender/renderingmanager.cpp |  6 +++-
 apps/openmw/mwrender/renderingmanager.hpp |  2 ++
 apps/openmw/mwworld/cellpreloader.cpp     | 34 +++++++++++++++++++++--
 apps/openmw/mwworld/cellpreloader.hpp     |  6 ++--
 apps/openmw/mwworld/scene.cpp             |  4 +++
 apps/openmw/mwworld/scene.hpp             |  5 ++--
 components/resource/resourcesystem.cpp    |  6 +---
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index d4199d5f6c..07b477c436 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -233,11 +233,15 @@ namespace MWRender
 
     void RenderingManager::clearCache()
     {
-        mResourceSystem->updateCache(mViewer->getFrameStamp()->getReferenceTime());
         if (mTerrain.get())
             mTerrain->clearCache();
     }
 
+    double RenderingManager::getReferenceTime() const
+    {
+        return mViewer->getFrameStamp()->getReferenceTime();
+    }
+
     osg::Group* RenderingManager::getLightRoot()
     {
         return mLightRoot.get();
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 550e48e636..bc5db562c3 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -67,6 +67,8 @@ namespace MWRender
 
         void clearCache();
 
+        double getReferenceTime() const;
+
         osg::Group* getLightRoot();
 
         void setNightEyeFactor(float factor);
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index dd6850abae..16bf920bbb 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 
 #include <components/resource/scenemanager.hpp>
+#include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -33,6 +34,7 @@ namespace MWWorld
         std::vector<std::string>& mOut;
     };
 
+    /// Worker thread item: preload models in a cell.
     class PreloadItem : public SceneUtil::WorkItem
     {
     public:
@@ -92,8 +94,30 @@ namespace MWWorld
         std::vector<osg::ref_ptr<const Resource::BulletShape> > mPreloadedShapes;
     };
 
-    CellPreloader::CellPreloader(Resource::SceneManager *sceneManager, Resource::BulletShapeManager* bulletShapeManager)
-        : mSceneManager(sceneManager)
+    /// Worker thread item: update the resource system's cache, effectively deleting unused entries.
+    class UpdateCacheItem : public SceneUtil::WorkItem
+    {
+    public:
+        UpdateCacheItem(Resource::ResourceSystem* resourceSystem, double referenceTime)
+            : mReferenceTime(referenceTime)
+            , mResourceSystem(resourceSystem)
+        {
+        }
+
+        virtual void doWork()
+        {
+            osg::Timer timer;
+            mResourceSystem->updateCache(mReferenceTime);
+            std::cout << "cleared cache in " << timer.time_m() << std::endl;
+        }
+
+    private:
+        double mReferenceTime;
+        Resource::ResourceSystem* mResourceSystem;
+    };
+
+    CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager)
+        : mResourceSystem(resourceSystem)
         , mBulletShapeManager(bulletShapeManager)
     {
         mWorkQueue = new SceneUtil::WorkQueue;
@@ -120,7 +144,7 @@ namespace MWWorld
             return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mSceneManager, mBulletShapeManager));
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
@@ -129,6 +153,7 @@ namespace MWWorld
     void CellPreloader::updateCache(double timestamp)
     {
         // time (in seconds) to keep a preloaded cell in cache after it's no longer needed
+        // additionally we could support a minimum/maximum size for the cache
         const double expiryTime = 60.0;
 
         for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
@@ -138,6 +163,9 @@ namespace MWWorld
             else
                 ++it;
         }
+
+        // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
+        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, timestamp));
     }
 
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 7e02cb7d10..b3413b1743 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -7,7 +7,7 @@
 
 namespace Resource
 {
-    class SceneManager;
+    class ResourceSystem;
     class BulletShapeManager;
 }
 
@@ -18,7 +18,7 @@ namespace MWWorld
     class CellPreloader
     {
     public:
-        CellPreloader(Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager);
+        CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager);
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
         /// @note The cell itself must be in State_Loaded or State_Preloaded.
@@ -30,7 +30,7 @@ namespace MWWorld
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
     private:
-        Resource::SceneManager* mSceneManager;
+        Resource::ResourceSystem* mResourceSystem;
         Resource::BulletShapeManager* mBulletShapeManager;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index f30e6efe10..70a461b5b9 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -24,6 +24,7 @@
 #include "class.hpp"
 #include "cellvisitors.hpp"
 #include "cellstore.hpp"
+#include "cellpreloader.hpp"
 
 namespace
 {
@@ -402,6 +403,7 @@ namespace MWWorld
 
         mCellChanged = true;
 
+        mPreloader->updateCache(mRendering.getReferenceTime());
         mRendering.clearCache();
     }
 
@@ -439,6 +441,7 @@ namespace MWWorld
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics)
     : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering)
     {
+        mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
     }
 
     Scene::~Scene()
@@ -515,6 +518,7 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
+        mPreloader->updateCache(mRendering.getReferenceTime());
         mRendering.clearCache();
     }
 
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index c6de3ebdf7..b428d0ddd7 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -1,12 +1,11 @@
 #ifndef GAME_MWWORLD_SCENE_H
 #define GAME_MWWORLD_SCENE_H
 
-//#include "../mwrender/renderingmanager.hpp"
-
 #include "ptr.hpp"
 #include "globals.hpp"
 
 #include <set>
+#include <memory>
 
 namespace osg
 {
@@ -43,6 +42,7 @@ namespace MWWorld
 {
     class Player;
     class CellStore;
+    class CellPreloader;
 
     class Scene
     {
@@ -57,6 +57,7 @@ namespace MWWorld
             bool mCellChanged;
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
+            std::auto_ptr<CellPreloader> mPreloader;
 
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 68ed136440..1f25bd461f 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -54,13 +54,9 @@ namespace Resource
 
     void ResourceSystem::updateCache(double referenceTime)
     {
-        // TODO: call updateCache from the worker thread so the main thread isn't held up by the delete operations
-        // change ObjectCache to not hold lock while the unref happens
-
-        osg::Timer timer;
+        // TODO: change ObjectCache to not hold lock while the unref happens
         for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
             (*it)->updateCache(referenceTime);
-        std::cout << "updateCache took " << timer.time_m() << " ms" << std::endl;
     }
 
     void ResourceSystem::addResourceManager(ResourceManager *resourceMgr)

From c155680d3c8c22ac8dc22ccc540584e3b720990f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 00:43:37 +0100
Subject: [PATCH 198/765] Customize ObjectCache for more efficient locking in
 removeExpiredObjectsInCache

---
 components/resource/objectcache.cpp     | 37 ++++++++++++++-----------
 components/resource/objectcache.hpp     | 24 ++++++----------
 components/resource/resourcemanager.cpp |  2 +-
 components/resource/resourcemanager.hpp |  8 ++----
 components/resource/resourcesystem.cpp  |  1 -
 5 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index 7264d05aa7..0c6066417c 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -11,13 +11,10 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include <osg/Version>
-
-#if OSG_VERSION_LESS_THAN(3,3,3)
-
 #include "objectcache.hpp"
 
-using namespace osgDB;
+namespace Resource
+{
 
 ////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -95,21 +92,29 @@ void ObjectCache::updateTimeStampOfObjectsInCacheWithExternalReferences(double r
 
 void ObjectCache::removeExpiredObjectsInCache(double expiryTime)
 {
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+    std::vector<osg::ref_ptr<osg::Object> > objectsToRemove;
 
-    // Remove expired entries from object cache
-    ObjectCacheMap::iterator oitr = _objectCache.begin();
-    while(oitr != _objectCache.end())
     {
-        if (oitr->second.second<=expiryTime)
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+
+        // Remove expired entries from object cache
+        ObjectCacheMap::iterator oitr = _objectCache.begin();
+        while(oitr != _objectCache.end())
         {
-            _objectCache.erase(oitr++);
-        }
-        else
-        {
-            ++oitr;
+            if (oitr->second.second<=expiryTime)
+            {
+                objectsToRemove.push_back(oitr->second.first);
+                _objectCache.erase(oitr++);
+            }
+            else
+            {
+                ++oitr;
+            }
         }
     }
+
+    // note, actual unref happens outside of the lock
+    objectsToRemove.clear();
 }
 
 void ObjectCache::removeFromObjectCache(const std::string& fileName)
@@ -138,4 +143,4 @@ void ObjectCache::releaseGLObjects(osg::State* state)
     }
 }
 
-#endif
+}
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index cae48ca6b7..624c38bad5 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -1,3 +1,6 @@
+// Resource ObjectCache for OpenMW, forked from osgDB ObjectCache by Robert Osfield, see copyright notice below.
+// The main change from the upstream version is that removeExpiredObjectsInCache no longer keeps a lock while the unref happens.
+
 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
  * This library is open source and may be redistributed and/or modified under
@@ -11,17 +14,8 @@
  * OpenSceneGraph Public License for more details.
 */
 
-// Wrapper for osgDB/ObjectCache. Works around ObjectCache not being available in old OSG 3.2.
-// Use "#include objectcache.hpp" in place of "#include <osgDB/ObjectCache".
-
-#ifndef OSGDB_OBJECTCACHE_WRAPPER
-#define OSGDB_OBJECTCACHE_WRAPPER 1
-
-#include <osg/Version>
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
-#include <osgDB/ObjectCache>
-#else
+#ifndef OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
+#define OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 
 #include <osg/Node>
 
@@ -30,9 +24,9 @@
 
 #include <map>
 
-namespace osgDB {
+namespace Resource {
 
-class /*OSGDB_EXPORT*/ ObjectCache : public osg::Referenced
+class ObjectCache : public osg::Referenced
 {
     public:
 
@@ -70,7 +64,7 @@ class /*OSGDB_EXPORT*/ ObjectCache : public osg::Referenced
         /** Get an ref_ptr<Object> from the object cache*/
         osg::ref_ptr<osg::Object> getRefFromObjectCache(const std::string& fileName);
 
-        /** call rleaseGLObjects on all objects attached to the object cache.*/
+        /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
     protected:
@@ -88,5 +82,3 @@ class /*OSGDB_EXPORT*/ ObjectCache : public osg::Referenced
 }
 
 #endif
-
-#endif
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index 60233baa0d..03e6263b91 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -7,7 +7,7 @@ namespace Resource
 
     ResourceManager::ResourceManager(const VFS::Manager *vfs, const double expiryDelay)
         : mVFS(vfs)
-        , mCache(new osgDB::ObjectCache)
+        , mCache(new Resource::ObjectCache)
         , mExpiryDelay(expiryDelay)
     {
 
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index e45a2e9cb7..a9b6ab3d51 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -8,13 +8,9 @@ namespace VFS
     class Manager;
 }
 
-namespace osgDB
-{
-    class ObjectCache;
-}
-
 namespace Resource
 {
+    class ObjectCache;
 
     /// @brief Base class for managers that require a virtual file system and object cache.
     /// @par This base class implements clearing of the cache, but populating it and what it's used for is up to the individual sub classes.
@@ -34,7 +30,7 @@ namespace Resource
 
     protected:
         const VFS::Manager* mVFS;
-        osg::ref_ptr<osgDB::ObjectCache> mCache;
+        osg::ref_ptr<Resource::ObjectCache> mCache;
         double mExpiryDelay;
     };
 
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index 1f25bd461f..a8ab6556d7 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -54,7 +54,6 @@ namespace Resource
 
     void ResourceSystem::updateCache(double referenceTime)
     {
-        // TODO: change ObjectCache to not hold lock while the unref happens
         for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
             (*it)->updateCache(referenceTime);
     }

From d3415387a533a069daf070e37d8cdeed1d9d3d1e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 01:18:20 +0100
Subject: [PATCH 199/765] AI: take into account success chance when rating a
 spell

---
 apps/openmw/mwmechanics/aicombataction.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 60446e524d..608bbaeb17 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -167,7 +167,8 @@ namespace MWMechanics
     {
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
-        if (MWMechanics::getSpellSuccessChance(spell, actor) == 0)
+        float successChance = MWMechanics::getSpellSuccessChance(spell, actor);
+        if (successChance == 0.f)
             return 0.f;
 
         if (spell->mData.mType != ESM::Spell::ST_Spell)
@@ -192,7 +193,7 @@ namespace MWMechanics
         if ( ((types & Touch) || (types & Target)) && target.getClass().getCreatureStats(target).getActiveSpells().isSpellActive(spell->mId))
             return 0.f;
 
-        return rateEffects(spell->mEffects, actor, target);
+        return rateEffects(spell->mEffects, actor, target) * (successChance / 100.f);
     }
 
     float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& target)

From 94c05c6baa50d1f2a736f2d3f1808ef1bed7abe2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 01:19:10 +0100
Subject: [PATCH 200/765] AI: don't cast useless resist spells (Fixes #2760)

---
 apps/openmw/mwmechanics/aicombataction.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 608bbaeb17..627bc02f79 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -254,8 +254,27 @@ namespace MWMechanics
         case ESM::MagicEffect::CureCommonDisease:
         case ESM::MagicEffect::CureBlightDisease:
         case ESM::MagicEffect::CureCorprusDisease:
+        case ESM::MagicEffect::ResistBlightDisease:
+        case ESM::MagicEffect::ResistCommonDisease:
+        case ESM::MagicEffect::ResistCorprusDisease:
         case ESM::MagicEffect::Invisibility:
+        case ESM::MagicEffect::Chameleon:
             return 0.f;
+
+        case ESM::MagicEffect::RestoreAttribute:
+            return 0.f; // TODO: implement based on attribute damage
+        case ESM::MagicEffect::RestoreSkill:
+            return 0.f; // TODO: implement based on skill damage
+
+        case ESM::MagicEffect::ResistFire:
+        case ESM::MagicEffect::ResistFrost:
+        case ESM::MagicEffect::ResistMagicka:
+        case ESM::MagicEffect::ResistNormalWeapons:
+        case ESM::MagicEffect::ResistParalysis:
+        case ESM::MagicEffect::ResistPoison:
+        case ESM::MagicEffect::ResistShock:
+            return 0.f; // probably useless since we don't know in advance what the enemy will cast
+
         case ESM::MagicEffect::Feather:
             if (actor.getClass().getEncumbrance(actor) - actor.getClass().getCapacity(actor) >= 0)
                 return 100.f;

From 162287b82d60d068474836751c7fad41b50aa275 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 01:24:49 +0100
Subject: [PATCH 201/765] AI combat actions: rename 'target' to 'enemy'

---
 apps/openmw/mwmechanics/aicombataction.cpp | 46 +++++++++++-----------
 apps/openmw/mwmechanics/aicombataction.hpp | 12 +++---
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 627bc02f79..cf0d2532b9 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -97,7 +97,7 @@ namespace MWMechanics
         return rateEffects(potion->mEffects, actor, MWWorld::Ptr());
     }
 
-    float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& target, int type,
+    float rateWeapon (const MWWorld::Ptr &item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy, int type,
                       float arrowRating, float boltRating)
     {
         if (item.getTypeName() != typeid(ESM::Weapon).name())
@@ -153,7 +153,7 @@ namespace MWMechanics
             if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes
                     && (item.getCellRef().getEnchantmentCharge() == -1
                         || item.getCellRef().getEnchantmentCharge() >= enchantment->mData.mCost))
-                rating += rateEffects(enchantment->mEffects, actor, target);
+                rating += rateEffects(enchantment->mEffects, actor, enemy);
         }
 
         int skill = item.getClass().getEquipmentSkill(item);
@@ -163,7 +163,7 @@ namespace MWMechanics
         return rating;
     }
 
-    float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& target)
+    float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
     {
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
@@ -190,13 +190,13 @@ namespace MWMechanics
         int types = getRangeTypes(spell->mEffects);
         if ((types & Self) && stats.getActiveSpells().isSpellActive(spell->mId))
             return 0.f;
-        if ( ((types & Touch) || (types & Target)) && target.getClass().getCreatureStats(target).getActiveSpells().isSpellActive(spell->mId))
+        if ( ((types & Touch) || (types & Target)) && enemy.getClass().getCreatureStats(enemy).getActiveSpells().isSpellActive(spell->mId))
             return 0.f;
 
-        return rateEffects(spell->mEffects, actor, target) * (successChance / 100.f);
+        return rateEffects(spell->mEffects, actor, enemy) * (successChance / 100.f);
     }
 
-    float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& target)
+    float rateMagicItem(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)
     {
         if (ptr.getClass().getEnchantment(ptr).empty())
             return 0.f;
@@ -205,7 +205,7 @@ namespace MWMechanics
 
         if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
         {
-            return rateEffects(enchantment->mEffects, actor, target);
+            return rateEffects(enchantment->mEffects, actor, enemy);
         }
         else
         {
@@ -214,9 +214,9 @@ namespace MWMechanics
         }
     }
 
-    float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &target)
+    float rateEffect(const ESM::ENAMstruct &effect, const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
     {
-        // NOTE: target may be empty
+        // NOTE: enemy may be empty
 
         float rating = 1;
         switch (effect.mEffectID)
@@ -337,7 +337,7 @@ namespace MWMechanics
 
         case ESM::MagicEffect::DamageAttribute:
         case ESM::MagicEffect::DrainAttribute:
-            if (!target.isEmpty() && target.getClass().getCreatureStats(target).getAttribute(effect.mAttribute).getModified() <= 0)
+            if (!enemy.isEmpty() && enemy.getClass().getCreatureStats(enemy).getAttribute(effect.mAttribute).getModified() <= 0)
                 return 0.f;
             {
                 if (effect.mAttribute >= 0 && effect.mAttribute < ESM::Attribute::Length)
@@ -359,9 +359,9 @@ namespace MWMechanics
 
         case ESM::MagicEffect::DamageSkill:
         case ESM::MagicEffect::DrainSkill:
-            if (target.isEmpty() || !target.getClass().isNpc())
+            if (enemy.isEmpty() || !enemy.getClass().isNpc())
                 return 0.f;
-            if (target.getClass().getNpcStats(target).getSkill(effect.mSkill).getModified() <= 0)
+            if (enemy.getClass().getNpcStats(enemy).getSkill(effect.mSkill).getModified() <= 0)
                 return 0.f;
             break;
 
@@ -369,9 +369,9 @@ namespace MWMechanics
             break;
         }
 
-        // TODO: for non-cumulative effects (e.g. paralyze), check if the target is already suffering from them
+        // TODO: for non-cumulative effects (e.g. paralyze), check if the enemy is already suffering from them
 
-        // TODO: could take into account target's resistance/weakness against the effect
+        // TODO: could take into account enemy's resistance/weakness against the effect
 
         const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
 
@@ -392,13 +392,13 @@ namespace MWMechanics
         return rating;
     }
 
-    float rateEffects(const ESM::EffectList &list, const MWWorld::Ptr& actor, const MWWorld::Ptr& target)
+    float rateEffects(const ESM::EffectList &list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy)
     {
-        // NOTE: target may be empty
+        // NOTE: enemy may be empty
         float rating = 0.f;
         for (std::vector<ESM::ENAMstruct>::const_iterator it = list.mList.begin(); it != list.mList.end(); ++it)
         {
-            rating += rateEffect(*it, actor, target);
+            rating += rateEffect(*it, actor, enemy);
         }
         return rating;
     }
@@ -474,7 +474,7 @@ namespace MWMechanics
         // Already done in AiCombat itself
     }
 
-    boost::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &target)
+    boost::shared_ptr<Action> prepareNextAction(const MWWorld::Ptr &actor, const MWWorld::Ptr &enemy)
     {
         Spells& spells = actor.getClass().getCreatureStats(actor).getSpells();
 
@@ -503,7 +503,7 @@ namespace MWMechanics
 
             for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
             {
-                float rating = rateMagicItem(*it, actor, target);
+                float rating = rateMagicItem(*it, actor, enemy);
                 if (rating > bestActionRating)
                 {
                     bestActionRating = rating;
@@ -515,7 +515,7 @@ namespace MWMechanics
             MWWorld::Ptr bestArrow;
             for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
             {
-                float rating = rateWeapon(*it, actor, target, ESM::Weapon::Arrow);
+                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Arrow);
                 if (rating > bestArrowRating)
                 {
                     bestArrowRating = rating;
@@ -527,7 +527,7 @@ namespace MWMechanics
             MWWorld::Ptr bestBolt;
             for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
             {
-                float rating = rateWeapon(*it, actor, target, ESM::Weapon::Bolt);
+                float rating = rateWeapon(*it, actor, enemy, ESM::Weapon::Bolt);
                 if (rating > bestBoltRating)
                 {
                     bestBoltRating = rating;
@@ -542,7 +542,7 @@ namespace MWMechanics
                         == equipmentSlots.end())
                     continue;
 
-                float rating = rateWeapon(*it, actor, target, -1, bestArrowRating, bestBoltRating);
+                float rating = rateWeapon(*it, actor, enemy, -1, bestArrowRating, bestBoltRating);
                 if (rating > bestActionRating)
                 {
                     const ESM::Weapon* weapon = it->get<ESM::Weapon>()->mBase;
@@ -563,7 +563,7 @@ namespace MWMechanics
         {
             const ESM::Spell* spell = it->first;
 
-            float rating = rateSpell(spell, actor, target);
+            float rating = rateSpell(spell, actor, enemy);
             if (rating > bestActionRating)
             {
                 bestActionRating = rating;
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index a4a398d05f..6f5cbfbc29 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -72,19 +72,19 @@ namespace MWMechanics
         virtual void getCombatRange (float& rangeAttack, float& rangeFollow);
     };
 
-    float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
-    float rateMagicItem (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr &target);
+    float rateSpell (const ESM::Spell* spell, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
+    float rateMagicItem (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
     float ratePotion (const MWWorld::Ptr& item, const MWWorld::Ptr &actor);
     /// @param type Skip all weapons that are not of this type (i.e. return rating 0)
-    float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& target,
+    float rateWeapon (const MWWorld::Ptr& item, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy,
                       int type=-1, float arrowRating=0.f, float boltRating=0.f);
 
     /// @note target may be empty
-    float rateEffect (const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
+    float rateEffect (const ESM::ENAMstruct& effect, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
     /// @note target may be empty
-    float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
+    float rateEffects (const ESM::EffectList& list, const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 
-    boost::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& target);
+    boost::shared_ptr<Action> prepareNextAction (const MWWorld::Ptr& actor, const MWWorld::Ptr& enemy);
 }
 
 #endif

From a7b217def22d6bf1c35afd5dde36ceb18000a6eb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 01:27:40 +0100
Subject: [PATCH 202/765] AI: don't cast fortify effects (Fixes #3184)

---
 apps/openmw/mwmechanics/aicombataction.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index cf0d2532b9..cee2aae9c4 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -275,6 +275,15 @@ namespace MWMechanics
         case ESM::MagicEffect::ResistShock:
             return 0.f; // probably useless since we don't know in advance what the enemy will cast
 
+        // don't cast these for now as they would make the NPC cast the same effect over and over again, especially when they have potions
+        case ESM::MagicEffect::FortifyAttribute:
+        case ESM::MagicEffect::FortifyHealth:
+        case ESM::MagicEffect::FortifyMagicka:
+        case ESM::MagicEffect::FortifyFatigue:
+        case ESM::MagicEffect::FortifySkill:
+        case ESM::MagicEffect::FortifyMaximumMagicka:
+            return 0.f;
+
         case ESM::MagicEffect::Feather:
             if (actor.getClass().getEncumbrance(actor) - actor.getClass().getCapacity(actor) >= 0)
                 return 100.f;

From 023c87b21595353b98edce6176b38f8dca52f288 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 05:13:46 -0800
Subject: [PATCH 203/765] Preload cell when the player goes near a teleport
 door. It works!

---
 apps/openmw/mwworld/cellpreloader.cpp |  2 +
 apps/openmw/mwworld/scene.cpp         | 58 +++++++++++++++++++++++++++
 apps/openmw/mwworld/scene.hpp         |  3 ++
 3 files changed, 63 insertions(+)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 16bf920bbb..f1366a8b2a 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -66,6 +66,7 @@ namespace MWWorld
         /// Preload work to be called from the worker thread.
         virtual void doWork()
         {
+            osg::Timer preloadTimer;
             for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
             {
                 try
@@ -81,6 +82,7 @@ namespace MWWorld
                     // error will be shown when visiting the cell
                 }
             }
+            std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 70a461b5b9..912a39e7c1 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -193,6 +193,13 @@ namespace MWWorld
 
     void Scene::update (float duration, bool paused)
     {
+        mPreloadTimer += duration;
+        if (mPreloadTimer > 1.f)
+        {
+            preloadCells();
+            mPreloadTimer = 0.f;
+        }
+
         mRendering.update (duration, paused);
     }
 
@@ -440,6 +447,7 @@ namespace MWWorld
 
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics)
     : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering)
+    , mPreloadTimer(0.f)
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
     }
@@ -603,4 +611,54 @@ namespace MWWorld
 
         return Ptr();
     }
+
+    void Scene::preloadCells()
+    {
+        std::vector<MWWorld::ConstPtr> teleportDoors;
+        for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
+            iter!=mActiveCells.end(); ++iter)
+        {
+            const MWWorld::CellStore* cellStore = *iter;
+            typedef MWWorld::CellRefList<ESM::Door>::List DoorList;
+            const DoorList &doors = cellStore->getReadOnlyDoors().mList;
+            for (DoorList::const_iterator doorIt = doors.begin(); doorIt != doors.end(); ++doorIt)
+            {
+                if (!doorIt->mRef.getTeleport()) {
+                    continue;
+                }
+                teleportDoors.push_back(MWWorld::ConstPtr(&*doorIt, cellStore));
+            }
+        }
+
+        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        const float preloadDist = 500.f;
+
+        for (std::vector<MWWorld::ConstPtr>::iterator it = teleportDoors.begin(); it != teleportDoors.end(); ++it)
+        {
+            const MWWorld::ConstPtr& door = *it;
+            float sqrDistToPlayer = (player.getRefData().getPosition().asVec3() - door.getRefData().getPosition().asVec3()).length2();
+
+            if (sqrDistToPlayer < preloadDist*preloadDist)
+            {
+                MWWorld::CellStore* targetCell = NULL;
+                try
+                {
+                    if (!door.getCellRef().getDestCell().empty())
+                        targetCell = MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell());
+                    else
+                    {
+                        int x,y;
+                        MWBase::Environment::get().getWorld()->positionToIndex (door.getCellRef().getDoorDest().pos[0], door.getCellRef().getDoorDest().pos[1], x, y);
+                        targetCell = MWBase::Environment::get().getWorld()->getExterior(x, y);
+                    }
+                }
+                catch (std::exception& e)
+                {
+                    // ignore error for now, would spam the log too much
+                }
+                if (targetCell)
+                    mPreloader->preload(targetCell, mRendering.getReferenceTime());
+            }
+        }
+    }
 }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index b428d0ddd7..4ac0d0666a 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -58,6 +58,7 @@ namespace MWWorld
             MWPhysics::PhysicsSystem *mPhysics;
             MWRender::RenderingManager& mRendering;
             std::auto_ptr<CellPreloader> mPreloader;
+            float mPreloadTimer;
 
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
@@ -112,6 +113,8 @@ namespace MWWorld
             bool isCellActive(const CellStore &cell);
 
             Ptr searchPtrViaActorId (int actorId);
+
+            void preloadCells();
     };
 }
 

From 8592166eeb5acf5bbffb16125b0ccf5f98dc2b0b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 05:27:19 -0800
Subject: [PATCH 204/765] Preload surrounding cells when preloading an exterior
 cell destination

---
 apps/openmw/mwworld/cellpreloader.cpp |  2 ++
 apps/openmw/mwworld/scene.cpp         | 29 +++++++++++++++------------
 apps/openmw/mwworld/scene.hpp         |  1 +
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index f1366a8b2a..429e3294db 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -66,6 +66,8 @@ namespace MWWorld
         /// Preload work to be called from the worker thread.
         virtual void doWork()
         {
+            // TODO: make CellStore::loadRefs thread safe so we can call it from here
+
             osg::Timer preloadTimer;
             for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
             {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 912a39e7c1..38b762018e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -334,15 +334,13 @@ namespace MWWorld
         std::string loadingExteriorText = "#{sLoadingMessage3}";
         loadingListener->setLabel(loadingExteriorText);
 
-        const int halfGridSize = Settings::Manager::getInt("exterior cell load distance", "Cells");
-
         CellStoreCollection::iterator active = mActiveCells.begin();
         while (active!=mActiveCells.end())
         {
             if ((*active)->getCell()->isExterior())
             {
-                if (std::abs (X-(*active)->getCell()->getGridX())<=halfGridSize &&
-                    std::abs (Y-(*active)->getCell()->getGridY())<=halfGridSize)
+                if (std::abs (X-(*active)->getCell()->getGridX())<=mHalfGridSize &&
+                    std::abs (Y-(*active)->getCell()->getGridY())<=mHalfGridSize)
                 {
                     // keep cells within the new grid
                     ++active;
@@ -354,9 +352,9 @@ namespace MWWorld
 
         int refsToLoad = 0;
         // get the number of refs to load
-        for (int x=X-halfGridSize; x<=X+halfGridSize; ++x)
+        for (int x=X-mHalfGridSize; x<=X+mHalfGridSize; ++x)
         {
-            for (int y=Y-halfGridSize; y<=Y+halfGridSize; ++y)
+            for (int y=Y-mHalfGridSize; y<=Y+mHalfGridSize; ++y)
             {
                 CellStoreCollection::iterator iter = mActiveCells.begin();
 
@@ -379,9 +377,9 @@ namespace MWWorld
         loadingListener->setProgressRange(refsToLoad);
 
         // Load cells
-        for (int x=X-halfGridSize; x<=X+halfGridSize; ++x)
+        for (int x=X-mHalfGridSize; x<=X+mHalfGridSize; ++x)
         {
-            for (int y=Y-halfGridSize; y<=Y+halfGridSize; ++y)
+            for (int y=Y-mHalfGridSize; y<=Y+mHalfGridSize; ++y)
             {
                 CellStoreCollection::iterator iter = mActiveCells.begin();
 
@@ -448,6 +446,7 @@ namespace MWWorld
     Scene::Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics)
     : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering)
     , mPreloadTimer(0.f)
+    , mHalfGridSize(Settings::Manager::getInt("exterior cell load distance", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
     }
@@ -640,24 +639,28 @@ namespace MWWorld
 
             if (sqrDistToPlayer < preloadDist*preloadDist)
             {
-                MWWorld::CellStore* targetCell = NULL;
                 try
                 {
                     if (!door.getCellRef().getDestCell().empty())
-                        targetCell = MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell());
+                        mPreloader->preload(MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell()), mRendering.getReferenceTime());
                     else
                     {
                         int x,y;
                         MWBase::Environment::get().getWorld()->positionToIndex (door.getCellRef().getDoorDest().pos[0], door.getCellRef().getDoorDest().pos[1], x, y);
-                        targetCell = MWBase::Environment::get().getWorld()->getExterior(x, y);
+
+                        for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
+                        {
+                            for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
+                            {
+                                mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                            }
+                        }
                     }
                 }
                 catch (std::exception& e)
                 {
                     // ignore error for now, would spam the log too much
                 }
-                if (targetCell)
-                    mPreloader->preload(targetCell, mRendering.getReferenceTime());
             }
         }
     }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 4ac0d0666a..68748af850 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -59,6 +59,7 @@ namespace MWWorld
             MWRender::RenderingManager& mRendering;
             std::auto_ptr<CellPreloader> mPreloader;
             float mPreloadTimer;
+            int mHalfGridSize;
 
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 

From 8b981ab507bf7e940c9ed86f466c585f9258ffeb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 05:53:42 -0800
Subject: [PATCH 205/765] Crash fix

---
 components/resource/scenemanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 4ed14241a2..c2be3960f6 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -200,7 +200,8 @@ namespace Resource
             for(unsigned int unit=0;unit<texAttributes.size();++unit)
             {
                 osg::StateAttribute *texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
-                apply(texture);
+                if (texture)
+                    apply(texture);
             }
         }
 

From c3ad4dad7544bd2e0ea1f7931ce8854d87e5d535 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 05:53:56 -0800
Subject: [PATCH 206/765] Fix applying of filter settings on terrain textures

---
 components/terrain/terraingrid.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index eb085ca426..4f7a0772b7 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -139,15 +139,16 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
         std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
         for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
         {
-            osg::ref_ptr<osg::Texture2D> tex = mTextureCache[it->mDiffuseMap];
-            if (!tex)
+            osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
+            if (!texture)
             {
-                tex = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mDiffuseMap));
-                tex->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-                tex->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-                mTextureCache[it->mDiffuseMap] = tex;
+                texture = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mDiffuseMap));
+                texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                mResourceSystem->getSceneManager()->applyFilterSettings(texture);
+                mTextureCache[it->mDiffuseMap] = texture;
             }
-            layerTextures.push_back(tex);
+            layerTextures.push_back(texture);
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
         }
 
@@ -161,7 +162,6 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setResizeNonPowerOfTwoHint(false);
             texture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
             blendmapTextures.push_back(texture);
-            mResourceSystem->getSceneManager()->applyFilterSettings(texture);
 
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
         }

From 49ecac4ced6a562f6b0e6491e87ab6d3864f61c9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 07:37:35 -0800
Subject: [PATCH 207/765] Add a mutex lock around the SharedStateManager

---
 components/resource/scenemanager.cpp | 2 ++
 components/resource/scenemanager.hpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index c2be3960f6..eecee813f4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -357,7 +357,9 @@ namespace Resource
             loaded->accept(setFilterSettingsControllerVisitor);
 
             // share state
+            mSharedStateMutex.lock();
             osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
+            mSharedStateMutex.unlock();
 
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 173131e666..0345fff228 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -89,6 +89,8 @@ namespace Resource
         void setUnRefImageDataAfterApply(bool unref);
 
     private:
+        OpenThreads::Mutex mSharedStateMutex;
+
         Resource::ImageManager* mImageManager;
         Resource::NifFileManager* mNifFileManager;
 

From 610257cd3a396c8e4fe557584a89395371af88b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 07:37:56 -0800
Subject: [PATCH 208/765] Preload the exterior cell grid

---
 apps/openmw/mwworld/scene.cpp | 53 +++++++++++++++++++++++++++++++----
 apps/openmw/mwworld/scene.hpp |  8 ++++--
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 38b762018e..b859efbf13 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -194,7 +194,7 @@ namespace MWWorld
     void Scene::update (float duration, bool paused)
     {
         mPreloadTimer += duration;
-        if (mPreloadTimer > 1.f)
+        if (mPreloadTimer > 0.5f)
         {
             preloadCells();
             mPreloadTimer = 0.f;
@@ -313,7 +313,7 @@ namespace MWWorld
         getGridCenter(cellX, cellY);
         float centerX, centerY;
         MWBase::Environment::get().getWorld()->indexToPosition(cellX, cellY, centerX, centerY, true);
-        const float maxDistance = 8192/2 + 1024; // 1/2 cell size + threshold
+        const float maxDistance = 8192/2 + mCellLoadingThreshold; // 1/2 cell size + threshold
         float distance = std::max(std::abs(centerX-pos.x()), std::abs(centerY-pos.y()));
         if (distance > maxDistance)
         {
@@ -447,6 +447,8 @@ namespace MWWorld
     : mCurrentCell (0), mCellChanged (false), mPhysics(physics), mRendering(rendering)
     , mPreloadTimer(0.f)
     , mHalfGridSize(Settings::Manager::getInt("exterior cell load distance", "Cells"))
+    , mCellLoadingThreshold(1024.f)
+    , mPreloadDistance(1000.f)
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
     }
@@ -612,6 +614,12 @@ namespace MWWorld
     }
 
     void Scene::preloadCells()
+    {
+        preloadTeleportDoorDestinations();
+        preloadExteriorGrid();
+    }
+
+    void Scene::preloadTeleportDoorDestinations()
     {
         std::vector<MWWorld::ConstPtr> teleportDoors;
         for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
@@ -630,14 +638,12 @@ namespace MWWorld
         }
 
         const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const float preloadDist = 500.f;
-
         for (std::vector<MWWorld::ConstPtr>::iterator it = teleportDoors.begin(); it != teleportDoors.end(); ++it)
         {
             const MWWorld::ConstPtr& door = *it;
             float sqrDistToPlayer = (player.getRefData().getPosition().asVec3() - door.getRefData().getPosition().asVec3()).length2();
 
-            if (sqrDistToPlayer < preloadDist*preloadDist)
+            if (sqrDistToPlayer < mPreloadDistance*mPreloadDistance)
             {
                 try
                 {
@@ -664,4 +670,41 @@ namespace MWWorld
             }
         }
     }
+
+    void Scene::preloadExteriorGrid()
+    {
+        if (!MWBase::Environment::get().getWorld()->isCellExterior())
+            return;
+
+        int halfGridSizePlusOne = mHalfGridSize + 1;
+
+        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();
+
+        int cellX,cellY;
+        getGridCenter(cellX,cellY);
+
+        float centerX, centerY;
+        MWBase::Environment::get().getWorld()->indexToPosition(cellX, cellY, centerX, centerY, true);
+
+        for (int dx = -halfGridSizePlusOne; dx <= halfGridSizePlusOne; ++dx)
+        {
+            for (int dy = -halfGridSizePlusOne; dy <= halfGridSizePlusOne; ++dy)
+            {
+                if (dy != halfGridSizePlusOne && dy != -halfGridSizePlusOne && dx != halfGridSizePlusOne && dx != -halfGridSizePlusOne)
+                    continue; // only care about the outer (not yet loaded) part of the grid
+
+                float thisCellCenterX, thisCellCenterY;
+                MWBase::Environment::get().getWorld()->indexToPosition(cellX+dx, cellY+dy, thisCellCenterX, thisCellCenterY, true);
+
+                float dist = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
+                float loadDist = 8192/2 + 8192 - mCellLoadingThreshold + mPreloadDistance;
+
+                std::cout << cellX+dx << " " << cellY+dy << " dist " << dist << " need " << loadDist << std::endl;
+
+                if (dist < loadDist)
+                    mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(cellX+dx, cellY+dy), mRendering.getReferenceTime());
+            }
+        }
+    }
 }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 68748af850..36021819e8 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -60,6 +60,8 @@ namespace MWWorld
             std::auto_ptr<CellPreloader> mPreloader;
             float mPreloadTimer;
             int mHalfGridSize;
+            float mCellLoadingThreshold;
+            float mPreloadDistance;
 
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
@@ -68,6 +70,10 @@ namespace MWWorld
 
             void getGridCenter(int& cellX, int& cellY);
 
+            void preloadCells();
+            void preloadTeleportDoorDestinations();
+            void preloadExteriorGrid();
+
         public:
 
             Scene (MWRender::RenderingManager& rendering, MWPhysics::PhysicsSystem *physics);
@@ -114,8 +120,6 @@ namespace MWWorld
             bool isCellActive(const CellStore &cell);
 
             Ptr searchPtrViaActorId (int actorId);
-
-            void preloadCells();
     };
 }
 

From 5efaa9817c6172f5be24a0efdff7f308db4e71f1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 18:01:14 +0100
Subject: [PATCH 209/765] Add preloading settings

---
 apps/openmw/mwworld/scene.cpp | 16 +++++++++-------
 apps/openmw/mwworld/scene.hpp |  1 +
 files/settings-default.cfg    |  6 ++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index b859efbf13..c788df234a 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -193,11 +193,14 @@ namespace MWWorld
 
     void Scene::update (float duration, bool paused)
     {
-        mPreloadTimer += duration;
-        if (mPreloadTimer > 0.5f)
+        if (mPreloadEnabled)
         {
-            preloadCells();
-            mPreloadTimer = 0.f;
+            mPreloadTimer += duration;
+            if (mPreloadTimer > 0.5f)
+            {
+                preloadCells();
+                mPreloadTimer = 0.f;
+            }
         }
 
         mRendering.update (duration, paused);
@@ -448,7 +451,8 @@ namespace MWWorld
     , mPreloadTimer(0.f)
     , mHalfGridSize(Settings::Manager::getInt("exterior cell load distance", "Cells"))
     , mCellLoadingThreshold(1024.f)
-    , mPreloadDistance(1000.f)
+    , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
+    , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
     }
@@ -700,8 +704,6 @@ namespace MWWorld
                 float dist = std::max(std::abs(thisCellCenterX - playerPos.x()), std::abs(thisCellCenterY - playerPos.y()));
                 float loadDist = 8192/2 + 8192 - mCellLoadingThreshold + mPreloadDistance;
 
-                std::cout << cellX+dx << " " << cellY+dy << " dist " << dist << " need " << loadDist << std::endl;
-
                 if (dist < loadDist)
                     mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(cellX+dx, cellY+dy), mRendering.getReferenceTime());
             }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 36021819e8..34e137e45a 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -62,6 +62,7 @@ namespace MWWorld
             int mHalfGridSize;
             float mCellLoadingThreshold;
             float mPreloadDistance;
+            bool mPreloadEnabled;
 
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index dddf1a29b9..c033426005 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -37,6 +37,12 @@ first person field of view = 55.0
 # dramatically affect performance, see documentation for details.
 exterior cell load distance = 1
 
+# Preload cells in a background thread
+preload enabled = true
+
+# Preloading distance threshold
+preload distance = 1000
+
 [Map]
 
 # Size of each exterior cell in pixels in the world map. (e.g. 12 to 24).

From 778bce3ae939ec17345b09cb1365215079ee9640 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 18:27:12 +0100
Subject: [PATCH 210/765] Remove unused ObjectCache functions

---
 components/resource/objectcache.cpp | 24 ------------------------
 components/resource/objectcache.hpp |  6 ------
 2 files changed, 30 deletions(-)

diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index 0c6066417c..54576a122c 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -31,42 +31,18 @@ ObjectCache::~ObjectCache()
 //    OSG_NOTICE<<"Destructed ObjectCache"<<std::endl;
 }
 
-void ObjectCache::addObjectCache(ObjectCache* objectCache)
-{
-    // don't allow a cache to be added to itself.
-    if (objectCache==this) return;
-
-    // lock both ObjectCache to prevent their contents from being modified by other threads while we merge.
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock1(_objectCacheMutex);
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock2(objectCache->_objectCacheMutex);
-
-    // OSG_NOTICE<<"Inserting objects to main ObjectCache "<<objectCache->_objectCache.size()<<std::endl;
-
-    _objectCache.insert(objectCache->_objectCache.begin(), objectCache->_objectCache.end());
-}
-
-
 void ObjectCache::addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
     _objectCache[filename]=ObjectTimeStampPair(object,timestamp);
 }
 
-osg::Object* ObjectCache::getFromObjectCache(const std::string& fileName)
-{
-    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
-    ObjectCacheMap::iterator itr = _objectCache.find(fileName);
-    if (itr!=_objectCache.end()) return itr->second.first.get();
-    else return 0;
-}
-
 osg::ref_ptr<osg::Object> ObjectCache::getRefFromObjectCache(const std::string& fileName)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
     ObjectCacheMap::iterator itr = _objectCache.find(fileName);
     if (itr!=_objectCache.end())
     {
-        // OSG_NOTICE<<"Found "<<fileName<<" in ObjectCache "<<this<<std::endl;
         return itr->second.first;
     }
     else return 0;
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 624c38bad5..b933933f3f 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -49,18 +49,12 @@ class ObjectCache : public osg::Referenced
         /** Remove all objects in the cache regardless of having external references or expiry times.*/
         void clear();
 
-        /** Add contents of specified ObjectCache to this object cache.*/
-        void addObjectCache(ObjectCache* object);
-
         /** Add a filename,object,timestamp triple to the Registry::ObjectCache.*/
         void addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp = 0.0);
 
         /** Remove Object from cache.*/
         void removeFromObjectCache(const std::string& fileName);
 
-        /** Get an Object from the object cache*/
-        osg::Object* getFromObjectCache(const std::string& fileName);
-
         /** Get an ref_ptr<Object> from the object cache*/
         osg::ref_ptr<osg::Object> getRefFromObjectCache(const std::string& fileName);
 

From 41233fc8e5717ba0d37dd5c3afb513a7e5702c62 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 18:56:21 +0100
Subject: [PATCH 211/765] Keep a reference to the original scene template for
 as long as the instance is used

---
 components/resource/objectcache.cpp  | 2 --
 components/resource/scenemanager.cpp | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index 54576a122c..17368f34f5 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -23,12 +23,10 @@ namespace Resource
 ObjectCache::ObjectCache():
     osg::Referenced(true)
 {
-//    OSG_NOTICE<<"Constructed ObjectCache"<<std::endl;
 }
 
 ObjectCache::~ObjectCache()
 {
-//    OSG_NOTICE<<"Destructed ObjectCache"<<std::endl;
 }
 
 void ObjectCache::addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index eecee813f4..46d975631e 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -373,6 +373,10 @@ namespace Resource
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
         osg::ref_ptr<osg::Node> cloned = osg::clone(scene.get(), SceneUtil::CopyOp());
+
+        // add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
+        cloned->getOrCreateUserDataContainer()->addUserObject(const_cast<osg::Node*>(scene.get()));
+
         return cloned;
     }
 

From a81b10b4153751ee7c1cc117f8b9096dda70bb8b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 19:05:55 +0100
Subject: [PATCH 212/765] Make the cache expiryDelay configurable

---
 apps/openmw/mwworld/cellpreloader.cpp   | 12 ++++++++----
 apps/openmw/mwworld/cellpreloader.hpp   |  4 ++++
 apps/openmw/mwworld/scene.cpp           |  4 ++++
 components/resource/niffilemanager.cpp  |  3 +--
 components/resource/resourcemanager.cpp |  9 +++++++--
 components/resource/resourcemanager.hpp |  6 ++++--
 components/resource/resourcesystem.cpp  | 10 ++++++++++
 components/resource/resourcesystem.hpp  |  3 +++
 files/settings-default.cfg              |  4 ++++
 9 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 429e3294db..13ce75d685 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -123,6 +123,7 @@ namespace MWWorld
     CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager)
         : mResourceSystem(resourceSystem)
         , mBulletShapeManager(bulletShapeManager)
+        , mExpiryDelay(0.0)
     {
         mWorkQueue = new SceneUtil::WorkQueue;
     }
@@ -156,13 +157,11 @@ namespace MWWorld
 
     void CellPreloader::updateCache(double timestamp)
     {
-        // time (in seconds) to keep a preloaded cell in cache after it's no longer needed
-        // additionally we could support a minimum/maximum size for the cache
-        const double expiryTime = 60.0;
+        // TODO: add settings for a minimum/maximum size of the cache
 
         for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
         {
-            if (it->second.mTimeStamp < timestamp - expiryTime)
+            if (it->second.mTimeStamp < timestamp - mExpiryDelay)
                 mPreloadCells.erase(it++);
             else
                 ++it;
@@ -172,6 +171,11 @@ namespace MWWorld
         mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, timestamp));
     }
 
+    void CellPreloader::setExpiryDelay(double expiryDelay)
+    {
+        mExpiryDelay = expiryDelay;
+    }
+
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index b3413b1743..5a24321795 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -27,12 +27,16 @@ namespace MWWorld
         /// Removes preloaded cells that have not had a preload request for a while.
         void updateCache(double timestamp);
 
+        /// How long to keep a preloaded cell in cache after it's no longer requested.
+        void setExpiryDelay(double expiryDelay);
+
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
     private:
         Resource::ResourceSystem* mResourceSystem;
         Resource::BulletShapeManager* mBulletShapeManager;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        double mExpiryDelay;
 
         struct PreloadEntry
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c788df234a..86f40df73e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -455,6 +455,10 @@ namespace MWWorld
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
+
+        float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
+        rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
+        mPreloader->setExpiryDelay(cacheExpiryDelay);
     }
 
     Scene::~Scene()
diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index 3c7437520b..ecb63db600 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -29,8 +29,7 @@ namespace Resource
     };
 
     NifFileManager::NifFileManager(const VFS::Manager *vfs)
-        : ResourceManager(vfs, 0.0) // NIF files aren't needed any more when the converted objects are cached in SceneManager / BulletShapeManager,
-                                    // so we'll use expiryDelay of 0 to instantly delete NIF files after use.
+        : ResourceManager(vfs)
     {
     }
 
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index 03e6263b91..b6b38bfa2b 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -5,10 +5,10 @@
 namespace Resource
 {
 
-    ResourceManager::ResourceManager(const VFS::Manager *vfs, const double expiryDelay)
+    ResourceManager::ResourceManager(const VFS::Manager *vfs)
         : mVFS(vfs)
         , mCache(new Resource::ObjectCache)
-        , mExpiryDelay(expiryDelay)
+        , mExpiryDelay(0.0)
     {
 
     }
@@ -26,6 +26,11 @@ namespace Resource
         mCache->clear();
     }
 
+    void ResourceManager::setExpiryDelay(double expiryDelay)
+    {
+        mExpiryDelay = expiryDelay;
+    }
+
     const VFS::Manager* ResourceManager::getVFS() const
     {
         return mVFS;
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index a9b6ab3d51..d2a1d10237 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -17,8 +17,7 @@ namespace Resource
     class ResourceManager
     {
     public:
-        /// @param expiryDelay how long to keep objects in cache after no longer being referenced.
-        ResourceManager(const VFS::Manager* vfs, const double expiryDelay = 300.0);
+        ResourceManager(const VFS::Manager* vfs);
 
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
         virtual void updateCache(double referenceTime);
@@ -26,6 +25,9 @@ namespace Resource
         /// Clear all cache entries regardless of having external references.
         virtual void clearCache();
 
+        /// How long to keep objects in cache after no longer being referenced.
+        void setExpiryDelay (double expiryDelay);
+
         const VFS::Manager* getVFS() const;
 
     protected:
diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
index a8ab6556d7..5772f2b853 100644
--- a/components/resource/resourcesystem.cpp
+++ b/components/resource/resourcesystem.cpp
@@ -52,6 +52,16 @@ namespace Resource
         return mKeyframeManager.get();
     }
 
+    void ResourceSystem::setExpiryDelay(double expiryDelay)
+    {
+        for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+            (*it)->setExpiryDelay(expiryDelay);
+
+        // NIF files aren't needed any more once the converted objects are cached in SceneManager / BulletShapeManager,
+        // so no point in using an expiry delay
+        mNifFileManager->setExpiryDelay(0.0);
+    }
+
     void ResourceSystem::updateCache(double referenceTime)
     {
         for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
index 30607432da..9b933ffc4d 100644
--- a/components/resource/resourcesystem.hpp
+++ b/components/resource/resourcesystem.hpp
@@ -43,6 +43,9 @@ namespace Resource
         /// @note Does not delete resourceMgr.
         void removeResourceManager(ResourceManager* resourceMgr);
 
+        /// How long to keep objects in cache after no longer being referenced.
+        void setExpiryDelay(double expiryDelay);
+
         /// @note May be called from any thread.
         const VFS::Manager* getVFS() const;
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c033426005..4df20e7096 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -43,6 +43,10 @@ preload enabled = true
 # Preloading distance threshold
 preload distance = 1000
 
+# How long to keep preloaded cells and cached models/textures/collision shapes in cache
+# after they're no longer referenced/required (in seconds)
+cache expiry delay = 300
+
 [Map]
 
 # Size of each exterior cell in pixels in the world map. (e.g. 12 to 24).

From a34a08c212074693e88289371f9702acff1eb959 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 7 Feb 2016 13:52:18 -0500
Subject: [PATCH 213/765] Render cell markers

Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
---
 apps/opencs/CMakeLists.txt             |  5 ++-
 apps/opencs/view/render/cell.cpp       |  7 +++
 apps/opencs/view/render/cell.hpp       |  5 +++
 apps/opencs/view/render/cellmarker.cpp | 62 ++++++++++++++++++++++++++
 apps/opencs/view/render/cellmarker.hpp | 48 ++++++++++++++++++++
 5 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 apps/opencs/view/render/cellmarker.cpp
 create mode 100644 apps/opencs/view/render/cellmarker.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0bde541bf7..c9245ca9fd 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -35,7 +35,7 @@ opencs_hdrs_noqt (model/world
 
 
 opencs_units (model/tools
-    tools reportmodel mergeoperation 
+    tools reportmodel mergeoperation
     )
 
 opencs_units_noqt (model/tools
@@ -90,7 +90,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight
-    lightingbright object cell terrainstorage tagbase cellarrow
+    lightingbright object cell terrainstorage tagbase cellarrow cellmarker
     )
 
 opencs_hdrs_noqt (view/render
@@ -192,6 +192,7 @@ endif(APPLE)
 target_link_libraries(openmw-cs
     ${OSG_LIBRARIES}
     ${OPENTHREADS_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
     ${OSGUTIL_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
     ${OSGGA_LIBRARIES}
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index bd85c8a142..0030fd9b82 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -70,6 +70,8 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     mCellNode = new osg::Group;
     rootNode->addChild(mCellNode);
 
+    setCellMarker();
+
     if (!mDeleted)
     {
         CSMWorld::IdTable& references = dynamic_cast<CSMWorld::IdTable&> (
@@ -303,6 +305,11 @@ void CSVRender::Cell::setCellArrows (int mask)
     }
 }
 
+void CSVRender::Cell::setCellMarker()
+{
+    mCellMarker.reset(new CellMarker(mCellNode, mCoordinates));
+}
+
 CSMWorld::CellCoordinates CSVRender::Cell::getCoordinates() const
 {
     return mCoordinates;
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 85b9bf21b4..22f9872e3d 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -15,6 +15,7 @@
 
 #include "object.hpp"
 #include "cellarrow.hpp"
+#include "cellmarker.hpp"
 
 class QModelIndex;
 
@@ -42,6 +43,7 @@ namespace CSVRender
             std::auto_ptr<Terrain::TerrainGrid> mTerrain;
             CSMWorld::CellCoordinates mCoordinates;
             std::auto_ptr<CellArrow> mCellArrows[4];
+            std::auto_ptr<CellMarker> mCellMarker;
             bool mDeleted;
 
             /// Ignored if cell does not have an object with the given ID.
@@ -105,6 +107,9 @@ namespace CSVRender
 
             void setCellArrows (int mask);
 
+            /// \brief Set marker for this cell.
+            void setCellMarker();
+
             /// Returns 0, 0 in case of an unpaged cell.
             CSMWorld::CellCoordinates getCoordinates() const;
 
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
new file mode 100644
index 0000000000..17bb05440e
--- /dev/null
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -0,0 +1,62 @@
+#include "cellmarker.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include <osg/AutoTransform>
+#include <osg/Geode>
+#include <osg/Group>
+#include <osgText/Text>
+
+void CSVRender::CellMarker::buildMarker()
+{
+    const int characterSize = 20;
+
+    // Set up marker text containing cell's coordinates.
+    osg::ref_ptr<osgText::Text> markerText (new osgText::Text);
+    markerText->setBackdropType(osgText::Text::OUTLINE);
+    markerText->setLayout(osgText::Text::LEFT_TO_RIGHT);
+    markerText->setCharacterSize(characterSize);
+    std::string coordinatesText =
+        "#" + boost::lexical_cast<std::string>(mCoordinates.getX()) +
+        " " + boost::lexical_cast<std::string>(mCoordinates.getY());
+    markerText->setText(coordinatesText);
+
+    // Add text to marker node.
+    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
+    geode->addDrawable(markerText);
+    mMarkerNode->addChild(geode);
+}
+
+void CSVRender::CellMarker::positionMarker()
+{
+    const int cellSize = 8192;
+    const int markerHeight = 0;
+
+    // Move marker to center of cell.
+    int x = (mCoordinates.getX() * cellSize) + (cellSize / 2);
+    int y = (mCoordinates.getY() * cellSize) + (cellSize / 2);
+    mMarkerNode->setPosition(osg::Vec3f(x, y, markerHeight));
+}
+
+CSVRender::CellMarker::CellMarker(
+    osg::Group *cellNode,
+    const CSMWorld::CellCoordinates& coordinates
+) : mCellNode(cellNode),
+    mCoordinates(coordinates)
+{
+    // Set up node for cell marker.
+    mMarkerNode = new osg::AutoTransform();
+    mMarkerNode->setAutoRotateMode(osg::AutoTransform::ROTATE_TO_SCREEN);
+    mMarkerNode->setAutoScaleToScreen(true);
+    mMarkerNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+
+    mCellNode->addChild(mMarkerNode);
+
+    buildMarker();
+    positionMarker();
+}
+
+CSVRender::CellMarker::~CellMarker()
+{
+    mCellNode->removeChild(mMarkerNode);
+}
diff --git a/apps/opencs/view/render/cellmarker.hpp b/apps/opencs/view/render/cellmarker.hpp
new file mode 100644
index 0000000000..4ac9d86b00
--- /dev/null
+++ b/apps/opencs/view/render/cellmarker.hpp
@@ -0,0 +1,48 @@
+#ifndef OPENCS_VIEW_CELLMARKER_H
+#define OPENCS_VIEW_CELLMARKER_H
+
+#include <osg/ref_ptr>
+
+#include "../../model/world/cellcoordinates.hpp"
+
+namespace osg
+{
+    class AutoTransform;
+    class Group;
+}
+
+namespace CSVRender
+{
+    /// \brief Marker to display cell coordinates.
+    class CellMarker
+    {
+        private:
+
+            osg::Group* mCellNode;
+            osg::ref_ptr<osg::AutoTransform> mMarkerNode;
+            CSMWorld::CellCoordinates mCoordinates;
+
+            // Not implemented.
+            CellMarker(const CellMarker&);
+            CellMarker& operator=(const CellMarker&);
+
+            /// \brief Build marker containing cell's coordinates.
+            void buildMarker();
+
+            /// \brief Position marker above center of cell.
+            void positionMarker();
+
+        public:
+
+            /// \brief Constructor.
+            /// \param cellNode Cell to create marker for.
+            /// \param coordinates Coordinates of cell.
+            CellMarker(
+                osg::Group *cellNode,
+                const CSMWorld::CellCoordinates& coordinates);
+
+            ~CellMarker();
+    };
+}
+
+#endif

From c8054424c946ed5433b325d2f1301f16d7d78b64 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 22:37:52 +0100
Subject: [PATCH 214/765] Preload items equipped by NPCs

---
 apps/openmw/mwworld/cellpreloader.cpp | 68 ++++++++++++++++++++++++---
 apps/openmw/mwworld/cellpreloader.hpp |  2 +-
 apps/openmw/mwworld/scene.cpp         |  7 +++
 components/resource/scenemanager.cpp  |  3 ++
 4 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 13ce75d685..6bf28cb48e 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -5,10 +5,14 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
+#include <components/misc/resourcehelpers.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
+
 #include "cellstore.hpp"
 #include "manualref.hpp"
 #include "class.hpp"
@@ -23,11 +27,54 @@ namespace MWWorld
         {
         }
 
-        virtual bool operator()(const MWWorld::ConstPtr& ptr)
+        virtual bool operator()(const MWWorld::Ptr& ptr)
         {
             std::string model = ptr.getClass().getModel(ptr);
             if (!model.empty())
                 mOut.push_back(model);
+
+            // TODO: preload NPC body parts (mHead / mHair)
+
+            // FIXME: use const version of InventoryStore functions once they are available
+            if (ptr.getClass().hasInventoryStore(ptr))
+            {
+                MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+                for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                {
+                    MWWorld::ContainerStoreIterator equipped = invStore.getSlot(slot);
+                    if (equipped != invStore.end())
+                    {
+                        std::vector<ESM::PartReference> parts;
+                        if(equipped->getTypeName() == typeid(ESM::Clothing).name())
+                        {
+                            const ESM::Clothing *clothes = equipped->get<ESM::Clothing>()->mBase;
+                            parts = clothes->mParts.mParts;
+                        }
+                        else if(equipped->getTypeName() == typeid(ESM::Armor).name())
+                        {
+                            const ESM::Armor *armor = equipped->get<ESM::Armor>()->mBase;
+                            parts = armor->mParts.mParts;
+                        }
+                        else
+                        {
+                            model = equipped->getClass().getModel(*equipped);
+                            if (!model.empty())
+                                mOut.push_back(model);
+                        }
+
+                        for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
+                        {
+                            const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(it->mMale);
+                            if (part && !part->mModel.empty())
+                                mOut.push_back("meshes/"+part->mModel);
+                            part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(it->mFemale);
+                            if (part && !part->mModel.empty())
+                                mOut.push_back("meshes/"+part->mModel);
+                        }
+                    }
+                }
+            }
+
             return true;
         }
 
@@ -39,14 +86,15 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(const MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager)
             : mSceneManager(sceneManager)
             , mBulletShapeManager(bulletShapeManager)
         {
+            osg::Timer timer;
+            ListModelsVisitor visitor (mMeshes);
             if (cell->getState() == MWWorld::CellStore::State_Loaded)
             {
-                ListModelsVisitor visitor (mMeshes);
-                cell->forEachConst(visitor);
+                cell->forEach(visitor);
             }
             else
             {
@@ -61,6 +109,7 @@ namespace MWWorld
                         mMeshes.push_back(model);
                 }
             }
+            std::cout << "listed models in " << timer.time_m() << std::endl;
         }
 
         /// Preload work to be called from the worker thread.
@@ -73,9 +122,16 @@ namespace MWWorld
             {
                 try
                 {
+                    std::string mesh  = *it;
+                    Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
+
+                    //std::cout << "preloading " << mesh << std::endl;
+
                     mPreloadedNodes.push_back(mSceneManager->getTemplate(*it));
                     mPreloadedShapes.push_back(mBulletShapeManager->getShape(*it));
 
+                    // TODO: load .kf
+
                     // TODO: do a createInstance() and hold on to it since we can make use of it when the cell goes active
                 }
                 catch (std::exception& e)
@@ -84,7 +140,7 @@ namespace MWWorld
                     // error will be shown when visiting the cell
                 }
             }
-            std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
+            //std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
@@ -128,7 +184,7 @@ namespace MWWorld
         mWorkQueue = new SceneUtil::WorkQueue;
     }
 
-    void CellPreloader::preload(const CellStore *cell, double timestamp)
+    void CellPreloader::preload(CellStore *cell, double timestamp)
     {
         if (!mWorkQueue)
         {
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 5a24321795..c7495182b3 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -22,7 +22,7 @@ namespace MWWorld
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
         /// @note The cell itself must be in State_Loaded or State_Preloaded.
-        void preload(const MWWorld::CellStore* cell, double timestamp);
+        void preload(MWWorld::CellStore* cell, double timestamp);
 
         /// Removes preloaded cells that have not had a preload request for a while.
         void updateCache(double timestamp);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 86f40df73e..321c1c622e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -2,6 +2,7 @@
 
 #include <limits>
 #include <iostream>
+#include <osg/Timer>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
@@ -329,6 +330,7 @@ namespace MWWorld
 
     void Scene::changeCellGrid (int X, int Y)
     {
+        osg::Timer timer;
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
 
@@ -413,6 +415,8 @@ namespace MWWorld
 
         mPreloader->updateCache(mRendering.getReferenceTime());
         mRendering.clearCache();
+
+        std::cout << "changeCellGrid took " << timer.time_m() << std::endl;
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -477,6 +481,7 @@ namespace MWWorld
 
     void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
     {
+        osg::Timer timer;
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
         if(!loadcell)
@@ -537,6 +542,8 @@ namespace MWWorld
 
         mPreloader->updateCache(mRendering.getReferenceTime());
         mRendering.clearCache();
+
+        std::cout << "change to interior took " << timer.time_m() << std::endl;
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 46d975631e..f083e8175d 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -1,5 +1,6 @@
 #include "scenemanager.hpp"
 
+#include <iostream>
 #include <osg/Node>
 #include <osg/Geode>
 #include <osg/UserDataContainer>
@@ -364,6 +365,8 @@ namespace Resource
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
 
+            //std::cout << "loading " << normalized  << std::endl;
+
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
         }

From e4e313fe129fa2c96440e53a8fc9e2ba8bca2fd1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 14:41:21 +0100
Subject: [PATCH 215/765] Remove outdated comment

---
 apps/openmw/mwworld/cellpreloader.cpp   | 2 +-
 components/resource/resourcemanager.cpp | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 6bf28cb48e..d9875e0b71 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -140,7 +140,7 @@ namespace MWWorld
                     // error will be shown when visiting the cell
                 }
             }
-            //std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
+            std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index b6b38bfa2b..e5f6d9f437 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -15,8 +15,6 @@ namespace Resource
 
     void ResourceManager::updateCache(double referenceTime)
     {
-        // NOTE: we could clear the cache from the background thread if the deletion proves too much of an overhead
-        // idea: customize objectCache to not hold a lock while doing the actual deletion
         mCache->updateTimeStampOfObjectsInCacheWithExternalReferences(referenceTime);
         mCache->removeExpiredObjectsInCache(referenceTime - mExpiryDelay);
     }

From ef5de945483ab719df31cb3c392a2a0e8b46c9dc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 15:31:09 +0100
Subject: [PATCH 216/765] Fix correctActorModelPath

---
 apps/openmw/mwworld/cellpreloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index d9875e0b71..b45d1de5ba 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -123,7 +123,7 @@ namespace MWWorld
                 try
                 {
                     std::string mesh  = *it;
-                    Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
+                    mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
                     //std::cout << "preloading " << mesh << std::endl;
 

From fc0be77e4c02ee182141c103be3404757240708b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 15:51:31 +0100
Subject: [PATCH 217/765] Preload keyframes

---
 apps/openmw/mwworld/cellpreloader.cpp | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index b45d1de5ba..4780582c52 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -5,7 +5,9 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/bulletshapemanager.hpp>
+#include <components/resource/keyframemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
+#include <components/nifosg/nifloader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -86,9 +88,10 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager)
             : mSceneManager(sceneManager)
             , mBulletShapeManager(bulletShapeManager)
+            , mKeyframeManager(keyframeManager)
         {
             osg::Timer timer;
             ListModelsVisitor visitor (mMeshes);
@@ -130,7 +133,21 @@ namespace MWWorld
                     mPreloadedNodes.push_back(mSceneManager->getTemplate(*it));
                     mPreloadedShapes.push_back(mBulletShapeManager->getShape(*it));
 
-                    // TODO: load .kf
+                    size_t slashpos = mesh.find_last_of("/\\");
+                    if (slashpos != std::string::npos && slashpos != mesh.size()-1)
+                    {
+                        Misc::StringUtils::lowerCaseInPlace(mesh);
+                        if (mesh[slashpos+1] == 'x')
+                        {
+                            std::string kfname = mesh;
+                            if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
+                            {
+                                kfname.replace(kfname.size()-4, 4, ".kf");
+                                mPreloadedKeyframes.push_back(mKeyframeManager->get(kfname));
+                            }
+
+                        }
+                    }
 
                     // TODO: do a createInstance() and hold on to it since we can make use of it when the cell goes active
                 }
@@ -148,10 +165,12 @@ namespace MWWorld
         MeshList mMeshes;
         Resource::SceneManager* mSceneManager;
         Resource::BulletShapeManager* mBulletShapeManager;
+        Resource::KeyframeManager* mKeyframeManager;
 
         // keep a ref to the loaded object to make sure it stays loaded as long as this cell is in the preloaded state
         std::vector<osg::ref_ptr<const osg::Node> > mPreloadedNodes;
         std::vector<osg::ref_ptr<const Resource::BulletShape> > mPreloadedShapes;
+        std::vector<osg::ref_ptr<const NifOsg::KeyframeHolder> > mPreloadedKeyframes;
     };
 
     /// Worker thread item: update the resource system's cache, effectively deleting unused entries.
@@ -205,7 +224,7 @@ namespace MWWorld
             return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager));
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager()));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);

From b2019d31c72d5dd4a30c9b8b7aa214d6dbdf24da Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 15:55:05 +0100
Subject: [PATCH 218/765] Mark thread safe methods in BsaFile

---
 components/bsa/bsa_file.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/bsa/bsa_file.hpp b/components/bsa/bsa_file.hpp
index 8ed63f35da..5ff86ef650 100644
--- a/components/bsa/bsa_file.hpp
+++ b/components/bsa/bsa_file.hpp
@@ -90,6 +90,7 @@ private:
     void readHeader();
 
     /// Get the index of a given file name, or -1 if not found
+    /// @note Thread safe.
     int getIndex(const char *str) const;
 
 public:
@@ -116,12 +117,17 @@ public:
 
     /** Open a file contained in the archive. Throws an exception if the
         file doesn't exist.
+     * @note Thread safe.
     */
     Files::IStreamPtr getFile(const char *file);
 
+    /** Open a file contained in the archive.
+     * @note Thread safe.
+    */
     Files::IStreamPtr getFile(const FileStruct* file);
 
     /// Get a list of all files
+    /// @note Thread safe.
     const FileList &getList() const
     { return files; }
 };

From 84f01b7527c5359ba441e0b3efc1f15c469f0d0c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 16:27:28 +0100
Subject: [PATCH 219/765] Remove unneeded forward declaration

---
 components/sceneutil/workqueue.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index 06489dfbbc..bc2e55647c 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -37,7 +37,6 @@ namespace SceneUtil
         OpenThreads::Condition mCondition;
     };
 
-    class WorkQueue;
     class WorkThread;
 
     /// @brief A work queue that users can push work items onto, to be completed by one or more background threads.

From effe022bb2a2e5d15cc03324facd11a145d639dd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 20:52:32 +0100
Subject: [PATCH 220/765] Move preload model list to MWClass, preload NPC
 head/hair

---
 apps/openmw/mwclass/creature.cpp      | 23 +++++++++
 apps/openmw/mwclass/creature.hpp      |  3 ++
 apps/openmw/mwclass/npc.cpp           | 68 +++++++++++++++++++++++++++
 apps/openmw/mwclass/npc.hpp           |  3 ++
 apps/openmw/mwworld/cellpreloader.cpp | 46 +-----------------
 apps/openmw/mwworld/class.cpp         |  7 +++
 apps/openmw/mwworld/class.hpp         |  3 ++
 7 files changed, 108 insertions(+), 45 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index e9502d86b8..6e9cfccb96 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -182,6 +182,29 @@ namespace MWClass
         return "";
     }
 
+    void Creature::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    {
+        std::string model = getModel(ptr);
+        if (!model.empty())
+            models.push_back(model);
+
+        // FIXME: use const version of InventoryStore functions once they are available
+        if (ptr.getClass().hasInventoryStore(ptr))
+        {
+            MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+            {
+                MWWorld::ContainerStoreIterator equipped = invStore.getSlot(slot);
+                if (equipped != invStore.end())
+                {
+                    model = equipped->getClass().getModel(*equipped);
+                    if (!model.empty())
+                        models.push_back(model);
+                }
+            }
+        }
+    }
+
     std::string Creature::getName (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index cb89a53d62..bea56887a0 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -101,6 +101,9 @@ namespace MWClass
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
 
+            virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+
             virtual bool
             isActor() const {
                 return true;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 57a6d088ab..14bd0640ca 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -429,6 +429,74 @@ namespace MWClass
         return model;
     }
 
+    void Npc::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    {
+        const MWWorld::LiveCellRef<ESM::NPC> *npc = ptr.get<ESM::NPC>();
+        const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().search(npc->mBase->mRace);
+        if(race && race->mData.mFlags & ESM::Race::Beast)
+            models.push_back("meshes\\base_animkna.nif");
+
+        // keep these always loaded just in case
+        models.push_back("meshes/xargonian_swimkna.nif");
+        models.push_back("meshes/xbase_anim_female.nif");
+        models.push_back("meshes/xbase_anim.nif");
+
+        if (!npc->mBase->mModel.empty())
+            models.push_back("meshes/"+npc->mBase->mModel);
+
+        if (!npc->mBase->mHead.empty())
+        {
+            const ESM::BodyPart* head = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHead);
+            if (head)
+                models.push_back("meshes/"+head->mModel);
+        }
+        if (!npc->mBase->mHair.empty())
+        {
+            const ESM::BodyPart* hair = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(npc->mBase->mHair);
+            if (hair)
+                models.push_back("meshes/"+hair->mModel);
+        }
+
+        // FIXME: use const version of InventoryStore functions once they are available
+        if (ptr.getClass().hasInventoryStore(ptr))
+        {
+            MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
+            for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+            {
+                MWWorld::ContainerStoreIterator equipped = invStore.getSlot(slot);
+                if (equipped != invStore.end())
+                {
+                    std::vector<ESM::PartReference> parts;
+                    if(equipped->getTypeName() == typeid(ESM::Clothing).name())
+                    {
+                        const ESM::Clothing *clothes = equipped->get<ESM::Clothing>()->mBase;
+                        parts = clothes->mParts.mParts;
+                    }
+                    else if(equipped->getTypeName() == typeid(ESM::Armor).name())
+                    {
+                        const ESM::Armor *armor = equipped->get<ESM::Armor>()->mBase;
+                        parts = armor->mParts.mParts;
+                    }
+                    else
+                    {
+                        std::string model = equipped->getClass().getModel(*equipped);
+                        if (!model.empty())
+                            models.push_back(model);
+                    }
+
+                    for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
+                    {
+                        const std::string& partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mFemale : it->mMale;
+                        const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
+                        if (part && !part->mModel.empty())
+                            models.push_back("meshes/"+part->mModel);
+                    }
+                }
+            }
+        }
+
+    }
+
     std::string Npc::getName (const MWWorld::ConstPtr& ptr) const
     {
         if(ptr.getRefData().getCustomData() && ptr.getRefData().getCustomData()->asNpcCustomData().mNpcStats.isWerewolf())
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 5df34380a5..95edbd4089 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -75,6 +75,9 @@ namespace MWClass
 
             virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const;
 
+            virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+
             virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const;
             ///< Generate action for activation
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 4780582c52..1a8ee27094 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -31,51 +31,7 @@ namespace MWWorld
 
         virtual bool operator()(const MWWorld::Ptr& ptr)
         {
-            std::string model = ptr.getClass().getModel(ptr);
-            if (!model.empty())
-                mOut.push_back(model);
-
-            // TODO: preload NPC body parts (mHead / mHair)
-
-            // FIXME: use const version of InventoryStore functions once they are available
-            if (ptr.getClass().hasInventoryStore(ptr))
-            {
-                MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
-                for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
-                {
-                    MWWorld::ContainerStoreIterator equipped = invStore.getSlot(slot);
-                    if (equipped != invStore.end())
-                    {
-                        std::vector<ESM::PartReference> parts;
-                        if(equipped->getTypeName() == typeid(ESM::Clothing).name())
-                        {
-                            const ESM::Clothing *clothes = equipped->get<ESM::Clothing>()->mBase;
-                            parts = clothes->mParts.mParts;
-                        }
-                        else if(equipped->getTypeName() == typeid(ESM::Armor).name())
-                        {
-                            const ESM::Armor *armor = equipped->get<ESM::Armor>()->mBase;
-                            parts = armor->mParts.mParts;
-                        }
-                        else
-                        {
-                            model = equipped->getClass().getModel(*equipped);
-                            if (!model.empty())
-                                mOut.push_back(model);
-                        }
-
-                        for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
-                        {
-                            const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(it->mMale);
-                            if (part && !part->mModel.empty())
-                                mOut.push_back("meshes/"+part->mModel);
-                            part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(it->mFemale);
-                            if (part && !part->mModel.empty())
-                                mOut.push_back("meshes/"+part->mModel);
-                        }
-                    }
-                }
-            }
+            ptr.getClass().getModelsToPreload(ptr, mOut);
 
             return true;
         }
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 7f2d759b95..ecfe7cb7c4 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -291,6 +291,13 @@ namespace MWWorld
         return "";
     }
 
+    void Class::getModelsToPreload(const Ptr &ptr, std::vector<std::string> &models) const
+    {
+        std::string model = getModel(ptr);
+        if (!model.empty())
+            models.push_back(model);
+    }
+
     std::string Class::applyEnchantment(const MWWorld::ConstPtr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const
     {
         throw std::runtime_error ("class can't be enchanted");
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 85cd9ff7c5..0bb3edbeef 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -262,6 +262,9 @@ namespace MWWorld
 
             virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
 
+            virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+
             virtual std::string applyEnchantment(const MWWorld::ConstPtr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;
             ///< Creates a new record using \a ptr as template, with the given name and the given enchantment applied to it.
 

From 84dcf59c50b21604c18ffc62078ea0f5d8499bd5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 22:57:34 +0100
Subject: [PATCH 221/765] Fix preloading of equipment parts that don't separate
 gender

---
 apps/openmw/mwclass/npc.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 14bd0640ca..5f7f913290 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -486,7 +486,9 @@ namespace MWClass
 
                     for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
                     {
-                        const std::string& partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mFemale : it->mMale;
+                        std::string partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mFemale : it->mMale;
+                        if (partname.empty())
+                            partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mMale : it->mFemale;
                         const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
                         if (part && !part->mModel.empty())
                             models.push_back("meshes/"+part->mModel);

From 1b8e82e92978c53c4e7d13427975cb49ca72fe19 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 00:26:22 +0100
Subject: [PATCH 222/765] Preload NPC body parts

---
 apps/openmw/mwclass/npc.cpp           |  20 ++-
 apps/openmw/mwrender/npcanimation.cpp | 220 +++++++++++++-------------
 apps/openmw/mwrender/npcanimation.hpp |   5 +
 3 files changed, 136 insertions(+), 109 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 5f7f913290..3519f9d83e 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -37,6 +37,7 @@
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
+#include "../mwrender/npcanimation.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
@@ -457,7 +458,10 @@ namespace MWClass
                 models.push_back("meshes/"+hair->mModel);
         }
 
+        bool female = (npc->mBase->mFlags & ESM::NPC::Female);
+
         // FIXME: use const version of InventoryStore functions once they are available
+        // preload equipped items
         if (ptr.getClass().hasInventoryStore(ptr))
         {
             MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
@@ -486,9 +490,9 @@ namespace MWClass
 
                     for (std::vector<ESM::PartReference>::const_iterator it = parts.begin(); it != parts.end(); ++it)
                     {
-                        std::string partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mFemale : it->mMale;
+                        std::string partname = female ? it->mFemale : it->mMale;
                         if (partname.empty())
-                            partname = (npc->mBase->mFlags & ESM::NPC::Female) ? it->mMale : it->mFemale;
+                            partname = female ? it->mMale : it->mFemale;
                         const ESM::BodyPart* part = MWBase::Environment::get().getWorld()->getStore().get<ESM::BodyPart>().search(partname);
                         if (part && !part->mModel.empty())
                             models.push_back("meshes/"+part->mModel);
@@ -497,6 +501,18 @@ namespace MWClass
             }
         }
 
+        // preload body parts
+        if (race)
+        {
+            const std::vector<const ESM::BodyPart*>& parts = MWRender::NpcAnimation::getBodyParts(Misc::StringUtils::lowerCase(race->mId), female, false, false);
+            for (std::vector<const ESM::BodyPart*>::const_iterator it = parts.begin(); it != parts.end(); ++it)
+            {
+                const ESM::BodyPart* part = *it;
+                if (part && !part->mModel.empty())
+                    models.push_back("meshes/"+part->mModel);
+            }
+        }
+
     }
 
     std::string Npc::getName (const MWWorld::ConstPtr& ptr) const
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index c8d7c79c5d..026b3a2cf7 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -619,116 +619,10 @@ void NpcAnimation::updateParts()
     showWeapons(mShowWeapons);
     showCarriedLeft(mShowCarriedLeft);
 
-    // Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
-    static std::map< std::pair<std::string,int>,std::vector<const ESM::BodyPart*> > sRaceMapping;
-
     bool isWerewolf = (mNpcType == Type_Werewolf);
-    int flags = (isWerewolf ? -1 : 0);
-    if(!mNpc->isMale())
-    {
-        static const int Flag_Female      = 1<<0;
-        flags |= Flag_Female;
-    }
-    if(mViewMode == VM_FirstPerson)
-    {
-        static const int Flag_FirstPerson = 1<<1;
-        flags |= Flag_FirstPerson;
-    }
-
     std::string race = (isWerewolf ? "werewolf" : Misc::StringUtils::lowerCase(mNpc->mRace));
-    std::pair<std::string, int> thisCombination = std::make_pair(race, flags);
-    if (sRaceMapping.find(thisCombination) == sRaceMapping.end())
-    {
-        typedef std::multimap<ESM::BodyPart::MeshPart,ESM::PartReferenceType> BodyPartMapType;
-        static BodyPartMapType sBodyPartMap;
-        if(sBodyPartMap.empty())
-        {
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Neck, ESM::PRT_Neck));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Groin, ESM::PRT_Groin));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_RHand));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_LHand));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_RFoot));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_LFoot));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_RKnee));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_LKnee));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg));
-            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Tail, ESM::PRT_Tail));
-        }
 
-        std::vector<const ESM::BodyPart*> &parts = sRaceMapping[thisCombination];
-        parts.resize(ESM::PRT_Count, NULL);
-
-        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
-        const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
-        for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it)
-        {
-            if(isWerewolf)
-                break;
-            const ESM::BodyPart& bodypart = *it;
-            if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
-                continue;
-            if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
-                continue;
-
-            if (!Misc::StringUtils::ciEqual(bodypart.mRace, mNpc->mRace))
-                continue;
-
-            bool firstPerson = (bodypart.mId.size() >= 3)
-                    && bodypart.mId[bodypart.mId.size()-3] == '1'
-                    && bodypart.mId[bodypart.mId.size()-2] == 's'
-                    && bodypart.mId[bodypart.mId.size()-1] == 't';
-            if(firstPerson != (mViewMode == VM_FirstPerson))
-            {
-                if(mViewMode == VM_FirstPerson && (bodypart.mData.mPart == ESM::BodyPart::MP_Hand ||
-                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Wrist ||
-                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Forearm ||
-                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Upperarm))
-                {
-                    /* Allow 3rd person skins as a fallback for the arms if 1st person is missing. */
-                    BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-                    while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
-                    {
-                        if(!parts[bIt->second])
-                            parts[bIt->second] = &*it;
-                        ++bIt;
-                    }
-                }
-                continue;
-            }
-
-            if ((!mNpc->isMale()) != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
-            {
-                // Allow opposite gender's parts as fallback if parts for our gender are missing
-                BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-                while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
-                {
-                    if(!parts[bIt->second])
-                        parts[bIt->second] = &*it;
-                    ++bIt;
-                }
-                continue;
-            }
-
-            BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
-            while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
-            {
-                parts[bIt->second] = &*it;
-                ++bIt;
-            }
-        }
-    }
-
-    const std::vector<const ESM::BodyPart*> &parts = sRaceMapping[thisCombination];
+    const std::vector<const ESM::BodyPart*> &parts = getBodyParts(race, !mNpc->isMale(), mViewMode == VM_FirstPerson, isWerewolf);
     for(int part = ESM::PRT_Neck; part < ESM::PRT_Count; ++part)
     {
         if(mPartPriorities[part] < 1)
@@ -1116,6 +1010,118 @@ void NpcAnimation::updatePtr(const MWWorld::Ptr &updated)
     mHeadAnimationTime->updatePtr(updated);
 }
 
+// Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
+typedef std::map< std::pair<std::string,int>,std::vector<const ESM::BodyPart*> > RaceMapping;
+static RaceMapping sRaceMapping;
+
+const std::vector<const ESM::BodyPart *>& NpcAnimation::getBodyParts(const std::string &race, bool female, bool firstPerson, bool werewolf)
+{
+    static const int Flag_FirstPerson = 1<<1;
+    static const int Flag_Female      = 1<<0;
+
+    int flags = (werewolf ? -1 : 0);
+    if(female)
+        flags |= Flag_Female;
+    if(firstPerson)
+        flags |= Flag_FirstPerson;
+
+    RaceMapping::iterator found = sRaceMapping.find(std::make_pair(race, flags));
+    if (found != sRaceMapping.end())
+        return found->second;
+    else
+    {
+        std::vector<const ESM::BodyPart*>& parts = sRaceMapping[std::make_pair(race, flags)];
+
+        typedef std::multimap<ESM::BodyPart::MeshPart,ESM::PartReferenceType> BodyPartMapType;
+        static BodyPartMapType sBodyPartMap;
+        if(sBodyPartMap.empty())
+        {
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Neck, ESM::PRT_Neck));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Chest, ESM::PRT_Cuirass));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Groin, ESM::PRT_Groin));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_RHand));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Hand, ESM::PRT_LHand));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_RWrist));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Wrist, ESM::PRT_LWrist));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_RForearm));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Forearm, ESM::PRT_LForearm));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_RUpperarm));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperarm, ESM::PRT_LUpperarm));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_RFoot));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Foot, ESM::PRT_LFoot));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_RAnkle));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Ankle, ESM::PRT_LAnkle));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_RKnee));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Knee, ESM::PRT_LKnee));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_RLeg));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Upperleg, ESM::PRT_LLeg));
+            sBodyPartMap.insert(std::make_pair(ESM::BodyPart::MP_Tail, ESM::PRT_Tail));
+        }
+
+        parts.resize(ESM::PRT_Count, NULL);
+
+        const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
+        for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it)
+        {
+            if(werewolf)
+                break;
+            const ESM::BodyPart& bodypart = *it;
+            if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
+                continue;
+            if (bodypart.mData.mType != ESM::BodyPart::MT_Skin)
+                continue;
+
+            if (!Misc::StringUtils::ciEqual(bodypart.mRace, race))
+                continue;
+
+            bool partFirstPerson = (bodypart.mId.size() >= 3)
+                    && bodypart.mId[bodypart.mId.size()-3] == '1'
+                    && bodypart.mId[bodypart.mId.size()-2] == 's'
+                    && bodypart.mId[bodypart.mId.size()-1] == 't';
+            if(partFirstPerson != (firstPerson))
+            {
+                if(firstPerson && (bodypart.mData.mPart == ESM::BodyPart::MP_Hand ||
+                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Wrist ||
+                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Forearm ||
+                                                   bodypart.mData.mPart == ESM::BodyPart::MP_Upperarm))
+                {
+                    /* Allow 3rd person skins as a fallback for the arms if 1st person is missing. */
+                    BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+                    while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                    {
+                        if(!parts[bIt->second])
+                            parts[bIt->second] = &*it;
+                        ++bIt;
+                    }
+                }
+                continue;
+            }
+
+            if ((female) != (bodypart.mData.mFlags & ESM::BodyPart::BPF_Female))
+            {
+                // Allow opposite gender's parts as fallback if parts for our gender are missing
+                BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+                while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+                {
+                    if(!parts[bIt->second])
+                        parts[bIt->second] = &*it;
+                    ++bIt;
+                }
+                continue;
+            }
+
+            BodyPartMapType::const_iterator bIt = sBodyPartMap.lower_bound(BodyPartMapType::key_type(bodypart.mData.mPart));
+            while(bIt != sBodyPartMap.end() && bIt->first == bodypart.mData.mPart)
+            {
+                parts[bIt->second] = &*it;
+                ++bIt;
+            }
+        }
+        return parts;
+    }
+}
+
 void NpcAnimation::setAccurateAiming(bool enabled)
 {
     mAccurateAiming = enabled;
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index c5fc62f9cc..baf9c8c246 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -10,6 +10,7 @@
 namespace ESM
 {
     struct NPC;
+    struct BodyPart;
 }
 
 namespace MWRender
@@ -150,6 +151,10 @@ public:
     void setFirstPersonOffset(const osg::Vec3f& offset);
 
     virtual void updatePtr(const MWWorld::Ptr& updated);
+
+    /// Get a list of body parts that may be used by an NPC of given race and gender.
+    /// @note This is a fixed size list, one list item for each ESM::PartReferenceType, may contain NULL body parts.
+    static const std::vector<const ESM::BodyPart*>& getBodyParts(const std::string& raceId, bool female, bool firstperson, bool werewolf);
 };
 
 }

From d16450bff2b934bc9f8053b510b1501348dc99ca Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 00:28:27 +0100
Subject: [PATCH 223/765] Fix correctActorModelPath in preloader not being used

---
 apps/openmw/mwworld/cellpreloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 1a8ee27094..06216221b0 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -86,8 +86,8 @@ namespace MWWorld
 
                     //std::cout << "preloading " << mesh << std::endl;
 
-                    mPreloadedNodes.push_back(mSceneManager->getTemplate(*it));
-                    mPreloadedShapes.push_back(mBulletShapeManager->getShape(*it));
+                    mPreloadedNodes.push_back(mSceneManager->getTemplate(mesh));
+                    mPreloadedShapes.push_back(mBulletShapeManager->getShape(mesh));
 
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)

From f9082502f8a91132fe45ab9d3f632f865aa2a29d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 01:02:40 +0100
Subject: [PATCH 224/765] Move construction of WorkQueue to RenderingManager

---
 apps/openmw/mwrender/renderingmanager.cpp | 7 +++++++
 apps/openmw/mwrender/renderingmanager.hpp | 9 +++++++++
 apps/openmw/mwworld/cellpreloader.cpp     | 1 -
 apps/openmw/mwworld/scene.cpp             | 1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 07b477c436..6ba30f32c8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -26,6 +26,7 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/workqueue.hpp>
 
 #include <components/terrain/terraingrid.hpp>
 
@@ -131,6 +132,7 @@ namespace MWRender
         : mViewer(viewer)
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
+        , mWorkQueue(new SceneUtil::WorkQueue)
         , mFogDepth(0.f)
         , mUnderwaterColor(fallback->getFallbackColour("Water_UnderwaterColor"))
         , mUnderwaterWeight(fallback->getFallbackFloat("Water_UnderwaterColorWeight"))
@@ -231,6 +233,11 @@ namespace MWRender
         return mResourceSystem;
     }
 
+    SceneUtil::WorkQueue *RenderingManager::getWorkQueue()
+    {
+        return mWorkQueue.get();
+    }
+
     void RenderingManager::clearCache()
     {
         if (mTerrain.get())
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index bc5db562c3..8bc3a0a74d 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -42,6 +42,11 @@ namespace Fallback
     class Map;
 }
 
+namespace SceneUtil
+{
+    class WorkQueue;
+}
+
 namespace MWRender
 {
 
@@ -65,6 +70,8 @@ namespace MWRender
 
         Resource::ResourceSystem* getResourceSystem();
 
+        SceneUtil::WorkQueue* getWorkQueue();
+
         void clearCache();
 
         double getReferenceTime() const;
@@ -190,6 +197,8 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mLightRoot;
         Resource::ResourceSystem* mResourceSystem;
 
+        osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+
         osg::ref_ptr<osg::Light> mSunLight;
 
         std::auto_ptr<Pathgrid> mPathgrid;
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 06216221b0..2591e8c894 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -156,7 +156,6 @@ namespace MWWorld
         , mBulletShapeManager(bulletShapeManager)
         , mExpiryDelay(0.0)
     {
-        mWorkQueue = new SceneUtil::WorkQueue;
     }
 
     void CellPreloader::preload(CellStore *cell, double timestamp)
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 321c1c622e..2856c77e8e 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -459,6 +459,7 @@ namespace MWWorld
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
+        mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
         float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
         rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);

From 1cda2bf796fdb27e40accfa11fcc44d9c609e9df Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 01:17:02 +0100
Subject: [PATCH 225/765] Preload sky & water from the main menu

---
 apps/openmw/engine.cpp                    |  2 ++
 apps/openmw/mwbase/world.hpp              |  2 ++
 apps/openmw/mwrender/renderingmanager.cpp | 34 +++++++++++++++++++
 apps/openmw/mwrender/renderingmanager.hpp |  2 ++
 apps/openmw/mwrender/sky.cpp              | 40 +++++++++++++++++++++++
 apps/openmw/mwrender/sky.hpp              |  2 ++
 apps/openmw/mwrender/water.cpp            | 12 +++++++
 apps/openmw/mwrender/water.hpp            |  3 ++
 apps/openmw/mwworld/worldimp.cpp          |  5 +++
 apps/openmw/mwworld/worldimp.hpp          |  2 ++
 10 files changed, 104 insertions(+)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d30d0961aa..b3a58d18e5 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -651,6 +651,8 @@ void OMW::Engine::go()
     }
     else if (!mSkipMenu)
     {
+        mEnvironment.getWorld()->preloadCommonAssets();
+
         // start in main menu
         mEnvironment.getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         try
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 119ce6b217..946a9a5ddb 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -95,6 +95,8 @@ namespace MWBase
 
             virtual ~World() {}
 
+            virtual void preloadCommonAssets() = 0;
+
             virtual void startNewGame (bool bypass) = 0;
             ///< \param bypass Bypass regular game start.
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6ba30f32c8..8c23a07071 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -127,6 +127,29 @@ namespace MWRender
         bool mWireframe;
     };
 
+    class PreloadCommonAssetsWorkItem : public SceneUtil::WorkItem
+    {
+    public:
+        PreloadCommonAssetsWorkItem(Resource::ResourceSystem* resourceSystem)
+            : mResourceSystem(resourceSystem)
+        {
+        }
+
+        virtual void doWork()
+        {
+            for (std::vector<std::string>::const_iterator it = mModels.begin(); it != mModels.end(); ++it)
+                mResourceSystem->getSceneManager()->getTemplate(*it);
+            for (std::vector<std::string>::const_iterator it = mTextures.begin(); it != mTextures.end(); ++it)
+                mResourceSystem->getImageManager()->getImage(*it);
+        }
+
+        std::vector<std::string> mModels;
+        std::vector<std::string> mTextures;
+
+    private:
+        Resource::ResourceSystem* mResourceSystem;
+    };
+
     RenderingManager::RenderingManager(osgViewer::Viewer* viewer, osg::ref_ptr<osg::Group> rootNode, Resource::ResourceSystem* resourceSystem,
                                        const Fallback::Map* fallback, const std::string& resourcePath)
         : mViewer(viewer)
@@ -238,6 +261,17 @@ namespace MWRender
         return mWorkQueue.get();
     }
 
+    void RenderingManager::preloadCommonAssets()
+    {
+        osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem (new PreloadCommonAssetsWorkItem(mResourceSystem));
+        mSky->listAssetsToPreload(workItem->mModels, workItem->mTextures);
+        mWater->listAssetsToPreload(workItem->mTextures);
+
+        workItem->mTextures.push_back("textures/_land_default.dds");
+
+        mWorkQueue->addWorkItem(workItem);
+    }
+
     void RenderingManager::clearCache()
     {
         if (mTerrain.get())
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 8bc3a0a74d..72f322d2c5 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -72,6 +72,8 @@ namespace MWRender
 
         SceneUtil::WorkQueue* getWorkQueue();
 
+        void preloadCommonAssets();
+
         void clearCache();
 
         double getReferenceTime() const;
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 0d3bf1a666..dafb2bb4b4 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1694,6 +1694,46 @@ void SkyManager::setWaterHeight(float height)
     mUnderwaterSwitch->setWaterLevel(height);
 }
 
+void SkyManager::listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures)
+{
+    models.push_back("meshes/sky_atmosphere.nif");
+    if (mSceneManager->getVFS()->exists("meshes/sky_night_02.nif"))
+        models.push_back("meshes/sky_night_02.nif");
+    models.push_back("meshes/sky_night_01.nif");
+    models.push_back("meshes/sky_clouds_01.nif");
+
+    models.push_back("meshes\\ashcloud.nif");
+    models.push_back("meshes\\blightcloud.nif");
+    models.push_back("meshes\\snow.nif");
+    models.push_back("meshes\\blizzard.nif");
+
+    textures.push_back("textures/tx_mooncircle_full_s.dds");
+    textures.push_back("textures/tx_mooncircle_full_m.dds");
+
+    textures.push_back("textures/tx_masser_new.dds");
+    textures.push_back("textures/tx_masser_one_wax.dds");
+    textures.push_back("textures/tx_masser_half_wax.dds");
+    textures.push_back("textures/tx_masser_three_wax.dds");
+    textures.push_back("textures/tx_masser_one_wan.dds");
+    textures.push_back("textures/tx_masser_half_wan.dds");
+    textures.push_back("textures/tx_masser_three_wan.dds");
+    textures.push_back("textures/tx_masser_full.dds");
+
+    textures.push_back("textures/tx_secunda_new.dds");
+    textures.push_back("textures/tx_secunda_one_wax.dds");
+    textures.push_back("textures/tx_secunda_half_wax.dds");
+    textures.push_back("textures/tx_secunda_three_wax.dds");
+    textures.push_back("textures/tx_secunda_one_wan.dds");
+    textures.push_back("textures/tx_secunda_half_wan.dds");
+    textures.push_back("textures/tx_secunda_three_wan.dds");
+    textures.push_back("textures/tx_secunda_full.dds");
+
+    textures.push_back("textures/tx_sun_05.dds");
+    textures.push_back("textures/tx_sun_flash_grey_05.dds");
+
+    textures.push_back("textures/tx_raindrop_01.dds");
+}
+
 void SkyManager::setWaterEnabled(bool enabled)
 {
     mUnderwaterSwitch->setEnabled(enabled);
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 0caadaa073..741911b238 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -153,6 +153,8 @@ namespace MWRender
         /// Set height of water plane (used to remove underwater weather particles)
         void setWaterHeight(float height);
 
+        void listAssetsToPreload(std::vector<std::string>& models, std::vector<std::string>& textures);
+
     private:
         void create();
         ///< no need to call this, automatically done on first enable()
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 0e4f1a974b..a8d601f114 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -649,6 +649,18 @@ Water::~Water()
     }
 }
 
+void Water::listAssetsToPreload(std::vector<std::string> &textures)
+{
+    int frameCount = mFallback->getFallbackInt("Water_SurfaceFrameCount");
+    std::string texture = mFallback->getFallbackString("Water_SurfaceTexture");
+    for (int i=0; i<frameCount; ++i)
+    {
+        std::ostringstream texname;
+        texname << "textures/water/" << texture << std::setw(2) << std::setfill('0') << i << ".dds";
+        textures.push_back(texname.str());
+    }
+}
+
 void Water::setEnabled(bool enabled)
 {
     mEnabled = enabled;
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index b02ee392c5..e03728d5f7 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_MWRENDER_WATER_H
 
 #include <memory>
+#include <vector>
 
 #include <osg/ref_ptr>
 #include <osg/Vec3f>
@@ -85,6 +86,8 @@ namespace MWRender
               const std::string& resourcePath);
         ~Water();
 
+        void listAssetsToPreload(std::vector<std::string>& textures);
+
         void setEnabled(bool enabled);
 
         bool toggle();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 9064dc94cd..137dac42e8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3216,4 +3216,9 @@ namespace MWWorld
         return mPhysics->getHitDistance(weaponPos, target);
     }
 
+    void World::preloadCommonAssets()
+    {
+        mRendering->preloadCommonAssets();
+    }
+
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 8c56443f79..cf9321da52 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -183,6 +183,8 @@ namespace MWWorld
             virtual void startNewGame (bool bypass);
             ///< \param bypass Bypass regular game start.
 
+            virtual void preloadCommonAssets();
+
             virtual void clear();
 
             virtual int countSavedGameRecords() const;

From 10a3e270a3d32aaa9f34e575f544dfd2f3e4e922 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 01:51:23 +0100
Subject: [PATCH 226/765] Preload fast travel destinations

---
 apps/openmw/mwworld/scene.cpp | 87 +++++++++++++++++++++++++++++++----
 apps/openmw/mwworld/scene.hpp |  3 ++
 2 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 2856c77e8e..130644d7f0 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -633,6 +633,7 @@ namespace MWWorld
     {
         preloadTeleportDoorDestinations();
         preloadExteriorGrid();
+        preloadFastTravelDestinations();
     }
 
     void Scene::preloadTeleportDoorDestinations()
@@ -664,19 +665,12 @@ namespace MWWorld
                 try
                 {
                     if (!door.getCellRef().getDestCell().empty())
-                        mPreloader->preload(MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell()), mRendering.getReferenceTime());
+                        preloadCell(MWBase::Environment::get().getWorld()->getInterior(door.getCellRef().getDestCell()));
                     else
                     {
                         int x,y;
                         MWBase::Environment::get().getWorld()->positionToIndex (door.getCellRef().getDoorDest().pos[0], door.getCellRef().getDoorDest().pos[1], x, y);
-
-                        for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
-                        {
-                            for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
-                            {
-                                mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
-                            }
-                        }
+                        preloadCell(MWBase::Environment::get().getWorld()->getExterior(x,y), true);
                     }
                 }
                 catch (std::exception& e)
@@ -717,7 +711,80 @@ namespace MWWorld
                 float loadDist = 8192/2 + 8192 - mCellLoadingThreshold + mPreloadDistance;
 
                 if (dist < loadDist)
-                    mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(cellX+dx, cellY+dy), mRendering.getReferenceTime());
+                    preloadCell(MWBase::Environment::get().getWorld()->getExterior(cellX+dx, cellY+dy));
+            }
+        }
+    }
+
+    void Scene::preloadCell(CellStore *cell, bool preloadSurrounding)
+    {
+        if (preloadSurrounding && cell->isExterior())
+        {
+            int x = cell->getCell()->getGridX();
+            int y = cell->getCell()->getGridY();
+            for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
+            {
+                for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
+                {
+                    mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                }
+            }
+        }
+        else
+            mPreloader->preload(cell, mRendering.getReferenceTime());
+    }
+
+    struct ListFastTravelDestinationsVisitor
+    {
+        ListFastTravelDestinationsVisitor(float preloadDist, const osg::Vec3f& playerPos)
+            : mPreloadDist(preloadDist)
+            , mPlayerPos(playerPos)
+        {
+        }
+
+        bool operator()(const MWWorld::Ptr& ptr)
+        {
+            if ((ptr.getRefData().getPosition().asVec3() - mPlayerPos).length2() > mPreloadDist * mPreloadDist)
+                return true;
+
+            if (ptr.getClass().isNpc())
+            {
+                const std::vector<ESM::Transport::Dest>& transport = ptr.get<ESM::NPC>()->mBase->mTransport.mList;
+                mList.insert(mList.begin(), transport.begin(), transport.end());
+            }
+            else
+            {
+                const std::vector<ESM::Transport::Dest>& transport = ptr.get<ESM::Creature>()->mBase->mTransport.mList;
+                mList.insert(mList.begin(), transport.begin(), transport.end());
+            }
+            return true;
+        }
+        float mPreloadDist;
+        osg::Vec3f mPlayerPos;
+        std::vector<ESM::Transport::Dest> mList;
+    };
+
+    void Scene::preloadFastTravelDestinations()
+    {
+        const MWWorld::ConstPtr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        ListFastTravelDestinationsVisitor listVisitor(mPreloadDistance, player.getRefData().getPosition().asVec3());
+
+        for (CellStoreCollection::const_iterator iter (mActiveCells.begin()); iter!=mActiveCells.end(); ++iter)
+        {
+            MWWorld::CellStore* cellStore = *iter;
+            cellStore->forEachType<ESM::NPC>(listVisitor);
+            cellStore->forEachType<ESM::Creature>(listVisitor);
+        }
+
+        for (std::vector<ESM::Transport::Dest>::const_iterator it = listVisitor.mList.begin(); it != listVisitor.mList.end(); ++it)
+        {
+            if (!it->mCellName.empty())
+                preloadCell(MWBase::Environment::get().getWorld()->getInterior(it->mCellName));
+            else
+            {
+                int x,y;
+                MWBase::Environment::get().getWorld()->positionToIndex( it->mPos.pos[0], it->mPos.pos[1], x, y);
+                preloadCell(MWBase::Environment::get().getWorld()->getExterior(x,y), true);
             }
         }
     }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 34e137e45a..f473f7a3c9 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -74,6 +74,9 @@ namespace MWWorld
             void preloadCells();
             void preloadTeleportDoorDestinations();
             void preloadExteriorGrid();
+            void preloadFastTravelDestinations();
+
+            void preloadCell(MWWorld::CellStore* cell, bool preloadSurrounding=false);
 
         public:
 

From 6806741d9b9d1e5e613d667771c018baf4165af2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 01:58:07 +0100
Subject: [PATCH 227/765] Add settings for disabling the individual preloading
 types

---
 apps/openmw/mwworld/scene.cpp | 12 +++++++++---
 apps/openmw/mwworld/scene.hpp |  4 ++++
 files/settings-default.cfg    | 11 ++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 130644d7f0..3658bff35d 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -457,6 +457,9 @@ namespace MWWorld
     , mCellLoadingThreshold(1024.f)
     , mPreloadDistance(Settings::Manager::getInt("preload distance", "Cells"))
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
+    , mPreloadExteriorGrid(Settings::Manager::getBool("preload exterior grid", "Cells"))
+    , mPreloadDoors(Settings::Manager::getBool("preload doors", "Cells"))
+    , mPreloadFastTravel(Settings::Manager::getBool("preload fast travel", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
@@ -631,9 +634,12 @@ namespace MWWorld
 
     void Scene::preloadCells()
     {
-        preloadTeleportDoorDestinations();
-        preloadExteriorGrid();
-        preloadFastTravelDestinations();
+        if (mPreloadDoors)
+            preloadTeleportDoorDestinations();
+        if (mPreloadExteriorGrid)
+            preloadExteriorGrid();
+        if (mPreloadFastTravel)
+            preloadFastTravelDestinations();
     }
 
     void Scene::preloadTeleportDoorDestinations()
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index f473f7a3c9..5c429f7c70 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -64,6 +64,10 @@ namespace MWWorld
             float mPreloadDistance;
             bool mPreloadEnabled;
 
+            bool mPreloadExteriorGrid;
+            bool mPreloadDoors;
+            bool mPreloadFastTravel;
+
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4df20e7096..4a9a5dd65e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -37,9 +37,18 @@ first person field of view = 55.0
 # dramatically affect performance, see documentation for details.
 exterior cell load distance = 1
 
-# Preload cells in a background thread
+# Preload cells in a background thread. All settings starting with 'preload' have no effect unless this is enabled.
 preload enabled = true
 
+# Preload adjacent cells when moving close to an exterior cell border.
+preload exterior grid = true
+
+# Preload possible fast travel destinations.
+preload fast travel = true
+
+# Preload the locations that doors lead to.
+preload doors = true
+
 # Preloading distance threshold
 preload distance = 1000
 

From f6f9eff9a68e5ef7297ef97323c5096aab4f490e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 03:06:00 +0100
Subject: [PATCH 228/765] Preload levelled creatures

---
 apps/openmw/mwclass/creaturelevlist.cpp | 17 +++++++++++++++++
 apps/openmw/mwclass/creaturelevlist.hpp |  3 +++
 apps/openmw/mwworld/scene.cpp           |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index db2ba45bc7..e2f29ea72e 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -6,6 +6,7 @@
 #include "../mwmechanics/levelledlist.hpp"
 
 #include "../mwworld/customdata.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 namespace MWClass
 {
@@ -53,6 +54,22 @@ namespace MWClass
         registerClass (typeid (ESM::CreatureLevList).name(), instance);
     }
 
+    void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
+    {
+        const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
+
+        for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it != ref->mBase->mList.end(); ++it)
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            if (it->mLevel > player.getClass().getCreatureStats(player).getLevel())
+                continue;
+
+            const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+            MWWorld::ManualRef ref(store, it->mId);
+            ref.getPtr().getClass().getModelsToPreload(ref.getPtr(), models);
+        }
+    }
+
     void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string& model, MWRender::RenderingInterface &renderingInterface) const
     {
         ensureCustomData(ptr);
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index 67a7858d87..25b5cbddfb 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -17,6 +17,9 @@ namespace MWClass
 
             static void registerSelf();
 
+            virtual void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const;
+            ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
+
             virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const;
             ///< Add reference into a cell for rendering
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3658bff35d..4c843133d6 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -197,7 +197,7 @@ namespace MWWorld
         if (mPreloadEnabled)
         {
             mPreloadTimer += duration;
-            if (mPreloadTimer > 0.5f)
+            if (mPreloadTimer > 0.25f)
             {
                 preloadCells();
                 mPreloadTimer = 0.f;

From d11c2864df515afe083628c781b7058f14fe1375 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 15:30:53 +0100
Subject: [PATCH 229/765] Introduce UnrefQueue to handle the deleting of no
 longer needed objects in the background thread

---
 apps/openmw/mwrender/objects.cpp          | 12 +++++-
 apps/openmw/mwrender/objects.hpp          | 13 +++++--
 apps/openmw/mwrender/renderingmanager.cpp |  8 +++-
 apps/openmw/mwrender/renderingmanager.hpp |  2 +
 components/CMakeLists.txt                 |  2 +-
 components/sceneutil/unrefqueue.cpp       | 46 +++++++++++++++++++++++
 components/sceneutil/unrefqueue.hpp       | 37 ++++++++++++++++++
 components/terrain/terraingrid.cpp        | 21 ++++++-----
 components/terrain/terraingrid.hpp        |  9 ++---
 9 files changed, 128 insertions(+), 22 deletions(-)
 create mode 100644 components/sceneutil/unrefqueue.cpp
 create mode 100644 components/sceneutil/unrefqueue.hpp

diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index f58ebb9174..516d10b959 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -14,6 +14,7 @@
 
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
@@ -85,9 +86,10 @@ namespace
 namespace MWRender
 {
 
-Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode)
+Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode, SceneUtil::UnrefQueue* unrefQueue)
     : mRootNode(rootNode)
     , mResourceSystem(resourceSystem)
+    , mUnrefQueue(unrefQueue)
 {
 }
 
@@ -186,7 +188,11 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
         delete iter->second;
         mObjects.erase(iter);
 
+        if (mUnrefQueue.get())
+            mUnrefQueue->push(ptr.getRefData().getBaseNode());
+
         ptr.getRefData().getBaseNode()->getParent(0)->removeChild(ptr.getRefData().getBaseNode());
+
         ptr.getRefData().setBaseNode(NULL);
         return true;
     }
@@ -200,6 +206,8 @@ void Objects::removeCell(const MWWorld::CellStore* store)
     {
         if(iter->first.getCell() == store)
         {
+            if (mUnrefQueue.get())
+                mUnrefQueue->push(iter->second->getObjectRoot());
             delete iter->second;
             mObjects.erase(iter++);
         }
@@ -211,6 +219,8 @@ void Objects::removeCell(const MWWorld::CellStore* store)
     if(cell != mCellSceneNodes.end())
     {
         cell->second->getParent(0)->removeChild(cell->second);
+        if (mUnrefQueue.get())
+            mUnrefQueue->push(cell->second);
         mCellSceneNodes.erase(cell);
     }
 }
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 3d0c92cb43..5b91abea4d 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -30,6 +30,11 @@ namespace MWWorld
     class CellStore;
 }
 
+namespace SceneUtil
+{
+    class UnrefQueue;
+}
+
 namespace MWRender{
 
 class Animation;
@@ -65,12 +70,14 @@ class Objects{
 
     osg::ref_ptr<osg::Group> mRootNode;
 
-    void insertBegin(const MWWorld::Ptr& ptr);
-
     Resource::ResourceSystem* mResourceSystem;
 
+    osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+
+    void insertBegin(const MWWorld::Ptr& ptr);
+
 public:
-    Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode);
+    Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> rootNode, SceneUtil::UnrefQueue* unrefQueue);
     ~Objects();
 
     /// @param animated Attempt to load separate keyframes from a .kf file matching the model file?
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 8c23a07071..5a9cd59fc3 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -27,6 +27,7 @@
 #include <components/sceneutil/statesetupdater.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/workqueue.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include <components/terrain/terraingrid.hpp>
 
@@ -156,6 +157,7 @@ namespace MWRender
         , mRootNode(rootNode)
         , mResourceSystem(resourceSystem)
         , mWorkQueue(new SceneUtil::WorkQueue)
+        , mUnrefQueue(new SceneUtil::UnrefQueue)
         , mFogDepth(0.f)
         , mUnderwaterColor(fallback->getFallbackColour("Water_UnderwaterColor"))
         , mUnderwaterWeight(fallback->getFallbackFloat("Water_UnderwaterColorWeight"))
@@ -176,7 +178,7 @@ namespace MWRender
 
         mPathgrid.reset(new Pathgrid(mRootNode));
 
-        mObjects.reset(new Objects(mResourceSystem, lightRoot));
+        mObjects.reset(new Objects(mResourceSystem, lightRoot, mUnrefQueue.get()));
 
         mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
 
@@ -187,7 +189,7 @@ namespace MWRender
         mWater.reset(new Water(mRootNode, lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
         mTerrain.reset(new Terrain::TerrainGrid(lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain));
+                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 
@@ -437,6 +439,8 @@ namespace MWRender
 
     void RenderingManager::update(float dt, bool paused)
     {
+        mUnrefQueue->flush(mWorkQueue.get());
+
         if (!paused)
         {
             mEffectManager->update(dt);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 72f322d2c5..3d6a4ac3a2 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -45,6 +45,7 @@ namespace Fallback
 namespace SceneUtil
 {
     class WorkQueue;
+    class UnrefQueue;
 }
 
 namespace MWRender
@@ -200,6 +201,7 @@ namespace MWRender
         Resource::ResourceSystem* mResourceSystem;
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
 
         osg::ref_ptr<osg::Light> mSunLight;
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 26e8f7b6a3..81e6defe46 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -46,7 +46,7 @@ add_component_dir (resource
 
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
-    lightmanager lightutil positionattitudetransform workqueue
+    lightmanager lightutil positionattitudetransform workqueue unrefqueue
     )
 
 add_component_dir (nif
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
new file mode 100644
index 0000000000..23b1359e58
--- /dev/null
+++ b/components/sceneutil/unrefqueue.cpp
@@ -0,0 +1,46 @@
+#include "unrefqueue.hpp"
+
+#include <osg/Object>
+//#include <osg/Timer>
+//#include <iostream>
+
+#include <components/sceneutil/workqueue.hpp>
+
+namespace SceneUtil
+{
+
+    class UnrefWorkItem : public SceneUtil::WorkItem
+    {
+    public:
+        std::vector<osg::ref_ptr<osg::Object> > mObjects;
+
+        virtual void doWork()
+        {
+            //osg::Timer timer;
+            //size_t objcount = mObjects.size();
+            mObjects.clear();
+            //std::cout << "cleared " << objcount << " objects in " << timer.time_m() << std::endl;
+        }
+    };
+
+    UnrefQueue::UnrefQueue()
+    {
+        mWorkItem = new UnrefWorkItem;
+    }
+
+    void UnrefQueue::push(osg::Object *obj)
+    {
+        mWorkItem->mObjects.push_back(obj);
+    }
+
+    void UnrefQueue::flush(SceneUtil::WorkQueue *workQueue)
+    {
+        if (mWorkItem->mObjects.empty())
+            return;
+
+        workQueue->addWorkItem(mWorkItem);
+
+        mWorkItem = new UnrefWorkItem;
+    }
+
+}
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
new file mode 100644
index 0000000000..d0bec061c4
--- /dev/null
+++ b/components/sceneutil/unrefqueue.hpp
@@ -0,0 +1,37 @@
+#ifndef OPENMW_COMPONENTS_UNREFQUEUE_H
+#define OPENMW_COMPONENTS_UNREFQUEUE_H
+
+#include <osg/ref_ptr>
+#include <osg/Referenced>
+
+namespace osg
+{
+    class Object;
+}
+
+namespace SceneUtil
+{
+    class WorkQueue;
+    class UnrefWorkItem;
+
+    /// @brief Handles unreferencing of objects through the WorkQueue. Typical use scenario
+    /// would be the main thread pushing objects that are no longer needed, and the background thread deleting them.
+    class UnrefQueue : public osg::Referenced
+    {
+    public:
+        UnrefQueue();
+
+        /// Adds an object to the list of objects to be unreferenced. Call from the main thread.
+        void push(osg::Object* obj);
+
+        /// Adds a WorkItem to the given WorkQueue that will clear the list of objects in a worker thread, thus unreferencing them.
+        /// Call from the main thread.
+        void flush(SceneUtil::WorkQueue* workQueue);
+
+    private:
+        osg::ref_ptr<UnrefWorkItem> mWorkItem;
+    };
+
+}
+
+#endif
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 4f7a0772b7..4b67371e08 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -8,6 +8,7 @@
 
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include <components/esm/loadland.hpp>
 
@@ -46,11 +47,10 @@ namespace
 namespace Terrain
 {
 
-TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
-                         Storage* storage, int nodeMask)
+TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue)
     : Terrain::World(parent, resourceSystem, ico, storage, nodeMask)
     , mNumSplits(4)
-    , mKdTreeBuilder(new osg::KdTreeBuilder)
+    , mUnrefQueue(unrefQueue)
 {
     mCache = BufferCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1);
 }
@@ -212,13 +212,6 @@ void TerrainGrid::loadCell(int x, int y)
     element->mNode = terrainNode;
     mTerrainRoot->addChild(element->mNode);
 
-    // kdtree probably not needed with mNumSplits=4
-    /*
-    // build a kdtree to speed up intersection tests with the terrain
-    // Note, the build could be optimized using a custom kdtree builder, since we know that the terrain can be represented by a quadtree
-    geode->accept(*mKdTreeBuilder);
-    */
-
     mGrid[std::make_pair(x,y)] = element.release();
 }
 
@@ -230,6 +223,10 @@ void TerrainGrid::unloadCell(int x, int y)
 
     GridElement* element = it->second;
     mTerrainRoot->removeChild(element->mNode);
+
+    if (mUnrefQueue.get())
+        mUnrefQueue->push(element->mNode);
+
     delete element;
 
     mGrid.erase(it);
@@ -240,7 +237,11 @@ void TerrainGrid::clearCache()
     for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
     {
         if (it->second->referenceCount() <= 1)
+        {
+            if (mUnrefQueue.get())
+                mUnrefQueue->push(it->second);
             mTextureCache.erase(it++);
+        }
         else
             ++it;
     }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 81bfc4211e..5708e70685 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -6,9 +6,9 @@
 #include "world.hpp"
 #include "material.hpp"
 
-namespace osg
+namespace SceneUtil
 {
-    class KdTreeBuilder;
+    class UnrefQueue;
 }
 
 namespace Terrain
@@ -20,8 +20,7 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
-              Storage* storage, int nodeMask);
+        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue = NULL);
         ~TerrainGrid();
 
         virtual void loadCell(int x, int y);
@@ -42,7 +41,7 @@ namespace Terrain
         typedef std::map<std::pair<int, int>, GridElement*> Grid;
         Grid mGrid;
 
-        osg::ref_ptr<osg::KdTreeBuilder> mKdTreeBuilder;
+        osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
     };
 
 }

From 40a6e05e178b28ddbdf8c909f7aab2dce7fa9af0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 16:09:55 +0100
Subject: [PATCH 230/765] Use a deque instead of vector in UnrefQueue

---
 components/sceneutil/unrefqueue.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index 23b1359e58..0b65c4a326 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -1,5 +1,7 @@
 #include "unrefqueue.hpp"
 
+#include <deque>
+
 #include <osg/Object>
 //#include <osg/Timer>
 //#include <iostream>
@@ -12,7 +14,7 @@ namespace SceneUtil
     class UnrefWorkItem : public SceneUtil::WorkItem
     {
     public:
-        std::vector<osg::ref_ptr<osg::Object> > mObjects;
+        std::deque<osg::ref_ptr<osg::Object> > mObjects;
 
         virtual void doWork()
         {

From ae031b23d42d7174f5c1187d79e1e47040d1e9df Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 16:10:42 +0100
Subject: [PATCH 231/765] Do not detach NPC parts in destructor

---
 apps/openmw/mwrender/animation.cpp    | 7 ++++++-
 apps/openmw/mwrender/animation.hpp    | 3 +++
 apps/openmw/mwrender/npcanimation.cpp | 7 +++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index b7c0c0a365..3d4fd11d05 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1409,8 +1409,13 @@ namespace MWRender
 
     PartHolder::~PartHolder()
     {
-        if (mNode->getNumParents())
+        if (mNode.get() && mNode->getNumParents())
             mNode->getParent(0)->removeChild(mNode);
     }
 
+    void PartHolder::unlink()
+    {
+        mNode = NULL;
+    }
+
 }
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 992462e1f1..feaf0e16c3 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -55,6 +55,9 @@ public:
 
     ~PartHolder();
 
+    /// Unreferences mNode *without* detaching it from the graph. Only use if you know what you are doing.
+    void unlink();
+
     osg::ref_ptr<osg::Node> getNode()
     {
         return mNode;
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 026b3a2cf7..10c0032d40 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -273,6 +273,13 @@ NpcAnimation::~NpcAnimation()
             // all from within this destructor. ouch!
            && mPtr.getRefData().getCustomData() && mPtr.getClass().getInventoryStore(mPtr).getListener() == this)
         mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr);
+
+    // do not detach (delete) parts yet, this is done so the background thread can handle the deletion
+    for(size_t i = 0;i < ESM::PRT_Count;i++)
+    {
+        if (mObjectParts[i].get())
+            mObjectParts[i]->unlink();
+    }
 }
 
 NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem,

From 8ece1885cdc2662ceaefcd4542abdf9970880483 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 16:18:19 +0100
Subject: [PATCH 232/765] Animation: don't create the NodeMap if we don't need
 it

---
 apps/openmw/mwrender/animation.cpp | 61 +++++++++++++++++-------------
 apps/openmw/mwrender/animation.hpp |  5 ++-
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 3d4fd11d05..5aea13660f 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -95,7 +95,12 @@ namespace
     class NodeMapVisitor : public osg::NodeVisitor
     {
     public:
-        NodeMapVisitor() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {}
+        typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
+
+        NodeMapVisitor(NodeMap& map)
+            : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
+            , mMap(map)
+        {}
 
         void apply(osg::MatrixTransform& trans)
         {
@@ -103,15 +108,8 @@ namespace
             traverse(trans);
         }
 
-        typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
-
-        const NodeMap& getNodeMap() const
-        {
-            return mMap;
-        }
-
     private:
-        NodeMap mMap;
+        NodeMap& mMap;
     };
 
     NifOsg::TextKeyMap::const_iterator findGroupStart(const NifOsg::TextKeyMap &keys, const std::string &groupname)
@@ -312,6 +310,7 @@ namespace MWRender
     Animation::Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
         : mInsert(parentNode)
         , mSkeleton(NULL)
+        , mNodeMapCreated(false)
         , mPtr(ptr)
         , mResourceSystem(resourceSystem)
         , mAccumulate(1.f, 1.f, 0.f)
@@ -407,12 +406,14 @@ namespace MWRender
         if (!animsrc->mKeyframes || animsrc->mKeyframes->mTextKeys.empty() || animsrc->mKeyframes->mKeyframeControllers.empty())
             return;
 
+        const NodeMap& nodeMap = getNodeMap();
+
         for (NifOsg::KeyframeHolder::KeyframeControllerMap::const_iterator it = animsrc->mKeyframes->mKeyframeControllers.begin();
              it != animsrc->mKeyframes->mKeyframeControllers.end(); ++it)
         {
             std::string bonename = Misc::StringUtils::lowerCase(it->first);
-            NodeMap::const_iterator found = mNodeMap.find(bonename);
-            if (found == mNodeMap.end())
+            NodeMap::const_iterator found = nodeMap.find(bonename);
+            if (found == nodeMap.end())
             {
                 std::cerr << "addAnimSource: can't find bone '" + bonename << "' in " << model << " (referenced by " << kfname << ")" << std::endl;
                 continue;
@@ -436,11 +437,11 @@ namespace MWRender
 
         if (!mAccumRoot)
         {
-            NodeMap::const_iterator found = mNodeMap.find("root bone");
-            if (found == mNodeMap.end())
-                found = mNodeMap.find("bip01");
+            NodeMap::const_iterator found = nodeMap.find("root bone");
+            if (found == nodeMap.end())
+                found = nodeMap.find("bip01");
 
-            if (found != mNodeMap.end())
+            if (found != nodeMap.end())
                 mAccumRoot = found->second;
         }
     }
@@ -690,6 +691,17 @@ namespace MWRender
         mTextKeyListener = listener;
     }
 
+    const Animation::NodeMap &Animation::getNodeMap() const
+    {
+        if (!mNodeMapCreated && mObjectRoot)
+        {
+            NodeMapVisitor visitor(mNodeMap);
+            mObjectRoot->accept(visitor);
+            mNodeMapCreated = true;
+        }
+        return mNodeMap;
+    }
+
     void Animation::resetActiveGroups()
     {
         // remove all previous external controllers from the scene graph
@@ -729,7 +741,7 @@ namespace MWRender
 
                 for (AnimSource::ControllerMap::iterator it = animsrc->mControllerMap[blendMask].begin(); it != animsrc->mControllerMap[blendMask].end(); ++it)
                 {
-                    osg::ref_ptr<osg::Node> node = mNodeMap.at(it->first); // this should not throw, we already checked for the node existing in addAnimSource
+                    osg::ref_ptr<osg::Node> node = getNodeMap().at(it->first); // this should not throw, we already checked for the node existing in addAnimSource
 
                     node->addUpdateCallback(it->second);
                     mActiveControllers.insert(std::make_pair(node, it->second));
@@ -978,6 +990,7 @@ namespace MWRender
         mSkeleton = NULL;
 
         mNodeMap.clear();
+        mNodeMapCreated = false;
         mActiveControllers.clear();
         mAccumRoot = NULL;
         mAccumCtrl = NULL;
@@ -1025,10 +1038,6 @@ namespace MWRender
             removeTriBipVisitor.remove();
         }
 
-        NodeMapVisitor visitor;
-        mObjectRoot->accept(visitor);
-        mNodeMap = visitor.getNodeMap();
-
         mObjectRoot->addCullCallback(new SceneUtil::LightListCallback);
     }
 
@@ -1121,8 +1130,8 @@ namespace MWRender
             parentNode = mInsert;
         else
         {
-            NodeMap::iterator found = mNodeMap.find(Misc::StringUtils::lowerCase(bonename));
-            if (found == mNodeMap.end())
+            NodeMap::const_iterator found = getNodeMap().find(Misc::StringUtils::lowerCase(bonename));
+            if (found == getNodeMap().end())
                 throw std::runtime_error("Can't find bone " + bonename);
 
             parentNode = found->second;
@@ -1222,8 +1231,8 @@ namespace MWRender
     const osg::Node* Animation::getNode(const std::string &name) const
     {
         std::string lowerName = Misc::StringUtils::lowerCase(name);
-        NodeMap::const_iterator found = mNodeMap.find(lowerName);
-        if (found == mNodeMap.end())
+        NodeMap::const_iterator found = getNodeMap().find(lowerName);
+        if (found == getNodeMap().end())
             return NULL;
         else
             return found->second;
@@ -1317,8 +1326,8 @@ namespace MWRender
 
         if (mPtr.getClass().isBipedal(mPtr))
         {
-            NodeMap::iterator found = mNodeMap.find("bip01 head");
-            if (found != mNodeMap.end() && dynamic_cast<osg::MatrixTransform*>(found->second.get()))
+            NodeMap::const_iterator found = getNodeMap().find("bip01 head");
+            if (found != getNodeMap().end() && dynamic_cast<osg::MatrixTransform*>(found->second.get()))
             {
                 osg::Node* node = found->second;
                 mHeadController = new RotateController(mObjectRoot.get());
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index feaf0e16c3..1d7930566a 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -232,7 +232,8 @@ protected:
 
     // Stored in all lowercase for a case-insensitive lookup
     typedef std::map<std::string, osg::ref_ptr<osg::MatrixTransform> > NodeMap;
-    NodeMap mNodeMap;
+    mutable NodeMap mNodeMap;
+    mutable bool mNodeMapCreated;
 
     MWWorld::Ptr mPtr;
 
@@ -263,6 +264,8 @@ protected:
 
     float mAlpha;
 
+    const NodeMap& getNodeMap() const;
+
     /* Sets the appropriate animations on the bone groups based on priority.
      */
     void resetActiveGroups();

From ce3cce24a56df230616f13622deb59464b4b36d4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 16:20:17 +0100
Subject: [PATCH 233/765] Remove unneeded dynamic_cast

---
 apps/openmw/mwrender/animation.cpp    | 4 ++--
 apps/openmw/mwrender/npcanimation.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 5aea13660f..c86878e3d7 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1327,9 +1327,9 @@ namespace MWRender
         if (mPtr.getClass().isBipedal(mPtr))
         {
             NodeMap::const_iterator found = getNodeMap().find("bip01 head");
-            if (found != getNodeMap().end() && dynamic_cast<osg::MatrixTransform*>(found->second.get()))
+            if (found != getNodeMap().end())
             {
-                osg::Node* node = found->second;
+                osg::MatrixTransform* node = found->second;
                 mHeadController = new RotateController(mObjectRoot.get());
                 node->addUpdateCallback(mHeadController);
                 mActiveControllers.insert(std::make_pair(node, mHeadController));
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 10c0032d40..709653cd8e 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -847,9 +847,9 @@ void NpcAnimation::addControllers()
     if (mViewMode == VM_FirstPerson)
     {
         NodeMap::iterator found = mNodeMap.find("bip01 neck");
-        if (found != mNodeMap.end() && dynamic_cast<osg::MatrixTransform*>(found->second.get()))
+        if (found != mNodeMap.end())
         {
-            osg::Node* node = found->second;
+            osg::MatrixTransform* node = found->second.get();
             mFirstPersonNeckController = new NeckController(mObjectRoot.get());
             node->addUpdateCallback(mFirstPersonNeckController);
             mActiveControllers.insert(std::make_pair(node, mFirstPersonNeckController));

From 2e62298bd33534a64e7eff91c94ea1aac5f806ae Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 18:11:07 +0100
Subject: [PATCH 234/765] Clean up ObjectCache includes

---
 components/resource/niffilemanager.cpp |  2 ++
 components/resource/objectcache.cpp    |  2 ++
 components/resource/objectcache.hpp    | 13 +++++++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
index ecb63db600..82768cc2c5 100644
--- a/components/resource/niffilemanager.cpp
+++ b/components/resource/niffilemanager.cpp
@@ -1,5 +1,7 @@
 #include "niffilemanager.hpp"
 
+#include <osg/Object>
+
 #include <components/vfs/manager.hpp>
 
 #include "objectcache.hpp"
diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index 17368f34f5..a0a3cf3a52 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -13,6 +13,8 @@
 
 #include "objectcache.hpp"
 
+#include <osg/Object>
+
 namespace Resource
 {
 
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index b933933f3f..79ebabd5b8 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -17,13 +17,18 @@
 #ifndef OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 #define OPENMW_COMPONENTS_RESOURCE_OBJECTCACHE
 
-#include <osg/Node>
-
-#include <osgDB/ReaderWriter>
-#include <osgDB/DatabaseRevisions>
+#include <osg/Referenced>
+#include <osg/ref_ptr>
 
+#include <string>
 #include <map>
 
+namespace osg
+{
+    class Object;
+    class State;
+}
+
 namespace Resource {
 
 class ObjectCache : public osg::Referenced

From e28dc3e72fea00ebde993cdb5cc3ea01e84d1b7c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 18:33:02 +0100
Subject: [PATCH 235/765] Preload instances in SceneManager

---
 apps/opencs/view/render/object.cpp         |  2 +-
 apps/openmw/mwrender/animation.cpp         |  6 +-
 apps/openmw/mwrender/creatureanimation.cpp |  2 +-
 apps/openmw/mwrender/effectmanager.cpp     |  2 +-
 apps/openmw/mwrender/npcanimation.cpp      |  2 +-
 apps/openmw/mwrender/sky.cpp               | 12 ++--
 apps/openmw/mwrender/weaponanimation.cpp   |  2 +-
 apps/openmw/mwworld/cellpreloader.cpp      |  9 ++-
 apps/openmw/mwworld/cellpreloader.hpp      |  2 +
 apps/openmw/mwworld/projectilemanager.cpp  |  2 +-
 apps/openmw/mwworld/scene.cpp              |  2 +
 components/CMakeLists.txt                  |  2 +-
 components/resource/multiobjectcache.cpp   | 79 ++++++++++++++++++++++
 components/resource/multiobjectcache.hpp   | 47 +++++++++++++
 components/resource/scenemanager.cpp       | 39 +++++++++--
 components/resource/scenemanager.hpp       | 24 +++++--
 16 files changed, 207 insertions(+), 27 deletions(-)
 create mode 100644 components/resource/multiobjectcache.cpp
 create mode 100644 components/resource/multiobjectcache.hpp

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index b980b658a4..33939625d4 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -100,7 +100,7 @@ void CSVRender::Object::update()
         {
             std::string path = "meshes\\" + model;
 
-            mResourceSystem->getSceneManager()->createInstance(path, mBaseNode);
+            mResourceSystem->getSceneManager()->getInstance(path, mBaseNode);
         }
         catch (std::exception& e)
         {
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index c86878e3d7..398fe53225 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -997,7 +997,7 @@ namespace MWRender
 
         if (!forceskeleton)
         {
-            osg::ref_ptr<osg::Node> created = mResourceSystem->getSceneManager()->createInstance(model, mInsert);
+            osg::ref_ptr<osg::Node> created = mResourceSystem->getSceneManager()->getInstance(model, mInsert);
             mObjectRoot = created->asGroup();
             if (!mObjectRoot)
             {
@@ -1009,7 +1009,7 @@ namespace MWRender
         }
         else
         {
-            osg::ref_ptr<osg::Node> created = mResourceSystem->getSceneManager()->createInstance(model);
+            osg::ref_ptr<osg::Node> created = mResourceSystem->getSceneManager()->getInstance(model);
             osg::ref_ptr<SceneUtil::Skeleton> skel = dynamic_cast<SceneUtil::Skeleton*>(created.get());
             if (!skel)
             {
@@ -1136,7 +1136,7 @@ namespace MWRender
 
             parentNode = found->second;
         }
-        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->createInstance(model, parentNode);
+        osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model, parentNode);
 
         node->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 7c447182f2..9cd35ecde6 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -105,7 +105,7 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     else
         bonename = "Shield Bone";
 
-    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->createInstance(item.getClass().getModel(item));
+    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename);
     mResourceSystem->getSceneManager()->notifyAttached(attached);
 
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index c4e457a1fd..e2773f2dc8 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -27,7 +27,7 @@ EffectManager::~EffectManager()
 
 void EffectManager::addEffect(const std::string &model, const std::string& textureOverride, const osg::Vec3f &worldPosition, float scale)
 {
-    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->createInstance(model);
+    osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);
 
     node->setNodeMask(Mask_Effect);
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 709653cd8e..eee23aa312 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -647,7 +647,7 @@ void NpcAnimation::updateParts()
 
 PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const std::string& bonename, const std::string& bonefilter, bool enchantedGlow, osg::Vec4f* glowColor)
 {
-    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->createInstance(model);
+    osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename);
     mResourceSystem->getSceneManager()->notifyAttached(attached);
     if (enchantedGlow)
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index dafb2bb4b4..40283ba275 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1146,7 +1146,7 @@ void SkyManager::create()
 {
     assert(!mCreated);
 
-    mAtmosphereDay = mSceneManager->createInstance("meshes/sky_atmosphere.nif", mEarlyRenderBinRoot);
+    mAtmosphereDay = mSceneManager->getInstance("meshes/sky_atmosphere.nif", mEarlyRenderBinRoot);
     ModVertexAlphaVisitor modAtmosphere(0);
     mAtmosphereDay->accept(modAtmosphere);
 
@@ -1159,9 +1159,9 @@ void SkyManager::create()
 
     osg::ref_ptr<osg::Node> atmosphereNight;
     if (mSceneManager->getVFS()->exists("meshes/sky_night_02.nif"))
-        atmosphereNight = mSceneManager->createInstance("meshes/sky_night_02.nif", mAtmosphereNightNode);
+        atmosphereNight = mSceneManager->getInstance("meshes/sky_night_02.nif", mAtmosphereNightNode);
     else
-        atmosphereNight = mSceneManager->createInstance("meshes/sky_night_01.nif", mAtmosphereNightNode);
+        atmosphereNight = mSceneManager->getInstance("meshes/sky_night_01.nif", mAtmosphereNightNode);
     atmosphereNight->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
     ModVertexAlphaVisitor modStars(2);
     atmosphereNight->accept(modStars);
@@ -1176,14 +1176,14 @@ void SkyManager::create()
 
     mCloudNode = new osg::PositionAttitudeTransform;
     mEarlyRenderBinRoot->addChild(mCloudNode);
-    mCloudMesh = mSceneManager->createInstance("meshes/sky_clouds_01.nif", mCloudNode);
+    mCloudMesh = mSceneManager->getInstance("meshes/sky_clouds_01.nif", mCloudNode);
     ModVertexAlphaVisitor modClouds(1);
     mCloudMesh->accept(modClouds);
     mCloudUpdater = new CloudUpdater;
     mCloudUpdater->setOpacity(1.f);
     mCloudMesh->addUpdateCallback(mCloudUpdater);
 
-    mCloudMesh2 = mSceneManager->createInstance("meshes/sky_clouds_01.nif", mCloudNode);
+    mCloudMesh2 = mSceneManager->getInstance("meshes/sky_clouds_01.nif", mCloudNode);
     mCloudMesh2->accept(modClouds);
     mCloudUpdater2 = new CloudUpdater;
     mCloudUpdater2->setOpacity(0.f);
@@ -1537,7 +1537,7 @@ void SkyManager::setWeather(const WeatherResult& weather)
                 mParticleNode->setNodeMask(Mask_WeatherParticles);
                 mRootNode->addChild(mParticleNode);
             }
-            mParticleEffect = mSceneManager->createInstance(mCurrentParticleEffect, mParticleNode);
+            mParticleEffect = mSceneManager->getInstance(mCurrentParticleEffect, mParticleNode);
 
             SceneUtil::AssignControllerSourcesVisitor assignVisitor(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
             mParticleEffect->accept(assignVisitor);
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 4328d5a3d7..8fd294ccda 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -84,7 +84,7 @@ void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
             return;
         std::string model = ammo->getClass().getModel(*ammo);
 
-        osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->createInstance(model, parent);
+        osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->getInstance(model, parent);
 
         mAmmunition = PartHolderPtr(new PartHolder(arrow));
     }
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 2591e8c894..c6fa3b949a 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -86,7 +86,7 @@ namespace MWWorld
 
                     //std::cout << "preloading " << mesh << std::endl;
 
-                    mPreloadedNodes.push_back(mSceneManager->getTemplate(mesh));
+                    mPreloadedNodes.push_back(mSceneManager->cacheInstance(mesh));
                     mPreloadedShapes.push_back(mBulletShapeManager->getShape(mesh));
 
                     size_t slashpos = mesh.find_last_of("/\\");
@@ -104,8 +104,6 @@ namespace MWWorld
 
                         }
                     }
-
-                    // TODO: do a createInstance() and hold on to it since we can make use of it when the cell goes active
                 }
                 catch (std::exception& e)
                 {
@@ -185,6 +183,11 @@ namespace MWWorld
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
     }
 
+    void CellPreloader::notifyLoaded(CellStore *cell)
+    {
+        mPreloadCells.erase(cell);
+    }
+
     void CellPreloader::updateCache(double timestamp)
     {
         // TODO: add settings for a minimum/maximum size of the cache
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index c7495182b3..55e40dcbd1 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -24,6 +24,8 @@ namespace MWWorld
         /// @note The cell itself must be in State_Loaded or State_Preloaded.
         void preload(MWWorld::CellStore* cell, double timestamp);
 
+        void notifyLoaded(MWWorld::CellStore* cell);
+
         /// Removes preloaded cells that have not had a preload request for a while.
         void updateCache(double timestamp);
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index d1faf621c2..b8150ce9c9 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -92,7 +92,7 @@ namespace MWWorld
             attachTo = rotateNode;
         }
 
-        mResourceSystem->getSceneManager()->createInstance(model, attachTo);
+        mResourceSystem->getSceneManager()->getInstance(model, attachTo);
 
         SceneUtil::DisableFreezeOnCullVisitor disableFreezeOnCullVisitor;
         state.mNode->accept(disableFreezeOnCullVisitor);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 4c843133d6..46d75daaf5 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -296,6 +296,8 @@ namespace MWWorld
             if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
                 mRendering.configureAmbient(cell->getCell());
         }
+
+        mPreloader->notifyLoaded(cell);
     }
 
     void Scene::changeToVoid()
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 81e6defe46..0ac32f65ec 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -41,7 +41,7 @@ add_component_dir (vfs
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache resourcesystem resourcemanager
+    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager
     )
 
 add_component_dir (sceneutil
diff --git a/components/resource/multiobjectcache.cpp b/components/resource/multiobjectcache.cpp
new file mode 100644
index 0000000000..352715f19f
--- /dev/null
+++ b/components/resource/multiobjectcache.cpp
@@ -0,0 +1,79 @@
+#include "multiobjectcache.hpp"
+
+#include <vector>
+
+#include <osg/Object>
+
+namespace Resource
+{
+
+    MultiObjectCache::MultiObjectCache()
+    {
+
+    }
+
+    MultiObjectCache::~MultiObjectCache()
+    {
+
+    }
+
+    void MultiObjectCache::removeUnreferencedObjectsInCache()
+    {
+        std::vector<osg::ref_ptr<osg::Object> > objectsToRemove;
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+
+            // Remove unreferenced entries from object cache
+            ObjectCacheMap::iterator oitr = _objectCache.begin();
+            while(oitr != _objectCache.end())
+            {
+                if (oitr->second->referenceCount() <= 1)
+                {
+                    objectsToRemove.push_back(oitr->second);
+                    _objectCache.erase(oitr++);
+                }
+                else
+                {
+                    ++oitr;
+                }
+            }
+        }
+
+        // note, actual unref happens outside of the lock
+        objectsToRemove.clear();
+    }
+
+    void MultiObjectCache::addEntryToObjectCache(const std::string &filename, osg::Object *object)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+        _objectCache.insert(std::make_pair(filename, object));
+    }
+
+    osg::ref_ptr<osg::Object> MultiObjectCache::takeFromObjectCache(const std::string &fileName)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+        ObjectCacheMap::iterator found = _objectCache.find(fileName);
+        if (found == _objectCache.end())
+            return osg::ref_ptr<osg::Object>();
+        else
+        {
+            osg::ref_ptr<osg::Object> object = found->second;
+            _objectCache.erase(found);
+            return object;
+        }
+    }
+
+    void MultiObjectCache::releaseGLObjects(osg::State *state)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+
+        for(ObjectCacheMap::iterator itr = _objectCache.begin();
+            itr != _objectCache.end();
+            ++itr)
+        {
+            osg::Object* object = itr->second.get();
+            object->releaseGLObjects(state);
+        }
+    }
+
+}
diff --git a/components/resource/multiobjectcache.hpp b/components/resource/multiobjectcache.hpp
new file mode 100644
index 0000000000..b677100f08
--- /dev/null
+++ b/components/resource/multiobjectcache.hpp
@@ -0,0 +1,47 @@
+#ifndef OPENMW_COMPONENTS_MULTIOBJECTCACHE_H
+#define OPENMW_COMPONENTS_MULTIOBJECTCACHE_H
+
+#include <map>
+#include <string>
+
+#include <osg/ref_ptr>
+#include <osg/Referenced>
+
+namespace osg
+{
+    class Object;
+    class State;
+}
+
+namespace Resource
+{
+
+    /// @brief Cache for "non reusable" objects.
+    class MultiObjectCache : public osg::Referenced
+    {
+    public:
+        MultiObjectCache();
+        ~MultiObjectCache();
+
+        void removeUnreferencedObjectsInCache();
+
+        void addEntryToObjectCache(const std::string& filename, osg::Object* object);
+
+        /** Take an Object from cache. Return NULL if no object found. */
+        osg::ref_ptr<osg::Object> takeFromObjectCache(const std::string& fileName);
+
+        /** call releaseGLObjects on all objects attached to the object cache.*/
+        void releaseGLObjects(osg::State* state);
+
+    protected:
+
+        typedef std::multimap<std::string, osg::ref_ptr<osg::Object> >             ObjectCacheMap;
+
+        ObjectCacheMap                          _objectCache;
+        OpenThreads::Mutex                      _objectCacheMutex;
+
+    };
+
+}
+
+#endif
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f083e8175d..5acd5f8fb9 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -28,6 +28,7 @@
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
+#include "multiobjectcache.hpp"
 
 namespace
 {
@@ -233,6 +234,7 @@ namespace Resource
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
+        , mInstanceCache(new MultiObjectCache)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
         , mMinFilter(osg::Texture::LINEAR_MIPMAP_LINEAR)
@@ -246,7 +248,6 @@ namespace Resource
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
-
     }
 
     /// @brief Callback to read image files from the VFS.
@@ -372,7 +373,17 @@ namespace Resource
         }
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string &name)
+    osg::ref_ptr<osg::Node> SceneManager::cacheInstance(const std::string &name)
+    {
+        std::string normalized = name;
+        mVFS->normalizeFilename(normalized);
+
+        osg::ref_ptr<osg::Node> node = createInstance(normalized);
+        mInstanceCache->addEntryToObjectCache(normalized, node.get());
+        return node;
+    }
+
+    osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
     {
         osg::ref_ptr<const osg::Node> scene = getTemplate(name);
         osg::ref_ptr<osg::Node> cloned = osg::clone(scene.get(), SceneUtil::CopyOp());
@@ -383,9 +394,22 @@ namespace Resource
         return cloned;
     }
 
-    osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string &name, osg::Group* parentNode)
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name)
     {
-        osg::ref_ptr<osg::Node> cloned = createInstance(name);
+        std::string normalized = name;
+        mVFS->normalizeFilename(normalized);
+
+        osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
+        if (obj.get())
+            return static_cast<osg::Node*>(obj.get());
+
+        return createInstance(normalized);
+
+    }
+
+    osg::ref_ptr<osg::Node> SceneManager::getInstance(const std::string &name, osg::Group* parentNode)
+    {
+        osg::ref_ptr<osg::Node> cloned = getInstance(name);
         attachTo(cloned, parentNode);
         return cloned;
     }
@@ -487,4 +511,11 @@ namespace Resource
         mUnRefImageDataAfterApply = unref;
     }
 
+    void SceneManager::updateCache(double referenceTime)
+    {
+        ResourceManager::updateCache(referenceTime);
+
+        mInstanceCache->removeUnreferencedObjectsInCache();
+    }
+
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 0345fff228..8357e63cd3 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -29,6 +29,8 @@ namespace osgViewer
 namespace Resource
 {
 
+    class MultiObjectCache;
+
     /// @brief Handles loading and caching of scenes, e.g. .nif files or .osg files
     /// @note Some methods of the scene manager can be used from any thread, see the methods documentation for more details.
     class SceneManager : public ResourceManager
@@ -43,15 +45,21 @@ namespace Resource
         /// @note Thread safe.
         osg::ref_ptr<const osg::Node> getTemplate(const std::string& name);
 
-        /// Create an instance of the given scene template
+        /// Create an instance of the given scene template and cache it for later use, so that future calls to getInstance() can simply
+        /// return this cached object instead of creating a new one.
+        /// @note The returned ref_ptr may be kept around by the caller to ensure that the object stays in cache for as long as needed.
+        /// @note Thread safe.
+        osg::ref_ptr<osg::Node> cacheInstance(const std::string& name);
+
+        /// Get an instance of the given scene template
         /// @see getTemplate
         /// @note Thread safe.
-        osg::ref_ptr<osg::Node> createInstance(const std::string& name);
+        osg::ref_ptr<osg::Node> getInstance(const std::string& name);
 
-        /// Create an instance of the given scene template and immediately attach it to a parent node
+        /// Get an instance of the given scene template and immediately attach it to a parent node
         /// @see getTemplate
         /// @note Not thread safe, unless parentNode is not part of the main scene graph yet.
-        osg::ref_ptr<osg::Node> createInstance(const std::string& name, osg::Group* parentNode);
+        osg::ref_ptr<osg::Node> getInstance(const std::string& name, osg::Group* parentNode);
 
         /// Attach the given scene instance to the given parent node
         /// @note You should have the parentNode in its intended position before calling this method,
@@ -88,7 +96,15 @@ namespace Resource
         /// otherwise should be disabled to reduce memory usage.
         void setUnRefImageDataAfterApply(bool unref);
 
+        /// @see ResourceManager::updateCache
+        virtual void updateCache(double referenceTime);
+
     private:
+
+        osg::ref_ptr<osg::Node> createInstance(const std::string& name);
+
+        osg::ref_ptr<MultiObjectCache> mInstanceCache;
+
         OpenThreads::Mutex mSharedStateMutex;
 
         Resource::ImageManager* mImageManager;

From 246566cef4294062e8bc636458e4f54fffab56e4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 18:48:49 +0100
Subject: [PATCH 236/765] Preload instances in BulletShapeManager

---
 apps/openmw/mwphysics/physicssystem.cpp    |  4 +--
 apps/openmw/mwworld/cellpreloader.cpp      |  4 +--
 components/resource/bulletshapemanager.cpp | 32 +++++++++++++++++++++-
 components/resource/bulletshapemanager.hpp | 18 ++++++++++--
 4 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 6417968d3a..5d0ac1f8fc 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1088,7 +1088,7 @@ namespace MWPhysics
 
     void PhysicsSystem::addObject (const MWWorld::Ptr& ptr, const std::string& mesh, int collisionType)
     {
-        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->createInstance(mesh);
+        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance || !shapeInstance->getCollisionShape())
             return;
 
@@ -1234,7 +1234,7 @@ namespace MWPhysics
     }
 
     void PhysicsSystem::addActor (const MWWorld::Ptr& ptr, const std::string& mesh) {
-        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->createInstance(mesh);
+        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
         if (!shapeInstance)
             return;
 
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index c6fa3b949a..047c1e99b9 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -87,7 +87,7 @@ namespace MWWorld
                     //std::cout << "preloading " << mesh << std::endl;
 
                     mPreloadedNodes.push_back(mSceneManager->cacheInstance(mesh));
-                    mPreloadedShapes.push_back(mBulletShapeManager->getShape(mesh));
+                    mPreloadedShapes.push_back(mBulletShapeManager->cacheInstance(mesh));
 
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)
@@ -123,7 +123,7 @@ namespace MWWorld
 
         // keep a ref to the loaded object to make sure it stays loaded as long as this cell is in the preloaded state
         std::vector<osg::ref_ptr<const osg::Node> > mPreloadedNodes;
-        std::vector<osg::ref_ptr<const Resource::BulletShape> > mPreloadedShapes;
+        std::vector<osg::ref_ptr<const Resource::BulletShapeInstance> > mPreloadedShapes;
         std::vector<osg::ref_ptr<const NifOsg::KeyframeHolder> > mPreloadedKeyframes;
     };
 
diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index cb57d686ff..111808e6ed 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -14,7 +14,7 @@
 #include "scenemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
-
+#include "multiobjectcache.hpp"
 
 namespace Resource
 {
@@ -98,6 +98,7 @@ private:
 
 BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager)
     : ResourceManager(vfs)
+    , mInstanceCache(new MultiObjectCache)
     , mSceneManager(sceneMgr)
     , mNifFileManager(nifFileManager)
 {
@@ -151,6 +152,28 @@ osg::ref_ptr<const BulletShape> BulletShapeManager::getShape(const std::string &
     return shape;
 }
 
+osg::ref_ptr<BulletShapeInstance> BulletShapeManager::cacheInstance(const std::string &name)
+{
+    std::string normalized = name;
+    mVFS->normalizeFilename(normalized);
+
+    osg::ref_ptr<BulletShapeInstance> instance = createInstance(normalized);
+    mInstanceCache->addEntryToObjectCache(normalized, instance.get());
+    return instance;
+}
+
+osg::ref_ptr<BulletShapeInstance> BulletShapeManager::getInstance(const std::string &name)
+{
+    std::string normalized = name;
+    mVFS->normalizeFilename(normalized);
+
+    osg::ref_ptr<osg::Object> obj = mInstanceCache->takeFromObjectCache(normalized);
+    if (obj.get())
+        return static_cast<BulletShapeInstance*>(obj.get());
+    else
+        return createInstance(normalized);
+}
+
 osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::string &name)
 {
     osg::ref_ptr<const BulletShape> shape = getShape(name);
@@ -160,4 +183,11 @@ osg::ref_ptr<BulletShapeInstance> BulletShapeManager::createInstance(const std::
         return osg::ref_ptr<BulletShapeInstance>();
 }
 
+void BulletShapeManager::updateCache(double referenceTime)
+{
+    ResourceManager::updateCache(referenceTime);
+
+    mInstanceCache->removeUnreferencedObjectsInCache();
+}
+
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 4c0cb1fd29..14b26962ba 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -17,6 +17,8 @@ namespace Resource
     class BulletShape;
     class BulletShapeInstance;
 
+    class MultiObjectCache;
+
     /// Handles loading, caching and "instancing" of bullet shapes.
     /// A shape 'instance' is a clone of another shape, with the goal of setting a different scale on this instance.
     /// @note May be used from any thread.
@@ -26,12 +28,24 @@ namespace Resource
         BulletShapeManager(const VFS::Manager* vfs, SceneManager* sceneMgr, NifFileManager* nifFileManager);
         ~BulletShapeManager();
 
+        /// @note May return a null pointer if the object has no shape.
         osg::ref_ptr<const BulletShape> getShape(const std::string& name);
 
-        /// Shorthand for getShape(name)->makeInstance();
-        osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
+        /// Create an instance of the given shape and cache it for later use, so that future calls to getInstance() can simply return
+        /// the cached instance instead of having to create a new one.
+        /// @note The returned ref_ptr may be kept by the caller to ensure that the instance stays in cache for as long as needed.
+        osg::ref_ptr<BulletShapeInstance> cacheInstance(const std::string& name);
+
+        /// @note May return a null pointer if the object has no shape.
+        osg::ref_ptr<BulletShapeInstance> getInstance(const std::string& name);
+
+        /// @see ResourceManager::updateCache
+        virtual void updateCache(double referenceTime);
 
     private:
+        osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
+
+        osg::ref_ptr<MultiObjectCache> mInstanceCache;
         SceneManager* mSceneManager;
         NifFileManager* mNifFileManager;
     };

From 3552b3a82cf706c8ba63a663a8d9144d90f7505c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 18:51:17 +0100
Subject: [PATCH 237/765] Don't create a BulletShapeInstance for actors

---
 apps/openmw/mwphysics/actor.cpp         | 2 +-
 apps/openmw/mwphysics/actor.hpp         | 4 ++--
 apps/openmw/mwphysics/physicssystem.cpp | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index cc46897d13..c99754b5cd 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -16,7 +16,7 @@ namespace MWPhysics
 {
 
 
-Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shape, btCollisionWorld* world)
+Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape> shape, btCollisionWorld* world)
   : mCanWaterWalk(false), mWalkingOnWater(false)
   , mCollisionObject(0), mForce(0.f, 0.f, 0.f), mOnGround(false)
   , mInternalCollisionMode(true)
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 03193c675e..5755def740 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -15,7 +15,7 @@ class btCollisionObject;
 
 namespace Resource
 {
-    class BulletShapeInstance;
+    class BulletShape;
 }
 
 namespace MWPhysics
@@ -48,7 +48,7 @@ namespace MWPhysics
     class Actor : public PtrHolder
     {
     public:
-        Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<Resource::BulletShapeInstance> shape, btCollisionWorld* world);
+        Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape> shape, btCollisionWorld* world);
         ~Actor();
 
         /**
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 5d0ac1f8fc..48b3426b82 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1234,11 +1234,11 @@ namespace MWPhysics
     }
 
     void PhysicsSystem::addActor (const MWWorld::Ptr& ptr, const std::string& mesh) {
-        osg::ref_ptr<Resource::BulletShapeInstance> shapeInstance = mShapeManager->getInstance(mesh);
-        if (!shapeInstance)
+        osg::ref_ptr<const Resource::BulletShape> shape = mShapeManager->getShape(mesh);
+        if (!shape)
             return;
 
-        Actor* actor = new Actor(ptr, shapeInstance, mCollisionWorld);
+        Actor* actor = new Actor(ptr, shape, mCollisionWorld);
         mActors.insert(std::make_pair(ptr, actor));
     }
 

From afe533e6709496131cd5f424cab3f9b1b538fc25 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 19:00:30 +0100
Subject: [PATCH 238/765] Accept a const Object in UnrefQueue

---
 components/sceneutil/unrefqueue.cpp | 4 ++--
 components/sceneutil/unrefqueue.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index 0b65c4a326..a5eb1654e6 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -14,7 +14,7 @@ namespace SceneUtil
     class UnrefWorkItem : public SceneUtil::WorkItem
     {
     public:
-        std::deque<osg::ref_ptr<osg::Object> > mObjects;
+        std::deque<osg::ref_ptr<const osg::Object> > mObjects;
 
         virtual void doWork()
         {
@@ -30,7 +30,7 @@ namespace SceneUtil
         mWorkItem = new UnrefWorkItem;
     }
 
-    void UnrefQueue::push(osg::Object *obj)
+    void UnrefQueue::push(const osg::Object *obj)
     {
         mWorkItem->mObjects.push_back(obj);
     }
diff --git a/components/sceneutil/unrefqueue.hpp b/components/sceneutil/unrefqueue.hpp
index d0bec061c4..85b1d31e1d 100644
--- a/components/sceneutil/unrefqueue.hpp
+++ b/components/sceneutil/unrefqueue.hpp
@@ -22,7 +22,7 @@ namespace SceneUtil
         UnrefQueue();
 
         /// Adds an object to the list of objects to be unreferenced. Call from the main thread.
-        void push(osg::Object* obj);
+        void push(const osg::Object* obj);
 
         /// Adds a WorkItem to the given WorkQueue that will clear the list of objects in a worker thread, thus unreferencing them.
         /// Call from the main thread.

From 1457a0de78464a68e9b56e0ccf33189f5e0afc33 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 19:04:59 +0100
Subject: [PATCH 239/765] Use the UnrefQueue to delete BulletShapeInstances

---
 apps/openmw/mwphysics/physicssystem.cpp   | 14 ++++++++++++++
 apps/openmw/mwphysics/physicssystem.hpp   |  9 +++++++--
 apps/openmw/mwrender/renderingmanager.cpp |  5 +++++
 apps/openmw/mwrender/renderingmanager.hpp |  1 +
 apps/openmw/mwworld/scene.cpp             |  2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 48b3426b82..9f1cfc6822 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -22,6 +22,7 @@
 
 #include <components/esm/loadgmst.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include <components/nifosg/particle.hpp> // FindRecIndexVisitor
 
@@ -533,6 +534,11 @@ namespace MWPhysics
             setOrigin(btVector3(pos[0], pos[1], pos[2]));
         }
 
+        const Resource::BulletShapeInstance* getShapeInstance() const
+        {
+            return mShapeInstance.get();
+        }
+
         void setScale(float scale)
         {
             mShapeInstance->getCollisionShape()->setLocalScaling(btVector3(scale,scale,scale));
@@ -690,6 +696,11 @@ namespace MWPhysics
         delete mBroadphase;
     }
 
+    void PhysicsSystem::setUnrefQueue(SceneUtil::UnrefQueue *unrefQueue)
+    {
+        mUnrefQueue = unrefQueue;
+    }
+
     Resource::BulletShapeManager *PhysicsSystem::getShapeManager()
     {
         return mShapeManager.get();
@@ -1109,6 +1120,9 @@ namespace MWPhysics
         {
             mCollisionWorld->removeCollisionObject(found->second->getCollisionObject());
 
+            if (mUnrefQueue.get())
+                mUnrefQueue->push(found->second->getShapeInstance());
+
             mAnimatedObjects.erase(found->second);
 
             delete found->second;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index a866717c76..110b59268f 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -25,11 +25,12 @@ namespace MWRender
 namespace Resource
 {
     class BulletShapeManager;
+    class ResourceSystem;
 }
 
-namespace Resource
+namespace SceneUtil
 {
-    class ResourceSystem;
+    class UnrefQueue;
 }
 
 class btCollisionWorld;
@@ -53,6 +54,8 @@ namespace MWPhysics
             PhysicsSystem (Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
             ~PhysicsSystem ();
 
+            void setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue);
+
             Resource::BulletShapeManager* getShapeManager();
 
             void enableWater(float height);
@@ -165,6 +168,8 @@ namespace MWPhysics
 
             void updateWater();
 
+            osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+
             btBroadphaseInterface* mBroadphase;
             btDefaultCollisionConfiguration* mCollisionConfiguration;
             btCollisionDispatcher* mDispatcher;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5a9cd59fc3..be3caaeb43 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -263,6 +263,11 @@ namespace MWRender
         return mWorkQueue.get();
     }
 
+    SceneUtil::UnrefQueue *RenderingManager::getUnrefQueue()
+    {
+        return mUnrefQueue.get();
+    }
+
     void RenderingManager::preloadCommonAssets()
     {
         osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem (new PreloadCommonAssetsWorkItem(mResourceSystem));
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 3d6a4ac3a2..4c850de126 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -72,6 +72,7 @@ namespace MWRender
         Resource::ResourceSystem* getResourceSystem();
 
         SceneUtil::WorkQueue* getWorkQueue();
+        SceneUtil::UnrefQueue* getUnrefQueue();
 
         void preloadCommonAssets();
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 46d75daaf5..b0e3844934 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -466,6 +466,8 @@ namespace MWWorld
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
+        mPhysics->setUnrefQueue(rendering.getUnrefQueue());
+
         float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
         rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
         mPreloader->setExpiryDelay(cacheExpiryDelay);

From 596fe56bfdfe95dbc1a8783f65bf33c73694cd7e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 20:14:16 +0100
Subject: [PATCH 240/765] Make Land::loadData thread safe

---
 apps/opencs/model/tools/mergestages.cpp |  2 --
 apps/openmw/mwrender/terrainstorage.cpp |  3 ++
 components/esm/loadland.cpp             | 42 ++++++++++++++-----------
 components/esm/loadland.hpp             |  7 +++--
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index 52e1e69649..f52e8886f0 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -224,8 +224,6 @@ void CSMTools::MergeLandStage::perform (int stage, CSMDoc::Messages& messages)
 
         CSMWorld::Land newLand (land);
 
-        newLand.mEsm = 0; // avoid potential dangling pointer (ESMReader isn't needed anyway,
-                          // because record is already fully loaded)
         newLand.mPlugin = 0;
 
         if (land.mDataTypes & ESM::Land::DATA_VTEX)
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index ed1d8b6779..02947b5dd3 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -62,6 +62,9 @@ namespace MWRender
         const int flags = ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX;
         if (!land->isDataLoaded(flags))
             land->loadData(flags);
+
+        // TODO: unload land data when it's no longer needed
+
         return land;
     }
 
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index e7be033219..b0b072232a 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -2,6 +2,8 @@
 
 #include <utility>
 
+#include <OpenThreads/ScopedLock>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 #include "defs.hpp"
@@ -60,7 +62,6 @@ namespace ESM
         , mX(0)
         , mY(0)
         , mPlugin(0)
-        , mEsm(NULL)
         , mDataTypes(0)
         , mDataLoaded(false)
         , mLandData(NULL)
@@ -86,8 +87,7 @@ namespace ESM
     {
         isDeleted = false;
 
-        mEsm = &esm;
-        mPlugin = mEsm->getIndex();
+        mPlugin = esm.getIndex();
 
         bool hasLocation = false;
         bool isLoaded = false;
@@ -180,6 +180,8 @@ namespace ESM
 
     void Land::loadData(int flags) const
     {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+
         // Try to load only available data
         flags = flags & mDataTypes;
         // Return if all required data is loaded
@@ -191,15 +193,17 @@ namespace ESM
             mLandData = new LandData;
             mLandData->mDataTypes = mDataTypes;
         }
-        mEsm->restoreContext(mContext);
 
-        if (mEsm->isNextSub("VNML")) {
-            condLoad(flags, DATA_VNML, mLandData->mNormals, sizeof(mLandData->mNormals));
+        ESM::ESMReader reader;
+        reader.restoreContext(mContext);
+
+        if (reader.isNextSub("VNML")) {
+            condLoad(reader, flags, DATA_VNML, mLandData->mNormals, sizeof(mLandData->mNormals));
         }
 
-        if (mEsm->isNextSub("VHGT")) {
+        if (reader.isNextSub("VHGT")) {
             static VHGT vhgt;
-            if (condLoad(flags, DATA_VHGT, &vhgt, sizeof(vhgt))) {
+            if (condLoad(reader, flags, DATA_VHGT, &vhgt, sizeof(vhgt))) {
                 float rowOffset = vhgt.mHeightOffset;
                 for (int y = 0; y < LAND_SIZE; y++) {
                     rowOffset += vhgt.mHeightData[y * LAND_SIZE];
@@ -217,14 +221,14 @@ namespace ESM
             }
         }
 
-        if (mEsm->isNextSub("WNAM")) {
-            condLoad(flags, DATA_WNAM, mLandData->mWnam, 81);
+        if (reader.isNextSub("WNAM")) {
+            condLoad(reader, flags, DATA_WNAM, mLandData->mWnam, 81);
         }
-        if (mEsm->isNextSub("VCLR"))
-            condLoad(flags, DATA_VCLR, mLandData->mColours, 3 * LAND_NUM_VERTS);
-        if (mEsm->isNextSub("VTEX")) {
+        if (reader.isNextSub("VCLR"))
+            condLoad(reader, flags, DATA_VCLR, mLandData->mColours, 3 * LAND_NUM_VERTS);
+        if (reader.isNextSub("VTEX")) {
             static uint16_t vtex[LAND_NUM_TEXTURES];
-            if (condLoad(flags, DATA_VTEX, vtex, sizeof(vtex))) {
+            if (condLoad(reader, flags, DATA_VTEX, vtex, sizeof(vtex))) {
                 LandData::transposeTextureData(vtex, mLandData->mTextures);
             }
         }
@@ -240,25 +244,26 @@ namespace ESM
         }
     }
 
-    bool Land::condLoad(int flags, int dataFlag, void *ptr, unsigned int size) const
+    bool Land::condLoad(ESM::ESMReader& reader, int flags, int dataFlag, void *ptr, unsigned int size) const
     {
         if ((mDataLoaded & dataFlag) == 0 && (flags & dataFlag) != 0) {
-            mEsm->getHExact(ptr, size);
+            reader.getHExact(ptr, size);
             mDataLoaded |= dataFlag;
             return true;
         }
-        mEsm->skipHSubSize(size);
+        reader.skipHSubSize(size);
         return false;
     }
 
     bool Land::isDataLoaded(int flags) const
     {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         return (mDataLoaded & flags) == (flags & mDataTypes);
     }
 
     Land::Land (const Land& land)
     : mFlags (land.mFlags), mX (land.mX), mY (land.mY), mPlugin (land.mPlugin),
-      mEsm (land.mEsm), mContext (land.mContext), mDataTypes (land.mDataTypes),
+      mContext (land.mContext), mDataTypes (land.mDataTypes),
       mDataLoaded (land.mDataLoaded),
       mLandData (land.mLandData ? new LandData (*land.mLandData) : 0)
     {}
@@ -275,7 +280,6 @@ namespace ESM
         std::swap (mX, land.mX);
         std::swap (mY, land.mY);
         std::swap (mPlugin, land.mPlugin);
-        std::swap (mEsm, land.mEsm);
         std::swap (mContext, land.mContext);
         std::swap (mDataTypes, land.mDataTypes);
         std::swap (mDataLoaded, land.mDataLoaded);
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 65ac88cda3..8a8d6fdd2f 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+#include <OpenThreads/Mutex>
+
 #include "esmcommon.hpp"
 
 namespace ESM
@@ -31,7 +33,6 @@ struct Land
 
     // File context. This allows the ESM reader to be 'reset' to this
     // location later when we are ready to load the full data set.
-    ESMReader* mEsm;
     ESM_Context mContext;
 
     int mDataTypes;
@@ -155,7 +156,9 @@ struct Land
         /// Loads data and marks it as loaded
         /// \return true if data is actually loaded from file, false otherwise
         /// including the case when data is already loaded
-        bool condLoad(int flags, int dataFlag, void *ptr, unsigned int size) const;
+        bool condLoad(ESM::ESMReader& reader, int flags, int dataFlag, void *ptr, unsigned int size) const;
+
+        mutable OpenThreads::Mutex mMutex;
 
         mutable int mDataLoaded;
 

From 8aba74e6ee4df45cc442148e4e0b0f770b2159ef Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 20:23:53 +0100
Subject: [PATCH 241/765] Remove GridElement

---
 components/terrain/terraingrid.cpp | 20 +++++---------------
 components/terrain/terraingrid.hpp |  4 +---
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 4b67371e08..4d2f421e62 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -63,12 +63,6 @@ TerrainGrid::~TerrainGrid()
     }
 }
 
-class GridElement
-{
-public:
-    osg::ref_ptr<osg::Node> mNode;
-};
-
 osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter)
 {
     if (chunkSize * mNumSplits > 1.f)
@@ -208,11 +202,9 @@ void TerrainGrid::loadCell(int x, int y)
     if (!terrainNode)
         return; // no terrain defined
 
-    std::auto_ptr<GridElement> element (new GridElement);
-    element->mNode = terrainNode;
-    mTerrainRoot->addChild(element->mNode);
+    mTerrainRoot->addChild(terrainNode);
 
-    mGrid[std::make_pair(x,y)] = element.release();
+    mGrid[std::make_pair(x,y)] = terrainNode;
 }
 
 void TerrainGrid::unloadCell(int x, int y)
@@ -221,13 +213,11 @@ void TerrainGrid::unloadCell(int x, int y)
     if (it == mGrid.end())
         return;
 
-    GridElement* element = it->second;
-    mTerrainRoot->removeChild(element->mNode);
+    osg::Node* terrainNode = it->second;
+    mTerrainRoot->removeChild(terrainNode);
 
     if (mUnrefQueue.get())
-        mUnrefQueue->push(element->mNode);
-
-    delete element;
+        mUnrefQueue->push(terrainNode);
 
     mGrid.erase(it);
 }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 5708e70685..4e6a78abd4 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -14,8 +14,6 @@ namespace SceneUtil
 namespace Terrain
 {
 
-    class GridElement;
-
     /// @brief Simple terrain implementation that loads cells in a grid, with no LOD
     class TerrainGrid : public Terrain::World
     {
@@ -38,7 +36,7 @@ namespace Terrain
         typedef std::map<std::string, osg::ref_ptr<osg::Texture2D> >  TextureCache;
         TextureCache mTextureCache;
 
-        typedef std::map<std::pair<int, int>, GridElement*> Grid;
+        typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node> > Grid;
         Grid mGrid;
 
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;

From 98848c752a0621e3820f62b53f6c8b46aee3fcc6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 20:26:58 +0100
Subject: [PATCH 242/765] Make getLayerInfo thread safe

---
 components/esmterrain/storage.cpp | 4 ++++
 components/esmterrain/storage.hpp | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 267b831ec5..cead73070c 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -3,6 +3,8 @@
 #include <set>
 #include <iostream>
 
+#include <OpenThreads/ScopedLock>
+
 #include <osg/Image>
 #include <osg/Plane>
 
@@ -498,6 +500,8 @@ namespace ESMTerrain
 
     Terrain::LayerInfo Storage::getLayerInfo(const std::string& texture)
     {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mLayerInfoMutex);
+
         // Already have this cached?
         std::map<std::string, Terrain::LayerInfo>::iterator found = mLayerInfoMap.find(texture);
         if (found != mLayerInfoMap.end())
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 5b8ca953d4..9ca39e6f39 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -1,6 +1,8 @@
 #ifndef COMPONENTS_ESM_TERRAIN_STORAGE_H
 #define COMPONENTS_ESM_TERRAIN_STORAGE_H
 
+#include <OpenThreads/Mutex>
+
 #include <components/terrain/storage.hpp>
 
 #include <components/esm/loadland.hpp>
@@ -105,6 +107,7 @@ namespace ESMTerrain
         std::string getTextureName (UniqueTextureId id);
 
         std::map<std::string, Terrain::LayerInfo> mLayerInfoMap;
+        OpenThreads::Mutex mLayerInfoMutex;
 
         Terrain::LayerInfo getLayerInfo(const std::string& texture);
     };

From 0865cea2111a3e641a4e78a3935adc4d3b2a649b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 20:57:30 +0100
Subject: [PATCH 243/765] Preload terrain

---
 apps/openmw/mwrender/renderingmanager.cpp | 17 ++---
 apps/openmw/mwrender/renderingmanager.hpp |  3 +-
 apps/openmw/mwworld/cellpreloader.cpp     | 52 +++++++++----
 apps/openmw/mwworld/cellpreloader.hpp     |  8 +-
 apps/openmw/mwworld/scene.cpp             |  4 +-
 components/resource/resourcemanager.cpp   |  5 --
 components/resource/resourcemanager.hpp   |  3 -
 components/terrain/buffercache.cpp        |  4 +
 components/terrain/buffercache.hpp        |  4 +
 components/terrain/terraingrid.cpp        | 92 +++++++++++++++++------
 components/terrain/terraingrid.hpp        | 19 ++++-
 components/terrain/world.cpp              |  1 -
 components/terrain/world.hpp              |  6 +-
 13 files changed, 152 insertions(+), 66 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index be3caaeb43..177cee4eaa 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -258,16 +258,21 @@ namespace MWRender
         return mResourceSystem;
     }
 
-    SceneUtil::WorkQueue *RenderingManager::getWorkQueue()
+    SceneUtil::WorkQueue* RenderingManager::getWorkQueue()
     {
         return mWorkQueue.get();
     }
 
-    SceneUtil::UnrefQueue *RenderingManager::getUnrefQueue()
+    SceneUtil::UnrefQueue* RenderingManager::getUnrefQueue()
     {
         return mUnrefQueue.get();
     }
 
+    Terrain::World* RenderingManager::getTerrain()
+    {
+        return mTerrain.get();
+    }
+
     void RenderingManager::preloadCommonAssets()
     {
         osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem (new PreloadCommonAssetsWorkItem(mResourceSystem));
@@ -279,12 +284,6 @@ namespace MWRender
         mWorkQueue->addWorkItem(workItem);
     }
 
-    void RenderingManager::clearCache()
-    {
-        if (mTerrain.get())
-            mTerrain->clearCache();
-    }
-
     double RenderingManager::getReferenceTime() const
     {
         return mViewer->getFrameStamp()->getReferenceTime();
@@ -838,7 +837,7 @@ namespace MWRender
     void RenderingManager::updateTextureFiltering()
     {
         if (mTerrain.get())
-            mTerrain->clearCache();
+            mTerrain->updateCache();
 
         mResourceSystem->getSceneManager()->setFilterSettings(
             Settings::Manager::getString("texture mag filter", "General"),
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 4c850de126..4dda6f2735 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -73,11 +73,10 @@ namespace MWRender
 
         SceneUtil::WorkQueue* getWorkQueue();
         SceneUtil::UnrefQueue* getUnrefQueue();
+        Terrain::World* getTerrain();
 
         void preloadCommonAssets();
 
-        void clearCache();
-
         double getReferenceTime() const;
 
         osg::Group* getLightRoot();
diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 047c1e99b9..e72c36c68e 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -8,6 +8,7 @@
 #include <components/resource/keyframemanager.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/nifosg/nifloader.hpp>
+#include <components/terrain/world.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -44,10 +45,14 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager)
-            : mSceneManager(sceneManager)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain)
+            : mIsExterior(cell->getCell()->isExterior())
+            , mX(cell->getCell()->getGridX())
+            , mY(cell->getCell()->getGridY())
+            , mSceneManager(sceneManager)
             , mBulletShapeManager(bulletShapeManager)
             , mKeyframeManager(keyframeManager)
+            , mTerrain(terrain)
         {
             osg::Timer timer;
             ListModelsVisitor visitor (mMeshes);
@@ -86,8 +91,8 @@ namespace MWWorld
 
                     //std::cout << "preloading " << mesh << std::endl;
 
-                    mPreloadedNodes.push_back(mSceneManager->cacheInstance(mesh));
-                    mPreloadedShapes.push_back(mBulletShapeManager->cacheInstance(mesh));
+                    mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
+                    mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
 
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)
@@ -99,7 +104,7 @@ namespace MWWorld
                             if(kfname.size() > 4 && kfname.compare(kfname.size()-4, 4, ".nif") == 0)
                             {
                                 kfname.replace(kfname.size()-4, 4, ".kf");
-                                mPreloadedKeyframes.push_back(mKeyframeManager->get(kfname));
+                                mPreloadedObjects.push_back(mKeyframeManager->get(kfname));
                             }
 
                         }
@@ -111,29 +116,44 @@ namespace MWWorld
                     // error will be shown when visiting the cell
                 }
             }
-            std::cout << "preloaded " << mPreloadedNodes.size() << " nodes in " << preloadTimer.time_m() << std::endl;
+
+            if (mIsExterior)
+            {
+                try
+                {
+                    mPreloadedObjects.push_back(mTerrain->cacheCell(mX, mY));
+                }
+                catch(std::exception& e)
+                {
+                }
+            }
+
+            std::cout << "preloaded " << mPreloadedObjects.size() << " objects in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
         typedef std::vector<std::string> MeshList;
+        bool mIsExterior;
+        int mX;
+        int mY;
         MeshList mMeshes;
         Resource::SceneManager* mSceneManager;
         Resource::BulletShapeManager* mBulletShapeManager;
         Resource::KeyframeManager* mKeyframeManager;
+        Terrain::World* mTerrain;
 
-        // keep a ref to the loaded object to make sure it stays loaded as long as this cell is in the preloaded state
-        std::vector<osg::ref_ptr<const osg::Node> > mPreloadedNodes;
-        std::vector<osg::ref_ptr<const Resource::BulletShapeInstance> > mPreloadedShapes;
-        std::vector<osg::ref_ptr<const NifOsg::KeyframeHolder> > mPreloadedKeyframes;
+        // keep a ref to the loaded objects to make sure it stays loaded as long as this cell is in the preloaded state
+        std::vector<osg::ref_ptr<const osg::Object> > mPreloadedObjects;
     };
 
     /// Worker thread item: update the resource system's cache, effectively deleting unused entries.
     class UpdateCacheItem : public SceneUtil::WorkItem
     {
     public:
-        UpdateCacheItem(Resource::ResourceSystem* resourceSystem, double referenceTime)
+        UpdateCacheItem(Resource::ResourceSystem* resourceSystem, Terrain::World* terrain, double referenceTime)
             : mReferenceTime(referenceTime)
             , mResourceSystem(resourceSystem)
+            , mTerrain(terrain)
         {
         }
 
@@ -141,17 +161,21 @@ namespace MWWorld
         {
             osg::Timer timer;
             mResourceSystem->updateCache(mReferenceTime);
+
+            mTerrain->updateCache();
             std::cout << "cleared cache in " << timer.time_m() << std::endl;
         }
 
     private:
         double mReferenceTime;
         Resource::ResourceSystem* mResourceSystem;
+        Terrain::World* mTerrain;
     };
 
-    CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager)
+    CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain)
         : mResourceSystem(resourceSystem)
         , mBulletShapeManager(bulletShapeManager)
+        , mTerrain(terrain)
         , mExpiryDelay(0.0)
     {
     }
@@ -177,7 +201,7 @@ namespace MWWorld
             return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager()));
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
@@ -201,7 +225,7 @@ namespace MWWorld
         }
 
         // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
-        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, timestamp));
+        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, mTerrain, timestamp));
     }
 
     void CellPreloader::setExpiryDelay(double expiryDelay)
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 55e40dcbd1..32ea194c6e 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -11,6 +11,11 @@ namespace Resource
     class BulletShapeManager;
 }
 
+namespace Terrain
+{
+    class World;
+}
+
 namespace MWWorld
 {
     class CellStore;
@@ -18,7 +23,7 @@ namespace MWWorld
     class CellPreloader
     {
     public:
-        CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager);
+        CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain);
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
         /// @note The cell itself must be in State_Loaded or State_Preloaded.
@@ -37,6 +42,7 @@ namespace MWWorld
     private:
         Resource::ResourceSystem* mResourceSystem;
         Resource::BulletShapeManager* mBulletShapeManager;
+        Terrain::World* mTerrain;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         double mExpiryDelay;
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index b0e3844934..0be26c7b69 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -416,7 +416,6 @@ namespace MWWorld
         mCellChanged = true;
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-        mRendering.clearCache();
 
         std::cout << "changeCellGrid took " << timer.time_m() << std::endl;
     }
@@ -463,7 +462,7 @@ namespace MWWorld
     , mPreloadDoors(Settings::Manager::getBool("preload doors", "Cells"))
     , mPreloadFastTravel(Settings::Manager::getBool("preload fast travel", "Cells"))
     {
-        mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
+        mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager(), rendering.getTerrain()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
         mPhysics->setUnrefQueue(rendering.getUnrefQueue());
@@ -549,7 +548,6 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-        mRendering.clearCache();
 
         std::cout << "change to interior took " << timer.time_m() << std::endl;
     }
diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index e5f6d9f437..0a9784e6b3 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -19,11 +19,6 @@ namespace Resource
         mCache->removeExpiredObjectsInCache(referenceTime - mExpiryDelay);
     }
 
-    void ResourceManager::clearCache()
-    {
-        mCache->clear();
-    }
-
     void ResourceManager::setExpiryDelay(double expiryDelay)
     {
         mExpiryDelay = expiryDelay;
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index d2a1d10237..34fce01451 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -22,9 +22,6 @@ namespace Resource
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
         virtual void updateCache(double referenceTime);
 
-        /// Clear all cache entries regardless of having external references.
-        virtual void clearCache();
-
         /// How long to keep objects in cache after no longer being referenced.
         void setExpiryDelay (double expiryDelay);
 
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index f9c860d47b..2a72ea59b2 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -2,6 +2,8 @@
 
 #include <cassert>
 
+#include <OpenThreads/ScopedLock>
+
 #include <osg/PrimitiveSet>
 
 #include "defs.hpp"
@@ -178,6 +180,7 @@ namespace Terrain
 
     osg::ref_ptr<osg::Vec2Array> BufferCache::getUVBuffer()
     {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mUvBufferMutex);
         if (mUvBufferMap.find(mNumVerts) != mUvBufferMap.end())
         {
             return mUvBufferMap[mNumVerts];
@@ -206,6 +209,7 @@ namespace Terrain
 
     osg::ref_ptr<osg::DrawElements> BufferCache::getIndexBuffer(unsigned int flags)
     {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mIndexBufferMutex);
         unsigned int verts = mNumVerts;
 
         if (mIndexBufferMap.find(flags) != mIndexBufferMap.end())
diff --git a/components/terrain/buffercache.hpp b/components/terrain/buffercache.hpp
index ca210f2380..d1a57f8116 100644
--- a/components/terrain/buffercache.hpp
+++ b/components/terrain/buffercache.hpp
@@ -17,8 +17,10 @@ namespace Terrain
 
         /// @param flags first 4*4 bits are LOD deltas on each edge, respectively (4 bits each)
         ///              next 4 bits are LOD level of the index buffer (LOD 0 = don't omit any vertices)
+        /// @note Thread safe.
         osg::ref_ptr<osg::DrawElements> getIndexBuffer (unsigned int flags);
 
+        /// @note Thread safe.
         osg::ref_ptr<osg::Vec2Array> getUVBuffer();
 
         // TODO: add releaseGLObjects() for our vertex/element buffer objects
@@ -27,8 +29,10 @@ namespace Terrain
         // Index buffers are shared across terrain batches where possible. There is one index buffer for each
         // combination of LOD deltas and index buffer LOD we may need.
         std::map<int, osg::ref_ptr<osg::DrawElements> > mIndexBufferMap;
+        OpenThreads::Mutex mIndexBufferMutex;
 
         std::map<int, osg::ref_ptr<osg::Vec2Array> > mUvBufferMap;
+        OpenThreads::Mutex mUvBufferMutex;
 
         unsigned int mNumVerts;
     };
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 4d2f421e62..5b1854abc3 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -2,6 +2,8 @@
 
 #include <memory>
 
+#include <OpenThreads/ScopedLock>
+
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/imagemanager.hpp>
 #include <components/resource/scenemanager.hpp>
@@ -50,9 +52,9 @@ namespace Terrain
 TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue)
     : Terrain::World(parent, resourceSystem, ico, storage, nodeMask)
     , mNumSplits(4)
+    , mCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1)
     , mUnrefQueue(unrefQueue)
 {
-    mCache = BufferCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1);
 }
 
 TerrainGrid::~TerrainGrid()
@@ -63,6 +65,21 @@ TerrainGrid::~TerrainGrid()
     }
 }
 
+osg::ref_ptr<osg::Node> TerrainGrid::cacheCell(int x, int y)
+{
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
+        Grid::iterator found = mGridCache.find(std::make_pair(x,y));
+        if (found != mGridCache.end())
+            return found->second;
+    }
+    osg::ref_ptr<osg::Node> node = buildTerrain(NULL, 1.f, osg::Vec2f(x+0.5, y+0.5));
+
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
+    mGridCache.insert(std::make_pair(std::make_pair(x,y), node));
+    return node;
+}
+
 osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter)
 {
     if (chunkSize * mNumSplits > 1.f)
@@ -131,19 +148,22 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
         unsigned int dummyTextureCounter = 0;
 
         std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
-        for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
         {
-            osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
-            if (!texture)
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+            for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
             {
-                texture = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mDiffuseMap));
-                texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
-                texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
-                mResourceSystem->getSceneManager()->applyFilterSettings(texture);
-                mTextureCache[it->mDiffuseMap] = texture;
+                osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
+                if (!texture)
+                {
+                    texture = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mDiffuseMap));
+                    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                    mResourceSystem->getSceneManager()->applyFilterSettings(texture);
+                    mTextureCache[it->mDiffuseMap] = texture;
+                }
+                layerTextures.push_back(texture);
+                textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
             }
-            layerTextures.push_back(texture);
-            textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
         }
 
         std::vector<osg::ref_ptr<osg::Texture2D> > blendmapTextures;
@@ -196,11 +216,27 @@ void TerrainGrid::loadCell(int x, int y)
     if (mGrid.find(std::make_pair(x, y)) != mGrid.end())
         return; // already loaded
 
-    osg::Vec2f center(x+0.5f, y+0.5f);
+    // try to get it from the cache
+    osg::ref_ptr<osg::Node> terrainNode;
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
+        Grid::const_iterator found = mGridCache.find(std::make_pair(x,y));
+        if (found != mGridCache.end())
+        {
+            terrainNode = found->second;
+            if (!terrainNode)
+                return; // no terrain defined
+        }
+    }
 
-    osg::ref_ptr<osg::Node> terrainNode = buildTerrain(NULL, 1.f, center);
+    // didn't find in cache, build it
     if (!terrainNode)
-        return; // no terrain defined
+    {
+        osg::Vec2f center(x+0.5f, y+0.5f);
+        terrainNode = buildTerrain(NULL, 1.f, center);
+        if (!terrainNode)
+            return; // no terrain defined
+    }
 
     mTerrainRoot->addChild(terrainNode);
 
@@ -213,7 +249,7 @@ void TerrainGrid::unloadCell(int x, int y)
     if (it == mGrid.end())
         return;
 
-    osg::Node* terrainNode = it->second;
+    osg::ref_ptr<osg::Node> terrainNode = it->second;
     mTerrainRoot->removeChild(terrainNode);
 
     if (mUnrefQueue.get())
@@ -222,18 +258,28 @@ void TerrainGrid::unloadCell(int x, int y)
     mGrid.erase(it);
 }
 
-void TerrainGrid::clearCache()
+void TerrainGrid::updateCache()
 {
-    for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
     {
-        if (it->second->referenceCount() <= 1)
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+        for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
         {
-            if (mUnrefQueue.get())
-                mUnrefQueue->push(it->second);
-            mTextureCache.erase(it++);
+            if (it->second->referenceCount() <= 1)
+                mTextureCache.erase(it++);
+            else
+                ++it;
+        }
+    }
+
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
+        for (Grid::iterator it = mGridCache.begin(); it != mGridCache.end();)
+        {
+            if (it->second->referenceCount() <= 1)
+                mGridCache.erase(it++);
+            else
+                ++it;
         }
-        else
-            ++it;
     }
 }
 
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 4e6a78abd4..46a95e8173 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -21,11 +21,20 @@ namespace Terrain
         TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue = NULL);
         ~TerrainGrid();
 
+        /// Load a terrain cell and store it in cache for later use.
+        /// @note The returned ref_ptr should be kept by the caller to ensure that the terrain stays in cache for as long as needed.
+        /// @note Thread safe.
+        virtual osg::ref_ptr<osg::Node> cacheCell(int x, int y);
+
+        /// @note Not thread safe.
         virtual void loadCell(int x, int y);
+
+        /// @note Not thread safe.
         virtual void unloadCell(int x, int y);
 
-        /// Clear cached textures that are no longer referenced
-        void clearCache();
+        /// Clear cached objects that are no longer referenced
+        /// @note Thread safe.
+        void updateCache();
 
     private:
         osg::ref_ptr<osg::Node> buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
@@ -35,10 +44,16 @@ namespace Terrain
 
         typedef std::map<std::string, osg::ref_ptr<osg::Texture2D> >  TextureCache;
         TextureCache mTextureCache;
+        OpenThreads::Mutex mTextureCacheMutex;
 
         typedef std::map<std::pair<int, int>, osg::ref_ptr<osg::Node> > Grid;
         Grid mGrid;
 
+        Grid mGridCache;
+        OpenThreads::Mutex mGridCacheMutex;
+
+        BufferCache mCache;
+
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
     };
 
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index 2250b593d2..b56e87e1d5 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -11,7 +11,6 @@ namespace Terrain
 World::World(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
              Storage* storage, int nodeMask)
     : mStorage(storage)
-    , mCache(storage->getCellVertices())
     , mParent(parent)
     , mResourceSystem(resourceSystem)
     , mIncrementalCompileOperation(ico)
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index bd5d0a4661..992438a6a1 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -39,10 +39,12 @@ namespace Terrain
               Storage* storage, int nodeMask);
         virtual ~World();
 
-        virtual void clearCache() {}
+        virtual void updateCache() {}
 
         float getHeightAt (const osg::Vec3f& worldPos);
 
+        virtual osg::ref_ptr<osg::Node> cacheCell(int x, int y) {return NULL;}
+
         // This is only a hint and may be ignored by the implementation.
         virtual void loadCell(int x, int y) {}
         virtual void unloadCell(int x, int y) {}
@@ -52,8 +54,6 @@ namespace Terrain
     protected:
         Storage* mStorage;
 
-        BufferCache mCache;
-
         osg::ref_ptr<osg::Group> mParent;
         osg::ref_ptr<osg::Group> mTerrainRoot;
 

From 9f729667fb064ab5d7380a103da5180a940279a6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 21:06:02 +0100
Subject: [PATCH 244/765] Remove debug output

---
 apps/openmw/mwworld/cellpreloader.cpp | 11 -----------
 apps/openmw/mwworld/scene.cpp         |  7 -------
 components/nifosg/controller.hpp      |  1 -
 components/resource/scenemanager.cpp  |  2 --
 4 files changed, 21 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index e72c36c68e..ce9a87beba 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -54,7 +54,6 @@ namespace MWWorld
             , mKeyframeManager(keyframeManager)
             , mTerrain(terrain)
         {
-            osg::Timer timer;
             ListModelsVisitor visitor (mMeshes);
             if (cell->getState() == MWWorld::CellStore::State_Loaded)
             {
@@ -73,15 +72,11 @@ namespace MWWorld
                         mMeshes.push_back(model);
                 }
             }
-            std::cout << "listed models in " << timer.time_m() << std::endl;
         }
 
         /// Preload work to be called from the worker thread.
         virtual void doWork()
         {
-            // TODO: make CellStore::loadRefs thread safe so we can call it from here
-
-            osg::Timer preloadTimer;
             for (MeshList::const_iterator it = mMeshes.begin(); it != mMeshes.end(); ++it)
             {
                 try
@@ -89,8 +84,6 @@ namespace MWWorld
                     std::string mesh  = *it;
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
-                    //std::cout << "preloading " << mesh << std::endl;
-
                     mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
                     mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
 
@@ -127,8 +120,6 @@ namespace MWWorld
                 {
                 }
             }
-
-            std::cout << "preloaded " << mPreloadedObjects.size() << " objects in " << preloadTimer.time_m() << std::endl;
         }
 
     private:
@@ -159,11 +150,9 @@ namespace MWWorld
 
         virtual void doWork()
         {
-            osg::Timer timer;
             mResourceSystem->updateCache(mReferenceTime);
 
             mTerrain->updateCache();
-            std::cout << "cleared cache in " << timer.time_m() << std::endl;
         }
 
     private:
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 0be26c7b69..308809bd26 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -2,7 +2,6 @@
 
 #include <limits>
 #include <iostream>
-#include <osg/Timer>
 
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
@@ -332,7 +331,6 @@ namespace MWWorld
 
     void Scene::changeCellGrid (int X, int Y)
     {
-        osg::Timer timer;
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
 
@@ -416,8 +414,6 @@ namespace MWWorld
         mCellChanged = true;
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-
-        std::cout << "changeCellGrid took " << timer.time_m() << std::endl;
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -488,7 +484,6 @@ namespace MWWorld
 
     void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
     {
-        osg::Timer timer;
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
         if(!loadcell)
@@ -548,8 +543,6 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
         mPreloader->updateCache(mRendering.getReferenceTime());
-
-        std::cout << "change to interior took " << timer.time_m() << std::endl;
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index 0b633a1224..ce268f5871 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -17,7 +17,6 @@
 #include <osg/Texture2D>
 #include <osg/ref_ptr>
 
-#include <osg/Timer>
 #include <osg/StateSet>
 #include <osg/NodeCallback>
 #include <osg/Drawable>
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 5acd5f8fb9..29f7076f0c 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -366,8 +366,6 @@ namespace Resource
             if (mIncrementalCompileOperation)
                 mIncrementalCompileOperation->add(loaded);
 
-            //std::cout << "loading " << normalized  << std::endl;
-
             mCache->addEntryToObjectCache(normalized, loaded);
             return loaded;
         }

From 98c5e072f29990d8de48533ebed6f684dce7f5cc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 21:17:10 +0100
Subject: [PATCH 245/765] Swap the terrain cache update order to make more
 sense

---
 components/terrain/terraingrid.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 5b1854abc3..f40f3a3884 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -260,17 +260,6 @@ void TerrainGrid::unloadCell(int x, int y)
 
 void TerrainGrid::updateCache()
 {
-    {
-        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
-        for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
-        {
-            if (it->second->referenceCount() <= 1)
-                mTextureCache.erase(it++);
-            else
-                ++it;
-        }
-    }
-
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mGridCacheMutex);
         for (Grid::iterator it = mGridCache.begin(); it != mGridCache.end();)
@@ -281,6 +270,17 @@ void TerrainGrid::updateCache()
                 ++it;
         }
     }
+
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+        for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end();)
+        {
+            if (it->second->referenceCount() <= 1)
+                mTextureCache.erase(it++);
+            else
+                ++it;
+        }
+    }
 }
 
 }

From 61b6806a62baa89db93f5270e5f7907ffbb73764 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Tue, 9 Feb 2016 20:23:00 -0500
Subject: [PATCH 246/765] Allow toggling of cell markers

---
 apps/opencs/view/render/cellmarker.cpp | 14 ++++++++++++++
 apps/opencs/view/render/cellmarker.hpp | 17 +++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
index 17bb05440e..e8772a5867 100644
--- a/apps/opencs/view/render/cellmarker.cpp
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -7,6 +7,17 @@
 #include <osg/Group>
 #include <osgText/Text>
 
+#include "mask.hpp"
+
+CSVRender::CellMarkerTag::CellMarkerTag(CellMarker *marker)
+: TagBase(Mask_CellMarker), mMarker(marker)
+{}
+
+CSVRender::CellMarker *CSVRender::CellMarkerTag::getCellMarker() const
+{
+    return mMarker;
+}
+
 void CSVRender::CellMarker::buildMarker()
 {
     const int characterSize = 20;
@@ -50,6 +61,9 @@ CSVRender::CellMarker::CellMarker(
     mMarkerNode->setAutoScaleToScreen(true);
     mMarkerNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 
+    mMarkerNode->setUserData(new CellMarkerTag(this));
+    mMarkerNode->setNodeMask(Mask_CellMarker);
+
     mCellNode->addChild(mMarkerNode);
 
     buildMarker();
diff --git a/apps/opencs/view/render/cellmarker.hpp b/apps/opencs/view/render/cellmarker.hpp
index 4ac9d86b00..08c7e06086 100644
--- a/apps/opencs/view/render/cellmarker.hpp
+++ b/apps/opencs/view/render/cellmarker.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENCS_VIEW_CELLMARKER_H
 #define OPENCS_VIEW_CELLMARKER_H
 
+#include "tagbase.hpp"
+
 #include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
@@ -13,6 +15,21 @@ namespace osg
 
 namespace CSVRender
 {
+    class CellMarker;
+
+    class CellMarkerTag : public TagBase
+    {
+        private:
+
+            CellMarker *mMarker;
+
+        public:
+
+            CellMarkerTag(CellMarker *marker);
+
+            CellMarker *getCellMarker() const;
+    };
+
     /// \brief Marker to display cell coordinates.
     class CellMarker
     {

From 5e876b1379545964c59ea4c6a7bc27b4e320968f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 10 Feb 2016 15:34:06 +0100
Subject: [PATCH 247/765] Add missing include

---
 apps/openmw/mwrender/water.cpp     | 1 +
 components/terrain/terraingrid.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a8d601f114..dba85aeb78 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -15,6 +15,7 @@
 #include <osg/FrontFace>
 #include <osg/Shader>
 #include <osg/GLExtensions>
+#include <osg/UserDataContainer>
 
 #include <osgDB/ReadFile>
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index f40f3a3884..4f0e464ce2 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -2,6 +2,8 @@
 
 #include <memory>
 
+#include <osg/UserDataContainer>
+
 #include <OpenThreads/ScopedLock>
 
 #include <components/resource/resourcesystem.hpp>

From fb219fea17533812d416e9617bdda2c66b4fbf4d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 7 Feb 2016 19:43:38 +0100
Subject: [PATCH 248/765] Fix respawning of NPCs/creatures when they were moved
 to a different cell

---
 apps/openmw/mwclass/creature.cpp | 10 +++++-----
 apps/openmw/mwclass/npc.cpp      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 6e9cfccb96..0f021b5a2e 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -772,18 +772,18 @@ namespace MWClass
     {
         if (isFlagBitSet(ptr, ESM::Creature::Respawn))
         {
-            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
-            // This also means we cannot respawn dynamically placed references with no content file connection.
             if (ptr.getCellRef().hasContentFile())
             {
                 if (ptr.getRefData().getCount() == 0)
                     ptr.getRefData().setCount(1);
 
-                // Reset to original position
-                ptr.getRefData().setPosition(ptr.getCellRef().getPosition());
-
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
                 ptr.getRefData().setCustomData(NULL);
+
+                // Reset to original position
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
+                        ptr.getCellRef().getPosition().pos[1],
+                        ptr.getCellRef().getPosition().pos[2]);
             }
         }
     }
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 3519f9d83e..474985f7bb 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1305,18 +1305,18 @@ namespace MWClass
     {
         if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn)
         {
-            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
-            // This also means we cannot respawn dynamically placed references with no content file connection.
             if (ptr.getCellRef().hasContentFile())
             {
                 if (ptr.getRefData().getCount() == 0)
                     ptr.getRefData().setCount(1);
 
-                // Reset to original position
-                ptr.getRefData().setPosition(ptr.getCellRef().getPosition());
-
                 MWBase::Environment::get().getWorld()->removeContainerScripts(ptr);
                 ptr.getRefData().setCustomData(NULL);
+
+                // Reset to original position
+                MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
+                        ptr.getCellRef().getPosition().pos[1],
+                        ptr.getCellRef().getPosition().pos[2]);
             }
         }
     }

From d3808580b032eb75232aaae02c121bb711e19e28 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 8 Feb 2016 16:45:56 +0100
Subject: [PATCH 249/765] Rename lightRoot to sceneRoot

---
 apps/openmw/mwrender/renderingmanager.cpp | 40 +++++++++++------------
 apps/openmw/mwrender/renderingmanager.hpp |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 177cee4eaa..29b641f6bb 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -169,26 +169,26 @@ namespace MWRender
     {
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
 
-        osg::ref_ptr<SceneUtil::LightManager> lightRoot = new SceneUtil::LightManager;
-        lightRoot->setLightingMask(Mask_Lighting);
-        mLightRoot = lightRoot;
-        lightRoot->setStartLight(1);
+        osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
+        sceneRoot->setLightingMask(Mask_Lighting);
+        mSceneRoot = sceneRoot;
+        sceneRoot->setStartLight(1);
 
-        mRootNode->addChild(lightRoot);
+        mRootNode->addChild(sceneRoot);
 
         mPathgrid.reset(new Pathgrid(mRootNode));
 
-        mObjects.reset(new Objects(mResourceSystem, lightRoot, mUnrefQueue.get()));
+        mObjects.reset(new Objects(mResourceSystem, sceneRoot, mUnrefQueue.get()));
 
         mViewer->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation);
 
         mResourceSystem->getSceneManager()->setIncrementalCompileOperation(mViewer->getIncrementalCompileOperation());
 
-        mEffectManager.reset(new EffectManager(lightRoot, mResourceSystem));
+        mEffectManager.reset(new EffectManager(sceneRoot, mResourceSystem));
 
-        mWater.reset(new Water(mRootNode, lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
+        mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
-        mTerrain.reset(new Terrain::TerrainGrid(lightRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
+        mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
                                                 new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
@@ -203,21 +203,21 @@ namespace MWRender
         mSunLight->setAmbient(osg::Vec4f(0,0,0,1));
         mSunLight->setSpecular(osg::Vec4f(0,0,0,0));
         mSunLight->setConstantAttenuation(1.f);
-        lightRoot->addChild(source);
+        sceneRoot->addChild(source);
 
-        lightRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-        lightRoot->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON);
-        lightRoot->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON);
+        sceneRoot->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
 
-        lightRoot->setNodeMask(Mask_Scene);
-        lightRoot->setName("Scene Root");
+        sceneRoot->setNodeMask(Mask_Scene);
+        sceneRoot->setName("Scene Root");
 
-        mSky.reset(new SkyManager(lightRoot, resourceSystem->getSceneManager()));
+        mSky.reset(new SkyManager(sceneRoot, resourceSystem->getSceneManager()));
 
         source->setStateSetModes(*mRootNode->getOrCreateStateSet(), osg::StateAttribute::ON);
 
         mStateUpdater = new StateUpdater;
-        lightRoot->addUpdateCallback(mStateUpdater);
+        sceneRoot->addUpdateCallback(mStateUpdater);
 
         osg::Camera::CullingMode cullingMode = osg::Camera::DEFAULT_CULLING|osg::Camera::FAR_PLANE_CULLING;
 
@@ -291,7 +291,7 @@ namespace MWRender
 
     osg::Group* RenderingManager::getLightRoot()
     {
-        return mLightRoot.get();
+        return mSceneRoot.get();
     }
 
     void RenderingManager::setNightEyeFactor(float factor)
@@ -589,7 +589,7 @@ namespace MWRender
         image->setPixelFormat(texture->getInternalFormat());
 
         rttCamera->setUpdateCallback(new NoTraverseCallback);
-        rttCamera->addChild(mLightRoot);
+        rttCamera->addChild(mSceneRoot);
         rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
 
         mRootNode->addChild(rttCamera);
@@ -772,7 +772,7 @@ namespace MWRender
         {
             mPlayerNode = new SceneUtil::PositionAttitudeTransform;
             mPlayerNode->setNodeMask(Mask_Player);
-            mLightRoot->addChild(mPlayerNode);
+            mSceneRoot->addChild(mPlayerNode);
         }
 
         mPlayerNode->setUserDataContainer(new osg::DefaultUserDataContainer);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 4dda6f2735..59692f45aa 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -197,7 +197,7 @@ namespace MWRender
 
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
-        osg::ref_ptr<osg::Group> mLightRoot;
+        osg::ref_ptr<osg::Group> mSceneRoot;
         Resource::ResourceSystem* mResourceSystem;
 
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;

From 6bfeb118d7ecae3bc528ff558656c42caaa8c6ec Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 10 Feb 2016 19:08:17 +0100
Subject: [PATCH 250/765] Fix cleanup issue

---
 apps/openmw/mwworld/cellpreloader.cpp | 7 +++++++
 apps/openmw/mwworld/cellpreloader.hpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index ce9a87beba..6acb41dc3c 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -169,6 +169,13 @@ namespace MWWorld
     {
     }
 
+    CellPreloader::~CellPreloader()
+    {
+        for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();++it)
+            it->second.mWorkItem->waitTillDone();
+        mPreloadCells.clear();
+    }
+
     void CellPreloader::preload(CellStore *cell, double timestamp)
     {
         if (!mWorkQueue)
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 32ea194c6e..4373953973 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -24,6 +24,7 @@ namespace MWWorld
     {
     public:
         CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager, Terrain::World* terrain);
+        ~CellPreloader();
 
         /// Ask a background thread to preload rendering meshes and collision shapes for objects in this cell.
         /// @note The cell itself must be in State_Loaded or State_Preloaded.

From be6ea3d607724e89e917cc3d448333e9b2d688dd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 11 Feb 2016 16:22:54 +0100
Subject: [PATCH 251/765] Account for UV coordinate flip in UVController (Fixes
 #3203)

---
 components/nifosg/controller.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index d0abc9ead2..aabe07c866 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -254,9 +254,15 @@ void UVController::apply(osg::StateSet* stateset, osg::NodeVisitor* nv)
         float uScale = mUScale.interpKey(value);
         float vScale = mVScale.interpKey(value);
 
+        osg::Matrix flipMat;
+        flipMat.preMultTranslate(osg::Vec3f(0,1,0));
+        flipMat.preMultScale(osg::Vec3f(1,-1,1));
+
         osg::Matrixf mat = osg::Matrixf::scale(uScale, vScale, 1);
         mat.setTrans(uTrans, vTrans, 0);
 
+        mat = flipMat * mat * flipMat;
+
         // setting once is enough because all other texture units share the same TexMat (see setDefaults).
         if (!mTextureUnits.empty())
         {

From 48ac0bef3ed17024957e4715b3d85396be30665f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 11 Feb 2016 16:34:02 +0100
Subject: [PATCH 252/765] Repair save games affected by bug #3080 (Fixes #3160)

---
 apps/openmw/mwmechanics/aisequence.cpp | 46 ++++++++++++++------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 04ac96b11b..71733d613d 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -351,60 +351,64 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
          it != sequence.mPackages.end(); ++it)
     {
+        MWMechanics::AiPackage* package = NULL;
         switch (it->mType)
         {
         case ESM::AiSequence::Ai_Wander:
         {
-            MWMechanics::AiWander* wander = new AiWander(
-                        static_cast<ESM::AiSequence::AiWander*>(it->mPackage));
-            mPackages.push_back(wander);
+            package = new AiWander(static_cast<ESM::AiSequence::AiWander*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Travel:
         {
-            MWMechanics::AiTravel* travel = new AiTravel(
-                        static_cast<ESM::AiSequence::AiTravel*>(it->mPackage));
-            mPackages.push_back(travel);
+            package = new AiTravel(static_cast<ESM::AiSequence::AiTravel*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Escort:
         {
-            MWMechanics::AiEscort* escort = new AiEscort(
-                        static_cast<ESM::AiSequence::AiEscort*>(it->mPackage));
-            mPackages.push_back(escort);
+            package = new AiEscort(static_cast<ESM::AiSequence::AiEscort*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Follow:
         {
-            MWMechanics::AiFollow* follow = new AiFollow(
-                        static_cast<ESM::AiSequence::AiFollow*>(it->mPackage));
-            mPackages.push_back(follow);
+            package = new AiFollow(static_cast<ESM::AiSequence::AiFollow*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Activate:
         {
-            MWMechanics::AiActivate* activate = new AiActivate(
-                        static_cast<ESM::AiSequence::AiActivate*>(it->mPackage));
-            mPackages.push_back(activate);
+            package = new AiActivate(static_cast<ESM::AiSequence::AiActivate*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Combat:
         {
-            MWMechanics::AiCombat* combat = new AiCombat(
-                        static_cast<ESM::AiSequence::AiCombat*>(it->mPackage));
-            mPackages.push_back(combat);
+            package = new AiCombat(static_cast<ESM::AiSequence::AiCombat*>(it->mPackage));
             break;
         }
         case ESM::AiSequence::Ai_Pursue:
         {
-            MWMechanics::AiPursue* pursue = new AiPursue(
-                        static_cast<ESM::AiSequence::AiPursue*>(it->mPackage));
-            mPackages.push_back(pursue);
+            package = new AiPursue(static_cast<ESM::AiSequence::AiPursue*>(it->mPackage));
             break;
         }
         default:
             break;
         }
+
+        if (!package)
+            continue;
+
+        // remove previous packages if required
+        if (package->shouldCancelPreviousAi())
+        {
+            for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
+            {
+                if((*it)->canCancel())
+                    it = mPackages.erase(it);
+                else
+                    ++it;
+            }
+        }
+
+        mPackages.push_back(package);
     }
 }
 

From 8b596dfcbe8a142a77b0af54f257343c16469cc2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 12 Feb 2016 14:46:45 +0100
Subject: [PATCH 253/765] Remove support for OSG 3.2

Since commit e8662bea3133ba9dbb09b86c3abb1af39425e90d, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
---
 CMakeLists.txt                           |  2 +-
 apps/openmw/mwrender/animation.cpp       | 14 -----------
 apps/openmw/mwrender/objects.cpp         | 15 -----------
 apps/openmw/mwrender/sky.cpp             |  4 ---
 components/nifosg/nifloader.cpp          | 32 ------------------------
 components/resource/imagemanager.cpp     |  7 ------
 components/resource/scenemanager.cpp     | 17 -------------
 components/sceneutil/clone.cpp           |  5 ----
 components/sceneutil/controller.cpp      |  8 ------
 components/sceneutil/riggeometry.cpp     |  2 --
 components/sdlutil/sdlgraphicswindow.cpp |  8 ------
 components/terrain/terraingrid.cpp       |  6 -----
 12 files changed, 1 insertion(+), 119 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52970cfb59..df2ee6f49a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,7 +233,7 @@ if (USE_QT)
     set (OSG_QT osgQt)
 endif()
 
-find_package(OpenSceneGraph 3.2.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
+find_package(OpenSceneGraph 3.4.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
 
 include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 398fe53225..e3cc57bc42 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -201,17 +201,10 @@ namespace
     class RemoveDrawableVisitor : public RemoveVisitor
     {
     public:
-        virtual void apply(osg::Geode &geode)
-        {
-            applyImpl(geode);
-        }
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         virtual void apply(osg::Drawable& drw)
         {
             applyImpl(drw);
         }
-#endif
 
         void applyImpl(osg::Node& node)
         {
@@ -239,17 +232,10 @@ namespace
     class RemoveTriBipVisitor : public RemoveVisitor
     {
     public:
-        virtual void apply(osg::Geode &node)
-        {
-            applyImpl(node);
-        }
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         virtual void apply(osg::Drawable& drw)
         {
             applyImpl(drw);
         }
-#endif
 
         void applyImpl(osg::Node& node)
         {
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 516d10b959..d249a7602e 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -43,26 +43,11 @@ namespace
             traverse(node);
         }
 
-        virtual void apply(osg::Geode& geode)
-        {
-            std::vector<osgParticle::ParticleSystem*> partsysVector;
-            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            {
-                osg::Drawable* drw = geode.getDrawable(i);
-                if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(drw))
-                    partsysVector.push_back(partsys);
-            }
-
-            for (std::vector<osgParticle::ParticleSystem*>::iterator it = partsysVector.begin(); it != partsysVector.end(); ++it)
-                geode.removeDrawable(*it);
-        }
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         virtual void apply(osg::Drawable& drw)
         {
             if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
                 mToRemove.push_back(partsys);
         }
-#endif
 
         void remove()
         {
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 40283ba275..1757314fe2 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1282,11 +1282,7 @@ public:
                 if (stateset->getAttribute(osg::StateAttribute::MATERIAL))
                 {
                     SceneUtil::CompositeStateSetUpdater* composite = NULL;
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
                     osg::Callback* callback = node.getUpdateCallback();
-#else
-                    osg::NodeCallback* callback = node.getUpdateCallback();
-#endif
                     while (callback)
                     {
                         if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback)))
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 6c6061063e..61fbc9b966 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -934,13 +934,7 @@ namespace NifOsg
             updater->addParticleSystem(partsys);
             parentNode->addChild(updater);
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(partsys);
-            osg::Node* toAttach = geode.get();
-#else
             osg::Node* toAttach = partsys.get();
-#endif
 
             if (rf == osgParticle::ParticleProcessor::RELATIVE_RF)
                 parentNode->addChild(toAttach);
@@ -1017,11 +1011,6 @@ namespace NifOsg
                 triShapeToGeometry(triShape, geometry, parentNode, composite, boundTextures, animflags);
             }
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(geometry);
-#endif
-
             if (geometry->getDataVariance() == osg::Object::DYNAMIC)
             {
                 // Add a copy, we will alternate between the two copies every other frame using the FrameSwitch
@@ -1029,24 +1018,14 @@ namespace NifOsg
                 geometry->setDataVariance(osg::Object::STATIC);
                 osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-                osg::ref_ptr<osg::Geode> geode2 = static_cast<osg::Geode*>(osg::clone(geode.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES));
-                frameswitch->addChild(geode);
-                frameswitch->addChild(geode2);
-#else
                 osg::ref_ptr<osg::Geometry> geom2 = static_cast<osg::Geometry*>(osg::clone(geometry.get(), osg::CopyOp::DEEP_COPY_NODES|osg::CopyOp::DEEP_COPY_DRAWABLES));
                 frameswitch->addChild(geometry);
                 frameswitch->addChild(geom2);
-#endif
 
                 parentNode->addChild(frameswitch);
             }
             else
-#if OSG_VERSION_LESS_THAN(3,3,3)
-                parentNode->addChild(geode);
-#else
                 parentNode->addChild(geometry);
-#endif
         }
 
         osg::ref_ptr<osg::Geometry> handleMorphGeometry(const Nif::NiGeomMorpherController* morpher, const Nif::NiTriShape *triShape, osg::Node* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<int>& boundTextures, int animflags)
@@ -1151,21 +1130,10 @@ namespace NifOsg
 
             osg::ref_ptr<FrameSwitch> frameswitch = new FrameSwitch;
 
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-            geode->addDrawable(rig);
-
-            osg::Geode* geode2 = static_cast<osg::Geode*>(osg::clone(geode.get(), osg::CopyOp::DEEP_COPY_NODES|
-                                                                     osg::CopyOp::DEEP_COPY_DRAWABLES));
-
-            frameswitch->addChild(geode);
-            frameswitch->addChild(geode2);
-#else
             SceneUtil::RigGeometry* rig2 = static_cast<SceneUtil::RigGeometry*>(osg::clone(rig.get(), osg::CopyOp::DEEP_COPY_NODES|
                                                                                            osg::CopyOp::DEEP_COPY_DRAWABLES));
             frameswitch->addChild(rig);
             frameswitch->addChild(rig2);
-#endif
 
             parentNode->addChild(frameswitch);
         }
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 79da7d7abf..a4278eb0f8 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -62,17 +62,10 @@ namespace Resource
             case(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT):
             case(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT):
             {
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
                 osg::GLExtensions* exts = osg::GLExtensions::Get(0, false);
                 if (exts && !exts->isTextureCompressionS3TCSupported
                         // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a patch to OSG.
                         && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
-#else
-                osg::Texture::Extensions* exts = osg::Texture::getExtensions(0, false);
-                if (exts && !exts->isTextureCompressionS3TCSupported()
-                        // This one works too. Should it be included in isTextureCompressionS3TCSupported()? Submitted as a patch to OSG.
-                        && !osg::isGLExtensionSupported(0, "GL_S3_s3tc"))
-#endif
                 {
                     std::cerr << "Error loading " << filename << ": no S3TC texture compression support installed" << std::endl;
                     return false;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 29f7076f0c..52db2decc9 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -52,23 +52,6 @@ namespace
                     && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
         }
 
-        void apply(osg::Geode& geode)
-        {
-            for (unsigned int i=0;i<geode.getNumDrawables();++i)
-            {
-                if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(geode.getDrawable(i)))
-                {
-                    if (isWorldSpaceParticleSystem(partsys))
-                    {
-                        // HACK: Ignore the InverseWorldMatrix transform the geode is attached to
-                        if (geode.getNumParents() && geode.getParent(0)->getNumParents())
-                            transformInitialParticles(partsys, geode.getParent(0)->getParent(0));
-                    }
-                    geode.setNodeMask(mMask);
-                }
-            }
-        }
-
 #if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         // in OSG 3.3 and up Drawables can be directly in the scene graph without a Geode decorating them.
         void apply(osg::Drawable& drw)
diff --git a/components/sceneutil/clone.cpp b/components/sceneutil/clone.cpp
index 784195e7ef..26f3f5c7cd 100644
--- a/components/sceneutil/clone.cpp
+++ b/components/sceneutil/clone.cpp
@@ -81,11 +81,6 @@ namespace SceneUtil
 #endif
 
             osg::Drawable* cloned = osg::clone(drawable, copyop);
-#if OSG_VERSION_LESS_THAN(3,3,3)
-            // work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag
-            if (cloned->getUpdateCallback())
-                cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));
-#endif
             return cloned;
         }
         if (dynamic_cast<const SceneUtil::RigGeometry*>(drawable))
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index 7762b48d07..916d4f80bd 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -65,11 +65,7 @@ namespace SceneUtil
 
     void ControllerVisitor::apply(osg::Node &node)
     {
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         osg::Callback* callback = node.getUpdateCallback();
-#else
-        osg::NodeCallback* callback = node.getUpdateCallback();
-#endif
         while (callback)
         {
             if (Controller* ctrl = dynamic_cast<Controller*>(callback))
@@ -96,11 +92,7 @@ namespace SceneUtil
         {
             osg::Drawable* drw = geode.getDrawable(i);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
             osg::Callback* callback = drw->getUpdateCallback();
-#else
-            osg::Drawable::UpdateCallback* callback = drw->getUpdateCallback();
-#endif
 
             if (Controller* ctrl = dynamic_cast<Controller*>(callback))
                 visit(geode, *ctrl);
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index be8d97a4cb..da7d424311 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -289,11 +289,9 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
 
     _boundingBox = box;
     _boundingBoxComputed = true;
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
     // in OSG 3.3.3 and up Drawable inherits from Node, so has a bounding sphere as well.
     _boundingSphere = osg::BoundingSphere(_boundingBox);
     _boundingSphereComputed = true;
-#endif
     for (unsigned int i=0; i<getNumParents(); ++i)
         getParent(i)->dirtyBound();
 }
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index a0483e84df..e5bad1f009 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -112,11 +112,7 @@ void GraphicsWindowSDL2::init()
 
     mValid = true;
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,4)
     getEventQueue()->syncWindowRectangleWithGraphicsContext();
-#else
-    getEventQueue()->syncWindowRectangleWithGraphcisContext();
-#endif
 }
 
 
@@ -133,11 +129,7 @@ bool GraphicsWindowSDL2::realizeImplementation()
 
     SDL_ShowWindow(mWindow);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,4)
     getEventQueue()->syncWindowRectangleWithGraphicsContext();
-#else
-    getEventQueue()->syncWindowRectangleWithGraphcisContext();
-#endif
 
     mRealized = true;
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 4f0e464ce2..96584172a8 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -193,13 +193,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
 
         transform->addChild(effect);
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         osg::Node* toAttach = geometry.get();
-#else
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-        geode->addDrawable(geometry);
-        osg::Node* toAttach = geode.get();
-#endif
 
         effect->addChild(toAttach);
 

From f94722b271c83ffbbe55a46eff19619f0083d87c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 12 Feb 2016 14:55:00 +0100
Subject: [PATCH 254/765] OSG 3.3.4 is the first release to include the DDS
 crash fix

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df2ee6f49a..520279e504 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,7 +233,7 @@ if (USE_QT)
     set (OSG_QT osgQt)
 endif()
 
-find_package(OpenSceneGraph 3.4.0 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
+find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
 
 include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
 

From 5824619a95f5ad16dae84de41ab9a635bb16f56b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 12 Feb 2016 19:28:10 +0100
Subject: [PATCH 255/765] Clean up includes

---
 apps/openmw/mwrender/animation.cpp       | 1 -
 apps/openmw/mwrender/objects.cpp         | 1 -
 apps/openmw/mwrender/sky.cpp             | 1 -
 components/nifosg/nifloader.cpp          | 1 -
 components/resource/imagemanager.cpp     | 1 -
 components/resource/scenemanager.cpp     | 3 ---
 components/sceneutil/controller.cpp      | 1 -
 components/sceneutil/riggeometry.cpp     | 1 -
 components/sdlutil/sdlgraphicswindow.cpp | 2 --
 components/terrain/terraingrid.cpp       | 1 -
 10 files changed, 13 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index e3cc57bc42..abca3b2667 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -10,7 +10,6 @@
 #include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Material>
-#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index d249a7602e..a13ee03ac9 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -5,7 +5,6 @@
 #include <osg/Group>
 #include <osg/Geode>
 #include <osg/UserDataContainer>
-#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleProcessor>
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 1757314fe2..f10beca6ca 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -11,7 +11,6 @@
 #include <osg/Material>
 #include <osg/TexEnvCombine>
 #include <osg/TexMat>
-#include <osg/Version>
 #include <osg/OcclusionQueryNode>
 #include <osg/ColorMask>
 #include <osg/MatrixTransform>
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 61fbc9b966..8f40768845 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -5,7 +5,6 @@
 #include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Array>
-#include <osg/Version>
 #include <osg/LOD>
 
 // resource
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index a4278eb0f8..870fa370b1 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -2,7 +2,6 @@
 
 #include <osgDB/Registry>
 #include <osg/GLExtensions>
-#include <osg/Version>
 
 #include <components/vfs/manager.hpp>
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 52db2decc9..85a4afa301 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -4,7 +4,6 @@
 #include <osg/Node>
 #include <osg/Geode>
 #include <osg/UserDataContainer>
-#include <osg/Version>
 
 #include <osgParticle/ParticleSystem>
 #include <osgFX/Effect>
@@ -52,7 +51,6 @@ namespace
                     && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
         }
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         // in OSG 3.3 and up Drawables can be directly in the scene graph without a Geode decorating them.
         void apply(osg::Drawable& drw)
         {
@@ -67,7 +65,6 @@ namespace
                 partsys->setNodeMask(mMask);
             }
         }
-#endif
 
         void transformInitialParticles(osgParticle::ParticleSystem* partsys, osg::Node* node)
         {
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index 916d4f80bd..0978999116 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -5,7 +5,6 @@
 #include <osg/Drawable>
 #include <osg/Geode>
 #include <osg/NodeCallback>
-#include <osg/Version>
 
 namespace SceneUtil
 {
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index da7d424311..f915ee39c3 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -4,7 +4,6 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <osg/Version>
 #include <osg/MatrixTransform>
 
 #include "skeleton.hpp"
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index e5bad1f009..66d53b0961 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -2,8 +2,6 @@
 
 #include <SDL_video.h>
 
-#include <osg/Version>
-
 namespace SDLUtil
 {
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 96584172a8..981a984e48 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -19,7 +19,6 @@
 #include <osg/Geometry>
 #include <osg/Geode>
 #include <osg/KdTree>
-#include <osg/Version>
 
 #include <osgFX/Effect>
 

From d1375cd3a3ada3e8b9a84e64e1f5d1ab7b39cbaa Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 12 Feb 2016 23:40:50 +0100
Subject: [PATCH 256/765] Crashcatcher: limit backtrace to a sensible number of
 stack frames

When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
---
 apps/openmw/crashcatcher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/crashcatcher.cpp b/apps/openmw/crashcatcher.cpp
index cafd0e08a1..4f0356259a 100644
--- a/apps/openmw/crashcatcher.cpp
+++ b/apps/openmw/crashcatcher.cpp
@@ -149,7 +149,7 @@ static void gdb_info(pid_t pid)
                 "info registers\n"
                 "shell echo \"\"\n"
                 "shell echo \"* Backtrace\"\n"
-                "thread apply all backtrace full\n"
+                "thread apply all backtrace full 1000\n"
                 "detach\n"
                 "quit\n", pid);
         fclose(f);

From 383524c6881056dc3f84992d5ec8d51e2f102273 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 13 Feb 2016 02:56:41 +0100
Subject: [PATCH 257/765] Run physics in fixed timesteps, use the remainder to
 interpolate between current and previous state

Based on http://gafferongames.com/game-physics/fix-your-timestep/
---
 apps/openmw/mwbase/world.hpp              |   2 +-
 apps/openmw/mwphysics/actor.cpp           |  38 ++++++--
 apps/openmw/mwphysics/actor.hpp           |  17 ++++
 apps/openmw/mwphysics/physicssystem.cpp   | 103 ++++++++++++----------
 apps/openmw/mwphysics/physicssystem.hpp   |   2 +-
 apps/openmw/mwworld/projectilemanager.cpp |   2 +-
 apps/openmw/mwworld/worldimp.cpp          |  15 ++--
 apps/openmw/mwworld/worldimp.hpp          |   4 +-
 8 files changed, 117 insertions(+), 66 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 946a9a5ddb..52697d6708 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -270,7 +270,7 @@ namespace MWBase
             virtual MWWorld::Ptr moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z) = 0;
+            virtual MWWorld::Ptr moveObject(const MWWorld::Ptr &ptr, MWWorld::CellStore* newCell, float x, float y, float z, bool movePhysics=true) = 0;
             ///< @return an updated Ptr
 
             virtual void scaleObject (const MWWorld::Ptr& ptr, float scale) = 0;
diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index c99754b5cd..61022da28c 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -45,8 +45,7 @@ Actor::Actor(const MWWorld::Ptr& ptr, osg::ref_ptr<const Resource::BulletShape>
 
     updateRotation();
     updateScale();
-    // already called by updateScale()
-    //updatePosition();
+    updatePosition();
 
     updateCollisionMask();
 }
@@ -86,19 +85,44 @@ void Actor::updatePosition()
 {
     osg::Vec3f position = mPtr.getRefData().getPosition().asVec3();
 
+    mPosition = position;
+    mPreviousPosition = position;
+
+    updateCollisionObjectPosition();
+}
+
+void Actor::updateCollisionObjectPosition()
+{
     btTransform tr = mCollisionObject->getWorldTransform();
     osg::Vec3f scaledTranslation = mRotation * osg::componentMultiply(mMeshTranslation, mScale);
-    osg::Vec3f newPosition = scaledTranslation + position;
-
+    osg::Vec3f newPosition = scaledTranslation + mPosition;
     tr.setOrigin(toBullet(newPosition));
     mCollisionObject->setWorldTransform(tr);
 }
 
-osg::Vec3f Actor::getPosition() const
+osg::Vec3f Actor::getCollisionObjectPosition() const
 {
     return toOsg(mCollisionObject->getWorldTransform().getOrigin());
 }
 
+void Actor::setPosition(const osg::Vec3f &position)
+{
+    mPreviousPosition = mPosition;
+
+    mPosition = position;
+    updateCollisionObjectPosition();
+}
+
+osg::Vec3f Actor::getPosition() const
+{
+    return mPosition;
+}
+
+osg::Vec3f Actor::getPreviousPosition() const
+{
+    return mPreviousPosition;
+}
+
 void Actor::updateRotation ()
 {
     btTransform tr = mCollisionObject->getWorldTransform();
@@ -106,7 +130,7 @@ void Actor::updateRotation ()
     tr.setRotation(toBullet(mRotation));
     mCollisionObject->setWorldTransform(tr);
 
-    updatePosition();
+    updateCollisionObjectPosition();
 }
 
 void Actor::updateScale()
@@ -122,7 +146,7 @@ void Actor::updateScale()
     mPtr.getClass().adjustScale(mPtr, scaleVec, true);
     mRenderingScale = scaleVec;
 
-    updatePosition();
+    updateCollisionObjectPosition();
 }
 
 osg::Vec3f Actor::getHalfExtents() const
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 5755def740..b238547e11 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -68,8 +68,15 @@ namespace MWPhysics
 
         void updateScale();
         void updateRotation();
+
+        /**
+         * Set mPosition and mPreviousPosition to the position in the Ptr's RefData. This should be used
+         * when an object is "instantly" moved/teleported as opposed to being moved by the physics simulation.
+         */
         void updatePosition();
 
+        void updateCollisionObjectPosition();
+
         /**
          * Returns the half extents of the collision body (scaled according to collision scale)
          */
@@ -79,8 +86,17 @@ namespace MWPhysics
          * Returns the position of the collision body
          * @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
          */
+        osg::Vec3f getCollisionObjectPosition() const;
+
+        /**
+          * Store the current position into mPreviousPosition, then move to this position.
+          */
+        void setPosition(const osg::Vec3f& position);
+
         osg::Vec3f getPosition() const;
 
+        osg::Vec3f getPreviousPosition() const;
+
         /**
          * Returns the half extents of the collision body (scaled according to rendering scale)
          * @note The reason we need this extra method is because of an inconsistency in MW - NPC race scales aren't applied to the collision shape,
@@ -138,6 +154,7 @@ namespace MWPhysics
         osg::Vec3f mScale;
         osg::Vec3f mRenderingScale;
         osg::Vec3f mPosition;
+        osg::Vec3f mPreviousPosition;
 
         osg::Vec3f mForce;
         bool mOnGround;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 9f1cfc6822..ddb3d0c858 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -234,13 +234,11 @@ namespace MWPhysics
             }
         }
 
-        static osg::Vec3f move(const MWWorld::Ptr &ptr, Actor* physicActor, const osg::Vec3f &movement, float time,
+        static osg::Vec3f move(osg::Vec3f position, const MWWorld::Ptr &ptr, Actor* physicActor, const osg::Vec3f &movement, float time,
                                   bool isFlying, float waterlevel, float slowFall, btCollisionWorld* collisionWorld,
                                std::map<MWWorld::Ptr, MWWorld::Ptr>& standingCollisionTracker)
         {
             const ESM::Position& refpos = ptr.getRefData().getPosition();
-            osg::Vec3f position(refpos.asVec3());
-
             // Early-out for totally static creatures
             // (Not sure if gravity should still apply?)
             if (!ptr.getClass().isMobile(ptr))
@@ -944,8 +942,8 @@ namespace MWPhysics
         if (!physactor1 || !physactor2)
             return false;
 
-        osg::Vec3f pos1 (physactor1->getPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.8)); // eye level
-        osg::Vec3f pos2 (physactor2->getPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.8));
+        osg::Vec3f pos1 (physactor1->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.8)); // eye level
+        osg::Vec3f pos2 (physactor2->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.8));
 
         RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap|CollisionType_Door);
 
@@ -1007,11 +1005,11 @@ namespace MWPhysics
             return osg::Vec3f();
     }
 
-    osg::Vec3f PhysicsSystem::getPosition(const MWWorld::ConstPtr &actor) const
+    osg::Vec3f PhysicsSystem::getCollisionObjectPosition(const MWWorld::ConstPtr &actor) const
     {
         const Actor* physactor = getActor(actor);
         if (physactor)
-            return physactor->getPosition();
+            return physactor->getCollisionObjectPosition();
         else
             return osg::Vec3f();
     }
@@ -1296,54 +1294,65 @@ namespace MWPhysics
         mMovementResults.clear();
 
         mTimeAccum += dt;
-        if(mTimeAccum >= 1.0f/60.0f)
+        const float physicsDt = 1.f/60.0f;
+        int numSteps = mTimeAccum / (physicsDt);
+        mTimeAccum -= numSteps * physicsDt;
+
+        if (numSteps)
         {
             // Collision events should be available on every frame
             mStandingCollisions.clear();
+        }
 
-            const MWBase::World *world = MWBase::Environment::get().getWorld();
-            PtrVelocityList::iterator iter = mMovementQueue.begin();
-            for(;iter != mMovementQueue.end();++iter)
+        const MWBase::World *world = MWBase::Environment::get().getWorld();
+        PtrVelocityList::iterator iter = mMovementQueue.begin();
+        for(;iter != mMovementQueue.end();++iter)
+        {
+            float waterlevel = -std::numeric_limits<float>::max();
+            const MWWorld::CellStore *cell = iter->first.getCell();
+            if(cell->getCell()->hasWater())
+                waterlevel = cell->getWaterLevel();
+
+
+            const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects();
+
+            bool waterCollision = false;
+            if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude()
+                    && cell->getCell()->hasWater()
+                    && !world->isUnderwater(iter->first.getCell(),
+                                           osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
+                waterCollision = true;
+
+            ActorMap::iterator foundActor = mActors.find(iter->first);
+            if (foundActor == mActors.end()) // actor was already removed from the scene
+                continue;
+            Actor* physicActor = foundActor->second;
+            physicActor->setCanWaterWalk(waterCollision);
+
+            // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
+            float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
+
+            osg::Vec3f position = physicActor->getPosition();
+            float oldHeight = position.z();
+            for (int i=0; i<numSteps; ++i)
             {
-                float waterlevel = -std::numeric_limits<float>::max();
-                const MWWorld::CellStore *cell = iter->first.getCell();
-                if(cell->getCell()->hasWater())
-                    waterlevel = cell->getWaterLevel();
-
-                float oldHeight = iter->first.getRefData().getPosition().pos[2];
-
-                const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects();
-
-                bool waterCollision = false;
-                if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude()
-                        && cell->getCell()->hasWater()
-                        && !world->isUnderwater(iter->first.getCell(),
-                                               osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
-                    waterCollision = true;
-
-                ActorMap::iterator foundActor = mActors.find(iter->first);
-                if (foundActor == mActors.end()) // actor was already removed from the scene
-                    continue;
-                Actor* physicActor = foundActor->second;
-                physicActor->setCanWaterWalk(waterCollision);
-
-                // Slow fall reduces fall speed by a factor of (effect magnitude / 200)
-                float slowFall = 1.f - std::max(0.f, std::min(1.f, effects.get(ESM::MagicEffect::SlowFall).getMagnitude() * 0.005f));
-
-                osg::Vec3f newpos = MovementSolver::move(physicActor->getPtr(), physicActor, iter->second, mTimeAccum,
-                                                            world->isFlying(iter->first),
-                                                            waterlevel, slowFall, mCollisionWorld, mStandingCollisions);
-
-                float heightDiff = newpos.z() - oldHeight;
-
-                if (heightDiff < 0)
-                    iter->first.getClass().getCreatureStats(iter->first).addToFallHeight(-heightDiff);
-
-                mMovementResults.push_back(std::make_pair(iter->first, newpos));
+                position = MovementSolver::move(position, physicActor->getPtr(), physicActor, iter->second, physicsDt,
+                                                world->isFlying(iter->first),
+                                                waterlevel, slowFall, mCollisionWorld, mStandingCollisions);
+                physicActor->setPosition(position);
             }
 
-            mTimeAccum = 0.0f;
+            float interpolationFactor = mTimeAccum / physicsDt;
+            osg::Vec3f interpolated = position * interpolationFactor + physicActor->getPreviousPosition() * (1.f - interpolationFactor);
+
+            float heightDiff = position.z() - oldHeight;
+
+            if (heightDiff < 0)
+                iter->first.getClass().getCreatureStats(iter->first).addToFallHeight(-heightDiff);
+
+            mMovementResults.push_back(std::make_pair(iter->first, interpolated));
         }
+
         mMovementQueue.clear();
 
         return mMovementResults;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 110b59268f..62ebf4f0e9 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -129,7 +129,7 @@ namespace MWPhysics
 
             /// Get the position of the collision shape for the actor. Use together with getHalfExtents() to get the collision bounds in world space.
             /// @note The collision shape's origin is in its center, so the position returned can be described as center of the actor collision box in world space.
-            osg::Vec3f getPosition(const MWWorld::ConstPtr& actor) const;
+            osg::Vec3f getCollisionObjectPosition(const MWWorld::ConstPtr& actor) const;
 
             /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
             /// be overwritten. Valid until the next call to applyQueuedMovement.
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index b8150ce9c9..881530c8a4 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -117,7 +117,7 @@ namespace MWWorld
                                             const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
                                             const osg::Vec3f& fallbackDirection)
     {
-        osg::Vec3f pos = mPhysics->getPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
+        osg::Vec3f pos = mPhysics->getCollisionObjectPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
 
         if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
             return;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 137dac42e8..98517f5432 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1113,7 +1113,7 @@ namespace MWWorld
         }
     }
 
-    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z)
+    MWWorld::Ptr World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z, bool movePhysics)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
 
@@ -1201,7 +1201,8 @@ namespace MWWorld
         if (haveToMove && newPtr.getRefData().getBaseNode())
         {
             mRendering->moveObject(newPtr, vec);
-            mPhysics->updatePosition(newPtr);
+            if (movePhysics)
+                mPhysics->updatePosition(newPtr);
         }
         if (isPlayer)
         {
@@ -1210,7 +1211,7 @@ namespace MWWorld
         return newPtr;
     }
 
-    MWWorld::Ptr World::moveObjectImp(const Ptr& ptr, float x, float y, float z)
+    MWWorld::Ptr World::moveObjectImp(const Ptr& ptr, float x, float y, float z, bool movePhysics)
     {
         CellStore *cell = ptr.getCell();
 
@@ -1221,7 +1222,7 @@ namespace MWWorld
             cell = getExterior(cellX, cellY);
         }
 
-        return moveObject(ptr, cell, x, y, z);
+        return moveObject(ptr, cell, x, y, z, movePhysics);
     }
 
     MWWorld::Ptr World::moveObject (const Ptr& ptr, float x, float y, float z)
@@ -1373,10 +1374,10 @@ namespace MWWorld
                 player = iter;
                 continue;
             }
-            moveObjectImp(iter->first, iter->second.x(), iter->second.y(), iter->second.z());
+            moveObjectImp(iter->first, iter->second.x(), iter->second.y(), iter->second.z(), false);
         }
         if(player != results.end())
-            moveObjectImp(player->first, player->second.x(), player->second.y(), player->second.z());
+            moveObjectImp(player->first, player->second.x(), player->second.y(), player->second.z(), false);
 
         mPhysics->debugDraw();
     }
@@ -3206,7 +3207,7 @@ namespace MWWorld
     osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target)
     {
         osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
-        osg::Vec3f targetPos = mPhysics->getPosition(target);
+        osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
         return (targetPos - weaponPos);
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index cf9321da52..6cc5cdc11c 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -119,7 +119,7 @@ namespace MWWorld
 
             void rotateObjectImp (const Ptr& ptr, const osg::Vec3f& rot, bool adjust);
 
-            Ptr moveObjectImp (const Ptr& ptr, float x, float y, float z);
+            Ptr moveObjectImp (const Ptr& ptr, float x, float y, float z, bool movePhysics=true);
             ///< @return an updated Ptr in case the Ptr's cell changes
 
             Ptr copyObjectToCell(const ConstPtr &ptr, CellStore* cell, ESM::Position pos, int count, bool adjustPos);
@@ -355,7 +355,7 @@ namespace MWWorld
             virtual MWWorld::Ptr moveObject (const Ptr& ptr, float x, float y, float z);
             ///< @return an updated Ptr in case the Ptr's cell changes
 
-            virtual MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z);
+            virtual MWWorld::Ptr moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z, bool movePhysics=true);
             ///< @return an updated Ptr
 
             virtual void scaleObject (const Ptr& ptr, float scale);

From 796a4a795a95ad2ffa16de61368af9257b41b9c8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 13 Feb 2016 03:09:28 +0100
Subject: [PATCH 258/765] Avoid the 'spiral of death'

---
 apps/openmw/mwphysics/physicssystem.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index ddb3d0c858..8d4c2c590c 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -1295,7 +1295,11 @@ namespace MWPhysics
 
         mTimeAccum += dt;
         const float physicsDt = 1.f/60.0f;
+
+        const int maxAllowedSteps = 20;
         int numSteps = mTimeAccum / (physicsDt);
+        numSteps = std::min(numSteps, maxAllowedSteps);
+
         mTimeAccum -= numSteps * physicsDt;
 
         if (numSteps)

From 6fc6913424f07bda08e72c6253fe6e091f423222 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 13 Feb 2016 03:34:00 +0100
Subject: [PATCH 259/765] Do not set the cursor when creating it

---
 components/sdlutil/sdlcursormanager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index afe2406096..b372744f54 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -239,8 +239,6 @@ namespace SDLUtil
 
         //clean up
         SDL_FreeSurface(surf);
-
-        _setGUICursor(name);
     }
 
 }

From eaf3f5a82920e7b016a3a111de0de05d89cfc68b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 13 Feb 2016 04:14:05 +0100
Subject: [PATCH 260/765] Remove unused arguments

---
 apps/openmw/mwgui/windowmanagerimp.cpp  | 4 +---
 components/sdlutil/sdlcursormanager.cpp | 6 +++---
 components/sdlutil/sdlcursormanager.hpp | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 03fbc92382..f5d78aee62 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2020,13 +2020,11 @@ namespace MWGui
             if(image.valid())
             {
                 //everything looks good, send it to the cursor manager
-                Uint8 size_x = imgSetPointer->getSize().width;
-                Uint8 size_y = imgSetPointer->getSize().height;
                 Uint8 hotspot_x = imgSetPointer->getHotSpot().left;
                 Uint8 hotspot_y = imgSetPointer->getHotSpot().top;
                 int rotation = imgSetPointer->getRotation();
 
-                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, size_x, size_y, hotspot_x, hotspot_y);
+                mCursorManager->createCursor(imgSetPointer->getResourceName(), rotation, image, hotspot_x, hotspot_y);
             }
         }
     }
diff --git a/components/sdlutil/sdlcursormanager.cpp b/components/sdlutil/sdlcursormanager.cpp
index b372744f54..ad03083deb 100644
--- a/components/sdlutil/sdlcursormanager.cpp
+++ b/components/sdlutil/sdlcursormanager.cpp
@@ -211,12 +211,12 @@ namespace SDLUtil
         SDL_SetCursor(mCursorMap.find(name)->second);
     }
 
-    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y)
+    void SDLCursorManager::createCursor(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)
     {
-        _createCursorFromResource(name, rotDegrees, image, size_x, size_y, hotspot_x, hotspot_y);
+        _createCursorFromResource(name, rotDegrees, image, hotspot_x, hotspot_y);
     }
 
-    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y)
+    void SDLCursorManager::_createCursorFromResource(const std::string& name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y)
     {
         osg::ref_ptr<osg::Image> decompressed;
 
diff --git a/components/sdlutil/sdlcursormanager.hpp b/components/sdlutil/sdlcursormanager.hpp
index 0db578039c..f338778d1a 100644
--- a/components/sdlutil/sdlcursormanager.hpp
+++ b/components/sdlutil/sdlcursormanager.hpp
@@ -29,10 +29,10 @@ namespace SDLUtil
         ///        name of the cursor we changed to ("arrow", "ibeam", etc)
         virtual void cursorChanged(const std::string &name);
 
-        virtual void createCursor(const std::string &name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y);
+        virtual void createCursor(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y);
 
     private:
-        void _createCursorFromResource(const std::string &name, int rotDegrees, osg::Image* image, Uint8 size_x, Uint8 size_y, Uint8 hotspot_x, Uint8 hotspot_y);
+        void _createCursorFromResource(const std::string &name, int rotDegrees, osg::Image* image, Uint8 hotspot_x, Uint8 hotspot_y);
         void _putPixel(SDL_Surface *surface, int x, int y, Uint32 pixel);
 
         void _setGUICursor(const std::string& name);

From 25744aaaddd7a28d434e00ae2b426e12097d4e13 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 14 Feb 2016 10:28:41 -0500
Subject: [PATCH 261/765] Update cell marker appearance

- Added bounding box around marker text. Box is black when cell exists
  otherwise it is red.

- Changed format of marker text.

- Changed marker text's pivot point to be at center of text.
---
 apps/opencs/view/render/cell.cpp       |  8 +++++++-
 apps/opencs/view/render/cellmarker.cpp | 27 ++++++++++++++++++++------
 apps/opencs/view/render/cellmarker.hpp |  7 +++++--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 0030fd9b82..e7b135891a 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -307,7 +307,13 @@ void CSVRender::Cell::setCellArrows (int mask)
 
 void CSVRender::Cell::setCellMarker()
 {
-    mCellMarker.reset(new CellMarker(mCellNode, mCoordinates));
+    bool cellExists = false;
+    int cellIndex = mData.getCells().searchId(mId);
+    if (cellIndex > -1)
+    {
+        cellExists = !mData.getCells().getRecord(cellIndex).isDeleted();
+    }
+    mCellMarker.reset(new CellMarker(mCellNode, mCoordinates, cellExists));
 }
 
 CSMWorld::CellCoordinates CSVRender::Cell::getCoordinates() const
diff --git a/apps/opencs/view/render/cellmarker.cpp b/apps/opencs/view/render/cellmarker.cpp
index e8772a5867..e0d270f856 100644
--- a/apps/opencs/view/render/cellmarker.cpp
+++ b/apps/opencs/view/render/cellmarker.cpp
@@ -22,14 +22,27 @@ void CSVRender::CellMarker::buildMarker()
 {
     const int characterSize = 20;
 
-    // Set up marker text containing cell's coordinates.
+    // Set up attributes of marker text.
     osg::ref_ptr<osgText::Text> markerText (new osgText::Text);
-    markerText->setBackdropType(osgText::Text::OUTLINE);
     markerText->setLayout(osgText::Text::LEFT_TO_RIGHT);
     markerText->setCharacterSize(characterSize);
+    markerText->setAlignment(osgText::Text::CENTER_CENTER);
+    markerText->setDrawMode(osgText::Text::TEXT | osgText::Text::FILLEDBOUNDINGBOX);
+
+    // If cell exists then show black bounding box otherwise show red.
+    if (mExists)
+    {
+        markerText->setBoundingBoxColor(osg::Vec4f(0.0f, 0.0f, 0.0f, 1.0f));
+    }
+    else
+    {
+        markerText->setBoundingBoxColor(osg::Vec4f(1.0f, 0.0f, 0.0f, 1.0f));
+    }
+
+    // Add text containing cell's coordinates.
     std::string coordinatesText =
-        "#" + boost::lexical_cast<std::string>(mCoordinates.getX()) +
-        " " + boost::lexical_cast<std::string>(mCoordinates.getY());
+        boost::lexical_cast<std::string>(mCoordinates.getX()) + "," +
+        boost::lexical_cast<std::string>(mCoordinates.getY());
     markerText->setText(coordinatesText);
 
     // Add text to marker node.
@@ -51,9 +64,11 @@ void CSVRender::CellMarker::positionMarker()
 
 CSVRender::CellMarker::CellMarker(
     osg::Group *cellNode,
-    const CSMWorld::CellCoordinates& coordinates
+    const CSMWorld::CellCoordinates& coordinates,
+    const bool cellExists
 ) : mCellNode(cellNode),
-    mCoordinates(coordinates)
+    mCoordinates(coordinates),
+    mExists(cellExists)
 {
     // Set up node for cell marker.
     mMarkerNode = new osg::AutoTransform();
diff --git a/apps/opencs/view/render/cellmarker.hpp b/apps/opencs/view/render/cellmarker.hpp
index 08c7e06086..4246b20b8d 100644
--- a/apps/opencs/view/render/cellmarker.hpp
+++ b/apps/opencs/view/render/cellmarker.hpp
@@ -38,6 +38,7 @@ namespace CSVRender
             osg::Group* mCellNode;
             osg::ref_ptr<osg::AutoTransform> mMarkerNode;
             CSMWorld::CellCoordinates mCoordinates;
+            bool mExists;
 
             // Not implemented.
             CellMarker(const CellMarker&);
@@ -46,7 +47,7 @@ namespace CSVRender
             /// \brief Build marker containing cell's coordinates.
             void buildMarker();
 
-            /// \brief Position marker above center of cell.
+            /// \brief Position marker at center of cell.
             void positionMarker();
 
         public:
@@ -54,9 +55,11 @@ namespace CSVRender
             /// \brief Constructor.
             /// \param cellNode Cell to create marker for.
             /// \param coordinates Coordinates of cell.
+            /// \param cellExists Whether or not cell exists.
             CellMarker(
                 osg::Group *cellNode,
-                const CSMWorld::CellCoordinates& coordinates);
+                const CSMWorld::CellCoordinates& coordinates,
+                const bool cellExists);
 
             ~CellMarker();
     };

From 83a9a164bcba46a32c3f5dfc4e408e9b2bf2c323 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 00:27:39 +0100
Subject: [PATCH 262/765] Raise the required bullet version to 2.83

2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587).
---
 apps/openmw/mwphysics/physicssystem.cpp    | 16 ----------------
 components/resource/bulletshape.cpp        | 14 --------------
 components/resource/bulletshapemanager.hpp |  6 ++++++
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 8d4c2c590c..784910d51d 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -765,18 +765,11 @@ namespace MWPhysics
             mLeastDistSqr(std::numeric_limits<float>::max())
         { }
 
-#if BT_BULLET_VERSION >= 281
         virtual btScalar addSingleResult(btManifoldPoint& cp,
                                          const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
                                          const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
         {
             const btCollisionObject* collisionObject = col1Wrap->m_collisionObject;
-#else
-        virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
-                                         const btCollisionObject* col1, int partId1, int index1)
-        {
-            const btCollisionObject* collisionObject = col1;
-#endif
             if (collisionObject != mMe)
             {
                 btScalar distsqr = mOrigin.distance2(cp.getPositionWorldOnA());
@@ -1026,7 +1019,6 @@ namespace MWPhysics
 
         std::vector<MWWorld::Ptr> mResult;
 
-#if BT_BULLET_VERSION >= 281
         virtual btScalar addSingleResult(btManifoldPoint& cp,
                                          const btCollisionObjectWrapper* col0Wrap,int partId0,int index0,
                                          const btCollisionObjectWrapper* col1Wrap,int partId1,int index1)
@@ -1034,14 +1026,6 @@ namespace MWPhysics
             const btCollisionObject* collisionObject = col0Wrap->m_collisionObject;
             if (collisionObject == mTestedAgainst)
                 collisionObject = col1Wrap->m_collisionObject;
-#else
-        virtual btScalar addSingleResult(btManifoldPoint& cp, const btCollisionObject* col0, int partId0, int index0,
-                                         const btCollisionObject* col1, int partId1, int index1)
-        {
-            const btCollisionObject* collisionObject = col0;
-            if (collisionObject == mTestedAgainst)
-                collisionObject = col1;
-#endif
             PtrHolder* holder = static_cast<PtrHolder*>(collisionObject->getUserPointer());
             if (holder)
                 mResult.push_back(holder->getPtr());
diff --git a/components/resource/bulletshape.cpp b/components/resource/bulletshape.cpp
index 6855429c36..dbdbf0c6e3 100644
--- a/components/resource/bulletshape.cpp
+++ b/components/resource/bulletshape.cpp
@@ -65,21 +65,7 @@ btCollisionShape* BulletShape::duplicateCollisionShape(const btCollisionShape *s
 
     if(const btBvhTriangleMeshShape* trishape = dynamic_cast<const btBvhTriangleMeshShape*>(shape))
     {
-#if BT_BULLET_VERSION >= 283
         btScaledBvhTriangleMeshShape* newShape = new btScaledBvhTriangleMeshShape(const_cast<btBvhTriangleMeshShape*>(trishape), btVector3(1.f, 1.f, 1.f));
-#else
-        // work around btScaledBvhTriangleMeshShape bug ( https://code.google.com/p/bullet/issues/detail?id=371 ) in older bullet versions
-        const btTriangleMesh* oldMesh = static_cast<const btTriangleMesh*>(trishape->getMeshInterface());
-        btTriangleMesh* newMesh = new btTriangleMesh(*oldMesh);
-
-        // Do not build a new bvh (not needed, since it's the same as the original shape's bvh)
-        btOptimizedBvh* bvh = const_cast<btBvhTriangleMeshShape*>(trishape)->getOptimizedBvh();
-        TriangleMeshShape* newShape = new TriangleMeshShape(newMesh, true, bvh == NULL);
-        // Set original shape's bvh via pointer
-        // The pointer is safe because the BulletShapeInstance keeps a ref_ptr to the original BulletShape
-        if (bvh)
-            newShape->setOptimizedBvh(bvh);
-#endif
         return newShape;
     }
 
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 14b26962ba..3fe351f90c 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -6,9 +6,15 @@
 
 #include <osg/ref_ptr>
 
+#include <LinearMath/btScalar.h>
+
 #include "bulletshape.hpp"
 #include "resourcemanager.hpp"
 
+#if BT_BULLET_VERSION < 283
+#error "OpenMW requires Bullet version 2.83 or later"
+#endif
+
 namespace Resource
 {
     class SceneManager;

From 9eb96b9cb6af2643b21617e391d317c605cf7c7d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 14:34:59 +0100
Subject: [PATCH 263/765] Parse the bullet version in FindBullet.cmake

---
 CMakeLists.txt                             | 3 +++
 cmake/FindBullet.cmake                     | 8 ++++++++
 components/resource/bulletshapemanager.hpp | 6 ------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 520279e504..f5c4681149 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,6 +304,9 @@ find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(SDL2 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(Bullet REQUIRED)
+if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283)
+    message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
+endif()
 
 include_directories("."
     SYSTEM
diff --git a/cmake/FindBullet.cmake b/cmake/FindBullet.cmake
index 6d5c517afd..d70815dd50 100644
--- a/cmake/FindBullet.cmake
+++ b/cmake/FindBullet.cmake
@@ -14,11 +14,14 @@
 #
 
 # Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
+# Modified for OpenMW to parse BT_BULLET_VERSION.
 #
 # Redistribution AND use is allowed according to the terms of the New
 # BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+include(PreprocessorUtils)
+
 set(BULLET_ROOT $ENV{BULLET_ROOT})
 
 macro(_FIND_BULLET_LIBRARY _var)
@@ -75,4 +78,9 @@ if(BULLET_FOUND)
    #_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
    _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
+
+    find_file(BULLET_BTSCALAR_FILE NAMES btScalar.h PATHS "${BULLET_INCLUDE_DIR}/LinearMath")
+    file(READ ${BULLET_BTSCALAR_FILE} BULLET_BTSCALAR_CONTENT)
+    get_preprocessor_entry(BULLET_BTSCALAR_CONTENT BT_BULLET_VERSION BULLET_VERSION)
+    message(STATUS "Bullet version: ${BULLET_VERSION}")
 endif()
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
index 3fe351f90c..14b26962ba 100644
--- a/components/resource/bulletshapemanager.hpp
+++ b/components/resource/bulletshapemanager.hpp
@@ -6,15 +6,9 @@
 
 #include <osg/ref_ptr>
 
-#include <LinearMath/btScalar.h>
-
 #include "bulletshape.hpp"
 #include "resourcemanager.hpp"
 
-#if BT_BULLET_VERSION < 283
-#error "OpenMW requires Bullet version 2.83 or later"
-#endif
-
 namespace Resource
 {
     class SceneManager;

From 3c717a63603b53b301370bdf7cdef12441582748 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 14:38:58 +0100
Subject: [PATCH 264/765] Use Qt5 on travis to match the PPA's OSG build

---
 CI/before_install.linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index 1c02bc8d99..b8d8b45e26 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -11,11 +11,11 @@ sudo apt-get update -qq
 sudo apt-get install -qq libgtest-dev google-mock
 sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev
 sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev
+sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev qtbase5-dev
 if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build
-sudo cmake .. -DBUILD_SHARED_LIBS=1
+sudo cmake .. -DBUILD_SHARED_LIBS=1 -DDESIRED_QT_VERSION=5
 sudo make -j4
 sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
 sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so

From 647a5e091f4298ed390e511d7ce9fbfa64e0aa95 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 15:16:48 +0100
Subject: [PATCH 265/765] Add osgQt to the repository

Ensures that it will be built against the correct Qt version.
---
 CMakeLists.txt                          |    7 +-
 apps/opencs/CMakeLists.txt              |    2 +-
 apps/opencs/view/render/scenewidget.cpp |    2 +-
 extern/osgQt/CMakeLists.txt             |   21 +
 extern/osgQt/GraphicsWindowQt           |  193 ++++
 extern/osgQt/GraphicsWindowQt.cpp       | 1063 +++++++++++++++++++++++
 6 files changed, 1281 insertions(+), 7 deletions(-)
 create mode 100644 extern/osgQt/CMakeLists.txt
 create mode 100644 extern/osgQt/GraphicsWindowQt
 create mode 100644 extern/osgQt/GraphicsWindowQt.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5c4681149..719df3e348 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,11 +229,7 @@ IF(BOOST_STATIC)
     set(Boost_USE_STATIC_LIBS   ON)
 endif()
 
-if (USE_QT)
-    set (OSG_QT osgQt)
-endif()
-
-find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle ${OSG_QT} osgUtil osgFX)
+find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgAnimation osgParticle osgUtil osgFX)
 
 include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS})
 
@@ -570,6 +566,7 @@ endif(WIN32)
 # Extern
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
+add_subdirectory (extern/osgQt)
 
 # Components
 add_subdirectory (components)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index c9245ca9fd..6401e42222 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -197,7 +197,7 @@ target_link_libraries(openmw-cs
     ${OSGVIEWER_LIBRARIES}
     ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
-    ${OSGQT_LIBRARIES}
+    ${EXTERN_OSGQT_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index e5b9171e09..ba31c9b8bc 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -6,7 +6,7 @@
 #include <QShortcut>
 #include <QLayout>
 
-#include <osgQt/GraphicsWindowQt>
+#include <extern/osgQt/GraphicsWindowQt>
 #include <osg/GraphicsContext>
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
new file mode 100644
index 0000000000..e8a456da99
--- /dev/null
+++ b/extern/osgQt/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(OSGQT_LIBRARY "osgQt")
+
+# Sources
+
+set(OSGQT_SOURCE_FILES
+    GraphicsWindowQt.cpp
+)
+
+include_directories(${FFMPEG_INCLUDE_DIRS})
+add_library(${OSGQT_LIBRARY} STATIC ${OSGQT_SOURCE_FILES})
+
+if (DESIRED_QT_VERSION MATCHES 4)
+    include(${QT_USE_FILE})
+    target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
+else()
+    qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
+endif()
+
+link_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(EXTERN_OSGQT_LIBRARY ${OSGQT_LIBRARY} PARENT_SCOPE)
diff --git a/extern/osgQt/GraphicsWindowQt b/extern/osgQt/GraphicsWindowQt
new file mode 100644
index 0000000000..54d069176b
--- /dev/null
+++ b/extern/osgQt/GraphicsWindowQt
@@ -0,0 +1,193 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Wang Rui
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGVIEWER_GRAPHICSWINDOWQT
+#define OSGVIEWER_GRAPHICSWINDOWQT
+
+#include <QGLWidget>
+
+#include <osgViewer/GraphicsWindow>
+
+#include <QMutex>
+#include <QEvent>
+#include <QQueue>
+#include <QSet>
+#include <QGLWidget>
+
+class QInputEvent;
+class QGestureEvent;
+
+namespace osgViewer {
+    class ViewerBase;
+}
+
+namespace osgQt
+{
+
+// forward declarations
+class GraphicsWindowQt;
+
+/// The function sets the WindowingSystem to Qt.
+void initQtWindowingSystem();
+
+/** The function sets the viewer that will be used after entering
+ *  the Qt main loop (QCoreApplication::exec()).
+ *
+ *  The function also initializes internal structures required for proper
+ *  scene rendering.
+ *
+ *  The method must be called from main thread. */
+void setViewer( osgViewer::ViewerBase *viewer );
+
+
+class GLWidget : public QGLWidget
+{
+    typedef QGLWidget inherited;
+
+public:
+
+    GLWidget( QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
+    GLWidget( QGLContext* context, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
+    GLWidget( const QGLFormat& format, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
+    virtual ~GLWidget();
+
+    inline void setGraphicsWindow( GraphicsWindowQt* gw ) { _gw = gw; }
+    inline GraphicsWindowQt* getGraphicsWindow() { return _gw; }
+    inline const GraphicsWindowQt* getGraphicsWindow() const { return _gw; }
+
+    inline bool getForwardKeyEvents() const { return _forwardKeyEvents; }
+    virtual void setForwardKeyEvents( bool f ) { _forwardKeyEvents = f; }
+    
+    inline bool getTouchEventsEnabled() const { return _touchEventsEnabled; }
+    void setTouchEventsEnabled( bool e );
+
+    void setKeyboardModifiers( QInputEvent* event );
+
+    virtual void keyPressEvent( QKeyEvent* event );
+    virtual void keyReleaseEvent( QKeyEvent* event );
+    virtual void mousePressEvent( QMouseEvent* event );
+    virtual void mouseReleaseEvent( QMouseEvent* event );
+    virtual void mouseDoubleClickEvent( QMouseEvent* event );
+    virtual void mouseMoveEvent( QMouseEvent* event );
+    virtual void wheelEvent( QWheelEvent* event );
+    virtual bool gestureEvent( QGestureEvent* event );
+
+protected:
+
+    int getNumDeferredEvents()
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+        return _deferredEventQueue.count();
+    }
+    void enqueueDeferredEvent(QEvent::Type eventType, QEvent::Type removeEventType = QEvent::None)
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+
+        if (removeEventType != QEvent::None)
+        {
+            if (_deferredEventQueue.removeOne(removeEventType))
+                _eventCompressor.remove(eventType);
+        }
+
+        if (_eventCompressor.find(eventType) == _eventCompressor.end())
+        {
+            _deferredEventQueue.enqueue(eventType);
+            _eventCompressor.insert(eventType);
+        }
+    }
+    void processDeferredEvents();
+
+    friend class GraphicsWindowQt;
+    GraphicsWindowQt* _gw;
+
+    QMutex _deferredEventQueueMutex;
+    QQueue<QEvent::Type> _deferredEventQueue;
+    QSet<QEvent::Type> _eventCompressor;
+
+    bool _touchEventsEnabled;
+
+    bool _forwardKeyEvents;
+    qreal _devicePixelRatio;
+
+    virtual void resizeEvent( QResizeEvent* event );
+    virtual void moveEvent( QMoveEvent* event );
+    virtual void glDraw();
+    virtual bool event( QEvent* event );
+};
+
+class GraphicsWindowQt : public osgViewer::GraphicsWindow
+{
+public:
+    GraphicsWindowQt( osg::GraphicsContext::Traits* traits, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0 );
+    GraphicsWindowQt( GLWidget* widget );
+    virtual ~GraphicsWindowQt();
+
+    inline GLWidget* getGLWidget() { return _widget; }
+    inline const GLWidget* getGLWidget() const { return _widget; }
+
+    /// deprecated
+    inline GLWidget* getGraphWidget() { return _widget; }
+    /// deprecated
+    inline const GLWidget* getGraphWidget() const { return _widget; }
+
+    struct WindowData : public osg::Referenced
+    {
+        WindowData( GLWidget* widget = NULL, QWidget* parent = NULL ): _widget(widget), _parent(parent) {}
+        GLWidget* _widget;
+        QWidget* _parent;
+    };
+
+    bool init( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f );
+
+    static QGLFormat traits2qglFormat( const osg::GraphicsContext::Traits* traits );
+    static void qglFormat2traits( const QGLFormat& format, osg::GraphicsContext::Traits* traits );
+    static osg::GraphicsContext::Traits* createTraits( const QGLWidget* widget );
+
+    virtual bool setWindowRectangleImplementation( int x, int y, int width, int height );
+    virtual void getWindowRectangle( int& x, int& y, int& width, int& height );
+    virtual bool setWindowDecorationImplementation( bool windowDecoration );
+    virtual bool getWindowDecoration() const;
+    virtual void grabFocus();
+    virtual void grabFocusIfPointerInWindow();
+    virtual void raiseWindow();
+    virtual void setWindowName( const std::string& name );
+    virtual std::string getWindowName();
+    virtual void useCursor( bool cursorOn );
+    virtual void setCursor( MouseCursor cursor );
+    inline bool getTouchEventsEnabled() const { return _widget->getTouchEventsEnabled(); }
+    virtual void setTouchEventsEnabled( bool e ) { _widget->setTouchEventsEnabled(e); }
+
+
+    virtual bool valid() const;
+    virtual bool realizeImplementation();
+    virtual bool isRealizedImplementation() const;
+    virtual void closeImplementation();
+    virtual bool makeCurrentImplementation();
+    virtual bool releaseContextImplementation();
+    virtual void swapBuffersImplementation();
+    virtual void runOperations();
+
+    virtual void requestWarpPointer( float x, float y );
+
+protected:
+
+    friend class GLWidget;
+    GLWidget* _widget;
+    bool _ownsWidget;
+    QCursor _currentCursor;
+    bool _realized;
+};
+
+}
+
+#endif
diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
new file mode 100644
index 0000000000..2001c8b315
--- /dev/null
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -0,0 +1,1063 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 2009 Wang Rui
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#include "GraphicsWindowQt"
+
+#include <osg/DeleteHandler>
+#include <osgViewer/ViewerBase>
+#include <QInputEvent>
+#include <QPointer>
+
+#if (QT_VERSION>=QT_VERSION_CHECK(4, 6, 0))
+# define USE_GESTURES
+# include <QGestureEvent>
+# include <QGesture>
+#endif
+
+using namespace osgQt;
+
+
+class QtKeyboardMap
+{
+
+public:
+    QtKeyboardMap()
+    {
+        mKeyMap[Qt::Key_Escape     ] = osgGA::GUIEventAdapter::KEY_Escape;
+        mKeyMap[Qt::Key_Delete   ] = osgGA::GUIEventAdapter::KEY_Delete;
+        mKeyMap[Qt::Key_Home       ] = osgGA::GUIEventAdapter::KEY_Home;
+        mKeyMap[Qt::Key_Enter      ] = osgGA::GUIEventAdapter::KEY_KP_Enter;
+        mKeyMap[Qt::Key_End        ] = osgGA::GUIEventAdapter::KEY_End;
+        mKeyMap[Qt::Key_Return     ] = osgGA::GUIEventAdapter::KEY_Return;
+        mKeyMap[Qt::Key_PageUp     ] = osgGA::GUIEventAdapter::KEY_Page_Up;
+        mKeyMap[Qt::Key_PageDown   ] = osgGA::GUIEventAdapter::KEY_Page_Down;
+        mKeyMap[Qt::Key_Left       ] = osgGA::GUIEventAdapter::KEY_Left;
+        mKeyMap[Qt::Key_Right      ] = osgGA::GUIEventAdapter::KEY_Right;
+        mKeyMap[Qt::Key_Up         ] = osgGA::GUIEventAdapter::KEY_Up;
+        mKeyMap[Qt::Key_Down       ] = osgGA::GUIEventAdapter::KEY_Down;
+        mKeyMap[Qt::Key_Backspace  ] = osgGA::GUIEventAdapter::KEY_BackSpace;
+        mKeyMap[Qt::Key_Tab        ] = osgGA::GUIEventAdapter::KEY_Tab;
+        mKeyMap[Qt::Key_Space      ] = osgGA::GUIEventAdapter::KEY_Space;
+        mKeyMap[Qt::Key_Delete     ] = osgGA::GUIEventAdapter::KEY_Delete;
+        mKeyMap[Qt::Key_Alt      ] = osgGA::GUIEventAdapter::KEY_Alt_L;
+        mKeyMap[Qt::Key_Shift    ] = osgGA::GUIEventAdapter::KEY_Shift_L;
+        mKeyMap[Qt::Key_Control  ] = osgGA::GUIEventAdapter::KEY_Control_L;
+        mKeyMap[Qt::Key_Meta     ] = osgGA::GUIEventAdapter::KEY_Meta_L;
+
+        mKeyMap[Qt::Key_F1             ] = osgGA::GUIEventAdapter::KEY_F1;
+        mKeyMap[Qt::Key_F2             ] = osgGA::GUIEventAdapter::KEY_F2;
+        mKeyMap[Qt::Key_F3             ] = osgGA::GUIEventAdapter::KEY_F3;
+        mKeyMap[Qt::Key_F4             ] = osgGA::GUIEventAdapter::KEY_F4;
+        mKeyMap[Qt::Key_F5             ] = osgGA::GUIEventAdapter::KEY_F5;
+        mKeyMap[Qt::Key_F6             ] = osgGA::GUIEventAdapter::KEY_F6;
+        mKeyMap[Qt::Key_F7             ] = osgGA::GUIEventAdapter::KEY_F7;
+        mKeyMap[Qt::Key_F8             ] = osgGA::GUIEventAdapter::KEY_F8;
+        mKeyMap[Qt::Key_F9             ] = osgGA::GUIEventAdapter::KEY_F9;
+        mKeyMap[Qt::Key_F10            ] = osgGA::GUIEventAdapter::KEY_F10;
+        mKeyMap[Qt::Key_F11            ] = osgGA::GUIEventAdapter::KEY_F11;
+        mKeyMap[Qt::Key_F12            ] = osgGA::GUIEventAdapter::KEY_F12;
+        mKeyMap[Qt::Key_F13            ] = osgGA::GUIEventAdapter::KEY_F13;
+        mKeyMap[Qt::Key_F14            ] = osgGA::GUIEventAdapter::KEY_F14;
+        mKeyMap[Qt::Key_F15            ] = osgGA::GUIEventAdapter::KEY_F15;
+        mKeyMap[Qt::Key_F16            ] = osgGA::GUIEventAdapter::KEY_F16;
+        mKeyMap[Qt::Key_F17            ] = osgGA::GUIEventAdapter::KEY_F17;
+        mKeyMap[Qt::Key_F18            ] = osgGA::GUIEventAdapter::KEY_F18;
+        mKeyMap[Qt::Key_F19            ] = osgGA::GUIEventAdapter::KEY_F19;
+        mKeyMap[Qt::Key_F20            ] = osgGA::GUIEventAdapter::KEY_F20;
+
+        mKeyMap[Qt::Key_hyphen         ] = '-';
+        mKeyMap[Qt::Key_Equal         ] = '=';
+
+        mKeyMap[Qt::Key_division      ] = osgGA::GUIEventAdapter::KEY_KP_Divide;
+        mKeyMap[Qt::Key_multiply      ] = osgGA::GUIEventAdapter::KEY_KP_Multiply;
+        mKeyMap[Qt::Key_Minus         ] = '-';
+        mKeyMap[Qt::Key_Plus          ] = '+';
+        //mKeyMap[Qt::Key_H              ] = osgGA::GUIEventAdapter::KEY_KP_Home;
+        //mKeyMap[Qt::Key_                    ] = osgGA::GUIEventAdapter::KEY_KP_Up;
+        //mKeyMap[92                    ] = osgGA::GUIEventAdapter::KEY_KP_Page_Up;
+        //mKeyMap[86                    ] = osgGA::GUIEventAdapter::KEY_KP_Left;
+        //mKeyMap[87                    ] = osgGA::GUIEventAdapter::KEY_KP_Begin;
+        //mKeyMap[88                    ] = osgGA::GUIEventAdapter::KEY_KP_Right;
+        //mKeyMap[83                    ] = osgGA::GUIEventAdapter::KEY_KP_End;
+        //mKeyMap[84                    ] = osgGA::GUIEventAdapter::KEY_KP_Down;
+        //mKeyMap[85                    ] = osgGA::GUIEventAdapter::KEY_KP_Page_Down;
+        mKeyMap[Qt::Key_Insert        ] = osgGA::GUIEventAdapter::KEY_KP_Insert;
+        //mKeyMap[Qt::Key_Delete        ] = osgGA::GUIEventAdapter::KEY_KP_Delete;
+    }
+
+    ~QtKeyboardMap()
+    {
+    }
+
+    int remapKey(QKeyEvent* event)
+    {
+        KeyMap::iterator itr = mKeyMap.find(event->key());
+        if (itr == mKeyMap.end())
+        {
+            return int(*(event->text().toLatin1().data()));
+        }
+        else
+            return itr->second;
+    }
+
+    private:
+    typedef std::map<unsigned int, int> KeyMap;
+    KeyMap mKeyMap;
+};
+
+static QtKeyboardMap s_QtKeyboardMap;
+
+
+/// The object responsible for the scene re-rendering.
+class HeartBeat : public QObject {
+public:
+    int _timerId;
+    osg::Timer _lastFrameStartTime;
+    osg::observer_ptr< osgViewer::ViewerBase > _viewer;
+
+    virtual ~HeartBeat();
+    
+    void init( osgViewer::ViewerBase *viewer );
+    void stopTimer();
+    void timerEvent( QTimerEvent *event );
+
+    static HeartBeat* instance();
+private:
+    HeartBeat();
+
+    static QPointer<HeartBeat> heartBeat;
+};
+
+QPointer<HeartBeat> HeartBeat::heartBeat;
+
+#if (QT_VERSION < QT_VERSION_CHECK(5, 2, 0))
+    #define GETDEVICEPIXELRATIO() 1.0
+#else
+    #define GETDEVICEPIXELRATIO() devicePixelRatio()
+#endif
+
+GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, bool forwardKeyEvents )
+: QGLWidget(parent, shareWidget, f),
+_gw( NULL ),
+_touchEventsEnabled( false ),
+_forwardKeyEvents( forwardKeyEvents )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
+                    bool forwardKeyEvents )
+: QGLWidget(context, parent, shareWidget, f),
+_gw( NULL ),
+_touchEventsEnabled( false ),
+_forwardKeyEvents( forwardKeyEvents )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
+                    bool forwardKeyEvents )
+: QGLWidget(format, parent, shareWidget, f),
+_gw( NULL ),
+_touchEventsEnabled( false ),
+_forwardKeyEvents( forwardKeyEvents )
+{
+    _devicePixelRatio = GETDEVICEPIXELRATIO();
+}
+
+GLWidget::~GLWidget()
+{
+    // close GraphicsWindowQt and remove the reference to us
+    if( _gw )
+    {
+        _gw->close();
+        _gw->_widget = NULL;
+        _gw = NULL;
+    }
+}
+
+void GLWidget::setTouchEventsEnabled(bool e)
+{
+#ifdef USE_GESTURES
+    if (e==_touchEventsEnabled)
+        return;
+
+    _touchEventsEnabled = e;
+
+    if (_touchEventsEnabled)
+    {
+        grabGesture(Qt::PinchGesture);
+    }
+    else
+    {
+        ungrabGesture(Qt::PinchGesture);
+    }
+#endif
+}
+
+void GLWidget::processDeferredEvents()
+{
+    QQueue<QEvent::Type> deferredEventQueueCopy;
+    {
+        QMutexLocker lock(&_deferredEventQueueMutex);
+        deferredEventQueueCopy = _deferredEventQueue;
+        _eventCompressor.clear();
+        _deferredEventQueue.clear();
+    }
+
+    while (!deferredEventQueueCopy.isEmpty())
+    {
+        QEvent event(deferredEventQueueCopy.dequeue());
+        QGLWidget::event(&event);
+    }
+}
+
+bool GLWidget::event( QEvent* event )
+{
+#ifdef USE_GESTURES
+    if ( event->type()==QEvent::Gesture )
+        return gestureEvent(static_cast<QGestureEvent*>(event));
+#endif
+
+    // QEvent::Hide
+    //
+    // workaround "Qt-workaround" that does glFinish before hiding the widget
+    // (the Qt workaround was seen at least in Qt 4.6.3 and 4.7.0)
+    //
+    // Qt makes the context current, performs glFinish, and releases the context.
+    // This makes the problem in OSG multithreaded environment as the context
+    // is active in another thread, thus it can not be made current for the purpose
+    // of glFinish in this thread.
+
+    // QEvent::ParentChange
+    //
+    // Reparenting GLWidget may create a new underlying window and a new GL context.
+    // Qt will then call doneCurrent on the GL context about to be deleted. The thread
+    // where old GL context was current has no longer current context to render to and
+    // we cannot make new GL context current in this thread.
+
+    // We workaround above problems by deferring execution of problematic event requests.
+    // These events has to be enqueue and executed later in a main GUI thread (GUI operations
+    // outside the main thread are not allowed) just before makeCurrent is called from the
+    // right thread. The good place for doing that is right after swap in a swapBuffersImplementation.
+
+    if (event->type() == QEvent::Hide)
+    {
+        // enqueue only the last of QEvent::Hide and QEvent::Show
+        enqueueDeferredEvent(QEvent::Hide, QEvent::Show);
+        return true;
+    }
+    else if (event->type() == QEvent::Show)
+    {
+        // enqueue only the last of QEvent::Show or QEvent::Hide
+        enqueueDeferredEvent(QEvent::Show, QEvent::Hide);
+        return true;
+    }
+    else if (event->type() == QEvent::ParentChange)
+    {
+        // enqueue only the last QEvent::ParentChange
+        enqueueDeferredEvent(QEvent::ParentChange);
+        return true;
+    }
+
+    // perform regular event handling
+    return QGLWidget::event( event );
+}
+
+void GLWidget::setKeyboardModifiers( QInputEvent* event )
+{
+    int modkey = event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier);
+    unsigned int mask = 0;
+    if ( modkey & Qt::ShiftModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_SHIFT;
+    if ( modkey & Qt::ControlModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_CTRL;
+    if ( modkey & Qt::AltModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_ALT;
+    _gw->getEventQueue()->getCurrentEventState()->setModKeyMask( mask );
+}
+
+void GLWidget::resizeEvent( QResizeEvent* event )
+{
+    const QSize& size = event->size();
+
+    int scaled_width = static_cast<int>(size.width()*_devicePixelRatio);
+    int scaled_height = static_cast<int>(size.height()*_devicePixelRatio);
+    _gw->resized( x(), y(), scaled_width,  scaled_height);
+    _gw->getEventQueue()->windowResize( x(), y(), scaled_width, scaled_height );
+    _gw->requestRedraw();
+}
+
+void GLWidget::moveEvent( QMoveEvent* event )
+{
+    const QPoint& pos = event->pos();
+    int scaled_width = static_cast<int>(width()*_devicePixelRatio);
+    int scaled_height = static_cast<int>(height()*_devicePixelRatio);
+    _gw->resized( pos.x(), pos.y(), scaled_width,  scaled_height );
+    _gw->getEventQueue()->windowResize( pos.x(), pos.y(), scaled_width,  scaled_height );
+}
+
+void GLWidget::glDraw()
+{
+    _gw->requestRedraw();
+}
+
+void GLWidget::keyPressEvent( QKeyEvent* event )
+{
+    setKeyboardModifiers( event );
+    int value = s_QtKeyboardMap.remapKey( event );
+    _gw->getEventQueue()->keyPress( value );
+
+    // this passes the event to the regular Qt key event processing,
+    // among others, it closes popup windows on ESC and forwards the event to the parent widgets
+    if( _forwardKeyEvents )
+        inherited::keyPressEvent( event );
+}
+
+void GLWidget::keyReleaseEvent( QKeyEvent* event )
+{
+    if( event->isAutoRepeat() )
+    {
+        event->ignore();
+    }
+    else
+    {
+        setKeyboardModifiers( event );
+        int value = s_QtKeyboardMap.remapKey( event );
+        _gw->getEventQueue()->keyRelease( value );
+    }
+
+    // this passes the event to the regular Qt key event processing,
+    // among others, it closes popup windows on ESC and forwards the event to the parent widgets
+    if( _forwardKeyEvents )
+        inherited::keyReleaseEvent( event );
+}
+
+void GLWidget::mousePressEvent( QMouseEvent* event )
+{
+    int button = 0;
+    switch ( event->button() )
+    {
+        case Qt::LeftButton: button = 1; break;
+        case Qt::MidButton: button = 2; break;
+        case Qt::RightButton: button = 3; break;
+        case Qt::NoButton: button = 0; break;
+        default: button = 0; break;
+    }
+    setKeyboardModifiers( event );
+    _gw->getEventQueue()->mouseButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
+}
+
+void GLWidget::mouseReleaseEvent( QMouseEvent* event )
+{
+    int button = 0;
+    switch ( event->button() )
+    {
+        case Qt::LeftButton: button = 1; break;
+        case Qt::MidButton: button = 2; break;
+        case Qt::RightButton: button = 3; break;
+        case Qt::NoButton: button = 0; break;
+        default: button = 0; break;
+    }
+    setKeyboardModifiers( event );
+    _gw->getEventQueue()->mouseButtonRelease( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
+}
+
+void GLWidget::mouseDoubleClickEvent( QMouseEvent* event )
+{
+    int button = 0;
+    switch ( event->button() )
+    {
+        case Qt::LeftButton: button = 1; break;
+        case Qt::MidButton: button = 2; break;
+        case Qt::RightButton: button = 3; break;
+        case Qt::NoButton: button = 0; break;
+        default: button = 0; break;
+    }
+    setKeyboardModifiers( event );
+    _gw->getEventQueue()->mouseDoubleButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
+}
+
+void GLWidget::mouseMoveEvent( QMouseEvent* event )
+{
+    setKeyboardModifiers( event );
+    _gw->getEventQueue()->mouseMotion( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio );
+}
+
+void GLWidget::wheelEvent( QWheelEvent* event )
+{
+    setKeyboardModifiers( event );
+    _gw->getEventQueue()->mouseScroll(
+        event->orientation() == Qt::Vertical ?
+            (event->delta()>0 ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN) :
+            (event->delta()>0 ? osgGA::GUIEventAdapter::SCROLL_LEFT : osgGA::GUIEventAdapter::SCROLL_RIGHT) );
+}
+
+#ifdef USE_GESTURES
+static osgGA::GUIEventAdapter::TouchPhase translateQtGestureState( Qt::GestureState state )
+{
+    osgGA::GUIEventAdapter::TouchPhase touchPhase;
+    switch ( state )
+    {
+        case Qt::GestureStarted:
+            touchPhase = osgGA::GUIEventAdapter::TOUCH_BEGAN;
+            break;
+        case Qt::GestureUpdated:
+            touchPhase = osgGA::GUIEventAdapter::TOUCH_MOVED;
+            break;
+        case Qt::GestureFinished:
+        case Qt::GestureCanceled:
+            touchPhase = osgGA::GUIEventAdapter::TOUCH_ENDED;
+            break;
+        default:
+            touchPhase = osgGA::GUIEventAdapter::TOUCH_UNKNOWN;
+    };
+
+    return touchPhase;
+}
+#endif
+
+
+bool GLWidget::gestureEvent( QGestureEvent* qevent )
+{
+#ifndef USE_GESTURES
+    return false;
+#else
+
+    bool accept = false;
+
+    if ( QPinchGesture* pinch = static_cast<QPinchGesture *>(qevent->gesture(Qt::PinchGesture) ) )
+    {
+    const QPointF qcenterf = pinch->centerPoint();
+    const float angle = pinch->totalRotationAngle();
+    const float scale = pinch->totalScaleFactor();
+
+    const QPoint pinchCenterQt = mapFromGlobal(qcenterf.toPoint());
+    const osg::Vec2 pinchCenter( pinchCenterQt.x(), pinchCenterQt.y() );
+
+        //We don't have absolute positions of the two touches, only a scale and rotation
+        //Hence we create pseudo-coordinates which are reasonable, and centered around the
+        //real position
+        const float radius = (width()+height())/4;
+        const osg::Vec2 vector( scale*cos(angle)*radius, scale*sin(angle)*radius);
+        const osg::Vec2 p0 = pinchCenter+vector;
+        const osg::Vec2 p1 = pinchCenter-vector;
+
+        osg::ref_ptr<osgGA::GUIEventAdapter> event = 0;
+        const osgGA::GUIEventAdapter::TouchPhase touchPhase = translateQtGestureState( pinch->state() );
+        if ( touchPhase==osgGA::GUIEventAdapter::TOUCH_BEGAN )
+        {
+            event = _gw->getEventQueue()->touchBegan(0 , touchPhase, p0[0], p0[1] );
+        }
+        else if ( touchPhase==osgGA::GUIEventAdapter::TOUCH_MOVED )
+        {
+            event = _gw->getEventQueue()->touchMoved( 0, touchPhase, p0[0], p0[1] );
+        }
+        else
+        {
+            event = _gw->getEventQueue()->touchEnded( 0, touchPhase, p0[0], p0[1], 1 );
+        }
+
+        if ( event )
+        {
+            event->addTouchPoint( 1, touchPhase, p1[0], p1[1] );
+            accept = true;
+        }
+    }
+
+    if ( accept )
+        qevent->accept();
+
+    return accept;
+#endif
+}
+
+
+
+GraphicsWindowQt::GraphicsWindowQt( osg::GraphicsContext::Traits* traits, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f )
+:   _realized(false)
+{
+
+    _widget = NULL;
+    _traits = traits;
+    init( parent, shareWidget, f );
+}
+
+GraphicsWindowQt::GraphicsWindowQt( GLWidget* widget )
+:   _realized(false)
+{
+    _widget = widget;
+    _traits = _widget ? createTraits( _widget ) : new osg::GraphicsContext::Traits;
+    init( NULL, NULL, 0 );
+}
+
+GraphicsWindowQt::~GraphicsWindowQt()
+{
+    close();
+
+    // remove reference from GLWidget
+    if ( _widget )
+        _widget->_gw = NULL;
+}
+
+bool GraphicsWindowQt::init( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f )
+{
+    // update _widget and parent by WindowData
+    WindowData* windowData = _traits.get() ? dynamic_cast<WindowData*>(_traits->inheritedWindowData.get()) : 0;
+    if ( !_widget )
+        _widget = windowData ? windowData->_widget : NULL;
+    if ( !parent )
+        parent = windowData ? windowData->_parent : NULL;
+
+    // create widget if it does not exist
+    _ownsWidget = _widget == NULL;
+    if ( !_widget )
+    {
+        // shareWidget
+        if ( !shareWidget ) {
+            GraphicsWindowQt* sharedContextQt = dynamic_cast<GraphicsWindowQt*>(_traits->sharedContext.get());
+            if ( sharedContextQt )
+                shareWidget = sharedContextQt->getGLWidget();
+        }
+
+        // WindowFlags
+        Qt::WindowFlags flags = f | Qt::Window | Qt::CustomizeWindowHint;
+        if ( _traits->windowDecoration )
+            flags |= Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint
+#if (QT_VERSION_CHECK(4, 5, 0) <= QT_VERSION)
+                | Qt::WindowCloseButtonHint
+#endif
+                ;
+
+        // create widget
+        _widget = new GLWidget( traits2qglFormat( _traits.get() ), parent, shareWidget, flags );
+    }
+
+    // set widget name and position
+    // (do not set it when we inherited the widget)
+    if ( _ownsWidget )
+    {
+        _widget->setWindowTitle( _traits->windowName.c_str() );
+        _widget->move( _traits->x, _traits->y );
+        if ( !_traits->supportsResize ) _widget->setFixedSize( _traits->width, _traits->height );
+        else _widget->resize( _traits->width, _traits->height );
+    }
+
+    // initialize widget properties
+    _widget->setAutoBufferSwap( false );
+    _widget->setMouseTracking( true );
+    _widget->setFocusPolicy( Qt::WheelFocus );
+    _widget->setGraphicsWindow( this );
+    useCursor( _traits->useCursor );
+
+    // initialize State
+    setState( new osg::State );
+    getState()->setGraphicsContext(this);
+
+    // initialize contextID
+    if ( _traits.valid() && _traits->sharedContext.valid() )
+    {
+        getState()->setContextID( _traits->sharedContext->getState()->getContextID() );
+        incrementContextIDUsageCount( getState()->getContextID() );
+    }
+    else
+    {
+        getState()->setContextID( osg::GraphicsContext::createNewContextID() );
+    }
+
+    // make sure the event queue has the correct window rectangle size and input range
+    getEventQueue()->syncWindowRectangleWithGraphicsContext();
+
+    return true;
+}
+
+QGLFormat GraphicsWindowQt::traits2qglFormat( const osg::GraphicsContext::Traits* traits )
+{
+    QGLFormat format( QGLFormat::defaultFormat() );
+
+    format.setAlphaBufferSize( traits->alpha );
+    format.setRedBufferSize( traits->red );
+    format.setGreenBufferSize( traits->green );
+    format.setBlueBufferSize( traits->blue );
+    format.setDepthBufferSize( traits->depth );
+    format.setStencilBufferSize( traits->stencil );
+    format.setSampleBuffers( traits->sampleBuffers );
+    format.setSamples( traits->samples );
+
+    format.setAlpha( traits->alpha>0 );
+    format.setDepth( traits->depth>0 );
+    format.setStencil( traits->stencil>0 );
+    format.setDoubleBuffer( traits->doubleBuffer );
+    format.setSwapInterval( traits->vsync ? 1 : 0 );
+    format.setStereo( traits->quadBufferStereo ? 1 : 0 );
+
+    return format;
+}
+
+void GraphicsWindowQt::qglFormat2traits( const QGLFormat& format, osg::GraphicsContext::Traits* traits )
+{
+    traits->red = format.redBufferSize();
+    traits->green = format.greenBufferSize();
+    traits->blue = format.blueBufferSize();
+    traits->alpha = format.alpha() ? format.alphaBufferSize() : 0;
+    traits->depth = format.depth() ? format.depthBufferSize() : 0;
+    traits->stencil = format.stencil() ? format.stencilBufferSize() : 0;
+
+    traits->sampleBuffers = format.sampleBuffers() ? 1 : 0;
+    traits->samples = format.samples();
+
+    traits->quadBufferStereo = format.stereo();
+    traits->doubleBuffer = format.doubleBuffer();
+
+    traits->vsync = format.swapInterval() >= 1;
+}
+
+osg::GraphicsContext::Traits* GraphicsWindowQt::createTraits( const QGLWidget* widget )
+{
+    osg::GraphicsContext::Traits *traits = new osg::GraphicsContext::Traits;
+
+    qglFormat2traits( widget->format(), traits );
+
+    QRect r = widget->geometry();
+    traits->x = r.x();
+    traits->y = r.y();
+    traits->width = r.width();
+    traits->height = r.height();
+
+    traits->windowName = widget->windowTitle().toLocal8Bit().data();
+    Qt::WindowFlags f = widget->windowFlags();
+    traits->windowDecoration = ( f & Qt::WindowTitleHint ) &&
+                            ( f & Qt::WindowMinMaxButtonsHint ) &&
+                            ( f & Qt::WindowSystemMenuHint );
+    QSizePolicy sp = widget->sizePolicy();
+    traits->supportsResize = sp.horizontalPolicy() != QSizePolicy::Fixed ||
+                            sp.verticalPolicy() != QSizePolicy::Fixed;
+
+    return traits;
+}
+
+bool GraphicsWindowQt::setWindowRectangleImplementation( int x, int y, int width, int height )
+{
+    if ( _widget == NULL )
+        return false;
+
+    _widget->setGeometry( x, y, width, height );
+    return true;
+}
+
+void GraphicsWindowQt::getWindowRectangle( int& x, int& y, int& width, int& height )
+{
+    if ( _widget )
+    {
+        const QRect& geom = _widget->geometry();
+        x = geom.x();
+        y = geom.y();
+        width = geom.width();
+        height = geom.height();
+    }
+}
+
+bool GraphicsWindowQt::setWindowDecorationImplementation( bool windowDecoration )
+{
+    Qt::WindowFlags flags = Qt::Window|Qt::CustomizeWindowHint;//|Qt::WindowStaysOnTopHint;
+    if ( windowDecoration )
+        flags |= Qt::WindowTitleHint|Qt::WindowMinMaxButtonsHint|Qt::WindowSystemMenuHint;
+    _traits->windowDecoration = windowDecoration;
+
+    if ( _widget )
+    {
+        _widget->setWindowFlags( flags );
+
+        return true;
+    }
+
+    return false;
+}
+
+bool GraphicsWindowQt::getWindowDecoration() const
+{
+    return _traits->windowDecoration;
+}
+
+void GraphicsWindowQt::grabFocus()
+{
+    if ( _widget )
+        _widget->setFocus( Qt::ActiveWindowFocusReason );
+}
+
+void GraphicsWindowQt::grabFocusIfPointerInWindow()
+{
+    if ( _widget->underMouse() )
+        _widget->setFocus( Qt::ActiveWindowFocusReason );
+}
+
+void GraphicsWindowQt::raiseWindow()
+{
+    if ( _widget )
+        _widget->raise();
+}
+
+void GraphicsWindowQt::setWindowName( const std::string& name )
+{
+    if ( _widget )
+        _widget->setWindowTitle( name.c_str() );
+}
+
+std::string GraphicsWindowQt::getWindowName()
+{
+    return _widget ? _widget->windowTitle().toStdString() : "";
+}
+
+void GraphicsWindowQt::useCursor( bool cursorOn )
+{
+    if ( _widget )
+    {
+        _traits->useCursor = cursorOn;
+        if ( !cursorOn ) _widget->setCursor( Qt::BlankCursor );
+        else _widget->setCursor( _currentCursor );
+    }
+}
+
+void GraphicsWindowQt::setCursor( MouseCursor cursor )
+{
+    if ( cursor==InheritCursor && _widget )
+    {
+        _widget->unsetCursor();
+    }
+
+    switch ( cursor )
+    {
+    case NoCursor: _currentCursor = Qt::BlankCursor; break;
+    case RightArrowCursor: case LeftArrowCursor: _currentCursor = Qt::ArrowCursor; break;
+    case InfoCursor: _currentCursor = Qt::SizeAllCursor; break;
+    case DestroyCursor: _currentCursor = Qt::ForbiddenCursor; break;
+    case HelpCursor: _currentCursor = Qt::WhatsThisCursor; break;
+    case CycleCursor: _currentCursor = Qt::ForbiddenCursor; break;
+    case SprayCursor: _currentCursor = Qt::SizeAllCursor; break;
+    case WaitCursor: _currentCursor = Qt::WaitCursor; break;
+    case TextCursor: _currentCursor = Qt::IBeamCursor; break;
+    case CrosshairCursor: _currentCursor = Qt::CrossCursor; break;
+    case HandCursor: _currentCursor = Qt::OpenHandCursor; break;
+    case UpDownCursor: _currentCursor = Qt::SizeVerCursor; break;
+    case LeftRightCursor: _currentCursor = Qt::SizeHorCursor; break;
+    case TopSideCursor: case BottomSideCursor: _currentCursor = Qt::UpArrowCursor; break;
+    case LeftSideCursor: case RightSideCursor: _currentCursor = Qt::SizeHorCursor; break;
+    case TopLeftCorner: _currentCursor = Qt::SizeBDiagCursor; break;
+    case TopRightCorner: _currentCursor = Qt::SizeFDiagCursor; break;
+    case BottomRightCorner: _currentCursor = Qt::SizeBDiagCursor; break;
+    case BottomLeftCorner: _currentCursor = Qt::SizeFDiagCursor; break;
+    default: break;
+    };
+    if ( _widget ) _widget->setCursor( _currentCursor );
+}
+
+bool GraphicsWindowQt::valid() const
+{
+    return _widget && _widget->isValid();
+}
+
+bool GraphicsWindowQt::realizeImplementation()
+{
+    // save the current context
+    // note: this will save only Qt-based contexts
+    const QGLContext *savedContext = QGLContext::currentContext();
+
+    // initialize GL context for the widget
+    if ( !valid() )
+        _widget->glInit();
+
+    // make current
+    _realized = true;
+    bool result = makeCurrent();
+    _realized = false;
+
+    // fail if we do not have current context
+    if ( !result )
+    {
+        if ( savedContext )
+            const_cast< QGLContext* >( savedContext )->makeCurrent();
+
+        OSG_WARN << "Window realize: Can make context current." << std::endl;
+        return false;
+    }
+
+    _realized = true;
+
+    // make sure the event queue has the correct window rectangle size and input range
+    getEventQueue()->syncWindowRectangleWithGraphicsContext();
+
+    // make this window's context not current
+    // note: this must be done as we will probably make the context current from another thread
+    //       and it is not allowed to have one context current in two threads
+    if( !releaseContext() )
+        OSG_WARN << "Window realize: Can not release context." << std::endl;
+
+    // restore previous context
+    if ( savedContext )
+        const_cast< QGLContext* >( savedContext )->makeCurrent();
+
+    return true;
+}
+
+bool GraphicsWindowQt::isRealizedImplementation() const
+{
+    return _realized;
+}
+
+void GraphicsWindowQt::closeImplementation()
+{
+    if ( _widget )
+        _widget->close();
+    _realized = false;
+}
+
+void GraphicsWindowQt::runOperations()
+{
+    // While in graphics thread this is last chance to do something useful before
+    // graphics thread will execute its operations.
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    if (QGLContext::currentContext() != _widget->context())
+        _widget->makeCurrent();
+
+    GraphicsWindow::runOperations();
+}
+
+bool GraphicsWindowQt::makeCurrentImplementation()
+{
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    _widget->makeCurrent();
+
+    return true;
+}
+
+bool GraphicsWindowQt::releaseContextImplementation()
+{
+    _widget->doneCurrent();
+    return true;
+}
+
+void GraphicsWindowQt::swapBuffersImplementation()
+{
+    _widget->swapBuffers();
+
+    // FIXME: the processDeferredEvents should really be executed in a GUI (main) thread context but
+    // I couln't find any reliable way to do this. For now, lets hope non of *GUI thread only operations* will
+    // be executed in a QGLWidget::event handler. On the other hand, calling GUI only operations in the
+    // QGLWidget event handler is an indication of a Qt bug.
+    if (_widget->getNumDeferredEvents() > 0)
+        _widget->processDeferredEvents();
+
+    // We need to call makeCurrent here to restore our previously current context
+    // which may be changed by the processDeferredEvents function.
+    if (QGLContext::currentContext() != _widget->context())
+        _widget->makeCurrent();
+}
+
+void GraphicsWindowQt::requestWarpPointer( float x, float y )
+{
+    if ( _widget )
+        QCursor::setPos( _widget->mapToGlobal(QPoint((int)x,(int)y)) );
+}
+
+
+class QtWindowingSystem : public osg::GraphicsContext::WindowingSystemInterface
+{
+public:
+
+    QtWindowingSystem()
+    {
+        OSG_INFO << "QtWindowingSystemInterface()" << std::endl;
+    }
+
+    ~QtWindowingSystem()
+    {
+        if (osg::Referenced::getDeleteHandler())
+        {
+            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
+            osg::Referenced::getDeleteHandler()->flushAll();
+        }
+    }
+
+    // Access the Qt windowing system through this singleton class.
+    static QtWindowingSystem* getInterface()
+    {
+        static QtWindowingSystem* qtInterface = new QtWindowingSystem;
+        return qtInterface;
+    }
+
+    // Return the number of screens present in the system
+    virtual unsigned int getNumScreens( const osg::GraphicsContext::ScreenIdentifier& /*si*/ )
+    {
+        OSG_WARN << "osgQt: getNumScreens() not implemented yet." << std::endl;
+        return 0;
+    }
+
+    // Return the resolution of specified screen
+    // (0,0) is returned if screen is unknown
+    virtual void getScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*si*/, osg::GraphicsContext::ScreenSettings & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: getScreenSettings() not implemented yet." << std::endl;
+    }
+
+    // Set the resolution for given screen
+    virtual bool setScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*si*/, const osg::GraphicsContext::ScreenSettings & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: setScreenSettings() not implemented yet." << std::endl;
+        return false;
+    }
+
+    // Enumerates available resolutions
+    virtual void enumerateScreenSettings( const osg::GraphicsContext::ScreenIdentifier& /*screenIdentifier*/, osg::GraphicsContext::ScreenSettingsList & /*resolution*/ )
+    {
+        OSG_WARN << "osgQt: enumerateScreenSettings() not implemented yet." << std::endl;
+    }
+
+    // Create a graphics context with given traits
+    virtual osg::GraphicsContext* createGraphicsContext( osg::GraphicsContext::Traits* traits )
+    {
+        if (traits->pbuffer)
+        {
+            OSG_WARN << "osgQt: createGraphicsContext - pbuffer not implemented yet." << std::endl;
+            return NULL;
+        }
+        else
+        {
+            osg::ref_ptr< GraphicsWindowQt > window = new GraphicsWindowQt( traits );
+            if (window->valid()) return window.release();
+            else return NULL;
+        }
+    }
+
+private:
+
+    // No implementation for these
+    QtWindowingSystem( const QtWindowingSystem& );
+    QtWindowingSystem& operator=( const QtWindowingSystem& );
+};
+
+
+// declare C entry point for static compilation.
+extern "C" void graphicswindow_Qt(void)
+{
+    osg::GraphicsContext::setWindowingSystemInterface(QtWindowingSystem::getInterface());
+}
+
+
+void osgQt::initQtWindowingSystem()
+{
+    graphicswindow_Qt();
+}
+
+
+
+void osgQt::setViewer( osgViewer::ViewerBase *viewer )
+{
+    HeartBeat::instance()->init( viewer );
+}
+
+
+/// Constructor. Must be called from main thread.
+HeartBeat::HeartBeat() : _timerId( 0 )
+{
+}
+
+
+/// Destructor. Must be called from main thread.
+HeartBeat::~HeartBeat()
+{
+    stopTimer();
+}
+
+HeartBeat* HeartBeat::instance()
+{
+    if (!heartBeat)
+    {
+        heartBeat = new HeartBeat();
+    }
+    return heartBeat;
+}
+
+void HeartBeat::stopTimer()
+{
+    if ( _timerId != 0 )
+    {
+        killTimer( _timerId );
+        _timerId = 0;
+    }
+}
+
+
+/// Initializes the loop for viewer. Must be called from main thread.
+void HeartBeat::init( osgViewer::ViewerBase *viewer )
+{
+    if( _viewer == viewer )
+        return;
+
+    stopTimer();
+
+    _viewer = viewer;
+
+    if( viewer )
+    {
+        _timerId = startTimer( 0 );
+        _lastFrameStartTime.setStartTick( 0 );
+    }
+}
+
+
+void HeartBeat::timerEvent( QTimerEvent */*event*/ )
+{
+    osg::ref_ptr< osgViewer::ViewerBase > viewer;
+    if( !_viewer.lock( viewer ) )
+    {
+        // viewer has been deleted -> stop timer
+        stopTimer();
+        return;
+    }
+
+    // limit the frame rate
+    if( viewer->getRunMaxFrameRate() > 0.0)
+    {
+        double dt = _lastFrameStartTime.time_s();
+        double minFrameTime = 1.0 / viewer->getRunMaxFrameRate();
+        if (dt < minFrameTime)
+            OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(minFrameTime-dt)));
+    }
+    else
+    {
+        // avoid excessive CPU loading when no frame is required in ON_DEMAND mode
+        if( viewer->getRunFrameScheme() == osgViewer::ViewerBase::ON_DEMAND )
+        {
+            double dt = _lastFrameStartTime.time_s();
+            if (dt < 0.01)
+                OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(0.01-dt)));
+        }
+
+        // record start frame time
+        _lastFrameStartTime.setStartTick();
+
+        // make frame
+        if( viewer->getRunFrameScheme() == osgViewer::ViewerBase::ON_DEMAND )
+        {
+            if( viewer->checkNeedToDoFrame() )
+            {
+                viewer->frame();
+            }
+        }
+        else
+        {
+            viewer->frame();
+        }
+    }
+}

From b77ed829b963179e4848035b55eb71ce06625040 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 15:17:23 +0100
Subject: [PATCH 266/765] Revert "Use Qt5 on travis to match the PPA's OSG
 build"

This reverts commit 3c717a63603b53b301370bdf7cdef12441582748.
---
 CI/before_install.linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index b8d8b45e26..1c02bc8d99 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -11,11 +11,11 @@ sudo apt-get update -qq
 sudo apt-get install -qq libgtest-dev google-mock
 sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev
 sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
-sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev qtbase5-dev
+sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev
 if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build
-sudo cmake .. -DBUILD_SHARED_LIBS=1 -DDESIRED_QT_VERSION=5
+sudo cmake .. -DBUILD_SHARED_LIBS=1
 sudo make -j4
 sudo ln -s /usr/src/gtest/build/libgtest.so /usr/lib/libgtest.so
 sudo ln -s /usr/src/gtest/build/libgtest_main.so /usr/lib/libgtest_main.so

From 80392775efe2c594005bd89ca1450dc934b9e19c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 15:18:06 +0100
Subject: [PATCH 267/765] Fix copy&paste error

---
 extern/osgQt/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
index e8a456da99..3bd08a390a 100644
--- a/extern/osgQt/CMakeLists.txt
+++ b/extern/osgQt/CMakeLists.txt
@@ -6,7 +6,6 @@ set(OSGQT_SOURCE_FILES
     GraphicsWindowQt.cpp
 )
 
-include_directories(${FFMPEG_INCLUDE_DIRS})
 add_library(${OSGQT_LIBRARY} STATIC ${OSGQT_SOURCE_FILES})
 
 if (DESIRED_QT_VERSION MATCHES 4)

From 3f403466360af2343e0f7527f7a91c70dcc5096d Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 15 Feb 2016 19:49:54 -0500
Subject: [PATCH 268/765] Implemented a wrapper for DialInfo::SelectStruct

---
 apps/opencs/CMakeLists.txt                    |   2 +-
 apps/opencs/model/world/infoselectwrapper.cpp | 855 ++++++++++++++++++
 apps/opencs/model/world/infoselectwrapper.hpp | 238 +++++
 3 files changed, 1094 insertions(+), 1 deletion(-)
 create mode 100644 apps/opencs/model/world/infoselectwrapper.cpp
 create mode 100644 apps/opencs/model/world/infoselectwrapper.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0bde541bf7..7b825232bc 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -26,7 +26,7 @@ opencs_units_noqt (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
     pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
-    idcompletionmanager metadata defaultgmsts
+    idcompletionmanager metadata defaultgmsts infoselectwrapper
     )
 
 opencs_hdrs_noqt (model/world
diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
new file mode 100644
index 0000000000..42cbabf72d
--- /dev/null
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -0,0 +1,855 @@
+#include "infoselectwrapper.hpp"
+
+#include <limits>
+#include <sstream>
+
+const size_t CSMWorld::ConstInfoSelectWrapper::RuleMinSize = 5;
+
+const size_t CSMWorld::ConstInfoSelectWrapper::FunctionPrefixOffset = 1;
+const size_t CSMWorld::ConstInfoSelectWrapper::FunctionIndexOffset = 2;
+const size_t CSMWorld::ConstInfoSelectWrapper::RelationIndexOffset = 4;
+const size_t CSMWorld::ConstInfoSelectWrapper::VarNameOffset = 5;
+
+const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
+{
+    "Rank Low",
+    "Rank High",
+    "Rank Requirement",
+    "Reputation",
+    "Health Percent",
+    "PC Reputation",
+    "PC Level",
+    "PC Health Percent",
+    "PC Magicka",
+    "PC Fatigue",
+    "PC Strength",
+    "PC Block",
+    "PC Armorer",
+    "PC Medium Armor",
+    "PC Heavy Armor",
+    "PC Blunt Weapon",
+    "PC Long Blade",
+    "PC Axe",
+    "PC Spear",
+    "PC Athletics",
+    "PC Enchant",
+    "PC Detruction",
+    "PC Alteration",
+    "PC Illusion",
+    "PC Conjuration",
+    "PC Mysticism",
+    "PC Restoration",
+    "PC Alchemy",
+    "PC Unarmored",
+    "PC Security",
+    "PC Sneak",
+    "PC Acrobatics",
+    "PC Light Armor",
+    "PC Shorth Blade",
+    "PC Marksman",
+    "PC Merchantile",
+    "PC Speechcraft",
+    "PC Hand to Hand",
+    "PC Sex",
+    "PC Expelled",
+    "PC Common Disease",
+    "PC Blight Disease",
+    "PC Clothing Modifier",
+    "PC Crime Level",
+    "Same Sex",
+    "Same Race",
+    "Same Faction",
+    "Faction Rank Difference",
+    "Detected",
+    "Alarmed",
+    "Choice",
+    "PC Intelligence",
+    "PC Willpower",
+    "PC Agility",
+    "PC Speed",
+    "PC Endurance",
+    "PC Personality",
+    "PC Luck",
+    "PC Corpus",
+    "Weather",
+    "PC Vampire",
+    "PC Level",
+    "PC Attacked",
+    "Talked to PC",
+    "PC Health",
+    "Creature Target",
+    "Friend Hit",
+    "Fight",
+    "Hello",
+    "Alarm",
+    "Flee",
+    "Should Attack",
+    "Werewolf",
+    "PC Werewolf Kills",
+    "Global",
+    "Local",
+    "Journal",
+    "Item",
+    "Dead",
+    "Not Id",
+    "Not Faction",
+    "Not Class",
+    "Not Race",
+    "Not Cell",
+    "Not Local",
+    0
+};
+
+const char* CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings[] =
+{
+    "=",
+    "!=",
+    ">",
+    ">=",
+    "<",
+    "<=",
+    0
+};
+
+const char* CSMWorld::ConstInfoSelectWrapper::ComparisonEnumStrings[] =
+{
+    "Boolean",
+    "Integer",
+    "Numeric",
+    0
+};
+
+// static functions
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(FunctionName name)
+{
+    if (name < Function_None)
+        return FunctionEnumStrings[name];
+    else
+        return "(Invalid Data: Function)";
+}
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(RelationType type)
+{
+    if (type < Relation_None)
+        return RelationEnumStrings[type];
+    else
+        return "(Invalid Data: Relation)";
+}
+
+std::string CSMWorld::ConstInfoSelectWrapper::convertToString(ComparisonType type)
+{
+    if (type < Comparison_None)
+        return ComparisonEnumStrings[type];
+    else
+        return "(Invalid Data: Comparison)";
+}
+
+// ConstInfoSelectWrapper
+
+CSMWorld::ConstInfoSelectWrapper::ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select)
+    : mConstSelect(select)
+{
+    readRule();
+}
+
+CSMWorld::ConstInfoSelectWrapper::FunctionName CSMWorld::ConstInfoSelectWrapper::getFunctionName() const
+{
+    return mFunctionName;
+}
+
+CSMWorld::ConstInfoSelectWrapper::RelationType CSMWorld::ConstInfoSelectWrapper::getRelationType() const
+{
+    return mRelationType;
+}
+
+CSMWorld::ConstInfoSelectWrapper::ComparisonType CSMWorld::ConstInfoSelectWrapper::getComparisonType() const
+{
+    return mComparisonType;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::hasVariable() const
+{
+    return mHasVariable;
+}
+
+const std::string& CSMWorld::ConstInfoSelectWrapper::getVariableName() const
+{
+    return mVariableName;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue() const
+{
+    if (!variantTypeIsValid())
+        return false;
+
+    if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsAlwaysTrue(getConditionFloatRange(), getValidIntRange());
+        else
+            return conditionIsAlwaysTrue(getConditionIntRange(), getValidIntRange());
+    }
+    else if (mComparisonType == Comparison_Numeric)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsAlwaysTrue(getConditionFloatRange(), getValidFloatRange());
+        else
+            return conditionIsAlwaysTrue(getConditionIntRange(), getValidFloatRange());
+    }
+
+    return false;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue() const
+{
+    if (!variantTypeIsValid())
+        return false;
+
+    if (mComparisonType == Comparison_Boolean || mComparisonType == Comparison_Integer)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsNeverTrue(getConditionFloatRange(), getValidIntRange());
+        else
+            return conditionIsNeverTrue(getConditionIntRange(), getValidIntRange());
+    }
+    else if (mComparisonType == Comparison_Numeric)
+    {
+        if (mConstSelect.mValue.getType() == ESM::VT_Float)
+            return conditionIsNeverTrue(getConditionFloatRange(), getValidFloatRange());
+        else
+            return conditionIsNeverTrue(getConditionIntRange(), getValidFloatRange());
+    }
+
+    return false;
+}
+
+bool CSMWorld::ConstInfoSelectWrapper::variantTypeIsValid() const
+{
+    return (mConstSelect.mValue.getType() == ESM::VT_Int || mConstSelect.mValue.getType() == ESM::VT_Short ||
+        mConstSelect.mValue.getType() == ESM::VT_Long || mConstSelect.mValue.getType() == ESM::VT_Float);
+}
+
+const ESM::Variant& CSMWorld::ConstInfoSelectWrapper::getVariant() const
+{
+    return mConstSelect.mValue;
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readRule()
+{
+    if (mConstSelect.mSelectRule.size() < RuleMinSize)
+        throw std::runtime_error("InfoSelectWrapper: rule is to small");
+
+    readFunctionName();
+    readRelationType();
+    readVariableName();
+    updateHasVariable();
+    updateComparisonType();
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readFunctionName()
+{
+    char functionPrefix = mConstSelect.mSelectRule[FunctionPrefixOffset];
+    std::string functionIndex = mConstSelect.mSelectRule.substr(FunctionIndexOffset, 2);
+    int convertedIndex = -1;
+
+    // Read in function index, form ## from 00 .. 73, skip leading zero
+    if (functionIndex[0] == '0')
+        functionIndex = functionIndex[1];
+
+    std::stringstream stream;
+    stream << functionIndex;
+    stream >> convertedIndex;
+
+    switch (functionPrefix)
+    {
+        case '1':
+            if (convertedIndex >= 0 && convertedIndex <= 73)
+                mFunctionName = static_cast<FunctionName>(convertedIndex);
+            else
+                mFunctionName = Function_None;
+            break;
+
+        case '2': mFunctionName = Function_Global; break;
+        case '3': mFunctionName = Function_Local; break;
+        case '4': mFunctionName = Function_Journal; break;
+        case '5': mFunctionName = Function_Item; break;
+        case '6': mFunctionName = Function_Dead; break;
+        case '7': mFunctionName = Function_NotId; break;
+        case '8': mFunctionName = Function_NotFaction; break;
+        case '9': mFunctionName = Function_NotClass; break;
+        case 'A': mFunctionName = Function_NotRace; break;
+        case 'B': mFunctionName = Function_NotCell; break;
+        case 'C': mFunctionName = Function_NotLocal; break;
+        default:  mFunctionName = Function_None; break;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readRelationType()
+{
+    char relationIndex = mConstSelect.mSelectRule[RelationIndexOffset];
+
+    switch (relationIndex)
+    {
+        case '0': mRelationType = Relation_Equal; break;
+        case '1': mRelationType = Relation_NotEqual; break;
+        case '2': mRelationType = Relation_Greater; break;
+        case '3': mRelationType = Relation_GreaterOrEqual; break;
+        case '4': mRelationType = Relation_Less; break;
+        case '5': mRelationType = Relation_LessOrEqual; break;
+        default:  mRelationType = Relation_None;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::readVariableName()
+{
+    if (mConstSelect.mSelectRule.size() >= VarNameOffset)
+        mVariableName = mConstSelect.mSelectRule.substr(VarNameOffset);
+    else
+        mVariableName.clear();
+}
+
+void CSMWorld::ConstInfoSelectWrapper::updateHasVariable()
+{
+    switch (mFunctionName)
+    {
+        case Function_Global:
+        case Function_Local:
+        case Function_Journal:
+        case Function_Item:
+        case Function_Dead:
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_NotLocal:
+            mHasVariable = true;
+            break;
+
+        default:
+            mHasVariable = false;
+            break;
+    }
+}
+
+void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
+{
+    switch (mFunctionName)
+    {
+        // Boolean
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_PcExpelled:
+        case Function_PcCommonDisease:
+        case Function_PcBlightDisease:
+        case Function_SameSex:
+        case Function_SameRace:
+        case Function_SameFaction:
+        case Function_Detected:
+        case Function_Alarmed:
+        case Function_PcCorpus:
+        case Function_PcVampire:
+        case Function_Attacked:
+        case Function_TalkedToPc:
+        case Function_ShouldAttack:
+        case Function_Werewolf:
+            mComparisonType = Comparison_Boolean;
+            break;
+
+        // Integer
+        case Function_Journal:
+        case Function_Item:
+        case Function_Dead:
+        case Function_RankLow:
+        case Function_RankHigh:
+        case Function_RankRequirement:
+        case Function_Reputation:
+        case Function_PcReputation:
+        case Function_PcLevel:
+        case Function_PcStrength:
+        case Function_PcBlock:
+        case Function_PcArmorer:
+        case Function_PcMediumArmor:
+        case Function_PcHeavyArmor:
+        case Function_PcBluntWeapon:
+        case Function_PcLongBlade:
+        case Function_PcAxe:
+        case Function_PcSpear:
+        case Function_PcAthletics:
+        case Function_PcEnchant:
+        case Function_PcDestruction:
+        case Function_PcAlteration:
+        case Function_PcIllusion:
+        case Function_PcConjuration:
+        case Function_PcMysticism:
+        case Function_PcRestoration:
+        case Function_PcAlchemy:
+        case Function_PcUnarmored:
+        case Function_PcSecurity:
+        case Function_PcSneak:
+        case Function_PcAcrobatics:
+        case Function_PcLightArmor:
+        case Function_PcShortBlade:
+        case Function_PcMarksman:
+        case Function_PcMerchantile:
+        case Function_PcSpeechcraft:
+        case Function_PcHandToHand:
+        case Function_PcGender:
+        case Function_PcClothingModifier:
+        case Function_PcCrimeLevel:
+        case Function_FactionRankDifference:
+        case Function_Choice:
+        case Function_PcIntelligence:
+        case Function_PcWillpower:
+        case Function_PcAgility:
+        case Function_PcSpeed:
+        case Function_PcEndurance:
+        case Function_PcPersonality:
+        case Function_PcLuck:
+        case Function_Weather:
+        case Function_Level:
+        case Function_CreatureTarget:
+        case Function_FriendHit:
+        case Function_Fight:
+        case Function_Hello:
+        case Function_Alarm:
+        case Function_Flee:
+        case Function_PcWerewolfKills:
+            mComparisonType = Comparison_Integer;
+            break;
+
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            mComparisonType = Comparison_Numeric;
+            break;
+
+        default:
+            mComparisonType = Comparison_None;
+            break;
+    }
+}
+
+std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getConditionIntRange() const
+{
+    const int IntMax = std::numeric_limits<int>::max();
+    const int IntMin = std::numeric_limits<int>::min();
+    const std::pair<int, int> InvalidRange(IntMax, IntMin);
+
+    int value = mConstSelect.mValue.getInteger();
+
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_NotEqual:
+            return std::pair<int, int>(value, value);
+
+        case Relation_Greater:
+            if (value == IntMax)
+            {
+                return InvalidRange;
+            }
+            else
+            {
+                return std::pair<int, int>(value + 1, IntMax);
+            }
+            break;
+
+        case Relation_GreaterOrEqual:
+            return std::pair<int, int>(value, IntMax);
+
+        case Relation_Less:
+            if (value == IntMin)
+            {
+                return InvalidRange;
+            }
+            else
+            {
+                return std::pair<int, int>(IntMin, value - 1);
+            }
+
+        case Relation_LessOrEqual:
+            return std::pair<int, int>(IntMin, value);
+
+        default:
+            throw std::logic_error("InfoSelectWrapper: relation does not have a range");
+    }
+}
+
+std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getConditionFloatRange() const
+{
+    const float FloatMax = std::numeric_limits<float>::infinity();
+    const float FloatMin = -std::numeric_limits<float>::infinity();
+    const float Epsilon = std::numeric_limits<float>::epsilon();
+    const std::pair<float, float> InvalidRange(FloatMax, FloatMin);
+
+    float value = mConstSelect.mValue.getFloat();
+
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_NotEqual:
+            return std::pair<float, float>(value, value);
+
+        case Relation_Greater:
+            return std::pair<float, float>(value + Epsilon, FloatMax);
+
+        case Relation_GreaterOrEqual:
+            return std::pair<float, float>(value, FloatMax);
+
+        case Relation_Less:
+            return std::pair<float, float>(FloatMin, value - Epsilon);
+
+        case Relation_LessOrEqual:
+            return std::pair<float, float>(FloatMin, value);
+
+        default:
+            throw std::logic_error("InfoSelectWrapper: given relation does not have a range");
+    }
+}
+
+std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
+{
+    const int IntMax = std::numeric_limits<int>::max();
+    const int IntMin = std::numeric_limits<int>::min();
+
+    switch (mFunctionName)
+    {
+        // TODO these need to be checked
+
+        // Boolean
+        case Function_NotId:
+        case Function_NotFaction:
+        case Function_NotClass:
+        case Function_NotRace:
+        case Function_NotCell:
+        case Function_PcExpelled:
+        case Function_PcCommonDisease:
+        case Function_PcBlightDisease:
+        case Function_SameSex:
+        case Function_SameRace:
+        case Function_SameFaction:
+        case Function_Detected:
+        case Function_Alarmed:
+        case Function_PcCorpus:
+        case Function_PcVampire:
+        case Function_Attacked:
+        case Function_TalkedToPc:
+        case Function_ShouldAttack:
+        case Function_Werewolf:
+            return std::pair<int, int>(0,1);
+
+        // Integer
+        case Function_RankLow:
+        case Function_RankHigh:
+        case Function_Reputation:
+        case Function_PcReputation:
+            return std::pair<int, int>(IntMin, IntMax);
+
+        case Function_Journal:
+        case Function_Item:
+        case Function_Dead:
+        case Function_PcLevel:
+        case Function_PcStrength:
+        case Function_PcBlock:
+        case Function_PcArmorer:
+        case Function_PcMediumArmor:
+        case Function_PcHeavyArmor:
+        case Function_PcBluntWeapon:
+        case Function_PcLongBlade:
+        case Function_PcAxe:
+        case Function_PcSpear:
+        case Function_PcAthletics:
+        case Function_PcEnchant:
+        case Function_PcDestruction:
+        case Function_PcAlteration:
+        case Function_PcIllusion:
+        case Function_PcConjuration:
+        case Function_PcMysticism:
+        case Function_PcRestoration:
+        case Function_PcAlchemy:
+        case Function_PcUnarmored:
+        case Function_PcSecurity:
+        case Function_PcSneak:
+        case Function_PcAcrobatics:
+        case Function_PcLightArmor:
+        case Function_PcShortBlade:
+        case Function_PcMarksman:
+        case Function_PcMerchantile:
+        case Function_PcSpeechcraft:
+        case Function_PcHandToHand:
+        case Function_PcClothingModifier:
+        case Function_PcCrimeLevel:
+        case Function_Choice:
+        case Function_PcIntelligence:
+        case Function_PcWillpower:
+        case Function_PcAgility:
+        case Function_PcSpeed:
+        case Function_PcEndurance:
+        case Function_PcPersonality:
+        case Function_PcLuck:
+        case Function_Level:
+        case Function_Fight:
+        case Function_Hello:
+        case Function_Alarm:
+        case Function_Flee:
+        case Function_PcWerewolfKills:
+            return std::pair<int, int>(0, IntMax);
+
+        case Function_Weather:
+            return std::pair<int, int>(0, 9);
+
+        case Function_FriendHit:
+            return std::pair<int, int>(0,4);
+
+        case Function_RankRequirement:
+            return std::pair<int, int>(0, 3);
+
+        case Function_CreatureTarget:
+            return std::pair<int, int>(0,2);
+
+        case Function_PcGender:
+            return std::pair<int, int>(0,1);
+
+        case Function_FactionRankDifference:
+            return std::pair<int, int>(-9, 9);
+
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+            return std::pair<int, int>(IntMin, IntMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<int, int>(0, 100);
+
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            return std::pair<int, int>(0,0);
+
+        default:
+            throw std::runtime_error("InfoSelectWrapper: function does not exist");
+    }
+}
+
+std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getValidFloatRange() const
+{
+    const float FloatMax = std::numeric_limits<float>::infinity();
+    const float FloatMin = -std::numeric_limits<float>::infinity();
+
+    switch (mFunctionName)
+    {
+        // Numeric
+        case Function_Global:
+        case Function_Local:
+        case Function_NotLocal:
+            return std::pair<float, float>(FloatMin, FloatMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<float, float>(0, 100);
+
+        case Function_PcMagicka:
+        case Function_PcFatigue:
+        case Function_PcHealth:
+            return std::pair<float, float>(0,0);
+
+        default:
+            throw std::runtime_error("InfoSelectWrapper: function does not exist or is not numeric");
+    }
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangeContains(T1 value, std::pair<T2,T2> range) const
+{
+    return (value >= range.first && value <= range.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangesOverlap(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+{
+    // One of the bounds of either range should fall within the other range
+    return
+        (range1.first <= range2.first  && range2.first  <= range1.second) ||
+        (range1.first <= range2.second && range2.second <= range1.second) ||
+        (range2.first <= range1.first  && range1.first  <= range2.second) ||
+        (range2.first <= range1.second && range1.second <= range2.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangesMatch(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
+{
+    return (range1.first == range2.first  && range1.second == range2.second);
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(std::pair<T1,T1> conditionRange,
+    std::pair<T2,T2> validRange) const
+{
+
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_Greater:
+        case Relation_GreaterOrEqual:
+        case Relation_Less:
+        case Relation_LessOrEqual:
+            // If ranges are same, it will always be true
+            return rangesMatch(conditionRange, validRange);
+
+        case Relation_NotEqual:
+            // If value is not within range, it will always be true
+            return !rangeContains(conditionRange.first, validRange);
+
+        default:
+            throw std::logic_error("InfoCondition: operator can not be used to compare");
+    }
+
+    return false;
+}
+
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> conditionRange,
+    std::pair<T2,T2> validRange) const
+{
+    switch (mRelationType)
+    {
+        case Relation_Equal:
+        case Relation_Greater:
+        case Relation_GreaterOrEqual:
+        case Relation_Less:
+        case Relation_LessOrEqual:
+            // If ranges do not overlap, it will never be true
+            return !rangesOverlap(conditionRange, validRange);
+
+        case Relation_NotEqual:
+            // If the value is the only value withing the range, it will never be true
+            return rangesOverlap(conditionRange, validRange);
+
+        default:
+            throw std::logic_error("InfoCondition: operator can not be used to compare");
+    }
+
+    return false;
+}
+
+// InfoSelectWrapper
+
+CSMWorld::InfoSelectWrapper::InfoSelectWrapper(ESM::DialInfo::SelectStruct& select)
+    : CSMWorld::ConstInfoSelectWrapper(select), mSelect(select)
+{
+}
+
+void CSMWorld::InfoSelectWrapper::setFunctionName(FunctionName name)
+{
+    mFunctionName = name;
+    updateHasVariable();
+    updateComparisonType();
+}
+
+void CSMWorld::InfoSelectWrapper::setRelationType(RelationType type)
+{
+    mRelationType = type;
+}
+
+void CSMWorld::InfoSelectWrapper::setVariableName(const std::string& name)
+{
+    mVariableName = name;
+}
+
+void CSMWorld::InfoSelectWrapper::setDefaults()
+{
+    if (!variantTypeIsValid())
+        mSelect.mValue.setType(ESM::VT_Int);
+
+    switch (mComparisonType)
+    {
+        case Comparison_Boolean:
+            setRelationType(Relation_Equal);
+            mSelect.mValue.setInteger(1);
+            break;
+
+        case Comparison_Integer:
+        case Comparison_Numeric:
+            setRelationType(Relation_Greater);
+            mSelect.mValue.setInteger(0);
+            break;
+
+        default:
+            // Do nothing
+            break;
+    }
+
+    update();
+}
+
+void CSMWorld::InfoSelectWrapper::update()
+{
+    std::ostringstream stream;
+
+    // Leading 0
+    stream << '0';
+
+    // Write Function
+
+    bool writeIndex = false;
+    int functionIndex = static_cast<int>(mFunctionName);
+
+    switch (mFunctionName)
+    {
+        case Function_None:         stream << '0'; break;
+        case Function_Global:       stream << '2'; break;
+        case Function_Local:        stream << '3'; break;
+        case Function_Journal:      stream << '4'; break;
+        case Function_Item:         stream << '5'; break;
+        case Function_Dead:         stream << '6'; break;
+        case Function_NotId:        stream << '7'; break;
+        case Function_NotFaction:   stream << '8'; break;
+        case Function_NotClass:     stream << '9'; break;
+        case Function_NotRace:      stream << 'A'; break;
+        case Function_NotCell:      stream << 'B'; break;
+        case Function_NotLocal:     stream << 'C'; break;
+        default:                    stream << '1'; writeIndex = true; break;
+    }
+
+    if (writeIndex && functionIndex < 10) // leading 0
+        stream << '0' << functionIndex;
+    else if (writeIndex)
+        stream << functionIndex;
+    else
+        stream << "00";
+
+    // Write Relation
+    switch (mRelationType)
+    {
+        case Relation_Equal:            stream << '0'; break;
+        case Relation_NotEqual:         stream << '1'; break;
+        case Relation_Greater:          stream << '2'; break;
+        case Relation_GreaterOrEqual:   stream << '3'; break;
+        case Relation_Less:             stream << '4'; break;
+        case Relation_LessOrEqual:      stream << '5'; break;
+        default:                        stream << '0'; break;
+    }
+
+    if (mHasVariable)
+        stream << mVariableName;
+
+    mSelect.mSelectRule = stream.str();
+}
+
+ESM::Variant& CSMWorld::InfoSelectWrapper::getVariant()
+{
+    return mSelect.mValue;
+}
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
new file mode 100644
index 0000000000..8ccae0efa5
--- /dev/null
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -0,0 +1,238 @@
+#ifndef CSM_WORLD_INFOSELECTWRAPPER_H
+#define CSM_WORLD_INFOSELECTWRAPPER_H
+
+#include <components/esm/loadinfo.hpp>
+
+namespace CSMWorld
+{
+    // ESM::DialInfo::SelectStruct.mSelectRule
+    // 012345...
+    // ^^^ ^^
+    // ||| ||
+    // ||| |+------------- condition variable string
+    // ||| +-------------- comparison type, ['0'..'5']; e.g. !=, <, >=, etc
+    // ||+---------------- function index (encoded, where function == '1')
+    // |+----------------- function, ['1'..'C']; e.g. Global, Local, Not ID, etc
+    // +------------------ unknown
+    //
+
+    // Wrapper for DialInfo::SelectStruct
+    class ConstInfoSelectWrapper
+    {
+    public:
+
+        // Order matters
+        enum FunctionName
+        {
+            Function_RankLow=0,
+            Function_RankHigh,
+            Function_RankRequirement,
+            Function_Reputation,
+            Function_Health_Percent,
+            Function_PcReputation,
+            Function_PcLevel,
+            Function_PcHealthPercent,
+            Function_PcMagicka,
+            Function_PcFatigue,
+            Function_PcStrength,
+            Function_PcBlock,
+            Function_PcArmorer,
+            Function_PcMediumArmor,
+            Function_PcHeavyArmor,
+            Function_PcBluntWeapon,
+            Function_PcLongBlade,
+            Function_PcAxe,
+            Function_PcSpear,
+            Function_PcAthletics,
+            Function_PcEnchant,
+            Function_PcDestruction,
+            Function_PcAlteration,
+            Function_PcIllusion,
+            Function_PcConjuration,
+            Function_PcMysticism,
+            Function_PcRestoration,
+            Function_PcAlchemy,
+            Function_PcUnarmored,
+            Function_PcSecurity,
+            Function_PcSneak,
+            Function_PcAcrobatics,
+            Function_PcLightArmor,
+            Function_PcShortBlade,
+            Function_PcMarksman,
+            Function_PcMerchantile,
+            Function_PcSpeechcraft,
+            Function_PcHandToHand,
+            Function_PcGender,
+            Function_PcExpelled,
+            Function_PcCommonDisease,
+            Function_PcBlightDisease,
+            Function_PcClothingModifier,
+            Function_PcCrimeLevel,
+            Function_SameSex,
+            Function_SameRace,
+            Function_SameFaction,
+            Function_FactionRankDifference,
+            Function_Detected,
+            Function_Alarmed,
+            Function_Choice,
+            Function_PcIntelligence,
+            Function_PcWillpower,
+            Function_PcAgility,
+            Function_PcSpeed,
+            Function_PcEndurance,
+            Function_PcPersonality,
+            Function_PcLuck,
+            Function_PcCorpus,
+            Function_Weather,
+            Function_PcVampire,
+            Function_Level,
+            Function_Attacked,
+            Function_TalkedToPc,
+            Function_PcHealth,
+            Function_CreatureTarget,
+            Function_FriendHit,
+            Function_Fight,
+            Function_Hello,
+            Function_Alarm,
+            Function_Flee,
+            Function_ShouldAttack,
+            Function_Werewolf,
+            Function_PcWerewolfKills=73,
+
+            Function_Global,
+            Function_Local,
+            Function_Journal,
+            Function_Item,
+            Function_Dead,
+            Function_NotId,
+            Function_NotFaction,
+            Function_NotClass,
+            Function_NotRace,
+            Function_NotCell,
+            Function_NotLocal,
+
+            Function_None
+        };
+
+        enum RelationType
+        {
+            Relation_Equal,
+            Relation_NotEqual,
+            Relation_Greater,
+            Relation_GreaterOrEqual,
+            Relation_Less,
+            Relation_LessOrEqual,
+
+            Relation_None
+        };
+
+        enum ComparisonType
+        {
+            Comparison_Boolean,
+            Comparison_Integer,
+            Comparison_Numeric,
+
+            Comparison_None
+        };
+
+        static const size_t RuleMinSize;
+
+        static const size_t FunctionPrefixOffset;
+        static const size_t FunctionIndexOffset;
+        static const size_t RelationIndexOffset;
+        static const size_t VarNameOffset;
+
+        static const char* FunctionEnumStrings[];
+        static const char* RelationEnumStrings[];
+        static const char* ComparisonEnumStrings[];
+
+        static std::string convertToString(FunctionName name);
+        static std::string convertToString(RelationType type);
+        static std::string convertToString(ComparisonType type);
+
+        ConstInfoSelectWrapper(const ESM::DialInfo::SelectStruct& select);
+
+        FunctionName getFunctionName() const;
+        RelationType getRelationType() const;
+        ComparisonType getComparisonType() const;
+
+        bool hasVariable() const;
+        const std::string& getVariableName() const;
+
+        bool conditionIsAlwaysTrue() const;
+        bool conditionIsNeverTrue() const;
+        bool variantTypeIsValid() const;
+
+        const ESM::Variant& getVariant() const;
+
+    protected:
+
+        void readRule();
+        void readFunctionName();
+        void readRelationType();
+        void readVariableName();
+        void updateHasVariable();
+        void updateComparisonType();
+
+        std::pair<int, int> getConditionIntRange() const;
+        std::pair<float, float> getConditionFloatRange() const;
+
+        std::pair<int, int> getValidIntRange() const;
+        std::pair<float, float> getValidFloatRange() const;
+
+        template <typename Type1, typename Type2>
+        bool rangeContains(Type1 value, std::pair<Type2,Type2> range) const;
+
+        template <typename Type1, typename Type2>
+        bool rangesOverlap(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+
+        template <typename Type1, typename Type2>
+        bool rangesMatch(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
+
+        template <typename Type1, typename Type2>
+        bool conditionIsAlwaysTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+
+        template <typename Type1, typename Type2>
+        bool conditionIsNeverTrue(std::pair<Type1,Type1> conditionRange, std::pair<Type2,Type2> validRange) const;
+
+        FunctionName mFunctionName;
+        RelationType mRelationType;
+        ComparisonType mComparisonType;
+
+        bool mHasVariable;
+        std::string mVariableName;
+
+    private:
+
+        const ESM::DialInfo::SelectStruct& mConstSelect;
+    };
+
+    // Wrapper for DialInfo::SelectStruct that can modify the wrapped select struct
+    class InfoSelectWrapper : public ConstInfoSelectWrapper
+    {
+    public:
+
+        InfoSelectWrapper(ESM::DialInfo::SelectStruct& select);
+
+        // Wrapped SelectStruct will not be modified until update() is called
+        void setFunctionName(FunctionName name);
+        void setRelationType(RelationType type);
+        void setVariableName(const std::string& name);
+
+        // Modified wrapped SelectStruct
+        void update();
+
+        // This sets properties based on the function name to its defaults and updates the wrapped object
+        void setDefaults();
+
+        ESM::Variant& getVariant();
+
+    private:
+
+        ESM::DialInfo::SelectStruct& mSelect;
+
+        void writeRule();
+    };
+}
+
+#endif

From ed57293e5488b6ff57c13e5cac147195ab965f5a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 14:55:13 +0100
Subject: [PATCH 269/765] Allow '^' escape characters in books

http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
---
 components/interpreter/defines.cpp | 19 ++++++++++---------
 components/interpreter/defines.hpp |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index 2ceb857c40..a700253b65 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -26,13 +26,14 @@ namespace Interpreter{
         return a.length() > b.length();
     }
 
-    std::string fixDefinesReal(std::string text, char eschar, bool isBook, Context& context)
+    std::string fixDefinesReal(std::string text, bool dialogue, Context& context)
     {
         unsigned int start = 0;
         std::ostringstream retval;
         for(unsigned int i = 0; i < text.length(); i++)
         {
-            if(text[i] == eschar)
+            char eschar = text[i];
+            if(eschar == '%' || eschar == '^')
             {
                 retval << text.substr(start, i - start);
                 std::string temp = Misc::StringUtils::lowerCase(text.substr(i+1, 100));
@@ -113,7 +114,7 @@ namespace Interpreter{
                         retval << context.getCurrentCellName();
                     }
 
-                    else if(eschar == '%' && !isBook) { // In Dialogue, not messagebox
+                    else if(!dialogue) { // In Dialogue, not messagebox
                         if(     (found = check(temp, "faction", &i, &start))){
                             retval << context.getNPCFaction();
                         }
@@ -207,15 +208,15 @@ namespace Interpreter{
         return retval.str ();
     }
 
-    std::string fixDefinesDialog(std::string text, Context& context){
-        return fixDefinesReal(text, '%', false, context);
+    std::string fixDefinesDialog(const std::string& text, Context& context){
+        return fixDefinesReal(text, true, context);
     }
 
-    std::string fixDefinesMsgBox(std::string text, Context& context){
-        return fixDefinesReal(text, '^', false, context);
+    std::string fixDefinesMsgBox(const std::string& text, Context& context){
+        return fixDefinesReal(text, false, context);
     }
 
-    std::string fixDefinesBook(std::string text, Context& context){
-        return fixDefinesReal(text, '%', true, context);
+    std::string fixDefinesBook(const std::string& text, Context& context){
+        return fixDefinesReal(text, false, context);
     }
 }
diff --git a/components/interpreter/defines.hpp b/components/interpreter/defines.hpp
index 00c4386b88..3471b20305 100644
--- a/components/interpreter/defines.hpp
+++ b/components/interpreter/defines.hpp
@@ -5,9 +5,9 @@
 #include "context.hpp"
 
 namespace Interpreter{
-    std::string fixDefinesDialog(std::string text, Context& context);
-    std::string fixDefinesMsgBox(std::string text, Context& context);
-    std::string fixDefinesBook(std::string text, Context& context);
+    std::string fixDefinesDialog(const std::string& text, Context& context);
+    std::string fixDefinesMsgBox(const std::string& text, Context& context);
+    std::string fixDefinesBook(const std::string& text, Context& context);
 }
 
 #endif

From dececf6c3878d555e94dd548c7a5f5e58c0e4efd Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 16 Feb 2016 16:02:29 +0100
Subject: [PATCH 270/765] instance moving via drag in 3D scenes

---
 apps/opencs/CMakeLists.txt                    |   2 +-
 apps/opencs/view/render/cell.cpp              |  13 ++
 apps/opencs/view/render/cell.hpp              |   2 +
 apps/opencs/view/render/instancemode.cpp      | 160 +++++++++++++++++-
 apps/opencs/view/render/instancemode.hpp      |  19 +++
 apps/opencs/view/render/instancemovemode.cpp  |  12 ++
 apps/opencs/view/render/instancemovemode.hpp  |  18 ++
 apps/opencs/view/render/object.cpp            | 137 ++++++++++++++-
 apps/opencs/view/render/object.hpp            |  40 ++++-
 .../view/render/pagedworldspacewidget.cpp     |  17 ++
 .../view/render/pagedworldspacewidget.hpp     |   3 +
 apps/opencs/view/render/scenewidget.cpp       |   6 +
 apps/opencs/view/render/scenewidget.hpp       |   3 +
 .../view/render/unpagedworldspacewidget.cpp   |   6 +
 .../view/render/unpagedworldspacewidget.hpp   |   3 +
 apps/opencs/view/render/worldspacewidget.hpp  |   3 +
 16 files changed, 428 insertions(+), 16 deletions(-)
 create mode 100644 apps/opencs/view/render/instancemovemode.cpp
 create mode 100644 apps/opencs/view/render/instancemovemode.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 6401e42222..ce02160662 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -85,7 +85,7 @@ opencs_units (view/widget
 
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
-    previewwidget editmode instancemode instanceselectionmode
+    previewwidget editmode instancemode instanceselectionmode instancemovemode
     )
 
 opencs_units_noqt (view/render
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index e7b135891a..d666304fac 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -338,3 +338,16 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (un
 
     return result;
 }
+
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getEdited (unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<TagBase> > result;
+
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+            if (iter->second->isEdited())
+                result.push_back (iter->second->getTag());
+
+    return result;
+}
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 22f9872e3d..6cdafbf36d 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -116,6 +116,8 @@ namespace CSVRender
             bool isDeleted() const;
 
             std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) const;
+
+            std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) const;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 4b6b2e41f8..f2fb552b00 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -18,10 +18,11 @@
 #include "worldspacewidget.hpp"
 #include "pagedworldspacewidget.hpp"
 #include "instanceselectionmode.hpp"
+#include "instancemovemode.hpp"
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0)
+  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None)
 {
 }
 
@@ -30,12 +31,7 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     if (!mSubMode)
     {
         mSubMode = new CSVWidget::SceneToolMode (toolbar, "Edit Sub-Mode");
-        mSubMode->addButton (":placeholder", "move",
-            "Move selected instances"
-            "<ul><li>Use primary edit to move instances around freely</li>"
-            "<li>Use secondary edit to move instances around within the grid</li>"
-            "</ul>"
-            "<font color=Red>Not implemented yet</font color>");
+        mSubMode->addButton (new InstanceMoveMode (this), "move");
         mSubMode->addButton (":placeholder", "rotate",
             "Rotate selected instances"
             "<ul><li>Use primary edit to rotate instances freely</li>"
@@ -53,6 +49,8 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
     if (!mSelectionMode)
         mSelectionMode = new InstanceSelectionMode (toolbar, getWorldspaceWidget());
 
+    mDragMode = DragMode_None;
+
     EditMode::activate (toolbar);
 
     toolbar->addTool (mSubMode);
@@ -120,6 +118,154 @@ void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
     }
 }
 
+bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+{
+    if (mDragMode!=DragMode_None)
+        return false;
+
+    if (tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+    {
+        getWorldspaceWidget().clearSelection (Mask_Reference);
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        {
+            CSVRender::Object* object = objectTag->mObject;
+            object->setSelected (true);
+        }
+    }
+
+    std::vector<osg::ref_ptr<TagBase> > selection =
+        getWorldspaceWidget().getSelection (Mask_Reference);
+
+    if (selection.empty())
+        return false;
+
+    // \todo check for sub-mode
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+        iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            objectTag->mObject->setEdited (Object::Override_Position);
+        }
+    }
+
+    mDragMode = DragMode_Move;
+
+    return true;
+}
+
+bool CSVRender::InstanceMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+{
+
+    return false;
+}
+
+void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
+{
+    switch (mDragMode)
+    {
+        case DragMode_Move:
+        {
+            osg::Vec3f eye;
+            osg::Vec3f centre;
+            osg::Vec3f up;
+
+            getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+            osg::Vec3f offset;
+
+            if (diffY)
+                offset += up * diffY * speedFactor;
+
+            if (diffX)
+                offset += ((centre-eye) ^ up) * diffX * speedFactor;
+
+            std::vector<osg::ref_ptr<TagBase> > selection =
+                getWorldspaceWidget().getEdited (Mask_Reference);
+
+            for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+                iter!=selection.end(); ++iter)
+            {
+                if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+                {
+                    ESM::Position position = objectTag->mObject->getPosition();
+                    for (int i=0; i<3; ++i)
+                        position.pos[i] += offset[i];
+                    objectTag->mObject->setPosition (position.pos);
+                }
+            }
+
+            break;
+        }
+
+        case DragMode_None: break;
+    }
+}
+
+void CSVRender::InstanceMode::dragCompleted()
+{
+    std::vector<osg::ref_ptr<TagBase> > selection =
+        getWorldspaceWidget().getEdited (Mask_Reference);
+
+    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+
+    QString description;
+
+    switch (mDragMode)
+    {
+        case DragMode_Move: description = "Move Instances"; break;
+
+        case DragMode_None: break;
+    }
+
+    undoStack.beginMacro (description);
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+        iter!=selection.end(); ++iter)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+        {
+            objectTag->mObject->apply (undoStack);
+        }
+    }
+
+    undoStack.endMacro();
+
+    mDragMode = DragMode_None;
+}
+
+void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
+{
+    if (mDragMode==DragMode_Move)
+    {
+        osg::Vec3f eye;
+        osg::Vec3f centre;
+        osg::Vec3f up;
+
+        getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+        osg::Vec3f offset = centre - eye;
+        offset.normalize();
+        offset *= diff * speedFactor;
+
+        std::vector<osg::ref_ptr<TagBase> > selection =
+            getWorldspaceWidget().getEdited (Mask_Reference);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
+            iter!=selection.end(); ++iter)
+        {
+            if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
+            {
+                ESM::Position position = objectTag->mObject->getPosition();
+                for (int i=0; i<3; ++i)
+                    position.pos[i] += offset[i];
+                objectTag->mObject->setPosition (position.pos);
+            }
+        }
+    }
+}
+
 void CSVRender::InstanceMode::dragEnterEvent (QDragEnterEvent *event)
 {
     if (const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData()))
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 78836878a4..7662a0cdc3 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -15,8 +15,17 @@ namespace CSVRender
     class InstanceMode : public EditMode
     {
             Q_OBJECT
+
+            enum DragMode
+            {
+                DragMode_None,
+                DragMode_Move
+
+            };
+
             CSVWidget::SceneToolMode *mSubMode;
             InstanceSelectionMode *mSelectionMode;
+            DragMode mDragMode;
 
         public:
 
@@ -34,6 +43,16 @@ namespace CSVRender
 
             virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
 
+            virtual bool primaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+
+            virtual bool secondaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+
+            virtual void drag (int diffX, int diffY, double speedFactor);
+
+            virtual void dragCompleted();
+
+            virtual void dragWheel (int diff, double speedFactor);
+
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
             virtual void dropEvent (QDropEvent* event);
diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
new file mode 100644
index 0000000000..fd42b9f699
--- /dev/null
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -0,0 +1,12 @@
+
+#include "instancemovemode.hpp"
+
+CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
+: ModeButton (QIcon (QPixmap (":placeholder")),
+  "Move selected instances"
+  "<ul><li>Use primary edit to move instances around freely</li>"
+  "<li>Use secondary edit to move instances around within the grid</li>"
+  "</ul>"
+  "<font color=Red>Not implemented yet</font color>",
+  parent)
+{}
diff --git a/apps/opencs/view/render/instancemovemode.hpp b/apps/opencs/view/render/instancemovemode.hpp
new file mode 100644
index 0000000000..bd0e28dac8
--- /dev/null
+++ b/apps/opencs/view/render/instancemovemode.hpp
@@ -0,0 +1,18 @@
+#ifndef CSV_RENDER_INSTANCEMOVEMODE_H
+#define CSV_RENDER_INSTANCEMOVEMODE_H
+
+#include "../widget/modebutton.hpp"
+
+namespace CSVRender
+{
+    class InstanceMoveMode : public CSVWidget::ModeButton
+    {
+            Q_OBJECT
+
+        public:
+
+            InstanceMoveMode (QWidget *parent = 0);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 33939625d4..1e2fd26400 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -15,6 +15,8 @@
 #include "../../model/world/data.hpp"
 #include "../../model/world/ref.hpp"
 #include "../../model/world/refidcollection.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/universalid.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
@@ -130,18 +132,20 @@ void CSVRender::Object::adjustTransform()
     if (mReferenceId.empty())
         return;
 
-    const CSMWorld::CellRef& reference = getReference();
+    ESM::Position position = getPosition();
 
     // position
-    mBaseNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(reference.mPos.pos[0], reference.mPos.pos[1], reference.mPos.pos[2]));
+    mBaseNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
 
     // orientation
-    osg::Quat xr (-reference.mPos.rot[0], osg::Vec3f(1,0,0));
-    osg::Quat yr (-reference.mPos.rot[1], osg::Vec3f(0,1,0));
-    osg::Quat zr (-reference.mPos.rot[2], osg::Vec3f(0,0,1));
+    osg::Quat xr (-position.rot[0], osg::Vec3f(1,0,0));
+    osg::Quat yr (-position.rot[1], osg::Vec3f(0,1,0));
+    osg::Quat zr (-position.rot[2], osg::Vec3f(0,0,1));
     mBaseNode->setAttitude(zr*yr*xr);
 
-    mBaseNode->setScale(osg::Vec3(reference.mScale, reference.mScale, reference.mScale));
+    float scale = getScale();
+
+    mBaseNode->setScale(osg::Vec3(scale, scale, scale));
 }
 
 const CSMWorld::CellRef& CSVRender::Object::getReference() const
@@ -154,7 +158,8 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const
 
 CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     const std::string& id, bool referenceable, bool forceBaseToZero)
-: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero)
+: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
+  mScaleOverride (1), mOverrideFlags (0)
 {
     mBaseNode = new osg::PositionAttitudeTransform;
     mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
@@ -290,3 +295,121 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::Object::getTag() const
 {
     return static_cast<CSVRender::TagBase *> (mBaseNode->getUserData());
 }
+
+bool CSVRender::Object::isEdited() const
+{
+    return mOverrideFlags;
+}
+
+void CSVRender::Object::setEdited (int flags)
+{
+    bool discard = mOverrideFlags & ~flags;
+    int added = flags & ~mOverrideFlags;
+
+    mOverrideFlags = flags;
+
+    if (added & Override_Position)
+        for (int i=0; i<3; ++i)
+            mPositionOverride.pos[i] = getReference().mPos.pos[i];
+
+    if (added & Override_Rotation)
+        for (int i=0; i<3; ++i)
+            mPositionOverride.rot[i] = getReference().mPos.rot[i];
+
+    if (added & Override_Scale)
+        mScaleOverride = getReference().mScale;
+
+    if (discard)
+        adjustTransform();
+}
+
+ESM::Position CSVRender::Object::getPosition() const
+{
+    ESM::Position position = getReference().mPos;
+
+    if (mOverrideFlags & Override_Position)
+        for (int i=0; i<3; ++i)
+            position.pos[i] = mPositionOverride.pos[i];
+
+    if (mOverrideFlags & Override_Rotation)
+        for (int i=0; i<3; ++i)
+            position.rot[i] = mPositionOverride.rot[i];
+
+    return position;
+}
+
+float CSVRender::Object::getScale() const
+{
+    return mOverrideFlags & Override_Scale ? mScaleOverride : getReference().mScale;
+}
+
+void CSVRender::Object::setPosition (const float position[3])
+{
+    mOverrideFlags |= Override_Position;
+
+    for (int i=0; i<3; ++i)
+        mPositionOverride.pos[i] = position[i];
+
+    adjustTransform();
+}
+
+void CSVRender::Object::setRotation (const float rotation[3])
+{
+    mOverrideFlags |= Override_Rotation;
+
+    for (int i=0; i<3; ++i)
+        mPositionOverride.rot[i] = rotation[i];
+
+    adjustTransform();
+}
+
+void CSVRender::Object::setScale (float scale)
+{
+    mOverrideFlags |= Override_Scale;
+
+    mScaleOverride = scale;
+
+    adjustTransform();
+}
+
+void CSVRender::Object::apply (QUndoStack& undoStack)
+{
+    const CSMWorld::RefCollection& collection = mData.getReferences();
+    QAbstractItemModel *model = mData.getTableModel (CSMWorld::UniversalId::Type_References);
+
+    int recordIndex = collection.getIndex (mReferenceId);
+
+    if (mOverrideFlags & Override_Position)
+    {
+        for (int i=0; i<3; ++i)
+        {
+            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+                CSMWorld::Columns::ColumnId_PositionXPos+i));
+
+            undoStack.push (new CSMWorld::ModifyCommand (*model,
+                model->index (recordIndex, column), mPositionOverride.pos[i]));
+        }
+    }
+
+    if (mOverrideFlags & Override_Rotation)
+    {
+        for (int i=0; i<3; ++i)
+        {
+            int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+                CSMWorld::Columns::ColumnId_PositionXRot+i));
+
+            undoStack.push (new CSMWorld::ModifyCommand (*model,
+                model->index (recordIndex, column), mPositionOverride.rot[i]));
+        }
+    }
+
+    if (mOverrideFlags & Override_Scale)
+    {
+        int column = collection.findColumnIndex (CSMWorld::Columns::ColumnId_Scale);
+
+        undoStack.push (new CSMWorld::ModifyCommand (*model,
+            model->index (recordIndex, column), mScaleOverride));
+    }
+
+    mOverrideFlags = 0;
+}
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 4a89fe201f..accdb93e0f 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -8,9 +8,12 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
+#include <components/esm/defs.hpp>
+
 #include "tagbase.hpp"
 
 class QModelIndex;
+class QUndoStack;
 
 namespace osg
 {
@@ -53,7 +56,18 @@ namespace CSVRender
 
     class Object
     {
-            const CSMWorld::Data& mData;
+        public:
+
+            enum OverrideFlags
+            {
+                Override_Position = 1,
+                Override_Rotation = 2,
+                Override_Scale = 4
+            };
+
+        private:
+
+            CSMWorld::Data& mData;
             std::string mReferenceId;
             std::string mReferenceableId;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
@@ -62,6 +76,9 @@ namespace CSVRender
             osg::Group* mParentNode;
             Resource::ResourceSystem* mResourceSystem;
             bool mForceBaseToZero;
+            ESM::Position mPositionOverride;
+            int mScaleOverride;
+            int mOverrideFlags;
 
             /// Not implemented
             Object (const Object&);
@@ -116,6 +133,27 @@ namespace CSVRender
             std::string getReferenceableId() const;
 
             osg::ref_ptr<TagBase> getTag() const;
+
+            /// Is there currently an editing operation running on this object?
+            bool isEdited() const;
+
+            void setEdited (int flags);
+
+            ESM::Position getPosition() const;
+
+            float getScale() const;
+
+            /// Set override position.
+            void setPosition (const float position[3]);
+
+            /// Set override rotation
+            void setRotation (const float rotation[3]);
+
+            /// Set override scale
+            void setScale (float scale);
+
+            /// Apply override changes via command and end edit mode
+            void apply (QUndoStack& undoStack);
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index d71446d0b3..cbba9ef5d9 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -555,6 +555,23 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget:
     return result;
 }
 
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getEdited (
+    unsigned int elementMask) const
+{
+    std::vector<osg::ref_ptr<CSVRender::TagBase> > result;
+
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+    {
+        std::vector<osg::ref_ptr<CSVRender::TagBase> > cellResult =
+            iter->second->getEdited (elementMask);
+
+        result.insert (result.end(), cellResult.begin(), cellResult.end());
+    }
+
+    return result;
+}
+
 CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 419a2a46a2..baec96b039 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -112,6 +112,9 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const;
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index ba31c9b8bc..55d9c8195c 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -120,6 +120,12 @@ bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
     return QObject::eventFilter(obj, event);
 }
 
+osg::Camera *RenderWidget::getCamera()
+{
+    return mView->getCamera();
+}
+
+
 // --------------------------------------------------
 
 CompositeViewer::CompositeViewer()
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 63da01a45b..07a7d76008 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -21,6 +21,7 @@ namespace Resource
 namespace osg
 {
     class Group;
+    class Camera;
 }
 
 namespace CSVWidget
@@ -47,6 +48,8 @@ namespace CSVRender
 
         bool eventFilter(QObject *, QEvent *);
 
+        osg::Camera *getCamera();
+
     protected:
 
         osg::ref_ptr<osgViewer::View> mView;
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 8d65c36948..4a7723d2f2 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -131,6 +131,12 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidge
     return mCell->getSelection (elementMask);
 }
 
+std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getEdited (
+    unsigned int elementMask) const
+{
+    return mCell->getEdited (elementMask);
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index a4c517948d..f7b583f3da 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -60,6 +60,9 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const;
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index ac6426b42e..67f585e03c 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -152,6 +152,9 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const = 0;
 
+            virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
+                const = 0;
+
         protected:
 
             /// Visual elements in a scene

From 63665104bfdd458c7a791f579aafccebdf2b1592 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 18:19:17 +0100
Subject: [PATCH 271/765] Remove optimization build flags on Travis-CI to speed
 up the build

---
 CI/before_script.linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 17667ad28a..93be1cb48e 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -5,4 +5,4 @@ mkdir build
 cd build
 export CODE_COVERAGE=1
 if [ "${CC}" = "clang" ]; then export CODE_COVERAGE=0; fi
-${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_SYSTEM_TINYXML=TRUE
+${ANALYZE}cmake .. -DBUILD_WITH_CODE_COVERAGE=${CODE_COVERAGE} -DBUILD_UNITTESTS=1 -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=/usr/games  -DCMAKE_BUILD_TYPE="None" -DUSE_SYSTEM_TINYXML=TRUE

From c4d38bb42df4c734b20c2567ab5b79808bf8728b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 19:17:04 +0100
Subject: [PATCH 272/765] Fix clang analyzer warnings

---
 apps/opencs/model/prefs/state.hpp              |  2 +-
 apps/opencs/model/world/refidadapterimp.cpp    | 18 +++++++++---------
 apps/openmw/mwgui/settingswindow.cpp           |  7 -------
 apps/openmw/mwmechanics/actors.cpp             |  2 +-
 apps/openmw/mwmechanics/aiescort.cpp           |  2 +-
 apps/openmw/mwmechanics/aiescort.hpp           |  2 +-
 apps/openmw/mwmechanics/aifollow.cpp           |  2 +-
 apps/openmw/mwmechanics/aifollow.hpp           |  4 ++--
 apps/openmw/mwmechanics/aipackage.cpp          |  2 +-
 apps/openmw/mwmechanics/aipackage.hpp          |  2 +-
 apps/openmw/mwmechanics/aisequence.cpp         |  8 +++-----
 .../openmw/mwmechanics/mechanicsmanagerimp.cpp |  2 +-
 apps/openmw/mwmechanics/spellcasting.cpp       |  7 -------
 components/resource/scenemanager.cpp           | 18 +++++++++---------
 components/sceneutil/lightutil.hpp             |  2 +-
 components/vfs/bsaarchive.hpp                  |  2 +-
 16 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/apps/opencs/model/prefs/state.hpp b/apps/opencs/model/prefs/state.hpp
index bcd76c6712..fffadee5e6 100644
--- a/apps/opencs/model/prefs/state.hpp
+++ b/apps/opencs/model/prefs/state.hpp
@@ -1,4 +1,4 @@
-#ifndef CSV_PREFS_STATE_H
+#ifndef CSM_PREFS_STATE_H
 #define CSM_PREFS_STATE_H
 
 #include <map>
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 039624c84b..7885bf5958 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -108,7 +108,7 @@ void CSMWorld::IngredEffectRefIdAdapter::setNestedTable (const RefIdColumn* colu
     ESM::Ingredient ingredient = record.get();
 
     ingredient.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Ingredient::IRDTstruct> >&>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >&>(nestedTable).mNestedTable.at(0);
 
     record.setModified (ingredient);
 }
@@ -120,11 +120,11 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::IngredEffectRefIdAdapter::nestedTabl
         static_cast<const Record<ESM::Ingredient>&> (data.getRecord (RefIdData::LocalIndex (index, mType)));
 
     // return the whole struct
-    std::vector<typename ESM::Ingredient::IRDTstruct> wrap;
+    std::vector<ESM::Ingredient::IRDTstruct> wrap;
     wrap.push_back(record.get().mData);
 
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Ingredient::IRDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Ingredient::IRDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::IngredEffectRefIdAdapter::getNestedData (const RefIdColumn *column,
@@ -1129,7 +1129,7 @@ void CSMWorld::CreatureAttributesRefIdAdapter::setNestedTable (const RefIdColumn
 
     // store the whole struct
     creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
 
     record.setModified (creature);
 }
@@ -1141,10 +1141,10 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttributesRefIdAdapter::nest
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
     // return the whole struct
-    std::vector<typename ESM::Creature::NPDTstruct> wrap;
+    std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::CreatureAttributesRefIdAdapter::getNestedData (const RefIdColumn *column,
@@ -1235,7 +1235,7 @@ void CSMWorld::CreatureAttackRefIdAdapter::setNestedTable (const RefIdColumn* co
 
     // store the whole struct
     creature.mData =
-        static_cast<const NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
+        static_cast<const NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> > &>(nestedTable).mNestedTable.at(0);
 
     record.setModified (creature);
 }
@@ -1247,10 +1247,10 @@ CSMWorld::NestedTableWrapperBase* CSMWorld::CreatureAttackRefIdAdapter::nestedTa
         static_cast<const Record<ESM::Creature>&> (data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Creature)));
 
     // return the whole struct
-    std::vector<typename ESM::Creature::NPDTstruct> wrap;
+    std::vector<ESM::Creature::NPDTstruct> wrap;
     wrap.push_back(record.get().mData);
     // deleted by dtor of NestedTableStoring
-    return new NestedTableWrapper<std::vector<typename ESM::Creature::NPDTstruct> >(wrap);
+    return new NestedTableWrapper<std::vector<ESM::Creature::NPDTstruct> >(wrap);
 }
 
 QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData (const RefIdColumn *column,
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 86ecd9dfb0..b410204e90 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -27,13 +27,6 @@
 
 namespace
 {
-    std::string fpsLevelToStr(int level)
-    {
-        if (level == 0)
-            return "#{sOff}";
-        else //if (level == 1)
-            return "#{sOn}";
-    }
 
     std::string textureMipmappingToStr(const std::string& val)
     {
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 70aab95dfe..4a689d964e 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1377,7 +1377,7 @@ namespace MWMechanics
             {
                 if ((*it)->getTypeId() == MWMechanics::AiPackage::TypeIdFollow)
                 {
-                    MWWorld::Ptr followTarget = static_cast<MWMechanics::AiFollow*>(*it)->getTarget();
+                    MWWorld::Ptr followTarget = (*it)->getTarget();
                     if (followTarget.isEmpty())
                         continue;
                     if (followTarget == actor)
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index fffab8d77d..1fc6c52a43 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -119,7 +119,7 @@ namespace MWMechanics
         return TypeIdEscort;
     }
 
-    MWWorld::Ptr AiEscort::getTarget()
+    MWWorld::Ptr AiEscort::getTarget() const
     {
         return MWBase::Environment::get().getWorld()->getPtr(mActorId, false);
     }
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index cdb0f79360..677cf6f430 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -37,7 +37,7 @@ namespace MWMechanics
 
             virtual int getTypeId() const;
 
-            MWWorld::Ptr getTarget();
+            MWWorld::Ptr getTarget() const;
             virtual bool sideWithTarget() const { return true; }
 
             void writeState(ESM::AiSequence::AiSequence &sequence) const;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 1430d42f20..02daec19e5 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -200,7 +200,7 @@ void AiFollow::writeState(ESM::AiSequence::AiSequence &sequence) const
     sequence.mPackages.push_back(package);
 }
 
-MWWorld::Ptr AiFollow::getTarget()
+MWWorld::Ptr AiFollow::getTarget() const
 {
     if (mActorId == -2)
         return MWWorld::Ptr();
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 017ea7122d..0f955879a4 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -31,7 +31,7 @@ namespace MWMechanics
 
             AiFollow(const ESM::AiSequence::AiFollow* follow);
 
-            MWWorld::Ptr getTarget();
+            MWWorld::Ptr getTarget() const;
             virtual bool sideWithTarget() const { return true; }
             virtual bool followTargetThroughDoors() const { return true; }
 
@@ -60,7 +60,7 @@ namespace MWMechanics
             float mY;
             float mZ;
             std::string mActorRefId;
-            int mActorId;
+            mutable int mActorId;
             std::string mCellId;
             bool mActive; // have we spotted the target?
             int mFollowIndex;
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 58ba7dfe8e..863fe05ef7 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -20,7 +20,7 @@
 
 MWMechanics::AiPackage::~AiPackage() {}
 
-MWWorld::Ptr MWMechanics::AiPackage::getTarget()
+MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
 {
     return MWWorld::Ptr();
 }
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 72bb4487ce..f938a34a15 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -72,7 +72,7 @@ namespace MWMechanics
             virtual void fastForward(const MWWorld::Ptr& actor, AiState& state) {}
 
             /// Get the target actor the AI is targeted at (not applicable to all AI packages, default return empty Ptr)
-            virtual MWWorld::Ptr getTarget();
+            virtual MWWorld::Ptr getTarget() const;
 
             /// Return true if having this AiPackage makes the actor side with the target in fights (default false)
             virtual bool sideWithTarget() const;
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 71733d613d..5cfc1264ae 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -68,9 +68,8 @@ bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
 {
     if (getTypeId() != AiPackage::TypeIdCombat)
         return false;
-    const AiCombat *combat = static_cast<const AiCombat *>(mPackages.front());
     
-    targetActor = combat->getTarget();
+    targetActor = mPackages.front()->getTarget();
 
     return !targetActor.isEmpty();
 }
@@ -114,8 +113,7 @@ bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
         {
-            const AiCombat *combat = static_cast<const AiCombat *>(*it);
-            if (combat->getTarget() == actor)
+            if ((*it)->getTarget() == actor)
                 return true;
         }
     }
@@ -255,7 +253,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         for (std::list<AiPackage *>::const_iterator iter (mPackages.begin()); iter!=mPackages.end(); ++iter)
         {
             if((*iter)->getTypeId() == AiPackage::TypeIdCombat && package.getTypeId() == AiPackage::TypeIdCombat
-                && static_cast<const AiCombat*>(*iter)->getTarget() == static_cast<const AiCombat*>(&package)->getTarget())
+                && (*iter)->getTarget() == (&package)->getTarget())
             {
                 return; // already in combat with this actor
             }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 84da270ebb..7fbc3a8535 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1330,7 +1330,7 @@ namespace MWMechanics
         {
             if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
             {
-                MWWorld::Ptr target = static_cast<AiCombat*>(*it)->getTarget();
+                MWWorld::Ptr target = (*it)->getTarget();
                 if (!target.isEmpty() && target.getClass().isNpc())
                     isFightingNpc = true;
             }
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 4c51388356..736d2a6161 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -62,13 +62,6 @@ namespace
         }
     }
 
-    void applyDynamicStatsEffect(int attribute, const MWWorld::Ptr& target, float magnitude)
-    {
-        MWMechanics::DynamicStat<float> value = target.getClass().getCreatureStats(target).getDynamic(attribute);
-        value.setCurrent(value.getCurrent()+magnitude, attribute == 2);
-        target.getClass().getCreatureStats(target).setDynamic(attribute, value);
-    }
-
 }
 
 namespace MWMechanics
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 85a4afa301..ffe8dd881b 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -139,16 +139,16 @@ namespace Resource
         virtual void apply(osg::Node& node)
         {
             if (osgFX::Effect* effect = dynamic_cast<osgFX::Effect*>(&node))
-                apply(*effect);
+                applyEffect(*effect);
 
             osg::StateSet* stateset = node.getStateSet();
             if (stateset)
-                apply(stateset);
+                applyStateSet(stateset);
 
             traverse(node);
         }
 
-        void apply(osgFX::Effect& effect)
+        void applyEffect(osgFX::Effect& effect)
         {
             for (int i =0; i<effect.getNumTechniques(); ++i)
             {
@@ -156,7 +156,7 @@ namespace Resource
                 for (int pass=0; pass<tech->getNumPasses(); ++pass)
                 {
                     if (tech->getPassStateSet(pass))
-                        apply(tech->getPassStateSet(pass));
+                        applyStateSet(tech->getPassStateSet(pass));
                 }
             }
         }
@@ -165,29 +165,29 @@ namespace Resource
         {
             osg::StateSet* stateset = geode.getStateSet();
             if (stateset)
-                apply(stateset);
+                applyStateSet(stateset);
 
             for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
             {
                 osg::Drawable* drw = geode.getDrawable(i);
                 stateset = drw->getStateSet();
                 if (stateset)
-                    apply(stateset);
+                    applyStateSet(stateset);
             }
         }
 
-        void apply(osg::StateSet* stateset)
+        void applyStateSet(osg::StateSet* stateset)
         {
             const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
             for(unsigned int unit=0;unit<texAttributes.size();++unit)
             {
                 osg::StateAttribute *texture = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
                 if (texture)
-                    apply(texture);
+                    applyStateAttribute(texture);
             }
         }
 
-        void apply(osg::StateAttribute* attr)
+        void applyStateAttribute(osg::StateAttribute* attr)
         {
             osg::Texture* tex = attr->asTexture();
             if (tex)
diff --git a/components/sceneutil/lightutil.hpp b/components/sceneutil/lightutil.hpp
index 810ffa3187..d6c9703409 100644
--- a/components/sceneutil/lightutil.hpp
+++ b/components/sceneutil/lightutil.hpp
@@ -8,7 +8,7 @@ namespace osg
 
 namespace ESM
 {
-    class Light;
+    struct Light;
 }
 
 namespace SceneUtil
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 25ad60e0a6..a6e2740378 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -34,4 +34,4 @@ namespace VFS
 
 }
 
-#endif
\ No newline at end of file
+#endif

From e89609e5b0d8258ddf1064df9b4c143133979a0c Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 17 Feb 2016 14:15:57 -0500
Subject: [PATCH 273/765] Changes to how Info Conditions are edited

---
 apps/opencs/model/world/columns.cpp           |  25 +-
 .../model/world/nestedcoladapterimp.cpp       | 271 ++++--------------
 2 files changed, 59 insertions(+), 237 deletions(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index d0d3a1671d..aa453ced8c 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -3,6 +3,7 @@
 #include <components/misc/stringops.hpp>
 
 #include "universalid.hpp"
+#include "infoselectwrapper.hpp"
 
 namespace CSMWorld
 {
@@ -273,9 +274,9 @@ namespace CSMWorld
             { ColumnId_InfoList, "Info List" },
             { ColumnId_InfoCondition, "Info Conditions" },
             { ColumnId_InfoCondFunc, "Function" },
-            { ColumnId_InfoCondVar, "Func/Variable" },
-            { ColumnId_InfoCondComp, "Comp" },
-            { ColumnId_InfoCondValue, "Values" },
+            { ColumnId_InfoCondVar, "Name" },
+            { ColumnId_InfoCondComp, "Relation" },
+            { ColumnId_InfoCondValue, "Value" },
             { ColumnId_OriginalCell, "Original Cell" },
 
             { ColumnId_NpcAttributes, "NPC Attributes" },
@@ -546,18 +547,6 @@ namespace
         "AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
     };
 
-    static const char *sInfoCondFunc[] =
-    {
-        " ", "Function", "Global", "Local", "Journal",
-        "Item", "Dead", "Not ID", "Not Faction", "Not Class",
-        "Not Race", "Not Cell", "Not Local", 0
-    };
-
-    static const char *sInfoCondComp[] =
-    {
-        "!=", "<", "<=", "=", ">", ">=", 0
-    };
-
     const char **getEnumNames (CSMWorld::Columns::ColumnId column)
     {
         switch (column)
@@ -585,10 +574,8 @@ namespace
             case CSMWorld::Columns::ColumnId_EffectId: return sEffectId;
             case CSMWorld::Columns::ColumnId_PartRefType: return sPartRefType;
             case CSMWorld::Columns::ColumnId_AiPackageType: return sAiPackageType;
-            case CSMWorld::Columns::ColumnId_InfoCondFunc: return sInfoCondFunc;
-            // FIXME: don't have dynamic value enum delegate, use Display_String for now
-            //case CSMWorld::Columns::ColumnId_InfoCond: return sInfoCond;
-            case CSMWorld::Columns::ColumnId_InfoCondComp: return sInfoCondComp;
+            case CSMWorld::Columns::ColumnId_InfoCondFunc: return CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings;
+            case CSMWorld::Columns::ColumnId_InfoCondComp: return CSMWorld::ConstInfoSelectWrapper::RelationEnumStrings;
 
             default: return 0;
         }
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 92b4b9e624..a8f1c229ac 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -6,6 +6,7 @@
 #include "idcollection.hpp"
 #include "pathgrid.hpp"
 #include "info.hpp"
+#include "infoselectwrapper.hpp"
 
 namespace CSMWorld
 {
@@ -529,16 +530,6 @@ namespace CSMWorld
         return 1; // fixed at size 1
     }
 
-    // ESM::DialInfo::SelectStruct.mSelectRule
-    // 012345...
-    // ^^^ ^^
-    // ||| ||
-    // ||| |+------------- condition variable string
-    // ||| +-------------- comparison type, ['0'..'5']; e.g. !=, <, >=, etc
-    // ||+---------------- function index (encoded, where function == '1')
-    // |+----------------- function, ['1'..'C']; e.g. Global, Local, Not ID, etc
-    // +------------------ unknown
-    //
     InfoConditionAdapter::InfoConditionAdapter () {}
 
     void InfoConditionAdapter::addRow(Record<Info>& record, int position) const
@@ -547,11 +538,11 @@ namespace CSMWorld
 
         std::vector<ESM::DialInfo::SelectStruct>& conditions = info.mSelects;
 
-        // blank row
+        // default row
         ESM::DialInfo::SelectStruct condStruct;
-        condStruct.mSelectRule = "00000";
+        condStruct.mSelectRule = "01000";
         condStruct.mValue = ESM::Variant();
-        condStruct.mValue.setType(ESM::VT_Int); // default to ints
+        condStruct.mValue.setType(ESM::VT_Int);
 
         conditions.insert(conditions.begin()+position, condStruct);
 
@@ -589,89 +580,6 @@ namespace CSMWorld
         return new NestedTableWrapper<std::vector<ESM::DialInfo::SelectStruct> >(record.get().mSelects);
     }
 
-    // See the mappings in MWDialogue::SelectWrapper::getArgument
-    // from ESM::Attribute, ESM::Skill and MWMechanics::CreatureStats (for AI)
-    static std::map<const std::string, std::string> populateEncToInfoFunc()
-    {
-        std::map<const std::string, std::string> funcMap;
-        funcMap["00"] = "Rank Low";
-        funcMap["01"] = "Rank High";
-        funcMap["02"] = "Rank Requirement";
-        funcMap["03"] = "Reputation";
-        funcMap["04"] = "Health Percent";
-        funcMap["05"] = "PC Reputation";
-        funcMap["06"] = "PC Level";
-        funcMap["07"] = "PC Health Percent";
-        funcMap["08"] = "PC Magicka";
-        funcMap["09"] = "PC Fatigue";
-        funcMap["10"] = "PC Strength";
-        funcMap["11"] = "PC Block";
-        funcMap["12"] = "PC Armorer";
-        funcMap["13"] = "PC Medium Armor";
-        funcMap["14"] = "PC Heavy Armor";
-        funcMap["15"] = "PC Blunt Weapon";
-        funcMap["16"] = "PC Long Blade";
-        funcMap["17"] = "PC Axe";
-        funcMap["18"] = "PC Spear";
-        funcMap["19"] = "PC Athletics";
-        funcMap["20"] = "PC Enchant";
-        funcMap["21"] = "PC Destruction";
-        funcMap["22"] = "PC Alteration";
-        funcMap["23"] = "PC Illusion";
-        funcMap["24"] = "PC Conjuration";
-        funcMap["25"] = "PC Mysticism";
-        funcMap["26"] = "PC Restoration";
-        funcMap["27"] = "PC Alchemy";
-        funcMap["28"] = "PC Unarmored";
-        funcMap["29"] = "PC Security";
-        funcMap["30"] = "PC Sneak";
-        funcMap["31"] = "PC Acrobatics";
-        funcMap["32"] = "PC Light Armor";
-        funcMap["33"] = "PC Short Blade";
-        funcMap["34"] = "PC Marksman";
-        funcMap["35"] = "PC Merchantile";
-        funcMap["36"] = "PC Speechcraft";
-        funcMap["37"] = "PC Hand To Hand";
-        funcMap["38"] = "PC Sex";
-        funcMap["39"] = "PC Expelled";
-        funcMap["40"] = "PC Common Disease";
-        funcMap["41"] = "PC Blight Disease";
-        funcMap["42"] = "PC Clothing Modifier";
-        funcMap["43"] = "PC Crime Level";
-        funcMap["44"] = "Same Sex";
-        funcMap["45"] = "Same Race";
-        funcMap["46"] = "Same Faction";
-        funcMap["47"] = "Faction Rank Difference";
-        funcMap["48"] = "Detected";
-        funcMap["49"] = "Alarmed";
-        funcMap["50"] = "Choice";
-        funcMap["51"] = "PC Intelligence";
-        funcMap["52"] = "PC Willpower";
-        funcMap["53"] = "PC Agility";
-        funcMap["54"] = "PC Speed";
-        funcMap["55"] = "PC Endurance";
-        funcMap["56"] = "PC Personality";
-        funcMap["57"] = "PC Luck";
-        funcMap["58"] = "PC Corpus";
-        funcMap["59"] = "Weather";
-        funcMap["60"] = "PC Vampire";
-        funcMap["61"] = "Level";
-        funcMap["62"] = "Attacked";
-        funcMap["63"] = "Talked To PC";
-        funcMap["64"] = "PC Health";
-        funcMap["65"] = "Creature Target";
-        funcMap["66"] = "Friend Hit";
-        funcMap["67"] = "Fight";
-        funcMap["68"] = "Hello";
-        funcMap["69"] = "Alarm";
-        funcMap["70"] = "Flee";
-        funcMap["71"] = "Should Attack";
-        funcMap["72"] = "Werewolf";
-        funcMap["73"] = "PC Werewolf Kills";
-        return funcMap;
-    }
-    static const std::map<const std::string, std::string> sEncToInfoFunc = populateEncToInfoFunc();
-
     QVariant InfoConditionAdapter::getData(const Record<Info>& record,
             int subRowIndex, int subColIndex) const
     {
@@ -682,70 +590,36 @@ namespace CSMWorld
         if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
             throw std::runtime_error ("index out of range");
 
+        ConstInfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
+
         switch (subColIndex)
         {
             case 0:
             {
-                char condType = conditions[subRowIndex].mSelectRule[1];
-                switch (condType)
-                {
-                    case '0': return 0;  // blank space
-                    case '1': return 1;  // Function
-                    case '2': return 2;  // Global
-                    case '3': return 3;  // Local
-                    case '4': return 4;  // Journal
-                    case '5': return 5;  // Item
-                    case '6': return 6;  // Dead
-                    case '7': return 7;  // Not ID
-                    case '8': return 8;  // Not Factio
-                    case '9': return 9;  // Not Class
-                    case 'A': return 10; // Not Race
-                    case 'B': return 11; // Not Cell
-                    case 'C': return 12; // Not Local
-                    default: return QVariant(); // TODO: log an error?
-                }
+                return infoSelectWrapper.getFunctionName();
             }
             case 1:
             {
-                if (conditions[subRowIndex].mSelectRule[1] == '1')
-                {
-                    // throws an exception if the encoding is not found
-                    return sEncToInfoFunc.at(conditions[subRowIndex].mSelectRule.substr(2, 2)).c_str();
-                }
+                if (infoSelectWrapper.hasVariable())
+                    return QString(infoSelectWrapper.getVariableName().c_str());
                 else
-                    return QString(conditions[subRowIndex].mSelectRule.substr(5).c_str());
+                    return "";
             }
             case 2:
             {
-                char compType = conditions[subRowIndex].mSelectRule[4];
-                switch (compType)
-                {
-                    case '0': return 3; // =
-                    case '1': return 0; // !=
-                    case '2': return 4; // >
-                    case '3': return 5; // >=
-                    case '4': return 1; // <
-                    case '5': return 2; // <=
-                    default: return QVariant(); // TODO: log an error?
-                }
+                return infoSelectWrapper.getRelationType();
             }
             case 3:
             {
-                switch (conditions[subRowIndex].mValue.getType())
+                switch (infoSelectWrapper.getVariant().getType())
                 {
-                    case ESM::VT_String:
-                    {
-                        return QString::fromUtf8 (conditions[subRowIndex].mValue.getString().c_str());
-                    }
                     case ESM::VT_Int:
-                    case ESM::VT_Short:
-                    case ESM::VT_Long:
                     {
-                        return conditions[subRowIndex].mValue.getInteger();
+                        return infoSelectWrapper.getVariant().getInteger();
                     }
                     case ESM::VT_Float:
                     {
-                        return conditions[subRowIndex].mValue.getFloat();
+                        return infoSelectWrapper.getVariant().getFloat();
                     }
                     default: return QVariant();
                 }
@@ -764,101 +638,62 @@ namespace CSMWorld
         if (subRowIndex < 0 || subRowIndex >= static_cast<int> (conditions.size()))
             throw std::runtime_error ("index out of range");
 
+        InfoSelectWrapper infoSelectWrapper(conditions[subRowIndex]);
+        bool conversionResult = false;
+
         switch (subColIndex)
         {
-            case 0:
+            case 0: // Function
             {
-                // See sInfoCondFunc in columns.cpp for the enum values
-                switch (value.toInt())
-                {
-                    // FIXME: when these change the values of the other columns need to change
-                    // correspondingly (and automatically)
-                    case 1:
-                    {
-                        conditions[subRowIndex].mSelectRule[1] = '1';             // Function
-                        // default to "Rank Low"
-                        conditions[subRowIndex].mSelectRule[2] = '0';
-                        conditions[subRowIndex].mSelectRule[3] = '0';
-                        break;
-                    }
-                    case 2:  conditions[subRowIndex].mSelectRule[1] = '2'; break; // Global
-                    case 3:  conditions[subRowIndex].mSelectRule[1] = '3'; break; // Local
-                    case 4:  conditions[subRowIndex].mSelectRule[1] = '4'; break; // Journal
-                    case 5:  conditions[subRowIndex].mSelectRule[1] = '5'; break; // Item
-                    case 6:  conditions[subRowIndex].mSelectRule[1] = '6'; break; // Dead
-                    case 7:  conditions[subRowIndex].mSelectRule[1] = '7'; break; // Not ID
-                    case 8:  conditions[subRowIndex].mSelectRule[1] = '8'; break; // Not Faction
-                    case 9:  conditions[subRowIndex].mSelectRule[1] = '9'; break; // Not Class
-                    case 10: conditions[subRowIndex].mSelectRule[1] = 'A'; break; // Not Race
-                    case 11: conditions[subRowIndex].mSelectRule[1] = 'B'; break; // Not Cell
-                    case 12: conditions[subRowIndex].mSelectRule[1] = 'C'; break; // Not Local
-                    default: return; // return without saving
-                }
-                break;
-            }
-            case 1:
-            {
-                if (conditions[subRowIndex].mSelectRule[1] == '1')
-                {
-                    std::map<const std::string, std::string>::const_iterator it = sEncToInfoFunc.begin();
-                    for (;it != sEncToInfoFunc.end(); ++it)
-                    {
-                        if (it->second == value.toString().toUtf8().constData())
-                        {
-                            std::string rule = conditions[subRowIndex].mSelectRule.substr(0, 2);
-                            rule.append(it->first);
-                            // leave old values for undo (NOTE: may not be vanilla's behaviour)
-                            rule.append(conditions[subRowIndex].mSelectRule.substr(4));
-                            conditions[subRowIndex].mSelectRule = rule;
-                            break;
-                        }
-                    }
+                infoSelectWrapper.setFunctionName(static_cast<ConstInfoSelectWrapper::FunctionName>(value.toInt()));
 
-                    if (it == sEncToInfoFunc.end())
-                        return; // return without saving; TODO: maybe log an error here
-                }
-                else
+                if (infoSelectWrapper.getComparisonType() != ConstInfoSelectWrapper::Comparison_Numeric &&
+                    infoSelectWrapper.getVariant().getType() != ESM::VT_Int)
                 {
-                    // FIXME: validate the string values before saving, based on the current function
-                    std::string rule = conditions[subRowIndex].mSelectRule.substr(0, 5);
-                    conditions[subRowIndex].mSelectRule = rule.append(value.toString().toUtf8().constData());
+                    infoSelectWrapper.getVariant().setType(ESM::VT_Int);
                 }
+
+                infoSelectWrapper.update();
                 break;
             }
-            case 2:
+            case 1: // Variable
             {
-                // See sInfoCondComp in columns.cpp for the enum values
-                switch (value.toInt())
-                {
-                    case 0: conditions[subRowIndex].mSelectRule[4] = '1'; break; // !=
-                    case 1: conditions[subRowIndex].mSelectRule[4] = '4'; break; // <
-                    case 2: conditions[subRowIndex].mSelectRule[4] = '5'; break; // <=
-                    case 3: conditions[subRowIndex].mSelectRule[4] = '0'; break; // =
-                    case 4: conditions[subRowIndex].mSelectRule[4] = '2'; break; // >
-                    case 5: conditions[subRowIndex].mSelectRule[4] = '3'; break; // >=
-                    default: return; // return without saving
-                }
+                infoSelectWrapper.setVariableName(value.toString().toUtf8().constData());
+                infoSelectWrapper.update();
                 break;
             }
-            case 3:
+            case 2: // Relation
             {
-                switch (conditions[subRowIndex].mValue.getType())
+                infoSelectWrapper.setRelationType(static_cast<ConstInfoSelectWrapper::RelationType>(value.toInt()));
+                infoSelectWrapper.update();
+                break;
+            }
+            case 3: // Value
+            {
+                switch (infoSelectWrapper.getComparisonType())
                 {
-                    case ESM::VT_String:
+                    case ConstInfoSelectWrapper::Comparison_Numeric:
                     {
-                        conditions[subRowIndex].mValue.setString (value.toString().toUtf8().constData());
+                        if (value.toInt(&conversionResult) && conversionResult)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
+                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                        }
+                        else if (value.toFloat(&conversionResult) && conversionResult)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Float);
+                            infoSelectWrapper.getVariant().setFloat(value.toFloat());
+                        }
                         break;
                     }
-                    case ESM::VT_Int:
-                    case ESM::VT_Short:
-                    case ESM::VT_Long:
+                    case ConstInfoSelectWrapper::Comparison_Boolean:
+                    case ConstInfoSelectWrapper::Comparison_Integer:
                     {
-                        conditions[subRowIndex].mValue.setInteger (value.toInt());
-                        break;
-                    }
-                    case ESM::VT_Float:
-                    {
-                        conditions[subRowIndex].mValue.setFloat (value.toFloat());
+                        if (value.toInt(&conversionResult) && conversionResult)
+                        {
+                            infoSelectWrapper.getVariant().setType(ESM::VT_Int);
+                            infoSelectWrapper.getVariant().setInteger(value.toInt());
+                        }
                         break;
                     }
                     default: break;

From 8668eccd0bec7e565934d8d65519c05303ef621c Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 17 Feb 2016 15:38:30 -0500
Subject: [PATCH 274/765] Topic Info verifier with fixes to InfoSelectWrapper
 class

---
 apps/opencs/CMakeLists.txt                    |   2 +-
 apps/opencs/model/tools/tools.cpp             |  16 +-
 apps/opencs/model/tools/topicinfocheck.cpp    | 441 ++++++++++++++++++
 apps/opencs/model/tools/topicinfocheck.hpp    |  95 ++++
 apps/opencs/model/world/infoselectwrapper.cpp |  41 +-
 apps/opencs/model/world/infoselectwrapper.hpp |   2 +
 6 files changed, 591 insertions(+), 6 deletions(-)
 create mode 100644 apps/opencs/model/tools/topicinfocheck.cpp
 create mode 100644 apps/opencs/model/tools/topicinfocheck.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 7b825232bc..a657bade20 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -42,7 +42,7 @@ opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages gmstcheck
+    mergestages gmstcheck topicinfocheck
     )
 
 opencs_hdrs_noqt (model/tools
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index e750092b93..b6a04a236f 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -30,6 +30,7 @@
 #include "magiceffectcheck.hpp"
 #include "mergeoperation.hpp"
 #include "gmstcheck.hpp"
+#include "topicinfocheck.hpp"
 
 CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
 {
@@ -111,9 +112,22 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
                                                                     mData.getReferenceables(),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Icons),
                                                                     mData.getResources (CSMWorld::UniversalId::Type_Textures)));
-        
+
         mVerifierOperation->appendStage (new GmstCheckStage (mData.getGmsts()));
 
+        mVerifierOperation->appendStage (new TopicInfoCheckStage (mData.getTopicInfos(),
+                                                                  mData.getCells(),
+                                                                  mData.getClasses(),
+                                                                  mData.getFactions(),
+                                                                  mData.getGmsts(),
+                                                                  mData.getGlobals(),
+                                                                  mData.getJournals(),
+                                                                  mData.getRaces(),
+                                                                  mData.getRegions(),
+                                                                  mData.getTopics(),
+                                                                  mData.getReferenceables().getDataSet(),
+                                                                  mData.getResources (CSMWorld::UniversalId::Type_SoundsRes)));
+
         mVerifier.setOperation (mVerifierOperation);
     }
 
diff --git a/apps/opencs/model/tools/topicinfocheck.cpp b/apps/opencs/model/tools/topicinfocheck.cpp
new file mode 100644
index 0000000000..f6af2a9456
--- /dev/null
+++ b/apps/opencs/model/tools/topicinfocheck.cpp
@@ -0,0 +1,441 @@
+#include "topicinfocheck.hpp"
+
+#include <sstream>
+
+#include "../world/infoselectwrapper.hpp"
+
+CSMTools::TopicInfoCheckStage::TopicInfoCheckStage(
+    const CSMWorld::InfoCollection& topicInfos,
+    const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
+    const CSMWorld::IdCollection<ESM::Class>& classes,
+    const CSMWorld::IdCollection<ESM::Faction>& factions,
+    const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+    const CSMWorld::IdCollection<ESM::Global>& globals,
+    const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+    const CSMWorld::IdCollection<ESM::Race>& races,
+    const CSMWorld::IdCollection<ESM::Region>& regions,
+    const CSMWorld::IdCollection<ESM::Dialogue> &topics,
+    const CSMWorld::RefIdData& referencables,
+    const CSMWorld::Resources& soundFiles)
+    : mTopicInfos(topicInfos),
+      mCells(cells),
+      mClasses(classes),
+      mFactions(factions),
+      mGameSettings(gmsts),
+      mGlobals(globals),
+      mJournals(journals),
+      mRaces(races),
+      mRegions(regions),
+      mTopics(topics),
+      mReferencables(referencables),
+      mSoundFiles(soundFiles)
+{}
+
+int CSMTools::TopicInfoCheckStage::setup()
+{
+    // Generate list of cell names for reference checking
+
+    mCellNames.clear();
+    for (int i = 0; i < mCells.getSize(); ++i)
+    {
+        const CSMWorld::Record<CSMWorld::Cell>& cellRecord = mCells.getRecord(i);
+
+        if (cellRecord.isDeleted())
+            continue;
+
+        mCellNames.insert(cellRecord.get().mName);
+    }
+    // Cell names can also include region names
+    for (int i = 0; i < mRegions.getSize(); ++i)
+    {
+        const CSMWorld::Record<ESM::Region>& regionRecord = mRegions.getRecord(i);
+
+        if (regionRecord.isDeleted())
+            continue;
+
+        mCellNames.insert(regionRecord.get().mName);
+    }
+    // Default cell name
+    int index = mGameSettings.searchId("sDefaultCellname");
+    if (index != -1)
+    {
+        const CSMWorld::Record<ESM::GameSetting>& gmstRecord = mGameSettings.getRecord(index);
+
+        if (!gmstRecord.isDeleted() && gmstRecord.get().mValue.getType() == ESM::VT_String)
+        {
+            mCellNames.insert(gmstRecord.get().mValue.getString());
+        }
+    }
+
+    return mTopicInfos.getSize();
+}
+
+void CSMTools::TopicInfoCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<CSMWorld::Info>& infoRecord = mTopicInfos.getRecord(stage);
+
+    if (infoRecord.isDeleted())
+        return;
+
+    const CSMWorld::Info& topicInfo = infoRecord.get();
+
+    // There should always be a topic that matches
+    int topicIndex = mTopics.searchId(topicInfo.mTopicId);
+
+    const CSMWorld::Record<ESM::Dialogue>& topicRecord = mTopics.getRecord(topicIndex);
+
+    if (topicRecord.isDeleted())
+        return;
+
+    const ESM::Dialogue& topic = topicRecord.get();
+
+    CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_TopicInfo, topicInfo.mId);
+
+    // Check fields
+
+    if (!topicInfo.mActor.empty())
+    {
+        verifyActor(topicInfo.mActor, id, messages);
+    }
+
+    if (!topicInfo.mClass.empty())
+    {
+        verifyId(topicInfo.mClass, mClasses, id, messages);
+    }
+
+    if (!topicInfo.mCell.empty())
+    {
+        verifyCell(topicInfo.mCell, id, messages);
+    }
+
+    if (!topicInfo.mFaction.empty())
+    {
+        if (verifyId(topicInfo.mFaction, mFactions, id, messages))
+        {
+            verifyFactionRank(topicInfo.mFaction, topicInfo.mData.mRank, id, messages);
+        }
+    }
+
+    if (!topicInfo.mPcFaction.empty())
+    {
+        if (verifyId(topicInfo.mPcFaction, mFactions, id, messages))
+        {
+            verifyFactionRank(topicInfo.mPcFaction, topicInfo.mData.mPCrank, id, messages);
+        }
+    }
+
+    if (topicInfo.mData.mGender < -1 || topicInfo.mData.mGender > 1)
+    {
+        std::ostringstream stream;
+        messages.add(id, "Gender: Value is invalid", "", CSMDoc::Message::Severity_Error);
+    }
+
+    if (!topicInfo.mRace.empty())
+    {
+        verifyId(topicInfo.mRace, mRaces, id, messages);
+    }
+
+    if (!topicInfo.mSound.empty())
+    {
+        verifySound(topicInfo.mSound, id, messages);
+    }
+
+    if (topicInfo.mResponse.empty() && topic.mType != ESM::Dialogue::Voice)
+    {
+        messages.add(id, "Response is empty", "", CSMDoc::Message::Severity_Warning);
+    }
+
+    // Check info conditions
+
+    for (std::vector<ESM::DialInfo::SelectStruct>::const_iterator it = topicInfo.mSelects.begin();
+         it != topicInfo.mSelects.end(); ++it)
+    {
+        verifySelectStruct((*it), id, messages);
+    }
+}
+
+// Verification functions
+
+bool CSMTools::TopicInfoCheckStage::verifyActor(const std::string& actor, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Actor";
+
+    CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(actor);
+
+    if (index.first == -1)
+    {
+        writeMissingIdError(specifier, actor, id, messages);
+        return false;
+    }
+    else if (mReferencables.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(specifier, actor, id, messages);
+        return false;
+    }
+    else if (index.second != CSMWorld::UniversalId::Type_Npc && index.second != CSMWorld::UniversalId::Type_Creature)
+    {
+        writeInvalidTypeError(specifier, actor, index.second, "NPC or Creature", id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyCell(const std::string& cell, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Cell";
+
+    if (mCellNames.find(cell) == mCellNames.end())
+    {
+        writeMissingIdError(specifier, cell, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyFactionRank(const std::string& factionName, int rank, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    if (rank < -1)
+    {
+        std::ostringstream stream;
+        stream << "Rank or PC Rank is set to " << rank << ", but should be set to -1 if no rank is required";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+
+    int index = mFactions.searchId(factionName);
+
+    const ESM::Faction &faction = mFactions.getRecord(index).get();
+
+    int limit = 0;
+    for (; limit < 10; ++limit)
+    {
+        if (faction.mRanks[limit].empty())
+            break;
+    }
+
+    if (rank >= limit)
+    {
+        std::ostringstream stream;
+        stream << "Rank or PC Rank is set to " << rank << " which is more than the maximum of " << limit - 1
+               << " for the " << factionName << " faction";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifyItem(const std::string& item, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Item";
+
+    CSMWorld::RefIdData::LocalIndex index = mReferencables.searchId(item);
+
+    if (index.first == -1)
+    {
+        writeMissingIdError(specifier, item, id, messages);
+        return false;
+    }
+    else if (mReferencables.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(specifier, item, id, messages);
+        return false;
+    }
+    else
+    {
+        switch (index.second)
+        {
+            case CSMWorld::UniversalId::Type_Potion:
+            case CSMWorld::UniversalId::Type_Apparatus:
+            case CSMWorld::UniversalId::Type_Armor:
+            case CSMWorld::UniversalId::Type_Book:
+            case CSMWorld::UniversalId::Type_Clothing:
+            case CSMWorld::UniversalId::Type_Ingredient:
+            case CSMWorld::UniversalId::Type_Light:
+            case CSMWorld::UniversalId::Type_Lockpick:
+            case CSMWorld::UniversalId::Type_Miscellaneous:
+            case CSMWorld::UniversalId::Type_Probe:
+            case CSMWorld::UniversalId::Type_Repair:
+            case CSMWorld::UniversalId::Type_Weapon:
+            case CSMWorld::UniversalId::Type_ItemLevelledList:
+                break;
+
+            default:
+                writeInvalidTypeError(specifier, item, index.second, "Potion, Armor, Book, etc.", id, messages);
+                return false;
+        }
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifySelectStruct(const ESM::DialInfo::SelectStruct& select,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    CSMWorld::ConstInfoSelectWrapper infoCondition(select);
+
+    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_None)
+    {
+        messages.add(id, "Invalid Info Condition: " + infoCondition.toString(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+    else if (!infoCondition.variantTypeIsValid())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: Value for \"" << infoCondition.toString() << "\" has a type of ";
+
+        switch (select.mValue.getType())
+        {
+            case ESM::VT_None:   stream << "None"; break;
+            case ESM::VT_Short:  stream << "Short"; break;
+            case ESM::VT_Int:    stream << "Int"; break;
+            case ESM::VT_Long:   stream << "Long"; break;
+            case ESM::VT_Float:  stream << "Float"; break;
+            case ESM::VT_String: stream << "String"; break;
+            default:             stream << "Unknown"; break;
+        }
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        return false;
+    }
+    else if (infoCondition.conditionIsAlwaysTrue())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: " << infoCondition.toString() << " is always true";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Warning);
+        return false;
+    }
+    else if (infoCondition.conditionIsNeverTrue())
+    {
+        std::ostringstream stream;
+        stream << "Info Condition: " << infoCondition.toString() << " is never true";
+
+        messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Warning);
+        return false;
+    }
+
+    // Id checks
+    if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Global &&
+        !verifyId(infoCondition.getVariableName(), mGlobals, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Journal &&
+        !verifyId(infoCondition.getVariableName(), mJournals, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Item &&
+        !verifyItem(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_Dead &&
+        !verifyActor(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotId &&
+        !verifyActor(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotFaction &&
+        !verifyId(infoCondition.getVariableName(), mFactions, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotClass &&
+        !verifyId(infoCondition.getVariableName(), mClasses, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotRace &&
+        !verifyId(infoCondition.getVariableName(), mRaces, id, messages))
+    {
+        return false;
+    }
+    else if (infoCondition.getFunctionName() == CSMWorld::ConstInfoSelectWrapper::Function_NotCell &&
+        !verifyCell(infoCondition.getVariableName(), id, messages))
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool CSMTools::TopicInfoCheckStage::verifySound(const std::string& sound, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    const std::string specifier = "Sound File";
+
+    if (mSoundFiles.searchId(sound) == -1)
+    {
+        writeMissingIdError(specifier, sound, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+template <typename T>
+bool CSMTools::TopicInfoCheckStage::verifyId(const std::string& name, const CSMWorld::IdCollection<T>& collection,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    int index = collection.searchId(name);
+
+    if (index == -1)
+    {
+        writeMissingIdError(T::getRecordType(), name, id, messages);
+        return false;
+    }
+    else if (collection.getRecord(index).isDeleted())
+    {
+        writeDeletedRecordError(T::getRecordType(), name, id, messages);
+        return false;
+    }
+
+    return true;
+}
+
+// Error functions
+
+void CSMTools::TopicInfoCheckStage::writeMissingIdError(const std::string& specifier, const std::string& missingId,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    std::ostringstream stream;
+    stream << specifier << ": ID or name \"" << missingId << "\" could not be found";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
+
+void CSMTools::TopicInfoCheckStage::writeDeletedRecordError(const std::string& specifier, const std::string& recordId,
+    const CSMWorld::UniversalId& id, CSMDoc::Messages& messages)
+{
+    std::ostringstream stream;
+    stream << specifier << ": Deleted record with ID \"" << recordId << "\" is being referenced";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
+
+void CSMTools::TopicInfoCheckStage::writeInvalidTypeError(const std::string& specifier, const std::string& invalidId,
+    CSMWorld::UniversalId::Type invalidType, const std::string& expectedType, const CSMWorld::UniversalId& id,
+    CSMDoc::Messages& messages)
+{
+    CSMWorld::UniversalId tempId(invalidType, invalidId);
+
+    std::ostringstream stream;
+    stream << specifier << ": invalid type of " << tempId.getTypeName() << " was found for referencable \""
+           << invalidId << "\" (can be of type " << expectedType << ")";
+
+    messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+}
diff --git a/apps/opencs/model/tools/topicinfocheck.hpp b/apps/opencs/model/tools/topicinfocheck.hpp
new file mode 100644
index 0000000000..510901dacc
--- /dev/null
+++ b/apps/opencs/model/tools/topicinfocheck.hpp
@@ -0,0 +1,95 @@
+#ifndef CSM_TOOLS_TOPICINFOCHECK_HPP
+#define CSM_TOOLS_TOPICINFOCHECK_HPP
+
+#include <set>
+
+#include <components/esm/loadclas.hpp>
+#include <components/esm/loaddial.hpp>
+#include <components/esm/loadfact.hpp>
+#include <components/esm/loadglob.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadrace.hpp>
+#include <components/esm/loadregn.hpp>
+
+#include "../world/cell.hpp"
+#include "../world/idcollection.hpp"
+#include "../world/infocollection.hpp"
+#include "../world/refiddata.hpp"
+#include "../world/resources.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMTools
+{
+    /// \brief VerifyStage: check topics
+    class TopicInfoCheckStage : public CSMDoc::Stage
+    {
+    public:
+
+        TopicInfoCheckStage(
+            const CSMWorld::InfoCollection& topicInfos,
+            const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
+            const CSMWorld::IdCollection<ESM::Class>& classes,
+            const CSMWorld::IdCollection<ESM::Faction>& factions,
+            const CSMWorld::IdCollection<ESM::GameSetting>& gmsts,
+            const CSMWorld::IdCollection<ESM::Global>& globals,
+            const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+            const CSMWorld::IdCollection<ESM::Race>& races,
+            const CSMWorld::IdCollection<ESM::Region>& regions,
+            const CSMWorld::IdCollection<ESM::Dialogue>& topics,
+            const CSMWorld::RefIdData& referencables,
+            const CSMWorld::Resources& soundFiles);
+
+        virtual int setup();
+        ///< \return number of steps
+
+        virtual void perform(int step, CSMDoc::Messages& messages);
+        ///< Messages resulting from this stage will be appended to \a messages
+
+    private:
+
+        const CSMWorld::InfoCollection& mTopicInfos;
+
+        const CSMWorld::IdCollection<CSMWorld::Cell>& mCells;
+        const CSMWorld::IdCollection<ESM::Class>& mClasses;
+        const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+        const CSMWorld::IdCollection<ESM::GameSetting>& mGameSettings;
+        const CSMWorld::IdCollection<ESM::Global>& mGlobals;
+        const CSMWorld::IdCollection<ESM::Dialogue>& mJournals;
+        const CSMWorld::IdCollection<ESM::Race>& mRaces;
+        const CSMWorld::IdCollection<ESM::Region>& mRegions;
+        const CSMWorld::IdCollection<ESM::Dialogue>& mTopics;
+
+        const CSMWorld::RefIdData& mReferencables;
+        const CSMWorld::Resources& mSoundFiles;
+
+        std::set<std::string> mCellNames;
+
+        // These return false when not successful and write an error
+        bool verifyActor(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifyCell(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifyFactionRank(const std::string& name, int rank, const CSMWorld::UniversalId& id,
+            CSMDoc::Messages& messages);
+        bool verifyItem(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+        bool verifySelectStruct(const ESM::DialInfo::SelectStruct& select, const CSMWorld::UniversalId& id,
+            CSMDoc::Messages& messages);
+        bool verifySound(const std::string& name, const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        template <typename T>
+        bool verifyId(const std::string& name, const CSMWorld::IdCollection<T>& collection,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        // Common error messages
+        void writeMissingIdError(const std::string& specifier, const std::string& missingId,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        void writeDeletedRecordError(const std::string& specifier, const std::string& recordId,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+
+        void writeInvalidTypeError(const std::string& specifier, const std::string& invalidId,
+            CSMWorld::UniversalId::Type invalidType, const std::string& expectedType,
+            const CSMWorld::UniversalId& id, CSMDoc::Messages& messages);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index 42cbabf72d..0bc1ec22b8 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -226,8 +226,7 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue() const
 
 bool CSMWorld::ConstInfoSelectWrapper::variantTypeIsValid() const
 {
-    return (mConstSelect.mValue.getType() == ESM::VT_Int || mConstSelect.mValue.getType() == ESM::VT_Short ||
-        mConstSelect.mValue.getType() == ESM::VT_Long || mConstSelect.mValue.getType() == ESM::VT_Float);
+    return (mConstSelect.mValue.getType() == ESM::VT_Int || mConstSelect.mValue.getType() == ESM::VT_Float);
 }
 
 const ESM::Variant& CSMWorld::ConstInfoSelectWrapper::getVariant() const
@@ -235,6 +234,40 @@ const ESM::Variant& CSMWorld::ConstInfoSelectWrapper::getVariant() const
     return mConstSelect.mValue;
 }
 
+std::string CSMWorld::ConstInfoSelectWrapper::toString() const
+{
+    std::ostringstream stream;
+    stream << convertToString(mFunctionName) << " ";
+    
+    if (mHasVariable)
+        stream << mVariableName << " ";
+    
+    stream << convertToString(mRelationType) << " ";
+    
+    switch (mConstSelect.mValue.getType())
+    {
+        case ESM::VT_Short:
+        case ESM::VT_Long:
+        case ESM::VT_Int:
+            stream << mConstSelect.mValue.getInteger();
+            break;
+            
+        case ESM::VT_Float:
+            stream << mConstSelect.mValue.getFloat();
+            break;
+            
+        case ESM::VT_String:
+            stream << mConstSelect.mValue.getString();
+            break;
+            
+        default:
+            stream << "(Invalid value type)";
+            break;
+    }
+    
+    return stream.str();
+}
+
 void CSMWorld::ConstInfoSelectWrapper::readRule()
 {
     if (mConstSelect.mSelectRule.size() < RuleMinSize)
@@ -554,9 +587,9 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
         case Function_RankHigh:
         case Function_Reputation:
         case Function_PcReputation:
+        case Function_Journal:
             return std::pair<int, int>(IntMin, IntMax);
 
-        case Function_Journal:
         case Function_Item:
         case Function_Dead:
         case Function_PcLevel:
@@ -736,7 +769,7 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> con
 
         case Relation_NotEqual:
             // If the value is the only value withing the range, it will never be true
-            return rangesOverlap(conditionRange, validRange);
+            return rangesMatch(conditionRange, validRange);
 
         default:
             throw std::logic_error("InfoCondition: operator can not be used to compare");
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index 8ccae0efa5..1aa86aecab 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -164,6 +164,8 @@ namespace CSMWorld
         bool variantTypeIsValid() const;
 
         const ESM::Variant& getVariant() const;
+        
+        std::string toString() const;
 
     protected:
 

From bdc99048bba21b309b7fde55d0fc7406d7b05b8b Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 17 Feb 2016 19:01:22 -0500
Subject: [PATCH 275/765] Missing header

---
 apps/opencs/model/world/infoselectwrapper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index 0bc1ec22b8..5271430f5e 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -2,6 +2,7 @@
 
 #include <limits>
 #include <sstream>
+#include <stdexcept>
 
 const size_t CSMWorld::ConstInfoSelectWrapper::RuleMinSize = 5;
 

From a94029267f4067d761c42f80a667a60ff3e177b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 01:25:52 +0100
Subject: [PATCH 276/765] Fix an inverted condition (Bug #3209)

---
 components/interpreter/defines.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
index a700253b65..fafaf1feff 100644
--- a/components/interpreter/defines.cpp
+++ b/components/interpreter/defines.cpp
@@ -114,7 +114,7 @@ namespace Interpreter{
                         retval << context.getCurrentCellName();
                     }
 
-                    else if(!dialogue) { // In Dialogue, not messagebox
+                    else if(dialogue) { // In Dialogue, not messagebox
                         if(     (found = check(temp, "faction", &i, &start))){
                             retval << context.getNPCFaction();
                         }

From 6fb0022b351a25b426336d68ec3e798c4d082dd0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 17:47:10 +0100
Subject: [PATCH 277/765] Update preloading settings

Disable 'preload fast travel' by default.

Add 'min cache size' and 'max cache size' settings.

Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
---
 apps/openmw/mwworld/cellpreloader.cpp | 33 ++++++++++++++++++++++++---
 apps/openmw/mwworld/cellpreloader.hpp |  8 +++++++
 apps/openmw/mwworld/scene.cpp         |  8 ++++---
 files/settings-default.cfg            | 18 +++++++++++----
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 6acb41dc3c..f2881d68f3 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -166,6 +166,8 @@ namespace MWWorld
         , mBulletShapeManager(bulletShapeManager)
         , mTerrain(terrain)
         , mExpiryDelay(0.0)
+        , mMinCacheSize(0)
+        , mMaxCacheSize(0)
     {
     }
 
@@ -197,6 +199,23 @@ namespace MWWorld
             return;
         }
 
+        while (mPreloadCells.size() >= mMaxCacheSize)
+        {
+            // throw out oldest cell to make room
+            PreloadMap::iterator oldestCell = mPreloadCells.begin();
+            double oldestTimestamp = DBL_MAX;
+            for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
+            {
+                if (it->second.mTimeStamp < oldestTimestamp)
+                {
+                    oldestTimestamp = it->second.mTimeStamp;
+                    oldestCell = it;
+                }
+            }
+
+            mPreloadCells.erase(oldestCell);
+        }
+
         osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));
         mWorkQueue->addWorkItem(item);
 
@@ -210,11 +229,9 @@ namespace MWWorld
 
     void CellPreloader::updateCache(double timestamp)
     {
-        // TODO: add settings for a minimum/maximum size of the cache
-
         for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
         {
-            if (it->second.mTimeStamp < timestamp - mExpiryDelay)
+            if (mPreloadCells.size() >= mMinCacheSize && it->second.mTimeStamp < timestamp - mExpiryDelay)
                 mPreloadCells.erase(it++);
             else
                 ++it;
@@ -229,6 +246,16 @@ namespace MWWorld
         mExpiryDelay = expiryDelay;
     }
 
+    void CellPreloader::setMinCacheSize(unsigned int num)
+    {
+        mMinCacheSize = num;
+    }
+
+    void CellPreloader::setMaxCacheSize(unsigned int num)
+    {
+        mMaxCacheSize = num;
+    }
+
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index 4373953973..f78e66e754 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -38,6 +38,12 @@ namespace MWWorld
         /// How long to keep a preloaded cell in cache after it's no longer requested.
         void setExpiryDelay(double expiryDelay);
 
+        /// The minimum number of preloaded cells before unused cells get thrown out.
+        void setMinCacheSize(unsigned int num);
+
+        /// The maximum number of preloaded cells.
+        void setMaxCacheSize(unsigned int num);
+
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
     private:
@@ -46,6 +52,8 @@ namespace MWWorld
         Terrain::World* mTerrain;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
         double mExpiryDelay;
+        unsigned int mMinCacheSize;
+        unsigned int mMaxCacheSize;
 
         struct PreloadEntry
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 308809bd26..cd0954260d 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -463,9 +463,11 @@ namespace MWWorld
 
         mPhysics->setUnrefQueue(rendering.getUnrefQueue());
 
-        float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
-        rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
-        mPreloader->setExpiryDelay(cacheExpiryDelay);
+        rendering.getResourceSystem()->setExpiryDelay(Settings::Manager::getFloat("cache expiry delay", "Cells"));
+
+        mPreloader->setExpiryDelay(Settings::Manager::getFloat("preload cell expiry delay", "Cells"));
+        mPreloader->setMinCacheSize(Settings::Manager::getInt("preload cell cache min", "Cells"));
+        mPreloader->setMaxCacheSize(Settings::Manager::getInt("preload cell cache max", "Cells"));
     }
 
     Scene::~Scene()
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 4a9a5dd65e..c6c97546eb 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -44,7 +44,7 @@ preload enabled = true
 preload exterior grid = true
 
 # Preload possible fast travel destinations.
-preload fast travel = true
+preload fast travel = false
 
 # Preload the locations that doors lead to.
 preload doors = true
@@ -52,9 +52,19 @@ preload doors = true
 # Preloading distance threshold
 preload distance = 1000
 
-# How long to keep preloaded cells and cached models/textures/collision shapes in cache
-# after they're no longer referenced/required (in seconds)
-cache expiry delay = 300
+# The minimum amount of cells in the preload cache before unused cells start to get thrown out (see "preload cell expiry delay").
+# This value should be lower or equal to 'preload cell cache max'.
+preload cell cache min = 12
+
+# The maximum amount of cells in the preload cache. A too high value could cause you to run out of memory.
+# You may need to reduce this setting when running lots of mods or high-res texture replacers.
+preload cell cache max = 20
+
+# How long to keep preloaded cells in cache after they're no longer referenced/required (in seconds)
+preload cell expiry delay = 5
+
+# How long to keep models/textures/collision shapes in cache after they're no longer referenced/required (in seconds)
+cache expiry delay = 5
 
 [Map]
 

From 7f89bb273a1d8d0c807863d955acc6b1618353bd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 19:31:25 +0100
Subject: [PATCH 278/765] Add 'reflect actors' setting for the water shader,
 default off

---
 apps/openmw/mwrender/water.cpp            |  4 +++-
 files/mygui/openmw_settings_window.layout | 10 ++++++++++
 files/settings-default.cfg                |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index dba85aeb78..e20590ecb5 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -375,7 +375,9 @@ public:
         setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
         setReferenceFrame(osg::Camera::RELATIVE_RF);
 
-        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting);
+        bool reflectActors = Settings::Manager::getBool("reflect actors", "Water");
+
+        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(reflectActors ? Mask_Actor : 0));
         setNodeMask(Mask_RenderToTexture);
 
         unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index cf7fe1be70..5d6d817d6e 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -396,6 +396,16 @@
                                     <Property key="Caption" value="Texture quality"/>
                                 </Widget>
                             </Widget>
+                            <Widget type="HBox" skin="" position="4 56 350 24">
+                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
+                                    <UserString key="SettingCategory" value="Water"/>
+                                    <UserString key="SettingName" value="reflect actors"/>
+                                    <UserString key="SettingType" value="CheckButton"/>
+                                </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 79 16" align="Left Top">
+                                    <Property key="Caption" value="Reflect actors"/>
+                                </Widget>
+                            </Widget>
                         </Widget>
 
                     </Widget>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c6c97546eb..a5e750d4da 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -274,6 +274,9 @@ rtt size = 512
 # Enable refraction which affects visibility through water plane.
 refraction = false
 
+# Draw NPCs and creatures on water reflections.
+reflect actors = false
+
 [Objects]
 
 # Enable shaders for objects other than water. Unused.

From e05d97502095d71506eb9595a42ed07f47b728f0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Feb 2016 23:14:52 +0100
Subject: [PATCH 279/765] Change the way that texture filtering settings are
 applied at runtime

---
 apps/openmw/engine.cpp                    |  3 +--
 apps/openmw/mwrender/renderingmanager.cpp | 10 ++++++----
 apps/openmw/mwrender/water.cpp            |  3 ---
 components/resource/objectcache.cpp       | 16 +++++++++++++++
 components/resource/objectcache.hpp       |  4 ++++
 components/resource/scenemanager.cpp      | 24 +++--------------------
 components/resource/scenemanager.hpp      | 10 ++--------
 components/terrain/terraingrid.cpp        |  8 +++++++-
 components/terrain/terraingrid.hpp        |  4 ++++
 components/terrain/world.hpp              |  2 ++
 10 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index b3a58d18e5..5fd328022a 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -453,8 +453,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         Settings::Manager::getString("texture mag filter", "General"),
         Settings::Manager::getString("texture min filter", "General"),
         Settings::Manager::getString("texture mipmap", "General"),
-        Settings::Manager::getInt("anisotropy", "General"),
-        NULL
+        Settings::Manager::getInt("anisotropy", "General")
     );
 
     // Create input and UI first to set up a bootstrapping environment for
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 29b641f6bb..7569cea1fe 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -836,16 +836,18 @@ namespace MWRender
 
     void RenderingManager::updateTextureFiltering()
     {
-        if (mTerrain.get())
-            mTerrain->updateCache();
+        mViewer->stopThreading();
 
         mResourceSystem->getSceneManager()->setFilterSettings(
             Settings::Manager::getString("texture mag filter", "General"),
             Settings::Manager::getString("texture min filter", "General"),
             Settings::Manager::getString("texture mipmap", "General"),
-            Settings::Manager::getInt("anisotropy", "General"),
-            mViewer
+            Settings::Manager::getInt("anisotropy", "General")
         );
+
+        mTerrain->updateTextureFiltering();
+
+        mViewer->startThreading();
     }
 
     void RenderingManager::updateAmbient()
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index e20590ecb5..e6acbb5008 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -318,7 +318,6 @@ public:
         mRefractionTexture->setInternalFormat(GL_RGB);
         mRefractionTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mRefractionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mRefractionTexture);
 
@@ -330,7 +329,6 @@ public:
         mRefractionDepthTexture->setSourceType(GL_UNSIGNED_INT);
         mRefractionDepthTexture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
         mRefractionDepthTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-        mRefractionDepthTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
     }
@@ -393,7 +391,6 @@ public:
         mReflectionTexture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
         mReflectionTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mReflectionTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-        mReflectionTexture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
 
         attach(osg::Camera::COLOR_BUFFER, mReflectionTexture);
 
diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index a0a3cf3a52..5fec6730d6 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -14,6 +14,7 @@
 #include "objectcache.hpp"
 
 #include <osg/Object>
+#include <osg/Node>
 
 namespace Resource
 {
@@ -119,4 +120,19 @@ void ObjectCache::releaseGLObjects(osg::State* state)
     }
 }
 
+void ObjectCache::accept(osg::NodeVisitor &nv)
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+
+    for(ObjectCacheMap::iterator itr = _objectCache.begin();
+        itr != _objectCache.end();
+        ++itr)
+    {
+        osg::Object* object = itr->second.first.get();
+        osg::Node* node = object->asNode();
+        if (node)
+            node->accept(nv);
+    }
+}
+
 }
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
index 79ebabd5b8..82aca76f03 100644
--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@@ -27,6 +27,7 @@ namespace osg
 {
     class Object;
     class State;
+    class NodeVisitor;
 }
 
 namespace Resource {
@@ -66,6 +67,9 @@ class ObjectCache : public osg::Referenced
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
+        /** call node->accept(nv); for all nodes in the objectCache. */
+        void accept(osg::NodeVisitor& nv);
+
     protected:
 
         virtual ~ObjectCache();
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index ffe8dd881b..e78cc7cb2c 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -10,8 +10,6 @@
 
 #include <osgUtil/IncrementalCompileOperation>
 
-#include <osgViewer/Viewer>
-
 #include <osgDB/SharedStateManager>
 #include <osgDB/Registry>
 
@@ -192,13 +190,6 @@ namespace Resource
             osg::Texture* tex = attr->asTexture();
             if (tex)
             {
-                if (tex->getUserDataContainer())
-                {
-                    const std::vector<std::string>& descriptions = tex->getUserDataContainer()->getDescriptions();
-                    if (std::find(descriptions.begin(), descriptions.end(), "dont_override_filter") != descriptions.end())
-                        return;
-                }
-
                 tex->setFilter(osg::Texture::MIN_FILTER, mMinFilter);
                 tex->setFilter(osg::Texture::MAG_FILTER, mMagFilter);
                 tex->setMaxAnisotropy(mMaxAnisotropy);
@@ -425,8 +416,7 @@ namespace Resource
     }
 
     void SceneManager::setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                                           const std::string &mipmap, int maxAnisotropy,
-                                           osgViewer::Viewer *viewer)
+                                           const std::string &mipmap, int maxAnisotropy)
     {
         osg::Texture::FilterMode min = osg::Texture::LINEAR;
         osg::Texture::FilterMode mag = osg::Texture::LINEAR;
@@ -458,23 +448,15 @@ namespace Resource
                 min = osg::Texture::LINEAR_MIPMAP_LINEAR;
         }
 
-        if(viewer) viewer->stopThreading();
-
         mMinFilter = min;
         mMagFilter = mag;
         mMaxAnisotropy = std::max(1, maxAnisotropy);
 
-        mCache->clear();
-
         SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
         SetFilterSettingsVisitor setFilterSettingsVisitor (mMinFilter, mMagFilter, mMaxAnisotropy);
-        if (viewer && viewer->getSceneData())
-        {
-            viewer->getSceneData()->accept(setFilterSettingsControllerVisitor);
-            viewer->getSceneData()->accept(setFilterSettingsVisitor);
-        }
 
-        if(viewer) viewer->startThreading();
+        mCache->accept(setFilterSettingsVisitor);
+        mCache->accept(setFilterSettingsControllerVisitor);
     }
 
     void SceneManager::applyFilterSettings(osg::Texture *tex)
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 8357e63cd3..987b7898e1 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -21,11 +21,6 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
-namespace osgViewer
-{
-    class Viewer;
-}
-
 namespace Resource
 {
 
@@ -83,10 +78,9 @@ namespace Resource
         /// @param mask The node mask to apply to loaded particle system nodes.
         void setParticleSystemMask(unsigned int mask);
 
-        /// @param viewer used to apply the new filter settings to the existing scene graph. If there is no scene yet, you can pass a NULL viewer.
+        /// @warning It is unsafe to call this method while the draw thread is using textures! call Viewer::stopThreading first.
         void setFilterSettings(const std::string &magfilter, const std::string &minfilter,
-                               const std::string &mipmap, int maxAnisotropy,
-                               osgViewer::Viewer *viewer);
+                               const std::string &mipmap, int maxAnisotropy);
 
         /// Apply filter settings to the given texture. Note, when loading an object through this scene manager (i.e. calling getTemplate or createInstance)
         /// the filter settings are applied automatically. This method is provided for textures that were created outside of the SceneManager.
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 981a984e48..fefb0b8bcb 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -175,7 +175,6 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
             texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
             texture->setResizeNonPowerOfTwoHint(false);
-            texture->getOrCreateUserDataContainer()->addDescription("dont_override_filter");
             blendmapTextures.push_back(texture);
 
             textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, blendmapTextures.back());
@@ -278,4 +277,11 @@ void TerrainGrid::updateCache()
     }
 }
 
+void TerrainGrid::updateTextureFiltering()
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
+    for (TextureCache::iterator it = mTextureCache.begin(); it != mTextureCache.end(); ++it)
+        mResourceSystem->getSceneManager()->applyFilterSettings(it->second);
+}
+
 }
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 46a95e8173..d2276a0af8 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -36,6 +36,10 @@ namespace Terrain
         /// @note Thread safe.
         void updateCache();
 
+        /// Apply the scene manager's texture filtering settings to all cached textures.
+        /// @note Thread safe.
+        void updateTextureFiltering();
+
     private:
         osg::ref_ptr<osg::Node> buildTerrain (osg::Group* parent, float chunkSize, const osg::Vec2f& chunkCenter);
 
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index 992438a6a1..f5638750cd 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -39,6 +39,8 @@ namespace Terrain
               Storage* storage, int nodeMask);
         virtual ~World();
 
+        virtual void updateTextureFiltering() {}
+
         virtual void updateCache() {}
 
         float getHeightAt (const osg::Vec3f& worldPos);

From acf44fd9e5621d4eff375932e71766f0d9852bd7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Feb 2016 23:19:26 +0100
Subject: [PATCH 280/765] NifLoader: handleTextureControllers outside of the
 NumTextures loop

---
 components/nifosg/nifloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8f40768845..27ce242401 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1390,8 +1390,8 @@ namespace NifOsg
 
                         boundTextures.push_back(tex.uvSet);
                     }
-                    handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
                 }
+                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
                 break;
             }
             // unused by mw

From 50e92c8136cdebeae95c6a9fc74adb734dd07210 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Feb 2016 23:21:50 +0100
Subject: [PATCH 281/765] NifLoader: move texture property handling to a
 separate function

---
 components/nifosg/nifloader.cpp | 222 ++++++++++++++++----------------
 1 file changed, 113 insertions(+), 109 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 27ce242401..dbb1e7d43e 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1210,6 +1210,118 @@ namespace NifOsg
             }
         }
 
+        void handleTextureProperty(const Nif::NiTexturingProperty* texprop, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
+        {
+            if (boundTextures.size())
+            {
+                // overriding a parent NiTexturingProperty, so remove what was previously bound
+                for (unsigned int i=0; i<boundTextures.size(); ++i)
+                    stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                boundTextures.clear();
+            }
+
+            for (int i=0; i<Nif::NiTexturingProperty::NumTextures; ++i)
+            {
+                if (texprop->textures[i].inUse)
+                {
+                    switch(i)
+                    {
+                        //These are handled later on
+                        case Nif::NiTexturingProperty::BaseTexture:
+                        case Nif::NiTexturingProperty::GlowTexture:
+                        case Nif::NiTexturingProperty::DarkTexture:
+                        case Nif::NiTexturingProperty::DetailTexture:
+                            break;
+                        case Nif::NiTexturingProperty::GlossTexture:
+                        {
+                            std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
+                            continue;
+                        }
+                        case Nif::NiTexturingProperty::BumpTexture:
+                        {
+                            std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
+                            continue;
+                        }
+                        case Nif::NiTexturingProperty::DecalTexture:
+                        {
+                            std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
+                            continue;
+                        }
+                        default:
+                        {
+                            std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
+                            continue;
+                        }
+                    }
+
+                    const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
+                    if(tex.texture.empty())
+                    {
+                        std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
+                        continue;
+                    }
+                    const Nif::NiSourceTexture *st = tex.texture.getPtr();
+                    if (!st->external)
+                    {
+                        std::cerr << "Warning: unhandled internal texture in " << mFilename << std::endl;
+                        continue;
+                    }
+
+                    std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
+
+                    unsigned int clamp = static_cast<unsigned int>(tex.clamp);
+                    int wrapT = (clamp) & 0x1;
+                    int wrapS = (clamp >> 1) & 0x1;
+
+                    // create a new texture, will later attempt to share using the SharedStateManager
+                    osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(imageManager->getImage(filename)));
+                    texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+                    texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+
+                    int texUnit = boundTextures.size();
+
+                    stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+
+                    if (i == Nif::NiTexturingProperty::GlowTexture)
+                    {
+                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
+                        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+                    else if (i == Nif::NiTexturingProperty::DarkTexture)
+                    {
+                        osg::TexEnv* texEnv = new osg::TexEnv;
+                        texEnv->setMode(osg::TexEnv::MODULATE);
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+                    else if (i == Nif::NiTexturingProperty::DetailTexture)
+                    {
+                        osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                        texEnv->setScale_RGB(2.f);
+                        texEnv->setCombine_Alpha(GL_MODULATE);
+                        texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
+                        texEnv->setOperand1_Alpha(GL_SRC_ALPHA);
+                        texEnv->setSource0_Alpha(GL_PREVIOUS_ARB);
+                        texEnv->setSource1_Alpha(GL_TEXTURE);
+                        texEnv->setCombine_RGB(GL_MODULATE);
+                        texEnv->setOperand0_RGB(GL_SRC_COLOR);
+                        texEnv->setOperand1_RGB(GL_SRC_COLOR);
+                        texEnv->setSource0_RGB(GL_PREVIOUS_ARB);
+                        texEnv->setSource1_RGB(GL_TEXTURE);
+                        stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
+
+                    boundTextures.push_back(tex.uvSet);
+                }
+            }
+            handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+        }
+
         void handleProperty(const Nif::Property *property,
                             osg::Node *node, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
@@ -1283,115 +1395,7 @@ namespace NifOsg
             {
                 const Nif::NiTexturingProperty* texprop = static_cast<const Nif::NiTexturingProperty*>(property);
                 osg::StateSet* stateset = node->getOrCreateStateSet();
-
-                if (boundTextures.size())
-                {
-                    // overriding a parent NiTexturingProperty, so remove what was previously bound
-                    for (unsigned int i=0; i<boundTextures.size(); ++i)
-                        stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
-                    boundTextures.clear();
-                }
-
-                for (int i=0; i<Nif::NiTexturingProperty::NumTextures; ++i)
-                {
-                    if (texprop->textures[i].inUse)
-                    {
-                        switch(i)
-                        {
-                            //These are handled later on
-                            case Nif::NiTexturingProperty::BaseTexture:
-                            case Nif::NiTexturingProperty::GlowTexture:
-                            case Nif::NiTexturingProperty::DarkTexture:
-                            case Nif::NiTexturingProperty::DetailTexture:
-                                break;
-                            case Nif::NiTexturingProperty::GlossTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            case Nif::NiTexturingProperty::BumpTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            case Nif::NiTexturingProperty::DecalTexture:
-                            {
-                                std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
-                                continue;
-                            }
-                            default:
-                            {
-                                std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
-                                continue;
-                            }
-                        }
-
-                        const Nif::NiTexturingProperty::Texture& tex = texprop->textures[i];
-                        if(tex.texture.empty())
-                        {
-                            std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
-                            continue;
-                        }
-                        const Nif::NiSourceTexture *st = tex.texture.getPtr();
-                        if (!st->external)
-                        {
-                            std::cerr << "Warning: unhandled internal texture in " << mFilename << std::endl;
-                            continue;
-                        }
-
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-
-                        unsigned int clamp = static_cast<unsigned int>(tex.clamp);
-                        int wrapT = (clamp) & 0x1;
-                        int wrapS = (clamp >> 1) & 0x1;
-
-                        // create a new texture, will later attempt to share using the SharedStateManager
-                        osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(imageManager->getImage(filename)));
-                        texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
-                        texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
-
-                        int texUnit = boundTextures.size();
-
-                        stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
-
-                        if (i == Nif::NiTexturingProperty::GlowTexture)
-                        {
-                            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
-                            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
-                            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
-                            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
-                            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
-
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-                        else if (i == Nif::NiTexturingProperty::DarkTexture)
-                        {
-                            osg::TexEnv* texEnv = new osg::TexEnv;
-                            texEnv->setMode(osg::TexEnv::MODULATE);
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-                        else if (i == Nif::NiTexturingProperty::DetailTexture)
-                        {
-                            osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                            texEnv->setScale_RGB(2.f);
-                            texEnv->setCombine_Alpha(GL_MODULATE);
-                            texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
-                            texEnv->setOperand1_Alpha(GL_SRC_ALPHA);
-                            texEnv->setSource0_Alpha(GL_PREVIOUS_ARB);
-                            texEnv->setSource1_Alpha(GL_TEXTURE);
-                            texEnv->setCombine_RGB(GL_MODULATE);
-                            texEnv->setOperand0_RGB(GL_SRC_COLOR);
-                            texEnv->setOperand1_RGB(GL_SRC_COLOR);
-                            texEnv->setSource0_RGB(GL_PREVIOUS_ARB);
-                            texEnv->setSource1_RGB(GL_TEXTURE);
-                            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
-                        }
-
-                        boundTextures.push_back(tex.uvSet);
-                    }
-                }
-                handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
+                handleTextureProperty(texprop, stateset, composite, imageManager, boundTextures, animflags);
                 break;
             }
             // unused by mw

From 4cd4131da9ce0b09bf11d4d28b81d111a91833a6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Feb 2016 23:24:54 +0100
Subject: [PATCH 282/765] NifLoader: assign a name to created textures

This name will tell the shader visitor how to handle that texture.
---
 components/nifosg/nifloader.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index dbb1e7d43e..f8ee15062d 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1316,6 +1316,27 @@ namespace NifOsg
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
 
+                    switch (i)
+                    {
+                    case Nif::NiTexturingProperty::BaseTexture:
+                        texture2d->setName("diffuseMap");
+                        break;
+                    case Nif::NiTexturingProperty::BumpTexture:
+                        texture2d->setName("normalMap");
+                        break;
+                    case Nif::NiTexturingProperty::GlowTexture:
+                        texture2d->setName("emissiveMap");
+                        break;
+                    case Nif::NiTexturingProperty::DarkTexture:
+                        texture2d->setName("darkMap");
+                        break;
+                    case Nif::NiTexturingProperty::DetailTexture:
+                        texture2d->setName("detailMap");
+                        break;
+                    default:
+                        break;
+                    }
+
                     boundTextures.push_back(tex.uvSet);
                 }
             }

From 606758d72f4e32ba771a604adea4c3ca1b31fc20 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Feb 2016 23:29:00 +0100
Subject: [PATCH 283/765] NifLoader: create the BumpTexture slot, but don't use
 it yet

---
 components/nifosg/nifloader.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f8ee15062d..9fbee3d4d9 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1230,6 +1230,7 @@ namespace NifOsg
                         case Nif::NiTexturingProperty::BaseTexture:
                         case Nif::NiTexturingProperty::GlowTexture:
                         case Nif::NiTexturingProperty::DarkTexture:
+                        case Nif::NiTexturingProperty::BumpTexture:
                         case Nif::NiTexturingProperty::DetailTexture:
                             break;
                         case Nif::NiTexturingProperty::GlossTexture:
@@ -1237,11 +1238,6 @@ namespace NifOsg
                             std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
                             continue;
                         }
-                        case Nif::NiTexturingProperty::BumpTexture:
-                        {
-                            std::cerr << "NiTexturingProperty::BumpTexture in " << mFilename << " not currently used." << std::endl;
-                            continue;
-                        }
                         case Nif::NiTexturingProperty::DecalTexture:
                         {
                             std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
@@ -1315,6 +1311,11 @@ namespace NifOsg
                         texEnv->setSource1_RGB(GL_TEXTURE);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
+                    else if (i == Nif::NiTexturingProperty::BumpTexture)
+                    {
+                        // Set this texture to Off by default since we can't render it with the fixed-function pipeline
+                        stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
+                    }
 
                     switch (i)
                     {

From a9ac10838221f0ccbc9c5afe863b08f8d1de43c2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 16:49:58 +0100
Subject: [PATCH 284/765] Fully read NiPixelData

---
 components/nif/data.cpp | 18 +++++++++++-------
 components/nif/data.hpp | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 08c268dde1..751b15097d 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -154,7 +154,7 @@ void NiFloatData::read(NIFStream *nif)
 
 void NiPixelData::read(NIFStream *nif)
 {
-    nif->getInt(); // always 0 or 1
+    fmt = (Format)nif->getUInt();
 
     rmask = nif->getInt(); // usually 0xff
     gmask = nif->getInt(); // usually 0xff00
@@ -169,19 +169,23 @@ void NiPixelData::read(NIFStream *nif)
     mips = nif->getInt();
 
     // Bytes per pixel, should be bpp * 8
-    /*int bytes =*/ nif->getInt();
+    /* int bytes = */ nif->getInt();
 
     for(int i=0; i<mips; i++)
     {
         // Image size and offset in the following data field
-        /*int x =*/ nif->getInt();
-        /*int y =*/ nif->getInt();
-        /*int offset =*/ nif->getInt();
+        Mipmap m;
+        m.width = nif->getInt();
+        m.height = nif->getInt();
+        m.dataOffset = nif->getInt();
+        mipmaps.push_back(m);
     }
 
-    // Skip the data
+    // Read the data
     unsigned int dataSize = nif->getInt();
-    nif->skip(dataSize);
+    data.reserve(dataSize);
+    for (unsigned i=0; i<dataSize; ++i)
+        data.push_back((unsigned char)nif->getChar());
 }
 
 void NiColorData::read(NIFStream *nif)
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 95f2441295..89886b66f8 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -105,9 +105,30 @@ public:
 class NiPixelData : public Record
 {
 public:
+    enum Format
+    {
+        NIPXFMT_RGB8,
+        NIPXFMT_RGBA8,
+        NIPXFMT_PAL8,
+        NIPXFMT_DXT1,
+        NIPXFMT_DXT3,
+        NIPXFMT_DXT5,
+        NIPXFMT_DXT5_ALT
+    };
+    Format fmt;
+
     unsigned int rmask, gmask, bmask, amask;
     int bpp, mips;
 
+    struct Mipmap
+    {
+        int width, height;
+        int dataOffset;
+    };
+    std::vector<Mipmap> mipmaps;
+
+    std::vector<unsigned char> data;
+
     void read(NIFStream *nif);
 };
 

From e647ee5424a4f1c8bb506d262ab09ccd94e2e3b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 15 Feb 2016 18:00:13 +0100
Subject: [PATCH 285/765] Support RGB and RGBA embedded textures in NIF files
 (Fixes #2295)

---
 components/nif/data.cpp         |  6 +--
 components/nifosg/nifloader.cpp | 77 ++++++++++++++++++++++++++++++---
 2 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index 751b15097d..1de7d0966c 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -175,9 +175,9 @@ void NiPixelData::read(NIFStream *nif)
     {
         // Image size and offset in the following data field
         Mipmap m;
-        m.width = nif->getInt();
-        m.height = nif->getInt();
-        m.dataOffset = nif->getInt();
+        m.width = nif->getUInt();
+        m.height = nif->getUInt();
+        m.dataOffset = nif->getUInt();
         mipmaps.push_back(m);
     }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9fbee3d4d9..0b49419ff1 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1210,6 +1210,68 @@ namespace NifOsg
             }
         }
 
+        osg::ref_ptr<osg::Image> handleInternalTexture(const Nif::NiPixelData* pixelData)
+        {
+            osg::ref_ptr<osg::Image> image (new osg::Image);
+
+            GLenum pixelformat = 0;
+            switch (pixelData->fmt)
+            {
+            case Nif::NiPixelData::NIPXFMT_RGB8:
+                pixelformat = GL_RGB;
+                break;
+            case Nif::NiPixelData::NIPXFMT_RGBA8:
+                pixelformat = GL_RGBA;
+                break;
+            default:
+                std::cerr << "Unhandled internal pixel format " << pixelData->fmt << " in " << mFilename << std::endl;
+                return NULL;
+            }
+
+            if (!pixelData->mipmaps.size())
+                return NULL;
+
+            unsigned char* data = new unsigned char[pixelData->data.size()];
+            memcpy(data, &pixelData->data[0], pixelData->data.size());
+            unsigned int width = 0;
+            unsigned int height = 0;
+
+            std::vector<unsigned int> mipmapVector;
+            for (unsigned int i=0; i<pixelData->mipmaps.size()-3; ++i)
+            {
+                const Nif::NiPixelData::Mipmap& mip = pixelData->mipmaps[i];
+
+                size_t mipSize = mip.height * mip.width * pixelData->bpp / 8;
+                if (mipSize + mip.dataOffset > pixelData->data.size())
+                {
+                    std::cerr << "Internal texture's mipmap data out of bounds" << std::endl;
+                    delete data;
+                    return NULL;
+                }
+
+                if (i != 0)
+                    mipmapVector.push_back(mip.dataOffset);
+                else
+                {
+                    width = mip.width;
+                    height = mip.height;
+                }
+            }
+
+            if (width <= 0 || height <= 0)
+            {
+                std::cerr << "Width and height must be non zero " << std::endl;
+                delete data;
+                return NULL;
+            }
+
+            image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE);
+            image->setMipmapLevels(mipmapVector);
+            image->flipVertical();
+
+            return image;
+        }
+
         void handleTextureProperty(const Nif::NiTexturingProperty* texprop, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
             if (boundTextures.size())
@@ -1256,21 +1318,24 @@ namespace NifOsg
                         std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
                         continue;
                     }
+                    osg::ref_ptr<osg::Image> image;
                     const Nif::NiSourceTexture *st = tex.texture.getPtr();
-                    if (!st->external)
+                    if (!st->external && !st->data.empty())
                     {
-                        std::cerr << "Warning: unhandled internal texture in " << mFilename << std::endl;
-                        continue;
+                        image = handleInternalTexture(st->data.getPtr());
+                    }
+                    else
+                    {
+                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
+                        image = imageManager->getImage(filename);
                     }
-
-                    std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
 
                     unsigned int clamp = static_cast<unsigned int>(tex.clamp);
                     int wrapT = (clamp) & 0x1;
                     int wrapS = (clamp >> 1) & 0x1;
 
                     // create a new texture, will later attempt to share using the SharedStateManager
-                    osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(imageManager->getImage(filename)));
+                    osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(image));
                     texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
                     texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
 

From a9ad1b09e2f267e502c30db902e108fabdf8956e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 18:18:48 +0100
Subject: [PATCH 286/765] Introduce ShaderManager & ShaderVisitor

Actual shaders still to be written.
---
 apps/openmw/mwrender/renderingmanager.cpp |   1 +
 components/CMakeLists.txt                 |   4 +
 components/resource/scenemanager.cpp      |  12 ++
 components/resource/scenemanager.hpp      |   9 +
 components/shader/shadermanager.cpp       |  81 +++++++++
 components/shader/shadermanager.hpp       |  49 ++++++
 components/shader/shadervisitor.cpp       | 195 ++++++++++++++++++++++
 components/shader/shadervisitor.hpp       |  54 ++++++
 files/shaders/CMakeLists.txt              |   2 +
 files/shaders/objects_fragment.glsl       |  15 ++
 files/shaders/objects_vertex.glsl         |  14 ++
 11 files changed, 436 insertions(+)
 create mode 100644 components/shader/shadermanager.cpp
 create mode 100644 components/shader/shadermanager.hpp
 create mode 100644 components/shader/shadervisitor.cpp
 create mode 100644 components/shader/shadervisitor.hpp
 create mode 100644 files/shaders/objects_fragment.glsl
 create mode 100644 files/shaders/objects_vertex.glsl

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7569cea1fe..6b5cf460cf 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -168,6 +168,7 @@ namespace MWRender
         , mFieldOfViewOverridden(false)
     {
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
+        resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0ac32f65ec..2508cdc825 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -44,6 +44,10 @@ add_component_dir (resource
     scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager
     )
 
+add_component_dir (shader
+    shadermanager shadervisitor
+    )
+
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue unrefqueue
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index e78cc7cb2c..f4846a8a0f 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -22,6 +22,9 @@
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/controller.hpp>
 
+#include <components/shader/shadervisitor.hpp>
+#include <components/shader/shadermanager.hpp>
+
 #include "imagemanager.hpp"
 #include "niffilemanager.hpp"
 #include "objectcache.hpp"
@@ -205,6 +208,7 @@ namespace Resource
 
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
+        , mShaderManager(new Shader::ShaderManager)
         , mInstanceCache(new MultiObjectCache)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
@@ -221,6 +225,11 @@ namespace Resource
         // this has to be defined in the .cpp file as we can't delete incomplete types
     }
 
+    void SceneManager::setShaderPath(const std::string &path)
+    {
+        mShaderManager->setShaderPath(path);
+    }
+
     /// @brief Callback to read image files from the VFS.
     class ImageReadCallback : public osgDB::ReadFileCallback
     {
@@ -329,6 +338,9 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
+            Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
+            loaded->accept(shaderVisitor);
+
             // share state
             mSharedStateMutex.lock();
             osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 987b7898e1..d86c746d79 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <memory>
 
 #include <osg/ref_ptr>
 #include <osg/Node>
@@ -21,6 +22,11 @@ namespace osgUtil
     class IncrementalCompileOperation;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
 namespace Resource
 {
 
@@ -34,6 +40,8 @@ namespace Resource
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
+        void setShaderPath(const std::string& path);
+
         /// Get a read-only copy of this scene "template"
         /// @note If the given filename does not exist or fails to load, an error marker mesh will be used instead.
         ///  If even the error marker mesh can not be found, an exception is thrown.
@@ -97,6 +105,7 @@ namespace Resource
 
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
+        std::auto_ptr<Shader::ShaderManager> mShaderManager;
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
         OpenThreads::Mutex mSharedStateMutex;
diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
new file mode 100644
index 0000000000..fc9a1f7222
--- /dev/null
+++ b/components/shader/shadermanager.cpp
@@ -0,0 +1,81 @@
+#include "shadermanager.hpp"
+
+#include <fstream>
+#include <iostream>
+
+#include <boost/lexical_cast.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+#include <OpenThreads/ScopedLock>
+
+namespace Shader
+{
+
+    void ShaderManager::setShaderPath(const std::string &path)
+    {
+        mPath = path;
+    }
+
+    osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &shaderTemplate, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+
+        // read the template if we haven't already
+        TemplateMap::iterator templateIt = mShaderTemplates.find(shaderTemplate);
+        if (templateIt == mShaderTemplates.end())
+        {
+            boost::filesystem::path p = (boost::filesystem::path(mPath) / shaderTemplate);
+            boost::filesystem::ifstream stream;
+            stream.open(p);
+            if (stream.fail())
+            {
+                std::cerr << "Failed to open " << p.string() << std::endl;
+                return NULL;
+            }
+            std::stringstream buffer;
+            buffer << stream.rdbuf();
+
+            templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, buffer.str())).first;
+        }
+
+        ShaderMap::iterator shaderIt = mShaders.find(std::make_pair(shaderTemplate, defines));
+        if (shaderIt == mShaders.end())
+        {
+            std::string shaderSource = templateIt->second;
+
+            const char escapeCharacter = '@';
+            size_t foundPos = 0;
+            while ((foundPos = shaderSource.find(escapeCharacter)) != std::string::npos)
+            {
+                size_t endPos = shaderSource.find_first_of(" \n\r()[].;", foundPos);
+                if (endPos == std::string::npos)
+                {
+                    std::cerr << "Unexpected EOF" << std::endl;
+                    return NULL;
+                }
+                std::string define = shaderSource.substr(foundPos+1, endPos - (foundPos+1));
+                DefineMap::const_iterator defineFound = defines.find(define);
+                if (defineFound == defines.end())
+                {
+                    std::cerr << "Undefined " << define << " in shader " << shaderTemplate << std::endl;
+                    return NULL;
+                }
+                else
+                {
+                    shaderSource.replace(foundPos, endPos-foundPos, defineFound->second);
+                }
+            }
+
+            osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
+            shader->setShaderSource(shaderSource);
+            // Assign a unique name to allow the SharedStateManager to compare shaders efficiently
+            static unsigned int counter = 0;
+            shader->setName(boost::lexical_cast<std::string>(counter++));
+
+            shaderIt = mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), shader)).first;
+        }
+        return shaderIt->second;
+    }
+
+}
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
new file mode 100644
index 0000000000..e0ec3fe5fa
--- /dev/null
+++ b/components/shader/shadermanager.hpp
@@ -0,0 +1,49 @@
+#ifndef OPENMW_COMPONENTS_SHADERMANAGER_H
+#define OPENMW_COMPONENTS_SHADERMANAGER_H
+
+#include <string>
+#include <map>
+
+#include <osg/ref_ptr>
+
+#include <osg/Shader>
+
+#include <OpenThreads/Mutex>
+
+namespace Shader
+{
+
+    /// @brief Reads shader template files and turns them into a concrete shader, based on a list of define's.
+    /// @par Shader templates can get the value of a define with the syntax @define.
+    class ShaderManager
+    {
+    public:
+        void setShaderPath(const std::string& path);
+
+        typedef std::map<std::string, std::string> DefineMap;
+
+        /// Create or retrieve a shader instance.
+        /// @param shaderTemplate The filename of the shader template.
+        /// @param defines Define values that can be retrieved by the shader template.
+        /// @param shaderType The type of shader (usually vertex or fragment shader).
+        /// @note May return NULL on failure.
+        /// @note Thread safe.
+        osg::ref_ptr<osg::Shader> getShader(const std::string& shaderTemplate, const DefineMap& defines, osg::Shader::Type shaderType);
+
+    private:
+        std::string mPath;
+
+        // <name, code>
+        typedef std::map<std::string, std::string> TemplateMap;
+        TemplateMap mShaderTemplates;
+
+        typedef std::pair<std::string, DefineMap> MapKey;
+        typedef std::map<MapKey, osg::ref_ptr<osg::Shader> > ShaderMap;
+        ShaderMap mShaders;
+
+        OpenThreads::Mutex mMutex;
+    };
+
+}
+
+#endif
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
new file mode 100644
index 0000000000..235e63d95a
--- /dev/null
+++ b/components/shader/shadervisitor.cpp
@@ -0,0 +1,195 @@
+#include "shadervisitor.hpp"
+
+#include <iostream>
+
+#include <osg/Texture>
+#include <osg/Material>
+#include <osg/Geometry>
+
+#include <osgUtil/TangentSpaceGenerator>
+
+#include <boost/lexical_cast.hpp>
+
+#include "shadermanager.hpp"
+
+namespace Shader
+{
+
+    ShaderVisitor::ShaderRequirements::ShaderRequirements()
+        : mColorMaterial(false)
+        , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
+        , mTexStageRequiringTangents(-1)
+    {
+    }
+
+    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
+        : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mShaderManager(shaderManager)
+        , mDefaultVsTemplate(defaultVsTemplate)
+        , mDefaultFsTemplate(defaultFsTemplate)
+    {
+        mRequirements.push_back(ShaderRequirements());
+    }
+
+    void ShaderVisitor::apply(osg::Node& node)
+    {
+        if (node.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(node.getStateSet());
+            traverse(node);
+            popRequirements();
+        }
+        else
+            traverse(node);
+    }
+
+    void ShaderVisitor::applyStateSet(osg::StateSet* stateset)
+    {
+        const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
+        for(unsigned int unit=0;unit<texAttributes.size();++unit)
+        {
+            const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+            if (attr)
+            {
+                const osg::Texture* texture = attr->asTexture();
+                if (texture)
+                {
+                    if (!texture->getName().empty())
+                    {
+                        mRequirements.back().mTextures[unit] = texture->getName();
+                        if (texture->getName() == "normalMap")
+                        {
+                            mRequirements.back().mTexStageRequiringTangents = unit;
+                            // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
+                            stateset->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                        }
+                    }
+                    else
+                        std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
+                }
+            }
+            // remove state that has no effect when rendering with shaders
+            stateset->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
+        }
+
+        const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();
+        for (osg::StateSet::AttributeList::const_iterator it = attributes.begin(); it != attributes.end(); ++it)
+        {
+            if (it->first.first == osg::StateAttribute::MATERIAL)
+            {
+                const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
+                mRequirements.back().mVertexColorMode = mat->getColorMode();
+            }
+        }
+    }
+
+    void ShaderVisitor::pushRequirements()
+    {
+        mRequirements.push_back(mRequirements.back());
+    }
+
+    void ShaderVisitor::popRequirements()
+    {
+        mRequirements.pop_back();
+    }
+
+    void ShaderVisitor::createProgram(const ShaderRequirements &reqs, osg::StateSet *stateset)
+    {
+        ShaderManager::DefineMap defineMap;
+        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap" };
+        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
+        {
+            defineMap[defaultTextures[i]] = "0";
+            defineMap[std::string(defaultTextures[i]) + std::string("UV")] = "0";
+        }
+        for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+        {
+            defineMap[texIt->second] = "1";
+            defineMap[texIt->second + std::string("UV")] = boost::lexical_cast<std::string>(texIt->first);
+        }
+
+        if (!reqs.mColorMaterial)
+            defineMap["colorMode"] = "0";
+        else
+        {
+            switch (reqs.mVertexColorMode)
+            {
+            default:
+            case GL_AMBIENT_AND_DIFFUSE:
+                defineMap["colorMode"] = "2";
+                break;
+            case GL_AMBIENT:
+                defineMap["colorMode"] = "1";
+                break;
+            }
+        }
+
+        osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
+        osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
+
+        if (vertexShader && fragmentShader)
+        {
+            osg::ref_ptr<osg::Program> program (new osg::Program);
+            program->addShader(vertexShader);
+            program->addShader(fragmentShader);
+
+            stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
+
+            for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
+            {
+                stateset->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
+            }
+        }
+    }
+
+    void ShaderVisitor::apply(osg::Geometry& geometry)
+    {
+        bool needPop = (geometry.getStateSet() != NULL);
+        if (geometry.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(geometry.getStateSet());
+        }
+
+        if (!mRequirements.empty())
+        {
+            const ShaderRequirements& reqs = mRequirements.back();
+            if (reqs.mTexStageRequiringTangents != -1)
+            {
+                osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
+                generator->generate(&geometry, reqs.mTexStageRequiringTangents);
+
+                geometry.setTexCoordArray(7, generator->getTangentArray(), osg::Array::BIND_PER_VERTEX);
+            }
+
+            // TODO: find a better place for the stateset
+            createProgram(reqs, geometry.getOrCreateStateSet());
+        }
+
+        if (needPop)
+            popRequirements();
+    }
+
+    void ShaderVisitor::apply(osg::Drawable& drawable)
+    {
+        // non-Geometry drawable (e.g. particle system)
+        bool needPop = (drawable.getStateSet() != NULL);
+
+        if (drawable.getStateSet())
+        {
+            pushRequirements();
+            applyStateSet(drawable.getStateSet());
+        }
+
+        if (!mRequirements.empty())
+        {
+            // TODO: find a better place for the stateset
+            createProgram(mRequirements.back(), drawable.getOrCreateStateSet());
+        }
+
+        if (needPop)
+            popRequirements();
+    }
+
+}
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
new file mode 100644
index 0000000000..507f1417ea
--- /dev/null
+++ b/components/shader/shadervisitor.hpp
@@ -0,0 +1,54 @@
+#ifndef OPENMW_COMPONENTS_SHADERVISITOR_H
+#define OPENMW_COMPONENTS_SHADERVISITOR_H
+
+#include <osg/NodeVisitor>
+
+namespace Shader
+{
+
+    class ShaderManager;
+
+    /// @brief Adjusts the given subgraph to render using shaders.
+    class ShaderVisitor : public osg::NodeVisitor
+    {
+    public:
+        ShaderVisitor(ShaderManager& shaderManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
+
+        virtual void apply(osg::Node& node);
+
+        virtual void apply(osg::Drawable& drawable);
+        virtual void apply(osg::Geometry& geometry);
+
+        void applyStateSet(osg::StateSet* stateset);
+
+        void pushRequirements();
+        void popRequirements();
+
+    private:
+        ShaderManager& mShaderManager;
+
+        struct ShaderRequirements
+        {
+            ShaderRequirements();
+
+            // <texture stage, texture name>
+            std::map<int, std::string> mTextures;
+
+            bool mColorMaterial;
+            // osg::Material::ColorMode
+            int mVertexColorMode;
+
+            // -1 == no tangents required
+            int mTexStageRequiringTangents;
+        };
+        std::vector<ShaderRequirements> mRequirements;
+
+        std::string mDefaultVsTemplate;
+        std::string mDefaultFsTemplate;
+
+        void createProgram(const ShaderRequirements& reqs, osg::StateSet* stateset);
+    };
+
+}
+
+#endif
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index fc4706c1f6..edb5b51f2a 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -6,6 +6,8 @@ set(SHADER_FILES
     water_vertex.glsl
     water_fragment.glsl
     water_nm.png
+    objects_vertex.glsl
+    objects_fragment.glsl
 )
 
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR} ${DDIR} "${SHADER_FILES}")
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
new file mode 100644
index 0000000000..9b42c30a79
--- /dev/null
+++ b/files/shaders/objects_fragment.glsl
@@ -0,0 +1,15 @@
+#version 120
+
+#if @diffuseMap
+uniform sampler2D diffuseMap;
+varying vec2 diffuseMapUV;
+#endif
+
+void main()
+{
+#if @diffuseMap
+    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+#else
+    gl_FragData[0] = vec4(1,1,1,1);
+#endif
+}
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
new file mode 100644
index 0000000000..17e8f3fc42
--- /dev/null
+++ b/files/shaders/objects_vertex.glsl
@@ -0,0 +1,14 @@
+#version 120
+
+#if @diffuseMap
+varying vec2 diffuseMapUV;
+#endif
+    
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+#if @diffuseMap
+    diffuseMapUV = gl_MultiTexCoord@diffuseMapUV.xy;
+#endif
+}

From 41e1fd407d3e0b2fb5e167b1ec5ff7f2ef7bdd51 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 22:28:06 +0100
Subject: [PATCH 287/765] Disable shaders for the sky

---
 apps/openmw/mwrender/sky.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index f10beca6ca..95204d5eb9 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -1125,6 +1125,9 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana
     , mSunEnabled(true)
 {
     osg::ref_ptr<CameraRelativeTransform> skyroot (new CameraRelativeTransform);
+    // Assign empty program to specify we don't want shaders
+    // The shaders generated by the SceneManager can't handle everything we need
+    skyroot->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(), osg::StateAttribute::OVERRIDE);
 
     skyroot->setNodeMask(Mask_Sky);
     parentNode->addChild(skyroot);

From 044e0a829a812748934893d941d2bc3e09ecc553 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 22:32:59 +0100
Subject: [PATCH 288/765] Add fog

---
 apps/openmw/mwrender/characterpreview.cpp | 7 +++++++
 apps/openmw/mwrender/localmap.cpp         | 7 ++++++-
 files/shaders/objects_fragment.glsl       | 7 ++++++-
 files/shaders/objects_vertex.glsl         | 3 +++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 2588540540..1c9c3be4bd 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -2,6 +2,7 @@
 
 #include <iostream>
 
+#include <osg/Fog>
 #include <osg/Texture2D>
 #include <osg/Camera>
 #include <osg/PositionAttitudeTransform>
@@ -102,6 +103,12 @@ namespace MWRender
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
+        // assign large value to effectively turn off fog
+        // shaders don't respect glDisable(GL_FOG)
+        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        fog->setStart(10000000);
+        fog->setEnd(10000000);
+        stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
         osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
         lightmodel->setAmbientIntensity(osg::Vec4(0.25, 0.25, 0.25, 1.0));
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index fd224ba415..be477735f8 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -180,7 +180,12 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
     stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
     stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
-    stateset->setMode(GL_FOG, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+    // assign large value to effectively turn off fog
+    // shaders don't respect glDisable(GL_FOG)
+    osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+    fog->setStart(10000000);
+    fog->setEnd(10000000);
+    stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
     osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;
     lightmodel->setAmbientIntensity(osg::Vec4(0.3f, 0.3f, 0.3f, 1.f));
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 9b42c30a79..288760229f 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -5,11 +5,16 @@ uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 #endif
 
+varying float depth;
+
 void main()
 {
 #if @diffuseMap
     gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
 #else
-    gl_FragData[0] = vec4(1,1,1,1);
+    gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
 #endif
+
+    float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 17e8f3fc42..47ae205724 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -3,10 +3,13 @@
 #if @diffuseMap
 varying vec2 diffuseMapUV;
 #endif
+
+varying float depth;
     
 void main(void)
 {
     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    depth = gl_Position.z;
 
 #if @diffuseMap
     diffuseMapUV = gl_MultiTexCoord@diffuseMapUV.xy;

From 937681121348b8ed38b20225f62951fd7d568b0c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 16 Feb 2016 23:30:23 +0100
Subject: [PATCH 289/765] Vertex lighting shader

---
 apps/openmw/mwrender/animation.cpp    |  5 ++++
 components/sceneutil/lightmanager.cpp | 12 ++++++++
 components/shader/shadervisitor.cpp   |  1 +
 files/shaders/objects_fragment.glsl   |  4 +++
 files/shaders/objects_vertex.glsl     | 42 ++++++++++++++++++++++++++-
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index abca3b2667..65ac7d8774 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1063,6 +1063,9 @@ namespace MWRender
 
         osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(glowColor, textures));
         node->addUpdateCallback(glowupdater);
+
+        // TODO: regenerate shader
+        // allowedToModifyStatesets = false
     }
 
     // TODO: Should not be here
@@ -1243,6 +1246,8 @@ namespace MWRender
             material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
             stateset->setAttributeAndModes(material, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
+            // FIXME: regenerate shader (mVertexColorMode)
+
             mObjectRoot->setStateSet(stateset);
         }
         else
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 64448e73e9..ca1fc7eb8d 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -56,6 +56,18 @@ namespace SceneUtil
             }
 
             state.applyModelViewMatrix(modelViewMatrix);
+
+            /*
+            for (int i=0; i<8; ++i)
+            {
+                osg::ref_ptr<osg::Light> defaultLight (new osg::Light(i));
+                defaultLight->setAmbient(osg::Vec4());
+                defaultLight->setDiffuse(osg::Vec4());
+                defaultLight->setSpecular(osg::Vec4());
+                defaultLight->setConstantAttenuation(0.f);
+                state.setGlobalDefaultAttribute(defaultLight);
+            }
+            */
         }
 
     private:
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 235e63d95a..02ece3296a 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -79,6 +79,7 @@ namespace Shader
             if (it->first.first == osg::StateAttribute::MATERIAL)
             {
                 const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
+                mRequirements.back().mColorMaterial = (mat->getColorMode() != osg::Material::OFF);
                 mRequirements.back().mVertexColorMode = mat->getColorMode();
             }
         }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 288760229f..07a524ba19 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -7,6 +7,8 @@ varying vec2 diffuseMapUV;
 
 varying float depth;
 
+varying vec3 lighting;
+
 void main()
 {
 #if @diffuseMap
@@ -15,6 +17,8 @@ void main()
     gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
 #endif
 
+    gl_FragData[0].xyz *= lighting;
+
     float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 47ae205724..679abda1d1 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -5,7 +5,44 @@ varying vec2 diffuseMapUV;
 #endif
 
 varying float depth;
-    
+
+varying vec3 lighting;
+
+#define MAX_LIGHTS 8
+
+vec3 doLighting(vec4 vertex, vec3 normal, vec3 vertexColor)
+{
+    vec3 viewPos = (gl_ModelViewMatrix * vertex).xyz;
+    vec3 viewNormal = normalize((gl_NormalMatrix * normal).xyz);
+    vec3 lightDir;
+    float d;
+
+#if @colorMode == 2
+    vec3 diffuse = vertexColor;
+    vec3 ambient = vertexColor;
+#else
+    vec3 diffuse = gl_FrontMaterial.diffuse.xyz;
+    vec3 ambient = gl_FrontMaterial.ambient.xyz;
+#endif
+
+    vec3 lightResult = vec3(0.0, 0.0, 0.0);
+    for (int i=0; i<MAX_LIGHTS; ++i)
+    {
+        lightDir = gl_LightSource[i].position.xyz - (viewPos * gl_LightSource[i].position.w);
+        d = length(lightDir);
+        lightDir = normalize(lightDir);
+
+        lightResult.xyz += ambient * gl_LightSource[i].ambient.xyz;
+        lightResult.xyz += diffuse * gl_LightSource[i].diffuse.xyz * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0)
+                * max(dot(viewNormal.xyz, lightDir), 0.0);
+    }
+
+    lightResult += gl_LightModel.ambient.xyz * ambient;
+
+    return lightResult;
+}
+
+
 void main(void)
 {
     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
@@ -14,4 +51,7 @@ void main(void)
 #if @diffuseMap
     diffuseMapUV = gl_MultiTexCoord@diffuseMapUV.xy;
 #endif
+
+    lighting = doLighting(gl_Vertex, gl_Normal.xyz, gl_Color.xyz);
+    lighting = clamp(lighting, vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0));
 }

From f93b7ec94388d95db13d9b3cd0003331bb30594f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 00:33:20 +0100
Subject: [PATCH 290/765] Fix light state issue

GLSL does not respect gl_Disable(GL_LIGHTX), so we have to set unused lights to zero.

Sadly, this change makes the applying of the modelView matrix less efficient. So far I couldn't find a better solution, osg's state tracker keeps getting in the way. :(
---
 components/sceneutil/lightmanager.cpp | 43 +++++++++++++--------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index ca1fc7eb8d..4d8edec426 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -56,18 +56,6 @@ namespace SceneUtil
             }
 
             state.applyModelViewMatrix(modelViewMatrix);
-
-            /*
-            for (int i=0; i<8; ++i)
-            {
-                osg::ref_ptr<osg::Light> defaultLight (new osg::Light(i));
-                defaultLight->setAmbient(osg::Vec4());
-                defaultLight->setDiffuse(osg::Vec4());
-                defaultLight->setSpecular(osg::Vec4());
-                defaultLight->setConstantAttenuation(0.f);
-                state.setGlobalDefaultAttribute(defaultLight);
-            }
-            */
         }
 
     private:
@@ -204,18 +192,18 @@ namespace SceneUtil
             return found->second;
         else
         {
-
-            std::vector<osg::ref_ptr<osg::Light> > lights;
-            for (unsigned int i=0; i<lightList.size();++i)
-                lights.push_back(lightList[i]->mLightSource->getLight(frameNum));
-
-            osg::ref_ptr<LightStateAttribute> attr = new LightStateAttribute(mStartLight, lights);
-
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
 
-            // don't use setAttributeAndModes, that does not support light indices!
-            stateset->setAttribute(attr, osg::StateAttribute::ON);
-            stateset->setAssociatedModes(attr, osg::StateAttribute::ON);
+            for (unsigned int i=0; i<lightList.size();++i)
+            {
+                std::vector<osg::ref_ptr<osg::Light> > lights;
+                lights.push_back(lightList[i]->mLightSource->getLight(frameNum));
+                osg::ref_ptr<LightStateAttribute> attr = new LightStateAttribute(mStartLight+i, lights);
+                // don't use setAttributeAndModes, that does not support light indices!
+                stateset->setAttribute(attr, osg::StateAttribute::ON);
+                stateset->setAssociatedModes(attr, osg::StateAttribute::ON);
+
+            }
 
             stateSetCache.insert(std::make_pair(hash, stateset));
             return stateset;
@@ -254,6 +242,17 @@ namespace SceneUtil
     void LightManager::setStartLight(int start)
     {
         mStartLight = start;
+
+        // Set default light state to zero
+        for (int i=start; i<8; ++i)
+        {
+            osg::ref_ptr<osg::Light> defaultLight (new osg::Light(i));
+            defaultLight->setAmbient(osg::Vec4());
+            defaultLight->setDiffuse(osg::Vec4());
+            defaultLight->setSpecular(osg::Vec4());
+            defaultLight->setConstantAttenuation(0.f);
+            getOrCreateStateSet()->setAttributeAndModes(defaultLight, osg::StateAttribute::OFF);
+        }
     }
 
     int LightManager::getStartLight() const

From bd279c63f7c99557e6bcb19973a769d1efee9c56 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 01:56:41 +0100
Subject: [PATCH 291/765] Fix fog on water

---
 apps/openmw/mwrender/water.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index e6acbb5008..8e9a7630c8 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -306,7 +306,12 @@ public:
         setUpdateCallback(new NoTraverseCallback);
 
         // No need for fog here, we are already applying fog on the water surface itself as well as underwater fog
-        getOrCreateStateSet()->setMode(GL_FOG, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
+        // assign large value to effectively turn off fog
+        // shaders don't respect glDisable(GL_FOG)
+        osg::ref_ptr<osg::Fog> fog (new osg::Fog);
+        fog->setStart(10000000);
+        fog->setEnd(10000000);
+        getOrCreateStateSet()->setAttributeAndModes(fog, osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
 
         mClipCullNode = new ClipCullNode;
         addChild(mClipCullNode);

From 553408949af813d7716d07bcdf443328d8f44815 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 01:56:47 +0100
Subject: [PATCH 292/765] Fix character preview

---
 apps/openmw/mwrender/characterpreview.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 1c9c3be4bd..b9f20f4ea4 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -99,7 +99,7 @@ namespace MWRender
 
         osg::ref_ptr<SceneUtil::LightManager> lightManager = new SceneUtil::LightManager;
         lightManager->setStartLight(1);
-        osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+        osg::ref_ptr<osg::StateSet> stateset = lightManager->getOrCreateStateSet();
         stateset->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);
@@ -130,7 +130,6 @@ namespace MWRender
 
         lightSource->setStateSetModes(*stateset, osg::StateAttribute::ON);
 
-        lightManager->setStateSet(stateset);
         lightManager->addChild(lightSource);
 
         mCamera->addChild(lightManager);

From 3859c58a8a0c31111c4be4a1a7612c6fccabcab1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 02:04:30 +0100
Subject: [PATCH 293/765] Assign gl_ClipVertex in the vertex shader to make
 clip planes work

---
 files/shaders/objects_vertex.glsl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 679abda1d1..fadbd98980 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -10,10 +10,8 @@ varying vec3 lighting;
 
 #define MAX_LIGHTS 8
 
-vec3 doLighting(vec4 vertex, vec3 normal, vec3 vertexColor)
+vec3 doLighting(vec3 viewPos, vec3 viewNormal, vec3 vertexColor)
 {
-    vec3 viewPos = (gl_ModelViewMatrix * vertex).xyz;
-    vec3 viewNormal = normalize((gl_NormalMatrix * normal).xyz);
     vec3 lightDir;
     float d;
 
@@ -28,7 +26,7 @@ vec3 doLighting(vec4 vertex, vec3 normal, vec3 vertexColor)
     vec3 lightResult = vec3(0.0, 0.0, 0.0);
     for (int i=0; i<MAX_LIGHTS; ++i)
     {
-        lightDir = gl_LightSource[i].position.xyz - (viewPos * gl_LightSource[i].position.w);
+        lightDir = gl_LightSource[i].position.xyz - (viewPos.xyz * gl_LightSource[i].position.w);
         d = length(lightDir);
         lightDir = normalize(lightDir);
 
@@ -48,10 +46,14 @@ void main(void)
     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
     depth = gl_Position.z;
 
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+
 #if @diffuseMap
     diffuseMapUV = gl_MultiTexCoord@diffuseMapUV.xy;
 #endif
 
-    lighting = doLighting(gl_Vertex, gl_Normal.xyz, gl_Color.xyz);
+    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color.xyz);
     lighting = clamp(lighting, vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0));
 }

From 3e854a84a2454aecad5a1d7529df99e04800bc45 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 02:27:40 +0100
Subject: [PATCH 294/765] Slightly more efficient applying of light state

---
 components/sceneutil/lightmanager.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 4d8edec426..3950d0aea8 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -45,6 +45,8 @@ namespace SceneUtil
 
         virtual void apply(osg::State& state) const
         {
+            if (mLights.empty())
+                return;
             osg::Matrix modelViewMatrix = state.getModelViewMatrix();
 
             state.applyModelViewMatrix(state.getInitialViewMatrix());
@@ -193,16 +195,25 @@ namespace SceneUtil
         else
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
-
+            std::vector<osg::ref_ptr<osg::Light> > lights;
             for (unsigned int i=0; i<lightList.size();++i)
             {
-                std::vector<osg::ref_ptr<osg::Light> > lights;
                 lights.push_back(lightList[i]->mLightSource->getLight(frameNum));
-                osg::ref_ptr<LightStateAttribute> attr = new LightStateAttribute(mStartLight+i, lights);
-                // don't use setAttributeAndModes, that does not support light indices!
-                stateset->setAttribute(attr, osg::StateAttribute::ON);
-                stateset->setAssociatedModes(attr, osg::StateAttribute::ON);
+            }
 
+            // the first light state attribute handles the actual state setting for all lights
+            // it's best to batch these up so that we don't need to touch the modelView matrix more than necessary
+            osg::ref_ptr<LightStateAttribute> attr = new LightStateAttribute(mStartLight, lights);
+            // don't use setAttributeAndModes, that does not support light indices!
+            stateset->setAttribute(attr, osg::StateAttribute::ON);
+            stateset->setAssociatedModes(attr, osg::StateAttribute::ON);
+
+            // need to push some dummy attributes to ensure proper state tracking
+            // lights need to reset to their default when the StateSet is popped
+            for (unsigned int i=1; i<lightList.size(); ++i)
+            {
+                osg::ref_ptr<LightStateAttribute> dummy = new LightStateAttribute(mStartLight+i, std::vector<osg::ref_ptr<osg::Light> >());
+                stateset->setAttribute(dummy, osg::StateAttribute::ON);
             }
 
             stateSetCache.insert(std::make_pair(hash, stateset));

From e845c576d4c9993c7e5cae8932dc2818f50eaec0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 02:46:47 +0100
Subject: [PATCH 295/765] Use the texture matrix

---
 files/shaders/objects_vertex.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index fadbd98980..7ef2f6aa3e 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -51,7 +51,7 @@ void main(void)
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
 
 #if @diffuseMap
-    diffuseMapUV = gl_MultiTexCoord@diffuseMapUV.xy;
+    diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
 #endif
 
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color.xyz);

From 5fd84074c59e967c45f06c45f0ccf4d21b455c17 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 02:52:44 +0100
Subject: [PATCH 296/765] Reimplement detailMap, darkMap and emissiveMap

---
 files/shaders/objects_fragment.glsl | 27 +++++++++++++++++++++++++++
 files/shaders/objects_vertex.glsl   | 24 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 07a524ba19..c3f004e027 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -5,6 +5,21 @@ uniform sampler2D diffuseMap;
 varying vec2 diffuseMapUV;
 #endif
 
+#if @darkMap
+uniform sampler2D darkMap;
+varying vec2 darkMapUV;
+#endif
+
+#if @detailMap
+uniform sampler2D detailMap;
+varying vec2 detailMapUV;
+#endif
+
+#if @emissiveMap
+uniform sampler2D emissiveMap;
+varying vec2 emissiveMapUV;
+#endif
+
 varying float depth;
 
 varying vec3 lighting;
@@ -17,8 +32,20 @@ void main()
     gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
 #endif
 
+#if @detailMap
+    gl_FragData[0].xyz *= texture2D(detailMap, detailMapUV).xyz * 2.0;
+#endif
+
+#if @darkMap
+    gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
+#endif
+
     gl_FragData[0].xyz *= lighting;
 
+#if @emissiveMap
+    gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
+#endif
+
     float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 7ef2f6aa3e..50d6eb4903 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -4,6 +4,18 @@
 varying vec2 diffuseMapUV;
 #endif
 
+#if @darkMap
+varying vec2 darkMapUV;
+#endif
+
+#if @detailMap
+varying vec2 detailMapUV;
+#endif
+
+#if @emissiveMap
+varying vec2 emissiveMapUV;
+#endif
+
 varying float depth;
 
 varying vec3 lighting;
@@ -54,6 +66,18 @@ void main(void)
     diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
 #endif
 
+#if @darkMap
+    darkMapUV = (gl_TextureMatrix[@darkMapUV] * gl_MultiTexCoord@darkMapUV).xy;
+#endif
+
+#if @detailMap
+    detailMapUV = (gl_TextureMatrix[@detailMap] * gl_MultiTexCoord@detailMap).xy;
+#endif
+
+#if @emissiveMap
+    emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
+#endif
+
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color.xyz);
     lighting = clamp(lighting, vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0));
 }

From 456816f707c36b482edb7385033bc5d4e282b412 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 03:07:18 +0100
Subject: [PATCH 297/765] Use diffuse.a / vertex.a, use material emission

---
 components/shader/shadervisitor.cpp |  2 +-
 files/shaders/objects_fragment.glsl |  4 ++--
 files/shaders/objects_vertex.glsl   | 29 +++++++++++++++++++----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 02ece3296a..96357ea9de 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -120,7 +120,7 @@ namespace Shader
             case GL_AMBIENT_AND_DIFFUSE:
                 defineMap["colorMode"] = "2";
                 break;
-            case GL_AMBIENT:
+            case GL_EMISSION:
                 defineMap["colorMode"] = "1";
                 break;
             }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index c3f004e027..016cae13f4 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -22,7 +22,7 @@ varying vec2 emissiveMapUV;
 
 varying float depth;
 
-varying vec3 lighting;
+varying vec4 lighting;
 
 void main()
 {
@@ -40,7 +40,7 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
-    gl_FragData[0].xyz *= lighting;
+    gl_FragData[0] *= lighting;
 
 #if @emissiveMap
     gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 50d6eb4903..1805f31deb 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -18,24 +18,24 @@ varying vec2 emissiveMapUV;
 
 varying float depth;
 
-varying vec3 lighting;
+varying vec4 lighting;
 
 #define MAX_LIGHTS 8
 
-vec3 doLighting(vec3 viewPos, vec3 viewNormal, vec3 vertexColor)
+vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
 {
     vec3 lightDir;
     float d;
 
 #if @colorMode == 2
-    vec3 diffuse = vertexColor;
-    vec3 ambient = vertexColor;
+    vec4 diffuse = vertexColor;
+    vec3 ambient = vertexColor.xyz;
 #else
-    vec3 diffuse = gl_FrontMaterial.diffuse.xyz;
+    vec4 diffuse = gl_FrontMaterial.diffuse;
     vec3 ambient = gl_FrontMaterial.ambient.xyz;
 #endif
+    vec4 lightResult = vec4(0.0, 0.0, 0.0, diffuse.a);
 
-    vec3 lightResult = vec3(0.0, 0.0, 0.0);
     for (int i=0; i<MAX_LIGHTS; ++i)
     {
         lightDir = gl_LightSource[i].position.xyz - (viewPos.xyz * gl_LightSource[i].position.w);
@@ -43,11 +43,17 @@ vec3 doLighting(vec3 viewPos, vec3 viewNormal, vec3 vertexColor)
         lightDir = normalize(lightDir);
 
         lightResult.xyz += ambient * gl_LightSource[i].ambient.xyz;
-        lightResult.xyz += diffuse * gl_LightSource[i].diffuse.xyz * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0)
+        lightResult.xyz += diffuse.xyz * gl_LightSource[i].diffuse.xyz * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0)
                 * max(dot(viewNormal.xyz, lightDir), 0.0);
     }
 
-    lightResult += gl_LightModel.ambient.xyz * ambient;
+    lightResult.xyz += gl_LightModel.ambient.xyz * ambient;
+
+#if @colorMode == 1
+    lightResult.xyz += vertexColor.xyz;
+#else
+    lightResult.xyz += gl_FrontMaterial.emission.xyz;
+#endif
 
     return lightResult;
 }
@@ -78,6 +84,9 @@ void main(void)
     emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
 #endif
 
-    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color.xyz);
-    lighting = clamp(lighting, vec3(0.0, 0.0, 0.0), vec3(1.0, 1.0, 1.0));
+    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
+
+    // TODO: make clamp configurable
+    // the following produces fixed-function compatible lighting, w/o clamp arguably looks better
+    //lighting = clamp(lighting, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
 }

From 22cc5c0965bebfabbc21d9a2dfb135758f15766f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 15:04:05 +0100
Subject: [PATCH 298/765] Cache the Program

---
 components/shader/shadermanager.cpp | 16 ++++++++++++++++
 components/shader/shadermanager.hpp |  6 ++++++
 components/shader/shadervisitor.cpp |  6 +-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index fc9a1f7222..9c0e70d481 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -3,6 +3,8 @@
 #include <fstream>
 #include <iostream>
 
+#include <osg/Program>
+
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
@@ -78,4 +80,18 @@ namespace Shader
         return shaderIt->second;
     }
 
+    osg::ref_ptr<osg::Program> ShaderManager::getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader)
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
+        ProgramMap::iterator found = mPrograms.find(std::make_pair(vertexShader, fragmentShader));
+        if (found == mPrograms.end())
+        {
+            osg::ref_ptr<osg::Program> program (new osg::Program);
+            program->addShader(vertexShader);
+            program->addShader(fragmentShader);
+            found = mPrograms.insert(std::make_pair(std::make_pair(vertexShader, fragmentShader), program)).first;
+        }
+        return found->second;
+    }
+
 }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index e0ec3fe5fa..5196dbe809 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -30,6 +30,9 @@ namespace Shader
         /// @note Thread safe.
         osg::ref_ptr<osg::Shader> getShader(const std::string& shaderTemplate, const DefineMap& defines, osg::Shader::Type shaderType);
 
+        osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader);
+
+
     private:
         std::string mPath;
 
@@ -41,6 +44,9 @@ namespace Shader
         typedef std::map<MapKey, osg::ref_ptr<osg::Shader> > ShaderMap;
         ShaderMap mShaders;
 
+        typedef std::map<std::pair<osg::ref_ptr<osg::Shader>, osg::ref_ptr<osg::Shader> >, osg::ref_ptr<osg::Program> > ProgramMap;
+        ProgramMap mPrograms;
+
         OpenThreads::Mutex mMutex;
     };
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 96357ea9de..a077cb09ea 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -131,11 +131,7 @@ namespace Shader
 
         if (vertexShader && fragmentShader)
         {
-            osg::ref_ptr<osg::Program> program (new osg::Program);
-            program->addShader(vertexShader);
-            program->addShader(fragmentShader);
-
-            stateset->setAttributeAndModes(program, osg::StateAttribute::ON);
+            stateset->setAttributeAndModes(mShaderManager.getProgram(vertexShader, fragmentShader), osg::StateAttribute::ON);
 
             for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
             {

From 21c4dffed25424f8a0ef2d48a896c81197202cdc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 23:29:07 +0100
Subject: [PATCH 299/765] Add #include support in shaders

---
 components/shader/shadermanager.cpp | 99 ++++++++++++++++++++++-------
 1 file changed, 75 insertions(+), 24 deletions(-)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 9c0e70d481..286642e578 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -19,6 +19,73 @@ namespace Shader
         mPath = path;
     }
 
+    bool parseIncludes(boost::filesystem::path shaderPath, std::string& source)
+    {
+        std::set<boost::filesystem::path> includedFiles;
+        size_t foundPos = 0;
+        while ((foundPos = source.find("#include")) != std::string::npos)
+        {
+            size_t start = source.find('"', foundPos);
+            if (start == std::string::npos || start == source.size()-1)
+            {
+                std::cerr << "Invalid #include " << std::endl;
+                return false;
+            }
+            size_t end = source.find('"', start+1);
+            if (end == std::string::npos)
+            {
+                std::cerr << "Invalid #include " << std::endl;
+                return false;
+            }
+            std::string includeFilename = source.substr(start+1, end-(start+1));
+            boost::filesystem::path includePath = shaderPath / includeFilename;
+            boost::filesystem::ifstream includeFstream;
+            includeFstream.open(includePath);
+            if (includeFstream.fail())
+            {
+                std::cerr << "Failed to open " << includePath.string() << std::endl;
+                return false;
+            }
+            std::stringstream buffer;
+            buffer << includeFstream.rdbuf();
+            source.replace(foundPos, (end-foundPos+1), buffer.str());
+
+            if (includedFiles.insert(includePath).second == false)
+            {
+                std::cerr << "Detected cyclic #includes" << std::endl;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool parseDefines(std::string& source, const ShaderManager::DefineMap& defines)
+    {
+        const char escapeCharacter = '@';
+        size_t foundPos = 0;
+        while ((foundPos = source.find(escapeCharacter)) != std::string::npos)
+        {
+            size_t endPos = source.find_first_of(" \n\r()[].;", foundPos);
+            if (endPos == std::string::npos)
+            {
+                std::cerr << "Unexpected EOF" << std::endl;
+                return false;
+            }
+            std::string define = source.substr(foundPos+1, endPos - (foundPos+1));
+            ShaderManager::DefineMap::const_iterator defineFound = defines.find(define);
+            if (defineFound == defines.end())
+            {
+                std::cerr << "Undefined " << define << std::endl;
+                return false;
+            }
+            else
+            {
+                source.replace(foundPos, endPos-foundPos, defineFound->second);
+            }
+        }
+        return true;
+    }
+
     osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &shaderTemplate, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
@@ -38,36 +105,20 @@ namespace Shader
             std::stringstream buffer;
             buffer << stream.rdbuf();
 
-            templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, buffer.str())).first;
+            // parse includes
+            std::string source = buffer.str();
+            if (!parseIncludes(boost::filesystem::path(mPath), source))
+                return NULL;
+
+            templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, source)).first;
         }
 
         ShaderMap::iterator shaderIt = mShaders.find(std::make_pair(shaderTemplate, defines));
         if (shaderIt == mShaders.end())
         {
             std::string shaderSource = templateIt->second;
-
-            const char escapeCharacter = '@';
-            size_t foundPos = 0;
-            while ((foundPos = shaderSource.find(escapeCharacter)) != std::string::npos)
-            {
-                size_t endPos = shaderSource.find_first_of(" \n\r()[].;", foundPos);
-                if (endPos == std::string::npos)
-                {
-                    std::cerr << "Unexpected EOF" << std::endl;
-                    return NULL;
-                }
-                std::string define = shaderSource.substr(foundPos+1, endPos - (foundPos+1));
-                DefineMap::const_iterator defineFound = defines.find(define);
-                if (defineFound == defines.end())
-                {
-                    std::cerr << "Undefined " << define << " in shader " << shaderTemplate << std::endl;
-                    return NULL;
-                }
-                else
-                {
-                    shaderSource.replace(foundPos, endPos-foundPos, defineFound->second);
-                }
-            }
+            if (!parseDefines(shaderSource, defines))
+                return NULL;
 
             osg::ref_ptr<osg::Shader> shader (new osg::Shader(shaderType));
             shader->setShaderSource(shaderSource);

From 1223bca3d4405ef2a1e2e5512322c11ceb680a46 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 23:29:26 +0100
Subject: [PATCH 300/765] Move doLighting to separate file

---
 files/shaders/CMakeLists.txt      |  1 +
 files/shaders/lighting.glsl       | 37 +++++++++++++++++++++++++++++
 files/shaders/objects_vertex.glsl | 39 +------------------------------
 3 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 files/shaders/lighting.glsl

diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index edb5b51f2a..a7b631139c 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SHADER_FILES
     water_nm.png
     objects_vertex.glsl
     objects_fragment.glsl
+    lighting.glsl
 )
 
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR} ${DDIR} "${SHADER_FILES}")
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
new file mode 100644
index 0000000000..98490b8b89
--- /dev/null
+++ b/files/shaders/lighting.glsl
@@ -0,0 +1,37 @@
+#define MAX_LIGHTS 8
+
+vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
+{
+    vec3 lightDir;
+    float d;
+
+#if @colorMode == 2
+    vec4 diffuse = vertexColor;
+    vec3 ambient = vertexColor.xyz;
+#else
+    vec4 diffuse = gl_FrontMaterial.diffuse;
+    vec3 ambient = gl_FrontMaterial.ambient.xyz;
+#endif
+    vec4 lightResult = vec4(0.0, 0.0, 0.0, diffuse.a);
+
+    for (int i=0; i<MAX_LIGHTS; ++i)
+    {
+        lightDir = gl_LightSource[i].position.xyz - (viewPos.xyz * gl_LightSource[i].position.w);
+        d = length(lightDir);
+        lightDir = normalize(lightDir);
+
+        lightResult.xyz += ambient * gl_LightSource[i].ambient.xyz;
+        lightResult.xyz += diffuse.xyz * gl_LightSource[i].diffuse.xyz * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0)
+                * max(dot(viewNormal.xyz, lightDir), 0.0);
+    }
+
+    lightResult.xyz += gl_LightModel.ambient.xyz * ambient;
+
+#if @colorMode == 1
+    lightResult.xyz += vertexColor.xyz;
+#else
+    lightResult.xyz += gl_FrontMaterial.emission.xyz;
+#endif
+
+    return lightResult;
+}
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 1805f31deb..c322f68537 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -20,44 +20,7 @@ varying float depth;
 
 varying vec4 lighting;
 
-#define MAX_LIGHTS 8
-
-vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
-{
-    vec3 lightDir;
-    float d;
-
-#if @colorMode == 2
-    vec4 diffuse = vertexColor;
-    vec3 ambient = vertexColor.xyz;
-#else
-    vec4 diffuse = gl_FrontMaterial.diffuse;
-    vec3 ambient = gl_FrontMaterial.ambient.xyz;
-#endif
-    vec4 lightResult = vec4(0.0, 0.0, 0.0, diffuse.a);
-
-    for (int i=0; i<MAX_LIGHTS; ++i)
-    {
-        lightDir = gl_LightSource[i].position.xyz - (viewPos.xyz * gl_LightSource[i].position.w);
-        d = length(lightDir);
-        lightDir = normalize(lightDir);
-
-        lightResult.xyz += ambient * gl_LightSource[i].ambient.xyz;
-        lightResult.xyz += diffuse.xyz * gl_LightSource[i].diffuse.xyz * clamp(1.0 / (gl_LightSource[i].constantAttenuation + gl_LightSource[i].linearAttenuation * d + gl_LightSource[i].quadraticAttenuation * d * d), 0.0, 1.0)
-                * max(dot(viewNormal.xyz, lightDir), 0.0);
-    }
-
-    lightResult.xyz += gl_LightModel.ambient.xyz * ambient;
-
-#if @colorMode == 1
-    lightResult.xyz += vertexColor.xyz;
-#else
-    lightResult.xyz += gl_FrontMaterial.emission.xyz;
-#endif
-
-    return lightResult;
-}
-
+#include "lighting.glsl"
 
 void main(void)
 {

From 18e80d5627727f4a98b2f7dd68e313fa322385df Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 17 Feb 2016 23:39:06 +0100
Subject: [PATCH 301/765] Add per-pixel lighting code

---
 files/shaders/lighting.glsl         |  4 ++++
 files/shaders/objects_fragment.glsl | 15 +++++++++++++++
 files/shaders/objects_vertex.glsl   | 18 ++++++++++++++----
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index 98490b8b89..f856bc6bd4 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -33,5 +33,9 @@ vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
     lightResult.xyz += gl_FrontMaterial.emission.xyz;
 #endif
 
+    // TODO: make clamp configurable
+    // the following produces fixed-function compatible lighting, w/o clamp arguably looks better
+    //lightResult = clamp(lightResult, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
+
     return lightResult;
 }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 016cae13f4..f3a9aa7666 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -22,7 +22,17 @@ varying vec2 emissiveMapUV;
 
 varying float depth;
 
+#define PER_PIXEL_LIGHTING 0
+
+#if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
+#else
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
+varying vec4 passColour;
+#endif
+
+#include "lighting.glsl"
 
 void main()
 {
@@ -40,7 +50,12 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
+
+#if !PER_PIXEL_LIGHTING
     gl_FragData[0] *= lighting;
+#else
+    gl_FragData[0] *= doLighting(passViewPos, passViewNormal, passColour);
+#endif
 
 #if @emissiveMap
     gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index c322f68537..7a6f0ca215 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -18,7 +18,15 @@ varying vec2 emissiveMapUV;
 
 varying float depth;
 
+#define PER_PIXEL_LIGHTING 0
+
+#if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
+#else
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
+varying vec4 passColour;
+#endif
 
 #include "lighting.glsl"
 
@@ -47,9 +55,11 @@ void main(void)
     emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
 #endif
 
+#if !PER_PIXEL_LIGHTING
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
-
-    // TODO: make clamp configurable
-    // the following produces fixed-function compatible lighting, w/o clamp arguably looks better
-    //lighting = clamp(lighting, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
+#else
+    passViewPos = viewPos.xyz;
+    passViewNormal = viewNormal;
+    passColour = gl_Color;
+#endif
 }

From e5a37a70232f43cd6bd3b76afcb26d0053fe56b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 00:00:12 +0100
Subject: [PATCH 302/765] Add normal map code

---
 files/shaders/objects_fragment.glsl | 20 ++++++++++++++++++--
 files/shaders/objects_vertex.glsl   | 12 +++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index f3a9aa7666..6346aa4996 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -20,9 +20,15 @@ uniform sampler2D emissiveMap;
 varying vec2 emissiveMapUV;
 #endif
 
+#if @normalMap
+uniform sampler2D normalMap;
+varying vec2 normalMapUV;
+varying vec3 viewTangent;
+#endif
+
 varying float depth;
 
-#define PER_PIXEL_LIGHTING 0
+#define PER_PIXEL_LIGHTING @normalMap
 
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
@@ -50,11 +56,21 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
+#if @normalMap
+    vec3 viewNormal = passViewNormal;
+    vec3 normalTex = texture2D(normalMap, normalMapUV).xyz;
+
+    vec3 viewBinormal = cross(viewTangent, viewNormal);
+    mat3 tbn = mat3(viewTangent, viewBinormal, viewNormal);
+
+    viewNormal = normalize(tbn * (normalTex * 2.0 - 1.0));
+#endif
+
 
 #if !PER_PIXEL_LIGHTING
     gl_FragData[0] *= lighting;
 #else
-    gl_FragData[0] *= doLighting(passViewPos, passViewNormal, passColour);
+    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColour);
 #endif
 
 #if @emissiveMap
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 7a6f0ca215..08fdb4ef84 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -16,9 +16,14 @@ varying vec2 detailMapUV;
 varying vec2 emissiveMapUV;
 #endif
 
+#if @normalMap
+varying vec2 normalMapUV;
+varying vec3 viewTangent;
+#endif
+
 varying float depth;
 
-#define PER_PIXEL_LIGHTING 0
+#define PER_PIXEL_LIGHTING @normalMap
 
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
@@ -55,6 +60,11 @@ void main(void)
     emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
 #endif
 
+#if @normalMap
+    normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
+    viewTangent = normalize(gl_NormalMatrix * gl_MultiTexCoord7.xyz);
+#endif
+
 #if !PER_PIXEL_LIGHTING
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
 #else

From 3969675afa9b793e1d25fdddf312973fcc50fe28 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 16:42:17 +0100
Subject: [PATCH 303/765] Remove unused settings

---
 apps/openmw/mwgui/settingswindow.cpp      | 33 ----------------
 apps/openmw/mwgui/settingswindow.hpp      |  6 ---
 files/mygui/openmw_settings_window.layout | 14 +------
 files/settings-default.cfg                | 48 -----------------------
 4 files changed, 1 insertion(+), 100 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b410204e90..14408d11a2 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -179,9 +179,6 @@ namespace MWGui
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
         getWidget(mAnisotropyBox, "AnisotropyBox");
-        getWidget(mShadersButton, "ShadersButton");
-        getWidget(mShadowsEnabledButton, "ShadowsEnabledButton");
-        getWidget(mShadowsTextureSize, "ShadowsTextureSize");
         getWidget(mControlsBox, "ControlsBox");
         getWidget(mResetControlsButton, "ResetControlsButton");
         getWidget(mKeyboardSwitch, "KeyboardButton");
@@ -211,8 +208,6 @@ namespace MWGui
 
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
 
-        mShadowsTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onShadowTextureSizeChanged);
-
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
@@ -253,13 +248,6 @@ namespace MWGui
         if (waterTextureSize >= 2048)
             mWaterTextureSize->setIndexSelected(2);
 
-        mShadowsTextureSize->setCaption (Settings::Manager::getString ("texture size", "Shadows"));
-
-        if (!Settings::Manager::getBool("shaders", "Objects"))
-        {
-            mShadowsEnabledButton->setEnabled(false);
-        }
-
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -339,12 +327,6 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onShadowTextureSizeChanged(MyGUI::ComboBox *_sender, size_t pos)
-    {
-        Settings::Manager::setString("texture size", "Shadows", _sender->getItemNameAt(pos));
-        apply();
-    }
-
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
         std::string on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
@@ -361,21 +343,6 @@ namespace MWGui
             newState = true;
         }
 
-        if (_sender == mShadersButton)
-        {
-            if (newState == false)
-            {
-                // shadows not supported
-                mShadowsEnabledButton->setEnabled(false);
-                mShadowsEnabledButton->setCaptionWithReplacing("#{sOff}");
-                Settings::Manager::setBool("enabled", "Shadows", false);
-            }
-            else
-            {
-                mShadowsEnabledButton->setEnabled(true);
-            }
-        }
-
         if (_sender == mFullscreenButton)
         {
             // check if this resolution is supported in fullscreen
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 4214653095..8d9394fada 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -32,13 +32,9 @@ namespace MWGui
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
             MyGUI::Widget* mAnisotropyBox;
-            MyGUI::Button* mShadersButton;
 
             MyGUI::ComboBox* mWaterTextureSize;
 
-            MyGUI::Button* mShadowsEnabledButton;
-            MyGUI::ComboBox* mShadowsTextureSize;
-
             // controls
             MyGUI::ScrollView* mControlsBox;
             MyGUI::Button* mResetControlsButton;
@@ -58,8 +54,6 @@ namespace MWGui
 
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
 
-            void onShadowTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
-
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
             void onResetDefaultBindings(MyGUI::Widget* _sender);
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 5d6d817d6e..fb8a358fe3 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -257,18 +257,6 @@
                                 <Property key="Caption" value="Window border"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 124 300 24">
-                            <Property key="Visible" value="false"/>
-                            <UserString key="Hidden" value="true"/>
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadersButton">
-                                <UserString key="SettingCategory" value="Objects"/>
-                                <UserString key="SettingName" value="shaders"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 108 16" align="Left Top">
-                                <Property key="Caption" value="Object shaders"/>
-                            </Widget>
-                        </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 94 300 32" align="Left Top">
                             <Property key="MultiLine" value="true"/>
@@ -411,7 +399,6 @@
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">
-                    -->
                     <Widget type="Widget" skin="" position="0 28 352 268">
                         <Property key="Visible" value="false"/>
                         <Property key="Caption" value="  Shadows  "/>
@@ -489,6 +476,7 @@
                             </Widget>
                         </Widget>
                     </Widget>
+                    -->
                 </Widget>
             </Widget>
         </Widget>
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index a5e750d4da..f6c5d29fc7 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -277,54 +277,6 @@ refraction = false
 # Draw NPCs and creatures on water reflections.
 reflect actors = false
 
-[Objects]
-
-# Enable shaders for objects other than water. Unused.
-shaders = true
-
-[Terrain]
-
-# Use shaders for terrain?  Unused.
-shader = true
-
-# Distant land is rendered?  Unused.
-distant land = false
-
-[Shadows]
-
-# Enable shadows. Other shadow settings disabled if false. Unused.
-enabled = false
-
-# Size of the shadow textures in pixels.  Unused.  (e.g. 256 to 2048).
-texture size = 1024
-
-# Actors cast shadows.  Unused.
-actor shadows = true
-
-# Static objects cast shadows.  Unused.
-statics shadows = true
-
-# Terrain cast shadows.  Unused.
-terrain shadows = true
-
-# Miscellaneous objects cast shadows.  Unused.
-misc shadows = true
-
-# Debugging of shadows.  Unused.
-debug = false
-
-# Fraction of distance after which shadow starts to fade out.  Unused.
-fade start = 0.8
-
-# Split shadow maps, allowing for a larger shadow distance.  Unused.
-split = false
-
-# Distance for shadows if not split.  Smaller is poorer. Unused.
-shadow distance = 1300
-
-# Distance for shadows if split.  Unused.
-split shadow distance = 14000
-
 [Windows]
 
 # Location and sizes of windows as a fraction of the OpenMW window or

From a73512afb73ec7b4a29ebcc07cd05f3db80cef02 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 17:08:18 +0100
Subject: [PATCH 304/765] Add shader settings to settings.cfg

---
 apps/openmw/mwrender/renderingmanager.cpp |  3 +++
 components/resource/scenemanager.cpp      | 21 +++++++++++++++
 components/resource/scenemanager.hpp      | 13 +++++++++
 components/shader/shadervisitor.cpp       | 32 ++++++++++++++++++++---
 components/shader/shadervisitor.hpp       | 17 ++++++++++++
 files/settings-default.cfg                | 21 +++++++++++++++
 files/shaders/lighting.glsl               |  9 ++++---
 files/shaders/objects_fragment.glsl       |  7 +++--
 files/shaders/objects_vertex.glsl         |  2 +-
 9 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 6b5cf460cf..dfc1743f07 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -169,6 +169,9 @@ namespace MWRender
     {
         resourceSystem->getSceneManager()->setParticleSystemMask(MWRender::Mask_ParticleSystem);
         resourceSystem->getSceneManager()->setShaderPath(resourcePath + "/shaders");
+        resourceSystem->getSceneManager()->setForceShaders(Settings::Manager::getBool("force shaders", "Shaders"));
+        resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
+        resourceSystem->getSceneManager()->setForcePerPixelLighting(Settings::Manager::getBool("force per pixel lighting", "Shaders"));
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f4846a8a0f..be0cd7dd73 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -209,6 +209,9 @@ namespace Resource
     SceneManager::SceneManager(const VFS::Manager *vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager)
         : ResourceManager(vfs)
         , mShaderManager(new Shader::ShaderManager)
+        , mForceShaders(false)
+        , mClampLighting(false)
+        , mForcePerPixelLighting(false)
         , mInstanceCache(new MultiObjectCache)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
@@ -220,6 +223,21 @@ namespace Resource
     {
     }
 
+    void SceneManager::setForceShaders(bool force)
+    {
+        mForceShaders = force;
+    }
+
+    void SceneManager::setClampLighting(bool clamp)
+    {
+        mClampLighting = clamp;
+    }
+
+    void SceneManager::setForcePerPixelLighting(bool force)
+    {
+        mForcePerPixelLighting = force;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -339,6 +357,9 @@ namespace Resource
             loaded->accept(setFilterSettingsControllerVisitor);
 
             Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
+            shaderVisitor.setForceShaders(mForceShaders);
+            shaderVisitor.setClampLighting(mClampLighting);
+            shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
             loaded->accept(shaderVisitor);
 
             // share state
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index d86c746d79..2ef9f614b5 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -40,6 +40,15 @@ namespace Resource
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
+        /// @see ShaderVisitor::setForceShaders
+        void setForceShaders(bool force);
+
+        /// @see ShaderVisitor::setClampLighting
+        void setClampLighting(bool clamp);
+
+        /// @see ShaderVisitor::setForcePerPixelLighting
+        void setForcePerPixelLighting(bool force);
+
         void setShaderPath(const std::string& path);
 
         /// Get a read-only copy of this scene "template"
@@ -106,6 +115,10 @@ namespace Resource
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);
 
         std::auto_ptr<Shader::ShaderManager> mShaderManager;
+        bool mForceShaders;
+        bool mClampLighting;
+        bool mForcePerPixelLighting;
+
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
         OpenThreads::Mutex mSharedStateMutex;
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index a077cb09ea..67362e0c6e 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -16,7 +16,8 @@ namespace Shader
 {
 
     ShaderVisitor::ShaderRequirements::ShaderRequirements()
-        : mColorMaterial(false)
+        : mHasNormalMap(false)
+        , mColorMaterial(false)
         , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
         , mTexStageRequiringTangents(-1)
     {
@@ -24,6 +25,9 @@ namespace Shader
 
     ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        , mForceShaders(false)
+        , mClampLighting(false)
+        , mForcePerPixelLighting(false)
         , mShaderManager(shaderManager)
         , mDefaultVsTemplate(defaultVsTemplate)
         , mDefaultFsTemplate(defaultFsTemplate)
@@ -31,6 +35,21 @@ namespace Shader
         mRequirements.push_back(ShaderRequirements());
     }
 
+    void ShaderVisitor::setForceShaders(bool force)
+    {
+        mForceShaders = force;
+    }
+
+    void ShaderVisitor::setClampLighting(bool clamp)
+    {
+        mClampLighting = clamp;
+    }
+
+    void ShaderVisitor::setForcePerPixelLighting(bool force)
+    {
+        mForcePerPixelLighting = force;
+    }
+
     void ShaderVisitor::apply(osg::Node& node)
     {
         if (node.getStateSet())
@@ -61,6 +80,7 @@ namespace Shader
                         if (texture->getName() == "normalMap")
                         {
                             mRequirements.back().mTexStageRequiringTangents = unit;
+                            mRequirements.back().mHasNormalMap = true;
                             // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
                             stateset->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
                         }
@@ -126,6 +146,9 @@ namespace Shader
             }
         }
 
+        defineMap["forcePPL"] = mForcePerPixelLighting ? "1" : "0";
+        defineMap["clamp"] = mClampLighting ? "1" : "0";
+
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
 
@@ -161,7 +184,8 @@ namespace Shader
             }
 
             // TODO: find a better place for the stateset
-            createProgram(reqs, geometry.getOrCreateStateSet());
+            if (reqs.mHasNormalMap || mForceShaders)
+                createProgram(reqs, geometry.getOrCreateStateSet());
         }
 
         if (needPop)
@@ -181,8 +205,10 @@ namespace Shader
 
         if (!mRequirements.empty())
         {
+            const ShaderRequirements& reqs = mRequirements.back();
             // TODO: find a better place for the stateset
-            createProgram(mRequirements.back(), drawable.getOrCreateStateSet());
+            if (reqs.mHasNormalMap || mForceShaders)
+                createProgram(reqs, drawable.getOrCreateStateSet());
         }
 
         if (needPop)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 507f1417ea..fb29d503fd 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -14,6 +14,17 @@ namespace Shader
     public:
         ShaderVisitor(ShaderManager& shaderManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
 
+        /// By default, only bump mapped objects will have a shader added to them.
+        /// Setting force = true will cause all objects to render using shaders, regardless of having a bump map.
+        void setForceShaders(bool force);
+
+        /// Set whether lighting is clamped for visual compatibility with the fixed function pipeline.
+        void setClampLighting(bool clamp);
+
+        /// By default, only bump mapped objects use per-pixel lighting.
+        /// Setting force = true will cause all shaders to use per-pixel lighting, regardless of having a bump map.
+        void setForcePerPixelLighting(bool force);
+
         virtual void apply(osg::Node& node);
 
         virtual void apply(osg::Drawable& drawable);
@@ -25,6 +36,10 @@ namespace Shader
         void popRequirements();
 
     private:
+        bool mForceShaders;
+        bool mClampLighting;
+        bool mForcePerPixelLighting;
+
         ShaderManager& mShaderManager;
 
         struct ShaderRequirements
@@ -34,6 +49,8 @@ namespace Shader
             // <texture stage, texture name>
             std::map<int, std::string> mTextures;
 
+            bool mHasNormalMap;
+
             bool mColorMaterial;
             // osg::Material::ColorMode
             int mVertexColorMode;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index f6c5d29fc7..e450f6518b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -157,6 +157,27 @@ texture min filter = linear
 # Texture mipmap type.  (none, nearest, or linear).
 texture mipmap = nearest
 
+[Shaders]
+
+# Force rendering with shaders. By default, only bump-mapped objects will use shaders.
+# Enabling this option may cause slightly different visuals if the "clamp lighting" option
+# is set to false. Otherwise, there should not be a visual difference.
+force shaders = false
+
+# Force the use of per pixel lighting. By default, only bump mapped objects use per-pixel lighting.
+# Has no effect if the 'force shaders' option is false.
+# Enabling per-pixel lighting can result in visual differences to the original MW engine. It is not
+# recommended to enable this option when using vanilla Morrowind files, because certain lights in Morrowind
+# rely on vertex lighting to look as intended.
+force per pixel lighting = false
+
+# Restrict the amount of lighting that an object can receive to a maximum of (1,1,1).
+# Only affects objects that render with shaders (see 'force shaders' option).
+# Setting this option to 'true' results in fixed-function compatible lighting, but the lighting
+# may appear 'dull' and there might be color shifts.
+# Setting this option to 'false' results in more realistic lighting.
+clamp lighting = false
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index f856bc6bd4..d3c51d3cdc 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -33,9 +33,10 @@ vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
     lightResult.xyz += gl_FrontMaterial.emission.xyz;
 #endif
 
-    // TODO: make clamp configurable
-    // the following produces fixed-function compatible lighting, w/o clamp arguably looks better
-    //lightResult = clamp(lightResult, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
-
+#if @clamp
+    lightResult = clamp(lightResult, vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0));
+#else
+    lightResult = max(lightResult, 0.0);
+#endif
     return lightResult;
 }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6346aa4996..37c715e1a7 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -28,7 +28,7 @@ varying vec3 viewTangent;
 
 varying float depth;
 
-#define PER_PIXEL_LIGHTING @normalMap
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
@@ -56,8 +56,11 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
-#if @normalMap
+#if PER_PIXEL_LIGHTING
     vec3 viewNormal = passViewNormal;
+#endif
+
+#if @normalMap
     vec3 normalTex = texture2D(normalMap, normalMapUV).xyz;
 
     vec3 viewBinormal = cross(viewTangent, viewNormal);
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 08fdb4ef84..940a2306e2 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -23,7 +23,7 @@ varying vec3 viewTangent;
 
 varying float depth;
 
-#define PER_PIXEL_LIGHTING @normalMap
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
 
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;

From 12326073859acdbecd3681038c9b16e4be0340dd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 19:41:06 +0100
Subject: [PATCH 305/765] Remove pointless widget names in settings layout file

---
 apps/openmw/mwgui/settingswindow.cpp      |  1 -
 apps/openmw/mwgui/settingswindow.hpp      |  1 -
 files/mygui/openmw_settings_window.layout | 38 +++++++++++------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 14408d11a2..a0833194b6 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -175,7 +175,6 @@ namespace MWGui
         getWidget(mOkButton, "OkButton");
         getWidget(mResolutionList, "ResolutionList");
         getWidget(mFullscreenButton, "FullscreenButton");
-        getWidget(mVSyncButton, "VSyncButton");
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
         getWidget(mAnisotropyBox, "AnisotropyBox");
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 8d9394fada..5b12cc557f 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -28,7 +28,6 @@ namespace MWGui
             // graphics
             MyGUI::ListBox* mResolutionList;
             MyGUI::Button* mFullscreenButton;
-            MyGUI::Button* mVSyncButton;
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
             MyGUI::Widget* mAnisotropyBox;
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index fb8a358fe3..8ff850cae5 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -10,7 +10,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sTransparency_Menu}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="MenuTransparencySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -31,7 +31,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top">
                         <Property key="Caption" value="#{sMenu_Help_Delay}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="ToolTipDelaySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -52,7 +52,7 @@
                     <Widget type="TextBox" skin="NormalText" position="0 0 352 16" align="Left Top" name="DifficultyText">
                         <Property key="Caption" value="#{sDifficulty}"/>
                     </Widget>
-                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch" name="DifficultySlider">
+                    <Widget type="MWScrollBar" skin="MW_HScroll" position="0 20 352 14" align="Left Top HStretch">
                         <Property key="Range" value="10000"/>
                         <Property key="Page" value="300"/>
                         <UserString key="SettingType" value="Slider"/>
@@ -74,7 +74,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 200 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="AutosaveButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Saves"/>
                         <UserString key="SettingName" value="autosave"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -84,7 +84,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 230 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="BestAttackButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="Game"/>
                         <UserString key="SettingName" value="best attack"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -94,7 +94,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 260 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="SubtitlesButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="GUI"/>
                         <UserString key="SettingName" value="subtitles"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -104,7 +104,7 @@
                     </Widget>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 290 260 24">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="CrosshairButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                         <UserString key="SettingCategory" value="HUD"/>
                         <UserString key="SettingName" value="crosshair"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -119,7 +119,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 4 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMaster}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 28 352 18" align="HStretch Top" name="MasterVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 28 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -130,7 +130,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 54 352 18" align="Left Top">
                     <Property key="Caption" value="#{sVoice}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 78 352 18" align="HStretch Top" name="VoiceVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 78 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -141,7 +141,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 104 352 18" align="Left Top">
                     <Property key="Caption" value="#{sEffects}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 128 352 18" align="HStretch Top" name="EffectsVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 128 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -152,7 +152,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 154 352 18" align="Left Top">
                     <Property key="Caption" value="#{sFootsteps}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 178 352 18" align="HStretch Top" name="FootstepsVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 178 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -163,7 +163,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 204 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMusic}"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 228 352 18" align="HStretch Top" name="MusicVolume">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 228 352 18" align="HStretch Top">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -189,7 +189,7 @@
                     <Property key="Caption" value="#{sControlsMenu1}"/>
                 </Widget>
                 <Widget type="HBox" skin="" position="4 224 300 24" align="Left Bottom">
-                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom" name="InvertYButton">
+                    <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Bottom">
                         <UserString key="SettingCategory" value="Input"/>
                         <UserString key="SettingName" value="invert y axis"/>
                         <UserString key="SettingType" value="CheckButton"/>
@@ -201,7 +201,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 254 336 18" align="Left Bottom">
                     <Property key="Caption" value="Camera sensitivity"/>
                 </Widget>
-                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 278 336 18" align="HStretch Bottom" name="CameraSensitivitySlider">
+                <Widget type="MWScrollBar" skin="MW_HScroll" position="4 278 336 18" align="HStretch Bottom">
                     <Property key="Range" value="10000"/>
                     <Property key="Page" value="300"/>
                     <UserString key="SettingType" value="Slider"/>
@@ -265,7 +265,7 @@
 
                         <Widget type="TextBox" skin="NormalText" position="0 198 329 18" align="Left Top" name="FovText">
                         </Widget>
-                        <Widget type="MWScrollBar" skin="MW_HScroll" position="0 222 329 18" align="HStretch Top" name="FOVSlider">
+                        <Widget type="MWScrollBar" skin="MW_HScroll" position="0 222 329 18" align="HStretch Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -320,7 +320,7 @@
                             <Widget type="TextBox" skin="SandText" position="0 0 300 24" align="Left Top" name="AnisotropyLabel">
                                 <Property key="Caption" value="Anisotropy"/>
                             </Widget>
-                            <Widget type="MWScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top" name="AnisotropySlider">
+                            <Widget type="MWScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top">
                                 <Property key="Range" value="17"/>
                                 <UserString key="SettingType" value="Slider"/>
                                 <UserString key="SettingCategory" value="General"/>
@@ -332,7 +332,7 @@
                         <Widget type="TextBox" skin="NormalText" position="4 130 322 18" align="Left Top">
                             <Property key="Caption" value="#{sRender_Distance}"/>
                         </Widget>
-                        <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 322 18" align="Left Top" name="ViewDistanceSlider">
+                        <Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 322 18" align="Left Top">
                             <Property key="Range" value="10000"/>
                             <Property key="Page" value="300"/>
                             <UserString key="SettingType" value="Slider"/>
@@ -354,7 +354,7 @@
                     <Widget type="TabItem" skin="" position="0 28 352 268">
                         <Property key="Caption" value="  Water  "/>
                         <Widget type="HBox" skin="" position="4 4 350 24">
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="WaterShaderButton">
+                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                                 <UserString key="SettingCategory" value="Water"/>
                                 <UserString key="SettingName" value="shader"/>
                                 <UserString key="SettingType" value="CheckButton"/>
@@ -365,7 +365,7 @@
                         </Widget>
                         <Widget type="Widget" skin="" position="24 32 300 230">
                             <Widget type="HBox" skin="" position="4 0 350 24">
-                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="RefractionButton">
+                                <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top">
                                     <UserString key="SettingCategory" value="Water"/>
                                     <UserString key="SettingName" value="refraction"/>
                                     <UserString key="SettingType" value="CheckButton"/>

From 268594dcf145b17c98c4def32d78c334392d593b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 22:48:53 +0100
Subject: [PATCH 306/765] Recreate shader in NpcAnimation::setAlpha

---
 apps/openmw/mwrender/animation.cpp   |  6 ++-
 apps/openmw/mwrender/util.cpp        |  1 +
 components/resource/scenemanager.cpp | 10 +++++
 components/resource/scenemanager.hpp |  3 ++
 components/shader/shadervisitor.cpp  | 67 ++++++++++++++++++++++------
 components/shader/shadervisitor.hpp  | 11 ++++-
 6 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 65ac7d8774..3d030febf2 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1246,13 +1246,15 @@ namespace MWRender
             material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
             stateset->setAttributeAndModes(material, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
 
-            // FIXME: regenerate shader (mVertexColorMode)
-
             mObjectRoot->setStateSet(stateset);
+
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
         }
         else
         {
             mObjectRoot->setStateSet(NULL);
+
+            mResourceSystem->getSceneManager()->recreateShaders(mObjectRoot);
         }
 
         setRenderBin();
diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp
index 0e1eaf0f4b..876ec285fc 100644
--- a/apps/openmw/mwrender/util.cpp
+++ b/apps/openmw/mwrender/util.cpp
@@ -18,6 +18,7 @@ void overrideTexture(const std::string &texture, Resource::ResourceSystem *resou
     osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D(resourceSystem->getImageManager()->getImage(correctedTexture));
     tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
     tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+    tex->setName("diffuseMap");
 
     osg::ref_ptr<osg::StateSet> stateset;
     if (node->getStateSet())
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index be0cd7dd73..172a6511a8 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -228,6 +228,16 @@ namespace Resource
         mForceShaders = force;
     }
 
+    void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node)
+    {
+        Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
+        shaderVisitor.setForceShaders(mForceShaders);
+        shaderVisitor.setClampLighting(mClampLighting);
+        shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
+        shaderVisitor.setAllowedToModifyStateSets(false);
+        node->accept(shaderVisitor);
+    }
+
     void SceneManager::setClampLighting(bool clamp)
     {
         mClampLighting = clamp;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 2ef9f614b5..db3de3f486 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -40,6 +40,9 @@ namespace Resource
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
+        /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
+        void recreateShaders(osg::ref_ptr<osg::Node> node);
+
         /// @see ShaderVisitor::setForceShaders
         void setForceShaders(bool force);
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 67362e0c6e..fcb9b80572 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -19,6 +19,7 @@ namespace Shader
         : mHasNormalMap(false)
         , mColorMaterial(false)
         , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
+        , mMaterialOverridden(false)
         , mTexStageRequiringTangents(-1)
     {
     }
@@ -28,6 +29,7 @@ namespace Shader
         , mForceShaders(false)
         , mClampLighting(false)
         , mForcePerPixelLighting(false)
+        , mAllowedToModifyStateSets(true)
         , mShaderManager(shaderManager)
         , mDefaultVsTemplate(defaultVsTemplate)
         , mDefaultFsTemplate(defaultFsTemplate)
@@ -55,7 +57,7 @@ namespace Shader
         if (node.getStateSet())
         {
             pushRequirements();
-            applyStateSet(node.getStateSet());
+            applyStateSet(node.getStateSet(), node);
             traverse(node);
             popRequirements();
         }
@@ -63,8 +65,21 @@ namespace Shader
             traverse(node);
     }
 
-    void ShaderVisitor::applyStateSet(osg::StateSet* stateset)
+    osg::StateSet* getWritableStateSet(osg::Node& node)
     {
+        if (!node.getStateSet())
+            return node.getOrCreateStateSet();
+
+        osg::ref_ptr<osg::StateSet> newStateSet = osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY);
+        node.setStateSet(newStateSet);
+        return newStateSet.get();
+    }
+
+    void ShaderVisitor::applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node)
+    {
+        osg::StateSet* writableStateSet = NULL;
+        if (mAllowedToModifyStateSets)
+            writableStateSet = node.getStateSet();
         const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
         for(unsigned int unit=0;unit<texAttributes.size();++unit)
         {
@@ -81,8 +96,10 @@ namespace Shader
                         {
                             mRequirements.back().mTexStageRequiringTangents = unit;
                             mRequirements.back().mHasNormalMap = true;
+                            if (!writableStateSet)
+                                writableStateSet = getWritableStateSet(node);
                             // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
-                            stateset->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                            writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
                         }
                     }
                     else
@@ -90,7 +107,12 @@ namespace Shader
                 }
             }
             // remove state that has no effect when rendering with shaders
-            stateset->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
+            if (stateset->getTextureAttribute(unit, osg::StateAttribute::TEXENV))
+            {
+                if (!writableStateSet)
+                    writableStateSet = getWritableStateSet(node);
+                writableStateSet->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
+            }
         }
 
         const osg::StateSet::AttributeList& attributes = stateset->getAttributeList();
@@ -98,9 +120,15 @@ namespace Shader
         {
             if (it->first.first == osg::StateAttribute::MATERIAL)
             {
-                const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
-                mRequirements.back().mColorMaterial = (mat->getColorMode() != osg::Material::OFF);
-                mRequirements.back().mVertexColorMode = mat->getColorMode();
+                if (!mRequirements.back().mMaterialOverridden || it->second.second & osg::StateAttribute::PROTECTED)
+                {
+                    if (it->second.second & osg::StateAttribute::OVERRIDE)
+                        mRequirements.back().mMaterialOverridden = true;
+
+                    const osg::Material* mat = static_cast<const osg::Material*>(it->second.first.get());
+                    mRequirements.back().mColorMaterial = (mat->getColorMode() != osg::Material::OFF);
+                    mRequirements.back().mVertexColorMode = mat->getColorMode();
+                }
             }
         }
     }
@@ -115,8 +143,14 @@ namespace Shader
         mRequirements.pop_back();
     }
 
-    void ShaderVisitor::createProgram(const ShaderRequirements &reqs, osg::StateSet *stateset)
+    void ShaderVisitor::createProgram(const ShaderRequirements &reqs, osg::Node& node)
     {
+        osg::StateSet* writableStateSet = NULL;
+        if (mAllowedToModifyStateSets)
+            writableStateSet = node.getOrCreateStateSet();
+        else
+            writableStateSet = getWritableStateSet(node);
+
         ShaderManager::DefineMap defineMap;
         const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap" };
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
@@ -154,11 +188,11 @@ namespace Shader
 
         if (vertexShader && fragmentShader)
         {
-            stateset->setAttributeAndModes(mShaderManager.getProgram(vertexShader, fragmentShader), osg::StateAttribute::ON);
+            writableStateSet->setAttributeAndModes(mShaderManager.getProgram(vertexShader, fragmentShader), osg::StateAttribute::ON);
 
             for (std::map<int, std::string>::const_iterator texIt = reqs.mTextures.begin(); texIt != reqs.mTextures.end(); ++texIt)
             {
-                stateset->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
+                writableStateSet->addUniform(new osg::Uniform(texIt->second.c_str(), texIt->first), osg::StateAttribute::ON);
             }
         }
     }
@@ -169,7 +203,7 @@ namespace Shader
         if (geometry.getStateSet())
         {
             pushRequirements();
-            applyStateSet(geometry.getStateSet());
+            applyStateSet(geometry.getStateSet(), geometry);
         }
 
         if (!mRequirements.empty())
@@ -185,7 +219,7 @@ namespace Shader
 
             // TODO: find a better place for the stateset
             if (reqs.mHasNormalMap || mForceShaders)
-                createProgram(reqs, geometry.getOrCreateStateSet());
+                createProgram(reqs, geometry);
         }
 
         if (needPop)
@@ -200,7 +234,7 @@ namespace Shader
         if (drawable.getStateSet())
         {
             pushRequirements();
-            applyStateSet(drawable.getStateSet());
+            applyStateSet(drawable.getStateSet(), drawable);
         }
 
         if (!mRequirements.empty())
@@ -208,11 +242,16 @@ namespace Shader
             const ShaderRequirements& reqs = mRequirements.back();
             // TODO: find a better place for the stateset
             if (reqs.mHasNormalMap || mForceShaders)
-                createProgram(reqs, drawable.getOrCreateStateSet());
+                createProgram(reqs, drawable);
         }
 
         if (needPop)
             popRequirements();
     }
 
+    void ShaderVisitor::setAllowedToModifyStateSets(bool allowed)
+    {
+        mAllowedToModifyStateSets = allowed;
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index fb29d503fd..c301db47d0 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -25,12 +25,17 @@ namespace Shader
         /// Setting force = true will cause all shaders to use per-pixel lighting, regardless of having a bump map.
         void setForcePerPixelLighting(bool force);
 
+        /// Set if we are allowed to modify StateSets encountered in the graph (default true).
+        /// @par If set to false, then instead of modifying, the StateSet will be cloned and this new StateSet will be assigned to the node.
+        /// @par This option is useful when the ShaderVisitor is run on a "live" subgraph that may have already been submitted for rendering.
+        void setAllowedToModifyStateSets(bool allowed);
+
         virtual void apply(osg::Node& node);
 
         virtual void apply(osg::Drawable& drawable);
         virtual void apply(osg::Geometry& geometry);
 
-        void applyStateSet(osg::StateSet* stateset);
+        void applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node);
 
         void pushRequirements();
         void popRequirements();
@@ -39,6 +44,7 @@ namespace Shader
         bool mForceShaders;
         bool mClampLighting;
         bool mForcePerPixelLighting;
+        bool mAllowedToModifyStateSets;
 
         ShaderManager& mShaderManager;
 
@@ -54,6 +60,7 @@ namespace Shader
             bool mColorMaterial;
             // osg::Material::ColorMode
             int mVertexColorMode;
+            bool mMaterialOverridden;
 
             // -1 == no tangents required
             int mTexStageRequiringTangents;
@@ -63,7 +70,7 @@ namespace Shader
         std::string mDefaultVsTemplate;
         std::string mDefaultFsTemplate;
 
-        void createProgram(const ShaderRequirements& reqs, osg::StateSet* stateset);
+        void createProgram(const ShaderRequirements& reqs, osg::Node& node);
     };
 
 }

From 5e12a1b4ef904c35c976526542ee306c0dc5787e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 23:05:44 +0100
Subject: [PATCH 307/765] Add enchanted item glow to the shader

---
 apps/openmw/mwrender/animation.cpp  | 20 +++++++++++++++-----
 components/shader/shadervisitor.cpp |  2 +-
 files/shaders/objects_fragment.glsl | 14 ++++++++++++--
 files/shaders/objects_vertex.glsl   | 15 +++++++++++++--
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 3d030febf2..ec0dab082b 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -52,8 +52,8 @@ namespace
     class GlowUpdater : public SceneUtil::StateSetUpdater
     {
     public:
-        GlowUpdater(osg::Vec4f color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
-            : mTexUnit(1) // FIXME: might not always be 1
+        GlowUpdater(int texUnit, osg::Vec4f color, const std::vector<osg::ref_ptr<osg::Texture2D> >& textures)
+            : mTexUnit(texUnit)
             , mColor(color)
             , mTextures(textures)
         {
@@ -1055,17 +1055,27 @@ namespace MWRender
 
             osg::ref_ptr<osg::Image> image = mResourceSystem->getImageManager()->getImage(stream.str());
             osg::ref_ptr<osg::Texture2D> tex (new osg::Texture2D(image));
+            tex->setName("envMap");
             tex->setWrap(osg::Texture::WRAP_S, osg::Texture2D::REPEAT);
             tex->setWrap(osg::Texture::WRAP_T, osg::Texture2D::REPEAT);
             mResourceSystem->getSceneManager()->applyFilterSettings(tex);
             textures.push_back(tex);
         }
 
-        osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(glowColor, textures));
+        int texUnit = 1; // FIXME: might not always be 1
+        osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(texUnit, glowColor, textures));
         node->addUpdateCallback(glowupdater);
 
-        // TODO: regenerate shader
-        // allowedToModifyStatesets = false
+        // set a texture now so that the ShaderVisitor can find it
+        osg::ref_ptr<osg::StateSet> writableStateSet = NULL;
+        if (!node->getStateSet())
+            writableStateSet = node->getOrCreateStateSet();
+        else
+            writableStateSet = osg::clone(node->getStateSet(), osg::CopyOp::SHALLOW_COPY);
+        writableStateSet->setTextureAttributeAndModes(texUnit, textures.front(), osg::StateAttribute::ON);
+        writableStateSet->addUniform(new osg::Uniform("envMapColor", glowColor));
+
+        mResourceSystem->getSceneManager()->recreateShaders(node);
     }
 
     // TODO: Should not be here
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index fcb9b80572..331beab343 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -152,7 +152,7 @@ namespace Shader
             writableStateSet = getWritableStateSet(node);
 
         ShaderManager::DefineMap defineMap;
-        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap" };
+        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap" };
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
         {
             defineMap[defaultTextures[i]] = "0";
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 37c715e1a7..6366da82ba 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -26,6 +26,12 @@ varying vec2 normalMapUV;
 varying vec3 viewTangent;
 #endif
 
+#if @envMap
+uniform sampler2D envMap;
+varying vec2 envMapUV;
+uniform vec4 envMapColor;
+#endif
+
 varying float depth;
 
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
@@ -35,7 +41,7 @@ varying vec4 lighting;
 #else
 varying vec3 passViewPos;
 varying vec3 passViewNormal;
-varying vec4 passColour;
+varying vec4 passColor;
 #endif
 
 #include "lighting.glsl"
@@ -73,13 +79,17 @@ void main()
 #if !PER_PIXEL_LIGHTING
     gl_FragData[0] *= lighting;
 #else
-    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColour);
+    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor);
 #endif
 
 #if @emissiveMap
     gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
 #endif
 
+#if @envMap
+    gl_FragData[0].xyz += texture2D(envMap, envMapUV).xyz * envMapColor.xyz;
+#endif
+
     float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 940a2306e2..a2c0e7d214 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -21,6 +21,10 @@ varying vec2 normalMapUV;
 varying vec3 viewTangent;
 #endif
 
+#if @envMap
+varying vec2 envMapUV;
+#endif
+
 varying float depth;
 
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
@@ -30,7 +34,7 @@ varying vec4 lighting;
 #else
 varying vec3 passViewPos;
 varying vec3 passViewNormal;
-varying vec4 passColour;
+varying vec4 passColor;
 #endif
 
 #include "lighting.glsl"
@@ -44,6 +48,13 @@ void main(void)
     gl_ClipVertex = viewPos;
     vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
 
+#if @envMap
+    vec3 viewVec = normalize(viewPos.xyz);
+    vec3 r = reflect( viewVec, viewNormal );
+    float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + (r.z+1.0)*(r.z+1.0) );
+    envMapUV = vec2(r.x/m + 0.5, r.y/m + 0.5);
+#endif
+
 #if @diffuseMap
     diffuseMapUV = (gl_TextureMatrix[@diffuseMapUV] * gl_MultiTexCoord@diffuseMapUV).xy;
 #endif
@@ -70,6 +81,6 @@ void main(void)
 #else
     passViewPos = viewPos.xyz;
     passViewNormal = viewNormal;
-    passColour = gl_Color;
+    passColor = gl_Color;
 #endif
 }

From 17c4dfdb62dc50bba91bfa11bf9757bc3a00ffc0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 18 Feb 2016 23:10:58 +0100
Subject: [PATCH 308/765] Use the lowest unused texture unit for the enchanted
 item glow texture

---
 apps/openmw/mwrender/animation.cpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index ec0dab082b..0418e34fdc 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1041,6 +1041,25 @@ namespace MWRender
         return mObjectRoot.get();
     }
 
+    class FindLowestUnusedTexUnitVisitor : public osg::NodeVisitor
+    {
+    public:
+        FindLowestUnusedTexUnitVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+            , mLowestUnusedTexUnit(0)
+        {
+        }
+
+        virtual void apply(osg::Node& node)
+        {
+            if (osg::StateSet* stateset = node.getStateSet())
+                mLowestUnusedTexUnit = std::max(mLowestUnusedTexUnit, int(stateset->getTextureAttributeList().size()));
+
+            traverse(node);
+        }
+        int mLowestUnusedTexUnit;
+    };
+
     void Animation::addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor)
     {
         std::vector<osg::ref_ptr<osg::Texture2D> > textures;
@@ -1062,7 +1081,9 @@ namespace MWRender
             textures.push_back(tex);
         }
 
-        int texUnit = 1; // FIXME: might not always be 1
+        FindLowestUnusedTexUnitVisitor findLowestUnusedTexUnitVisitor;
+        node->accept(findLowestUnusedTexUnitVisitor);
+        int texUnit = findLowestUnusedTexUnitVisitor.mLowestUnusedTexUnit;
         osg::ref_ptr<GlowUpdater> glowupdater (new GlowUpdater(texUnit, glowColor, textures));
         node->addUpdateCallback(glowupdater);
 

From 6000e48bba87eb22e8f4b5b29340e7f74c07d6fb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 01:30:15 +0100
Subject: [PATCH 309/765] Add terrain shaders and normal map support

Textures with _n filename suffix are automatically recognized as terrain normal maps.
---
 components/resource/scenemanager.cpp |  20 +++++
 components/resource/scenemanager.hpp |   5 ++
 components/terrain/material.cpp      | 106 +++++++++++++++++++++++++--
 components/terrain/material.hpp      |  34 ++++++++-
 components/terrain/terraingrid.cpp   |  31 +++++++-
 files/shaders/CMakeLists.txt         |   2 +
 files/shaders/terrain_fragment.glsl  |  64 ++++++++++++++++
 files/shaders/terrain_vertex.glsl    |  36 +++++++++
 8 files changed, 283 insertions(+), 15 deletions(-)
 create mode 100644 files/shaders/terrain_fragment.glsl
 create mode 100644 files/shaders/terrain_vertex.glsl

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 172a6511a8..57187c7343 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -228,6 +228,11 @@ namespace Resource
         mForceShaders = force;
     }
 
+    bool SceneManager::getForceShaders() const
+    {
+        return mForceShaders;
+    }
+
     void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node)
     {
         Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
@@ -243,16 +248,31 @@ namespace Resource
         mClampLighting = clamp;
     }
 
+    bool SceneManager::getClampLighting() const
+    {
+        return mClampLighting;
+    }
+
     void SceneManager::setForcePerPixelLighting(bool force)
     {
         mForcePerPixelLighting = force;
     }
 
+    bool SceneManager::getForcePerPixelLighting() const
+    {
+        return mForcePerPixelLighting;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
     }
 
+    Shader::ShaderManager &SceneManager::getShaderManager()
+    {
+        return *mShaderManager.get();
+    }
+
     void SceneManager::setShaderPath(const std::string &path)
     {
         mShaderManager->setShaderPath(path);
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index db3de3f486..8f28537894 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -40,17 +40,22 @@ namespace Resource
         SceneManager(const VFS::Manager* vfs, Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager);
         ~SceneManager();
 
+        Shader::ShaderManager& getShaderManager();
+
         /// Re-create shaders for this node, need to call this if texture stages or vertex color mode have changed.
         void recreateShaders(osg::ref_ptr<osg::Node> node);
 
         /// @see ShaderVisitor::setForceShaders
         void setForceShaders(bool force);
+        bool getForceShaders() const;
 
         /// @see ShaderVisitor::setClampLighting
         void setClampLighting(bool clamp);
+        bool getClampLighting() const;
 
         /// @see ShaderVisitor::setForcePerPixelLighting
         void setForcePerPixelLighting(bool force);
+        bool getForcePerPixelLighting() const;
 
         void setShaderPath(const std::string& path);
 
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 59d06f2542..fe32fe543a 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -1,21 +1,26 @@
 #include "material.hpp"
 
+#include <iostream>
+#include <stdexcept>
+
 #include <osg/Depth>
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 #include <osg/TexMat>
 #include <osg/Material>
-#include <osg/TexEnvCombine>
+
+#include <components/shader/shadermanager.hpp>
+
 
 namespace Terrain
 {
 
-    FixedFunctionTechnique::FixedFunctionTechnique(const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+    FixedFunctionTechnique::FixedFunctionTechnique(const std::vector<TextureLayer>& layers,
                                                    const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize)
     {
         bool firstLayer = true;
         int i=0;
-        for (std::vector<osg::ref_ptr<osg::Texture2D> >::const_iterator it = layers.begin(); it != layers.end(); ++it)
+        for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
         {
             osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
 
@@ -53,7 +58,7 @@ namespace Terrain
             }
 
             // Add the actual layer texture multiplied by the alpha map.
-            osg::ref_ptr<osg::Texture2D> tex = *it;
+            osg::ref_ptr<osg::Texture2D> tex = it->mDiffuseMap;
             stateset->setTextureAttributeAndModes(texunit, tex.get());
 
             osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
@@ -66,9 +71,85 @@ namespace Terrain
         }
     }
 
-    Effect::Effect(const std::vector<osg::ref_ptr<osg::Texture2D> > &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
+    ShaderTechnique::ShaderTechnique(Shader::ShaderManager& shaderManager, bool forcePerPixelLighting, bool clampLighting, const std::vector<TextureLayer>& layers,
+                                                   const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize)
+    {
+        bool firstLayer = true;
+        int i=0;
+        for (std::vector<TextureLayer>::const_iterator it = layers.begin(); it != layers.end(); ++it)
+        {
+            osg::ref_ptr<osg::StateSet> stateset (new osg::StateSet);
+
+            if (!firstLayer)
+            {
+                stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+                osg::ref_ptr<osg::Depth> depth (new osg::Depth);
+                depth->setFunction(osg::Depth::EQUAL);
+                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            }
+
+            int texunit = 0;
+
+            stateset->setTextureAttributeAndModes(texunit, it->mDiffuseMap);
+
+            osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
+            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
+            stateset->setTextureAttributeAndModes(texunit, texMat, osg::StateAttribute::ON);
+
+            stateset->addUniform(new osg::Uniform("diffuseMap", texunit));
+
+            if(!firstLayer)
+            {
+                ++texunit;
+                osg::ref_ptr<osg::Texture2D> blendmap = blendmaps.at(i++);
+
+                stateset->setTextureAttributeAndModes(texunit, blendmap.get());
+
+                // This is to map corner vertices directly to the center of a blendmap texel.
+                osg::Matrixf texMat;
+                float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
+                texMat.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
+                texMat.preMultScale(osg::Vec3f(scale, scale, 1.f));
+                texMat.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
+
+                stateset->setTextureAttributeAndModes(texunit, new osg::TexMat(texMat));
+                stateset->addUniform(new osg::Uniform("blendMap", texunit));
+            }
+
+            if (it->mNormalMap)
+            {
+                ++texunit;
+                stateset->setTextureAttributeAndModes(texunit, it->mNormalMap);
+                stateset->addUniform(new osg::Uniform("normalMap", texunit));
+            }
+
+            Shader::ShaderManager::DefineMap defineMap;
+            defineMap["forcePPL"] = forcePerPixelLighting ? "1" : "0";
+            defineMap["clamp"] = clampLighting ? "1" : "0";
+            defineMap["normalMap"] = (it->mNormalMap) ? "1" : "0";
+            defineMap["blendMap"] = !firstLayer ? "1" : "0";
+            defineMap["colorMode"] = "2";
+
+            osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
+            osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
+            if (!vertexShader || !fragmentShader)
+                throw std::runtime_error("Unable to create shader");
+
+            stateset->setAttributeAndModes(shaderManager.getProgram(vertexShader, fragmentShader));
+
+            firstLayer = false;
+
+            addPass(stateset);
+        }
+    }
+
+    Effect::Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager& shaderManager, const std::vector<TextureLayer> &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
                    int blendmapScale, float layerTileSize)
-        : mLayers(layers)
+        : mShaderManager(shaderManager)
+        , mUseShaders(useShaders)
+        , mForcePerPixelLighting(forcePerPixelLighting)
+        , mClampLighting(clampLighting)
+        , mLayers(layers)
         , mBlendmaps(blendmaps)
         , mBlendmapScale(blendmapScale)
         , mLayerTileSize(layerTileSize)
@@ -82,7 +163,18 @@ namespace Terrain
 
     bool Effect::define_techniques()
     {
-        addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        try
+        {
+            if (mUseShaders)
+                addTechnique(new ShaderTechnique(mShaderManager, mForcePerPixelLighting, mClampLighting, mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+            else
+                addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        }
+        catch (std::exception& e)
+        {
+            std::cerr << "Error: " << e.what() << std::endl;
+            addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+        }
 
         return true;
     }
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index dd00e41ed4..65349a5e7a 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -11,14 +11,36 @@ namespace osg
     class Texture2D;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
 namespace Terrain
 {
 
+    struct TextureLayer
+    {
+        osg::ref_ptr<osg::Texture2D> mDiffuseMap;
+        osg::ref_ptr<osg::Texture2D> mNormalMap; // optional
+    };
+
     class FixedFunctionTechnique : public osgFX::Technique
     {
     public:
         FixedFunctionTechnique(
-                const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+                const std::vector<TextureLayer>& layers,
+                const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
+
+    protected:
+        virtual void define_passes() {}
+    };
+
+    class ShaderTechnique : public osgFX::Technique
+    {
+    public:
+        ShaderTechnique(Shader::ShaderManager& shaderManager, bool forcePerPixelLighting, bool clampLighting,
+                const std::vector<TextureLayer>& layers,
                 const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
     protected:
@@ -28,8 +50,8 @@ namespace Terrain
     class Effect : public osgFX::Effect
     {
     public:
-        Effect(
-                const std::vector<osg::ref_ptr<osg::Texture2D> >& layers,
+        Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager& shaderManager,
+                const std::vector<TextureLayer>& layers,
                 const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
         virtual bool define_techniques();
@@ -48,7 +70,11 @@ namespace Terrain
         }
 
     private:
-        std::vector<osg::ref_ptr<osg::Texture2D> > mLayers;
+        Shader::ShaderManager& mShaderManager;
+        bool mUseShaders;
+        bool mForcePerPixelLighting;
+        bool mClampLighting;
+        std::vector<TextureLayer> mLayers;
         std::vector<osg::ref_ptr<osg::Texture2D> > mBlendmaps;
         int mBlendmapScale;
         float mLayerTileSize;
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index fefb0b8bcb..ddbb2fe230 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -148,11 +148,15 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
         osg::ref_ptr<osg::Node> textureCompileDummy (new osg::Node);
         unsigned int dummyTextureCounter = 0;
 
-        std::vector<osg::ref_ptr<osg::Texture2D> > layerTextures;
+        bool useShaders = mResourceSystem->getSceneManager()->getForceShaders();
+        if (!mResourceSystem->getSceneManager()->getClampLighting())
+            useShaders = true; // always use shaders when lighting is unclamped, this is to avoid lighting seams between a terrain chunk with normal maps and one without normal maps
+        std::vector<TextureLayer> layers;
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mTextureCacheMutex);
             for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
             {
+                TextureLayer textureLayer;
                 osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
                 if (!texture)
                 {
@@ -162,8 +166,26 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
                     mResourceSystem->getSceneManager()->applyFilterSettings(texture);
                     mTextureCache[it->mDiffuseMap] = texture;
                 }
-                layerTextures.push_back(texture);
-                textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, layerTextures.back());
+                textureLayer.mDiffuseMap = texture;
+                textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, texture);
+
+                if (!it->mNormalMap.empty())
+                {
+                    texture = mTextureCache[it->mNormalMap];
+                    if (!texture)
+                    {
+                        texture = new osg::Texture2D(mResourceSystem->getImageManager()->getImage(it->mNormalMap));
+                        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
+                        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
+                        mResourceSystem->getSceneManager()->applyFilterSettings(texture);
+                        mTextureCache[it->mNormalMap] = texture;
+                    }
+                    textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, texture);
+                    textureLayer.mNormalMap = texture;
+                    useShaders = true;
+                }
+
+                layers.push_back(textureLayer);
             }
         }
 
@@ -185,7 +207,8 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             geometry->setTexCoordArray(i, mCache.getUVBuffer());
 
         float blendmapScale = ESM::Land::LAND_TEXTURE_SIZE*chunkSize;
-        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(layerTextures, blendmapTextures, blendmapScale, blendmapScale));
+        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(useShaders, mResourceSystem->getSceneManager()->getForcePerPixelLighting(), mResourceSystem->getSceneManager()->getClampLighting(),
+                                                                mResourceSystem->getSceneManager()->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale));
 
         effect->addCullCallback(new SceneUtil::LightListCallback);
 
diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index a7b631139c..31db4a3eb8 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -8,6 +8,8 @@ set(SHADER_FILES
     water_nm.png
     objects_vertex.glsl
     objects_fragment.glsl
+    terrain_vertex.glsl
+    terrain_fragment.glsl
     lighting.glsl
 )
 
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
new file mode 100644
index 0000000000..3bfd16b0e0
--- /dev/null
+++ b/files/shaders/terrain_fragment.glsl
@@ -0,0 +1,64 @@
+#version 120
+
+varying vec2 uv;
+
+uniform sampler2D diffuseMap;
+
+#if @normalMap
+uniform sampler2D normalMap;
+#endif
+
+#if @blendMap
+uniform sampler2D blendMap;
+#endif
+
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
+varying vec4 passColor;
+#endif
+
+#include "lighting.glsl"
+
+void main()
+{
+    vec2 diffuseMapUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
+
+    gl_FragData[0] = vec4(texture2D(diffuseMap, diffuseMapUV).xyz, 1.0);
+
+#if @blendMap
+    vec2 blendMapUV = (gl_TextureMatrix[1] * vec4(uv, 0.0, 1.0)).xy;
+    gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
+#endif
+
+#if PER_PIXEL_LIGHTING
+    vec3 viewNormal = passViewNormal;
+#endif
+
+#if @normalMap
+    vec3 normalTex = texture2D(normalMap, diffuseMapUV).xyz;
+
+    vec3 viewTangent = (gl_ModelViewMatrix * vec4(1.0, 0.0, 0.0, 0.0)).xyz;
+    vec3 viewBinormal = normalize(cross(viewTangent, viewNormal));
+    viewTangent = normalize(cross(viewNormal, viewBinormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
+    mat3 tbn = mat3(viewTangent, viewBinormal, viewNormal);
+
+    viewNormal = normalize(tbn * (normalTex * 2.0 - 1.0));
+#endif
+
+
+#if !PER_PIXEL_LIGHTING
+    gl_FragData[0] *= lighting;
+#else
+    gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor);
+#endif
+
+    float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
+}
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
new file mode 100644
index 0000000000..43cb5d31b1
--- /dev/null
+++ b/files/shaders/terrain_vertex.glsl
@@ -0,0 +1,36 @@
+#version 120
+
+varying vec2 uv;
+varying float depth;
+
+#define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
+
+#if !PER_PIXEL_LIGHTING
+varying vec4 lighting;
+#else
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
+varying vec4 passColor;
+#endif
+
+#include "lighting.glsl"
+
+void main(void)
+{
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    depth = gl_Position.z;
+
+    vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
+    gl_ClipVertex = viewPos;
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
+
+#if !PER_PIXEL_LIGHTING
+    lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
+#else
+    passViewPos = viewPos.xyz;
+    passViewNormal = viewNormal;
+    passColor = gl_Color;
+#endif
+
+    uv = gl_MultiTexCoord0.xy;
+}

From ca0e1fe0e00232d2c94ef02fe978b3468dcecc8b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 01:45:28 +0100
Subject: [PATCH 310/765] Set the osg::Material on the terrain root node

---
 components/terrain/material.cpp    | 4 ----
 components/terrain/terraingrid.cpp | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index fe32fe543a..c1aef1f9df 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -154,10 +154,6 @@ namespace Terrain
         , mBlendmapScale(blendmapScale)
         , mLayerTileSize(layerTileSize)
     {
-        osg::ref_ptr<osg::Material> material (new osg::Material);
-        material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-        getOrCreateStateSet()->setAttributeAndModes(material, osg::StateAttribute::ON);
-
         selectTechnique(0);
     }
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index ddbb2fe230..cbafe16777 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -3,6 +3,7 @@
 #include <memory>
 
 #include <osg/UserDataContainer>
+#include <osg/Material>
 
 #include <OpenThreads/ScopedLock>
 
@@ -56,6 +57,9 @@ TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceS
     , mCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1)
     , mUnrefQueue(unrefQueue)
 {
+    osg::ref_ptr<osg::Material> material (new osg::Material);
+    material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+    mTerrainRoot->getOrCreateStateSet()->setAttributeAndModes(material, osg::StateAttribute::ON);
 }
 
 TerrainGrid::~TerrainGrid()

From e2dc46c92e90da4ee1e96dadd52f821bd75bc8e4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 01:48:07 +0100
Subject: [PATCH 311/765] Update settings

---
 files/settings-default.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index e450f6518b..1c87c5dd5b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -172,11 +172,11 @@ force shaders = false
 force per pixel lighting = false
 
 # Restrict the amount of lighting that an object can receive to a maximum of (1,1,1).
-# Only affects objects that render with shaders (see 'force shaders' option).
+# Only affects objects that render with shaders (see 'force shaders' option). Always affects terrain.
 # Setting this option to 'true' results in fixed-function compatible lighting, but the lighting
 # may appear 'dull' and there might be color shifts.
 # Setting this option to 'false' results in more realistic lighting.
-clamp lighting = false
+clamp lighting = true
 
 [Input]
 

From 9d392487a9726637b68bd82673440ea8e19e28bc Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 19 Feb 2016 02:59:19 -0500
Subject: [PATCH 312/765] Fix names to be unique and condition values to be set
 to 0

---
 apps/opencs/model/world/columns.cpp             | 4 ++--
 apps/opencs/model/world/nestedcoladapterimp.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index aa453ced8c..32aa7edcab 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -274,9 +274,9 @@ namespace CSMWorld
             { ColumnId_InfoList, "Info List" },
             { ColumnId_InfoCondition, "Info Conditions" },
             { ColumnId_InfoCondFunc, "Function" },
-            { ColumnId_InfoCondVar, "Name" },
+            { ColumnId_InfoCondVar, "Variable/Object" },
             { ColumnId_InfoCondComp, "Relation" },
-            { ColumnId_InfoCondValue, "Value" },
+            { ColumnId_InfoCondValue, "Values" },
             { ColumnId_OriginalCell, "Original Cell" },
 
             { ColumnId_NpcAttributes, "NPC Attributes" },
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index a8f1c229ac..82df7bd11a 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -674,7 +674,8 @@ namespace CSMWorld
                 {
                     case ConstInfoSelectWrapper::Comparison_Numeric:
                     {
-                        if (value.toInt(&conversionResult) && conversionResult)
+                        // QVariant seems to have issues converting 0
+                        if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
                         {
                             infoSelectWrapper.getVariant().setType(ESM::VT_Int);
                             infoSelectWrapper.getVariant().setInteger(value.toInt());
@@ -689,7 +690,7 @@ namespace CSMWorld
                     case ConstInfoSelectWrapper::Comparison_Boolean:
                     case ConstInfoSelectWrapper::Comparison_Integer:
                     {
-                        if (value.toInt(&conversionResult) && conversionResult)
+                        if ((value.toInt(&conversionResult) && conversionResult) || value.toString().compare("0") == 0)
                         {
                             infoSelectWrapper.getVariant().setType(ESM::VT_Int);
                             infoSelectWrapper.getVariant().setInteger(value.toInt());

From 5315866f611015b5a11f91820442cd053acd4ad4 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 19 Feb 2016 03:03:10 -0500
Subject: [PATCH 313/765] Corrections to condition ranges and several other
 minor fixes

---
 apps/opencs/model/world/infoselectwrapper.cpp | 67 +++++++++----------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index 5271430f5e..496f8e17f5 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -46,7 +46,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
     "PC Sneak",
     "PC Acrobatics",
     "PC Light Armor",
-    "PC Shorth Blade",
+    "PC Short Blade",
     "PC Marksman",
     "PC Merchantile",
     "PC Speechcraft",
@@ -74,8 +74,8 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] =
     "PC Corpus",
     "Weather",
     "PC Vampire",
-    "PC Level",
-    "PC Attacked",
+    "Level",
+    "Attacked",
     "Talked to PC",
     "PC Health",
     "Creature Target",
@@ -239,33 +239,27 @@ std::string CSMWorld::ConstInfoSelectWrapper::toString() const
 {
     std::ostringstream stream;
     stream << convertToString(mFunctionName) << " ";
-    
+
     if (mHasVariable)
         stream << mVariableName << " ";
-    
+
     stream << convertToString(mRelationType) << " ";
-    
+
     switch (mConstSelect.mValue.getType())
     {
-        case ESM::VT_Short:
-        case ESM::VT_Long:
         case ESM::VT_Int:
             stream << mConstSelect.mValue.getInteger();
             break;
-            
+
         case ESM::VT_Float:
             stream << mConstSelect.mValue.getFloat();
             break;
-            
-        case ESM::VT_String:
-            stream << mConstSelect.mValue.getString();
-            break;
-            
+
         default:
             stream << "(Invalid value type)";
             break;
     }
-    
+
     return stream.str();
 }
 
@@ -377,6 +371,7 @@ void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
         case Function_NotClass:
         case Function_NotRace:
         case Function_NotCell:
+        case Function_NotLocal:
         case Function_PcExpelled:
         case Function_PcCommonDisease:
         case Function_PcBlightDisease:
@@ -459,7 +454,7 @@ void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
         // Numeric
         case Function_Global:
         case Function_Local:
-        case Function_NotLocal:
+
         case Function_Health_Percent:
         case Function_PcHealthPercent:
         case Function_PcMagicka:
@@ -559,14 +554,13 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
 
     switch (mFunctionName)
     {
-        // TODO these need to be checked
-
         // Boolean
         case Function_NotId:
         case Function_NotFaction:
         case Function_NotClass:
         case Function_NotRace:
         case Function_NotCell:
+        case Function_NotLocal:
         case Function_PcExpelled:
         case Function_PcCommonDisease:
         case Function_PcBlightDisease:
@@ -581,7 +575,7 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
         case Function_TalkedToPc:
         case Function_ShouldAttack:
         case Function_Werewolf:
-            return std::pair<int, int>(0,1);
+            return std::pair<int, int>(0, 1);
 
         // Integer
         case Function_RankLow:
@@ -633,27 +627,29 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
         case Function_PcPersonality:
         case Function_PcLuck:
         case Function_Level:
+        case Function_PcWerewolfKills:
+            return std::pair<int, int>(0, IntMax);
+
         case Function_Fight:
         case Function_Hello:
         case Function_Alarm:
         case Function_Flee:
-        case Function_PcWerewolfKills:
-            return std::pair<int, int>(0, IntMax);
+            return std::pair<int, int>(0, 100);
 
         case Function_Weather:
             return std::pair<int, int>(0, 9);
 
         case Function_FriendHit:
-            return std::pair<int, int>(0,4);
+            return std::pair<int, int>(0, 4);
 
         case Function_RankRequirement:
             return std::pair<int, int>(0, 3);
 
         case Function_CreatureTarget:
-            return std::pair<int, int>(0,2);
+            return std::pair<int, int>(0, 2);
 
         case Function_PcGender:
-            return std::pair<int, int>(0,1);
+            return std::pair<int, int>(0, 1);
 
         case Function_FactionRankDifference:
             return std::pair<int, int>(-9, 9);
@@ -661,17 +657,16 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
         // Numeric
         case Function_Global:
         case Function_Local:
-        case Function_NotLocal:
             return std::pair<int, int>(IntMin, IntMax);
 
-        case Function_Health_Percent:
-        case Function_PcHealthPercent:
-            return std::pair<int, int>(0, 100);
-
         case Function_PcMagicka:
         case Function_PcFatigue:
         case Function_PcHealth:
-            return std::pair<int, int>(0,0);
+            return std::pair<int, int>(0, IntMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<int, int>(0, 100);
 
         default:
             throw std::runtime_error("InfoSelectWrapper: function does not exist");
@@ -691,14 +686,14 @@ std::pair<float, float> CSMWorld::ConstInfoSelectWrapper::getValidFloatRange() c
         case Function_NotLocal:
             return std::pair<float, float>(FloatMin, FloatMax);
 
-        case Function_Health_Percent:
-        case Function_PcHealthPercent:
-            return std::pair<float, float>(0, 100);
-
         case Function_PcMagicka:
         case Function_PcFatigue:
         case Function_PcHealth:
-            return std::pair<float, float>(0,0);
+            return std::pair<float, float>(0, FloatMax);
+
+        case Function_Health_Percent:
+        case Function_PcHealthPercent:
+            return std::pair<float, float>(0, 100);
 
         default:
             throw std::runtime_error("InfoSelectWrapper: function does not exist or is not numeric");
@@ -839,7 +834,7 @@ void CSMWorld::InfoSelectWrapper::update()
     // Write Function
 
     bool writeIndex = false;
-    int functionIndex = static_cast<int>(mFunctionName);
+    size_t functionIndex = static_cast<size_t>(mFunctionName);
 
     switch (mFunctionName)
     {

From 4e5462bc1977ebab9d07baf37c5b11d531686cce Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 14:23:55 +0100
Subject: [PATCH 314/765] Don't attempt to create a collision shape for an
 empty TriShape

---
 components/nifbullet/bulletnifloader.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 19afe49d63..9ac544c423 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -266,6 +266,11 @@ void BulletNifLoader::handleNiTriShape(const Nif::NiTriShape *shape, int flags,
     if (!shape->skin.empty())
         isAnimated = false;
 
+    if (shape->data.empty())
+        return;
+    if (shape->data->triangles->empty())
+        return;
+
     if (isAnimated)
     {
         if (!mCompoundShape)

From 7071d286e81b05e0c7492d0adc964dd7247477eb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 14:59:47 +0100
Subject: [PATCH 315/765] Fix inverted check for 16-bit indices

---
 components/terrain/buffercache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 2a72ea59b2..a72dac0262 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -219,7 +219,7 @@ namespace Terrain
 
         osg::ref_ptr<osg::DrawElements> buffer;
 
-        if (verts*verts > (0xffffu))
+        if (verts*verts <= (0xffffu))
             buffer = createIndexBuffer<osg::DrawElementsUShort>(flags, verts);
         else
             buffer = createIndexBuffer<osg::DrawElementsUInt>(flags, verts);

From 6a0ac824bd9c73089c7a56b5b63aa628fb30f90f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Feb 2016 15:00:50 +0100
Subject: [PATCH 316/765] Fix terrain error in OpenCS

---
 apps/openmw/mwrender/renderingmanager.cpp |  2 +-
 components/terrain/buffercache.hpp        |  1 +
 components/terrain/material.cpp           |  6 +++---
 components/terrain/material.hpp           |  4 ++--
 components/terrain/terraingrid.cpp        |  7 ++++---
 components/terrain/terraingrid.hpp        | 15 +++++++++++++--
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index dfc1743f07..3ad349ba74 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -193,7 +193,7 @@ namespace MWRender
         mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
         mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, mUnrefQueue.get()));
+                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 
diff --git a/components/terrain/buffercache.hpp b/components/terrain/buffercache.hpp
index d1a57f8116..172b9d6724 100644
--- a/components/terrain/buffercache.hpp
+++ b/components/terrain/buffercache.hpp
@@ -3,6 +3,7 @@
 
 #include <osg/ref_ptr>
 #include <osg/Array>
+#include <osg/PrimitiveSet>
 
 #include <map>
 
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index c1aef1f9df..54634d5d4b 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -143,7 +143,7 @@ namespace Terrain
         }
     }
 
-    Effect::Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager& shaderManager, const std::vector<TextureLayer> &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
+    Effect::Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager* shaderManager, const std::vector<TextureLayer> &layers, const std::vector<osg::ref_ptr<osg::Texture2D> > &blendmaps,
                    int blendmapScale, float layerTileSize)
         : mShaderManager(shaderManager)
         , mUseShaders(useShaders)
@@ -161,8 +161,8 @@ namespace Terrain
     {
         try
         {
-            if (mUseShaders)
-                addTechnique(new ShaderTechnique(mShaderManager, mForcePerPixelLighting, mClampLighting, mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
+            if (mUseShaders && mShaderManager)
+                addTechnique(new ShaderTechnique(*mShaderManager, mForcePerPixelLighting, mClampLighting, mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
             else
                 addTechnique(new FixedFunctionTechnique(mLayers, mBlendmaps, mBlendmapScale, mLayerTileSize));
         }
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index 65349a5e7a..e353e5b3a1 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -50,7 +50,7 @@ namespace Terrain
     class Effect : public osgFX::Effect
     {
     public:
-        Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager& shaderManager,
+        Effect(bool useShaders, bool forcePerPixelLighting, bool clampLighting, Shader::ShaderManager* shaderManager,
                 const std::vector<TextureLayer>& layers,
                 const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize);
 
@@ -70,7 +70,7 @@ namespace Terrain
         }
 
     private:
-        Shader::ShaderManager& mShaderManager;
+        Shader::ShaderManager* mShaderManager;
         bool mUseShaders;
         bool mForcePerPixelLighting;
         bool mClampLighting;
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index cbafe16777..e008d5e525 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -51,11 +51,12 @@ namespace
 namespace Terrain
 {
 
-TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue)
+TerrainGrid::TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, Shader::ShaderManager* shaderManager, SceneUtil::UnrefQueue* unrefQueue)
     : Terrain::World(parent, resourceSystem, ico, storage, nodeMask)
     , mNumSplits(4)
     , mCache((storage->getCellVertices()-1)/static_cast<float>(mNumSplits) + 1)
     , mUnrefQueue(unrefQueue)
+    , mShaderManager(shaderManager)
 {
     osg::ref_ptr<osg::Material> material (new osg::Material);
     material->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
@@ -211,8 +212,8 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             geometry->setTexCoordArray(i, mCache.getUVBuffer());
 
         float blendmapScale = ESM::Land::LAND_TEXTURE_SIZE*chunkSize;
-        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(useShaders, mResourceSystem->getSceneManager()->getForcePerPixelLighting(), mResourceSystem->getSceneManager()->getClampLighting(),
-                                                                mResourceSystem->getSceneManager()->getShaderManager(), layers, blendmapTextures, blendmapScale, blendmapScale));
+        osg::ref_ptr<osgFX::Effect> effect (new Terrain::Effect(mShaderManager ? useShaders : false, mResourceSystem->getSceneManager()->getForcePerPixelLighting(), mResourceSystem->getSceneManager()->getClampLighting(),
+                                                                mShaderManager, layers, blendmapTextures, blendmapScale, blendmapScale));
 
         effect->addCullCallback(new SceneUtil::LightListCallback);
 
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index d2276a0af8..defcce8b3f 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -4,13 +4,22 @@
 #include <osg/Vec2f>
 
 #include "world.hpp"
-#include "material.hpp"
 
 namespace SceneUtil
 {
     class UnrefQueue;
 }
 
+namespace Shader
+{
+    class ShaderManager;
+}
+
+namespace osg
+{
+    class Texture2D;
+}
+
 namespace Terrain
 {
 
@@ -18,7 +27,7 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, SceneUtil::UnrefQueue* unrefQueue = NULL);
+        TerrainGrid(osg::Group* parent, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, Shader::ShaderManager* shaderManager = NULL, SceneUtil::UnrefQueue* unrefQueue = NULL);
         ~TerrainGrid();
 
         /// Load a terrain cell and store it in cache for later use.
@@ -59,6 +68,8 @@ namespace Terrain
         BufferCache mCache;
 
         osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+
+        Shader::ShaderManager* mShaderManager;
     };
 
 }

From 20942e66588ecefed85a78d9e9f69b15b23e24ba Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 19 Feb 2016 14:10:47 -0500
Subject: [PATCH 317/765] Fixes to testing if condition is always or never true

---
 apps/opencs/model/world/infoselectwrapper.cpp | 31 ++++++++++++-------
 apps/opencs/model/world/infoselectwrapper.hpp |  5 ++-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index 496f8e17f5..d036b1965e 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -706,6 +706,13 @@ bool CSMWorld::ConstInfoSelectWrapper::rangeContains(T1 value, std::pair<T2,T2>
     return (value >= range.first && value <= range.second);
 }
 
+template <typename T1, typename T2>
+bool CSMWorld::ConstInfoSelectWrapper::rangeFullyContains(std::pair<T1,T1> containingRange,
+    std::pair<T2,T2> testRange) const
+{
+    return (containingRange.first <= testRange.first) && (testRange.second <= containingRange.second);
+}
+
 template <typename T1, typename T2>
 bool CSMWorld::ConstInfoSelectWrapper::rangesOverlap(std::pair<T1,T1> range1, std::pair<T2,T2> range2) const
 {
@@ -727,21 +734,22 @@ template <typename T1, typename T2>
 bool CSMWorld::ConstInfoSelectWrapper::conditionIsAlwaysTrue(std::pair<T1,T1> conditionRange,
     std::pair<T2,T2> validRange) const
 {
-
     switch (mRelationType)
     {
         case Relation_Equal:
-        case Relation_Greater:
-        case Relation_GreaterOrEqual:
-        case Relation_Less:
-        case Relation_LessOrEqual:
-            // If ranges are same, it will always be true
-            return rangesMatch(conditionRange, validRange);
+            return false;
 
         case Relation_NotEqual:
             // If value is not within range, it will always be true
             return !rangeContains(conditionRange.first, validRange);
 
+        case Relation_Greater:
+        case Relation_GreaterOrEqual:
+        case Relation_Less:
+        case Relation_LessOrEqual:
+            // If the valid range is completely within the condition range, it will always be true
+            return rangeFullyContains(conditionRange, validRange);
+
         default:
             throw std::logic_error("InfoCondition: operator can not be used to compare");
     }
@@ -756,6 +764,11 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> con
     switch (mRelationType)
     {
         case Relation_Equal:
+            return !rangeContains(conditionRange.first, validRange);
+
+        case Relation_NotEqual:
+            return false;
+
         case Relation_Greater:
         case Relation_GreaterOrEqual:
         case Relation_Less:
@@ -763,10 +776,6 @@ bool CSMWorld::ConstInfoSelectWrapper::conditionIsNeverTrue(std::pair<T1,T1> con
             // If ranges do not overlap, it will never be true
             return !rangesOverlap(conditionRange, validRange);
 
-        case Relation_NotEqual:
-            // If the value is the only value withing the range, it will never be true
-            return rangesMatch(conditionRange, validRange);
-
         default:
             throw std::logic_error("InfoCondition: operator can not be used to compare");
     }
diff --git a/apps/opencs/model/world/infoselectwrapper.hpp b/apps/opencs/model/world/infoselectwrapper.hpp
index 1aa86aecab..ce26a46dc7 100644
--- a/apps/opencs/model/world/infoselectwrapper.hpp
+++ b/apps/opencs/model/world/infoselectwrapper.hpp
@@ -164,7 +164,7 @@ namespace CSMWorld
         bool variantTypeIsValid() const;
 
         const ESM::Variant& getVariant() const;
-        
+
         std::string toString() const;
 
     protected:
@@ -188,6 +188,9 @@ namespace CSMWorld
         template <typename Type1, typename Type2>
         bool rangesOverlap(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
 
+        template <typename Type1, typename Type2>
+        bool rangeFullyContains(std::pair<Type1,Type1> containing, std::pair<Type2,Type2> test) const;
+
         template <typename Type1, typename Type2>
         bool rangesMatch(std::pair<Type1,Type1> range1, std::pair<Type2,Type2> range2) const;
 

From 5cf2441b1073875df26d292db1cad1a0a26c461b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 17:57:19 +0100
Subject: [PATCH 318/765] ShaderVisitor: support automatic recognition of
 normal maps based on file pattern

Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
---
 apps/openmw/mwrender/renderingmanager.cpp |   5 +-
 apps/openmw/mwrender/terrainstorage.cpp   |  16 +---
 apps/openmw/mwrender/terrainstorage.hpp   |   4 +-
 components/esmterrain/storage.cpp         |  27 ++++--
 components/esmterrain/storage.hpp         |   5 +-
 components/resource/imagemanager.cpp      |   1 +
 components/resource/scenemanager.cpp      |  17 +++-
 components/resource/scenemanager.hpp      |   8 ++
 components/shader/shadervisitor.cpp       | 104 +++++++++++++++++-----
 components/shader/shadervisitor.hpp       |  19 +++-
 files/settings-default.cfg                |  12 +++
 11 files changed, 164 insertions(+), 54 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 3ad349ba74..ef1b469e38 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -172,6 +172,8 @@ namespace MWRender
         resourceSystem->getSceneManager()->setForceShaders(Settings::Manager::getBool("force shaders", "Shaders"));
         resourceSystem->getSceneManager()->setClampLighting(Settings::Manager::getBool("clamp lighting", "Shaders"));
         resourceSystem->getSceneManager()->setForcePerPixelLighting(Settings::Manager::getBool("force per pixel lighting", "Shaders"));
+        resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
@@ -193,7 +195,8 @@ namespace MWRender
         mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
         mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), false), Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
+                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain normal maps", "Shaders")),
+                                                    Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 02947b5dd3..8d4bf2ea20 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -9,21 +9,9 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, bool preload)
-        : ESMTerrain::Storage(vfs)
+    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, bool autoUseNormalMaps)
+        : ESMTerrain::Storage(vfs, normalMapPattern, autoUseNormalMaps)
     {
-        if (preload)
-        {
-            const MWWorld::ESMStore &esmStore =
-                MWBase::Environment::get().getWorld()->getStore();
-
-            MWWorld::Store<ESM::Land>::iterator it = esmStore.get<ESM::Land>().begin();
-            for (; it != esmStore.get<ESM::Land>().end(); ++it)
-            {
-                const ESM::Land* land = &*it;
-                land->loadData(ESM::Land::DATA_VCLR|ESM::Land::DATA_VHGT|ESM::Land::DATA_VNML|ESM::Land::DATA_VTEX);
-            }
-        }
     }
 
     void TerrainStorage::getBounds(float& minX, float& maxX, float& minY, float& maxY)
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index a12ffd540f..7bd4b4fd51 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -14,9 +14,7 @@ namespace MWRender
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin);
     public:
 
-        ///@param preload Preload all Land records at startup? If using the multithreaded terrain component, this
-        /// should be set to "true" in order to avoid race conditions.
-        TerrainStorage(const VFS::Manager* vfs, bool preload);
+        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false);
 
         /// Get bounds of the whole terrain in cell units
         virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY);
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index cead73070c..9901020700 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -18,8 +18,10 @@ namespace ESMTerrain
 
     const float defaultHeight = -2048;
 
-    Storage::Storage(const VFS::Manager *vfs)
+    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, bool autoUseNormalMaps)
         : mVFS(vfs)
+        , mNormalMapPattern(normalMapPattern)
+        , mAutoUseNormalMaps(autoUseNormalMaps)
     {
     }
 
@@ -511,6 +513,8 @@ namespace ESMTerrain
         info.mParallax = false;
         info.mSpecular = false;
         info.mDiffuseMap = texture;
+
+        /*
         std::string texture_ = texture;
         boost::replace_last(texture_, ".", "_nh.");
 
@@ -519,21 +523,26 @@ namespace ESMTerrain
             info.mNormalMap = texture_;
             info.mParallax = true;
         }
-        else
+        */
+        if (mAutoUseNormalMaps)
         {
-            texture_ = texture;
-            boost::replace_last(texture_, ".", "_n.");
+            std::string texture_ = texture;
+            boost::replace_last(texture_, ".", mNormalMapPattern + ".");
             if (mVFS->exists(texture_))
                 info.mNormalMap = texture_;
         }
 
-        texture_ = texture;
-        boost::replace_last(texture_, ".", "_diffusespec.");
-        if (mVFS->exists(texture_))
+        /*
         {
-            info.mDiffuseMap = texture_;
-            info.mSpecular = true;
+            std::string texture_ = texture;
+            boost::replace_last(texture_, ".", "_diffusespec.");
+            if (mVFS->exists(texture_))
+            {
+                info.mDiffuseMap = texture_;
+                info.mSpecular = true;
+            }
         }
+        */
 
         mLayerInfoMap[texture] = info;
 
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 9ca39e6f39..0c8095a113 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -27,7 +27,7 @@ namespace ESMTerrain
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
 
     public:
-        Storage(const VFS::Manager* vfs);
+        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false);
 
         /// Data is loaded first, if necessary. Will return a 0-pointer if there is no data for
         /// any of the data types specified via \a flags. Will also return a 0-pointer if there
@@ -109,6 +109,9 @@ namespace ESMTerrain
         std::map<std::string, Terrain::LayerInfo> mLayerInfoMap;
         OpenThreads::Mutex mLayerInfoMutex;
 
+        std::string mNormalMapPattern;
+        bool mAutoUseNormalMaps;
+
         Terrain::LayerInfo getLayerInfo(const std::string& texture);
     };
 
diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
index 870fa370b1..ea3adc704b 100644
--- a/components/resource/imagemanager.cpp
+++ b/components/resource/imagemanager.cpp
@@ -121,6 +121,7 @@ namespace Resource
             }
 
             osg::Image* image = result.getImage();
+            image->setFileName(normalized);
             if (!checkSupported(image, filename))
             {
                 mCache->addEntryToObjectCache(normalized, mWarningImage);
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 57187c7343..00030edc54 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -212,6 +212,7 @@ namespace Resource
         , mForceShaders(false)
         , mClampLighting(false)
         , mForcePerPixelLighting(false)
+        , mAutoUseNormalMaps(false)
         , mInstanceCache(new MultiObjectCache)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)
@@ -235,7 +236,7 @@ namespace Resource
 
     void SceneManager::recreateShaders(osg::ref_ptr<osg::Node> node)
     {
-        Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
+        Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), *mImageManager, "objects_vertex.glsl", "objects_fragment.glsl");
         shaderVisitor.setForceShaders(mForceShaders);
         shaderVisitor.setClampLighting(mClampLighting);
         shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
@@ -263,6 +264,16 @@ namespace Resource
         return mForcePerPixelLighting;
     }
 
+    void SceneManager::setAutoUseNormalMaps(bool use)
+    {
+        mAutoUseNormalMaps = use;
+    }
+
+    void SceneManager::setNormalMapPattern(const std::string &pattern)
+    {
+        mNormalMapPattern = pattern;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -386,10 +397,12 @@ namespace Resource
             SetFilterSettingsControllerVisitor setFilterSettingsControllerVisitor(mMinFilter, mMagFilter, mMaxAnisotropy);
             loaded->accept(setFilterSettingsControllerVisitor);
 
-            Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), "objects_vertex.glsl", "objects_fragment.glsl");
+            Shader::ShaderVisitor shaderVisitor(*mShaderManager.get(), *mImageManager, "objects_vertex.glsl", "objects_fragment.glsl");
             shaderVisitor.setForceShaders(mForceShaders);
             shaderVisitor.setClampLighting(mClampLighting);
             shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
+            shaderVisitor.setAutoUseNormalMaps(mAutoUseNormalMaps);
+            shaderVisitor.setNormalMapPattern(mNormalMapPattern);
             loaded->accept(shaderVisitor);
 
             // share state
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 8f28537894..d78466260c 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -57,6 +57,12 @@ namespace Resource
         void setForcePerPixelLighting(bool force);
         bool getForcePerPixelLighting() const;
 
+        /// @see ShaderVisitor::setAutoUseNormalMaps
+        void setAutoUseNormalMaps(bool use);
+
+        /// @see ShaderVisitor::setNormalMapPattern
+        void setNormalMapPattern(const std::string& pattern);
+
         void setShaderPath(const std::string& path);
 
         /// Get a read-only copy of this scene "template"
@@ -126,6 +132,8 @@ namespace Resource
         bool mForceShaders;
         bool mClampLighting;
         bool mForcePerPixelLighting;
+        bool mAutoUseNormalMaps;
+        std::string mNormalMapPattern;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 331beab343..a69a479e31 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -5,10 +5,15 @@
 #include <osg/Texture>
 #include <osg/Material>
 #include <osg/Geometry>
+#include <osg/Image>
 
 #include <osgUtil/TangentSpaceGenerator>
 
 #include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include <components/resource/imagemanager.hpp>
+#include <components/vfs/manager.hpp>
 
 #include "shadermanager.hpp"
 
@@ -24,13 +29,20 @@ namespace Shader
     {
     }
 
-    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
+    ShaderVisitor::ShaderRequirements::~ShaderRequirements()
+    {
+
+    }
+
+    ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mForceShaders(false)
         , mClampLighting(false)
         , mForcePerPixelLighting(false)
         , mAllowedToModifyStateSets(true)
+        , mAutoUseNormalMaps(false)
         , mShaderManager(shaderManager)
+        , mImageManager(imageManager)
         , mDefaultVsTemplate(defaultVsTemplate)
         , mDefaultFsTemplate(defaultFsTemplate)
     {
@@ -81,37 +93,69 @@ namespace Shader
         if (mAllowedToModifyStateSets)
             writableStateSet = node.getStateSet();
         const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
-        for(unsigned int unit=0;unit<texAttributes.size();++unit)
+        if (texAttributes.size())
         {
-            const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
-            if (attr)
+            const osg::Texture* diffuseMap = NULL;
+            const osg::Texture* normalMap = NULL;
+            for(unsigned int unit=0;unit<texAttributes.size();++unit)
             {
-                const osg::Texture* texture = attr->asTexture();
-                if (texture)
+                const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
+                if (attr)
                 {
-                    if (!texture->getName().empty())
+                    const osg::Texture* texture = attr->asTexture();
+                    if (texture)
                     {
-                        mRequirements.back().mTextures[unit] = texture->getName();
-                        if (texture->getName() == "normalMap")
+                        if (!texture->getName().empty())
                         {
-                            mRequirements.back().mTexStageRequiringTangents = unit;
-                            mRequirements.back().mHasNormalMap = true;
-                            if (!writableStateSet)
-                                writableStateSet = getWritableStateSet(node);
-                            // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
-                            writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                            mRequirements.back().mTextures[unit] = texture->getName();
+                            if (texture->getName() == "normalMap")
+                            {
+                                mRequirements.back().mTexStageRequiringTangents = unit;
+                                mRequirements.back().mHasNormalMap = true;
+                                if (!writableStateSet)
+                                    writableStateSet = getWritableStateSet(node);
+                                // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
+                                writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
+                                normalMap = texture;
+                            }
+                            if (texture->getName() == "diffuseMap")
+                                diffuseMap = texture;
                         }
+                        else
+                            std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
                     }
-                    else
-                        std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
+                }
+                // remove state that has no effect when rendering with shaders
+                if (stateset->getTextureAttribute(unit, osg::StateAttribute::TEXENV))
+                {
+                    if (!writableStateSet)
+                        writableStateSet = getWritableStateSet(node);
+                    writableStateSet->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
                 }
             }
-            // remove state that has no effect when rendering with shaders
-            if (stateset->getTextureAttribute(unit, osg::StateAttribute::TEXENV))
+
+            if (mAutoUseNormalMaps && diffuseMap != NULL && normalMap == NULL)
             {
-                if (!writableStateSet)
-                    writableStateSet = getWritableStateSet(node);
-                writableStateSet->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
+                std::string normalMap = diffuseMap->getImage(0)->getFileName();
+                boost::replace_last(normalMap, ".", mNormalMapPattern + ".");
+                if (mImageManager.getVFS()->exists(normalMap))
+                {
+                    osg::ref_ptr<osg::Texture2D> normalMapTex (new osg::Texture2D(mImageManager.getImage(normalMap)));
+                    normalMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
+                    normalMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
+                    normalMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
+                    normalMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
+                    normalMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
+                    normalMapTex->setName("normalMap");
+
+                    int unit = texAttributes.size();
+                    if (!writableStateSet)
+                        writableStateSet = getWritableStateSet(node);
+                    writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON);
+                    mRequirements.back().mTextures[unit] = "normalMap";
+                    mRequirements.back().mTexStageRequiringTangents = unit;
+                    mRequirements.back().mHasNormalMap = true;
+                }
             }
         }
 
@@ -209,8 +253,12 @@ namespace Shader
         if (!mRequirements.empty())
         {
             const ShaderRequirements& reqs = mRequirements.back();
-            if (reqs.mTexStageRequiringTangents != -1)
+            if (reqs.mTexStageRequiringTangents != -1 && mAllowedToModifyStateSets)
             {
+                if (geometry.getTexCoordArray(reqs.mTexStageRequiringTangents) == NULL) // assign tex coord array for normal map if necessary
+                                                                                        // the normal-map may be assigned on-the-fly in applyStateSet() when mAutoUseNormalMaps is true
+                    geometry.setTexCoordArray(reqs.mTexStageRequiringTangents, geometry.getTexCoordArray(0));
+
                 osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
                 generator->generate(&geometry, reqs.mTexStageRequiringTangents);
 
@@ -254,4 +302,14 @@ namespace Shader
         mAllowedToModifyStateSets = allowed;
     }
 
+    void ShaderVisitor::setAutoUseNormalMaps(bool use)
+    {
+        mAutoUseNormalMaps = use;
+    }
+
+    void ShaderVisitor::setNormalMapPattern(const std::string &pattern)
+    {
+        mNormalMapPattern = pattern;
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index c301db47d0..645a929693 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -3,6 +3,11 @@
 
 #include <osg/NodeVisitor>
 
+namespace Resource
+{
+    class ImageManager;
+}
+
 namespace Shader
 {
 
@@ -12,7 +17,7 @@ namespace Shader
     class ShaderVisitor : public osg::NodeVisitor
     {
     public:
-        ShaderVisitor(ShaderManager& shaderManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
+        ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string& defaultVsTemplate, const std::string& defaultFsTemplate);
 
         /// By default, only bump mapped objects will have a shader added to them.
         /// Setting force = true will cause all objects to render using shaders, regardless of having a bump map.
@@ -30,6 +35,11 @@ namespace Shader
         /// @par This option is useful when the ShaderVisitor is run on a "live" subgraph that may have already been submitted for rendering.
         void setAllowedToModifyStateSets(bool allowed);
 
+        /// Automatically use normal maps if a file with suitable name exists (see normal map pattern).
+        void setAutoUseNormalMaps(bool use);
+
+        void setNormalMapPattern(const std::string& pattern);
+
         virtual void apply(osg::Node& node);
 
         virtual void apply(osg::Drawable& drawable);
@@ -46,15 +56,22 @@ namespace Shader
         bool mForcePerPixelLighting;
         bool mAllowedToModifyStateSets;
 
+        bool mAutoUseNormalMaps;
+        std::string mNormalMapPattern;
+
         ShaderManager& mShaderManager;
+        Resource::ImageManager& mImageManager;
 
         struct ShaderRequirements
         {
             ShaderRequirements();
+            ~ShaderRequirements();
 
             // <texture stage, texture name>
             std::map<int, std::string> mTextures;
 
+            osg::ref_ptr<osg::Texture> mDiffuseMap;
+
             bool mHasNormalMap;
 
             bool mColorMaterial;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 1c87c5dd5b..7403375c0e 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -178,6 +178,18 @@ force per pixel lighting = false
 # Setting this option to 'false' results in more realistic lighting.
 clamp lighting = true
 
+# If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
+# (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
+# If this option is disabled, normal maps are only used if they are explicitely listed within the mesh file (NIF file).
+# Affects objects.
+auto use object normal maps = false
+
+# See 'auto use object normal maps'. Affects terrain.
+auto use terrain normal maps = false
+
+# The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
+normal map pattern = _n
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.

From f01e8a69505418d8ba7ae05e312246517548361f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 19:02:11 +0100
Subject: [PATCH 319/765] Add specular mapping for objects

---
 apps/openmw/mwrender/renderingmanager.cpp |  6 ++-
 components/resource/scenemanager.cpp      | 12 +++++
 components/resource/scenemanager.hpp      |  6 +++
 components/shader/shadervisitor.cpp       | 64 +++++++++++++++++++----
 components/shader/shadervisitor.hpp       |  9 +++-
 files/settings-default.cfg                |  6 +++
 files/shaders/lighting.glsl               | 11 ++++
 files/shaders/objects_fragment.glsl       | 22 ++++++--
 files/shaders/objects_vertex.glsl         | 16 ++++--
 9 files changed, 132 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index ef1b469e38..dde283b68a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -174,6 +174,8 @@ namespace MWRender
         resourceSystem->getSceneManager()->setForcePerPixelLighting(Settings::Manager::getBool("force per pixel lighting", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
         resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
+        resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
 
         osg::ref_ptr<SceneUtil::LightManager> sceneRoot = new SceneUtil::LightManager;
         sceneRoot->setLightingMask(Mask_Lighting);
@@ -340,7 +342,9 @@ namespace MWRender
     {
         setAmbientColour(SceneUtil::colourFromRGB(cell->mAmbi.mAmbient));
 
-        mSunLight->setDiffuse(SceneUtil::colourFromRGB(cell->mAmbi.mSunlight));
+        osg::Vec4f diffuse = SceneUtil::colourFromRGB(cell->mAmbi.mSunlight);
+        mSunLight->setDiffuse(diffuse);
+        mSunLight->setSpecular(diffuse);
         mSunLight->setDirection(osg::Vec3f(1.f,-1.f,-1.f));
     }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 00030edc54..d0d10a3cd2 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -274,6 +274,16 @@ namespace Resource
         mNormalMapPattern = pattern;
     }
 
+    void SceneManager::setAutoUseSpecularMaps(bool use)
+    {
+        mAutoUseSpecularMaps = use;
+    }
+
+    void SceneManager::setSpecularMapPattern(const std::string &pattern)
+    {
+        mSpecularMapPattern = pattern;
+    }
+
     SceneManager::~SceneManager()
     {
         // this has to be defined in the .cpp file as we can't delete incomplete types
@@ -403,6 +413,8 @@ namespace Resource
             shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
             shaderVisitor.setAutoUseNormalMaps(mAutoUseNormalMaps);
             shaderVisitor.setNormalMapPattern(mNormalMapPattern);
+            shaderVisitor.setAutoUseSpecularMaps(mAutoUseSpecularMaps);
+            shaderVisitor.setSpecularMapPattern(mSpecularMapPattern);
             loaded->accept(shaderVisitor);
 
             // share state
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index d78466260c..00eb68e76d 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -63,6 +63,10 @@ namespace Resource
         /// @see ShaderVisitor::setNormalMapPattern
         void setNormalMapPattern(const std::string& pattern);
 
+        void setAutoUseSpecularMaps(bool use);
+
+        void setSpecularMapPattern(const std::string& pattern);
+
         void setShaderPath(const std::string& path);
 
         /// Get a read-only copy of this scene "template"
@@ -134,6 +138,8 @@ namespace Resource
         bool mForcePerPixelLighting;
         bool mAutoUseNormalMaps;
         std::string mNormalMapPattern;
+        bool mAutoUseSpecularMaps;
+        std::string mSpecularMapPattern;
 
         osg::ref_ptr<MultiObjectCache> mInstanceCache;
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index a69a479e31..279954eb0a 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -21,7 +21,7 @@ namespace Shader
 {
 
     ShaderVisitor::ShaderRequirements::ShaderRequirements()
-        : mHasNormalMap(false)
+        : mShaderRequired(false)
         , mColorMaterial(false)
         , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
         , mMaterialOverridden(false)
@@ -41,6 +41,7 @@ namespace Shader
         , mForcePerPixelLighting(false)
         , mAllowedToModifyStateSets(true)
         , mAutoUseNormalMaps(false)
+        , mAutoUseSpecularMaps(false)
         , mShaderManager(shaderManager)
         , mImageManager(imageManager)
         , mDefaultVsTemplate(defaultVsTemplate)
@@ -97,6 +98,7 @@ namespace Shader
         {
             const osg::Texture* diffuseMap = NULL;
             const osg::Texture* normalMap = NULL;
+            const osg::Texture* specularMap = NULL;
             for(unsigned int unit=0;unit<texAttributes.size();++unit)
             {
                 const osg::StateAttribute *attr = stateset->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
@@ -111,7 +113,7 @@ namespace Shader
                             if (texture->getName() == "normalMap")
                             {
                                 mRequirements.back().mTexStageRequiringTangents = unit;
-                                mRequirements.back().mHasNormalMap = true;
+                                mRequirements.back().mShaderRequired = true;
                                 if (!writableStateSet)
                                     writableStateSet = getWritableStateSet(node);
                                 // normal maps are by default off since the FFP can't render them, now that we'll use shaders switch to On
@@ -120,6 +122,8 @@ namespace Shader
                             }
                             if (texture->getName() == "diffuseMap")
                                 diffuseMap = texture;
+                            if (texture->getName() == "specularMap")
+                                specularMap = texture;
                         }
                         else
                             std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
@@ -154,7 +158,30 @@ namespace Shader
                     writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON);
                     mRequirements.back().mTextures[unit] = "normalMap";
                     mRequirements.back().mTexStageRequiringTangents = unit;
-                    mRequirements.back().mHasNormalMap = true;
+                    mRequirements.back().mShaderRequired = true;
+                }
+            }
+            if (mAutoUseSpecularMaps && diffuseMap != NULL && specularMap == NULL)
+            {
+                std::string specularMap = diffuseMap->getImage(0)->getFileName();
+                boost::replace_last(specularMap, ".", mSpecularMapPattern + ".");
+                if (mImageManager.getVFS()->exists(specularMap))
+                {
+                    std::cout << "using specmap " << specularMap << std::endl;
+                    osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(mImageManager.getImage(specularMap)));
+                    specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
+                    specularMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
+                    specularMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
+                    specularMapTex->setFilter(osg::Texture::MAG_FILTER, diffuseMap->getFilter(osg::Texture::MAG_FILTER));
+                    specularMapTex->setMaxAnisotropy(diffuseMap->getMaxAnisotropy());
+                    specularMapTex->setName("specularMap");
+
+                    int unit = texAttributes.size();
+                    if (!writableStateSet)
+                        writableStateSet = getWritableStateSet(node);
+                    writableStateSet->setTextureAttributeAndModes(unit, specularMapTex, osg::StateAttribute::ON);
+                    mRequirements.back().mTextures[unit] = "specularMap";
+                    mRequirements.back().mShaderRequired = true;
                 }
             }
         }
@@ -196,7 +223,7 @@ namespace Shader
             writableStateSet = getWritableStateSet(node);
 
         ShaderManager::DefineMap defineMap;
-        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap" };
+        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap" };
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
         {
             defineMap[defaultTextures[i]] = "0";
@@ -253,12 +280,19 @@ namespace Shader
         if (!mRequirements.empty())
         {
             const ShaderRequirements& reqs = mRequirements.back();
+
+            if (mAllowedToModifyStateSets)
+            {
+                // make sure that all UV sets are there
+                for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
+                {
+                    if (geometry.getTexCoordArray(it->first) == NULL)
+                        geometry.setTexCoordArray(it->first, geometry.getTexCoordArray(0));
+                }
+            }
+
             if (reqs.mTexStageRequiringTangents != -1 && mAllowedToModifyStateSets)
             {
-                if (geometry.getTexCoordArray(reqs.mTexStageRequiringTangents) == NULL) // assign tex coord array for normal map if necessary
-                                                                                        // the normal-map may be assigned on-the-fly in applyStateSet() when mAutoUseNormalMaps is true
-                    geometry.setTexCoordArray(reqs.mTexStageRequiringTangents, geometry.getTexCoordArray(0));
-
                 osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
                 generator->generate(&geometry, reqs.mTexStageRequiringTangents);
 
@@ -266,7 +300,7 @@ namespace Shader
             }
 
             // TODO: find a better place for the stateset
-            if (reqs.mHasNormalMap || mForceShaders)
+            if (reqs.mShaderRequired || mForceShaders)
                 createProgram(reqs, geometry);
         }
 
@@ -289,7 +323,7 @@ namespace Shader
         {
             const ShaderRequirements& reqs = mRequirements.back();
             // TODO: find a better place for the stateset
-            if (reqs.mHasNormalMap || mForceShaders)
+            if (reqs.mShaderRequired || mForceShaders)
                 createProgram(reqs, drawable);
         }
 
@@ -312,4 +346,14 @@ namespace Shader
         mNormalMapPattern = pattern;
     }
 
+    void ShaderVisitor::setAutoUseSpecularMaps(bool use)
+    {
+        mAutoUseSpecularMaps = use;
+    }
+
+    void ShaderVisitor::setSpecularMapPattern(const std::string &pattern)
+    {
+        mSpecularMapPattern = pattern;
+    }
+
 }
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 645a929693..2f957dfbf4 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -40,6 +40,10 @@ namespace Shader
 
         void setNormalMapPattern(const std::string& pattern);
 
+        void setAutoUseSpecularMaps(bool use);
+
+        void setSpecularMapPattern(const std::string& pattern);
+
         virtual void apply(osg::Node& node);
 
         virtual void apply(osg::Drawable& drawable);
@@ -59,6 +63,9 @@ namespace Shader
         bool mAutoUseNormalMaps;
         std::string mNormalMapPattern;
 
+        bool mAutoUseSpecularMaps;
+        std::string mSpecularMapPattern;
+
         ShaderManager& mShaderManager;
         Resource::ImageManager& mImageManager;
 
@@ -72,7 +79,7 @@ namespace Shader
 
             osg::ref_ptr<osg::Texture> mDiffuseMap;
 
-            bool mHasNormalMap;
+            bool mShaderRequired;
 
             bool mColorMaterial;
             // osg::Material::ColorMode
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 7403375c0e..98c33e834d 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -184,12 +184,18 @@ clamp lighting = true
 # Affects objects.
 auto use object normal maps = false
 
+auto use object specular maps = false
+
 # See 'auto use object normal maps'. Affects terrain.
 auto use terrain normal maps = false
 
+auto use terrain specular maps = false
+
 # The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
 normal map pattern = _n
 
+specular map pattern = _spec
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index d3c51d3cdc..d706563ba0 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -40,3 +40,14 @@ vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
 #endif
     return lightResult;
 }
+
+
+vec3 getSpecular(vec3 viewNormal, vec3 viewPos, float shininess, vec3 matSpec)
+{
+    vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
+    float NdotL = max(dot(viewNormal, lightDir), 0.0);
+    if (NdotL < 0)
+        return vec3(0,0,0);
+    vec3 halfVec = normalize(lightDir - viewPos);
+    return pow(max(dot(viewNormal, halfVec), 0.0), 128) * gl_LightSource[0].specular.xyz * matSpec;
+}
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 6366da82ba..f572c24bb6 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -32,6 +32,11 @@ varying vec2 envMapUV;
 uniform vec4 envMapColor;
 #endif
 
+#if @specularMap
+uniform sampler2D specularMap;
+varying vec2 specularMapUV;
+#endif
+
 varying float depth;
 
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
@@ -39,10 +44,10 @@ varying float depth;
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
 #else
-varying vec3 passViewPos;
-varying vec3 passViewNormal;
 varying vec4 passColor;
 #endif
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
 
 #include "lighting.glsl"
 
@@ -62,9 +67,7 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
-#if PER_PIXEL_LIGHTING
     vec3 viewNormal = passViewNormal;
-#endif
 
 #if @normalMap
     vec3 normalTex = texture2D(normalMap, normalMapUV).xyz;
@@ -90,6 +93,17 @@ void main()
     gl_FragData[0].xyz += texture2D(envMap, envMapUV).xyz * envMapColor.xyz;
 #endif
 
+#if @specularMap
+    vec4 specTex = texture2D(specularMap, specularMapUV);
+    float shininess = specTex.a * 255;
+    vec3 matSpec = specTex.xyz;
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 matSpec = gl_FrontMaterial.specular.xyz;
+#endif
+
+    gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos.xyz), shininess, matSpec);
+
     float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index a2c0e7d214..b1004aad3d 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -25,6 +25,10 @@ varying vec3 viewTangent;
 varying vec2 envMapUV;
 #endif
 
+#if @specularMap
+varying vec2 specularMapUV;
+#endif
+
 varying float depth;
 
 #define PER_PIXEL_LIGHTING (@normalMap || @forcePPL)
@@ -32,10 +36,10 @@ varying float depth;
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
 #else
-varying vec3 passViewPos;
-varying vec3 passViewNormal;
 varying vec4 passColor;
 #endif
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
 
 #include "lighting.glsl"
 
@@ -76,11 +80,15 @@ void main(void)
     viewTangent = normalize(gl_NormalMatrix * gl_MultiTexCoord7.xyz);
 #endif
 
+#if @specularMap
+    specularMapUV = (gl_TextureMatrix[@specularMapUV] * gl_MultiTexCoord@specularMapUV).xy;
+#endif
+
 #if !PER_PIXEL_LIGHTING
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
 #else
-    passViewPos = viewPos.xyz;
-    passViewNormal = viewNormal;
     passColor = gl_Color;
 #endif
+    passViewPos = viewPos.xyz;
+    passViewNormal = viewNormal;
 }

From 171e2936413e5b461537bfb6c9e28b0b807e3fed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 19:26:59 +0100
Subject: [PATCH 320/765] ShaderManager: insert #line directives when including
 files

---
 components/shader/shadermanager.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index 286642e578..ce77f46dc2 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -2,12 +2,14 @@
 
 #include <fstream>
 #include <iostream>
+#include <algorithm>
 
 #include <osg/Program>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <OpenThreads/ScopedLock>
 
@@ -21,8 +23,11 @@ namespace Shader
 
     bool parseIncludes(boost::filesystem::path shaderPath, std::string& source)
     {
+        boost::replace_all(source, "\r\n", "\n");
+
         std::set<boost::filesystem::path> includedFiles;
         size_t foundPos = 0;
+        int fileNumber = 1;
         while ((foundPos = source.find("#include")) != std::string::npos)
         {
             size_t start = source.find('"', foundPos);
@@ -46,9 +51,19 @@ namespace Shader
                 std::cerr << "Failed to open " << includePath.string() << std::endl;
                 return false;
             }
+
             std::stringstream buffer;
             buffer << includeFstream.rdbuf();
-            source.replace(foundPos, (end-foundPos+1), buffer.str());
+
+            // insert #line directives so we get correct line numbers in compiler errors
+            int includedFileNumber = fileNumber++;
+
+            int lineNumber = std::count(source.begin(), source.begin() + foundPos, '\n');
+
+            std::stringstream toInsert;
+            toInsert << "#line 0 " << includedFileNumber << "\n" << buffer.str() << "\n#line " << lineNumber << " 0\n";
+
+            source.replace(foundPos, (end-foundPos+1), toInsert.str());
 
             if (includedFiles.insert(includePath).second == false)
             {

From 0db7163363e634ba06806198ab3e4f1c5f467255 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 19:54:47 +0100
Subject: [PATCH 321/765] Add specular mapping for terrain

---
 apps/openmw/mwrender/renderingmanager.cpp |  5 +++--
 apps/openmw/mwrender/terrainstorage.cpp   |  4 ++--
 apps/openmw/mwrender/terrainstorage.hpp   |  2 +-
 components/esmterrain/storage.cpp         | 13 +++++++------
 components/esmterrain/storage.hpp         |  5 ++++-
 components/terrain/defs.hpp               |  4 +++-
 components/terrain/material.cpp           |  1 +
 components/terrain/material.hpp           |  1 +
 components/terrain/terraingrid.cpp        |  5 ++++-
 files/settings-default.cfg                |  4 ++++
 files/shaders/terrain_fragment.glsl       | 19 ++++++++++++++-----
 files/shaders/terrain_vertex.glsl         |  8 ++++----
 12 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index dde283b68a..57f784b2c0 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -197,8 +197,9 @@ namespace MWRender
         mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
         mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain normal maps", "Shaders")),
-                                                    Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
+                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain normal maps", "Shaders"),
+                                                     Settings::Manager::getString("terrain specular map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain specular maps", "Shaders")),
+                                                 Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index 8d4bf2ea20..cc1c3a0bc8 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -9,8 +9,8 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, bool autoUseNormalMaps)
-        : ESMTerrain::Storage(vfs, normalMapPattern, autoUseNormalMaps)
+    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
+        : ESMTerrain::Storage(vfs, normalMapPattern, autoUseNormalMaps, specularMapPattern, autoUseSpecularMaps)
     {
     }
 
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index 7bd4b4fd51..759c7dfcfb 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -14,7 +14,7 @@ namespace MWRender
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin);
     public:
 
-        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false);
+        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Get bounds of the whole terrain in cell units
         virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY);
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 9901020700..68b32cf2a1 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -18,10 +18,12 @@ namespace ESMTerrain
 
     const float defaultHeight = -2048;
 
-    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, bool autoUseNormalMaps)
+    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
         : mVFS(vfs)
         , mNormalMapPattern(normalMapPattern)
         , mAutoUseNormalMaps(autoUseNormalMaps)
+        , mSpecularMapPattern(specularMapPattern)
+        , mAutoUseSpecularMaps(autoUseSpecularMaps)
     {
     }
 
@@ -510,7 +512,7 @@ namespace ESMTerrain
             return found->second;
 
         Terrain::LayerInfo info;
-        info.mParallax = false;
+        //info.mParallax = false;
         info.mSpecular = false;
         info.mDiffuseMap = texture;
 
@@ -532,17 +534,16 @@ namespace ESMTerrain
                 info.mNormalMap = texture_;
         }
 
-        /*
+        if (mAutoUseSpecularMaps)
         {
             std::string texture_ = texture;
-            boost::replace_last(texture_, ".", "_diffusespec.");
+            boost::replace_last(texture_, ".", mSpecularMapPattern + ".");
             if (mVFS->exists(texture_))
             {
                 info.mDiffuseMap = texture_;
                 info.mSpecular = true;
             }
         }
-        */
 
         mLayerInfoMap[texture] = info;
 
@@ -553,7 +554,7 @@ namespace ESMTerrain
     {
         Terrain::LayerInfo info;
         info.mDiffuseMap = "textures\\_land_default.dds";
-        info.mParallax = false;
+        //info.mParallax = false;
         info.mSpecular = false;
         return info;
     }
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 0c8095a113..7b8b844fff 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -27,7 +27,7 @@ namespace ESMTerrain
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
 
     public:
-        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false);
+        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Data is loaded first, if necessary. Will return a 0-pointer if there is no data for
         /// any of the data types specified via \a flags. Will also return a 0-pointer if there
@@ -112,6 +112,9 @@ namespace ESMTerrain
         std::string mNormalMapPattern;
         bool mAutoUseNormalMaps;
 
+        std::string mSpecularMapPattern;
+        bool mAutoUseSpecularMaps;
+
         Terrain::LayerInfo getLayerInfo(const std::string& texture);
     };
 
diff --git a/components/terrain/defs.hpp b/components/terrain/defs.hpp
index 234e05a98a..10095bec0b 100644
--- a/components/terrain/defs.hpp
+++ b/components/terrain/defs.hpp
@@ -18,8 +18,10 @@ namespace Terrain
     {
         std::string mDiffuseMap;
         std::string mNormalMap;
-        bool mParallax; // Height info in normal map alpha channel?
+        //bool mParallax; // Height info in normal map alpha channel?
         bool mSpecular; // Specular info in diffuse map alpha channel?
+
+        bool requiresShaders() const { return !mNormalMap.empty() || mSpecular; }
     };
 
 }
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 54634d5d4b..b9405ef861 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -129,6 +129,7 @@ namespace Terrain
             defineMap["normalMap"] = (it->mNormalMap) ? "1" : "0";
             defineMap["blendMap"] = !firstLayer ? "1" : "0";
             defineMap["colorMode"] = "2";
+            defineMap["specularMap"] = it->mSpecular ? "1" : "0";
 
             osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
             osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index e353e5b3a1..61d5724d7b 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -23,6 +23,7 @@ namespace Terrain
     {
         osg::ref_ptr<osg::Texture2D> mDiffuseMap;
         osg::ref_ptr<osg::Texture2D> mNormalMap; // optional
+        bool mSpecular;
     };
 
     class FixedFunctionTechnique : public osgFX::Technique
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index e008d5e525..31cac2e9b3 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -162,6 +162,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
             {
                 TextureLayer textureLayer;
+                textureLayer.mSpecular = it->mSpecular;
                 osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
                 if (!texture)
                 {
@@ -187,9 +188,11 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
                     }
                     textureCompileDummy->getOrCreateStateSet()->setTextureAttributeAndModes(dummyTextureCounter++, texture);
                     textureLayer.mNormalMap = texture;
-                    useShaders = true;
                 }
 
+                if (it->requiresShaders())
+                    useShaders = true;
+
                 layers.push_back(textureLayer);
             }
         }
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 98c33e834d..1fd13ecd93 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -189,6 +189,8 @@ auto use object specular maps = false
 # See 'auto use object normal maps'. Affects terrain.
 auto use terrain normal maps = false
 
+# If a file with pattern 'terrain specular map pattern' exists, use that file as a 'diffuse specular' map. The texture
+# must contain the layer color in the RGB channel (as usual), and a specular multiplier in the alpha channel.
 auto use terrain specular maps = false
 
 # The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
@@ -196,6 +198,8 @@ normal map pattern = _n
 
 specular map pattern = _spec
 
+terrain specular map pattern = _diffusespec
+
 [Input]
 
 # Capture control of the cursor prevent movement outside the window.
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 3bfd16b0e0..db43cbd3ee 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -19,10 +19,10 @@ varying float depth;
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
 #else
-varying vec3 passViewPos;
-varying vec3 passViewNormal;
 varying vec4 passColor;
 #endif
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
 
 #include "lighting.glsl"
 
@@ -30,16 +30,15 @@ void main()
 {
     vec2 diffuseMapUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
 
-    gl_FragData[0] = vec4(texture2D(diffuseMap, diffuseMapUV).xyz, 1.0);
+    vec4 diffuseTex = texture2D(diffuseMap, diffuseMapUV);
+    gl_FragData[0] = vec4(diffuseTex.xyz, 1.0);
 
 #if @blendMap
     vec2 blendMapUV = (gl_TextureMatrix[1] * vec4(uv, 0.0, 1.0)).xy;
     gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
 #endif
 
-#if PER_PIXEL_LIGHTING
     vec3 viewNormal = passViewNormal;
-#endif
 
 #if @normalMap
     vec3 normalTex = texture2D(normalMap, diffuseMapUV).xyz;
@@ -59,6 +58,16 @@ void main()
     gl_FragData[0] *= doLighting(passViewPos, normalize(viewNormal), passColor);
 #endif
 
+#if @specularMap
+    float shininess = 128; // TODO: make configurable
+    vec3 matSpec = vec3(diffuseTex.a, diffuseTex.a, diffuseTex.a);
+#else
+    float shininess = gl_FrontMaterial.shininess;
+    vec3 matSpec = gl_FrontMaterial.specular.xyz;
+#endif
+
+    gl_FragData[0].xyz += getSpecular(normalize(viewNormal), normalize(passViewPos), shininess, matSpec);
+
     float fogValue = clamp((depth - gl_Fog.start) * gl_Fog.scale, 0.0, 1.0);
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, gl_Fog.color.xyz, fogValue);
 }
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 43cb5d31b1..46071d7f01 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -8,10 +8,10 @@ varying float depth;
 #if !PER_PIXEL_LIGHTING
 varying vec4 lighting;
 #else
-varying vec3 passViewPos;
-varying vec3 passViewNormal;
 varying vec4 passColor;
 #endif
+varying vec3 passViewPos;
+varying vec3 passViewNormal;
 
 #include "lighting.glsl"
 
@@ -27,10 +27,10 @@ void main(void)
 #if !PER_PIXEL_LIGHTING
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
 #else
-    passViewPos = viewPos.xyz;
-    passViewNormal = viewNormal;
     passColor = gl_Color;
 #endif
+    passViewNormal = viewNormal;
+    passViewPos = viewPos.xyz;
 
     uv = gl_MultiTexCoord0.xy;
 }

From 8f81df2bd3d97564f3521af5ec68ce4f4fa45b22 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 20:34:56 +0100
Subject: [PATCH 322/765] Cleanup

---
 apps/openmw/mwrender/water.cpp      | 1 -
 components/nifosg/particle.hpp      | 1 -
 components/shader/shadervisitor.cpp | 1 -
 components/terrain/terraingrid.cpp  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 8e9a7630c8..a410527de3 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -15,7 +15,6 @@
 #include <osg/FrontFace>
 #include <osg/Shader>
 #include <osg/GLExtensions>
-#include <osg/UserDataContainer>
 
 #include <osgDB/ReadFile>
 
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index a1ed3f3d0f..1e17143695 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -7,7 +7,6 @@
 #include <osgParticle/ModularEmitter>
 
 #include <osg/NodeCallback>
-#include <osg/UserDataContainer>
 
 #include <components/nif/nifkey.hpp>
 #include <components/nif/data.hpp>
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 279954eb0a..0940c4c9e0 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -167,7 +167,6 @@ namespace Shader
                 boost::replace_last(specularMap, ".", mSpecularMapPattern + ".");
                 if (mImageManager.getVFS()->exists(specularMap))
                 {
-                    std::cout << "using specmap " << specularMap << std::endl;
                     osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(mImageManager.getImage(specularMap)));
                     specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
                     specularMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index 31cac2e9b3..abfac4a71b 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include <osg/UserDataContainer>
 #include <osg/Material>
 
 #include <OpenThreads/ScopedLock>

From 4ca6e91292b4cdfda6df4bb66c0b9469a419c910 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 20:36:29 +0100
Subject: [PATCH 323/765] Fix in-code default settings so that we don't attempt
 to use shaders in OpenCS

---
 components/resource/scenemanager.cpp | 2 +-
 components/shader/shadervisitor.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index d0d10a3cd2..503b4ace84 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -210,7 +210,7 @@ namespace Resource
         : ResourceManager(vfs)
         , mShaderManager(new Shader::ShaderManager)
         , mForceShaders(false)
-        , mClampLighting(false)
+        , mClampLighting(true)
         , mForcePerPixelLighting(false)
         , mAutoUseNormalMaps(false)
         , mInstanceCache(new MultiObjectCache)
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 0940c4c9e0..bcce4a09c4 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -37,7 +37,7 @@ namespace Shader
     ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultVsTemplate, const std::string &defaultFsTemplate)
         : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
         , mForceShaders(false)
-        , mClampLighting(false)
+        , mClampLighting(true)
         , mForcePerPixelLighting(false)
         , mAllowedToModifyStateSets(true)
         , mAutoUseNormalMaps(false)

From cdefee3e648826ba191210d6bb407d95df7e5080 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 20:38:37 +0100
Subject: [PATCH 324/765] Add call to MultiObjectCache::releaseGLObjects

---
 components/resource/scenemanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 503b4ace84..0a0933474f 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -480,6 +480,7 @@ namespace Resource
     void SceneManager::releaseGLObjects(osg::State *state)
     {
         mCache->releaseGLObjects(state);
+        mInstanceCache->releaseGLObjects(state);
     }
 
     void SceneManager::setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation *ico)

From e7682e04ae8a0553ecb75e696973fbbd093882b1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 22:09:41 +0100
Subject: [PATCH 325/765] Cleanup

---
 components/shader/shadervisitor.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 2f957dfbf4..682a9c60fb 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -77,8 +77,6 @@ namespace Shader
             // <texture stage, texture name>
             std::map<int, std::string> mTextures;
 
-            osg::ref_ptr<osg::Texture> mDiffuseMap;
-
             bool mShaderRequired;
 
             bool mColorMaterial;

From e25e0a0600b95c1f2c1d7a228fffc5b226465b10 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 20 Feb 2016 23:43:05 +0100
Subject: [PATCH 326/765] ShaderVisitor: assume the first texture unit is the
 diffuseMap

---
 components/shader/shadervisitor.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index bcce4a09c4..46d4edf44b 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -88,6 +88,15 @@ namespace Shader
         return newStateSet.get();
     }
 
+    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap" };
+    bool isTextureNameRecognized(const std::string& name)
+    {
+        for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
+            if (name.c_str() == defaultTextures[i])
+                return true;
+        return false;
+    }
+
     void ShaderVisitor::applyStateSet(osg::ref_ptr<osg::StateSet> stateset, osg::Node& node)
     {
         osg::StateSet* writableStateSet = NULL;
@@ -107,10 +116,14 @@ namespace Shader
                     const osg::Texture* texture = attr->asTexture();
                     if (texture)
                     {
-                        if (!texture->getName().empty())
+                        std::string texName = texture->getName();
+                        if ((texName.empty() || !isTextureNameRecognized(texName)) && unit == 0)
+                            texName = "diffuseMap";
+
+                        if (!texName.empty())
                         {
-                            mRequirements.back().mTextures[unit] = texture->getName();
-                            if (texture->getName() == "normalMap")
+                            mRequirements.back().mTextures[unit] = texName;
+                            if (texName == "normalMap")
                             {
                                 mRequirements.back().mTexStageRequiringTangents = unit;
                                 mRequirements.back().mShaderRequired = true;
@@ -120,9 +133,9 @@ namespace Shader
                                 writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
                                 normalMap = texture;
                             }
-                            if (texture->getName() == "diffuseMap")
+                            if (texName == "diffuseMap")
                                 diffuseMap = texture;
-                            if (texture->getName() == "specularMap")
+                            if (texName == "specularMap")
                                 specularMap = texture;
                         }
                         else
@@ -222,7 +235,6 @@ namespace Shader
             writableStateSet = getWritableStateSet(node);
 
         ShaderManager::DefineMap defineMap;
-        const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap" };
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
         {
             defineMap[defaultTextures[i]] = "0";

From 09684adeff3f909d92fb729da781e572461ffbad Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Feb 2016 00:48:18 +0100
Subject: [PATCH 327/765] Update settings documentation

---
 files/settings-default.cfg | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 1fd13ecd93..c886cee702 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -180,10 +180,14 @@ clamp lighting = true
 
 # If this option is enabled, normal maps are automatically recognized and used if they are named appropriately
 # (see 'normal map pattern', e.g. for a base texture foo.dds, the normal map texture would have to be named foo_n.dds).
-# If this option is disabled, normal maps are only used if they are explicitely listed within the mesh file (NIF file).
+# If this option is disabled, normal maps are only used if they are explicitely listed within the mesh file (.nif or .osg file).
 # Affects objects.
 auto use object normal maps = false
 
+# If this option is enabled, specular maps are automatically recognized and used if they are named appropriately
+# (see 'specular map pattern', e.g. for a base texture foo.dds, the specular map texture would have to be named foo_spec.dds).
+# If this option is disabled, normal maps are only used if they are explicitely listed within the mesh file (.osg file, not supported in .nif files).
+# Affects objects.
 auto use object specular maps = false
 
 # See 'auto use object normal maps'. Affects terrain.
@@ -196,8 +200,10 @@ auto use terrain specular maps = false
 # The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
 normal map pattern = _n
 
+# The filename pattern to probe for when detecting object specular maps (see 'auto use object specular maps')
 specular map pattern = _spec
 
+# The filename pattern to probe for when detecting terrain specular maps (see 'auto use terrain specular maps')
 terrain specular map pattern = _diffusespec
 
 [Input]

From 8e826eefe69c739561da57d433826bc597ec498b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Feb 2016 01:26:45 +0100
Subject: [PATCH 328/765] Add missing initialization

---
 components/resource/scenemanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 0a0933474f..9965e77679 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -213,6 +213,7 @@ namespace Resource
         , mClampLighting(true)
         , mForcePerPixelLighting(false)
         , mAutoUseNormalMaps(false)
+        , mAutoUseSpecularMaps(false)
         , mInstanceCache(new MultiObjectCache)
         , mImageManager(imageManager)
         , mNifFileManager(nifFileManager)

From 900b522d13ec43bbc4844dc435445f3823c9dd31 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Feb 2016 01:28:42 +0100
Subject: [PATCH 329/765] Rename viewPos to viewDirection

---
 files/shaders/lighting.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/shaders/lighting.glsl b/files/shaders/lighting.glsl
index d706563ba0..08b369b5bd 100644
--- a/files/shaders/lighting.glsl
+++ b/files/shaders/lighting.glsl
@@ -42,12 +42,12 @@ vec4 doLighting(vec3 viewPos, vec3 viewNormal, vec4 vertexColor)
 }
 
 
-vec3 getSpecular(vec3 viewNormal, vec3 viewPos, float shininess, vec3 matSpec)
+vec3 getSpecular(vec3 viewNormal, vec3 viewDirection, float shininess, vec3 matSpec)
 {
     vec3 lightDir = normalize(gl_LightSource[0].position.xyz);
     float NdotL = max(dot(viewNormal, lightDir), 0.0);
     if (NdotL < 0)
         return vec3(0,0,0);
-    vec3 halfVec = normalize(lightDir - viewPos);
+    vec3 halfVec = normalize(lightDir - viewDirection);
     return pow(max(dot(viewNormal, halfVec), 0.0), 128) * gl_LightSource[0].specular.xyz * matSpec;
 }

From cee608e31bec969272b5e7aa0049280e2f12b0db Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Feb 2016 01:41:50 +0100
Subject: [PATCH 330/765] Make it work with appveyor's outdated OSG build

---
 components/resource/objectcache.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
index 5fec6730d6..7caf5366c9 100644
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@@ -129,9 +129,12 @@ void ObjectCache::accept(osg::NodeVisitor &nv)
         ++itr)
     {
         osg::Object* object = itr->second.first.get();
-        osg::Node* node = object->asNode();
-        if (node)
-            node->accept(nv);
+        if (object)
+        {
+            osg::Node* node = dynamic_cast<osg::Node*>(object);
+            if (node)
+                node->accept(nv);
+        }
     }
 }
 

From 22e717161a3d4e9ebb1cf556ba2b4154237f7532 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 21 Feb 2016 15:19:31 +0100
Subject: [PATCH 331/765] split object base node into two node (one for
 position, one for everything else)

---
 apps/opencs/view/render/object.cpp | 21 ++++++++++++---------
 apps/opencs/view/render/object.hpp |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 1e2fd26400..1833d73407 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -135,7 +135,7 @@ void CSVRender::Object::adjustTransform()
     ESM::Position position = getPosition();
 
     // position
-    mBaseNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
+    mRootNode->setPosition(mForceBaseToZero ? osg::Vec3() : osg::Vec3f(position.pos[0], position.pos[1], position.pos[2]));
 
     // orientation
     osg::Quat xr (-position.rot[0], osg::Vec3f(1,0,0));
@@ -161,6 +161,8 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 : mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
   mScaleOverride (1), mOverrideFlags (0)
 {
+    mRootNode = new osg::PositionAttitudeTransform;
+
     mBaseNode = new osg::PositionAttitudeTransform;
     mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
 
@@ -169,9 +171,11 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 
     mBaseNode->setUserData(new ObjectTag(this));
 
-    parentNode->addChild(mBaseNode);
+    mRootNode->addChild (mBaseNode);
 
-    mBaseNode->setNodeMask(Mask_Reference);
+    parentNode->addChild (mRootNode);
+
+    mRootNode->setNodeMask(Mask_Reference);
 
     if (referenceable)
     {
@@ -191,20 +195,19 @@ CSVRender::Object::~Object()
 {
     clear();
 
-    mParentNode->removeChild(mBaseNode);
-    mParentNode->removeChild(mOutline);
+    mParentNode->removeChild (mRootNode);
 }
 
 void CSVRender::Object::setSelected(bool selected)
 {
     mSelected = selected;
 
-    mParentNode->removeChild(mOutline);
-    mParentNode->removeChild(mBaseNode);
+    mRootNode->removeChild(mOutline);
+    mRootNode->removeChild(mBaseNode);
     if (selected)
-        mParentNode->addChild(mOutline);
+        mRootNode->addChild(mOutline);
     else
-        mParentNode->addChild(mBaseNode);
+        mRootNode->addChild(mBaseNode);
 }
 
 bool CSVRender::Object::getSelected() const
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index accdb93e0f..4b528b59f1 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -70,6 +70,7 @@ namespace CSVRender
             CSMWorld::Data& mData;
             std::string mReferenceId;
             std::string mReferenceableId;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mRootNode;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
             osg::ref_ptr<osgFX::Scribe> mOutline;
             bool mSelected;

From c5d3e6c9935f2d0f9ec863475f316e8ea00f096d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 14:31:02 +0100
Subject: [PATCH 332/765] Disable preloading of levelled lists

---
 apps/openmw/mwclass/creaturelevlist.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index e2f29ea72e..0223fb6345 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -56,8 +56,9 @@ namespace MWClass
 
     void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
     {
+        // disable for now, too many false positives
+        /*
         const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
-
         for (std::vector<ESM::LevelledListBase::LevelItem>::const_iterator it = ref->mBase->mList.begin(); it != ref->mBase->mList.end(); ++it)
         {
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -68,6 +69,7 @@ namespace MWClass
             MWWorld::ManualRef ref(store, it->mId);
             ref.getPtr().getClass().getModelsToPreload(ref.getPtr(), models);
         }
+        */
     }
 
     void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string& model, MWRender::RenderingInterface &renderingInterface) const

From 1c24cba46a266499b136e55ce5c351f0eb7c0acd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 15:13:31 +0100
Subject: [PATCH 333/765] Don't use multiple parental node paths.

---
 apps/opencs/view/render/object.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 1833d73407..0f135459b9 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -167,7 +167,6 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
 
     mOutline = new osgFX::Scribe;
-    mOutline->addChild(mBaseNode);
 
     mBaseNode->setUserData(new ObjectTag(this));
 
@@ -202,10 +201,14 @@ void CSVRender::Object::setSelected(bool selected)
 {
     mSelected = selected;
 
+    mOutline->removeChild(mBaseNode);
     mRootNode->removeChild(mOutline);
     mRootNode->removeChild(mBaseNode);
     if (selected)
+    {
+        mOutline->addChild(mBaseNode);
         mRootNode->addChild(mOutline);
+    }
     else
         mRootNode->addChild(mBaseNode);
 }

From 1667c807be651dbeb1be3055b4a5143f5e2db2c5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 15:21:06 +0100
Subject: [PATCH 334/765] Warn about particle emitters that have multiple
 parent node paths

---
 components/nifosg/particle.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 5003397222..205b0fd545 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -267,6 +267,8 @@ void Emitter::emitParticles(double dt)
         const osg::Matrix psToWorld = worldMats[0];
         worldToPs = osg::Matrix::inverse(psToWorld);
     }
+    if (worldMats.size() > 1)
+        std::cerr << "Found multiple parent node paths in particle emitter, this is not correctly supported " << std::endl;
 
     const osg::Matrix& ltw = getLocalToWorldMatrix();
     osg::Matrix emitterToPs = ltw * worldToPs;

From a6621626aa934207b4475ff4066387b42fbdef7b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 15:22:37 +0100
Subject: [PATCH 335/765] Don't use multiple parent node paths in
 CSVRender::Object

---
 apps/opencs/view/render/object.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 33939625d4..c220321d59 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -160,7 +160,6 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     mBaseNode->addCullCallback(new SceneUtil::LightListCallback);
 
     mOutline = new osgFX::Scribe;
-    mOutline->addChild(mBaseNode);
 
     mBaseNode->setUserData(new ObjectTag(this));
 
@@ -194,10 +193,14 @@ void CSVRender::Object::setSelected(bool selected)
 {
     mSelected = selected;
 
+    mOutline->removeChild(mBaseNode);
     mParentNode->removeChild(mOutline);
     mParentNode->removeChild(mBaseNode);
     if (selected)
+    {
+        mOutline->addChild(mBaseNode);
         mParentNode->addChild(mOutline);
+    }
     else
         mParentNode->addChild(mBaseNode);
 }

From 055d35a2b09f5bcc6082b306fc5254779ae491fc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 18:10:25 +0100
Subject: [PATCH 336/765] Revert "Warn about particle emitters that have
 multiple parent node paths"

Not working correctly because osg won't ignore camera nodes.

This reverts commit 1667c807be651dbeb1be3055b4a5143f5e2db2c5.
---
 components/nifosg/particle.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 205b0fd545..5003397222 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -267,8 +267,6 @@ void Emitter::emitParticles(double dt)
         const osg::Matrix psToWorld = worldMats[0];
         worldToPs = osg::Matrix::inverse(psToWorld);
     }
-    if (worldMats.size() > 1)
-        std::cerr << "Found multiple parent node paths in particle emitter, this is not correctly supported " << std::endl;
 
     const osg::Matrix& ltw = getLocalToWorldMatrix();
     osg::Matrix emitterToPs = ltw * worldToPs;

From 8bd16e4d5ab92035974b629349c6d8f3f5bbe977 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 18:58:19 +0100
Subject: [PATCH 337/765] Don't compute the world matrix multiple times

---
 apps/openmw/mwmechanics/character.cpp     | 12 ++++++------
 apps/openmw/mwrender/camera.cpp           |  6 +++---
 apps/openmw/mwrender/characterpreview.cpp |  6 +++---
 apps/openmw/mwrender/rotatecontroller.cpp |  6 +++---
 apps/openmw/mwrender/weaponanimation.cpp  | 12 ++++++------
 apps/openmw/mwworld/worldimp.cpp          |  6 +++---
 components/nifosg/particle.cpp            |  6 +++---
 components/resource/scenemanager.cpp      |  6 +++---
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 67707d0287..2f024838de 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2140,10 +2140,10 @@ void CharacterController::updateHeadTracking(float duration)
 
     if (!mHeadTrackTarget.isEmpty())
     {
-        osg::MatrixList mats = head->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = head->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Matrixf mat = mats[0];
+        osg::Matrixf mat = osg::computeLocalToWorld(nodepaths[0]);
         osg::Vec3f headPos = mat.getTrans();
 
         osg::Vec3f direction;
@@ -2154,9 +2154,9 @@ void CharacterController::updateHeadTracking(float duration)
                 node = anim->getNode("Bip01 Head");
             if (node != NULL)
             {
-                osg::MatrixList mats = node->getWorldMatrices();
-                if (mats.size())
-                    direction = mats[0].getTrans() - headPos;
+                osg::NodePathList nodepaths = node->getParentalNodePaths();
+                if (nodepaths.size())
+                    direction = osg::computeLocalToWorld(nodepaths[0]).getTrans() - headPos;
             }
             else
                 // no head node to look at, fall back to look at center of collision box
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 88934414f6..5a3f2bea36 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -88,10 +88,10 @@ namespace MWRender
         const osg::Node* trackNode = mTrackingNode;
         if (!trackNode)
             return osg::Vec3d();
-        osg::MatrixList mats = trackNode->getWorldMatrices();
-        if (!mats.size())
+        osg::NodePathList nodepaths = trackNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return osg::Vec3d();
-        const osg::Matrix& worldMat = mats[0];
+        osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
 
         osg::Vec3d position = worldMat.getTrans();
         if (!isFirstPerson())
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index b9f20f4ea4..201124447b 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -365,10 +365,10 @@ namespace MWRender
             traverse(node, nv);
 
             // Now update camera utilizing the updated head position
-            osg::MatrixList mats = mNodeToFollow->getWorldMatrices();
-            if (!mats.size())
+            osg::NodePathList nodepaths = mNodeToFollow->getParentalNodePaths();
+            if (!nodepaths.size())
                 return;
-            osg::Matrix worldMat = mats[0];
+            osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
             osg::Vec3 headOffset = worldMat.getTrans();
 
             cam->setViewMatrixAsLookAt(headOffset + mPosOffset, headOffset + mLookAtOffset, osg::Vec3(0,0,1));
diff --git a/apps/openmw/mwrender/rotatecontroller.cpp b/apps/openmw/mwrender/rotatecontroller.cpp
index 11f5b943d7..534cc74906 100644
--- a/apps/openmw/mwrender/rotatecontroller.cpp
+++ b/apps/openmw/mwrender/rotatecontroller.cpp
@@ -44,11 +44,11 @@ void RotateController::operator()(osg::Node *node, osg::NodeVisitor *nv)
 osg::Quat RotateController::getWorldOrientation(osg::Node *node)
 {
     // this could be optimized later, we just need the world orientation, not the full matrix
-    osg::MatrixList worldMats = node->getWorldMatrices(mRelativeTo);
+    osg::NodePathList nodepaths = node->getParentalNodePaths(mRelativeTo);
     osg::Quat worldOrient;
-    if (!worldMats.empty())
+    if (!nodepaths.empty())
     {
-        osg::Matrixf worldMat = worldMats[0];
+        osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
         worldOrient = worldMat.getRotate();
     }
     return worldOrient;
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 8fd294ccda..2627d3fc6a 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -114,10 +114,10 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
         osg::Node* weaponNode = getWeaponNode();
         if (!weaponNode)
             return;
-        osg::MatrixList mats = weaponNode->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = weaponNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Vec3f launchPos = mats[0].getTrans();
+        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
         float fThrownWeaponMinSpeed = gmst.find("fThrownWeaponMinSpeed")->getFloat();
         float fThrownWeaponMaxSpeed = gmst.find("fThrownWeaponMaxSpeed")->getFloat();
@@ -140,10 +140,10 @@ void WeaponAnimation::releaseArrow(MWWorld::Ptr actor, float attackStrength)
             return;
 
         osg::ref_ptr<osg::Node> ammoNode = mAmmunition->getNode();
-        osg::MatrixList mats = ammoNode->getWorldMatrices();
-        if (mats.empty())
+        osg::NodePathList nodepaths = ammoNode->getParentalNodePaths();
+        if (nodepaths.empty())
             return;
-        osg::Vec3f launchPos = mats[0].getTrans();
+        osg::Vec3f launchPos = osg::computeLocalToWorld(nodepaths[0]).getTrans();
 
         float fProjectileMinSpeed = gmst.find("fProjectileMinSpeed")->getFloat();
         float fProjectileMaxSpeed = gmst.find("fProjectileMaxSpeed")->getFloat();
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 98517f5432..f3d80ee67a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1051,9 +1051,9 @@ namespace MWWorld
             if(!node) node = anim->getNode("Bip01 Head");
             if(node)
             {
-                osg::MatrixList mats = node->getWorldMatrices();
-                if(!mats.empty())
-                    return mats[0];
+                osg::NodePathList nodepaths = node->getParentalNodePaths();
+                if(!nodepaths.empty())
+                    return osg::computeLocalToWorld(nodepaths[0]);
             }
         }
         return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 5003397222..be2e708fb6 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -261,10 +261,10 @@ void Emitter::emitParticles(double dt)
     osg::Matrix worldToPs;
 
     // maybe this could be optimized by halting at the lowest common ancestor of the particle and emitter nodes
-    osg::MatrixList worldMats = getParticleSystem()->getWorldMatrices();
-    if (!worldMats.empty())
+    osg::NodePathList partsysNodePaths = getParticleSystem()->getParentalNodePaths();
+    if (partsysNodePaths.size())
     {
-        const osg::Matrix psToWorld = worldMats[0];
+        osg::Matrix psToWorld = osg::computeLocalToWorld(partsysNodePaths[0]);
         worldToPs = osg::Matrix::inverse(psToWorld);
     }
 
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 9965e77679..113406ef68 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -69,10 +69,10 @@ namespace
 
         void transformInitialParticles(osgParticle::ParticleSystem* partsys, osg::Node* node)
         {
-            osg::MatrixList mats = node->getWorldMatrices();
-            if (mats.empty())
+            osg::NodePathList nodepaths = node->getParentalNodePaths();
+            if (nodepaths.empty())
                 return;
-            osg::Matrixf worldMat = mats[0];
+            osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
             worldMat.orthoNormalize(worldMat); // scale is already applied on the particle node
             for (int i=0; i<partsys->numParticles(); ++i)
             {

From 90a99991d1eaca47b192e01fc4eb5cef7ae249f1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 19:06:12 +0100
Subject: [PATCH 338/765] Use empty() instead of !size()

---
 apps/openmw/mwdialogue/keywordsearch.hpp  | 2 +-
 apps/openmw/mwgui/console.cpp             | 2 +-
 apps/openmw/mwgui/containeritemmodel.cpp  | 2 +-
 apps/openmw/mwmechanics/aiwander.cpp      | 2 +-
 apps/openmw/mwmechanics/character.cpp     | 2 +-
 apps/openmw/mwrender/characterpreview.cpp | 2 +-
 apps/openmw/mwrender/globalmap.cpp        | 2 +-
 apps/openmw/mwrender/localmap.cpp         | 2 +-
 apps/openmw/mwrender/water.cpp            | 2 +-
 apps/openmw/mwsound/soundmanagerimp.cpp   | 2 +-
 components/esm/loadtes3.cpp               | 4 ++--
 components/nifosg/nifloader.cpp           | 8 ++++----
 components/nifosg/particle.cpp            | 2 +-
 components/sceneutil/lightmanager.cpp     | 2 +-
 components/sceneutil/workqueue.cpp        | 2 +-
 components/shader/shadervisitor.cpp       | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index 3532dc22b8..f296f223fb 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -158,7 +158,7 @@ public:
         }
 
         // resolve overlapping keywords
-        while (matches.size())
+        while (!matches.empty())
         {
             int longestKeywordSize = 0;
             typename std::vector<Match>::iterator longestKeyword = matches.begin();
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 1777d86ad4..aeff7dc39a 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -240,7 +240,7 @@ namespace MWGui
             mCommandLine->setCaption(newCaption);
 
             // List candidates if repeatedly pressing tab
-            if (oldCaption == newCaption && matches.size())
+            if (oldCaption == newCaption && !matches.empty())
             {
                 int i = 0;
                 printOK("");
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index b2befc3ba8..1e4749695f 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -37,7 +37,7 @@ ContainerItemModel::ContainerItemModel(const std::vector<MWWorld::Ptr>& itemSour
     : mItemSources(itemSources)
     , mWorldItems(worldItems)
 {
-    assert (mItemSources.size());
+    assert (!mItemSources.empty());
 }
 
 ContainerItemModel::ContainerItemModel (const MWWorld::Ptr& source)
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 8231e572e8..27c7f6a93f 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -255,7 +255,7 @@ namespace MWMechanics
             // Construct a new path if there isn't one
             if(!storage.mPathFinder.isPathConstructed())
             {
-                if (mAllowedNodes.size())
+                if (!mAllowedNodes.empty())
                 {
                     setPathToAnAllowedNode(actor, storage, pos);
                 }
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2f024838de..0035ebb1ab 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -2155,7 +2155,7 @@ void CharacterController::updateHeadTracking(float duration)
             if (node != NULL)
             {
                 osg::NodePathList nodepaths = node->getParentalNodePaths();
-                if (nodepaths.size())
+                if (!nodepaths.empty())
                     direction = osg::computeLocalToWorld(nodepaths[0]).getTrans() - headPos;
             }
             else
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 201124447b..c858b57b71 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -366,7 +366,7 @@ namespace MWRender
 
             // Now update camera utilizing the updated head position
             osg::NodePathList nodepaths = mNodeToFollow->getParentalNodePaths();
-            if (!nodepaths.size())
+            if (nodepaths.empty())
                 return;
             osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
             osg::Vec3 headOffset = worldMat.getTrans();
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 9e8a545f85..b3b6cc3b0f 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -402,7 +402,7 @@ namespace MWRender
                 || bounds.mMinY > bounds.mMaxY)
             throw std::runtime_error("invalid map bounds");
 
-        if (!map.mImageData.size())
+        if (map.mImageData.empty())
             return;
 
         Files::IMemStream istream(&map.mImageData[0], map.mImageData.size());
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index be477735f8..8340ab78af 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -632,7 +632,7 @@ void LocalMap::MapSegment::initFogOfWar()
 void LocalMap::MapSegment::loadFogOfWar(const ESM::FogTexture &esm)
 {
     const std::vector<char>& data = esm.mImageData;
-    if (!data.size())
+    if (data.empty())
     {
         initFogOfWar();
         return;
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index a410527de3..0a379e50ac 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -566,7 +566,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
         textures.push_back(tex);
     }
 
-    if (!textures.size())
+    if (textures.empty())
         return;
 
     float fps = mFallback->getFallbackFloat("Water_SurfaceFPS");
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index e8ceaa40f5..ae8601594a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -366,7 +366,7 @@ namespace MWSound
         else
             filelist = mMusicFiles[mCurrentPlaylist];
 
-        if(!filelist.size())
+        if(filelist.empty())
             return;
 
         int i = Misc::Rng::rollDice(filelist.size());
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index df35a2579d..60d411fc63 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -53,14 +53,14 @@ void ESM::Header::load (ESMReader &esm)
     {
         esm.getSubHeader();
         mSCRD.resize(esm.getSubSize());
-        if (mSCRD.size())
+        if (!mSCRD.empty())
             esm.getExact(&mSCRD[0], mSCRD.size());
     }
     if (esm.isNextSub("SCRS"))
     {
         esm.getSubHeader();
         mSCRS.resize(esm.getSubSize());
-        if (mSCRS.size())
+        if (!mSCRS.empty())
             esm.getExact(&mSCRS[0], mSCRS.size());
     }
 }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0b49419ff1..975d6d6e07 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -962,7 +962,7 @@ namespace NifOsg
                 if (uvSet >= (int)data->uvlist.size())
                 {
                     std::cerr << "Warning: out of bounds UV set " << uvSet << " on TriShape \"" << triShape->name << "\" in " << mFilename << std::endl;
-                    if (data->uvlist.size())
+                    if (!data->uvlist.empty())
                         geometry->setTexCoordArray(textureStage, data->uvlist[0]);
                     continue;
                 }
@@ -1040,7 +1040,7 @@ namespace NifOsg
             triShapeToGeometry(triShape, morphGeom, parentNode, composite, boundTextures, animflags);
 
             const std::vector<Nif::NiMorphData::MorphData>& morphs = morpher->data.getPtr()->mMorphs;
-            if (!morphs.size())
+            if (morphs.empty())
                 return morphGeom;
             // Note we are not interested in morph 0, which just contains the original vertices
             for (unsigned int i = 1; i < morphs.size(); ++i)
@@ -1228,7 +1228,7 @@ namespace NifOsg
                 return NULL;
             }
 
-            if (!pixelData->mipmaps.size())
+            if (pixelData->mipmaps.empty())
                 return NULL;
 
             unsigned char* data = new unsigned char[pixelData->data.size()];
@@ -1274,7 +1274,7 @@ namespace NifOsg
 
         void handleTextureProperty(const Nif::NiTexturingProperty* texprop, osg::StateSet* stateset, SceneUtil::CompositeStateSetUpdater* composite, Resource::ImageManager* imageManager, std::vector<int>& boundTextures, int animflags)
         {
-            if (boundTextures.size())
+            if (!boundTextures.empty())
             {
                 // overriding a parent NiTexturingProperty, so remove what was previously bound
                 for (unsigned int i=0; i<boundTextures.size(); ++i)
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index be2e708fb6..935442c840 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -262,7 +262,7 @@ void Emitter::emitParticles(double dt)
 
     // maybe this could be optimized by halting at the lowest common ancestor of the particle and emitter nodes
     osg::NodePathList partsysNodePaths = getParticleSystem()->getParentalNodePaths();
-    if (partsysNodePaths.size())
+    if (!partsysNodePaths.empty())
     {
         osg::Matrix psToWorld = osg::computeLocalToWorld(partsysNodePaths[0]);
         worldToPs = osg::Matrix::inverse(psToWorld);
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 3950d0aea8..da29647c21 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -351,7 +351,7 @@ namespace SceneUtil
                     mLightList.push_back(&l);
             }
         }
-        if (mLightList.size())
+        if (!mLightList.empty())
         {
             unsigned int maxLights = static_cast<unsigned int> (8 - mLightManager->getStartLight());
 
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index bb1d1f1f70..bbd9f48401 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -87,7 +87,7 @@ osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
     {
         mCondition.wait(&mMutex);
     }
-    if (mQueue.size())
+    if (!mQueue.empty())
     {
         osg::ref_ptr<WorkItem> item = mQueue.front();
         mQueue.pop();
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 46d4edf44b..c882007599 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -103,7 +103,7 @@ namespace Shader
         if (mAllowedToModifyStateSets)
             writableStateSet = node.getStateSet();
         const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();
-        if (texAttributes.size())
+        if (!texAttributes.empty())
         {
             const osg::Texture* diffuseMap = NULL;
             const osg::Texture* normalMap = NULL;

From 5cdee454ef0d2ab6f39778a94b8f9f5121430f4b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 19:13:56 +0100
Subject: [PATCH 339/765] Fix degree/radians mixup (Fixes #3213)

---
 apps/openmw/mwscript/transformationextensions.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 64c126de12..95e2deee9b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -318,8 +318,8 @@ namespace MWScript
                         ptr = MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
                         dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                        float ax = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
-                        float ay = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                        float ax = ptr.getRefData().getPosition().rot[0];
+                        float ay = ptr.getRefData().getPosition().rot[1];
                         // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                         // except for when you position the player, then degrees must be used.
                         // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
@@ -374,14 +374,14 @@ namespace MWScript
                     }
                     dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(base,ptr);
 
-                    float ax = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[0]);
-                    float ay = osg::RadiansToDegrees(ptr.getRefData().getPosition().rot[1]);
+                    float ax = ptr.getRefData().getPosition().rot[0];
+                    float ay = ptr.getRefData().getPosition().rot[1];
                     // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
                     // except for when you position the player, then degrees must be used.
                     // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
                     if(ptr != MWMechanics::getPlayer())
                         zRot = zRot/60.0f;
-                    MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
+                    MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,osg::DegreesToRadians(zRot));
                     ptr.getClass().adjustPosition(ptr, false);
                 }
         };

From d05603c7fe0bf59b976b463cdca5fae05d17dc8c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Feb 2016 19:37:19 +0100
Subject: [PATCH 340/765] Directly apply On Target 'When Strikes' enchantments
 instead of launching a projectile (Fixes #3212)

---
 apps/openmw/mwclass/creature.cpp         | 13 +-------
 apps/openmw/mwclass/npc.cpp              | 13 +-------
 apps/openmw/mwmechanics/combat.cpp       | 40 ++++++++++++------------
 apps/openmw/mwmechanics/combat.hpp       |  2 ++
 apps/openmw/mwmechanics/spellcasting.cpp | 25 +++++++++------
 apps/openmw/mwmechanics/spellcasting.hpp |  3 +-
 6 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 0f021b5a2e..4a7af1099e 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -306,18 +306,7 @@ namespace MWClass
             }
 
             // Apply "On hit" enchanted weapons
-            std::string enchantmentName = !weapon.isEmpty() ? weapon.getClass().getEnchantment(weapon) : "";
-            if (!enchantmentName.empty())
-            {
-                const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                            enchantmentName);
-                if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
-                {
-                    MWMechanics::CastSpell cast(ptr, victim);
-                    cast.mHitPosition = hitPosition;
-                    cast.cast(weapon);
-                }
-            }
+            MWMechanics::applyOnStrikeEnchantment(ptr, victim, weapon, hitPosition);
         }
         else if (isBipedal(ptr))
         {
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 474985f7bb..4c825f63f7 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -637,18 +637,7 @@ namespace MWClass
             damage *= store.find("fCombatKODamageMult")->getFloat();
 
         // Apply "On hit" enchanted weapons
-        std::string enchantmentName = !weapon.isEmpty() ? weapon.getClass().getEnchantment(weapon) : "";
-        if (!enchantmentName.empty())
-        {
-            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                        enchantmentName);
-            if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
-            {
-                MWMechanics::CastSpell cast(ptr, victim);
-                cast.mHitPosition = hitPosition;
-                cast.cast(weapon);
-            }
-        }
+        MWMechanics::applyOnStrikeEnchantment(ptr, victim, weapon, hitPosition);
 
         MWMechanics::applyElementalShields(ptr, victim);
 
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index a01dc7079c..8d9d4cb3ac 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -29,29 +29,29 @@ float signedAngleRadians (const osg::Vec3f& v1, const osg::Vec3f& v2, const osg:
     return std::atan2((normal * (v1 ^ v2)), (v1 * v2));
 }
 
-bool applyEnchantment (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition)
-{
-    std::string enchantmentName = !object.isEmpty() ? object.getClass().getEnchantment(object) : "";
-    if (!enchantmentName.empty())
-    {
-        const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
-                    enchantmentName);
-        if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
-        {
-            MWMechanics::CastSpell cast(attacker, victim);
-            cast.mHitPosition = hitPosition;
-            cast.cast(object);
-            return true;
-        }
-    }
-    return false;
-}
-
 }
 
 namespace MWMechanics
 {
 
+    bool applyOnStrikeEnchantment (const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition)
+    {
+        std::string enchantmentName = !object.isEmpty() ? object.getClass().getEnchantment(object) : "";
+        if (!enchantmentName.empty())
+        {
+            const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(
+                        enchantmentName);
+            if (enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
+            {
+                MWMechanics::CastSpell cast(attacker, victim);
+                cast.mHitPosition = hitPosition;
+                cast.cast(object, false);
+                return true;
+            }
+        }
+        return false;
+    }
+
     bool blockMeleeAttack(const MWWorld::Ptr &attacker, const MWWorld::Ptr &blocker, const MWWorld::Ptr &weapon, float damage, float attackStrength)
     {
         if (!blocker.getClass().hasInventoryStore(blocker))
@@ -215,9 +215,9 @@ namespace MWMechanics
             damage *= gmst.find("fCombatKODamageMult")->getFloat();
 
         // Apply "On hit" effect of the weapon
-        bool appliedEnchantment = applyEnchantment(attacker, victim, weapon, hitPosition);
+        bool appliedEnchantment = applyOnStrikeEnchantment(attacker, victim, weapon, hitPosition);
         if (weapon != projectile)
-            appliedEnchantment = applyEnchantment(attacker, victim, projectile, hitPosition);
+            appliedEnchantment = applyOnStrikeEnchantment(attacker, victim, projectile, hitPosition);
 
         if (damage > 0)
             MWBase::Environment::get().getWorld()->spawnBloodEffect(victim, hitPosition);
diff --git a/apps/openmw/mwmechanics/combat.hpp b/apps/openmw/mwmechanics/combat.hpp
index ca78d7956e..7d0b3b78fc 100644
--- a/apps/openmw/mwmechanics/combat.hpp
+++ b/apps/openmw/mwmechanics/combat.hpp
@@ -6,6 +6,8 @@
 namespace MWMechanics
 {
 
+bool applyOnStrikeEnchantment(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim, const MWWorld::Ptr& object, const osg::Vec3f& hitPosition);
+
 /// @return can we block the attack?
 bool blockMeleeAttack (const MWWorld::Ptr& attacker, const MWWorld::Ptr& blocker, const MWWorld::Ptr& weapon, float damage, float attackStrength);
 
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 736d2a6161..8882d14a88 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -687,7 +687,7 @@ namespace MWMechanics
         throw std::runtime_error("ID type cannot be casted");
     }
 
-    bool CastSpell::cast(const MWWorld::Ptr &item)
+    bool CastSpell::cast(const MWWorld::Ptr &item, bool launchProjectile)
     {
         std::string enchantmentName = item.getClass().getEnchantment(item);
         if (enchantmentName.empty())
@@ -754,15 +754,20 @@ namespace MWMechanics
             inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Touch);
         }
 
-        std::string projectileModel;
-        std::string sound;
-        float speed = 0;
-        getProjectileInfo(enchantment->mEffects, projectileModel, sound, speed);
-        if (!projectileModel.empty())
-            MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
-                                                               false, enchantment->mEffects, mCaster, mSourceName,
-                                                                   // Not needed, enchantments can only be cast by actors
-                                                                   osg::Vec3f(1,0,0));
+        if (launchProjectile)
+        {
+            std::string projectileModel;
+            std::string sound;
+            float speed = 0;
+            getProjectileInfo(enchantment->mEffects, projectileModel, sound, speed);
+            if (!projectileModel.empty())
+                MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
+                                                                   false, enchantment->mEffects, mCaster, mSourceName,
+                                                                       // Not needed, enchantments can only be cast by actors
+                                                                       osg::Vec3f(1,0,0));
+        }
+        else if (!mTarget.isEmpty())
+            inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Target);
 
         return true;
     }
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 5b48bd4a8d..5bc6180580 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -81,7 +81,8 @@ namespace MWMechanics
         bool cast (const ESM::Spell* spell);
 
         /// @note mCaster must be an actor
-        bool cast (const MWWorld::Ptr& item);
+        /// @param launchProjectile If set to false, "on target" effects are directly applied instead of being launched as projectile originating from the caster.
+        bool cast (const MWWorld::Ptr& item, bool launchProjectile=true);
 
         /// @note mCaster must be an NPC
         bool cast (const ESM::Ingredient* ingredient);

From f4ed3894966d06657bb9cc66547a22193aca8faf Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 22 Feb 2016 15:48:25 -0500
Subject: [PATCH 341/765] InfoCondition autocompletion

---
 apps/opencs/model/world/data.cpp              |  2 +-
 .../model/world/idcompletionmanager.cpp       |  6 ++-
 .../view/world/idcompletiondelegate.cpp       | 51 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 6eccb74830..b54df596cb 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -271,7 +271,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
         new NestedChildColumn (Columns::ColumnId_InfoCondFunc, ColumnBase::Display_InfoCondFunc));
     // FIXME: don't have dynamic value enum delegate, use Display_String for now
     mTopicInfos.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_String));
+        new NestedChildColumn (Columns::ColumnId_InfoCondVar, ColumnBase::Display_InfoCondVar));
     mTopicInfos.getNestableColumn(index)->addColumn(
         new NestedChildColumn (Columns::ColumnId_InfoCondComp, ColumnBase::Display_InfoCondComp));
     mTopicInfos.getNestableColumn(index)->addColumn(
diff --git a/apps/opencs/model/world/idcompletionmanager.cpp b/apps/opencs/model/world/idcompletionmanager.cpp
index 20cd8652c6..7f3221342b 100644
--- a/apps/opencs/model/world/idcompletionmanager.cpp
+++ b/apps/opencs/model/world/idcompletionmanager.cpp
@@ -60,6 +60,10 @@ std::vector<CSMWorld::ColumnBase::Display> CSMWorld::IdCompletionManager::getDis
     {
         types.push_back(current->first);
     }
+
+    // Hack for Display_InfoCondVar
+    types.push_back(CSMWorld::ColumnBase::Display_InfoCondVar);
+
     return types;
 }
 
@@ -104,7 +108,7 @@ void CSMWorld::IdCompletionManager::generateCompleters(CSMWorld::Data &data)
                 QAbstractItemView *popup = new CSVWidget::CompleterPopup();
                 completer->setPopup(popup); // The completer takes ownership of the popup
                 completer->setMaxVisibleItems(10);
-                
+
                 mCompleters[current->first] = completer;
             }
         }
diff --git a/apps/opencs/view/world/idcompletiondelegate.cpp b/apps/opencs/view/world/idcompletiondelegate.cpp
index 970490828f..7f0f4ae460 100644
--- a/apps/opencs/view/world/idcompletiondelegate.cpp
+++ b/apps/opencs/view/world/idcompletiondelegate.cpp
@@ -1,6 +1,7 @@
 #include "idcompletiondelegate.hpp"
 
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/infoselectwrapper.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -27,6 +28,56 @@ QWidget *CSVWorld::IdCompletionDelegate::createEditor(QWidget *parent,
         return NULL;
     }
 
+    // The completer for InfoCondVar needs to return a completer based on the first column
+    if (display == CSMWorld::ColumnBase::Display_InfoCondVar)
+    {
+        QModelIndex sibling = index.sibling(index.row(), 0);
+        int conditionFunction = sibling.model()->data(sibling, Qt::EditRole).toInt();
+
+        switch (conditionFunction)
+        {
+            case CSMWorld::ConstInfoSelectWrapper::Function_Global:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_GlobalVariable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Journal:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Journal);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Item:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Dead:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotId:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Referenceable);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotFaction:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Faction);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotClass:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Class);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotRace:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Race);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotCell:
+            {
+                return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_Cell);
+            }
+            case CSMWorld::ConstInfoSelectWrapper::Function_Local:
+            case CSMWorld::ConstInfoSelectWrapper::Function_NotLocal:
+            {
+                return new CSVWidget::DropLineEdit(display, parent);
+            }
+            default: return 0; // The rest of them can't be edited anyway
+        }
+    }
+
     CSMWorld::IdCompletionManager &completionManager = getDocument().getIdCompletionManager();
     CSVWidget::DropLineEdit *editor = new CSVWidget::DropLineEdit(display, parent);
     editor->setCompleter(completionManager.getCompleter(display).get());

From 1ae402476dc6583c40f1ef8e618bd819579b9d4e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 22 Feb 2016 17:01:15 -0500
Subject: [PATCH 342/765] Journal verifier

---
 apps/opencs/CMakeLists.txt               |  2 +-
 apps/opencs/model/tools/journalcheck.cpp | 79 ++++++++++++++++++++++++
 apps/opencs/model/tools/journalcheck.hpp | 35 +++++++++++
 apps/opencs/model/tools/tools.cpp        |  3 +
 4 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 apps/opencs/model/tools/journalcheck.cpp
 create mode 100644 apps/opencs/model/tools/journalcheck.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index a657bade20..cbf89a7e50 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -42,7 +42,7 @@ opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
     startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
-    mergestages gmstcheck topicinfocheck
+    mergestages gmstcheck topicinfocheck journalcheck
     )
 
 opencs_hdrs_noqt (model/tools
diff --git a/apps/opencs/model/tools/journalcheck.cpp b/apps/opencs/model/tools/journalcheck.cpp
new file mode 100644
index 0000000000..bdd14ddf0d
--- /dev/null
+++ b/apps/opencs/model/tools/journalcheck.cpp
@@ -0,0 +1,79 @@
+#include "journalcheck.hpp"
+
+#include <set>
+#include <sstream>
+
+CSMTools::JournalCheckStage::JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue> &journals,
+    const CSMWorld::InfoCollection& journalInfos)
+    : mJournals(journals), mJournalInfos(journalInfos)
+{}
+
+int CSMTools::JournalCheckStage::setup()
+{
+    return mJournals.getSize();
+}
+
+void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<ESM::Dialogue> &journalRecord = mJournals.getRecord(stage);
+
+    if (journalRecord.isDeleted())
+        return;
+
+    const ESM::Dialogue &journal = journalRecord.get();
+    int statusNamedCount = 0;
+    int totalInfoCount = 0;
+    std::set<int> questIndices;
+
+    CSMWorld::InfoCollection::Range range = mJournalInfos.getTopicRange(journal.mId);
+
+    for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it)
+    {
+        const CSMWorld::Record<CSMWorld::Info> infoRecord = (*it);
+
+        if (infoRecord.isDeleted())
+            continue;
+
+        const CSMWorld::Info& journalInfo = infoRecord.get();
+
+        totalInfoCount += 1;
+
+        if (journalInfo.mQuestStatus == ESM::DialInfo::QS_Name)
+        {
+            statusNamedCount += 1;
+        }
+
+        if (journalInfo.mResponse.empty())
+        {
+            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
+
+            messages.add(id, "Journal Info: missing description", "", CSMDoc::Message::Severity_Warning);
+        }
+
+        std::pair<std::set<int>::iterator, bool> result = questIndices.insert(journalInfo.mData.mJournalIndex);
+
+        // Duplicate index
+        if (result.second == false)
+        {
+            CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
+
+            std::ostringstream stream;
+            stream << "Journal: duplicated quest index " << journalInfo.mData.mJournalIndex;
+
+            messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
+        }
+    }
+
+    if (totalInfoCount == 0)
+    {
+        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
+
+        messages.add(id, "Journal: no defined Journal Infos", "", CSMDoc::Message::Severity_Warning);
+    }
+    else if (statusNamedCount > 1)
+    {
+        CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
+
+        messages.add(id, "Journal: multiple infos with quest status \"Named\"", "", CSMDoc::Message::Severity_Error);
+    }
+}
diff --git a/apps/opencs/model/tools/journalcheck.hpp b/apps/opencs/model/tools/journalcheck.hpp
new file mode 100644
index 0000000000..c9f6196984
--- /dev/null
+++ b/apps/opencs/model/tools/journalcheck.hpp
@@ -0,0 +1,35 @@
+#ifndef CSM_TOOLS_JOURNALCHECK_H
+#define CSM_TOOLS_JOURNALCHECK_H
+
+#include <components/esm/loaddial.hpp>
+
+#include "../world/idcollection.hpp"
+#include "../world/infocollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMTools
+{
+    /// \brief VerifyStage: make sure that journal infos are good
+    class JournalCheckStage : public CSMDoc::Stage
+    {
+    public:
+
+        JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue>& journals,
+            const CSMWorld::InfoCollection& journalInfos);
+
+        virtual int setup();
+        ///< \return number of steps
+
+        virtual void perform(int stage, CSMDoc::Messages& messages);
+        ///< Messages resulting from this stage will be appended to \a messages
+
+    private:
+
+        const CSMWorld::IdCollection<ESM::Dialogue>& mJournals;
+        const CSMWorld::InfoCollection& mJournalInfos;
+
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index b6a04a236f..f538a716e6 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -31,6 +31,7 @@
 #include "mergeoperation.hpp"
 #include "gmstcheck.hpp"
 #include "topicinfocheck.hpp"
+#include "journalcheck.hpp"
 
 CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
 {
@@ -128,6 +129,8 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
                                                                   mData.getReferenceables().getDataSet(),
                                                                   mData.getResources (CSMWorld::UniversalId::Type_SoundsRes)));
 
+        mVerifierOperation->appendStage (new JournalCheckStage(mData.getJournals(), mData.getJournalInfos()));
+
         mVerifier.setOperation (mVerifierOperation);
     }
 

From 062410bd8c83fe4b2cd927c2c6d6f5031a175c8e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 23 Feb 2016 10:56:18 +0100
Subject: [PATCH 343/765] Don't incorrectly remove TexEnv state

---
 components/shader/shadervisitor.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index c882007599..b06ceafde2 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -142,13 +142,6 @@ namespace Shader
                             std::cerr << "ShaderVisitor encountered unknown texture " << texture << std::endl;
                     }
                 }
-                // remove state that has no effect when rendering with shaders
-                if (stateset->getTextureAttribute(unit, osg::StateAttribute::TEXENV))
-                {
-                    if (!writableStateSet)
-                        writableStateSet = getWritableStateSet(node);
-                    writableStateSet->removeTextureAttribute(unit, osg::StateAttribute::TEXENV);
-                }
             }
 
             if (mAutoUseNormalMaps && diffuseMap != NULL && normalMap == NULL)

From 5f4ace1bc21a8b55fbff9334ada1f175084022f6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 24 Feb 2016 21:06:41 +0100
Subject: [PATCH 344/765] Implement support for sphere map NiTextureEffects
 (Fixes #1827)

---
 components/nif/effect.cpp       |  22 ++++---
 components/nif/effect.hpp       |  20 +++++++
 components/nifosg/nifloader.cpp | 100 +++++++++++++++++++++++++++-----
 3 files changed, 120 insertions(+), 22 deletions(-)

diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp
index 79cd104312..7947e301d6 100644
--- a/components/nif/effect.cpp
+++ b/components/nif/effect.cpp
@@ -19,14 +19,20 @@ void NiTextureEffect::read(NIFStream *nif)
 {
     NiDynamicEffect::read(nif);
 
-    /*
-           3 x Vector4 = [1,0,0,0]
-           int = 2
-           int = 0 or 3
-           int = 2
-           int = 2
-        */
-    nif->skip(16*4);
+    // Model Projection Matrix
+    nif->skip(3 * 3 * sizeof(float));
+
+    // Model Projection Transform
+    nif->skip(3 * sizeof(float));
+
+    // Texture Filtering
+    nif->skip(4);
+
+    clamp = nif->getUInt();
+
+    textureType = (TextureType)nif->getUInt();
+
+    coordGenType = (CoordGenType)nif->getUInt();
 
     texture.read(nif);
 
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index 02647e4448..015809a68f 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -70,6 +70,26 @@ struct NiSpotLight : public NiPointLight
 struct NiTextureEffect : NiDynamicEffect
 {
     NiSourceTexturePtr texture;
+    unsigned int clamp;
+
+    enum TextureType
+    {
+        Projected_Light = 0,
+        Projected_Shadow = 1,
+        Environment_Map = 2,
+        Fog_Map = 3
+    };
+    TextureType textureType;
+
+    enum CoordGenType
+    {
+        World_Parallel = 0,
+        World_Perspective,
+        Sphere_Map,
+        Specular_Cube_Map,
+        Diffuse_Cube_Map
+    };
+    CoordGenType coordGenType;
 
     void read(NIFStream *nif);
     void post(NIFFile *nif);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 975d6d6e07..53a0cdc19b 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -6,6 +6,7 @@
 #include <osg/Geometry>
 #include <osg/Array>
 #include <osg/LOD>
+#include <osg/TexGen>
 
 // resource
 #include <components/misc/stringops.hpp>
@@ -36,6 +37,7 @@
 #include <osg/TexEnvCombine>
 
 #include <components/nif/node.hpp>
+#include <components/nif/effect.hpp>
 #include <components/sceneutil/util.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
@@ -439,6 +441,81 @@ namespace NifOsg
             return lod;
         }
 
+        osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
+        {
+            if (!st)
+                return NULL;
+
+            osg::ref_ptr<osg::Image> image;
+            if (!st->external && !st->data.empty())
+            {
+                image = handleInternalTexture(st->data.getPtr());
+            }
+            else
+            {
+                std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
+                image = imageManager->getImage(filename);
+            }
+            return image;
+        }
+
+        void handleEffect(const Nif::Node* nifNode, osg::Node* node, Resource::ImageManager* imageManager)
+        {
+            if (nifNode->recType != Nif::RC_NiTextureEffect)
+            {
+                std::cerr << "Unhandled effect " << nifNode->recName << " in " << mFilename << std::endl;
+                return;
+            }
+
+            const Nif::NiTextureEffect* textureEffect = static_cast<const Nif::NiTextureEffect*>(nifNode);
+            if (textureEffect->textureType != Nif::NiTextureEffect::Environment_Map)
+            {
+                std::cerr << "Unhandled NiTextureEffect type " << textureEffect->textureType << std::endl;
+                return;
+            }
+
+            osg::ref_ptr<osg::TexGen> texGen (new osg::TexGen);
+            switch (textureEffect->coordGenType)
+            {
+            case Nif::NiTextureEffect::World_Parallel:
+                texGen->setMode(osg::TexGen::OBJECT_LINEAR);
+                break;
+            case Nif::NiTextureEffect::World_Perspective:
+                texGen->setMode(osg::TexGen::EYE_LINEAR);
+                break;
+            case Nif::NiTextureEffect::Sphere_Map:
+                texGen->setMode(osg::TexGen::SPHERE_MAP);
+                break;
+            default:
+                std::cerr << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType << std::endl;
+                return;
+            }
+
+            osg::ref_ptr<osg::Texture2D> texture2d (new osg::Texture2D(handleSourceTexture(textureEffect->texture.getPtr(), imageManager)));
+            texture2d->setName("envMap");
+            unsigned int clamp = static_cast<unsigned int>(textureEffect->clamp);
+            int wrapT = (clamp) & 0x1;
+            int wrapS = (clamp >> 1) & 0x1;
+            texture2d->setWrap(osg::Texture::WRAP_S, wrapS ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+            texture2d->setWrap(osg::Texture::WRAP_T, wrapT ? osg::Texture::REPEAT : osg::Texture::CLAMP);
+
+            osg::ref_ptr<osg::TexEnvCombine> texEnv = new osg::TexEnvCombine;
+            texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+            texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setCombine_RGB(osg::TexEnvCombine::ADD);
+            texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+            texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
+
+            int texUnit = 3; // FIXME
+
+            osg::StateSet* stateset = node->getOrCreateStateSet();
+            stateset->setTextureAttributeAndModes(texUnit, texture2d, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texUnit, texGen, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+
+            stateset->addUniform(new osg::Uniform("envMapColor", osg::Vec4f(1,1,1,1)));
+        }
+
         osg::ref_ptr<osg::Node> handleNode(const Nif::Node* nifNode, osg::Group* parentNode, Resource::ImageManager* imageManager,
                                 std::vector<int> boundTextures, int animflags, int particleflags, bool skipMeshes, TextKeyMap* textKeys, osg::Node* rootNode=NULL)
         {
@@ -582,13 +659,18 @@ namespace NifOsg
             const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(nifNode);
             if(ninode)
             {
+                const Nif::NodeList &effects = ninode->effects;
+                for (size_t i = 0; i < effects.length(); ++i)
+                {
+                    if (!effects[i].empty())
+                        handleEffect(effects[i].getPtr(), node, imageManager);
+                }
+
                 const Nif::NodeList &children = ninode->children;
                 for(size_t i = 0;i < children.length();++i)
                 {
                     if(!children[i].empty())
-                    {
                         handleNode(children[i].getPtr(), node, imageManager, boundTextures, animflags, particleflags, skipMeshes, textKeys, rootNode);
-                    }
                 }
             }
 
@@ -707,8 +789,7 @@ namespace NifOsg
                             wrapT = inherit->getWrap(osg::Texture2D::WRAP_T);
                         }
 
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(imageManager->getImage(filename)));
+                        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D(handleSourceTexture(st.getPtr(), imageManager)));
                         texture->setWrap(osg::Texture::WRAP_S, wrapS);
                         texture->setWrap(osg::Texture::WRAP_T, wrapT);
                         textures.push_back(texture);
@@ -1318,17 +1399,8 @@ namespace NifOsg
                         std::cerr << "Warning: texture layer " << i << " is in use but empty in " << mFilename << std::endl;
                         continue;
                     }
-                    osg::ref_ptr<osg::Image> image;
                     const Nif::NiSourceTexture *st = tex.texture.getPtr();
-                    if (!st->external && !st->data.empty())
-                    {
-                        image = handleInternalTexture(st->data.getPtr());
-                    }
-                    else
-                    {
-                        std::string filename = Misc::ResourceHelpers::correctTexturePath(st->filename, imageManager->getVFS());
-                        image = imageManager->getImage(filename);
-                    }
+                    osg::ref_ptr<osg::Image> image = handleSourceTexture(st, imageManager);
 
                     unsigned int clamp = static_cast<unsigned int>(tex.clamp);
                     int wrapT = (clamp) & 0x1;

From 5e105da3ba538594ff8d4827a3f892587fe6ee74 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 24 Feb 2016 21:28:55 +0100
Subject: [PATCH 345/765] Generate texture coordinates per-pixel when normal
 map + environment map are used

---
 files/shaders/objects_fragment.glsl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index f572c24bb6..a648f84848 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -89,10 +89,22 @@ void main()
     gl_FragData[0].xyz += texture2D(emissiveMap, emissiveMapUV).xyz;
 #endif
 
+
 #if @envMap
+
+#if @normalMap
+    // if using normal map + env map, take advantage of per-pixel normals for texCoordGen
+    vec3 viewVec = normalize(passViewPos.xyz);
+    vec3 r = reflect( viewVec, viewNormal );
+    float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + (r.z+1.0)*(r.z+1.0) );
+    vec2 texCoordGen = vec2(r.x/m + 0.5, r.y/m + 0.5);
+    gl_FragData[0].xyz += texture2D(envMap, texCoordGen).xyz * envMapColor.xyz;
+#else
     gl_FragData[0].xyz += texture2D(envMap, envMapUV).xyz * envMapColor.xyz;
 #endif
 
+#endif
+
 #if @specularMap
     vec4 specTex = texture2D(specularMap, specularMapUV);
     float shininess = specTex.a * 255;

From 52f4c07648eb393759ee75a9e1f76cd797e221be Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 25 Feb 2016 20:35:58 +0100
Subject: [PATCH 346/765] Enable -Wundef

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 719df3e348..d0370c48df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -377,7 +377,7 @@ endif()
 
 # CXX Compiler settings
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c++98 -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -std=c++98 -pedantic -Wno-long-long")
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
         execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE CLANG_VERSION)

From a7b78b37f555f2707857ade92640ec03613d06ed Mon Sep 17 00:00:00 2001
From: sandstranger <sandstranger@gmail.com>
Date: Thu, 25 Feb 2016 22:39:18 +0300
Subject: [PATCH 347/765] disable opengles for Android by default

---
 CMakeLists.txt                           | 8 +++-----
 components/sdlutil/sdlgraphicswindow.cpp | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 719df3e348..67a2251533 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,10 +190,6 @@ if (WIN32)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
-if (ANDROID)
-    set(OPENGL_ES TRUE CACHE BOOL "enable opengl es support for android" FORCE)
-endif (ANDROID)
-
 option(OPENGL_ES "enable opengl es support" FALSE )
 
 if (OPENGL_ES)
@@ -566,7 +562,9 @@ endif(WIN32)
 # Extern
 add_subdirectory (extern/osg-ffmpeg-videoplayer)
 add_subdirectory (extern/oics)
-add_subdirectory (extern/osgQt)
+if (USE_QT)
+    add_subdirectory (extern/osgQt)
+endif()
 
 # Components
 add_subdirectory (components)
diff --git a/components/sdlutil/sdlgraphicswindow.cpp b/components/sdlutil/sdlgraphicswindow.cpp
index 66d53b0961..c2cf2536e3 100644
--- a/components/sdlutil/sdlgraphicswindow.cpp
+++ b/components/sdlutil/sdlgraphicswindow.cpp
@@ -91,7 +91,7 @@ void GraphicsWindowSDL2::init()
     SDL_Window *oldWin = SDL_GL_GetCurrentWindow();
     SDL_GLContext oldCtx = SDL_GL_GetCurrentContext();
    
-#ifdef OPENGL_ES
+#if defined(OPENGL_ES) || defined(ANDROID)
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
      SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);    

From cdccf03228065e2351d20291dae45ab1a2bf9a11 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 25 Feb 2016 21:32:42 +0100
Subject: [PATCH 348/765] Fix mismatched delete

---
 components/nifosg/nifloader.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 53a0cdc19b..ab6bfcff3f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1312,8 +1312,6 @@ namespace NifOsg
             if (pixelData->mipmaps.empty())
                 return NULL;
 
-            unsigned char* data = new unsigned char[pixelData->data.size()];
-            memcpy(data, &pixelData->data[0], pixelData->data.size());
             unsigned int width = 0;
             unsigned int height = 0;
 
@@ -1326,7 +1324,6 @@ namespace NifOsg
                 if (mipSize + mip.dataOffset > pixelData->data.size())
                 {
                     std::cerr << "Internal texture's mipmap data out of bounds" << std::endl;
-                    delete data;
                     return NULL;
                 }
 
@@ -1342,10 +1339,12 @@ namespace NifOsg
             if (width <= 0 || height <= 0)
             {
                 std::cerr << "Width and height must be non zero " << std::endl;
-                delete data;
                 return NULL;
             }
 
+            unsigned char* data = new unsigned char[pixelData->data.size()];
+            memcpy(data, &pixelData->data[0], pixelData->data.size());
+
             image->setImage(width, height, 1, pixelformat, pixelformat, GL_UNSIGNED_BYTE, data, osg::Image::USE_NEW_DELETE);
             image->setMipmapLevels(mipmapVector);
             image->flipVertical();

From f99cd15f00cbae69b91151d1fc5ae4fedb4abf22 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 26 Feb 2016 12:59:35 +0100
Subject: [PATCH 349/765] Vanilla-compatible activate / onActivate (Fixes
 #1629)

See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635
---
 apps/openmw/engine.cpp                      |  2 -
 apps/openmw/mwscript/interpretercontext.cpp | 30 +----------
 apps/openmw/mwscript/interpretercontext.hpp | 13 -----
 apps/openmw/mwscript/miscextensions.cpp     |  5 +-
 apps/openmw/mwworld/localscripts.cpp        | 12 +----
 apps/openmw/mwworld/localscripts.hpp        |  5 --
 apps/openmw/mwworld/refdata.cpp             | 56 +++++++++++++++++++--
 apps/openmw/mwworld/refdata.hpp             |  8 +++
 apps/openmw/mwworld/worldimp.cpp            | 15 ++----
 components/esm/objectstate.cpp              |  7 +++
 components/esm/objectstate.hpp              |  1 +
 11 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 5fd328022a..62457cae6d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -76,8 +76,6 @@ void OMW::Engine::executeLocalScripts()
             &script.second.getRefData().getLocals(), script.second);
         mEnvironment.getScriptManager()->run (script.first, interpreterContext);
     }
-
-    localScripts.setIgnore (MWWorld::Ptr());
 }
 
 void OMW::Engine::frame(float frametime)
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 7a6afe2e0c..79f856398c 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -138,8 +138,7 @@ namespace MWScript
 
     InterpreterContext::InterpreterContext (
         MWScript::Locals *locals, MWWorld::Ptr reference, const std::string& targetId)
-    : mLocals (locals), mReference (reference),
-      mActivationHandled (false), mTargetId (targetId)
+    : mLocals (locals), mReference (reference), mTargetId (targetId)
     {
         // If we run on a reference (local script, dialogue script or console with object
         // selected), store the ID of that reference store it so it can be inherited by
@@ -477,37 +476,10 @@ namespace MWScript
         return static_cast<float>(std::sqrt(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]));
     }
 
-    bool InterpreterContext::hasBeenActivated (const MWWorld::Ptr& ptr)
-    {
-        if (!mActivated.isEmpty() && mActivated==ptr)
-        {
-            mActivationHandled = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    bool InterpreterContext::hasActivationBeenHandled() const
-    {
-        return mActivationHandled;
-    }
-
-    void InterpreterContext::activate (const MWWorld::Ptr& ptr)
-    {
-        mActivated = ptr;
-        mActivationHandled = false;
-    }
-
     void InterpreterContext::executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor)
     {
         boost::shared_ptr<MWWorld::Action> action = (ptr.getClass().activate(ptr, actor));
         action->execute (actor);
-        if (mActivated == ptr)
-        {
-            mActivationHandled = true;
-            mActivated = MWWorld::Ptr();
-        }
     }
 
     float InterpreterContext::getSecondsPassed() const
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 3c43444cc7..fdd5aa55f6 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -27,9 +27,6 @@ namespace MWScript
             Locals *mLocals;
             mutable MWWorld::Ptr mReference;
 
-            MWWorld::Ptr mActivated;
-            bool mActivationHandled;
-
             std::string mTargetId;
 
             /// If \a id is empty, a reference the script is run from is returned or in case
@@ -131,16 +128,6 @@ namespace MWScript
             virtual float getDistance (const std::string& name, const std::string& id = "") const;
             ///< @note if \a id is empty, assumes an implicit reference
 
-            bool hasBeenActivated (const MWWorld::Ptr& ptr);
-            ///< \attention Calling this function for the right reference will mark the action as
-            /// been handled.
-
-            bool hasActivationBeenHandled() const;
-
-            void activate (const MWWorld::Ptr& ptr);
-            ///< Store reference acted upon. The actual execution of the action does not
-            /// take place here.
-
             void executeActivation(MWWorld::Ptr ptr, MWWorld::Ptr actor);
             ///< Execute the activation action for this ptr. If ptr is mActivated, mark activation as handled.
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 51f0c6c55b..9e415faaac 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -142,7 +142,7 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = context.getReference();
 
-                    runtime.push (context.hasBeenActivated (ptr));
+                    runtime.push (ptr.getRefData().onActivate());
                 }
         };
 
@@ -158,7 +158,8 @@ namespace MWScript
 
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    context.executeActivation(ptr, MWMechanics::getPlayer());
+                    if (ptr.getRefData().activateByScript())
+                        context.executeActivation(ptr, MWMechanics::getPlayer());
                 }
         };
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index f0174ac522..5f6d10b314 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -66,11 +66,6 @@ MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (s
     mIter = mScripts.end();
 }
 
-void MWWorld::LocalScripts::setIgnore (const ConstPtr& ptr)
-{
-    mIgnore = ptr;
-}
-
 void MWWorld::LocalScripts::startIteration()
 {
     mIter = mScripts.begin();
@@ -81,11 +76,8 @@ bool MWWorld::LocalScripts::getNext(std::pair<std::string, Ptr>& script)
     while (mIter!=mScripts.end())
     {
         std::list<std::pair<std::string, Ptr> >::iterator iter = mIter++;
-        if (mIgnore.isEmpty() || iter->second!=mIgnore)
-        {
-            script = *iter;
-            return true;
-        }
+        script = *iter;
+        return true;
     }
     return false;
 }
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 6c2118ea8e..c698daf043 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -17,17 +17,12 @@ namespace MWWorld
     {
             std::list<std::pair<std::string, Ptr> > mScripts;
             std::list<std::pair<std::string, Ptr> >::iterator mIter;
-            MWWorld::ConstPtr mIgnore;
             const MWWorld::ESMStore& mStore;
 
         public:
 
             LocalScripts (const MWWorld::ESMStore& store);
 
-            void setIgnore (const ConstPtr& ptr);
-            ///< Mark a single reference for ignoring during iteration over local scripts (will revoke
-            /// previous ignores).
-
             void startIteration();
             ///< Set the iterator to the begin of the script list.
 
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 1da6b53fa4..f85abcc32b 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -8,8 +8,18 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+namespace
+{
+enum RefDataFlags
+{
+    Flag_SuppressActivate = 1, // If set, activation will be suppressed and redirected to the OnActivate flag, which can then be handled by a script.
+    Flag_OnActivate = 2
+};
+}
+
 namespace MWWorld
 {
+
     void RefData::copy (const RefData& refData)
     {
         mBaseNode = refData.mBaseNode;
@@ -19,6 +29,7 @@ namespace MWWorld
         mPosition = refData.mPosition;
         mChanged = refData.mChanged;
         mDeletedByContentFile = refData.mDeletedByContentFile;
+        mFlags = refData.mFlags;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
@@ -32,7 +43,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false)
+    : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false), mFlags(0)
     {
         for (int i=0; i<3; ++i)
         {
@@ -45,7 +56,7 @@ namespace MWWorld
     : mBaseNode(0), mDeletedByContentFile(false), mEnabled (true),
       mCount (1), mPosition (cellRef.mPos),
       mCustomData (0),
-      mChanged(false) // Loading from ESM/ESP files -> assume unchanged
+      mChanged(false), mFlags(0) // Loading from ESM/ESP files -> assume unchanged
     {
     }
 
@@ -55,8 +66,12 @@ namespace MWWorld
       mCount (objectState.mCount),
       mPosition (objectState.mPosition),
       mCustomData (0),
-      mChanged(true) // Loading from a savegame -> assume changed
+      mChanged(true), mFlags(objectState.mFlags) // Loading from a savegame -> assume changed
     {
+        // "Note that the ActivationFlag_UseEnabled is saved to the reference,
+        // which will result in permanently suppressed activation if the reference script is removed.
+        // This occurred when removing the animated containers mod, and the fix in MCP is to reset UseEnabled to true on loading a game."
+        mFlags &= (~Flag_SuppressActivate);
     }
 
     RefData::RefData (const RefData& refData)
@@ -80,6 +95,7 @@ namespace MWWorld
         objectState.mEnabled = mEnabled;
         objectState.mCount = mCount;
         objectState.mPosition = mPosition;
+        objectState.mFlags = mFlags;
     }
 
     RefData& RefData::operator= (const RefData& refData)
@@ -219,4 +235,38 @@ namespace MWWorld
     {
         return mChanged;
     }
+
+    bool RefData::activate()
+    {
+        if (!(mFlags & Flag_SuppressActivate))
+            return true;
+        else
+        {
+            mFlags |= Flag_OnActivate;
+            return false;
+        }
+    }
+
+    bool RefData::onActivate()
+    {
+        mFlags |= Flag_SuppressActivate;
+
+        if (mFlags & Flag_OnActivate)
+        {
+            mFlags &= (~Flag_OnActivate);
+            return true;
+        }
+        return false;
+    }
+
+    bool RefData::activateByScript()
+    {
+        if (mFlags & Flag_SuppressActivate)
+        {
+            mFlags &= (~Flag_SuppressActivate);
+            return true;
+        }
+        else
+            return false;
+    }
 }
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index d87ffdb70e..9e662e430c 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -50,6 +50,8 @@ namespace MWWorld
 
             bool mChanged;
 
+            unsigned int mFlags;
+
         public:
 
             RefData();
@@ -122,6 +124,12 @@ namespace MWWorld
 
             const CustomData *getCustomData() const;
 
+            bool activate();
+
+            bool onActivate();
+
+            bool activateByScript();
+
             bool hasChanged() const;
             ///< Has this RefData changed since it was originally loaded?
     };
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f3d80ee67a..ea2069bd23 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3148,25 +3148,16 @@ namespace MWWorld
 
     void World::activate(const Ptr &object, const Ptr &actor)
     {
-        MWScript::InterpreterContext interpreterContext (&object.getRefData().getLocals(), object);
-        interpreterContext.activate (object);
-
-        std::string script = object.getClass().getScript (object);
-
         breakInvisibility(actor);
 
         if (mScriptsEnabled)
         {
-            if (!script.empty())
+            if (object.getRefData().activate())
             {
-                getLocalScripts().setIgnore (object);
-                MWBase::Environment::get().getScriptManager()->run (script, interpreterContext);
+                boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
+                action->execute (actor);
             }
-            if (!interpreterContext.hasActivationBeenHandled())
-                interpreterContext.executeActivation(object, actor);
         }
-        else
-            interpreterContext.executeActivation(object, actor);
     }
 
     struct ResetActorsVisitor
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index d736bab66d..b80c72ffef 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -27,6 +27,9 @@ void ESM::ObjectState::load (ESMReader &esm)
     if (esm.isNextSub("LROT"))
         esm.skipHSub(); // local rotation, no longer used
 
+    mFlags = 0;
+    esm.getHNOT (mFlags, "FLAG");
+
     // obsolete
     int unused;
     esm.getHNOT(unused, "LTIM");
@@ -55,6 +58,9 @@ void ESM::ObjectState::save (ESMWriter &esm, bool inInventory) const
     if (!inInventory)
         esm.writeHNT ("POS_", mPosition, 24);
 
+    if (mFlags != 0)
+        esm.writeHNT ("FLAG", mFlags);
+
     if (!mHasCustomState)
         esm.writeHNT ("HCUS", false);
 }
@@ -70,6 +76,7 @@ void ESM::ObjectState::blank()
         mPosition.pos[i] = 0;
         mPosition.rot[i] = 0;
     }
+    mFlags = 0;
     mHasCustomState = true;
 }
 
diff --git a/components/esm/objectstate.hpp b/components/esm/objectstate.hpp
index 215cb74baa..5b78074af3 100644
--- a/components/esm/objectstate.hpp
+++ b/components/esm/objectstate.hpp
@@ -24,6 +24,7 @@ namespace ESM
         unsigned char mEnabled;
         int mCount;
         ESM::Position mPosition;
+        unsigned int mFlags;
 
         // Is there any class-specific state following the ObjectState
         bool mHasCustomState;

From a97eae864d1cfaae4df1e4c5f3975bb5bfed3ef9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 26 Feb 2016 13:15:41 +0100
Subject: [PATCH 350/765] Fix the ObstacleCheck time step (Fixes #3211)

---
 apps/openmw/mwmechanics/obstacle.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 5815d8cbe3..11bbd1e31a 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -120,14 +120,10 @@ namespace MWMechanics
         const MWWorld::Class& cls = actor.getClass();
         ESM::Position pos = actor.getRefData().getPosition();
 
-        // actors can move at most 60 fps (the physics framerate).
-        // the max() can be removed if we implement physics interpolation.
-        float movementDuration = std::max(1/60.f, duration);
-
         if(mDistSameSpot == -1)
             mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor);
 
-        float distSameSpot = mDistSameSpot * movementDuration;
+        float distSameSpot = mDistSameSpot * duration;
 
         bool samePosition =  (osg::Vec2f(pos.pos[0], pos.pos[1]) - osg::Vec2f(mPrevX, mPrevY)).length2() <  distSameSpot * distSameSpot;
 

From d60786b5da5e0f8c8d66405466543cee0c83f03c Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Fri, 26 Feb 2016 07:41:17 -0500
Subject: [PATCH 351/765] Do not show cell markers for interior cells

---
 apps/opencs/view/render/cell.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index e7b135891a..641aeb0883 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -3,6 +3,7 @@
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
+#include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
 
 #include "../../model/world/idtable.hpp"
@@ -308,12 +309,19 @@ void CSVRender::Cell::setCellArrows (int mask)
 void CSVRender::Cell::setCellMarker()
 {
     bool cellExists = false;
+    bool isInteriorCell = false;
+
     int cellIndex = mData.getCells().searchId(mId);
     if (cellIndex > -1)
     {
-        cellExists = !mData.getCells().getRecord(cellIndex).isDeleted();
+        const CSMWorld::Record<CSMWorld::Cell>& cellRecord = mData.getCells().getRecord(cellIndex);
+        cellExists = !cellRecord.isDeleted();
+        isInteriorCell = cellRecord.get().mData.mFlags & ESM::Cell::Interior;
+    }
+
+    if (!isInteriorCell) {
+        mCellMarker.reset(new CellMarker(mCellNode, mCoordinates, cellExists));
     }
-    mCellMarker.reset(new CellMarker(mCellNode, mCoordinates, cellExists));
 }
 
 CSMWorld::CellCoordinates CSVRender::Cell::getCoordinates() const

From c3ef387208614527937f5b54d50ec864c59dba39 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 27 Feb 2016 12:53:07 +0100
Subject: [PATCH 352/765] Vanilla-compatible creature/NPC respawning (Fixes
 #2369, Fixes #2467)

---
 apps/openmw/mwbase/world.hpp              | 11 ++++----
 apps/openmw/mwclass/creature.cpp          | 13 +++++++++-
 apps/openmw/mwclass/creaturelevlist.cpp   | 23 ++++++++++++++++-
 apps/openmw/mwclass/npc.cpp               | 13 +++++++++-
 apps/openmw/mwmechanics/creaturestats.cpp | 10 ++++++++
 apps/openmw/mwmechanics/creaturestats.hpp |  4 +++
 apps/openmw/mwstate/statemanagerimp.cpp   |  3 ++-
 apps/openmw/mwworld/cellstore.cpp         | 31 ++++++++++++-----------
 apps/openmw/mwworld/scene.cpp             | 27 ++++++++++++--------
 apps/openmw/mwworld/scene.hpp             | 10 +++++---
 apps/openmw/mwworld/worldimp.cpp          | 20 +++++++--------
 apps/openmw/mwworld/worldimp.hpp          | 11 ++++----
 components/esm/creaturestats.cpp          |  5 ++++
 components/esm/creaturestats.hpp          |  1 +
 14 files changed, 128 insertions(+), 54 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 52697d6708..99cbe96541 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -231,15 +231,16 @@ namespace MWBase
 
             virtual float getTimeScaleFactor() const = 0;
 
-            virtual void changeToInteriorCell (const std::string& cellName,
-                const ESM::Position& position) = 0;
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent=true) = 0;
             ///< Move to interior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position) = 0;
+            virtual void changeToExteriorCell (const ESM::Position& position, bool changeEvent=true) = 0;
             ///< Move to exterior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true) = 0;
-            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent=true) = 0;
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             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.
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 4a7af1099e..182177d521 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -759,7 +759,18 @@ namespace MWClass
 
     void Creature::respawn(const MWWorld::Ptr &ptr) const
     {
-        if (isFlagBitSet(ptr, ESM::Creature::Respawn))
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+            return;
+
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+        static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+
+        if (isFlagBitSet(ptr, ESM::Creature::Respawn)
+                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index 0223fb6345..cd55d31a12 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -44,7 +44,28 @@ namespace MWClass
         ensureCustomData(ptr);
 
         CreatureLevListCustomData& customData = ptr.getRefData().getCustomData()->asCreatureLevListCustomData();
-        customData.mSpawn = true;
+        if (customData.mSpawn)
+            return;
+
+        MWWorld::Ptr creature = (customData.mSpawnActorId == -1) ? MWWorld::Ptr() : MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+        if (!creature.isEmpty())
+        {
+            const MWMechanics::CreatureStats& creatureStats = creature.getClass().getCreatureStats(creature);
+            if (creature.getRefData().getCount() == 0)
+                customData.mSpawn = true;
+            else if (creatureStats.isDead())
+            {
+                const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+                static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+                static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+                float delay = std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+                if (creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+                    customData.mSpawn = true;
+            }
+        }
+        else
+            customData.mSpawn = true;
     }
 
     void CreatureLevList::registerSelf()
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 4c825f63f7..ee0112ac94 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1292,7 +1292,18 @@ namespace MWClass
 
     void Npc::respawn(const MWWorld::Ptr &ptr) const
     {
-        if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn)
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        if (ptr.getRefData().getCount() > 0 && !creatureStats.isDead())
+            return;
+
+        const MWWorld::Store<ESM::GameSetting>& gmst = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+        static const float fCorpseRespawnDelay = gmst.find("fCorpseRespawnDelay")->getFloat();
+        static const float fCorpseClearDelay = gmst.find("fCorpseClearDelay")->getFloat();
+
+        float delay = ptr.getRefData().getCount() == 0 ? fCorpseClearDelay : std::min(fCorpseRespawnDelay, fCorpseClearDelay);
+
+        if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn
+                && creatureStats.getTimeOfDeath() + delay <= MWBase::Environment::get().getWorld()->getTimeStamp())
         {
             if (ptr.getCellRef().hasContentFile())
             {
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 6933c40a3f..50b1a89b3e 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -187,6 +187,9 @@ namespace MWMechanics
 
         if (index==0 && mDynamic[index].getCurrent()<1)
         {
+            if (!mDead)
+                mTimeOfDeath = MWBase::Environment::get().getWorld()->getTimeStamp();
+
             mDead = true;
 
             mDynamic[index].setModifier(0);
@@ -503,6 +506,7 @@ namespace MWMechanics
         state.mLevel = mLevel;
         state.mActorId = mActorId;
         state.mDeathAnimation = mDeathAnimation;
+        state.mTimeOfDeath = mTimeOfDeath.toEsm();
 
         mSpells.writeState(state.mSpells);
         mActiveSpells.writeState(state.mActiveSpells);
@@ -549,6 +553,7 @@ namespace MWMechanics
         mLevel = state.mLevel;
         mActorId = state.mActorId;
         mDeathAnimation = state.mDeathAnimation;
+        mTimeOfDeath = MWWorld::TimeStamp(state.mTimeOfDeath);
 
         mSpells.readState(state.mSpells);
         mActiveSpells.readState(state.mActiveSpells);
@@ -622,6 +627,11 @@ namespace MWMechanics
         mDeathAnimation = index;
     }
 
+    MWWorld::TimeStamp CreatureStats::getTimeOfDeath() const
+    {
+        return mTimeOfDeath;
+    }
+
     std::map<CreatureStats::SummonKey, int>& CreatureStats::getSummonedCreatureMap()
     {
         return mSummonedCreatures;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 46c5bab31e..734e873196 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -65,6 +65,8 @@ namespace MWMechanics
         // The index of the death animation that was played
         unsigned char mDeathAnimation;
 
+        MWWorld::TimeStamp mTimeOfDeath;
+
     public:
         typedef std::pair<int, std::string> SummonKey; // <ESM::MagicEffect index, spell ID>
     private:
@@ -259,6 +261,8 @@ namespace MWMechanics
         unsigned char getDeathAnimation() const;
         void setDeathAnimation(unsigned char index);
 
+        MWWorld::TimeStamp getTimeOfDeath() const;
+
         int getActorId();
         ///< Will generate an actor ID, if the actor does not have one yet.
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 89d31c4853..1bf97cb7ea 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -493,7 +493,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
         // but some mods may be using it as a reload detector.
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
 
-        // Do not trigger erroneous cellChanged events
+        // Since we passed "changeEvent=false" to changeCell, we shouldn't have triggered the cell change flag.
+        // But make sure the flag is cleared anyway in case it was set from an earlier game.
         MWBase::Environment::get().getWorld()->markCellAsUnchanged();
     }
     catch (const std::exception& e)
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index dcaa73e933..1572ae1b03 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -902,21 +902,22 @@ namespace MWWorld
                     Ptr ptr (&*it, this);
                     ptr.getClass().respawn(ptr);
                 }
-                for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
-                for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
-                for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
-                {
-                    Ptr ptr (&*it, this);
-                    ptr.getClass().respawn(ptr);
-                }
+            }
+
+            for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
+            {
+                Ptr ptr (&*it, this);
+                ptr.getClass().respawn(ptr);
+            }
+            for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
+            {
+                Ptr ptr (&*it, this);
+                ptr.getClass().respawn(ptr);
+            }
+            for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
+            {
+                Ptr ptr (&*it, this);
+                ptr.getClass().respawn(ptr);
             }
         }
     }
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index cd0954260d..63bb4758a3 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -240,7 +240,7 @@ namespace MWWorld
         mActiveCells.erase(*iter);
     }
 
-    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener)
+    void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn)
     {
         std::pair<CellStoreCollection::iterator, bool> result = mActiveCells.insert(cell);
 
@@ -270,12 +270,13 @@ namespace MWWorld
                 }
             }
 
-            cell->respawn();
-
             // register local scripts
             // do this before insertCell, to make sure we don't add scripts from levelled creature spawning twice
             MWBase::Environment::get().getWorld()->getLocalScripts().addCell (cell);
 
+            if (respawn)
+                cell->respawn();
+
             // ... then references. This is important for adjustPosition to work correctly.
             /// \todo rescale depending on the state of a new GMST
             insertCell (*cell, true, loadingListener);
@@ -329,7 +330,7 @@ namespace MWWorld
         }
     }
 
-    void Scene::changeCellGrid (int X, int Y)
+    void Scene::changeCellGrid (int X, int Y, bool changeEvent)
     {
         Loading::Listener* loadingListener = MWBase::Environment::get().getWindowManager()->getLoadingScreen();
         Loading::ScopedLoad load(loadingListener);
@@ -403,7 +404,7 @@ namespace MWWorld
                 {
                     CellStore *cell = MWBase::Environment::get().getWorld()->getExterior(x, y);
 
-                    loadCell (cell, loadingListener);
+                    loadCell (cell, loadingListener, changeEvent);
                 }
             }
         }
@@ -411,7 +412,8 @@ namespace MWWorld
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(X,Y);
         MWBase::Environment::get().getWindowManager()->changeCell(current);
 
-        mCellChanged = true;
+        if (changeEvent)
+            mCellChanged = true;
 
         mPreloader->updateCache(mRendering.getReferenceTime());
     }
@@ -484,7 +486,7 @@ namespace MWWorld
         return mActiveCells;
     }
 
-    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
+    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent)
     {
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
@@ -530,7 +532,7 @@ namespace MWWorld
         loadingListener->setProgressRange(refsToLoad);
 
         // Load cell.
-        loadCell (cell, loadingListener);
+        loadCell (cell, loadingListener, changeEvent);
 
         changePlayerCell(cell, position, true);
 
@@ -540,21 +542,24 @@ namespace MWWorld
         // Sky system
         MWBase::Environment::get().getWorld()->adjustSky();
 
-        mCellChanged = true; MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
+        if (changeEvent)
+            mCellChanged = true;
+
+        MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
 
         mPreloader->updateCache(mRendering.getReferenceTime());
     }
 
-    void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos)
+    void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         int x = 0;
         int y = 0;
 
         MWBase::Environment::get().getWorld()->positionToIndex (position.pos[0], position.pos[1], x, y);
 
-        changeCellGrid(x, y);
+        changeCellGrid(x, y, changeEvent);
 
         CellStore* current = MWBase::Environment::get().getWorld()->getExterior(x, y);
         changePlayerCell(current, position, adjustPlayerPos);
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 5c429f7c70..6cba9c3be7 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -71,7 +71,7 @@ namespace MWWorld
             void insertCell (CellStore &cell, bool rescale, Loading::Listener* loadingListener);
 
             // Load and unload cells as necessary to create a cell grid with "X" and "Y" in the center
-            void changeCellGrid (int X, int Y);
+            void changeCellGrid (int X, int Y, bool changeEvent = true);
 
             void getGridCenter(int& cellX, int& cellY);
 
@@ -90,7 +90,7 @@ namespace MWWorld
 
             void unloadCell (CellStoreCollection::iterator iter);
 
-            void loadCell (CellStore *cell, Loading::Listener* loadingListener);
+            void loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn);
 
             void playerMoved (const osg::Vec3f& pos);
 
@@ -103,11 +103,13 @@ namespace MWWorld
             bool hasCellChanged() const;
             ///< Has the set of active cells changed, since the last frame?
 
-            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position);
+            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent=true);
             ///< Move to interior cell.
+            /// @param changeEvent Set cellChanged flag?
 
-            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos);
+            void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
             ///< Move to exterior cell.
+            /// @param changeEvent Set cellChanged flag?
 
             void changeToVoid();
             ///< Change into a void
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ea2069bd23..e6b8f25a2c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -962,11 +962,11 @@ namespace MWWorld
         return mTimeScale->getFloat();
     }
 
-    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
+    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
-        if (mCurrentWorldSpace != cellName)
+        if (changeEvent && mCurrentWorldSpace != cellName)
         {
             // changed worldspace
             mProjectileManager->clear();
@@ -976,34 +976,34 @@ namespace MWWorld
         }
 
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToInteriorCell(cellName, position);
+        mWorldScene->changeToInteriorCell(cellName, position, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToExteriorCell (const ESM::Position& position)
+    void World::changeToExteriorCell (const ESM::Position& position, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
-        if (mCurrentWorldSpace != "sys::default") // FIXME
+        if (changeEvent && mCurrentWorldSpace != "sys::default") // FIXME
         {
             // changed worldspace
             mProjectileManager->clear();
             mRendering->notifyWorldSpaceChanged();
         }
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToExteriorCell(position, true);
+        mWorldScene->changeToExteriorCell(position, true, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange)
+    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent)
     {
-        if (!detectWorldSpaceChange)
+        if (!changeEvent)
             mCurrentWorldSpace = cellId.mWorldspace;
 
         if (cellId.mPaged)
-            changeToExteriorCell (position);
+            changeToExteriorCell (position, changeEvent);
         else
-            changeToInteriorCell (cellId.mWorldspace, position);
+            changeToInteriorCell (cellId.mWorldspace, position, changeEvent);
     }
 
     void World::markCellAsUnchanged()
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 6cc5cdc11c..ce5aa417ed 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -324,15 +324,16 @@ namespace MWWorld
 
             virtual float getTimeScaleFactor() const;
 
-            virtual void changeToInteriorCell (const std::string& cellName,
-                const ESM::Position& position);
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent = true);
             ///< Move to interior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position);
+            virtual void changeToExteriorCell (const ESM::Position& position, bool changeEvent = true);
             ///< Move to exterior cell.
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true);
-            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent=true);
+            ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const;
             ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index 9bdbf96685..2200297e25 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -87,6 +87,8 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mDeathAnimation = 0;
     esm.getHNOT (mDeathAnimation, "DANM");
 
+    esm.getHNOT (mTimeOfDeath, "DTIM");
+
     mSpells.load(esm);
     mActiveSpells.load(esm);
     mAiSequence.load(esm);
@@ -193,6 +195,9 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mDeathAnimation)
         esm.writeHNT ("DANM", mDeathAnimation);
 
+    if (mTimeOfDeath.mHour != 0 && mTimeOfDeath.mDay != 0)
+        esm.writeHNT ("DTIM", mTimeOfDeath);
+
     mSpells.save(esm);
     mActiveSpells.save(esm);
     mAiSequence.save(esm);
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index 426e890559..66b708e27c 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -57,6 +57,7 @@ namespace ESM
         bool mRecalcDynamicStats;
         int mDrawState;
         unsigned char mDeathAnimation;
+        ESM::TimeStamp mTimeOfDeath;
 
         int mLevel;
 

From f2f601b9588da34ca5e1bd4f6d130dc081755c1e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 27 Feb 2016 13:13:24 +0100
Subject: [PATCH 353/765] Implement corpse clearing (Fixes #2363)

---
 apps/openmw/mwworld/cellstore.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 1572ae1b03..e4bfde04a6 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -889,11 +889,19 @@ namespace MWWorld
         return mFogState.get();
     }
 
+    void clearCorpse(const MWWorld::Ptr& ptr)
+    {
+        const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+        static const float fCorpseClearDelay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCorpseClearDelay")->getFloat();
+        if (!ptr.getClass().isPersistent(ptr) && creatureStats.getTimeOfDeath() + fCorpseClearDelay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+            MWBase::Environment::get().getWorld()->deleteObject(ptr);
+    }
+
     void CellStore::respawn()
     {
         if (mState == State_Loaded)
         {
-            static int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->getInt();
+            static const int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->getInt();
             if (MWBase::Environment::get().getWorld()->getTimeStamp() - mLastRespawn > 24*30*iMonthsToRespawn)
             {
                 mLastRespawn = MWBase::Environment::get().getWorld()->getTimeStamp();
@@ -907,16 +915,19 @@ namespace MWWorld
             for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
             {
                 Ptr ptr (&*it, this);
+                clearCorpse(ptr);
                 ptr.getClass().respawn(ptr);
             }
             for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
             {
                 Ptr ptr (&*it, this);
+                clearCorpse(ptr);
                 ptr.getClass().respawn(ptr);
             }
             for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
             {
                 Ptr ptr (&*it, this);
+                // no need to clearCorpse, handled as part of mCreatures
                 ptr.getClass().respawn(ptr);
             }
         }

From 3a2dccad4b046f850481155682133c4b4f29bf83 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 27 Feb 2016 13:40:53 +0100
Subject: [PATCH 354/765] Implement 'Show' script instruction

---
 apps/openmw/mwscript/docs/vmformat.txt  |  2 +
 apps/openmw/mwscript/locals.cpp         | 26 ++++++++++
 apps/openmw/mwscript/locals.hpp         |  6 +++
 apps/openmw/mwscript/miscextensions.cpp | 66 +++++++++++++++++++++++++
 components/compiler/extensions0.cpp     |  1 +
 components/compiler/opcodes.hpp         |  2 +
 6 files changed, 103 insertions(+)

diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index 93219c649b..d3070c79b0 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -449,5 +449,7 @@ op 0x2000300: EnableLevelupMenu
 op 0x2000301: ToggleScripts
 op 0x2000302: Fixme
 op 0x2000303: Fixme, explicit
+op 0x2000304: Show
+op 0x2000305: Show, explicit
 
 opcodes 0x2000304-0x3ffffff unused
diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp
index ee93ea2e7b..5c9ffa07a7 100644
--- a/apps/openmw/mwscript/locals.cpp
+++ b/apps/openmw/mwscript/locals.cpp
@@ -97,6 +97,32 @@ namespace MWScript
         return 0;
     }
 
+    float Locals::getFloatVar(const std::string &script, const std::string &var)
+    {
+        ensure (script);
+
+        const Compiler::Locals& locals = MWBase::Environment::get().getScriptManager()->getLocals(script);
+        int index = locals.getIndex(var);
+        char type = locals.getType(var);
+        if(index != -1)
+        {
+            switch(type)
+            {
+                case 's':
+                    return mShorts.at (index);
+
+                case 'l':
+                    return mLongs.at (index);
+
+                case 'f':
+                    return mFloats.at(index);
+                default:
+                    return 0;
+            }
+        }
+        return 0;
+    }
+
     bool Locals::setVarByInt(const std::string& script, const std::string& var, int val)
     {
         ensure (script);
diff --git a/apps/openmw/mwscript/locals.hpp b/apps/openmw/mwscript/locals.hpp
index bb4df42bf5..d63411a942 100644
--- a/apps/openmw/mwscript/locals.hpp
+++ b/apps/openmw/mwscript/locals.hpp
@@ -51,6 +51,12 @@ namespace MWScript
             /// \note Locals will be automatically configured first, if necessary
             int getIntVar (const std::string& script, const std::string& var);
 
+            /// if var does not exist, returns 0
+            /// @note var needs to be in lowercase
+            ///
+            /// \note Locals will be automatically configured first, if necessary
+            float getFloatVar (const std::string& script, const std::string& var);
+
             /// \note If locals have not been configured yet, no data is written.
             ///
             /// \return Locals written?
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 9e415faaac..1830be693b 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -849,6 +849,70 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpShow : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                MWWorld::Ptr ptr = R()(runtime, false);
+                std::string var = runtime.getStringLiteral(runtime[0].mInteger);
+                runtime.pop();
+
+                std::stringstream output;
+
+                if (!ptr.isEmpty())
+                {
+                    const std::string& script = ptr.getClass().getScript(ptr);
+                    if (script.empty())
+                    {
+                        output << ptr.getCellRef().getRefId() << " has no script " << std::endl;
+                    }
+                    else
+                    {
+                        const Compiler::Locals& locals =
+                            MWBase::Environment::get().getScriptManager()->getLocals(script);
+                        char type = locals.getType(var);
+                        switch (type)
+                        {
+                        case 'l':
+                        case 's':
+                            output << ptr.getCellRef().getRefId() << "." << var << ": " << ptr.getRefData().getLocals().getIntVar(script, var);
+                            break;
+                        case 'f':
+                            output << ptr.getCellRef().getRefId() << "." << var << ": " << ptr.getRefData().getLocals().getFloatVar(script, var);
+                            break;
+                        default:
+                            output << "unknown local '" << var << "' for '" << ptr.getCellRef().getRefId() << "'";
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    char type = world->getGlobalVariableType (var);
+
+                    switch (type)
+                    {
+                    case 's':
+                        output << runtime.getContext().getGlobalShort (var);
+                        break;
+                    case 'l':
+                        output << runtime.getContext().getGlobalLong (var);
+                        break;
+                    case 'f':
+                        output << runtime.getContext().getGlobalFloat (var);
+                        break;
+                    default:
+                        output << "unknown global variable";
+                    }
+                }
+                runtime.getContext().report(output.str());
+            }
+        };
+
         template <class R>
         class OpShowVars : public Interpreter::Opcode0
         {
@@ -1266,6 +1330,8 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Misc::opcodeEnableTeleporting, new OpEnableTeleporting<true>);
             interpreter.installSegment5 (Compiler::Misc::opcodeShowVars, new OpShowVars<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeShowVarsExplicit, new OpShowVars<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Misc::opcodeShow, new OpShow<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Misc::opcodeShowExplicit, new OpShow<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleGodMode, new OpToggleGodMode);
             interpreter.installSegment5 (Compiler::Misc::opcodeToggleScripts, new OpToggleScripts);
             interpreter.installSegment5 (Compiler::Misc::opcodeDisableLevitation, new OpEnableLevitation<false>);
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 6916945f93..161d8adb42 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -300,6 +300,7 @@ namespace Compiler
             extensions.registerInstruction ("disableteleporting", "", opcodeDisableTeleporting);
             extensions.registerInstruction ("enableteleporting", "", opcodeEnableTeleporting);
             extensions.registerInstruction ("showvars", "", opcodeShowVars, opcodeShowVarsExplicit);
+            extensions.registerInstruction ("show", "c", opcodeShow, opcodeShowExplicit);
             extensions.registerInstruction ("sv", "", opcodeShowVars, opcodeShowVarsExplicit);
             extensions.registerInstruction("tgm", "", opcodeToggleGodMode);
             extensions.registerInstruction("togglegodmode", "", opcodeToggleGodMode);
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index feed5513e3..430b884847 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -277,6 +277,8 @@ namespace Compiler
         const int opcodeEnableTeleporting = 0x2000216;
         const int opcodeShowVars = 0x200021d;
         const int opcodeShowVarsExplicit = 0x200021e;
+        const int opcodeShow = 0x2000304;
+        const int opcodeShowExplicit = 0x2000305;
         const int opcodeToggleGodMode = 0x200021f;
         const int opcodeToggleScripts = 0x2000301;
         const int opcodeDisableLevitation = 0x2000220;

From 84e9d346efdd2fb3b4c2ca55af01381361f95992 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 28 Feb 2016 16:47:33 +0100
Subject: [PATCH 355/765] Remove duplicate include

---
 apps/openmw/mwrender/water.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 0a379e50ac..340c077854 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -9,7 +9,6 @@
 #include <osg/Geometry>
 #include <osg/Material>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Depth>
 #include <osg/ClipNode>
 #include <osg/MatrixTransform>
 #include <osg/FrontFace>

From fc3de3302e7b99d9a1bb695441f3f35b56845bd0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 28 Feb 2016 16:47:41 +0100
Subject: [PATCH 356/765] Create a collision shape for the default terrain

---
 apps/openmw/mwworld/scene.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 63bb4758a3..65348763a3 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -268,6 +268,13 @@ namespace MWWorld
                     mPhysics->addHeightField (data->mHeights, cell->getCell()->getGridX(), cell->getCell()->getGridY(),
                         worldsize / (verts-1), verts);
                 }
+                else
+                {
+                    static std::vector<float> defaultHeight;
+                    defaultHeight.resize(verts*verts, -2048.f);
+                    mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(),
+                            worldsize / (verts-1), verts);
+                }
             }
 
             // register local scripts

From 27577ce765d18e82098847901e3155524a5794e6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 28 Feb 2016 16:49:18 +0100
Subject: [PATCH 357/765] Add ESM::Land::DEFAULT_HEIGHT

---
 apps/openmw/mwworld/scene.cpp     | 2 +-
 components/esm/loadland.hpp       | 3 +++
 components/esmterrain/storage.cpp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 65348763a3..ba28294690 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -271,7 +271,7 @@ namespace MWWorld
                 else
                 {
                     static std::vector<float> defaultHeight;
-                    defaultHeight.resize(verts*verts, -2048.f);
+                    defaultHeight.resize(verts*verts, ESM::Land::DEFAULT_HEIGHT);
                     mPhysics->addHeightField (&defaultHeight[0], cell->getCell()->getGridX(), cell->getCell()->getGridY(),
                             worldsize / (verts-1), verts);
                 }
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 8a8d6fdd2f..a2bf1573e9 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -46,6 +46,9 @@ struct Land
         DATA_VTEX = 16
     };
 
+    // default height to use in case there is no Land record
+    static const int DEFAULT_HEIGHT = -2048;
+
     // number of vertices per side
     static const int LAND_SIZE = 65;
 
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 68b32cf2a1..86d1e08e64 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -16,7 +16,7 @@
 namespace ESMTerrain
 {
 
-    const float defaultHeight = -2048;
+    const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
     Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
         : mVFS(vfs)

From 04d51d58713aa8e3294d3f3c023a524592c112ff Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 13:25:09 +0100
Subject: [PATCH 358/765] Always update the ingredient icons (Fixes #3220)

---
 apps/openmw/mwgui/alchemywindow.cpp | 43 +++++++++--------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 3299846b7e..61a0efc460 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -67,46 +67,29 @@ namespace MWGui
     {
         MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ());
 
-        if (result == MWMechanics::Alchemy::Result_NoName)
+        switch (result)
         {
+        case MWMechanics::Alchemy::Result_NoName:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage37}");
-            return;
-        }
-
-        // check if mortar & pestle is available (always needed)
-        if (result == MWMechanics::Alchemy::Result_NoMortarAndPestle)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_NoMortarAndPestle:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage45}");
-            return;
-        }
-
-        // make sure 2 or more ingredients were selected
-        if (result == MWMechanics::Alchemy::Result_LessThanTwoIngredients)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_LessThanTwoIngredients:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage6a}");
-            return;
-        }
-
-        if (result == MWMechanics::Alchemy::Result_NoEffects)
-        {
-            MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage8}");
-            MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
-            return;
-        }
-
-        if (result == MWMechanics::Alchemy::Result_Success)
-        {
+            break;
+        case MWMechanics::Alchemy::Result_Success:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sPotionSuccess}");
             MWBase::Environment::get().getSoundManager()->playSound("potion success", 1.f, 1.f);
-        }
-        else if (result == MWMechanics::Alchemy::Result_RandomFailure)
-        {
-            // potion failed
+            break;
+        case MWMechanics::Alchemy::Result_NoEffects:
+        case MWMechanics::Alchemy::Result_RandomFailure:
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage8}");
             MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
+            break;
         }
 
-        // reduce count of the ingredients
+        // remove ingredient slots that have been fully used up
         for (int i=0; i<4; ++i)
             if (mIngredients[i]->isUserString("ToolTipType"))
             {

From be2f20f564e1c27537dc693464b377887e71b997 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 16:54:00 +0100
Subject: [PATCH 359/765] PlaceAt: attempt to select a safe spawn location
 (Fixes #2515, Fixes #1384, Fixes #2925)

---
 .../mwscript/transformationextensions.cpp     | 75 ++++++++++++-------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 95e2deee9b..9c950c8ff8 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -492,6 +492,15 @@ namespace MWScript
         {
             public:
 
+                osg::Vec3f getSpawnPosition(const osg::Vec3f& origin, const osg::Quat& orientation, int direction, float distance)
+                {
+                    if(direction == 0) return origin + (orientation * osg::Vec3f(0,1,0)) * distance;
+                    else if(direction == 1) return origin - (orientation * osg::Vec3f(0,1,0)) * distance;
+                    else if(direction == 2) return origin - (orientation * osg::Vec3f(1,0,0)) * distance;
+                    else if(direction == 3) return origin + (orientation * osg::Vec3f(1,0,0)) * distance;
+                    else return origin;
+                }
+
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr actor = pc
@@ -514,40 +523,52 @@ namespace MWScript
                     if (!actor.isInCell())
                         throw std::runtime_error ("actor is not in a cell");
 
+                    ESM::Position ipos = actor.getRefData().getPosition();
+                    osg::Vec3f pos(ipos.asVec3());
+                    osg::Quat rot(ipos.rot[2], osg::Vec3f(0,0,-1));
+
+                    for (int i=0; i<4; ++i)
+                    {
+                        // check if spawn point is safe, fall back to another direction if not
+                        osg::Vec3f spawnPoint = getSpawnPosition(ipos.asVec3(), rot, direction, distance);
+                        spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
+
+                        if (!MWBase::Environment::get().getWorld()->castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),
+                                                                           pos.x(), pos.y(), pos.z() + 20))
+                        {
+                            // safe
+                            ipos.pos[0] = spawnPoint.x();
+                            ipos.pos[1] = spawnPoint.y();
+                            ipos.pos[2] = spawnPoint.z();
+                            break;
+                        }
+                        direction = (direction+1) % 4;
+                    }
+
+                    if (actor.getClass().isActor())
+                    {
+                        // TODO: should this depend on the 'direction' parameter?
+                        ipos.rot[0] = 0;
+                        ipos.rot[1] = 0;
+                        ipos.rot[2] = 0;
+                    }
+                    else
+                    {
+                        ipos.rot[0] = actor.getRefData().getPosition().rot[0];
+                        ipos.rot[1] = actor.getRefData().getPosition().rot[1];
+                        ipos.rot[2] = actor.getRefData().getPosition().rot[2];
+                    }
+
+
                     for (int i=0; i<count; ++i)
                     {
-                        ESM::Position ipos = actor.getRefData().getPosition();
-                        osg::Vec3f pos(ipos.asVec3());
-                        osg::Quat rot(ipos.rot[2], osg::Vec3f(0,0,-1));
-                        if(direction == 0) pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-                        else if(direction == 1) pos = pos - (rot * osg::Vec3f(0,1,0)) * distance;
-                        else if(direction == 2) pos = pos - (rot * osg::Vec3f(1,0,0)) * distance;
-                        else if(direction == 3) pos = pos + (rot * osg::Vec3f(1,0,0)) * distance;
-                        else throw std::runtime_error ("direction must be 0,1,2 or 3");
-
-                        ipos.pos[0] = pos.x();
-                        ipos.pos[1] = pos.y();
-                        ipos.pos[2] = pos.z();
-
-                        if (actor.getClass().isActor())
-                        {
-                            // TODO: should this depend on the 'direction' parameter?
-                            ipos.rot[0] = 0;
-                            ipos.rot[1] = 0;
-                            ipos.rot[2] = 0;
-                        }
-                        else
-                        {
-                            ipos.rot[0] = actor.getRefData().getPosition().rot[0];
-                            ipos.rot[1] = actor.getRefData().getPosition().rot[1];
-                            ipos.rot[2] = actor.getRefData().getPosition().rot[2];
-                        }
                         // create item
                         MWWorld::CellStore* store = actor.getCell();
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
                         ref.getPtr().getCellRef().setPosition(ipos);
 
-                        MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        placed.getClass().adjustPosition(placed, true); // snap to ground
                     }
                 }
         };

From 11f00e3aa961fb9f9554df406e1840f0fe87b05c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:05:18 +0100
Subject: [PATCH 360/765] Rename safePlaceObject to placeObject

---
 apps/openmw/mwbase/world.hpp                      | 2 +-
 apps/openmw/mwclass/creaturelevlist.cpp           | 2 +-
 apps/openmw/mwmechanics/summoning.cpp             | 2 +-
 apps/openmw/mwscript/transformationextensions.cpp | 6 +++---
 apps/openmw/mwworld/worldimp.cpp                  | 4 ++--
 apps/openmw/mwworld/worldimp.hpp                  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 99cbe96541..566853fc74 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -278,7 +278,7 @@ namespace MWBase
 
             virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0;
 
-            virtual MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
+            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& 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)
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index cd55d31a12..e0e890b604 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -120,7 +120,7 @@ namespace MWClass
             const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             MWWorld::ManualRef ref(store, id);
             ref.getPtr().getCellRef().setPosition(ptr.getCellRef().getPosition());
-            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
+            MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(), ptr.getCell() , ptr.getCellRef().getPosition());
             customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
             customData.mSpawn = false;
         }
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 636e199074..7c4d077e61 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -147,7 +147,7 @@ namespace MWMechanics
                         summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
                         creatureActorId = summonedCreatureStats.getActorId();
 
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,ipos);
 
                         MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(placed);
                         if (anim)
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 9c950c8ff8..7d9877168a 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -434,7 +434,7 @@ namespace MWScript
                         pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
                         ref.getPtr().getCellRef().setPosition(pos);
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,pos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                         placed.getClass().adjustPosition(placed, true);
                     }
                 }
@@ -482,7 +482,7 @@ namespace MWScript
                     pos.rot[2] = osg::DegreesToRadians(zRotDegrees);
                     MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID);
                     ref.getPtr().getCellRef().setPosition(pos);
-                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,pos);
+                    MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,pos);
                     placed.getClass().adjustPosition(placed, true);
                 }
         };
@@ -567,7 +567,7 @@ namespace MWScript
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
                         ref.getPtr().getCellRef().setPosition(ipos);
 
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,ipos);
                         placed.getClass().adjustPosition(placed, true); // snap to ground
                     }
                 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e6b8f25a2c..3a4b0109c7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1325,7 +1325,7 @@ namespace MWWorld
         rotateObjectImp(ptr, osg::Vec3f(x, y, z), adjust);
     }
 
-    MWWorld::Ptr World::safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos)
+    MWWorld::Ptr World::placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos)
     {
         return copyObjectToCell(ptr,cell,pos,ptr.getRefData().getCount(),false);
     }
@@ -3041,7 +3041,7 @@ namespace MWWorld
             MWWorld::ManualRef ref(getStore(), selectedCreature, 1);
             ref.getPtr().getCellRef().setPosition(ipos);
 
-            safePlaceObject(ref.getPtr(), cell, ipos);
+            placeObject(ref.getPtr(), cell, ipos);
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index ce5aa417ed..9f21135e54 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -367,8 +367,8 @@ namespace MWWorld
             /// \param adjust indicates rotation should be set or adjusted
             virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false);
 
-            virtual MWWorld::Ptr safePlaceObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos);
-            ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr.
+            virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos);
+            ///< place an object. Makes a copy of the Ptr.
 
             virtual float getMaxActivationDistance();
 

From 6df71f6250f7a06c4dfc93d18d91025ce27d3526 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:16:33 +0100
Subject: [PATCH 361/765] Factor out safePlaceObject function

---
 apps/openmw/mwbase/world.hpp                  |  6 ++-
 .../mwscript/transformationextensions.cpp     | 51 +------------------
 apps/openmw/mwworld/worldimp.cpp              | 37 ++++++++++++++
 apps/openmw/mwworld/worldimp.hpp              |  6 ++-
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 566853fc74..de5f15d64f 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -279,7 +279,11 @@ namespace MWBase
             virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0;
 
             virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos) = 0;
-            ///< place an object in a "safe" location (ie not in the void, etc).
+            ///< Place an object. Makes a copy of the Ptr.
+
+            virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance) = 0;
+            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
+            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
 
             virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
                 const = 0;
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 7d9877168a..e9e13e74f6 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -492,15 +492,6 @@ namespace MWScript
         {
             public:
 
-                osg::Vec3f getSpawnPosition(const osg::Vec3f& origin, const osg::Quat& orientation, int direction, float distance)
-                {
-                    if(direction == 0) return origin + (orientation * osg::Vec3f(0,1,0)) * distance;
-                    else if(direction == 1) return origin - (orientation * osg::Vec3f(0,1,0)) * distance;
-                    else if(direction == 2) return origin - (orientation * osg::Vec3f(1,0,0)) * distance;
-                    else if(direction == 3) return origin + (orientation * osg::Vec3f(1,0,0)) * distance;
-                    else return origin;
-                }
-
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr actor = pc
@@ -523,52 +514,12 @@ namespace MWScript
                     if (!actor.isInCell())
                         throw std::runtime_error ("actor is not in a cell");
 
-                    ESM::Position ipos = actor.getRefData().getPosition();
-                    osg::Vec3f pos(ipos.asVec3());
-                    osg::Quat rot(ipos.rot[2], osg::Vec3f(0,0,-1));
-
-                    for (int i=0; i<4; ++i)
-                    {
-                        // check if spawn point is safe, fall back to another direction if not
-                        osg::Vec3f spawnPoint = getSpawnPosition(ipos.asVec3(), rot, direction, distance);
-                        spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
-
-                        if (!MWBase::Environment::get().getWorld()->castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),
-                                                                           pos.x(), pos.y(), pos.z() + 20))
-                        {
-                            // safe
-                            ipos.pos[0] = spawnPoint.x();
-                            ipos.pos[1] = spawnPoint.y();
-                            ipos.pos[2] = spawnPoint.z();
-                            break;
-                        }
-                        direction = (direction+1) % 4;
-                    }
-
-                    if (actor.getClass().isActor())
-                    {
-                        // TODO: should this depend on the 'direction' parameter?
-                        ipos.rot[0] = 0;
-                        ipos.rot[1] = 0;
-                        ipos.rot[2] = 0;
-                    }
-                    else
-                    {
-                        ipos.rot[0] = actor.getRefData().getPosition().rot[0];
-                        ipos.rot[1] = actor.getRefData().getPosition().rot[1];
-                        ipos.rot[2] = actor.getRefData().getPosition().rot[2];
-                    }
-
-
                     for (int i=0; i<count; ++i)
                     {
                         // create item
-                        MWWorld::CellStore* store = actor.getCell();
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), itemID, 1);
-                        ref.getPtr().getCellRef().setPosition(ipos);
 
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,ipos);
-                        placed.getClass().adjustPosition(placed, true); // snap to ground
+                        MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), actor, actor.getCell(), direction, distance);
                     }
                 }
         };
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3a4b0109c7..be2baf7374 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1330,6 +1330,43 @@ namespace MWWorld
         return copyObjectToCell(ptr,cell,pos,ptr.getRefData().getCount(),false);
     }
 
+    MWWorld::Ptr World::safePlaceObject(const ConstPtr &ptr, const ConstPtr &referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance)
+    {
+        ESM::Position ipos = referenceObject.getRefData().getPosition();
+        osg::Vec3f pos(ipos.asVec3());
+        osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1));
+
+        for (int i=0; i<4; ++i)
+        {
+            // check if spawn point is safe, fall back to another direction if not
+            osg::Vec3f spawnPoint = pos;
+            if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
+            else if(direction == 1) spawnPoint = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
+            else if(direction == 2) spawnPoint = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
+            else if(direction == 3) spawnPoint = pos + (orientation * osg::Vec3f(1,0,0)) * distance;
+            spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
+
+            if (!castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),
+                                                               pos.x(), pos.y(), pos.z() + 20))
+            {
+                // safe
+                ipos.pos[0] = spawnPoint.x();
+                ipos.pos[1] = spawnPoint.y();
+                ipos.pos[2] = spawnPoint.z();
+                break;
+            }
+            direction = (direction+1) % 4;
+        }
+
+        ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];
+        ipos.rot[1] = referenceObject.getRefData().getPosition().rot[1];
+        ipos.rot[2] = referenceObject.getRefData().getPosition().rot[2];
+
+        MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getRefData().getCount(), false);
+        placed.getClass().adjustPosition(placed, true); // snap to ground
+        return placed;
+    }
+
     void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const
     {
         const int cellSize = 8192;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 9f21135e54..d1298a39be 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -368,7 +368,11 @@ namespace MWWorld
             virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false);
 
             virtual MWWorld::Ptr placeObject(const MWWorld::ConstPtr& ptr, MWWorld::CellStore* cell, ESM::Position pos);
-            ///< place an object. Makes a copy of the Ptr.
+            ///< Place an object. Makes a copy of the Ptr.
+
+            virtual MWWorld::Ptr safePlaceObject (const MWWorld::ConstPtr& ptr, const MWWorld::ConstPtr& referenceObject, MWWorld::CellStore* referenceCell, int direction, float distance);
+            ///< Place an object in a safe place next to \a referenceObject. \a direction and \a distance specify the wanted placement
+            /// relative to \a referenceObject (but the object may be placed somewhere else if the wanted location is obstructed).
 
             virtual float getMaxActivationDistance();
 

From be62ae758a706bcbabf847424686bf1c7894987d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:26:52 +0100
Subject: [PATCH 362/765] Fall back to sides first

---
 apps/openmw/mwworld/worldimp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index be2baf7374..6d7ceee432 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1336,8 +1336,11 @@ namespace MWWorld
         osg::Vec3f pos(ipos.asVec3());
         osg::Quat orientation(ipos.rot[2], osg::Vec3f(0,0,-1));
 
+        int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
+
         for (int i=0; i<4; ++i)
         {
+            direction = fallbackDirections[i];
             // check if spawn point is safe, fall back to another direction if not
             osg::Vec3f spawnPoint = pos;
             if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
@@ -1355,7 +1358,6 @@ namespace MWWorld
                 ipos.pos[2] = spawnPoint.z();
                 break;
             }
-            direction = (direction+1) % 4;
         }
 
         ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];

From 7485abe5c311a7e66f05c2382debdb888a57c8fb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:27:07 +0100
Subject: [PATCH 363/765] Use safePlaceObject for summoned creature spawning

---
 apps/openmw/mwmechanics/summoning.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 7c4d077e61..cf77714855 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -114,31 +114,16 @@ namespace MWMechanics
             bool found = creatureMap.find(std::make_pair(it->first, it->second)) != creatureMap.end();
             if (!found)
             {
-                ESM::Position ipos = mActor.getRefData().getPosition();
-                osg::Vec3f pos(ipos.asVec3());
-
-                osg::Quat rot (-ipos.rot[2], osg::Vec3f(0,0,1));
-                const float distance = 50;
-                pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-                ipos.pos[0] = pos.x();
-                ipos.pos[1] = pos.y();
-                ipos.pos[2] = pos.z();
-                ipos.rot[0] = 0;
-                ipos.rot[1] = 0;
-                ipos.rot[2] = 0;
-
                 const std::string& creatureGmst = summonMap[it->first];
                 std::string creatureID =
                         MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(creatureGmst)->getString();
 
                 if (!creatureID.empty())
                 {
-                    MWWorld::CellStore* store = mActor.getCell();
                     int creatureActorId = -1;
                     try
                     {
                         MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), creatureID, 1);
-                        ref.getPtr().getCellRef().setPosition(ipos);
 
                         MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
 
@@ -147,7 +132,7 @@ namespace MWMechanics
                         summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
                         creatureActorId = summonedCreatureStats.getActorId();
 
-                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(),store,ipos);
+                        MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), mActor, mActor.getCell(), 0, 120.f);
 
                         MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(placed);
                         if (anim)

From 36bb255bc0da04bdac805b61a2126330d1a25cdd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:30:38 +0100
Subject: [PATCH 364/765] Use safePlaceObject in spawnRandomCreature

---
 apps/openmw/mwworld/worldimp.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6d7ceee432..2ab027cd63 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3064,23 +3064,9 @@ namespace MWWorld
             if (selectedCreature.empty())
                 return;
 
-            ESM::Position ipos = mPlayer->getPlayer().getRefData().getPosition();
-            osg::Vec3f pos(ipos.asVec3());
-            osg::Quat rot(-ipos.rot[2], osg::Vec3f(0,0,1));
-            const float distance = 50;
-            pos = pos + (rot * osg::Vec3f(0,1,0)) * distance;
-            ipos.pos[0] = pos.x();
-            ipos.pos[1] = pos.y();
-            ipos.pos[2] = pos.z();
-            ipos.rot[0] = 0;
-            ipos.rot[1] = 0;
-            ipos.rot[2] = 0;
-
-            MWWorld::CellStore* cell = mPlayer->getPlayer().getCell();
             MWWorld::ManualRef ref(getStore(), selectedCreature, 1);
-            ref.getPtr().getCellRef().setPosition(ipos);
 
-            placeObject(ref.getPtr(), cell, ipos);
+            safePlaceObject(ref.getPtr(), getPlayerPtr(), getPlayerPtr().getCell(), 0, 220.f);
         }
     }
 

From 1e5b4bea0ac53cb544ec3a351c4a0f48ed3c5511 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 17:50:18 +0100
Subject: [PATCH 365/765] Don't create an unnecessary osg::Group when copying
 over a rig

---
 components/sceneutil/attach.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index d8cfa428a2..38330901d3 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -56,9 +56,18 @@ namespace SceneUtil
             CopyRigVisitor copyVisitor(handle, filter);
             toAttach->accept(copyVisitor);
 
-            master->asGroup()->addChild(handle);
-
-            return handle;
+            if (handle->getNumChildren() == 1)
+            {
+                osg::ref_ptr<osg::Node> newHandle = handle->getChild(0);
+                handle->removeChild(newHandle);
+                master->asGroup()->addChild(newHandle);
+                return newHandle;
+            }
+            else
+            {
+                master->asGroup()->addChild(handle);
+                return handle;
+            }
         }
         else
         {

From 8791063110e140f1eadd06a1c2ea191944882804 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 18:20:56 +0100
Subject: [PATCH 366/765] Fix "RigGeometry rendering with no skeleton" warnings
 in rare cases

---
 components/sceneutil/skeleton.cpp | 11 ++++++++++-
 components/sceneutil/skeleton.hpp |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index d1299c0587..f311de2469 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -38,6 +38,8 @@ Skeleton::Skeleton()
     , mNeedToUpdateBoneMatrices(true)
     , mActive(true)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -48,6 +50,8 @@ Skeleton::Skeleton(const Skeleton &copy, const osg::CopyOp &copyop)
     , mNeedToUpdateBoneMatrices(true)
     , mActive(copy.mActive)
     , mLastFrameNumber(0)
+    , mTraversedEvenFrame(false)
+    , mTraversedOddFrame(false)
 {
 
 }
@@ -111,6 +115,11 @@ void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
 
     mLastFrameNumber = nv->getTraversalNumber();
 
+    if (mLastFrameNumber % 2 == 0)
+        mTraversedEvenFrame = true;
+    else
+        mTraversedOddFrame = true;
+
     if (mNeedToUpdateBoneMatrices)
     {
         if (mRootBone.get())
@@ -140,7 +149,7 @@ void Skeleton::traverse(osg::NodeVisitor& nv)
     if (!getActive() && nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR
             // need to process at least 2 frames before shutting off update, since we need to have both frame-alternating RigGeometries initialized
             // this would be more naturally handled if the double-buffering was implemented in RigGeometry itself rather than in a FrameSwitch decorator node
-            && mLastFrameNumber != 0 && mLastFrameNumber+2 <= nv.getTraversalNumber())
+            && mLastFrameNumber != 0 && mTraversedEvenFrame && mTraversedOddFrame)
         return;
     osg::Group::traverse(nv);
 }
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index d98d367518..9ca1dd49da 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -69,6 +69,8 @@ namespace SceneUtil
         bool mActive;
 
         unsigned int mLastFrameNumber;
+        bool mTraversedEvenFrame;
+        bool mTraversedOddFrame;
     };
 
 }

From 87871d7d54260b4df53a0f3fc99c46cdcda5f041 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Feb 2016 20:23:19 +0100
Subject: [PATCH 367/765] Don't add RotateController to an uncontrolled node

---
 apps/openmw/mwrender/animation.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 0418e34fdc..7f7183b9e0 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1353,9 +1353,24 @@ namespace MWRender
             if (found != getNodeMap().end())
             {
                 osg::MatrixTransform* node = found->second;
-                mHeadController = new RotateController(mObjectRoot.get());
-                node->addUpdateCallback(mHeadController);
-                mActiveControllers.insert(std::make_pair(node, mHeadController));
+
+                bool foundKeyframeCtrl = false;
+                osg::Callback* cb = node->getUpdateCallback();
+                while (cb)
+                {
+                    if (dynamic_cast<NifOsg::KeyframeController*>(cb))
+                    {
+                        foundKeyframeCtrl = true;
+                        break;
+                    }
+                }
+
+                if (foundKeyframeCtrl)
+                {
+                    mHeadController = new RotateController(mObjectRoot.get());
+                    node->addUpdateCallback(mHeadController);
+                    mActiveControllers.insert(std::make_pair(node, mHeadController));
+                }
             }
         }
     }

From 7d8bd56e11e3eaee1cc6a7685ed61931ed4ea8bb Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 1 Mar 2016 11:21:06 +0100
Subject: [PATCH 368/765] create new records with basic data in the same step
 without updates inbetween (Fixes #3207)

---
 apps/opencs/model/world/commands.cpp |  5 +----
 apps/opencs/model/world/idtable.cpp  | 15 +++++++++++++++
 apps/opencs/model/world/idtable.hpp  |  4 ++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 097e83f7ca..f8c72a3909 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -68,9 +68,6 @@ void CSMWorld::ModifyCommand::undo()
 
 void CSMWorld::CreateCommand::applyModifications()
 {
-    for (std::map<int, QVariant>::const_iterator iter (mValues.begin()); iter!=mValues.end(); ++iter)
-        mModel.setData (mModel.getModelIndex (mId, iter->first), iter->second);
-
     if (!mNestedValues.empty())
     {
         CSMWorld::IdTree *tree = dynamic_cast<CSMWorld::IdTree *>(&mModel);
@@ -114,7 +111,7 @@ void CSMWorld::CreateCommand::setType (UniversalId::Type type)
 
 void CSMWorld::CreateCommand::redo()
 {
-    mModel.addRecord (mId, mType);
+    mModel.addRecordWithData (mId, mValues, mType);
     applyModifications();
 }
 
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index bd1179cea2..4d8a0842f2 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -149,6 +149,21 @@ void CSMWorld::IdTable::addRecord (const std::string& id, UniversalId::Type type
     endInsertRows();
 }
 
+void CSMWorld::IdTable::addRecordWithData (const std::string& id,
+    const std::map<int, QVariant>& data, UniversalId::Type type)
+{
+    int index = mIdCollection->getAppendIndex (id, type);
+
+    beginInsertRows (QModelIndex(), index, index);
+
+    mIdCollection->appendBlankRecord (id, type);
+
+    for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
+        mIdCollection->setData (index, iter->first, iter->second);
+
+    endInsertRows();
+}
+
 void CSMWorld::IdTable::cloneRecord(const std::string& origin,
                                     const std::string& destination,
                                     CSMWorld::UniversalId::Type type)
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 9ecba02142..8c2f8a46d8 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -53,6 +53,10 @@ namespace CSMWorld
             void addRecord (const std::string& id, UniversalId::Type type = UniversalId::Type_None);
             ///< \param type Will be ignored, unless the collection supports multiple record types
 
+            void addRecordWithData (const std::string& id, const std::map<int, QVariant>& data,
+                UniversalId::Type type = UniversalId::Type_None);
+            ///< \param type Will be ignored, unless the collection supports multiple record types
+
             void cloneRecord(const std::string& origin,
                              const std::string& destination,
                              UniversalId::Type type = UniversalId::Type_None);

From 2821f46a181371d5fac71d235c60f6008fbfba24 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 11:31:08 +0100
Subject: [PATCH 369/765] Corpse clearing fix

---
 apps/openmw/mwmechanics/creaturestats.cpp | 2 +-
 apps/openmw/mwworld/cellstore.cpp         | 2 +-
 components/esm/creaturestats.cpp          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 50b1a89b3e..13396e3fae 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -22,7 +22,7 @@ namespace MWMechanics
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
           mFallHeight(0), mRecalcMagicka(false), mLastRestock(0,0), mGoldPool(0), mActorId(-1),
-          mDeathAnimation(0), mLevel (0)
+          mDeathAnimation(0), mTimeOfDeath(), mLevel (0)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index e4bfde04a6..13f74e22b5 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -893,7 +893,7 @@ namespace MWWorld
     {
         const MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
         static const float fCorpseClearDelay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fCorpseClearDelay")->getFloat();
-        if (!ptr.getClass().isPersistent(ptr) && creatureStats.getTimeOfDeath() + fCorpseClearDelay <= MWBase::Environment::get().getWorld()->getTimeStamp())
+        if (creatureStats.isDead() && !ptr.getClass().isPersistent(ptr) && creatureStats.getTimeOfDeath() + fCorpseClearDelay <= MWBase::Environment::get().getWorld()->getTimeStamp())
             MWBase::Environment::get().getWorld()->deleteObject(ptr);
     }
 
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index 2200297e25..9b60382e9b 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -87,6 +87,8 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mDeathAnimation = 0;
     esm.getHNOT (mDeathAnimation, "DANM");
 
+    mTimeOfDeath.mDay = 0;
+    mTimeOfDeath.mHour = 0;
     esm.getHNOT (mTimeOfDeath, "DTIM");
 
     mSpells.load(esm);

From a19ac722151b18bef3199a30180a2bba33e226e3 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 1 Mar 2016 15:48:34 +0100
Subject: [PATCH 370/765] render marker

---
 apps/opencs/view/render/cell.cpp              |  21 ++-
 apps/opencs/view/render/cell.hpp              |   4 +
 apps/opencs/view/render/editmode.cpp          |   5 +
 apps/opencs/view/render/editmode.hpp          |   3 +
 apps/opencs/view/render/instancemode.cpp      |  22 +++
 apps/opencs/view/render/instancemode.hpp      |   8 +
 apps/opencs/view/render/object.cpp            | 157 +++++++++++++++++-
 apps/opencs/view/render/object.hpp            |  21 +++
 .../view/render/pagedworldspacewidget.cpp     |  16 +-
 .../view/render/pagedworldspacewidget.hpp     |   2 +
 .../view/render/unpagedworldspacewidget.cpp   |   5 +
 .../view/render/unpagedworldspacewidget.hpp   |   2 +
 apps/opencs/view/render/worldspacewidget.cpp  |   5 +
 apps/opencs/view/render/worldspacewidget.hpp  |   5 +
 apps/opencs/view/widget/scenetoolmode.cpp     |   5 +
 apps/opencs/view/widget/scenetoolmode.hpp     |   3 +
 16 files changed, 278 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index f82ef31502..6e47d35945 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -51,7 +51,12 @@ bool CSVRender::Cell::addObjects (int start, int end)
         {
             std::string id = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mId);
 
-            mObjects.insert (std::make_pair (id, new Object (mData, mCellNode, id, false)));
+            std::auto_ptr<Object> object (new Object (mData, mCellNode, id, false));
+
+            if (mSubModeElementMask & Mask_Reference)
+                object->setSubMode (mSubMode);
+
+            mObjects.insert (std::make_pair (id, object.release()));
             modified = true;
         }
     }
@@ -61,7 +66,8 @@ bool CSVRender::Cell::addObjects (int start, int end)
 
 CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
     bool deleted)
-: mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted)
+: mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted), mSubMode (0),
+  mSubModeElementMask (0)
 {
     std::pair<CSMWorld::CellCoordinates, bool> result = CSMWorld::CellCoordinates::fromId (id);
 
@@ -359,3 +365,14 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getEdited (unsig
 
     return result;
 }
+
+void CSVRender::Cell::setSubMode (int subMode, unsigned int elementMask)
+{
+    mSubMode = subMode;
+    mSubModeElementMask = elementMask;
+
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+                iter->second->setSubMode (subMode);
+}
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 6cdafbf36d..21949992d1 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -45,6 +45,8 @@ namespace CSVRender
             std::auto_ptr<CellArrow> mCellArrows[4];
             std::auto_ptr<CellMarker> mCellMarker;
             bool mDeleted;
+            int mSubMode;
+            unsigned int mSubModeElementMask;
 
             /// Ignored if cell does not have an object with the given ID.
             ///
@@ -118,6 +120,8 @@ namespace CSVRender
             std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) const;
 
             std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) const;
+
+            void setSubMode (int subMode, unsigned int elementMask);
     };
 }
 
diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index b325e31fb0..be264afc7c 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -70,3 +70,8 @@ void CSVRender::EditMode::dragEnterEvent (QDragEnterEvent *event) {}
 void CSVRender::EditMode::dropEvent (QDropEvent* event) {}
 
 void CSVRender::EditMode::dragMoveEvent (QDragMoveEvent *event) {}
+
+int CSVRender::EditMode::getSubMode() const
+{
+    return -1;
+}
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index 3ba97cf007..f5cef1be29 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -92,6 +92,9 @@ namespace CSVRender
 
             /// Default-implementation: ignored
             virtual void dragMoveEvent (QDragMoveEvent *event);
+
+            /// Default: return -1
+            virtual int getSubMode() const;
     };
 }
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index f2fb552b00..24e307dc5a 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -20,6 +20,11 @@
 #include "instanceselectionmode.hpp"
 #include "instancemovemode.hpp"
 
+int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
+{
+    return id=="move" ? 0 : (id=="rotate" ? 1 : 2);
+}
+
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
   parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None)
@@ -44,6 +49,9 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
             "<li>Use secondary edit to scale instances along the grid</li>"
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
+
+        connect (mSubMode, SIGNAL (modeChanged (const std::string&)),
+            this, SLOT (subModeChanged (const std::string&)));
     }
 
     if (!mSelectionMode)
@@ -55,6 +63,10 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
 
     toolbar->addTool (mSubMode);
     toolbar->addTool (mSelectionMode);
+
+    std::string subMode = mSubMode->getCurrentId();
+
+    getWorldspaceWidget().setSubMode (getSubModeFromId (subMode), Mask_Reference);
 }
 
 void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
@@ -402,3 +414,13 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
             event->accept();
     }
 }
+
+int CSVRender::InstanceMode::getSubMode() const
+{
+    return mSubMode ? getSubModeFromId (mSubMode->getCurrentId()) : 0;
+}
+
+void CSVRender::InstanceMode::subModeChanged (const std::string& id)
+{
+    getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
+}
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 7662a0cdc3..5beec56434 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -27,6 +27,8 @@ namespace CSVRender
             InstanceSelectionMode *mSelectionMode;
             DragMode mDragMode;
 
+            int getSubModeFromId (const std::string& id) const;
+
         public:
 
             InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent = 0);
@@ -56,6 +58,12 @@ namespace CSVRender
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
             virtual void dropEvent (QDropEvent* event);
+
+            virtual int getSubMode() const;
+
+        private slots:
+
+            void subModeChanged (const std::string& id);
     };
 }
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 0f135459b9..b7efa50586 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -9,6 +9,8 @@
 #include <osg/ShapeDrawable>
 #include <osg/Shape>
 #include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/PrimitiveSet>
 
 #include <osgFX/Scribe>
 
@@ -52,6 +54,11 @@ QString CSVRender::ObjectTag::getToolTip (bool hideBasics) const
 }
 
 
+CSVRender::ObjectMarkerTag::ObjectMarkerTag (Object* object, int axis)
+: TagBase (Mask_Reference), mObject (object), mAxis (axis)
+{}
+
+
 void CSVRender::Object::clear()
 {
 }
@@ -156,10 +163,144 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const
     return mData.getReferences().getRecord (mReferenceId).get();
 }
 
+void CSVRender::Object::updateMarker()
+{
+    for (int i=0; i<3; ++i)
+    {
+        if (mMarker[i])
+        {
+            mRootNode->removeChild (mMarker[i]);
+            mMarker[i] = osg::ref_ptr<osg::Node>();
+        }
+
+        if (mSelected)
+        {
+            if (mSubMode==0)
+            {
+                mMarker[i] = makeMarker (i);
+                mMarker[i]->setUserData(new ObjectMarkerTag (this, i));
+
+                mRootNode->addChild (mMarker[i]);
+            }
+        }
+    }
+}
+
+osg::ref_ptr<osg::Node> CSVRender::Object::makeMarker (int axis)
+{
+    osg::ref_ptr<osg::Geometry> geometry (new osg::Geometry);
+
+    const float shaftWidth = 10;
+    const float shaftBaseLength = 50;
+    const float headWidth = 30;
+    const float headLength = 30;
+
+    float shaftLength = shaftBaseLength + mBaseNode->getBound().radius();
+
+    // shaft
+    osg::Vec3Array *vertices = new osg::Vec3Array;
+
+    for (int i=0; i<2; ++i)
+    {
+        float length = i ? shaftLength : 0;
+
+        vertices->push_back (getMarkerPosition (-shaftWidth/2, -shaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (-shaftWidth/2, shaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (shaftWidth/2, shaftWidth/2, length, axis));
+        vertices->push_back (getMarkerPosition (shaftWidth/2, -shaftWidth/2, length, axis));
+    }
+
+    // head backside
+    vertices->push_back (getMarkerPosition (-headWidth/2, -headWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (-headWidth/2, headWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (headWidth/2, headWidth/2, shaftLength, axis));
+    vertices->push_back (getMarkerPosition (headWidth/2, -headWidth/2, shaftLength, axis));
+
+    // head
+    vertices->push_back (getMarkerPosition (0, 0, shaftLength+headLength, axis));
+
+    geometry->setVertexArray (vertices);
+
+    osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0);
+
+    // shaft
+    for (int i=0; i<4; ++i)
+    {
+        int i2 = i==3 ? 0 : i+1;
+        primitives->push_back (i);
+        primitives->push_back (4+i);
+        primitives->push_back (i2);
+
+        primitives->push_back (4+i);
+        primitives->push_back (4+i2);
+        primitives->push_back (i2);
+    }
+
+    // cap
+    primitives->push_back (0);
+    primitives->push_back (1);
+    primitives->push_back (2);
+
+    primitives->push_back (2);
+    primitives->push_back (3);
+    primitives->push_back (0);
+
+    // head, backside
+    primitives->push_back (0+8);
+    primitives->push_back (1+8);
+    primitives->push_back (2+8);
+
+    primitives->push_back (2+8);
+    primitives->push_back (3+8);
+    primitives->push_back (0+8);
+
+    for (int i=0; i<4; ++i)
+    {
+        primitives->push_back (12);
+        primitives->push_back (8+(i==3 ? 0 : i+1));
+        primitives->push_back (8+i);
+    }
+
+    geometry->addPrimitiveSet (primitives);
+
+    osg::Vec4Array *colours = new osg::Vec4Array;
+
+    for (int i=0; i<8; ++i)
+        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.2f, axis==1 ? 1.0f : 0.2f,
+            axis==2 ? 1.0f : 0.2f, 1.0f));
+
+    for (int i=8; i<8+4+1; ++i)
+        colours->push_back (osg::Vec4f (axis==0 ? 1.0f : 0.0f, axis==1 ? 1.0f : 0.0f,
+            axis==2 ? 1.0f : 0.0f, 1.0f));
+
+    geometry->setColorArray (colours, osg::Array::BIND_PER_VERTEX);
+
+    geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF);
+
+    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
+    geode->addDrawable (geometry);
+
+    return geode;
+}
+
+osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int axis)
+{
+    switch (axis)
+    {
+        case 0: return osg::Vec3f (x, y, z);
+        case 1: return osg::Vec3f (z, x, y);
+        case 2: return osg::Vec3f (y, z, x);
+
+        default:
+
+            throw std::logic_error ("invalid axis for marker geometry");
+    }
+}
+
 CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     const std::string& id, bool referenceable, bool forceBaseToZero)
 : mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
-  mScaleOverride (1), mOverrideFlags (0)
+  mScaleOverride (1), mOverrideFlags (0), mSubMode (-1)
 {
     mRootNode = new osg::PositionAttitudeTransform;
 
@@ -188,6 +329,7 @@ CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
 
     adjustTransform();
     update();
+    updateMarker();
 }
 
 CSVRender::Object::~Object()
@@ -211,6 +353,8 @@ void CSVRender::Object::setSelected(bool selected)
     }
     else
         mRootNode->addChild(mBaseNode);
+
+    updateMarker();
 }
 
 bool CSVRender::Object::getSelected() const
@@ -229,6 +373,7 @@ bool CSVRender::Object::referenceableDataChanged (const QModelIndex& topLeft,
     {
         adjustTransform();
         update();
+        updateMarker();
         return true;
     }
 
@@ -279,6 +424,7 @@ bool CSVRender::Object::referenceDataChanged (const QModelIndex& topLeft,
                 references.getData (index, columnIndex).toString().toUtf8().constData();
 
             update();
+            updateMarker();
         }
 
         return true;
@@ -419,3 +565,12 @@ void CSVRender::Object::apply (QUndoStack& undoStack)
 
     mOverrideFlags = 0;
 }
+
+void CSVRender::Object::setSubMode (int subMode)
+{
+    if (subMode!=mSubMode)
+    {
+        mSubMode = subMode;
+        updateMarker();
+    }
+}
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 4b528b59f1..9cd0a8d670 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -19,6 +19,8 @@ namespace osg
 {
     class PositionAttitudeTransform;
     class Group;
+    class Node;
+    class Geode;
 }
 
 namespace osgFX
@@ -53,6 +55,15 @@ namespace CSVRender
             virtual QString getToolTip (bool hideBasics) const;
     };
 
+    class ObjectMarkerTag : public TagBase
+    {
+        public:
+
+            ObjectMarkerTag (Object* object, int axis);
+
+            Object* mObject;
+            int mAxis;
+    };
 
     class Object
     {
@@ -80,6 +91,8 @@ namespace CSVRender
             ESM::Position mPositionOverride;
             int mScaleOverride;
             int mOverrideFlags;
+            osg::ref_ptr<osg::Node> mMarker[3];
+            int mSubMode;
 
             /// Not implemented
             Object (const Object&);
@@ -100,6 +113,12 @@ namespace CSVRender
             /// Throws an exception if *this was constructed with referenceable
             const CSMWorld::CellRef& getReference() const;
 
+            void updateMarker();
+
+            osg::ref_ptr<osg::Node> makeMarker (int axis);
+
+            osg::Vec3f getMarkerPosition (float x, float y, float z, int axis);
+
         public:
 
             Object (CSMWorld::Data& data, osg::Group *cellNode,
@@ -155,6 +174,8 @@ namespace CSVRender
 
             /// Apply override changes via command and end edit mode
             void apply (QUndoStack& undoStack);
+
+            void setSubMode (int subMode);
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index cbba9ef5d9..68c8949f32 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -309,10 +309,13 @@ void CSVRender::PagedWorldspaceWidget::addCellToScene (
     bool deleted = index==-1 ||
         cells.getRecord (index).mState==CSMWorld::RecordBase::State_Deleted;
 
-    Cell *cell = new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
-        deleted);
+    std::auto_ptr<Cell> cell (
+        new Cell (mDocument.getData(), mRootNode, coordinates.getId (mWorldspace),
+        deleted));
+    EditMode *editMode = getEditMode();
+    cell->setSubMode (editMode->getSubMode(), editMode->getInteractionMask());
 
-    mCells.insert (std::make_pair (coordinates, cell));
+    mCells.insert (std::make_pair (coordinates, cell.release()));
 }
 
 void CSVRender::PagedWorldspaceWidget::removeCellFromScene (
@@ -572,6 +575,13 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget:
     return result;
 }
 
+void CSVRender::PagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->setSubMode (subMode, elementMask);
+}
+
 CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index baec96b039..c77c3ebd23 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -115,6 +115,8 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
                 const;
 
+            virtual void setSubMode (int subMode, unsigned int elementMask);
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 4a7723d2f2..60aeeb4d81 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -137,6 +137,11 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidge
     return mCell->getEdited (elementMask);
 }
 
+void  CSVRender::UnpagedWorldspaceWidget::setSubMode (int subMode, unsigned int elementMask)
+{
+    mCell->setSubMode (subMode, elementMask);
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index f7b583f3da..a3718d9f3b 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -63,6 +63,8 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
                 const;
 
+            virtual void setSubMode (int subMode, unsigned int elementMask);
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 6ba6e95432..83feb0be3e 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -761,3 +761,8 @@ void CSVRender::WorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, c
     else if (button=="s-select")
         editMode.secondarySelectPressed (tag);
 }
+
+CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
+{
+    return dynamic_cast<CSVRender::EditMode *> (mEditMode->getCurrent());
+}
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 67f585e03c..eee618ed1a 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -35,6 +35,7 @@ namespace CSVRender
 {
     class TagBase;
     class CellArrow;
+    class EditMode;
 
     class WorldspaceWidget : public SceneWidget
     {
@@ -155,6 +156,8 @@ namespace CSVRender
             virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
                 const = 0;
 
+            virtual void setSubMode (int subMode, unsigned int elementMask) = 0;
+
         protected:
 
             /// Visual elements in a scene
@@ -184,6 +187,8 @@ namespace CSVRender
             virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button,
                 bool shift);
 
+            EditMode *getEditMode();
+
         private:
 
             void dragEnterEvent(QDragEnterEvent *event);
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 125f4ac79a..08e8ad5a4f 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -96,6 +96,11 @@ CSVWidget::ModeButton *CSVWidget::SceneToolMode::getCurrent()
     return mCurrent;
 }
 
+std::string CSVWidget::SceneToolMode::getCurrentId() const
+{
+    return mButtons.find (mCurrent)->second;
+}
+
 void CSVWidget::SceneToolMode::selected()
 {
     std::map<ModeButton *, std::string>::const_iterator iter =
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index 3aa8e6799a..c274d84ab2 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -56,6 +56,9 @@ namespace CSVWidget
             /// Will return a 0-pointer only if the mode does not have any buttons yet.
             ModeButton *getCurrent();
 
+            /// Must not be called if there aren't any buttons yet.
+            std::string getCurrentId() const;
+
         signals:
 
             void modeChanged (const std::string& id);

From 08f06c6c2d6f89eeea5c85a6dc82ec92e5fcc802 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 16:57:11 +0100
Subject: [PATCH 371/765] Fix a crash that could occur with actors that define
 'bip01 spine1' but do not define 'bip01 spine2' (Fixes #3223).

---
 apps/openmw/mwrender/weaponanimation.cpp | 25 +++++++++++++++---------
 apps/openmw/mwrender/weaponanimation.hpp |  3 +++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index 2627d3fc6a..d5fb70d164 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -182,23 +182,30 @@ void WeaponAnimation::deleteControllers()
 
 void WeaponAnimation::configureControllers(float characterPitchRadians)
 {
-    if (!mSpineControllers[0])
-        return;
-
     if (mPitchFactor == 0.f || characterPitchRadians == 0.f)
     {
-        for (int i=0; i<2; ++i)
-            mSpineControllers[i]->setEnabled(false);
+        setControllerEnabled(false);
         return;
     }
 
     float pitch = characterPitchRadians * mPitchFactor;
     osg::Quat rotate (pitch/2, osg::Vec3f(-1,0,0));
+    setControllerRotate(rotate);
+    setControllerEnabled(true);
+}
+
+void WeaponAnimation::setControllerRotate(const osg::Quat& rotate)
+{
     for (int i=0; i<2; ++i)
-    {
-        mSpineControllers[i]->setRotate(rotate);
-        mSpineControllers[i]->setEnabled(true);
-    }
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setRotate(rotate);
+}
+
+void WeaponAnimation::setControllerEnabled(bool enabled)
+{
+    for (int i=0; i<2; ++i)
+        if (mSpineControllers[i])
+            mSpineControllers[i]->setEnabled(enabled);
 }
 
 }
diff --git a/apps/openmw/mwrender/weaponanimation.hpp b/apps/openmw/mwrender/weaponanimation.hpp
index 3bf0fb7211..d50729c622 100644
--- a/apps/openmw/mwrender/weaponanimation.hpp
+++ b/apps/openmw/mwrender/weaponanimation.hpp
@@ -52,6 +52,9 @@ namespace MWRender
 
         osg::ref_ptr<RotateController> mSpineControllers[2];
 
+        void setControllerRotate(const osg::Quat& rotate);
+        void setControllerEnabled(bool enabled);
+
         virtual osg::Group* getArrowBone() = 0;
         virtual osg::Node* getWeaponNode() = 0;
         virtual Resource::ResourceSystem* getResourceSystem() = 0;

From 64636bd85a7c7172f106dd4c0f11e79290aba75c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 17:05:02 +0100
Subject: [PATCH 372/765] Improve error reporting

---
 components/nifosg/nifloader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index ab6bfcff3f..1300d592f4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -470,7 +470,7 @@ namespace NifOsg
             const Nif::NiTextureEffect* textureEffect = static_cast<const Nif::NiTextureEffect*>(nifNode);
             if (textureEffect->textureType != Nif::NiTextureEffect::Environment_Map)
             {
-                std::cerr << "Unhandled NiTextureEffect type " << textureEffect->textureType << std::endl;
+                std::cerr << "Unhandled NiTextureEffect type " << textureEffect->textureType << " in " << mFilename << std::endl;
                 return;
             }
 
@@ -487,7 +487,7 @@ namespace NifOsg
                 texGen->setMode(osg::TexGen::SPHERE_MAP);
                 break;
             default:
-                std::cerr << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType << std::endl;
+                std::cerr << "Unhandled NiTextureEffect coordGenType " << textureEffect->coordGenType << " in " << mFilename << std::endl;
                 return;
             }
 

From 30d06bfe0e9140796df9f205fd5f161e9b53865a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 17:27:54 +0100
Subject: [PATCH 373/765] Add comment

---
 components/nifosg/nifloader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 1300d592f4..b7eb9d8a75 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1377,6 +1377,8 @@ namespace NifOsg
                             break;
                         case Nif::NiTexturingProperty::GlossTexture:
                         {
+                            // Not used by the vanilla engine. MCP (Morrowind Code Patch) adds an option to use Gloss maps:
+                            // "- Gloss map fix. Morrowind removed gloss map entries from model files after loading them. This stops Morrowind from removing them."
                             std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
                             continue;
                         }

From 414c19f717e9e75d46cbd59d7130254c8dd10cd4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 18:40:18 +0100
Subject: [PATCH 374/765] Fix detailMapUV bug

---
 files/shaders/objects_vertex.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index b1004aad3d..2979411721 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -68,7 +68,7 @@ void main(void)
 #endif
 
 #if @detailMap
-    detailMapUV = (gl_TextureMatrix[@detailMap] * gl_MultiTexCoord@detailMap).xy;
+    detailMapUV = (gl_TextureMatrix[@detailMapUV] * gl_MultiTexCoord@detailMapUV).xy;
 #endif
 
 #if @emissiveMap

From 6e7c6fdd7ee7672ee20d3d8374eecf17c5cf412a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Mar 2016 18:41:36 +0100
Subject: [PATCH 375/765] Implement NiTexturingProperty::DecalTexture

---
 components/nifosg/nifloader.cpp     | 24 +++++++++++++++++++-----
 components/shader/shadervisitor.cpp |  4 ++--
 files/shaders/objects_fragment.glsl | 10 ++++++++++
 files/shaders/objects_vertex.glsl   |  8 ++++++++
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index b7eb9d8a75..8ffb8d5de4 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1374,6 +1374,7 @@ namespace NifOsg
                         case Nif::NiTexturingProperty::DarkTexture:
                         case Nif::NiTexturingProperty::BumpTexture:
                         case Nif::NiTexturingProperty::DetailTexture:
+                        case Nif::NiTexturingProperty::DecalTexture:
                             break;
                         case Nif::NiTexturingProperty::GlossTexture:
                         {
@@ -1382,11 +1383,6 @@ namespace NifOsg
                             std::cerr << "NiTexturingProperty::GlossTexture in " << mFilename << " not currently used." << std::endl;
                             continue;
                         }
-                        case Nif::NiTexturingProperty::DecalTexture:
-                        {
-                            std::cerr << "NiTexturingProperty::DecalTexture in " << mFilename << " not currently used." << std::endl;
-                            continue;
-                        }
                         default:
                         {
                             std::cerr << "Warning: unhandled texture stage " << i << " in " << mFilename << std::endl;
@@ -1454,6 +1450,21 @@ namespace NifOsg
                         // Set this texture to Off by default since we can't render it with the fixed-function pipeline
                         stateset->setTextureMode(texUnit, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                     }
+                    else if (i == Nif::NiTexturingProperty::DecalTexture)
+                    {
+                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
+                         texEnv->setCombine_RGB(GL_INTERPOLATE);
+                         texEnv->setSource0_RGB(GL_TEXTURE);
+                         texEnv->setOperand0_RGB(GL_SRC_COLOR);
+                         texEnv->setSource1_RGB(GL_PREVIOUS_ARB);
+                         texEnv->setOperand1_RGB(GL_SRC_COLOR);
+                         texEnv->setSource2_RGB(GL_TEXTURE);
+                         texEnv->setOperand2_RGB(GL_SRC_ALPHA);
+                         texEnv->setCombine_Alpha(GL_REPLACE);
+                         texEnv->setSource0_Alpha(GL_PREVIOUS);
+                         texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
+                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
+                    }
 
                     switch (i)
                     {
@@ -1472,6 +1483,9 @@ namespace NifOsg
                     case Nif::NiTexturingProperty::DetailTexture:
                         texture2d->setName("detailMap");
                         break;
+                    case Nif::NiTexturingProperty::DecalTexture:
+                        texture2d->setName("decalMap");
+                        break;
                     default:
                         break;
                     }
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index b06ceafde2..92bdac7b75 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -88,11 +88,11 @@ namespace Shader
         return newStateSet.get();
     }
 
-    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap" };
+    const char* defaultTextures[] = { "diffuseMap", "normalMap", "emissiveMap", "darkMap", "detailMap", "envMap", "specularMap", "decalMap" };
     bool isTextureNameRecognized(const std::string& name)
     {
         for (unsigned int i=0; i<sizeof(defaultTextures)/sizeof(defaultTextures[0]); ++i)
-            if (name.c_str() == defaultTextures[i])
+            if (name == defaultTextures[i])
                 return true;
         return false;
     }
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index a648f84848..2304d9aded 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -15,6 +15,11 @@ uniform sampler2D detailMap;
 varying vec2 detailMapUV;
 #endif
 
+#if @decalMap
+uniform sampler2D decalMap;
+varying vec2 decalMapUV;
+#endif
+
 #if @emissiveMap
 uniform sampler2D emissiveMap;
 varying vec2 emissiveMapUV;
@@ -67,6 +72,11 @@ void main()
     gl_FragData[0].xyz *= texture2D(darkMap, darkMapUV).xyz;
 #endif
 
+#if @decalMap
+    vec4 decalTex = texture2D(decalMap, decalMapUV);
+    gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
+#endif
+
     vec3 viewNormal = passViewNormal;
 
 #if @normalMap
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 2979411721..b65e496663 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -12,6 +12,10 @@ varying vec2 darkMapUV;
 varying vec2 detailMapUV;
 #endif
 
+#if @decalMap
+varying vec2 decalMapUV;
+#endif
+
 #if @emissiveMap
 varying vec2 emissiveMapUV;
 #endif
@@ -71,6 +75,10 @@ void main(void)
     detailMapUV = (gl_TextureMatrix[@detailMapUV] * gl_MultiTexCoord@detailMapUV).xy;
 #endif
 
+#if @decalMap
+    decalMapUV = (gl_TextureMatrix[@decalMapUV] * gl_MultiTexCoord@decalMapUV).xy;
+#endif
+
 #if @emissiveMap
     emissiveMapUV = (gl_TextureMatrix[@emissiveMapUV] * gl_MultiTexCoord@emissiveMapUV).xy;
 #endif

From 67c8faec753d7824f7715a66193418181332eb97 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 2 Mar 2016 13:20:23 +0100
Subject: [PATCH 376/765] Infinite loop fix

---
 apps/openmw/mwrender/animation.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 7f7183b9e0..5cf502476a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1363,6 +1363,7 @@ namespace MWRender
                         foundKeyframeCtrl = true;
                         break;
                     }
+                    cb = cb->getNestedCallback();
                 }
 
                 if (foundKeyframeCtrl)

From 563807ee5335c823d24fdc898ed439706bfa5b31 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 2 Mar 2016 13:33:31 +0100
Subject: [PATCH 377/765] Share the StateSet used to invert front face

---
 components/sceneutil/attach.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 38330901d3..8ac0aa9929 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -102,9 +102,15 @@ namespace SceneUtil
                 // Need to invert culling because of the negative scale
                 // Note: for absolute correctness we would need to check the current front face for every mesh then invert it
                 // However MW isn't doing this either, so don't. Assuming all meshes are using backface culling is more efficient.
-                osg::FrontFace* frontFace = new osg::FrontFace;
-                frontFace->setMode(osg::FrontFace::CLOCKWISE);
-                trans->getOrCreateStateSet()->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+                static osg::ref_ptr<osg::StateSet> frontFaceStateSet;
+                if (!frontFaceStateSet)
+                {
+                    frontFaceStateSet = new osg::StateSet;
+                    osg::FrontFace* frontFace = new osg::FrontFace;
+                    frontFace->setMode(osg::FrontFace::CLOCKWISE);
+                    frontFaceStateSet->setAttributeAndModes(frontFace, osg::StateAttribute::ON);
+                }
+                trans->setStateSet(frontFaceStateSet);
             }
 
             if (trans)

From 3d6323f13a20ae5cba65814d859137ec8dd94005 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 2 Mar 2016 17:02:30 +0100
Subject: [PATCH 378/765] Force-enable hasWater() for exterior cells (Fixes
 #3222)

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 components/esm/loadcell.hpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2ab027cd63..0dbadca176 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2039,7 +2039,7 @@ namespace MWWorld
 
     bool World::isUnderwater(const MWWorld::CellStore* cell, const osg::Vec3f &pos) const
     {
-        if (!(cell->getCell()->mData.mFlags & ESM::Cell::HasWater)) {
+        if (!(cell->getCell()->hasWater())) {
             return false;
         }
         return pos.z() < cell->getWaterLevel();
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index f92e0b5b70..cab8cf65e7 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -141,7 +141,7 @@ struct Cell
 
   bool hasWater() const
   {
-      return (mData.mFlags&HasWater) != 0;
+      return ((mData.mFlags&HasWater) != 0) || isExterior();
   }
 
   // Restore the given reader to the stored position. Will try to open

From 7fb6807e653a8d1258bb8104791ffbc29b17482a Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 2 Mar 2016 15:02:06 -0500
Subject: [PATCH 379/765] cell border markers

---
 apps/opencs/CMakeLists.txt             |  2 +-
 apps/opencs/view/render/cell.cpp       |  3 +
 apps/opencs/view/render/cell.hpp       |  2 +
 apps/opencs/view/render/cellborder.cpp | 97 ++++++++++++++++++++++++++
 apps/opencs/view/render/cellborder.hpp | 54 ++++++++++++++
 5 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 apps/opencs/view/render/cellborder.cpp
 create mode 100644 apps/opencs/view/render/cellborder.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 74f311c5fe..f78c411d20 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -90,7 +90,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight
-    lightingbright object cell terrainstorage tagbase cellarrow cellmarker
+    lightingbright object cell terrainstorage tagbase cellarrow cellmarker cellborder
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 641aeb0883..5348f4683c 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -93,6 +93,9 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
                 mTerrain.reset(new Terrain::TerrainGrid(mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Mask_Terrain));
                 mTerrain->loadCell(esmLand.mX,
                                    esmLand.mY);
+
+                mCellBorder.reset(new CellBorder(mCellNode, mCoordinates));
+                mCellBorder->buildShape(esmLand);
             }
         }
     }
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 22f9872e3d..54f5bea1ed 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -16,6 +16,7 @@
 #include "object.hpp"
 #include "cellarrow.hpp"
 #include "cellmarker.hpp"
+#include "cellborder.hpp"
 
 class QModelIndex;
 
@@ -44,6 +45,7 @@ namespace CSVRender
             CSMWorld::CellCoordinates mCoordinates;
             std::auto_ptr<CellArrow> mCellArrows[4];
             std::auto_ptr<CellMarker> mCellMarker;
+            std::auto_ptr<CellBorder> mCellBorder;
             bool mDeleted;
 
             /// Ignored if cell does not have an object with the given ID.
diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
new file mode 100644
index 0000000000..fd0492e5d9
--- /dev/null
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -0,0 +1,97 @@
+#include "cellborder.hpp"
+
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/PrimitiveSet>
+
+#include <components/esm/loadland.hpp>
+
+#include "mask.hpp"
+
+#include "../../model/world/cellcoordinates.hpp"
+
+const int CSVRender::CellBorder::CellSize = ESM::Land::REAL_SIZE;
+const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
+
+
+CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
+    : mParentNode(cellNode)
+{
+    mBaseNode = new osg::PositionAttitudeTransform();
+    mBaseNode->setNodeMask(Mask_CellBorder);
+    mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
+
+    mParentNode->addChild(mBaseNode);
+}
+
+CSVRender::CellBorder::~CellBorder()
+{
+    mParentNode->removeChild(mBaseNode);
+}
+
+void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
+{
+    const ESM::Land::LandData* landData = esmLand.getLandData(ESM::Land::DATA_VHGT);
+
+    if (!landData)
+        return;
+
+    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
+
+    // Vertices
+    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
+
+    int x = 0, y = 0;
+    for (; x < ESM::Land::LAND_SIZE; ++x)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    x = ESM::Land::LAND_SIZE - 1;
+    for (; y < ESM::Land::LAND_SIZE; ++y)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    y = ESM::Land::LAND_SIZE - 1;
+    for (; x >= 0; --x)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    x = 0;
+    for (; y >= 0; --y)
+        vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
+
+    geometry->setVertexArray(vertices);
+
+    // Color
+    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
+    colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
+
+    geometry->setColorArray(colors);
+    geometry->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE_SET);
+
+    // Primitive
+    osg::ref_ptr<osg::DrawElementsUShort> primitives =
+        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount+1);
+
+    for (size_t i = 0; i < VertexCount; ++i)
+        primitives->setElement(i, i);
+
+    primitives->setElement(VertexCount, 0);
+
+    geometry->addPrimitiveSet(primitives);
+    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+
+    osg::ref_ptr<osg::Geode> geode = new osg::Geode();
+    geode->addDrawable(geometry);
+    mBaseNode->addChild(geode);
+}
+
+size_t CSVRender::CellBorder::landIndex(int x, int y)
+{
+    return y * ESM::Land::LAND_SIZE + x;
+}
+
+float CSVRender::CellBorder::scaleToWorld(int value)
+{
+    return (CellSize + 128) * (float)value / ESM::Land::LAND_SIZE;
+}
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
new file mode 100644
index 0000000000..c91aa46c69
--- /dev/null
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -0,0 +1,54 @@
+#ifndef OPENCS_VIEW_CELLBORDER_H
+#define OPENCS_VIEW_CELLBORDER_H
+
+#include <cstddef>
+
+#include <osg/ref_ptr>
+
+namespace osg
+{
+    class Group;
+    class PositionAttitudeTransform;
+}
+
+namespace ESM
+{
+    struct Land;
+}
+
+namespace CSMWorld
+{
+    class CellCoordinates;
+}
+
+namespace CSVRender
+{
+
+    class CellBorder
+    {
+    public:
+
+        CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords);
+        ~CellBorder();
+
+        void buildShape(const ESM::Land& esmLand);
+
+    private:
+
+        static const int CellSize;
+        static const int VertexCount;
+
+        size_t landIndex(int x, int y);
+        float scaleToWorld(int val);
+
+        // unimplemented
+        CellBorder(const CellBorder&);
+        CellBorder& operator=(const CellBorder&);
+
+        osg::Group* mParentNode;
+        osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+
+    };
+}
+
+#endif

From fa1bd72bc0e13b094d3366d52ce9b518a32033c3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 2 Mar 2016 15:48:05 -0500
Subject: [PATCH 380/765] fix usage of deprecated function

---
 apps/opencs/view/render/cellborder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index fd0492e5d9..6073807ce0 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -65,8 +65,7 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
     colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
 
-    geometry->setColorArray(colors);
-    geometry->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE_SET);
+    geometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
 
     // Primitive
     osg::ref_ptr<osg::DrawElementsUShort> primitives =

From dd2fbfc0a2e5d09cd8e54d47ba1124f1a9bfbf9d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 2 Mar 2016 21:57:25 +0100
Subject: [PATCH 381/765] Fix windows build

---
 components/nifosg/nifloader.cpp | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8ffb8d5de4..705dbe83aa 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1433,16 +1433,16 @@ namespace NifOsg
                     {
                         osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
                         texEnv->setScale_RGB(2.f);
-                        texEnv->setCombine_Alpha(GL_MODULATE);
-                        texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
-                        texEnv->setOperand1_Alpha(GL_SRC_ALPHA);
-                        texEnv->setSource0_Alpha(GL_PREVIOUS_ARB);
-                        texEnv->setSource1_Alpha(GL_TEXTURE);
-                        texEnv->setCombine_RGB(GL_MODULATE);
-                        texEnv->setOperand0_RGB(GL_SRC_COLOR);
-                        texEnv->setOperand1_RGB(GL_SRC_COLOR);
-                        texEnv->setSource0_RGB(GL_PREVIOUS_ARB);
-                        texEnv->setSource1_RGB(GL_TEXTURE);
+                        texEnv->setCombine_Alpha(osg::TexEnvCombine::MODULATE);
+                        texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                        texEnv->setOperand1_Alpha(osg::TexEnvCombine::SRC_ALPHA);
+                        texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_Alpha(osg::TexEnvCombine::TEXTURE);
+                        texEnv->setCombine_RGB(osg::TexEnvCombine::MODULATE);
+                        texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                        texEnv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                        texEnv->setSource1_RGB(osg::TexEnvCombine::TEXTURE);
                         stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
                     else if (i == Nif::NiTexturingProperty::BumpTexture)
@@ -1453,16 +1453,16 @@ namespace NifOsg
                     else if (i == Nif::NiTexturingProperty::DecalTexture)
                     {
                          osg::TexEnvCombine* texEnv = new osg::TexEnvCombine;
-                         texEnv->setCombine_RGB(GL_INTERPOLATE);
-                         texEnv->setSource0_RGB(GL_TEXTURE);
-                         texEnv->setOperand0_RGB(GL_SRC_COLOR);
-                         texEnv->setSource1_RGB(GL_PREVIOUS_ARB);
-                         texEnv->setOperand1_RGB(GL_SRC_COLOR);
-                         texEnv->setSource2_RGB(GL_TEXTURE);
-                         texEnv->setOperand2_RGB(GL_SRC_ALPHA);
-                         texEnv->setCombine_Alpha(GL_REPLACE);
-                         texEnv->setSource0_Alpha(GL_PREVIOUS);
-                         texEnv->setOperand0_Alpha(GL_SRC_ALPHA);
+                         texEnv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE);
+                         texEnv->setSource0_RGB(osg::TexEnvCombine::TEXTURE);
+                         texEnv->setOperand0_RGB(osg::TexEnvCombine::SRC_COLOR);
+                         texEnv->setSource1_RGB(osg::TexEnvCombine::PREVIOUS);
+                         texEnv->setOperand1_RGB(osg::TexEnvCombine::SRC_COLOR);
+                         texEnv->setSource2_RGB(osg::TexEnvCombine::TEXTURE);
+                         texEnv->setOperand2_RGB(osg::TexEnvCombine::SRC_ALPHA);
+                         texEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);
+                         texEnv->setSource0_Alpha(osg::TexEnvCombine::PREVIOUS);
+                         texEnv->setOperand0_Alpha(osg::TexEnvCombine::SRC_ALPHA);
                          stateset->setTextureAttributeAndModes(texUnit, texEnv, osg::StateAttribute::ON);
                     }
 

From 2eaf96e3bfe7fd9052c8c0896bcf3f40cbcd2ce4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 2 Mar 2016 21:58:11 +0100
Subject: [PATCH 382/765] Make ResourceManager destructor virtual

---
 components/resource/resourcemanager.cpp | 4 ++++
 components/resource/resourcemanager.hpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/components/resource/resourcemanager.cpp b/components/resource/resourcemanager.cpp
index 0a9784e6b3..d19d9cf804 100644
--- a/components/resource/resourcemanager.cpp
+++ b/components/resource/resourcemanager.cpp
@@ -13,6 +13,10 @@ namespace Resource
 
     }
 
+    ResourceManager::~ResourceManager()
+    {
+    }
+
     void ResourceManager::updateCache(double referenceTime)
     {
         mCache->updateTimeStampOfObjectsInCacheWithExternalReferences(referenceTime);
diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
index 34fce01451..b69256834e 100644
--- a/components/resource/resourcemanager.hpp
+++ b/components/resource/resourcemanager.hpp
@@ -18,6 +18,7 @@ namespace Resource
     {
     public:
         ResourceManager(const VFS::Manager* vfs);
+        virtual ~ResourceManager();
 
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
         virtual void updateCache(double referenceTime);

From 9d985d883b7abdbe31c17148955937a1912b6455 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 2 Mar 2016 20:45:04 -0500
Subject: [PATCH 383/765] added grid icon

---
 apps/opencs/view/render/pagedworldspacewidget.cpp |   2 +-
 files/opencs/grid-view-small.png                  | Bin 0 -> 472 bytes
 files/opencs/grid-view.png                        | Bin 0 -> 210 bytes
 files/opencs/resources.qrc                        |   2 ++
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 files/opencs/grid-view-small.png
 create mode 100644 files/opencs/grid-view.png

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index d71446d0b3..60c5d1a231 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -564,7 +564,7 @@ CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibil
     mControlElements->addButton (":placeholder", Mask_CellMarker, ":placeholder",
         "Cell marker");
     mControlElements->addButton (":placeholder", Mask_CellArrow, ":placeholder", "Cell arrows");
-    mControlElements->addButton (":placeholder", Mask_CellBorder, ":placeholder", "Cell border");
+    mControlElements->addButton (":scenetoolbar/grid", Mask_CellBorder, ":scenetoolbar/grid-small", "Cell border");
 
     mControlElements->setSelectionMask (0xffffffff);
 
diff --git a/files/opencs/grid-view-small.png b/files/opencs/grid-view-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a874f21b0601285bdb1834f5362f74f97f8974e
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_00DSOL_t(2&z+OOZWJ*PL|@w;uS7tg
zO`-@z`6oUh=ln?ifHOC){8SDrmK8w|DIVLELwjbI95^s1Pj|^(T~)Tt{f*REKQoZV
zIl|IAtuMW#2HQ`6ut{h(>LD;)H7tqmU*2<h`-rMB?;>g2SKQ&-84189VR>Aez_PF;
zke>;oev0!FXf^<PF_=NcoUTECHfUb&#Rw<(WCryR{F)isuK*KR5Cl>85q0xA&?ca|
z21&wq%tFOrg8Z>M?PlcbimFjaOy@_OG-zA$9o2lIC1LTXD#)3{p+z6P&Hat~Qvmsn
z1fK{H-gf$Lr%M!cTXEq{cdIUMAF(X@vr+evd|j~!yU!oEy8DS5l!rvRXoQW^-hX{J
z)UM`sG(+9|AGbu!`|7T`>cB5*&%5}S+J&_4SRRtA{Ug8(yjFWjPA`7rbl%n-(?wf-
zj@wSip0K0ZBROICc$%=V5vo2h<bNbgvqANQ(Op%Qp+S9xTdexuSM>s?=jAgCp@r@M
O0000<MNUMnLSTaIjL)qA

literal 0
HcmV?d00001

diff --git a/files/opencs/grid-view.png b/files/opencs/grid-view.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b1bcb3133e90c79fe981a0536e72a7e91683b32
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&M
z25w;xW@MN(M*=8V<muuVl5y|tHAAij1rfG{-UTaH-mETFUVrK7EUSihd`>PcU;ZX%
ze0bRW|ETJ6A+~cOZ2SkV&%DilyRKA!&he_(cW(bTbpqMaFZ9-FR)jD!keQLB%#t9!
tiJK9~zR_y3QOyjbV%80AhCe(3jGNC{Y^xHSFbOEc;OXk;vd$@?2>|IcL5lzY

literal 0
HcmV?d00001

diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 1bcd3ab4f2..973f414fb7 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -80,6 +80,8 @@
         <file alias="free-camera">flying eye.png</file>
         <file alias="orbiting-camera">orbit2.png</file>
         <file alias="play">scene-play.png</file>
+        <file alias="grid">grid-view.png</file>
+        <file alias="grid-small">grid-view-small.png</file>
         <file alias="scene-view-1">scene-view-references.png</file>
         <file alias="scene-view-16">scene-view-terrain.png</file>
         <file alias="scene-view-4">scene-view-water.png</file>

From bf9aa2e1317ec2b49ecb84b32924d0a1ba2397b2 Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Wed, 27 Jan 2016 18:50:53 +0100
Subject: [PATCH 384/765] Extracted resizing of window's width to separate
 method

---
 apps/opencs/view/doc/view.cpp | 57 +++++++++++++++++++----------------
 apps/opencs/view/doc/view.hpp |  2 +-
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 3491c9de2b..2344837445 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -570,32 +570,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     //
     mScrollbarOnly = windows["mainwindow-scrollbar"].toString() == "Scrollbar Only";
 
-    QDesktopWidget *dw = QApplication::desktop();
-    QRect rect;
-    if (windows["grow-limit"].isTrue())
-        rect = dw->screenGeometry(this);
-    else
-        rect = dw->screenGeometry(dw->screen(dw->screenNumber(this)));
-
-    if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
-    {
-        int newWidth = width()+minWidth;
-        int frameWidth = frameGeometry().width() - width();
-        if (newWidth+frameWidth <= rect.width())
-        {
-            resize(newWidth, height());
-            // WARNING: below code assumes that new subviews are added to the right
-            if (x() > rect.width()-(newWidth+frameWidth))
-                move(rect.width()-(newWidth+frameWidth), y()); // shift left to stay within the screen
-        }
-        else
-        {
-            // full width
-            resize(rect.width()-frameWidth, height());
-            mSubViewWindow.setMinimumWidth(mSubViewWindow.width()+minWidth);
-            move(0, y());
-        }
-    }
+    updateWidth(windows["grow-limit"].isTrue(), minWidth);
 
     mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
 
@@ -959,3 +934,33 @@ void CSVDoc::View::merge()
 {
     emit mergeDocument (mDocument);
 }
+
+void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
+{
+    QDesktopWidget *dw = QApplication::desktop();
+    QRect rect;
+    if (isGrowLimit)
+        rect = dw->screenGeometry(this);
+    else
+        rect = dw->screenGeometry(dw->screen(dw->screenNumber(this)));
+
+    if (!mScrollbarOnly && mScroll && mSubViews.size() > 1)
+    {
+        int newWidth = width()+minSubViewWidth;
+        int frameWidth = frameGeometry().width() - width();
+        if (newWidth+frameWidth <= rect.width())
+        {
+            resize(newWidth, height());
+            // WARNING: below code assumes that new subviews are added to the right
+            if (x() > rect.width()-(newWidth+frameWidth))
+                move(rect.width()-(newWidth+frameWidth), y()); // shift left to stay within the screen
+        }
+        else
+        {
+            // full width
+            resize(rect.width()-frameWidth, height());
+            mSubViewWindow.setMinimumWidth(mSubViewWindow.width()+minSubViewWidth);
+            move(0, y());
+        }
+    }
+}
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 7d53042693..4a620121ea 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -95,7 +95,7 @@ namespace CSVDoc
             void resizeViewHeight (int height);
 
             void updateScrollbar();
-
+            void updateWidth(bool isGrowLimit, int minSubViewWidth);
         public:
 
             View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews);

From 9539925f3e8cd0465bf6ff552dca93655f694d18 Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Mon, 1 Feb 2016 12:12:14 +0100
Subject: [PATCH 385/765] Fixed typo in updateSubViewIndices. Changed 0 to NULL
 for pointers.

---
 apps/opencs/view/doc/subview.cpp |  2 +-
 apps/opencs/view/doc/subview.hpp |  2 +-
 apps/opencs/view/doc/view.cpp    | 10 +++++-----
 apps/opencs/view/doc/view.hpp    |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index 67a8f8c705..82cbe835e7 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -47,7 +47,7 @@ void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
 
 void CSVDoc::SubView::closeEvent (QCloseEvent *event)
 {
-    emit updateSubViewIndicies (this);
+    emit updateSubViewIndices (this);
 }
 
 std::string CSVDoc::SubView::getTitle() const
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index 1c5f8a7866..8402bf79a6 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -64,7 +64,7 @@ namespace CSVDoc
 
             void updateTitle();
 
-            void updateSubViewIndicies (SubView *view = 0);
+            void updateSubViewIndices (SubView *view = NULL);
 
             void universalIdChanged (const CSMWorld::UniversalId& universalId);
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 2344837445..e606ff36d1 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -343,7 +343,7 @@ void CSVDoc::View::updateTitle()
     setWindowTitle (QString::fromUtf8(stream.str().c_str()));
 }
 
-void CSVDoc::View::updateSubViewIndicies(SubView *view)
+void CSVDoc::View::updateSubViewIndices(SubView *view)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
@@ -574,7 +574,7 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
 
-    updateSubViewIndicies();
+    updateSubViewIndices();
 
     connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)), this,
         SLOT (addSubView (const CSMWorld::UniversalId&, const std::string&)));
@@ -583,8 +583,8 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
 
-    connect (view, SIGNAL (updateSubViewIndicies (SubView *)),
-        this, SLOT (updateSubViewIndicies (SubView *)));
+    connect (view, SIGNAL (updateSubViewIndices (SubView *)),
+        this, SLOT (updateSubViewIndices (SubView *)));
 
     view->show();
 
@@ -606,7 +606,7 @@ void CSVDoc::View::moveScrollBarToEnd(int min, int max)
 void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
 {
     if (*setting=="Windows/hide-subview")
-        updateSubViewIndicies (0);
+        updateSubViewIndices (NULL);
     else if (*setting=="Windows/mainwindow-scrollbar")
     {
         if (setting->toString()!="Grow Only")
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 4a620121ea..835702e414 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -143,7 +143,7 @@ namespace CSVDoc
             void updateTitle();
 
             // called when subviews are added or removed
-            void updateSubViewIndicies (SubView *view = 0);
+            void updateSubViewIndices (SubView *view = NULL);
 
         private slots:
 

From 3bfab9c2c9068cccd13a9caab7c3ad1fa146be57 Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Mon, 1 Feb 2016 12:39:24 +0100
Subject: [PATCH 386/765] extracted creation of scroll area to separate method

---
 apps/opencs/view/doc/view.cpp | 18 ++++++++++--------
 apps/opencs/view/doc/view.hpp |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index e606ff36d1..ff52574864 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -419,10 +419,7 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
     }
     else
     {
-        mScroll = new QScrollArea(this);
-        mScroll->setWidgetResizable(true);
-        mScroll->setWidget(&mSubViewWindow);
-        setCentralWidget(mScroll);
+        createScrollArea();
     }
 
     mOperations = new Operations;
@@ -626,10 +623,7 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
             }
             else
             {
-                mScroll = new QScrollArea(this);
-                mScroll->setWidgetResizable(true);
-                mScroll->setWidget(&mSubViewWindow);
-                setCentralWidget(mScroll);
+                createScrollArea();
             }
         }
         else  if (mScroll)
@@ -964,3 +958,11 @@ void CSVDoc::View::updateWidth(bool isGrowLimit, int minSubViewWidth)
         }
     }
 }
+
+void CSVDoc::View::createScrollArea()
+{
+    mScroll = new QScrollArea(this);
+    mScroll->setWidgetResizable(true);
+    mScroll->setWidget(&mSubViewWindow);
+    setCentralWidget(mScroll);
+}
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 835702e414..d95499191e 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -96,6 +96,7 @@ namespace CSVDoc
 
             void updateScrollbar();
             void updateWidth(bool isGrowLimit, int minSubViewWidth);
+            void createScrollArea();
         public:
 
             View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews);

From 128508882a038ae54cc22569edd96e4088bc69ed Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Wed, 3 Feb 2016 16:24:43 +0100
Subject: [PATCH 387/765] Changed some zeros to NULLs in view.cpp

---
 apps/opencs/view/doc/view.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index ff52574864..6f14e5a4df 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -373,7 +373,7 @@ void CSVDoc::View::updateSubViewIndices(SubView *view)
             else
             {
                 delete subView->titleBarWidget();
-                subView->setTitleBarWidget (0);
+                subView->setTitleBarWidget (NULL);
             }
         }
     }
@@ -402,7 +402,7 @@ void CSVDoc::View::updateActions()
 
 CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)
     : mViewManager (viewManager), mDocument (document), mViewIndex (totalViews-1),
-      mViewTotal (totalViews), mScroll(0), mScrollbarOnly(false)
+      mViewTotal (totalViews), mScroll(NULL), mScrollbarOnly(false)
 {
     CSMPrefs::Category& windows = CSMPrefs::State::get()["Windows"];
 
@@ -631,7 +631,7 @@ void CSVDoc::View::settingChanged (const CSMPrefs::Setting *setting)
             mScroll->takeWidget();
             setCentralWidget (&mSubViewWindow);
             mScroll->deleteLater();
-            mScroll = 0;
+            mScroll = NULL;
         }
     }
 }

From 5e27abe874412f976f7a02e393cc57357381760c Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 09:51:33 +0100
Subject: [PATCH 388/765] updated credits file

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 79cb87e64e..6898c7a9ad 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -94,6 +94,7 @@ Programmers
     Nolan Poe (nopoe)
     Paul Cercueil (pcercuei)
     Paul McElroy (Greendogo)
+    Pi03k
     Pieter van der Kloet (pvdk)
     pkubik
     Radu-Marius Popovici (rpopovici)

From c2a8be9048fb7982bed7c90b23369e0d33e0e0c7 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 12:00:05 +0100
Subject: [PATCH 389/765] confine move marker drags to a single axis

---
 apps/opencs/view/render/instancemode.cpp | 55 ++++++++++++++++--------
 apps/opencs/view/render/instancemode.hpp |  4 +-
 apps/opencs/view/render/object.cpp       |  8 ++--
 apps/opencs/view/render/object.hpp       |  3 +-
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 24e307dc5a..f4f38dd347 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -27,7 +27,7 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None)
+  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (0)
 {
 }
 
@@ -151,8 +151,6 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
     if (selection.empty())
         return false;
 
-    // \todo check for sub-mode
-
     for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
         iter!=selection.end(); ++iter)
     {
@@ -162,7 +160,15 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
         }
     }
 
-    mDragMode = DragMode_Move;
+    // \todo check for sub-mode
+
+    if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (tag.get()))
+    {
+        mDragAxis = objectTag->mAxis;
+        mDragMode = DragMode_MoveAxis;
+    }
+    else
+        mDragMode = DragMode_Move;
 
     return true;
 }
@@ -175,23 +181,33 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
 
 void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
 {
+    osg::Vec3f eye;
+    osg::Vec3f centre;
+    osg::Vec3f up;
+
+    getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
+
+    osg::Vec3f offset;
+
+    if (diffY)
+        offset += up * diffY * speedFactor;
+
+    if (diffX)
+        offset += ((centre-eye) ^ up) * diffX * speedFactor;
+
     switch (mDragMode)
     {
+        case DragMode_MoveAxis:
+        {
+            for (int i=0; i<3; ++i)
+                if (i!=mDragAxis)
+                    offset[i] = 0;
+
+            // Fall through
+        }
+
         case DragMode_Move:
         {
-            osg::Vec3f eye;
-            osg::Vec3f centre;
-            osg::Vec3f up;
-
-            getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
-
-            osg::Vec3f offset;
-
-            if (diffY)
-                offset += up * diffY * speedFactor;
-
-            if (diffX)
-                offset += ((centre-eye) ^ up) * diffX * speedFactor;
 
             std::vector<osg::ref_ptr<TagBase> > selection =
                 getWorldspaceWidget().getEdited (Mask_Reference);
@@ -226,7 +242,10 @@ void CSVRender::InstanceMode::dragCompleted()
 
     switch (mDragMode)
     {
-        case DragMode_Move: description = "Move Instances"; break;
+        case DragMode_Move:
+        case DragMode_MoveAxis:
+
+            description = "Move Instances"; break;
 
         case DragMode_None: break;
     }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 5beec56434..e65d8146cc 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -19,13 +19,15 @@ namespace CSVRender
             enum DragMode
             {
                 DragMode_None,
-                DragMode_Move
+                DragMode_Move,
+                DragMode_MoveAxis
 
             };
 
             CSVWidget::SceneToolMode *mSubMode;
             InstanceSelectionMode *mSelectionMode;
             DragMode mDragMode;
+            int mDragAxis;
 
             int getSubModeFromId (const std::string& id) const;
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index b7efa50586..1771acdf9e 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -55,7 +55,7 @@ QString CSVRender::ObjectTag::getToolTip (bool hideBasics) const
 
 
 CSVRender::ObjectMarkerTag::ObjectMarkerTag (Object* object, int axis)
-: TagBase (Mask_Reference), mObject (object), mAxis (axis)
+: ObjectTag (object), mAxis (axis)
 {}
 
 
@@ -287,9 +287,9 @@ osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int
 {
     switch (axis)
     {
-        case 0: return osg::Vec3f (x, y, z);
-        case 1: return osg::Vec3f (z, x, y);
-        case 2: return osg::Vec3f (y, z, x);
+        case 2: return osg::Vec3f (x, y, z);
+        case 0: return osg::Vec3f (z, x, y);
+        case 1: return osg::Vec3f (y, z, x);
 
         default:
 
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 9cd0a8d670..12cb0c78b0 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -55,13 +55,12 @@ namespace CSVRender
             virtual QString getToolTip (bool hideBasics) const;
     };
 
-    class ObjectMarkerTag : public TagBase
+    class ObjectMarkerTag : public ObjectTag
     {
         public:
 
             ObjectMarkerTag (Object* object, int axis);
 
-            Object* mObject;
             int mAxis;
     };
 

From d57021b23c682598f71a6922ca9bebe0ea6d56a5 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 12:02:45 +0100
Subject: [PATCH 390/765] some code simplification

---
 apps/opencs/view/render/instancemode.cpp | 25 +++++++++---------------
 apps/opencs/view/render/instancemode.hpp |  4 +---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index f4f38dd347..91923e0044 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -27,7 +27,7 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (0)
+  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1)
 {
 }
 
@@ -165,10 +165,11 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
     if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (tag.get()))
     {
         mDragAxis = objectTag->mAxis;
-        mDragMode = DragMode_MoveAxis;
     }
     else
-        mDragMode = DragMode_Move;
+        mDragAxis = -1;
+
+    mDragMode = DragMode_Move;
 
     return true;
 }
@@ -197,17 +198,12 @@ void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
 
     switch (mDragMode)
     {
-        case DragMode_MoveAxis:
-        {
-            for (int i=0; i<3; ++i)
-                if (i!=mDragAxis)
-                    offset[i] = 0;
-
-            // Fall through
-        }
-
         case DragMode_Move:
         {
+            if (mDragAxis!=-1)
+                for (int i=0; i<3; ++i)
+                    if (i!=mDragAxis)
+                        offset[i] = 0;
 
             std::vector<osg::ref_ptr<TagBase> > selection =
                 getWorldspaceWidget().getEdited (Mask_Reference);
@@ -242,10 +238,7 @@ void CSVRender::InstanceMode::dragCompleted()
 
     switch (mDragMode)
     {
-        case DragMode_Move:
-        case DragMode_MoveAxis:
-
-            description = "Move Instances"; break;
+        case DragMode_Move: description = "Move Instances"; break;
 
         case DragMode_None: break;
     }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index e65d8146cc..5a744ea888 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -19,9 +19,7 @@ namespace CSVRender
             enum DragMode
             {
                 DragMode_None,
-                DragMode_Move,
-                DragMode_MoveAxis
-
+                DragMode_Move
             };
 
             CSVWidget::SceneToolMode *mSubMode;

From 16dca126dd0de307fa5f165f171119e37f060423 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 4 Mar 2016 12:22:13 +0100
Subject: [PATCH 391/765] PlaceAt: don't use actor's X/Y rotation

---
 apps/openmw/mwworld/worldimp.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 0dbadca176..9f77dfed1b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1360,8 +1360,16 @@ namespace MWWorld
             }
         }
 
-        ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];
-        ipos.rot[1] = referenceObject.getRefData().getPosition().rot[1];
+        if (!referenceObject.getClass().isActor())
+        {
+            ipos.rot[0] = referenceObject.getRefData().getPosition().rot[0];
+            ipos.rot[1] = referenceObject.getRefData().getPosition().rot[1];
+        }
+        else
+        {
+            ipos.rot[0] = 0;
+            ipos.rot[1] = 0;
+        }
         ipos.rot[2] = referenceObject.getRefData().getPosition().rot[2];
 
         MWWorld::Ptr placed = copyObjectToCell(ptr, referenceCell, ipos, ptr.getRefData().getCount(), false);

From 76b47c6d5dda103084d2e5c24f0470932e07f87a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 4 Mar 2016 12:25:22 +0100
Subject: [PATCH 392/765] PlaceAt: don't correct spawn points for non-actors

---
 apps/openmw/mwworld/worldimp.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 9f77dfed1b..9486126234 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1341,12 +1341,16 @@ namespace MWWorld
         for (int i=0; i<4; ++i)
         {
             direction = fallbackDirections[i];
-            // check if spawn point is safe, fall back to another direction if not
             osg::Vec3f spawnPoint = pos;
             if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
             else if(direction == 1) spawnPoint = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
             else if(direction == 2) spawnPoint = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
             else if(direction == 3) spawnPoint = pos + (orientation * osg::Vec3f(1,0,0)) * distance;
+
+            if (!ptr.getClass().isActor())
+                break;
+
+            // check if spawn point is safe, fall back to another direction if not
             spawnPoint.z() += 30; // move up a little to account for slopes, will snap down later
 
             if (!castRay(spawnPoint.x(), spawnPoint.y(), spawnPoint.z(),

From 1240e0c716fee64a072affaabaad3a42c84037e8 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 15:19:26 +0100
Subject: [PATCH 393/765] cancel instance move on drag abort

---
 apps/opencs/view/render/cell.cpp                    | 8 ++++++++
 apps/opencs/view/render/cell.hpp                    | 4 ++++
 apps/opencs/view/render/instancemode.cpp            | 6 ++++++
 apps/opencs/view/render/instancemode.hpp            | 4 ++++
 apps/opencs/view/render/object.cpp                  | 7 +++++++
 apps/opencs/view/render/object.hpp                  | 4 ++++
 apps/opencs/view/render/pagedworldspacewidget.cpp   | 7 +++++++
 apps/opencs/view/render/pagedworldspacewidget.hpp   | 3 +++
 apps/opencs/view/render/unpagedworldspacewidget.cpp | 5 +++++
 apps/opencs/view/render/unpagedworldspacewidget.hpp | 3 +++
 apps/opencs/view/render/worldspacewidget.hpp        | 3 +++
 11 files changed, 54 insertions(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 6e47d35945..782a37796b 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -376,3 +376,11 @@ void CSVRender::Cell::setSubMode (int subMode, unsigned int elementMask)
             iter!=mObjects.end(); ++iter)
                 iter->second->setSubMode (subMode);
 }
+
+void CSVRender::Cell::reset (unsigned int elementMask)
+{
+    if (elementMask & Mask_Reference)
+        for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
+            iter!=mObjects.end(); ++iter)
+            iter->second->reset();
+}
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 21949992d1..4af5e4a25c 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -122,6 +122,10 @@ namespace CSVRender
             std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) const;
 
             void setSubMode (int subMode, unsigned int elementMask);
+
+            /// Erase all overrides and restore the visual representation of the cell to its
+            /// true state.
+            void reset (unsigned int elementMask);
     };
 }
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 91923e0044..3327538111 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -259,6 +259,12 @@ void CSVRender::InstanceMode::dragCompleted()
     mDragMode = DragMode_None;
 }
 
+void CSVRender::InstanceMode::dragAborted()
+{
+    getWorldspaceWidget().reset (Mask_Reference);
+    mDragMode = DragMode_None;
+}
+
 void CSVRender::InstanceMode::dragWheel (int diff, double speedFactor)
 {
     if (mDragMode==DragMode_Move)
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 5a744ea888..94bdbb08f0 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -53,6 +53,10 @@ namespace CSVRender
 
             virtual void dragCompleted();
 
+            /// \note dragAborted will not be called, if the drag is aborted via changing
+            /// editing mode
+            virtual void dragAborted();
+
             virtual void dragWheel (int diff, double speedFactor);
 
             virtual void dragEnterEvent (QDragEnterEvent *event);
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 1771acdf9e..6ca751ba56 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -574,3 +574,10 @@ void CSVRender::Object::setSubMode (int subMode)
         updateMarker();
     }
 }
+
+void CSVRender::Object::reset()
+{
+    mOverrideFlags = 0;
+    adjustTransform();
+    updateMarker();
+}
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 12cb0c78b0..a5cc141a0f 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -175,6 +175,10 @@ namespace CSVRender
             void apply (QUndoStack& undoStack);
 
             void setSubMode (int subMode);
+
+            /// Erase all overrides and restore the visual representation of the object to its
+            /// true state.
+            void reset();
     };
 }
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 68c8949f32..0ca3ff706a 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -582,6 +582,13 @@ void CSVRender::PagedWorldspaceWidget::setSubMode (int subMode, unsigned int ele
         iter->second->setSubMode (subMode, elementMask);
 }
 
+void CSVRender::PagedWorldspaceWidget::reset (unsigned int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::const_iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->reset (elementMask);
+}
+
 CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index c77c3ebd23..fe533be2dc 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -117,6 +117,9 @@ namespace CSVRender
 
             virtual void setSubMode (int subMode, unsigned int elementMask);
 
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask);
+
         protected:
 
             virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 60aeeb4d81..16c28cf930 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -142,6 +142,11 @@ void  CSVRender::UnpagedWorldspaceWidget::setSubMode (int subMode, unsigned int
     mCell->setSubMode (subMode, elementMask);
 }
 
+void CSVRender::UnpagedWorldspaceWidget::reset (unsigned int elementMask)
+{
+    mCell->reset (elementMask);
+}
+
 void CSVRender::UnpagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index a3718d9f3b..c5bfd22e65 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -65,6 +65,9 @@ namespace CSVRender
 
             virtual void setSubMode (int subMode, unsigned int elementMask);
 
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask);
+
         private:
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index eee618ed1a..55b0f1f551 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -158,6 +158,9 @@ namespace CSVRender
 
             virtual void setSubMode (int subMode, unsigned int elementMask) = 0;
 
+            /// Erase all overrides and restore the visual representation to its true state.
+            virtual void reset (unsigned int elementMask) = 0;
+
         protected:
 
             /// Visual elements in a scene

From 25effc4222e0b050abc3b95d16479faef77d06b5 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 15:30:28 +0100
Subject: [PATCH 394/765] cancel instance move on sub mode change

---
 apps/opencs/view/render/instancemode.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 3327538111..bfc233d29f 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -440,5 +440,6 @@ int CSVRender::InstanceMode::getSubMode() const
 
 void CSVRender::InstanceMode::subModeChanged (const std::string& id)
 {
+    getWorldspaceWidget().reset (Mask_Reference);
     getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
 }

From 1726393963fc4bff781eb6a43460647bae2a3fe2 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 15:31:50 +0100
Subject: [PATCH 395/765] cancel instance move on edit mode change

---
 apps/opencs/view/render/instancemode.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index bfc233d29f..d31327137c 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -71,6 +71,8 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
 
 void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
 {
+    getWorldspaceWidget().reset (Mask_Reference);
+
     if (mSelectionMode)
     {
         toolbar->removeTool (mSelectionMode);

From dd564daba05f6cd7595630be5661e2198b88bb82 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 16:24:02 +0100
Subject: [PATCH 396/765] do not start move drags while the document is locked
 for editing

---
 apps/opencs/view/render/instancemode.cpp | 13 +++++++++++--
 apps/opencs/view/render/instancemode.hpp |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index d31327137c..e8a7d95d7d 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -27,7 +27,8 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1)
+  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1),
+  mLocked (false)
 {
 }
 
@@ -90,6 +91,12 @@ void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
     EditMode::deactivate (toolbar);
 }
 
+void CSVRender::InstanceMode::setEditLock (bool locked)
+{
+    mLocked = locked;
+
+}
+
 void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
@@ -134,7 +141,7 @@ void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
 
 bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
 {
-    if (mDragMode!=DragMode_None)
+    if (mDragMode!=DragMode_None || mLocked)
         return false;
 
     if (tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
@@ -178,6 +185,8 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
 
 bool CSVRender::InstanceMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
 {
+    if (mLocked)
+        return false;
 
     return false;
 }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 94bdbb08f0..20b685916d 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -26,6 +26,7 @@ namespace CSVRender
             InstanceSelectionMode *mSelectionMode;
             DragMode mDragMode;
             int mDragAxis;
+            bool mLocked;
 
             int getSubModeFromId (const std::string& id) const;
 
@@ -37,6 +38,8 @@ namespace CSVRender
 
             virtual void deactivate (CSVWidget::SceneToolbar *toolbar);
 
+            virtual void setEditLock (bool locked);
+
             virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
 
             virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);

From b1fb64bf685cf74c5548fb5d18b7c260de1d4a5a Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 16:25:30 +0100
Subject: [PATCH 397/765] added missing drag mode resets

---
 apps/opencs/view/render/instancemode.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index e8a7d95d7d..74df6740ef 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -72,6 +72,7 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
 
 void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
 {
+    mDragMode = DragMode_None;
     getWorldspaceWidget().reset (Mask_Reference);
 
     if (mSelectionMode)
@@ -451,6 +452,7 @@ int CSVRender::InstanceMode::getSubMode() const
 
 void CSVRender::InstanceMode::subModeChanged (const std::string& id)
 {
+    mDragMode = DragMode_None;
     getWorldspaceWidget().reset (Mask_Reference);
     getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
 }

From 70745487f388851ac41204d81f5238e54979bfa2 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 5 Mar 2016 10:44:46 +0100
Subject: [PATCH 398/765] cancel instance move on editing lock becoming active

---
 apps/opencs/view/render/instancemode.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 74df6740ef..0c4da49631 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -96,6 +96,11 @@ void CSVRender::InstanceMode::setEditLock (bool locked)
 {
     mLocked = locked;
 
+    if (mLocked)
+    {
+        mDragMode = DragMode_None;
+        getWorldspaceWidget().reset (Mask_Reference);
+    }
 }
 
 void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)

From 51a4e3fa7d980349516100184e455d4449e59435 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 5 Mar 2016 10:56:54 +0100
Subject: [PATCH 399/765] properly abort drags from outside the worldspace
 widget (code was leaving unclean dragging flags behind)

---
 apps/opencs/view/render/instancemode.cpp     |  8 ++------
 apps/opencs/view/render/worldspacewidget.cpp | 19 ++++++++++++-------
 apps/opencs/view/render/worldspacewidget.hpp |  6 ++++++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 0c4da49631..80529d80d5 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -97,10 +97,7 @@ void CSVRender::InstanceMode::setEditLock (bool locked)
     mLocked = locked;
 
     if (mLocked)
-    {
-        mDragMode = DragMode_None;
-        getWorldspaceWidget().reset (Mask_Reference);
-    }
+        getWorldspaceWidget().abortDrag();
 }
 
 void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)
@@ -457,7 +454,6 @@ int CSVRender::InstanceMode::getSubMode() const
 
 void CSVRender::InstanceMode::subModeChanged (const std::string& id)
 {
-    mDragMode = DragMode_None;
-    getWorldspaceWidget().reset (Mask_Reference);
+    getWorldspaceWidget().abortDrag();
     getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
 }
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 83feb0be3e..aea23ba7e4 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -364,6 +364,17 @@ osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& loca
     return start + direction * CSMPrefs::get()["Scene Drops"]["distance"].toInt();
 }
 
+void CSVRender::WorldspaceWidget::abortDrag()
+{
+    if (mDragging)
+    {
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+
+        editMode.dragAborted();
+        mDragging = false;
+    }
+}
+
 void CSVRender::WorldspaceWidget::dragEnterEvent (QDragEnterEvent* event)
 {
     const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
@@ -736,13 +747,7 @@ void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)
 {
     if(event->key() == Qt::Key_Escape)
     {
-        if (mDragging)
-        {
-            EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-
-            editMode.dragAborted();
-            mDragging = false;
-        }
+        abortDrag();
     }
     else
         RenderWidget::keyPressEvent(event);
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 55b0f1f551..4c9c0c31e7 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -161,6 +161,12 @@ namespace CSVRender
             /// Erase all overrides and restore the visual representation to its true state.
             virtual void reset (unsigned int elementMask) = 0;
 
+            /// \note Drags will be automatically aborted when the aborting is triggered
+            /// (either explicitly or implicitly) from within this class. This function only
+            /// needs to be called, when the drag abort is triggered externally (e.g. from
+            /// an edit mode).
+            void abortDrag();
+
         protected:
 
             /// Visual elements in a scene

From a63453846b78bde8a7a7f5f82f77ce6b192eb221 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 5 Mar 2016 11:14:08 +0100
Subject: [PATCH 400/765] properly clear drag mode at the end of a drag

---
 apps/opencs/view/render/worldspacewidget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index aea23ba7e4..df57904735 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -372,6 +372,7 @@ void CSVRender::WorldspaceWidget::abortDrag()
 
         editMode.dragAborted();
         mDragging = false;
+        mDragMode.clear();
     }
 }
 
@@ -584,6 +585,7 @@ void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id)
 {
     dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
     mDragging = false;
+    mDragMode.clear();
 }
 
 void CSVRender::WorldspaceWidget::showToolTip()

From b5005f7812bd61e1d36b04afae625b74619d36b7 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 5 Mar 2016 11:41:42 +0100
Subject: [PATCH 401/765] keep sub mode over mode changes

---
 apps/opencs/view/render/instancemode.cpp  |  7 ++-
 apps/opencs/view/render/instancemode.hpp  |  1 +
 apps/opencs/view/widget/scenetoolmode.cpp | 52 +++++++++++++++--------
 apps/opencs/view/widget/scenetoolmode.hpp |  5 +++
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 80529d80d5..6fa8ddaa8e 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -27,8 +27,8 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
-  parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1),
-  mLocked (false)
+  parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
+  mDragAxis (-1), mLocked (false)
 {
 }
 
@@ -51,6 +51,8 @@ void CSVRender::InstanceMode::activate (CSVWidget::SceneToolbar *toolbar)
             "</ul>"
             "<font color=Red>Not implemented yet</font color>");
 
+        mSubMode->setButton (mSubModeId);
+
         connect (mSubMode, SIGNAL (modeChanged (const std::string&)),
             this, SLOT (subModeChanged (const std::string&)));
     }
@@ -454,6 +456,7 @@ int CSVRender::InstanceMode::getSubMode() const
 
 void CSVRender::InstanceMode::subModeChanged (const std::string& id)
 {
+    mSubModeId = id;
     getWorldspaceWidget().abortDrag();
     getWorldspaceWidget().setSubMode (getSubModeFromId (id), Mask_Reference);
 }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 20b685916d..db7fdaa96e 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -23,6 +23,7 @@ namespace CSVRender
             };
 
             CSVWidget::SceneToolMode *mSubMode;
+            std::string mSubModeId;
             InstanceSelectionMode *mSelectionMode;
             DragMode mDragMode;
             int mDragAxis;
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 08e8ad5a4f..c91890c697 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -38,6 +38,27 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
     setToolTip (toolTip);
 }
 
+void CSVWidget::SceneToolMode::setButton (std::map<ModeButton *, std::string>::iterator iter)
+{
+    for (std::map<ModeButton *, std::string>::const_iterator iter2 = mButtons.begin();
+        iter2!=mButtons.end(); ++iter2)
+        iter2->first->setChecked (iter2==iter);
+
+    setIcon (iter->first->icon());
+    adjustToolTip (iter->first);
+
+    if (mCurrent!=iter->first)
+    {
+        if (mCurrent)
+            mCurrent->deactivate (mToolbar);
+
+        mCurrent = iter->first;
+        mCurrent->activate (mToolbar);
+    }
+
+    emit modeChanged (iter->second);
+}
+
 CSVWidget::SceneToolMode::SceneToolMode (SceneToolbar *parent, const QString& toolTip)
 : SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()),
   mToolTip (toolTip), mFirst (0), mCurrent (0), mToolbar (parent)
@@ -101,9 +122,20 @@ std::string CSVWidget::SceneToolMode::getCurrentId() const
     return mButtons.find (mCurrent)->second;
 }
 
+void CSVWidget::SceneToolMode::setButton (const std::string& id)
+{
+    for (std::map<ModeButton *, std::string>::iterator iter = mButtons.begin();
+        iter!=mButtons.end(); ++iter)
+        if (iter->second==id)
+        {
+            setButton (iter);
+            break;
+        }
+}
+
 void CSVWidget::SceneToolMode::selected()
 {
-    std::map<ModeButton *, std::string>::const_iterator iter =
+    std::map<ModeButton *, std::string>::iterator iter =
         mButtons.find (dynamic_cast<ModeButton *> (sender()));
 
     if (iter!=mButtons.end())
@@ -111,22 +143,6 @@ void CSVWidget::SceneToolMode::selected()
         if (!iter->first->hasKeepOpen())
             mPanel->hide();
 
-        for (std::map<ModeButton *, std::string>::const_iterator iter2 = mButtons.begin();
-            iter2!=mButtons.end(); ++iter2)
-            iter2->first->setChecked (iter2==iter);
-
-        setIcon (iter->first->icon());
-        adjustToolTip (iter->first);
-
-        if (mCurrent!=iter->first)
-        {
-            if (mCurrent)
-                mCurrent->deactivate (mToolbar);
-
-            mCurrent = iter->first;
-            mCurrent->activate (mToolbar);
-        }
-
-        emit modeChanged (iter->second);
+        setButton (iter);
     }
 }
diff --git a/apps/opencs/view/widget/scenetoolmode.hpp b/apps/opencs/view/widget/scenetoolmode.hpp
index c274d84ab2..192b3ee78b 100644
--- a/apps/opencs/view/widget/scenetoolmode.hpp
+++ b/apps/opencs/view/widget/scenetoolmode.hpp
@@ -41,6 +41,8 @@ namespace CSVWidget
             /// items to be added, the function must return true anyway.
             virtual bool createContextMenu (QMenu *menu);
 
+            void setButton (std::map<ModeButton *, std::string>::iterator iter);
+
         public:
 
             SceneToolMode (SceneToolbar *parent, const QString& toolTip);
@@ -59,6 +61,9 @@ namespace CSVWidget
             /// Must not be called if there aren't any buttons yet.
             std::string getCurrentId() const;
 
+            /// Manually change the current mode
+            void setButton (const std::string& id);
+
         signals:
 
             void modeChanged (const std::string& id);

From 910e41e3c472612623e0c2dbd12ab88d693b7e37 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 15:56:19 +0100
Subject: [PATCH 402/765] Allow an Object to be specified as ignore parameter
 for castRay

---
 apps/openmw/mwphysics/physicssystem.cpp | 19 +++++++++++++++++++
 apps/openmw/mwphysics/physicssystem.hpp |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 784910d51d..15cb39fb12 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -557,6 +557,11 @@ namespace MWPhysics
             return mCollisionObject.get();
         }
 
+        const btCollisionObject* getCollisionObject() const
+        {
+            return mCollisionObject.get();
+        }
+
         /// Return solid flag. Not used by the object itself, true by default.
         bool isSolid() const
         {
@@ -883,6 +888,12 @@ namespace MWPhysics
             const Actor* actor = getActor(ignore);
             if (actor)
                 me = actor->getCollisionObject();
+            else
+            {
+                const Object* object = getObject(ignore);
+                if (object)
+                    me = object->getCollisionObject();
+            }
         }
 
         ClosestNotMeRayResultCallback resultCallback(me, btFrom, btTo);
@@ -1174,6 +1185,14 @@ namespace MWPhysics
         return NULL;
     }
 
+    const Object* PhysicsSystem::getObject(const MWWorld::ConstPtr &ptr) const
+    {
+        ObjectMap::const_iterator found = mObjects.find(ptr);
+        if (found != mObjects.end())
+            return found->second;
+        return NULL;
+    }
+
     void PhysicsSystem::updateScale(const MWWorld::Ptr &ptr)
     {
         ObjectMap::iterator found = mObjects.find(ptr);
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 62ebf4f0e9..c12672285e 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -70,6 +70,8 @@ namespace MWPhysics
             Actor* getActor(const MWWorld::Ptr& ptr);
             const Actor* getActor(const MWWorld::ConstPtr& ptr) const;
 
+            const Object* getObject(const MWWorld::ConstPtr& ptr) const;
+
             // Object or Actor
             void remove (const MWWorld::Ptr& ptr);
 

From 004f0d37d532a173e864d3719654a446389b4f1d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 15:56:54 +0100
Subject: [PATCH 403/765] Fix the projectile launch position for spells cast
 from objects (Fixes #3235)

---
 apps/openmw/mwworld/projectilemanager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 881530c8a4..3fafadec3b 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -117,7 +117,11 @@ namespace MWWorld
                                             const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
                                             const osg::Vec3f& fallbackDirection)
     {
-        osg::Vec3f pos = mPhysics->getCollisionObjectPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
+        osg::Vec3f pos;
+        if (caster.getClass().isActor())
+            pos = mPhysics->getCollisionObjectPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
+        else
+            pos = caster.getRefData().getPosition().asVec3();
 
         if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
             return;

From c085e503c6d8f04e0fa5a101768ad29ce33e3edd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 16:09:56 +0100
Subject: [PATCH 404/765] Pass the btCollisionObject as const

---
 apps/openmw/mwphysics/physicssystem.cpp |  8 ++++----
 apps/openmw/mwphysics/trace.cpp         | 12 ++++++------
 apps/openmw/mwphysics/trace.h           |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 15cb39fb12..d2d95d9376 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -68,8 +68,8 @@ namespace MWPhysics
             return osg::RadiansToDegrees(std::acos(normal * osg::Vec3f(0.f, 0.f, 1.f)));
         }
 
-        static bool stepMove(btCollisionObject *colobj, osg::Vec3f &position,
-                             const osg::Vec3f &toMove, float &remainingTime, btCollisionWorld* collisionWorld)
+        static bool stepMove(const btCollisionObject *colobj, osg::Vec3f &position,
+                             const osg::Vec3f &toMove, float &remainingTime, const btCollisionWorld* collisionWorld)
         {
             /*
              * Slide up an incline or set of stairs.  Should be called only after a
@@ -235,7 +235,7 @@ namespace MWPhysics
         }
 
         static osg::Vec3f move(osg::Vec3f position, const MWWorld::Ptr &ptr, Actor* physicActor, const osg::Vec3f &movement, float time,
-                                  bool isFlying, float waterlevel, float slowFall, btCollisionWorld* collisionWorld,
+                                  bool isFlying, float waterlevel, float slowFall, const btCollisionWorld* collisionWorld,
                                std::map<MWWorld::Ptr, MWWorld::Ptr>& standingCollisionTracker)
         {
             const ESM::Position& refpos = ptr.getRefData().getPosition();
@@ -254,7 +254,7 @@ namespace MWPhysics
                                     ) * movement * time;
             }
 
-            btCollisionObject *colobj = physicActor->getCollisionObject();
+            const btCollisionObject *colobj = physicActor->getCollisionObject();
             osg::Vec3f halfExtents = physicActor->getHalfExtents();
 
             // NOTE: here we don't account for the collision box translation (i.e. physicActor->getPosition() - refpos.pos).
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index 94434b856a..420ca1a9e5 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -16,7 +16,7 @@ namespace MWPhysics
 class ClosestNotMeConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback
 {
 public:
-    ClosestNotMeConvexResultCallback(btCollisionObject *me, const btVector3 &up, btScalar minSlopeDot)
+    ClosestNotMeConvexResultCallback(const btCollisionObject *me, const btVector3 &up, btScalar minSlopeDot)
       : btCollisionWorld::ClosestConvexResultCallback(btVector3(0.0, 0.0, 0.0), btVector3(0.0, 0.0, 0.0)),
         mMe(me), mUp(up), mMinSlopeDot(minSlopeDot)
     {
@@ -44,13 +44,13 @@ public:
     }
 
 protected:
-    btCollisionObject *mMe;
+    const btCollisionObject *mMe;
     const btVector3 mUp;
     const btScalar mMinSlopeDot;
 };
 
 
-void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world)
+void ActorTracer::doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
     const btVector3 btstart = toBullet(start);
     const btVector3 btend = toBullet(end);
@@ -66,9 +66,9 @@ void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, con
     newTraceCallback.m_collisionFilterGroup = actor->getBroadphaseHandle()->m_collisionFilterGroup;
     newTraceCallback.m_collisionFilterMask = actor->getBroadphaseHandle()->m_collisionFilterMask;
 
-    btCollisionShape *shape = actor->getCollisionShape();
+    const btCollisionShape *shape = actor->getCollisionShape();
     assert(shape->isConvex());
-    world->convexSweepTest(static_cast<btConvexShape*>(shape),
+    world->convexSweepTest(static_cast<const btConvexShape*>(shape),
                                                from, to, newTraceCallback);
 
     // Copy the hit data over to our trace results struct:
@@ -89,7 +89,7 @@ void ActorTracer::doTrace(btCollisionObject *actor, const osg::Vec3f& start, con
     }
 }
 
-void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world)
+void ActorTracer::findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world)
 {
     const btVector3 btstart(start.x(), start.y(), start.z()+1.0f);
     const btVector3 btend(end.x(), end.y(), end.z()+1.0f);
diff --git a/apps/openmw/mwphysics/trace.h b/apps/openmw/mwphysics/trace.h
index ef1a24d44a..7b7d0391e6 100644
--- a/apps/openmw/mwphysics/trace.h
+++ b/apps/openmw/mwphysics/trace.h
@@ -19,8 +19,8 @@ namespace MWPhysics
 
         float mFraction;
 
-        void doTrace(btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world);
-        void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, btCollisionWorld* world);
+        void doTrace(const btCollisionObject *actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
+        void findGround(const Actor* actor, const osg::Vec3f& start, const osg::Vec3f& end, const btCollisionWorld* world);
     };
 }
 

From 5ea7446eeb9ce8dc163c9954464311f8fa9b61dd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 19:41:45 +0100
Subject: [PATCH 405/765] Change a dynamic_cast to static_cast

---
 apps/openmw/mwphysics/physicssystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index d2d95d9376..db1bf52deb 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -585,7 +585,7 @@ namespace MWPhysics
 
             assert (mShapeInstance->getCollisionShape()->isCompound());
 
-            btCompoundShape* compound = dynamic_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
+            btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->getCollisionShape());
 
             for (std::map<int, int>::iterator it = mShapeInstance->mAnimatedShapes.begin(); it != mShapeInstance->mAnimatedShapes.end();)
             {

From 373c1e760267e01afc0c1390043d70d254d26fb1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 19:48:01 +0100
Subject: [PATCH 406/765] Assign the PageDisplay on initialization

---
 apps/openmw/mwgui/bookpage.cpp | 65 +++++++++++++++-------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 8506f04edf..dbd829176f 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -1252,72 +1252,65 @@ class BookPageImpl : public BookPage
 MYGUI_RTTI_DERIVED(BookPage)
 public:
 
+    BookPageImpl()
+        : mPageDisplay(NULL)
+    {
+    }
+
     void showPage (TypesetBook::Ptr book, size_t page)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-            pd->showPage (book, page);
-        else
-            throw std::runtime_error ("The main sub-widget for a BookPage must be a PageDisplay.");
+        mPageDisplay->showPage (book, page);
     }
 
     void adviseLinkClicked (boost::function <void (InteractiveId)> linkClicked)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->mLinkClicked = linkClicked;
-        }
+        mPageDisplay->mLinkClicked = linkClicked;
     }
 
     void unadviseLinkClicked ()
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->mLinkClicked = boost::function <void (InteractiveId)> ();
-        }
+        mPageDisplay->mLinkClicked = boost::function <void (InteractiveId)> ();
     }
 
 protected:
+
+    virtual void initialiseOverride()
+    {
+        Base::initialiseOverride();
+
+        if (getSubWidgetText())
+        {
+            mPageDisplay = getSubWidgetText()->castType<PageDisplay>();
+        }
+        else
+        {
+            throw std::runtime_error("BookPage unable to find page display sub widget");
+        }
+    }
+
     void onMouseLostFocus(Widget* _new)
     {
         // NOTE: MyGUI also fires eventMouseLostFocus for widgets that are about to be destroyed (if they had focus).
         // Child widgets may already be destroyed! So be careful.
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseLostFocus ();
-        }
-        else
-            Widget::onMouseLostFocus (_new);
+        mPageDisplay->onMouseLostFocus ();
     }
 
     void onMouseMove(int left, int top)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseMove (left, top);
-        }
-        else
-            Widget::onMouseMove (left, top);
+        mPageDisplay->onMouseMove (left, top);
     }
 
     void onMouseButtonPressed (int left, int top, MyGUI::MouseButton id)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseButtonPressed (left, top, id);
-        }
-        else
-            Widget::onMouseButtonPressed (left, top, id);
+        mPageDisplay->onMouseButtonPressed (left, top, id);
     }
 
     void onMouseButtonReleased(int left, int top, MyGUI::MouseButton id)
     {
-        if (PageDisplay* pd = dynamic_cast <PageDisplay*> (getSubWidgetText ()))
-        {
-            pd->onMouseButtonReleased (left, top, id);
-        }
-        else
-            Widget::onMouseButtonReleased (left, top, id);
+        mPageDisplay->onMouseButtonReleased (left, top, id);
     }
+
+    PageDisplay* mPageDisplay;
 };
 
 void BookPage::registerMyGUIComponents ()

From 763f64741255147501b63c94424195d8a996764a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 19:53:24 +0100
Subject: [PATCH 407/765] Add ItemModel::allowedToInsertItems

---
 apps/openmw/mwgui/container.cpp           | 4 ++--
 apps/openmw/mwgui/itemmodel.cpp           | 5 +++++
 apps/openmw/mwgui/itemmodel.hpp           | 3 +++
 apps/openmw/mwgui/pickpocketitemmodel.cpp | 6 ++++++
 apps/openmw/mwgui/pickpocketitemmodel.hpp | 1 +
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 5d71fc445d..e1b5c120af 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -57,7 +57,7 @@ namespace MWGui
     {
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
-            if (!dynamic_cast<PickpocketItemModel*>(mModel))
+            if (mModel && mModel->allowedToInsertItems())
                 dropItem();
             return;
         }
@@ -126,7 +126,7 @@ namespace MWGui
 
     void ContainerWindow::onBackgroundSelected()
     {
-        if (mDragAndDrop->mIsOnDragAndDrop && !dynamic_cast<PickpocketItemModel*>(mModel))
+        if (mDragAndDrop->mIsOnDragAndDrop && mModel && mModel->allowedToInsertItems())
             dropItem();
     }
 
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 2c382f3cf4..390bb0586a 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -119,6 +119,11 @@ namespace MWGui
         return ret;
     }
 
+    bool ItemModel::allowedToInsertItems() const
+    {
+        return true;
+    }
+
 
     ProxyItemModel::ProxyItemModel()
         : mSourceModel(NULL)
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index 2019c10426..20955b2065 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -70,6 +70,9 @@ namespace MWGui
         virtual MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool setNewOwner=false) = 0;
         virtual void removeItem (const ItemStack& item, size_t count) = 0;
 
+        /// Is the player allowed to insert items into this model? (default true)
+        virtual bool allowedToInsertItems() const;
+
     private:
         ItemModel(const ItemModel&);
         ItemModel& operator=(const ItemModel&);
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.cpp b/apps/openmw/mwgui/pickpocketitemmodel.cpp
index ab0d02f950..238fb59131 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@@ -64,4 +64,10 @@ namespace MWGui
         /// \todo check if player is detected
     }
 
+    bool PickpocketItemModel::allowedToInsertItems() const
+    {
+        // don't allow "reverse pickpocket" (yet)
+        return false;
+    }
+
 }
diff --git a/apps/openmw/mwgui/pickpocketitemmodel.hpp b/apps/openmw/mwgui/pickpocketitemmodel.hpp
index af72119c89..61f0569b5e 100644
--- a/apps/openmw/mwgui/pickpocketitemmodel.hpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.hpp
@@ -15,6 +15,7 @@ namespace MWGui
         virtual size_t getItemCount();
         virtual void update();
         virtual void removeItem (const ItemStack& item, size_t count);
+        virtual bool allowedToInsertItems() const;
 
     private:
         std::vector<ItemStack> mHiddenItems;

From 60a12b3dee7004ec64c388dbe519f40b5837ab81 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 20:00:51 +0100
Subject: [PATCH 408/765] Use MyGUI's castType function

---
 apps/openmw/mwgui/windowmanagerimp.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index f5d78aee62..1b2c455209 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1635,9 +1635,7 @@ namespace MWGui
         layout->mMainWidget->setPosition(pos);
         layout->mMainWidget->setSize(size);
 
-        MyGUI::Window* window = dynamic_cast<MyGUI::Window*>(layout->mMainWidget);
-        if (!window)
-            throw std::runtime_error("Attempting to track size of a non-resizable window");
+        MyGUI::Window* window = layout->mMainWidget->castType<MyGUI::Window>();
         window->eventWindowChangeCoord += MyGUI::newDelegate(this, &WindowManager::onWindowChangeCoord);
         mTrackedWindows[window] = name;
     }
@@ -2010,7 +2008,7 @@ namespace MWGui
         while (enumerator.next())
         {
             MyGUI::IResource* resource = enumerator.current().second;
-            ResourceImageSetPointerFix* imgSetPointer = dynamic_cast<ResourceImageSetPointerFix*>(resource);
+            ResourceImageSetPointerFix* imgSetPointer = resource->castType<ResourceImageSetPointerFix>(false);
             if (!imgSetPointer)
                 continue;
             std::string tex_name = imgSetPointer->getImageSet()->getIndexInfo(0,0).texture;

From 82b792f808241e05cddbda5425d5d1ed5b1af594 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 5 Mar 2016 20:02:33 +0100
Subject: [PATCH 409/765] Eliminate dynamic_cast in BillboardCallback

---
 components/nifosg/nifloader.cpp | 42 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 705dbe83aa..a5f9bd9509 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -132,31 +132,27 @@ namespace
 
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
         {
-            osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
-            if (node && cv)
+            osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+
+            osg::Matrix modelView = *cv->getModelViewMatrix();
+
+            // attempt to preserve scale
+            float mag[3];
+            for (int i=0;i<3;++i)
             {
-                osg::Matrix modelView = *cv->getModelViewMatrix();
-
-                // attempt to preserve scale
-                float mag[3];
-                for (int i=0;i<3;++i)
-                {
-                    mag[i] = std::sqrt(modelView(0,i) * modelView(0,i) + modelView(1,i) * modelView(1,i) + modelView(2,i) * modelView(2,i));
-                }
-
-                modelView.setRotate(osg::Quat());
-                modelView(0,0) = mag[0];
-                modelView(1,1) = mag[1];
-                modelView(2,2) = mag[2];
-
-                cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
-
-                traverse(node, nv);
-
-                cv->popModelViewMatrix();
+                mag[i] = std::sqrt(modelView(0,i) * modelView(0,i) + modelView(1,i) * modelView(1,i) + modelView(2,i) * modelView(2,i));
             }
-            else
-                traverse(node, nv);
+
+            modelView.setRotate(osg::Quat());
+            modelView(0,0) = mag[0];
+            modelView(1,1) = mag[1];
+            modelView(2,2) = mag[2];
+
+            cv->pushModelViewMatrix(new osg::RefMatrix(modelView), osg::Transform::RELATIVE_RF);
+
+            traverse(node, nv);
+
+            cv->popModelViewMatrix();
         }
     };
 

From 0df975a4d7f02ab86fdb2f63d610940e2ef6dbe5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 6 Mar 2016 11:33:07 +0100
Subject: [PATCH 410/765] Properly detach nodes in CopyRigVisitor (Fixes #3234)

---
 apps/openmw/mwrender/animation.cpp |  4 ++++
 components/sceneutil/attach.cpp    | 24 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 5cf502476a..36feeb7bef 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1458,7 +1458,11 @@ namespace MWRender
     PartHolder::~PartHolder()
     {
         if (mNode.get() && mNode->getNumParents())
+        {
+            if (mNode->getNumParents() > 1)
+                std::cerr << "Warning: part has multiple parents " << mNode->getNumParents() << " " << mNode.get() << std::endl;
             mNode->getParent(0)->removeChild(mNode);
+        }
     }
 
     void PartHolder::unlink()
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 8ac0aa9929..1f06e8327b 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -1,6 +1,7 @@
 #include "attach.hpp"
 
 #include <stdexcept>
+#include <iostream>
 
 #include <osg/NodeVisitor>
 #include <osg/Group>
@@ -34,14 +35,30 @@ namespace SceneUtil
             std::string lowerName = Misc::StringUtils::lowerCase(node.getName());
             if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
                     || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
-            {
-                mParent->addChild(&node);
-            }
+                mToCopy.push_back(&node);
             else
                 traverse(node);
         }
 
+        void doCopy()
+        {
+            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToCopy.begin(); it != mToCopy.end(); ++it)
+            {
+                osg::ref_ptr<osg::Node> node = *it;
+                if (node->getNumParents() > 1)
+                    std::cerr << "CopyRigVisitor warning: node has multiple parents" << std::endl;
+                while (node->getNumParents())
+                    node->getParent(0)->removeChild(node);
+
+                mParent->addChild(node);
+            }
+            mToCopy.clear();
+        }
+
     private:
+        typedef std::vector<osg::ref_ptr<osg::Node> > NodeVector;
+        NodeVector mToCopy;
+
         osg::ref_ptr<osg::Group> mParent;
         std::string mFilter;
         std::string mFilter2;
@@ -55,6 +72,7 @@ namespace SceneUtil
 
             CopyRigVisitor copyVisitor(handle, filter);
             toAttach->accept(copyVisitor);
+            copyVisitor.doCopy();
 
             if (handle->getNumChildren() == 1)
             {

From 0fc65db6bbbc855d68ed10852f022d9ff0fb0b36 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 6 Mar 2016 11:34:15 +0100
Subject: [PATCH 411/765] Remove parts before setting the new object root

---
 apps/openmw/mwrender/animation.cpp    | 3 +++
 apps/openmw/mwrender/npcanimation.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 36feeb7bef..4f4a49f496 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1457,6 +1457,9 @@ namespace MWRender
 
     PartHolder::~PartHolder()
     {
+        if (mNode.get() && !mNode->getNumParents())
+            std::cerr << "Warning: part has no parents " << std::endl;
+
         if (mNode.get() && mNode->getNumParents())
         {
             if (mNode->getNumParents() > 1)
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index eee23aa312..99106c9207 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -422,6 +422,8 @@ int NpcAnimation::getSlot(const osg::NodePath &path) const
 void NpcAnimation::updateNpcBase()
 {
     clearAnimSources();
+    for(size_t i = 0;i < ESM::PRT_Count;i++)
+        removeIndividualPart((ESM::PartReferenceType)i);
 
     const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
     const ESM::Race *race = store.get<ESM::Race>().find(mNpc->mRace);
@@ -501,8 +503,6 @@ void NpcAnimation::updateNpcBase()
         }
     }
 
-    for(size_t i = 0;i < ESM::PRT_Count;i++)
-        removeIndividualPart((ESM::PartReferenceType)i);
     updateParts();
 
     mWeaponAnimationTime->updateStartTime();

From 697b809c794cd6507b8c35cccd440785bd69266f Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Sun, 6 Mar 2016 14:49:34 +0100
Subject: [PATCH 412/765] Reactivate OS X CI

---
 .travis.yml              |  3 ++-
 CI/before_install.osx.sh | 13 +++++++------
 CI/before_script.osx.sh  | 22 +++++++++++++++++++++-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e314d8e7b0..839dbccd4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 os:
  - linux
-# - osx
+ - osx
+osx_image: xcode7.2
 language: cpp
 sudo: required
 dist: trusty
diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh
index 8bfe2b70f3..b9da521938 100755
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-export CXX=clang++
-export CC=clang
-
-brew tap openmw/openmw
 brew update
-brew unlink boost
-brew install openmw-mygui openmw-bullet openmw-sdl2 openmw-ffmpeg openmw/openmw/qt unshield
+brew rm cmake || true
+brew rm pkgconfig || true
+brew rm qt5 || true
+brew install cmake pkgconfig qt5
+
+curl http://downloads.openmw.org/osx/dependencies/openmw-deps-263d4a8.zip -o ~/openmw-deps.zip
+unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh
index 772284f914..bf38186f62 100755
--- a/CI/before_script.osx.sh
+++ b/CI/before_script.osx.sh
@@ -1,5 +1,25 @@
 #!/bin/sh
 
+export CXX=clang++
+export CC=clang
+
+DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
+QT_PATH="/usr/local/opt/qt5"
+
 mkdir build
 cd build
-cmake -DCMAKE_FRAMEWORK_PATH="/usr/local/lib/macosx/Release" -DCMAKE_EXE_LINKER_FLAGS="-F/usr/local/lib/macosx/Release" -DCMAKE_CXX_FLAGS="-stdlib=libstdc++" -DCMAKE_BUILD_TYPE=Debug -DBUILD_MYGUI_PLUGIN=OFF -G"Unix Makefiles" ..
+
+cmake \
+-D PKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON \
+-D CMAKE_EXE_LINKER_FLAGS="-lz" \
+-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
+-D CMAKE_OSX_DEPLOYMENT_TARGET="10.8" \
+-D CMAKE_OSX_SYSROOT="macosx10.11" \
+-D CMAKE_BUILD_TYPE=Debug \
+-D OPENMW_OSX_DEPLOYMENT=TRUE \
+-D DESIRED_QT_VERSION=5 \
+-D OSG_PLUGIN_LIB_SEARCH_PATH="$DEPENDENCIES_ROOT/lib/osgPlugins-3.4.0" \
+-D BUILD_ESMTOOL=FALSE \
+-D BUILD_MYGUI_PLUGIN=FALSE \
+-G"Unix Makefiles" \
+..

From 000597236e07b30ce8533b1877ee62e92de9e17a Mon Sep 17 00:00:00 2001
From: ae-g-i-s <github@xn--g-3fa.is>
Date: Sun, 6 Mar 2016 18:29:15 +0100
Subject: [PATCH 413/765] Fix incorrect handling of baseDisposition >= 100 in
 testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwdialogue/filter.cpp               | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 4 ++--
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 42da1a052a..4b7db53cf8 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -97,7 +97,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded = true) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 69df38ccfa..40d4076ae8 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -145,7 +145,7 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
     if (isCreature)
         return true;
 
-    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor)
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false)
             + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
     // For service refusal, the disposition check is inverted. However, a value of 0 still means "always succeed".
     return invert ? (info.mData.mDisposition == 0 || actorDisposition < info.mData.mDisposition)
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7fbc3a8535..74bb3eda6e 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -581,7 +581,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded /* = true */)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -653,7 +653,7 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
-        int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
+        int effective_disposition = std::max(0,std::min(int(x), (bounded ? 100 : std::numeric_limits<int>::max()) )); // clamped to [0..100] unless !bounded
         return effective_disposition;
     }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index fb29c07ea2..891c0587c9 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -92,7 +92,7 @@ namespace MWMechanics
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr);
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded = true);
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const;

From d0aba0d9ee0453f213cdcb6111dc24f86c725e4b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Mar 2016 21:28:50 +0100
Subject: [PATCH 414/765] Catch exceptions thrown during reference loading (Bug
 #3238)

---
 apps/openmw/mwworld/cellstore.cpp | 84 ++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 35 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 13f74e22b5..821c7035dc 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -463,27 +463,34 @@ namespace MWWorld
         // Load references from all plugins that do something with this cell.
         for (size_t i = 0; i < mCell->mContextList.size(); i++)
         {
-            // Reopen the ESM reader and seek to the right position.
-            int index = mCell->mContextList.at(i).index;
-            mCell->restore (esm[index], i);
-
-            ESM::CellRef ref;
-
-            // Get each reference in turn
-            bool deleted = false;
-            while (mCell->getNextRef (esm[index], ref, deleted))
+            try
             {
-                if (deleted)
-                    continue;
+                // Reopen the ESM reader and seek to the right position.
+                int index = mCell->mContextList.at(i).index;
+                mCell->restore (esm[index], i);
 
-                // Don't list reference if it was moved to a different cell.
-                ESM::MovedCellRefTracker::const_iterator iter =
-                    std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                if (iter != mCell->mMovedRefs.end()) {
-                    continue;
+                ESM::CellRef ref;
+
+                // Get each reference in turn
+                bool deleted = false;
+                while (mCell->getNextRef (esm[index], ref, deleted))
+                {
+                    if (deleted)
+                        continue;
+
+                    // Don't list reference if it was moved to a different cell.
+                    ESM::MovedCellRefTracker::const_iterator iter =
+                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end()) {
+                        continue;
+                    }
+
+                    mIds.push_back (Misc::StringUtils::lowerCase (ref.mRefID));
                 }
-
-                mIds.push_back (Misc::StringUtils::lowerCase (ref.mRefID));
+            }
+            catch (std::exception& e)
+            {
+                std::cerr << "An error occured listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 
@@ -510,25 +517,32 @@ namespace MWWorld
         // Load references from all plugins that do something with this cell.
         for (size_t i = 0; i < mCell->mContextList.size(); i++)
         {
-            // Reopen the ESM reader and seek to the right position.
-            int index = mCell->mContextList.at(i).index;
-            mCell->restore (esm[index], i);
-
-            ESM::CellRef ref;
-            ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
-
-            // Get each reference in turn
-            bool deleted = false;
-            while(mCell->getNextRef(esm[index], ref, deleted))
+            try
             {
-                // Don't load reference if it was moved to a different cell.
-                ESM::MovedCellRefTracker::const_iterator iter =
-                    std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
-                if (iter != mCell->mMovedRefs.end()) {
-                    continue;
-                }
+                // Reopen the ESM reader and seek to the right position.
+                int index = mCell->mContextList.at(i).index;
+                mCell->restore (esm[index], i);
 
-                loadRef (ref, deleted);
+                ESM::CellRef ref;
+                ref.mRefNum.mContentFile = ESM::RefNum::RefNum_NoContentFile;
+
+                // Get each reference in turn
+                bool deleted = false;
+                while(mCell->getNextRef(esm[index], ref, deleted))
+                {
+                    // Don't load reference if it was moved to a different cell.
+                    ESM::MovedCellRefTracker::const_iterator iter =
+                        std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
+                    if (iter != mCell->mMovedRefs.end()) {
+                        continue;
+                    }
+
+                    loadRef (ref, deleted);
+                }
+            }
+            catch (std::exception& e)
+            {
+                std::cerr << "An error occured loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 

From 3e6cf17665465f2e02b55690966f28511160ebed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Mar 2016 22:39:43 +0100
Subject: [PATCH 415/765] Warn about cellrefs with an empty refId (Bug #3238)

---
 apps/openmw/mwworld/cellstore.cpp |  4 ++--
 components/esm/cellref.cpp        | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 821c7035dc..87a836f717 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -194,7 +194,7 @@ namespace MWWorld
         else
         {
             std::cerr
-                << "Error: could not resolve cell reference " << ref.mRefID
+                << "Error: could not resolve cell reference '" << ref.mRefID << "'"
                 << " (dropping reference)" << std::endl;
         }
     }
@@ -612,7 +612,7 @@ namespace MWWorld
             case ESM::REC_WEAP: mWeapons.load(ref, deleted, store); break;
             case ESM::REC_BODY: mBodyParts.load(ref, deleted, store); break;
 
-            case 0: std::cerr << "Cell reference " + ref.mRefID + " not found!\n"; break;
+            case 0: std::cerr << "Cell reference '" + ref.mRefID + "' not found!\n"; break;
 
             default:
                 std::cerr
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 7acaed86d5..14fb14dd48 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -1,5 +1,7 @@
 #include "cellref.hpp"
 
+#include <iostream>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
@@ -43,7 +45,13 @@ void ESM::CellRef::loadId (ESMReader& esm, bool wideRefNum)
 
     mRefNum.load (esm, wideRefNum);
 
-    mRefID = esm.getHNString ("NAME");
+    mRefID = esm.getHNOString ("NAME");
+    if (mRefID.empty())
+    {
+        std::ios::fmtflags f(std::cerr.flags());
+        std::cerr << "Warning: got CellRef with empty RefId in " << esm.getName() << " 0x" << std::hex << esm.getFileOffset() << std::endl;
+        std::cerr.flags(f);
+    }
 }
 
 void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)

From 121bdd3e39aeff88f017ce79ab92dd398cce954f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Mar 2016 22:46:15 +0100
Subject: [PATCH 416/765] Update comment

---
 components/esm/loadcell.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index cab8cf65e7..549ed7309a 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -30,12 +30,12 @@ class MovedCellRef
 public:
     RefNum mRefNum;
 
-    // Target cell (if exterior)
+    // Coordinates of target exterior cell
     int mTarget[2];
 
-    // TODO: Support moving references between exterior and interior cells!
-    //  This may happen in saves, when an NPC follows the player. Tribunal
-    //  introduces a henchman (which no one uses), so we may need this as well.
+    // The content file format does not support moving objects to an interior cell.
+    // The save game format does support moving to interior cells, but uses a different mechanism
+    // (see the MovedRefTracker implementation in MWWorld::CellStore for more details).
 };
 
 /// Overloaded compare operator used to search inside a list of cell refs.

From b2181fae208c1d86987806628b77f0c3d964b9f3 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 8 Mar 2016 10:48:44 +0100
Subject: [PATCH 417/765] safer handling of command macros

---
 apps/opencs/CMakeLists.txt                    |  2 +-
 apps/opencs/model/world/commanddispatcher.cpp | 44 +++++--------------
 apps/opencs/model/world/commandmacro.cpp      | 26 +++++++++++
 apps/opencs/model/world/commandmacro.hpp      | 34 ++++++++++++++
 apps/opencs/view/render/instancemode.cpp      | 13 +++---
 apps/opencs/view/world/referencecreator.cpp   | 12 ++---
 apps/opencs/view/world/regionmap.cpp          | 18 +++-----
 apps/opencs/view/world/vartypedelegate.cpp    | 10 ++---
 8 files changed, 94 insertions(+), 65 deletions(-)
 create mode 100644 apps/opencs/model/world/commandmacro.cpp
 create mode 100644 apps/opencs/model/world/commandmacro.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 4caf76090c..ee6a47db08 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -26,7 +26,7 @@ opencs_units_noqt (model/world
     universalid record commands columnbase columnimp scriptcontext cell refidcollection
     refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
     pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
-    idcompletionmanager metadata defaultgmsts infoselectwrapper
+    idcompletionmanager metadata defaultgmsts infoselectwrapper commandmacro
     )
 
 opencs_hdrs_noqt (model/world
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index a1fc980eb5..ffbaa3decc 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -11,6 +11,7 @@
 #include "record.hpp"
 #include "commands.hpp"
 #include "idtableproxymodel.hpp"
+#include "commandmacro.hpp"
 
 std::vector<std::string> CSMWorld::CommandDispatcher::getDeletableRecords() const
 {
@@ -171,10 +172,9 @@ void CSMWorld::CommandDispatcher::executeModify (QAbstractItemModel *model, cons
 
     if (modifyCell.get())
     {
-        mDocument.getUndoStack().beginMacro (modifyData->text());
-        mDocument.getUndoStack().push (modifyData.release());
-        mDocument.getUndoStack().push (modifyCell.release());
-        mDocument.getUndoStack().endMacro();
+        CommandMacro macro (mDocument.getUndoStack());
+        macro.push (modifyData.release());
+        macro.push (modifyCell.release());
     }
     else
         mDocument.getUndoStack().push (modifyData.release());
@@ -194,9 +194,7 @@ void CSMWorld::CommandDispatcher::executeDelete()
 
     int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
 
-    if (rows.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Delete multiple records"));
-
+    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Delete multiple records" : "");
     for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
     {
         std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
@@ -204,7 +202,7 @@ void CSMWorld::CommandDispatcher::executeDelete()
 
         if (mId.getType() == UniversalId::Type_Referenceables)
         {
-            mDocument.getUndoStack().push ( new CSMWorld::DeleteCommand (model, id,
+            macro.push (new CSMWorld::DeleteCommand (model, id,
                 static_cast<CSMWorld::UniversalId::Type>(model.data (model.index (
                     model.getModelIndex (id, columnIndex).row(),
                     model.findColumnIndex (CSMWorld::Columns::ColumnId_RecordType))).toInt())));
@@ -212,9 +210,6 @@ void CSMWorld::CommandDispatcher::executeDelete()
         else
             mDocument.getUndoStack().push (new CSMWorld::DeleteCommand (model, id));
     }
-
-    if (rows.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeRevert()
@@ -231,25 +226,19 @@ void CSMWorld::CommandDispatcher::executeRevert()
 
     int columnIndex = model.findColumnIndex (Columns::ColumnId_Id);
 
-    if (rows.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Revert multiple records"));
-
+    CommandMacro macro (mDocument.getUndoStack(), rows.size()>1 ? "Revert multiple records" : "");
     for (std::vector<std::string>::const_iterator iter (rows.begin()); iter!=rows.end(); ++iter)
     {
         std::string id = model.data (model.getModelIndex (*iter, columnIndex)).
             toString().toUtf8().constData();
 
-        mDocument.getUndoStack().push (new CSMWorld::RevertCommand (model, id));
+        macro.push (new CSMWorld::RevertCommand (model, id));
     }
-
-    if (rows.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeExtendedDelete()
 {
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Extended delete of multiple records"));
+    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended delete of multiple records") : "");
 
     for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
         iter!=mExtendedTypes.end(); ++iter)
@@ -276,20 +265,15 @@ void CSMWorld::CommandDispatcher::executeExtendedDelete()
                     Misc::StringUtils::lowerCase (record.get().mCell)))
                     continue;
 
-                mDocument.getUndoStack().push (
-                    new CSMWorld::DeleteCommand (model, record.get().mId));
+                macro.push (new CSMWorld::DeleteCommand (model, record.get().mId));
             }
         }
     }
-
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSMWorld::CommandDispatcher::executeExtendedRevert()
 {
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Extended revert of multiple records"));
+    CommandMacro macro (mDocument.getUndoStack(), mExtendedTypes.size()>1 ? tr ("Extended revert of multiple records") : "");
 
     for (std::vector<UniversalId>::const_iterator iter (mExtendedTypes.begin());
         iter!=mExtendedTypes.end(); ++iter)
@@ -313,12 +297,8 @@ void CSMWorld::CommandDispatcher::executeExtendedRevert()
                     Misc::StringUtils::lowerCase (record.get().mCell)))
                     continue;
 
-                mDocument.getUndoStack().push (
-                    new CSMWorld::RevertCommand (model, record.get().mId));
+                macro.push (new CSMWorld::RevertCommand (model, record.get().mId));
             }
         }
     }
-
-    if (mExtendedTypes.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
diff --git a/apps/opencs/model/world/commandmacro.cpp b/apps/opencs/model/world/commandmacro.cpp
new file mode 100644
index 0000000000..0bd74cbe21
--- /dev/null
+++ b/apps/opencs/model/world/commandmacro.cpp
@@ -0,0 +1,26 @@
+
+#include "commandmacro.hpp"
+
+#include <QUndoStack>
+#include <QUndoCommand>
+
+CSMWorld::CommandMacro::CommandMacro (QUndoStack& undoStack, const QString& description)
+: mUndoStack (undoStack), mDescription (description), mStarted (false)
+{}
+
+CSMWorld::CommandMacro::~CommandMacro()
+{
+    if (mStarted)
+        mUndoStack.endMacro();
+}
+
+void CSMWorld::CommandMacro::push (QUndoCommand *command)
+{
+    if (!mStarted)
+    {
+        mUndoStack.beginMacro (mDescription.isEmpty() ? command->text() : mDescription);
+        mStarted = true;
+    }
+
+    mUndoStack.push (command);
+}
diff --git a/apps/opencs/model/world/commandmacro.hpp b/apps/opencs/model/world/commandmacro.hpp
new file mode 100644
index 0000000000..b1f6301d9a
--- /dev/null
+++ b/apps/opencs/model/world/commandmacro.hpp
@@ -0,0 +1,34 @@
+#ifndef CSM_WOLRD_COMMANDMACRO_H
+#define CSM_WOLRD_COMMANDMACRO_H
+
+class QUndoStack;
+class QUndoCommand;
+
+#include <QString>
+
+namespace CSMWorld
+{
+    class CommandMacro
+    {
+            QUndoStack& mUndoStack;
+            QString mDescription;
+            bool mStarted;
+
+            /// not implemented
+            CommandMacro (const CommandMacro&);
+
+            /// not implemented
+            CommandMacro& operator= (const CommandMacro&);
+
+        public:
+
+            /// If \a description is empty, the description of the first command is used.
+            CommandMacro (QUndoStack& undoStack, const QString& description = "");
+
+            ~CommandMacro();
+
+            void push (QUndoCommand *command);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 6fa8ddaa8e..12bc77105f 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -8,6 +8,7 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 #include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
@@ -259,7 +260,8 @@ void CSVRender::InstanceMode::dragCompleted()
         case DragMode_None: break;
     }
 
-    undoStack.beginMacro (description);
+
+    CSMWorld::CommandMacro macro (undoStack, description);
 
     for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
         iter!=selection.end(); ++iter)
@@ -270,8 +272,6 @@ void CSVRender::InstanceMode::dragCompleted()
         }
     }
 
-    undoStack.endMacro();
-
     mDragMode = DragMode_None;
 }
 
@@ -435,11 +435,10 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                         new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
                 }
 
-                document.getUndoStack().beginMacro (createCommand->text());
-                document.getUndoStack().push (createCommand.release());
+                CSMWorld::CommandMacro macro (document.getUndoStack());
+                macro.push (createCommand.release());
                 if (incrementCommand.get())
-                    document.getUndoStack().push (incrementCommand.release());
-                document.getUndoStack().endMacro();
+                    macro.push (incrementCommand.release());
 
                 dropped = true;
             }
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 73ca62e025..5428f4e95c 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -9,6 +9,7 @@
 #include "../../model/world/columns.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idcompletionmanager.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "../widget/droplineedit.hpp"
 
@@ -53,10 +54,9 @@ void CSVWorld::ReferenceCreator::pushCommand (std::auto_ptr<CSMWorld::CreateComm
     std::auto_ptr<CSMWorld::ModifyCommand> increment (new CSMWorld::ModifyCommand
         (cellTable, countIndex, count+1));
 
-    getUndoStack().beginMacro (command->text());
+    CSMWorld::CommandMacro macro (getUndoStack(), command->text());
     GenericCreator::pushCommand (command, id);
-    getUndoStack().push (increment.release());
-    getUndoStack().endMacro();
+    macro.push (increment.release());
 }
 
 int CSVWorld::ReferenceCreator::getRefNumCount() const
@@ -147,11 +147,11 @@ void CSVWorld::ReferenceCreator::cloneMode(const std::string& originId,
     cellChanged(); //otherwise ok button will remain disabled
 }
 
-CSVWorld::Creator *CSVWorld::ReferenceCreatorFactory::makeCreator (CSMDoc::Document& document, 
+CSVWorld::Creator *CSVWorld::ReferenceCreatorFactory::makeCreator (CSMDoc::Document& document,
                                                                    const CSMWorld::UniversalId& id) const
 {
-    return new ReferenceCreator(document.getData(), 
-                                document.getUndoStack(), 
+    return new ReferenceCreator(document.getData(),
+                                document.getUndoStack(),
                                 id,
                                 document.getIdCompletionManager());
 }
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 49764bd178..4de470dbc2 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -17,6 +17,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
 #include "../../model/world/tablemimedata.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 void CSVWorld::RegionMap::contextMenuEvent (QContextMenuEvent *event)
 {
@@ -159,8 +160,7 @@ void CSVWorld::RegionMap::setRegion (const std::string& regionId)
 
     QString regionId2 = QString::fromUtf8 (regionId.c_str());
 
-    if (selected.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Set Region"));
+    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Set Region") : "");
 
     for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
     {
@@ -170,12 +170,8 @@ void CSVWorld::RegionMap::setRegion (const std::string& regionId)
         QModelIndex index = cellsModel->getModelIndex (cellId,
             cellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Region));
 
-        mDocument.getUndoStack().push (
-            new CSMWorld::ModifyCommand (*cellsModel, index, regionId2));
+        macro.push (new CSMWorld::ModifyCommand (*cellsModel, index, regionId2));
     }
-
-    if (selected.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 CSVWorld::RegionMap::RegionMap (const CSMWorld::UniversalId& universalId,
@@ -258,19 +254,15 @@ void CSVWorld::RegionMap::createCells()
     CSMWorld::IdTable *cellsModel = &dynamic_cast<CSMWorld::IdTable&> (*
         mDocument.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
 
-    if (selected.size()>1)
-        mDocument.getUndoStack().beginMacro (tr ("Create cells"));
+    CSMWorld::CommandMacro macro (mDocument.getUndoStack(), selected.size()>1 ? tr ("Create cells"): "");
 
     for (QModelIndexList::const_iterator iter (selected.begin()); iter!=selected.end(); ++iter)
     {
         std::string cellId = model()->data (*iter, CSMWorld::RegionMap::Role_CellId).
             toString().toUtf8().constData();
 
-        mDocument.getUndoStack().push (new CSMWorld::CreateCommand (*cellsModel, cellId));
+        macro.push (new CSMWorld::CreateCommand (*cellsModel, cellId));
     }
-
-    if (selected.size()>1)
-        mDocument.getUndoStack().endMacro();
 }
 
 void CSVWorld::RegionMap::setRegion()
diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp
index a63e6028c2..8aa43d15b0 100644
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@@ -4,6 +4,7 @@
 
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QModelIndex& index, int type)
     const
@@ -36,13 +37,10 @@ void CSVWorld::VarTypeDelegate::addCommands (QAbstractItemModel *model, const QM
         default: break; // ignore the rest
     }
 
-    getUndoStack().beginMacro (
-        "Modify " + model->headerData (index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+    CSMWorld::CommandMacro macro (getUndoStack(), "Modify " + model->headerData (index.column(), Qt::Horizontal, Qt::DisplayRole).toString());
 
-    getUndoStack().push (new CSMWorld::ModifyCommand (*model, index, type));
-    getUndoStack().push (new CSMWorld::ModifyCommand (*model, next, value));
-
-    getUndoStack().endMacro();
+    macro.push (new CSMWorld::ModifyCommand (*model, index, type));
+    macro.push (new CSMWorld::ModifyCommand (*model, next, value));
 }
 
 CSVWorld::VarTypeDelegate::VarTypeDelegate (const std::vector<std::pair<int, QString> >& values,

From 2f1c6c740c1cce6e3b1457bdb67429d5aad69b2a Mon Sep 17 00:00:00 2001
From: ae-g-i-s <github@xn--g-3fa.is>
Date: Tue, 8 Mar 2016 20:41:39 +0100
Subject: [PATCH 418/765] Revert "Fix incorrect handling of baseDisposition >=
 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes
 #3233)"

This reverts commit 000597236e07b30ce8533b1877ee62e92de9e17a.
---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwdialogue/filter.cpp               | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 4 ++--
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 4b7db53cf8..42da1a052a 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -97,7 +97,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded = true) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 40d4076ae8..69df38ccfa 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -145,7 +145,7 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
     if (isCreature)
         return true;
 
-    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false)
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor)
             + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
     // For service refusal, the disposition check is inverted. However, a value of 0 still means "always succeed".
     return invert ? (info.mData.mDisposition == 0 || actorDisposition < info.mData.mDisposition)
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 74bb3eda6e..7fbc3a8535 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -581,7 +581,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded /* = true */)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -653,7 +653,7 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
-        int effective_disposition = std::max(0,std::min(int(x), (bounded ? 100 : std::numeric_limits<int>::max()) )); // clamped to [0..100] unless !bounded
+        int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
         return effective_disposition;
     }
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 891c0587c9..fb29c07ea2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -92,7 +92,7 @@ namespace MWMechanics
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool bounded = true);
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr);
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const;

From c9791c5c1a126dde031378cfd5c568e4a2d86519 Mon Sep 17 00:00:00 2001
From: ae-g-i-s <github@xn--g-3fa.is>
Date: Tue, 8 Mar 2016 21:30:28 +0100
Subject: [PATCH 419/765] Add addTemporaryDispositionChange parameter to
 MechanicsManager::getDerivedDisposition(), adjust callers that previously
 added temp disposition changes themselves (fixes #3233)

---
 apps/openmw/mwbase/mechanicsmanager.hpp         |  2 +-
 apps/openmw/mwdialogue/filter.cpp               |  3 +--
 apps/openmw/mwgui/dialogue.cpp                  |  3 +--
 apps/openmw/mwgui/tradewindow.cpp               |  3 +--
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 10 ++++++----
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 42da1a052a..b29859781a 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -97,7 +97,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = false) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 69df38ccfa..223690a719 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -145,8 +145,7 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
     if (isCreature)
         return true;
 
-    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor)
-            + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, true);
     // For service refusal, the disposition check is inverted. However, a value of 0 still means "always succeed".
     return invert ? (info.mData.mDisposition == 0 || actorDisposition < info.mData.mDisposition)
                   : (actorDisposition >= info.mData.mDisposition);
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 040cd6d651..76f39f5e78 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -640,8 +640,7 @@ namespace MWGui
         if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
         {
             int disp = std::max(0, std::min(100,
-                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
-                    + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()));
+                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr, true)));
             mDispositionBar->setProgressRange(100);
             mDispositionBar->setProgressPosition(disp);
             mDispositionText->setCaption(MyGUI::utility::toString(disp)+std::string("/100"));
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 6f45ed0053..d692c8b097 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -346,8 +346,7 @@ namespace MWGui
             else
                 d = int(100 * (b - a) / a);
 
-            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
-                + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange(),100));
+            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr, true),100));
 
             const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
             const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7fbc3a8535..e6a92b9ea6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -581,7 +581,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange/* = false */)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -653,6 +653,9 @@ namespace MWMechanics
 
         x += ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Charm).getMagnitude();
 
+        if(addTemporaryDispositionChange)
+          x += MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange();
+
         int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
         return effective_disposition;
     }
@@ -667,10 +670,9 @@ namespace MWMechanics
         MWWorld::Ptr playerPtr = getPlayer();
         const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
-        // I suppose the temporary disposition change _has_ to be considered here,
+        // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered here,
         // otherwise one would get different prices when exiting and re-entering the dialogue window...
-        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr)
-            + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange(),100));
+        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr, true),100));
         float a = static_cast<float>(std::min(playerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100));
         float b = std::min(0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
         float c = std::min(0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index fb29c07ea2..c61dce5215 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -92,7 +92,7 @@ namespace MWMechanics
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr);
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = false);
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const;

From 137dde7cf8a9e27aff0bd2b545636f94b9f7b3b4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 12:59:17 +0100
Subject: [PATCH 420/765] Include cleanup

---
 apps/openmw/mwrender/animation.cpp   | 2 --
 apps/openmw/mwrender/sky.cpp         | 2 +-
 apps/openmw/mwrender/sky.hpp         | 3 ++-
 apps/openmw/mwrender/water.cpp       | 1 -
 components/sceneutil/riggeometry.cpp | 2 --
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 4f4a49f496..5435a8c58c 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -3,11 +3,9 @@
 #include <iomanip>
 #include <limits>
 
-#include <osg/PositionAttitudeTransform>
 #include <osg/TexGen>
 #include <osg/TexEnvCombine>
 #include <osg/MatrixTransform>
-#include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Material>
 
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 95204d5eb9..65a3f8ac23 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -13,7 +13,7 @@
 #include <osg/TexMat>
 #include <osg/OcclusionQueryNode>
 #include <osg/ColorMask>
-#include <osg/MatrixTransform>
+#include <osg/PositionAttitudeTransform>
 #include <osg/BlendFunc>
 #include <osg/AlphaFunc>
 #include <osg/observer_ptr>
diff --git a/apps/openmw/mwrender/sky.hpp b/apps/openmw/mwrender/sky.hpp
index 741911b238..085eeb2be9 100644
--- a/apps/openmw/mwrender/sky.hpp
+++ b/apps/openmw/mwrender/sky.hpp
@@ -3,16 +3,17 @@
 
 #include <string>
 #include <memory>
+#include <vector>
 
 #include <osg/ref_ptr>
 #include <osg/Vec4f>
-#include <osg/PositionAttitudeTransform>
 
 namespace osg
 {
     class Group;
     class Node;
     class Material;
+    class PositionAttitudeTransform;
 }
 
 namespace osgParticle
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 340c077854..e2c9db0897 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -10,7 +10,6 @@
 #include <osg/Material>
 #include <osg/PositionAttitudeTransform>
 #include <osg/ClipNode>
-#include <osg/MatrixTransform>
 #include <osg/FrontFace>
 #include <osg/Shader>
 #include <osg/GLExtensions>
diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index f915ee39c3..9f3b192527 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -4,8 +4,6 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <osg/MatrixTransform>
-
 #include "skeleton.hpp"
 #include "util.hpp"
 

From f898bf493f9e5659ceb03e806dc1d3d6c73276ca Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 13:17:01 +0100
Subject: [PATCH 421/765] Don't use Geodes

---
 apps/openmw/mwrender/bulletdebugdraw.cpp      | 13 ++---
 apps/openmw/mwrender/bulletdebugdraw.hpp      |  2 -
 apps/openmw/mwrender/globalmap.cpp            |  5 +-
 apps/openmw/mwrender/objects.cpp              |  1 -
 apps/openmw/mwrender/pathgrid.cpp             |  9 +---
 apps/openmw/mwrender/ripplesimulation.cpp     |  6 +--
 apps/openmw/mwrender/sky.cpp                  | 48 ++++++-------------
 apps/openmw/mwrender/vismask.hpp              |  2 +-
 apps/openmw/mwrender/water.cpp                | 26 +++++-----
 apps/openmw/mwrender/water.hpp                |  4 +-
 .../myguiplatform/myguirendermanager.cpp      |  8 +---
 components/nifosg/nifloader.cpp               |  1 -
 components/sceneutil/attach.cpp               |  1 -
 components/sceneutil/controller.cpp           | 16 -------
 components/sceneutil/controller.hpp           |  1 -
 components/sceneutil/lightmanager.cpp         |  1 -
 components/sceneutil/visitor.cpp              |  8 ----
 components/sceneutil/visitor.hpp              |  1 -
 components/terrain/terraingrid.cpp            |  1 -
 19 files changed, 39 insertions(+), 115 deletions(-)

diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index eaf36cf857..d35c3ac5de 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -4,7 +4,6 @@
 
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
 
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
 
@@ -26,13 +25,8 @@ DebugDrawer::DebugDrawer(osg::ref_ptr<osg::Group> parentNode, btCollisionWorld *
       mWorld(world),
       mDebugOn(true)
 {
-    mGeode = new osg::Geode;
-    mParentNode->addChild(mGeode);
-    mGeode->setNodeMask(Mask_Debug);
 
     createGeometry();
-
-    mParentNode->addChild(mGeode);
 }
 
 void DebugDrawer::createGeometry()
@@ -40,6 +34,7 @@ void DebugDrawer::createGeometry()
     if (!mGeometry)
     {
         mGeometry = new osg::Geometry;
+        mGeometry->setNodeMask(Mask_Debug);
 
         mVertices = new osg::Vec3Array;
 
@@ -50,7 +45,7 @@ void DebugDrawer::createGeometry()
         mGeometry->setDataVariance(osg::Object::DYNAMIC);
         mGeometry->addPrimitiveSet(mDrawArrays);
 
-        mGeode->addDrawable(mGeometry);
+        mParentNode->addChild(mGeometry);
     }
 }
 
@@ -58,7 +53,7 @@ void DebugDrawer::destroyGeometry()
 {
     if (mGeometry)
     {
-        mGeode->removeDrawable(mGeometry);
+        mParentNode->removeChild(mGeometry);
         mGeometry = NULL;
         mVertices = NULL;
         mDrawArrays = NULL;
@@ -67,7 +62,7 @@ void DebugDrawer::destroyGeometry()
 
 DebugDrawer::~DebugDrawer()
 {
-    mParentNode->removeChild(mGeode);
+    destroyGeometry();
 }
 
 void DebugDrawer::step()
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index 1bccc20bd0..30da3aa72c 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -12,7 +12,6 @@ class btCollisionWorld;
 namespace osg
 {
     class Group;
-    class Geode;
     class Geometry;
 }
 
@@ -24,7 +23,6 @@ class DebugDrawer : public btIDebugDraw
 protected:
     osg::ref_ptr<osg::Group> mParentNode;
     btCollisionWorld *mWorld;
-    osg::ref_ptr<osg::Geode> mGeode;
     osg::ref_ptr<osg::Geometry> mGeometry;
     osg::ref_ptr<osg::Vec3Array> mVertices;
     osg::ref_ptr<osg::DrawArrays> mDrawArrays;
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index b3b6cc3b0f..4bc24c5949 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -6,7 +6,6 @@
 #include <osg/Texture2D>
 #include <osg/Group>
 #include <osg/Geometry>
-#include <osg/Geode>
 #include <osg/Depth>
 
 #include <osgDB/WriteFile>
@@ -296,9 +295,7 @@ namespace MWRender
             stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
             stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
             stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-            osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-            geode->addDrawable(geom);
-            camera->addChild(geode);
+            camera->addChild(geom);
         }
 
         mRoot->addChild(camera);
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index a13ee03ac9..e40863622f 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -3,7 +3,6 @@
 #include <cmath>
 
 #include <osg/Group>
-#include <osg/Geode>
 #include <osg/UserDataContainer>
 
 #include <osgParticle/ParticleSystem>
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index ae8bda1fb7..d79604a914 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -4,7 +4,6 @@
 
 #include <osg/Geometry>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Group>
 
 #include <components/esm/loadstat.hpp>
@@ -213,16 +212,12 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
     osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
     cellPathGrid->setPosition(cellPathGridPos);
 
-    osg::ref_ptr<osg::Geode> lineGeode = new osg::Geode;
     osg::ref_ptr<osg::Geometry> lines = createPathgridLines(pathgrid);
-    lineGeode->addDrawable(lines);
 
-    osg::ref_ptr<osg::Geode> pointGeode = new osg::Geode;
     osg::ref_ptr<osg::Geometry> points = createPathgridPoints(pathgrid);
-    pointGeode->addDrawable(points);
 
-    cellPathGrid->addChild(lineGeode);
-    cellPathGrid->addChild(pointGeode);
+    cellPathGrid->addChild(lines);
+    cellPathGrid->addChild(points);
 
     mPathGridRoot->addChild(cellPathGrid);
 
diff --git a/apps/openmw/mwrender/ripplesimulation.cpp b/apps/openmw/mwrender/ripplesimulation.cpp
index f43f1ee5c3..85319a632a 100644
--- a/apps/openmw/mwrender/ripplesimulation.cpp
+++ b/apps/openmw/mwrender/ripplesimulation.cpp
@@ -3,7 +3,6 @@
 #include <iomanip>
 
 #include <osg/PolygonOffset>
-#include <osg/Geode>
 #include <osg/Texture2D>
 #include <osg/Material>
 #include <osg/Depth>
@@ -85,10 +84,7 @@ namespace MWRender
 RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem* resourceSystem, const Fallback::Map* fallback)
     : mParent(parent)
 {
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-
     mParticleSystem = new osgParticle::ParticleSystem;
-    geode->addDrawable(mParticleSystem);
 
     mParticleSystem->setParticleAlignment(osgParticle::ParticleSystem::FIXED);
     mParticleSystem->setAlignVectorX(osg::Vec3f(1,0,0));
@@ -106,7 +102,7 @@ RippleSimulation::RippleSimulation(osg::Group *parent, Resource::ResourceSystem*
 
     mParticleNode = new osg::PositionAttitudeTransform;
     mParticleNode->addChild(updater);
-    mParticleNode->addChild(geode);
+    mParticleNode->addChild(mParticleSystem);
     mParticleNode->setNodeMask(Mask_Effect);
 
     createWaterRippleStateSet(resourceSystem, fallback, mParticleNode);
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index 65a3f8ac23..b74a822f14 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -5,7 +5,6 @@
 #include <osg/ClipPlane>
 #include <osg/Fog>
 #include <osg/Transform>
-#include <osg/Geode>
 #include <osg/Depth>
 #include <osg/Geometry>
 #include <osg/Material>
@@ -347,14 +346,6 @@ public:
     {
     }
 
-    void apply(osg::Geode &geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-        {
-            osg::Drawable* drw = geode.getDrawable(i);
-            apply(*drw);
-        }
-    }
     void apply(osg::Drawable& drw)
     {
         osg::Geometry* geom = drw.asGeometry();
@@ -438,12 +429,10 @@ class CelestialBody
 public:
     CelestialBody(osg::Group* parentNode, float scaleFactor, int numUvSets)
     {
-        mGeode = new osg::Geode;
-        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad(numUvSets);
-        mGeode->addDrawable(geom);
+        mGeom = createTexturedQuad(numUvSets);
         mTransform = new osg::PositionAttitudeTransform;
         mTransform->setScale(osg::Vec3f(450,450,450) * scaleFactor);
-        mTransform->addChild(mGeode);
+        mTransform->addChild(mGeom);
 
         parentNode->addChild(mTransform);
     }
@@ -460,7 +449,7 @@ public:
 protected:
     static const float mDistance;
     osg::ref_ptr<osg::PositionAttitudeTransform> mTransform;
-    osg::ref_ptr<osg::Geode> mGeode;
+    osg::ref_ptr<osg::Geometry> mGeom;
 };
 
 const float CelestialBody::mDistance = 1000.0f;
@@ -479,7 +468,7 @@ public:
         sunTex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         sunTex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
 
-        mGeode->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        mGeom->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
 
         osg::ref_ptr<osg::Group> queryNode (new osg::Group);
         // Need to render after the world geometry so we can correctly test for occlusions
@@ -553,12 +542,12 @@ private:
         // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
         oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
 
-        osg::ref_ptr<osg::Geode> queryGeode = osg::clone(mGeode.get(), osg::CopyOp::DEEP_COPY_ALL);
-        // Disable writing to the color buffer. We are using this geode for visibility tests only.
+        osg::ref_ptr<osg::Geometry> queryGeom = osg::clone(mGeom.get(), osg::CopyOp::DEEP_COPY_ALL);
+        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
         osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
-        queryGeode->getOrCreateStateSet()->setAttributeAndModes(colormask, osg::StateAttribute::ON);
+        queryGeom->getOrCreateStateSet()->setAttributeAndModes(colormask, osg::StateAttribute::ON);
 
-        oqn->addChild(queryGeode);
+        oqn->addChild(queryGeom);
 
         // Remove the default OFF|PROTECTED setting for texturing. We *want* to enable texturing for alpha testing purposes
         oqn->getQueryStateSet()->removeTextureMode(0, GL_TEXTURE_2D);
@@ -613,12 +602,10 @@ private:
 
         mTransform->addChild(transform);
 
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-        transform->addChild(geode);
+        osg::ref_ptr<osg::Geometry> geom = createTexturedQuad();
+        transform->addChild(geom);
 
-        geode->addDrawable(createTexturedQuad());
-
-        osg::StateSet* stateset = geode->getOrCreateStateSet();
+        osg::StateSet* stateset = geom->getOrCreateStateSet();
 
         stateset->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
         stateset->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
@@ -649,11 +636,9 @@ private:
         camera->setRenderOrder(osg::Camera::NESTED_RENDER);
         camera->setAllowEventFocus(false);
 
-        osg::ref_ptr<osg::Geode> geode (new osg::Geode);
         osg::ref_ptr<osg::Geometry> geom = osg::createTexturedQuadGeometry(osg::Vec3f(-1,-1,0), osg::Vec3f(2,0,0), osg::Vec3f(0,2,0));
-        geode->addDrawable(geom);
 
-        camera->addChild(geode);
+        camera->addChild(geom);
 
         osg::StateSet* stateset = geom->getOrCreateStateSet();
 
@@ -940,12 +925,12 @@ public:
         setPhase(MoonState::Phase_Full);
         setVisible(true);
 
-        mGeode->addUpdateCallback(mUpdater);
+        mGeom->addUpdateCallback(mUpdater);
     }
 
     ~Moon()
     {
-        mGeode->removeUpdateCallback(mUpdater);
+        mGeom->removeUpdateCallback(mUpdater);
     }
 
     virtual void adjustTransparency(const float ratio)
@@ -1380,11 +1365,8 @@ void SkyManager::createRain()
     osg::ref_ptr<osgParticle::ParticleSystemUpdater> updater (new osgParticle::ParticleSystemUpdater);
     updater->addParticleSystem(mRainParticleSystem);
 
-    osg::ref_ptr<osg::Geode> geode (new osg::Geode);
-    geode->addDrawable(mRainParticleSystem);
-
     mRainNode->addChild(emitter);
-    mRainNode->addChild(geode);
+    mRainNode->addChild(mRainParticleSystem);
     mRainNode->addChild(updater);
 
     mRainFader = new RainFader;
diff --git a/apps/openmw/mwrender/vismask.hpp b/apps/openmw/mwrender/vismask.hpp
index ce13758e32..c70bcc71b5 100644
--- a/apps/openmw/mwrender/vismask.hpp
+++ b/apps/openmw/mwrender/vismask.hpp
@@ -42,7 +42,7 @@ namespace MWRender
         Mask_Scene = (1<<12),
         Mask_GUI = (1<<13),
 
-        // Set on a Geode
+        // Set on a ParticleSystem Drawable
         Mask_ParticleSystem = (1<<14),
 
         // Set on cameras within the main scene graph
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index e2c9db0897..2ce4f517c1 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -5,7 +5,6 @@
 #include <osg/Fog>
 #include <osg/Depth>
 #include <osg/Group>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Material>
 #include <osg/PositionAttitudeTransform>
@@ -466,25 +465,22 @@ Water::Water(osg::Group *parent, osg::Group* sceneRoot, Resource::ResourceSystem
 {
     mSimulation.reset(new RippleSimulation(parent, resourceSystem, fallback));
 
-    osg::ref_ptr<osg::Geometry> waterGeom = createWaterGeometry(CELL_SIZE*150, 40, 900);
-    waterGeom->setDrawCallback(new DepthClampCallback);
-
-    mWaterGeode = new osg::Geode;
-    mWaterGeode->addDrawable(waterGeom);
-    mWaterGeode->setNodeMask(Mask_Water);
+    mWaterGeom = createWaterGeometry(CELL_SIZE*150, 40, 900);
+    mWaterGeom->setDrawCallback(new DepthClampCallback);
+    mWaterGeom->setNodeMask(Mask_Water);
 
     if (ico)
-        ico->add(mWaterGeode);
+        ico->add(mWaterGeom);
 
     mWaterNode = new osg::PositionAttitudeTransform;
-    mWaterNode->addChild(mWaterGeode);
+    mWaterNode->addChild(mWaterGeom);
     mWaterNode->addCullCallback(new FudgeCallback);
 
     // simple water fallback for the local map
-    osg::ref_ptr<osg::Geode> geode2 (osg::clone(mWaterGeode.get(), osg::CopyOp::DEEP_COPY_NODES));
-    createSimpleWaterStateSet(geode2, mFallback->getFallbackFloat("Water_Map_Alpha"));
-    geode2->setNodeMask(Mask_SimpleWater);
-    mWaterNode->addChild(geode2);
+    osg::ref_ptr<osg::Geometry> geom2 (osg::clone(mWaterGeom.get(), osg::CopyOp::DEEP_COPY_NODES));
+    createSimpleWaterStateSet(geom2, mFallback->getFallbackFloat("Water_Map_Alpha"));
+    geom2->setNodeMask(Mask_SimpleWater);
+    mWaterNode->addChild(geom2);
 
     mSceneRoot->addChild(mWaterNode);
 
@@ -521,10 +517,10 @@ void Water::updateWaterMaterial()
             mParent->addChild(mRefraction);
         }
 
-        createShaderWaterStateSet(mWaterGeode, mReflection, mRefraction);
+        createShaderWaterStateSet(mWaterGeom, mReflection, mRefraction);
     }
     else
-        createSimpleWaterStateSet(mWaterGeode, mFallback->getFallbackFloat("Water_World_Alpha"));
+        createSimpleWaterStateSet(mWaterGeom, mFallback->getFallbackFloat("Water_World_Alpha"));
 
     updateVisible();
 }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index e03728d5f7..29e78cf522 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -13,7 +13,7 @@ namespace osg
 {
     class Group;
     class PositionAttitudeTransform;
-    class Geode;
+    class Geometry;
     class Node;
 }
 
@@ -53,7 +53,7 @@ namespace MWRender
         osg::ref_ptr<osg::Group> mParent;
         osg::ref_ptr<osg::Group> mSceneRoot;
         osg::ref_ptr<osg::PositionAttitudeTransform> mWaterNode;
-        osg::ref_ptr<osg::Geode> mWaterGeode;
+        osg::ref_ptr<osg::Geometry> mWaterGeom;
         Resource::ResourceSystem* mResourceSystem;
         const Fallback::Map* mFallback;
         osg::ref_ptr<osgUtil::IncrementalCompileOperation> mIncrementalCompileOperation;
diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 5d2e3a9aed..0bc7b0ee1e 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -6,7 +6,6 @@
 #include <MyGUI_Timer.h>
 
 #include <osg/Drawable>
-#include <osg/Geode>
 #include <osg/BlendFunc>
 #include <osg/Texture2D>
 #include <osg/TexMat>
@@ -394,9 +393,6 @@ void RenderManager::initialise()
 
     mDrawable = new Drawable(this);
 
-    osg::ref_ptr<osg::Geode> geode = new osg::Geode;
-    geode->addDrawable(mDrawable.get());
-
     osg::ref_ptr<osg::Camera> camera = new osg::Camera();
     camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
     camera->setProjectionResizePolicy(osg::Camera::FIXED);
@@ -404,8 +400,8 @@ void RenderManager::initialise()
     camera->setViewMatrix(osg::Matrix::identity());
     camera->setRenderOrder(osg::Camera::POST_RENDER);
     camera->setClearMask(GL_NONE);
-    geode->setCullingActive(false);
-    camera->addChild(geode.get());
+    mDrawable->setCullingActive(false);
+    camera->addChild(mDrawable.get());
 
     mGuiRoot = camera;
     mSceneRoot->addChild(mGuiRoot.get());
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a5f9bd9509..f935406a61 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Matrixf>
 #include <osg/MatrixTransform>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Array>
 #include <osg/LOD>
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 1f06e8327b..c80b9be365 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -5,7 +5,6 @@
 
 #include <osg/NodeVisitor>
 #include <osg/Group>
-#include <osg/Geode>
 #include <osg/FrontFace>
 #include <osg/PositionAttitudeTransform>
 #include <osg/MatrixTransform>
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index 0978999116..12c89c87d0 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -3,7 +3,6 @@
 #include "statesetupdater.hpp"
 
 #include <osg/Drawable>
-#include <osg/Geode>
 #include <osg/NodeCallback>
 
 namespace SceneUtil
@@ -85,21 +84,6 @@ namespace SceneUtil
         traverse(node);
     }
 
-    void ControllerVisitor::apply(osg::Geode &geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-        {
-            osg::Drawable* drw = geode.getDrawable(i);
-
-            osg::Callback* callback = drw->getUpdateCallback();
-
-            if (Controller* ctrl = dynamic_cast<Controller*>(callback))
-                visit(geode, *ctrl);
-        }
-
-        apply(static_cast<osg::Node&>(geode));
-    }
-
     AssignControllerSourcesVisitor::AssignControllerSourcesVisitor()
         : ControllerVisitor()
     {
diff --git a/components/sceneutil/controller.hpp b/components/sceneutil/controller.hpp
index 7399ecad58..3f1ec874eb 100644
--- a/components/sceneutil/controller.hpp
+++ b/components/sceneutil/controller.hpp
@@ -63,7 +63,6 @@ namespace SceneUtil
         ControllerVisitor();
 
         virtual void apply(osg::Node& node);
-        virtual void apply(osg::Geode& geode);
 
         virtual void visit(osg::Node& node, Controller& ctrl) = 0;
     };
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index da29647c21..04ff3b603e 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -3,7 +3,6 @@
 #include <stdexcept>
 
 #include <osg/NodeVisitor>
-#include <osg/Geode>
 
 #include <osgUtil/CullVisitor>
 
diff --git a/components/sceneutil/visitor.cpp b/components/sceneutil/visitor.cpp
index 0a5ad2d006..d147ced7f3 100644
--- a/components/sceneutil/visitor.cpp
+++ b/components/sceneutil/visitor.cpp
@@ -1,7 +1,5 @@
 #include "visitor.hpp"
 
-#include <osg/Geode>
-
 #include <osgParticle/ParticleSystem>
 
 #include <components/misc/stringops.hpp>
@@ -19,12 +17,6 @@ namespace SceneUtil
         traverse(group);
     }
 
-    void DisableFreezeOnCullVisitor::apply(osg::Geode &geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            apply(*geode.getDrawable(i));
-    }
-
     void DisableFreezeOnCullVisitor::apply(osg::Drawable& drw)
     {
         if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
diff --git a/components/sceneutil/visitor.hpp b/components/sceneutil/visitor.hpp
index dcfefe9cd6..751339d02d 100644
--- a/components/sceneutil/visitor.hpp
+++ b/components/sceneutil/visitor.hpp
@@ -34,7 +34,6 @@ namespace SceneUtil
         {
         }
 
-        virtual void apply(osg::Geode &geode);
         virtual void apply(osg::Drawable& drw);
     };
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index abfac4a71b..c717a94f6c 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -17,7 +17,6 @@
 #include <components/esm/loadland.hpp>
 
 #include <osg/Geometry>
-#include <osg/Geode>
 #include <osg/KdTree>
 
 #include <osgFX/Effect>

From 02d23564dc072a36ed3c84abadbc683a2a1c0ea4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 14:29:45 +0100
Subject: [PATCH 422/765] Include cleanup

---
 components/nifosg/nifloader.cpp | 2 --
 components/nifosg/particle.cpp  | 2 ++
 components/nifosg/particle.hpp  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index f935406a61..c8daf315d2 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -19,7 +19,6 @@
 #include <osgParticle/ParticleSystem>
 #include <osgParticle/ParticleSystemUpdater>
 #include <osgParticle/ConstantRateCounter>
-#include <osgParticle/ModularEmitter>
 #include <osgParticle/Shooter>
 #include <osgParticle/BoxPlacer>
 #include <osgParticle/ModularProgram>
@@ -37,7 +36,6 @@
 
 #include <components/nif/node.hpp>
 #include <components/nif/effect.hpp>
-#include <components/sceneutil/util.hpp>
 #include <components/sceneutil/skeleton.hpp>
 #include <components/sceneutil/riggeometry.hpp>
 
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 935442c840..f542cf379e 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -5,6 +5,8 @@
 #include <osg/MatrixTransform>
 
 #include <components/nif/controlled.hpp>
+#include <components/nif/nifkey.hpp>
+#include <components/nif/data.hpp>
 
 #include "userdata.hpp"
 
diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp
index 1e17143695..6818aa7e0e 100644
--- a/components/nifosg/particle.hpp
+++ b/components/nifosg/particle.hpp
@@ -4,19 +4,19 @@
 #include <osgParticle/Particle>
 #include <osgParticle/Shooter>
 #include <osgParticle/Operator>
-#include <osgParticle/ModularEmitter>
+#include <osgParticle/Emitter>
+#include <osgParticle/Placer>
+#include <osgParticle/Counter>
 
 #include <osg/NodeCallback>
 
-#include <components/nif/nifkey.hpp>
-#include <components/nif/data.hpp>
-
 #include "controller.hpp" // ValueInterpolator
 
 namespace Nif
 {
     class NiGravity;
     class NiPlanarCollider;
+    class NiColorData;
 }
 
 namespace NifOsg

From abcfe9bcee2e8daa3b72fbe9fc7bd81bbbefc79c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 17:01:14 +0100
Subject: [PATCH 423/765] Don't add empty text key objects

---
 components/nifosg/nifloader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index c8daf315d2..0ba13d56ff 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -358,7 +358,9 @@ namespace NifOsg
                 skel->addChild(created);
                 created = skel;
             }
-            created->getOrCreateUserDataContainer()->addUserObject(textkeys);
+
+            if (!textkeys->mTextKeys.empty())
+                created->getOrCreateUserDataContainer()->addUserObject(textkeys);
 
             return created;
         }

From 14e19118209f3f39b9e583cf9e7c2383761f027e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 20:38:14 +0100
Subject: [PATCH 424/765] Fix memory leaks

---
 apps/openmw/mwmechanics/aisequence.cpp | 34 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 5cfc1264ae..f9016c607c 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -91,6 +91,8 @@ std::list<AiPackage*>::const_iterator AiSequence::erase(std::list<AiPackage*>::c
     {
         if (package == it)
         {
+            AiPackage* package = *it;
+            delete package;
             return mPackages.erase(it);
         }
     }
@@ -125,7 +127,10 @@ void AiSequence::stopCombat()
     for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
+        {
+            delete *it;
             it = mPackages.erase(it);
+        }
         else
             ++it;
     }
@@ -136,7 +141,10 @@ void AiSequence::stopPursuit()
     for(std::list<AiPackage*>::iterator it = mPackages.begin(); it != mPackages.end(); )
     {
         if ((*it)->getTypeId() == AiPackage::TypeIdPursue)
+        {
+            delete *it;
             it = mPackages.erase(it);
+        }
         else
             ++it;
     }
@@ -268,7 +276,10 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
         {
             if((*it)->canCancel())
+            {
+                delete *it;
                 it = mPackages.erase(it);
+            }
             else
                 ++it;
         }
@@ -349,49 +360,49 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
          it != sequence.mPackages.end(); ++it)
     {
-        MWMechanics::AiPackage* package = NULL;
+        std::auto_ptr<MWMechanics::AiPackage> package (NULL);
         switch (it->mType)
         {
         case ESM::AiSequence::Ai_Wander:
         {
-            package = new AiWander(static_cast<ESM::AiSequence::AiWander*>(it->mPackage));
+            package.reset(new AiWander(static_cast<ESM::AiSequence::AiWander*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Travel:
         {
-            package = new AiTravel(static_cast<ESM::AiSequence::AiTravel*>(it->mPackage));
+            package.reset(new AiTravel(static_cast<ESM::AiSequence::AiTravel*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Escort:
         {
-            package = new AiEscort(static_cast<ESM::AiSequence::AiEscort*>(it->mPackage));
+            package.reset(new AiEscort(static_cast<ESM::AiSequence::AiEscort*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Follow:
         {
-            package = new AiFollow(static_cast<ESM::AiSequence::AiFollow*>(it->mPackage));
+            package.reset(new AiFollow(static_cast<ESM::AiSequence::AiFollow*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Activate:
         {
-            package = new AiActivate(static_cast<ESM::AiSequence::AiActivate*>(it->mPackage));
+            package.reset(new AiActivate(static_cast<ESM::AiSequence::AiActivate*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Combat:
         {
-            package = new AiCombat(static_cast<ESM::AiSequence::AiCombat*>(it->mPackage));
+            package.reset(new AiCombat(static_cast<ESM::AiSequence::AiCombat*>(it->mPackage)));
             break;
         }
         case ESM::AiSequence::Ai_Pursue:
         {
-            package = new AiPursue(static_cast<ESM::AiSequence::AiPursue*>(it->mPackage));
+            package.reset(new AiPursue(static_cast<ESM::AiSequence::AiPursue*>(it->mPackage)));
             break;
         }
         default:
             break;
         }
 
-        if (!package)
+        if (!package.get())
             continue;
 
         // remove previous packages if required
@@ -400,13 +411,16 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
             for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
             {
                 if((*it)->canCancel())
+                {
+                    delete *it;
                     it = mPackages.erase(it);
+                }
                 else
                     ++it;
             }
         }
 
-        mPackages.push_back(package);
+        mPackages.push_back(package.release());
     }
 }
 

From 93ec289b1d93681bd4086a4b685e6c21f862278e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 10 Mar 2016 23:18:20 +0100
Subject: [PATCH 425/765] Improve setting of occlusion query state

---
 apps/openmw/mwrender/sky.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index b74a822f14..c16a1ee56c 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -15,6 +15,7 @@
 #include <osg/PositionAttitudeTransform>
 #include <osg/BlendFunc>
 #include <osg/AlphaFunc>
+#include <osg/PolygonOffset>
 #include <osg/observer_ptr>
 
 #include <osgParticle/ParticleSystem>
@@ -472,14 +473,20 @@ public:
 
         osg::ref_ptr<osg::Group> queryNode (new osg::Group);
         // Need to render after the world geometry so we can correctly test for occlusions
-        queryNode->getOrCreateStateSet()->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
-        queryNode->getOrCreateStateSet()->setNestRenderBins(false);
+        osg::StateSet* stateset = queryNode->getOrCreateStateSet();
+        stateset->setRenderBinDetails(RenderBin_OcclusionQuery, "RenderBin");
+        stateset->setNestRenderBins(false);
         // Set up alpha testing on the occlusion testing subgraph, that way we can get the occlusion tested fragments to match the circular shape of the sun
         osg::ref_ptr<osg::AlphaFunc> alphaFunc (new osg::AlphaFunc);
         alphaFunc->setFunction(osg::AlphaFunc::GREATER, 0.8);
-        queryNode->getOrCreateStateSet()->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
-        queryNode->getOrCreateStateSet()->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
-        queryNode->getOrCreateStateSet()->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(alphaFunc, osg::StateAttribute::ON);
+        stateset->setTextureAttributeAndModes(0, sunTex, osg::StateAttribute::ON);
+        stateset->setAttributeAndModes(createUnlitMaterial(), osg::StateAttribute::ON);
+        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
+        osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
+        stateset->setAttributeAndModes(colormask, osg::StateAttribute::ON);
+        osg::ref_ptr<osg::PolygonOffset> po (new osg::PolygonOffset( -1., -1. ));
+        stateset->setAttributeAndModes(po, osg::StateAttribute::ON);
 
         mTransform->addChild(queryNode);
 
@@ -543,15 +550,8 @@ private:
         oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
 
         osg::ref_ptr<osg::Geometry> queryGeom = osg::clone(mGeom.get(), osg::CopyOp::DEEP_COPY_ALL);
-        // Disable writing to the color buffer. We are using this geometry for visibility tests only.
-        osg::ref_ptr<osg::ColorMask> colormask (new osg::ColorMask(0, 0, 0, 0));
-        queryGeom->getOrCreateStateSet()->setAttributeAndModes(colormask, osg::StateAttribute::ON);
-
         oqn->addChild(queryGeom);
 
-        // Remove the default OFF|PROTECTED setting for texturing. We *want* to enable texturing for alpha testing purposes
-        oqn->getQueryStateSet()->removeTextureMode(0, GL_TEXTURE_2D);
-
         // Need to add texture coordinates so that texturing works. A bit ugly, relies on the vertex ordering
         // used within OcclusionQueryNode.
         osg::ref_ptr<osg::Vec2Array> texCoordArray (new osg::Vec2Array);
@@ -569,6 +569,7 @@ private:
 
         oqn->getQueryGeometry()->setTexCoordArray(0, texCoordArray, osg::Array::BIND_PER_VERTEX);
 
+        osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)
         {
             osg::ref_ptr<osg::Depth> depth (new osg::Depth);
@@ -578,12 +579,14 @@ private:
             // We want the sun glare to be "infinitely" far away.
             depth->setZNear(1.0);
             depth->setZFar(1.0);
-            oqn->getQueryStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
+            depth->setWriteMask(false);
+            queryStateSet->setAttributeAndModes(depth, osg::StateAttribute::ON);
         }
         else
         {
-            oqn->getQueryStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+            queryStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         }
+        oqn->setQueryStateSet(queryStateSet);
 
         parent->addChild(oqn);
 

From 85bd4f52f09e42a38f6cd0e1bea321f552c49c4e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 00:09:30 +0100
Subject: [PATCH 426/765] Improve occlusion query geometry rendering

---
 apps/openmw/mwrender/sky.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index c16a1ee56c..b12f4510bb 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -537,6 +537,12 @@ public:
     }
 
 private:
+    class DummyComputeBoundCallback : public osg::Node::ComputeBoundingSphereCallback
+    {
+    public:
+        virtual osg::BoundingSphere computeBound(const osg::Node& node) const { return osg::BoundingSphere(); }
+    };
+
     /// @param queryVisible If true, queries the amount of visible pixels. If false, queries the total amount of pixels.
     osg::ref_ptr<osg::OcclusionQueryNode> createOcclusionQueryNode(osg::Group* parent, bool queryVisible)
     {
@@ -549,25 +555,19 @@ private:
         // Note the debug geometry setDebugDisplay(true) is always DYNAMIC and that can't be changed, not a big deal.
         oqn->getQueryGeometry()->setDataVariance(osg::Object::STATIC);
 
-        osg::ref_ptr<osg::Geometry> queryGeom = osg::clone(mGeom.get(), osg::CopyOp::DEEP_COPY_ALL);
-        oqn->addChild(queryGeom);
+        // Set up the query geometry to match the actual sun's rendering shape. osg::OcclusionQueryNode wasn't originally intended to allow this,
+        // normally it would automatically adjust the query geometry to match the sub graph's bounding box. The below hack is needed to
+        // circumvent this.
+        osg::Geometry* queryGeom = oqn->getQueryGeometry();
+        queryGeom->setVertexArray(mGeom->getVertexArray());
+        queryGeom->setTexCoordArray(0, mGeom->getTexCoordArray(0), osg::Array::BIND_PER_VERTEX);
+        queryGeom->removePrimitiveSet(0, oqn->getQueryGeometry()->getNumPrimitiveSets());
+        queryGeom->addPrimitiveSet(mGeom->getPrimitiveSet(0));
 
-        // Need to add texture coordinates so that texturing works. A bit ugly, relies on the vertex ordering
-        // used within OcclusionQueryNode.
-        osg::ref_ptr<osg::Vec2Array> texCoordArray (new osg::Vec2Array);
-        for (int i=0; i<8; ++i)
-        {
-            texCoordArray->push_back(osg::Vec2(0,0));
-            texCoordArray->push_back(osg::Vec2(1,0));
-            texCoordArray->push_back(osg::Vec2(0,0));
-            texCoordArray->push_back(osg::Vec2(1,0));
-            texCoordArray->push_back(osg::Vec2(1,1));
-            texCoordArray->push_back(osg::Vec2(0,1));
-            texCoordArray->push_back(osg::Vec2(0,1));
-            texCoordArray->push_back(osg::Vec2(1,1));
-        }
-
-        oqn->getQueryGeometry()->setTexCoordArray(0, texCoordArray, osg::Array::BIND_PER_VERTEX);
+        // Hack to disable unwanted awful code inside OcclusionQueryNode::computeBound.
+        oqn->setComputeBoundingSphereCallback(new DummyComputeBoundCallback);
+        // Still need a proper bounding sphere.
+        oqn->setInitialBound(queryGeom->getBound());
 
         osg::StateSet* queryStateSet = new osg::StateSet;
         if (queryVisible)

From 84b8da7a0965a1d38bdc7f1c1a0130d4a05569b3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 00:36:35 +0100
Subject: [PATCH 427/765] Share the osg::Material on drawables

Reduces the number of GL calls / frame by ~4%.
---
 components/nifosg/nifloader.cpp | 45 ++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0ba13d56ff..53b9f33724 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -992,16 +992,7 @@ namespace NifOsg
 
             std::vector<const Nif::Property*> drawableProps;
             collectDrawableProperties(nifNode, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, true, animflags);
-
-            // Particles don't have normals, so can't be diffuse lit.
-            osg::Material* mat = static_cast<osg::Material*>(parentNode->getStateSet()->getAttribute(osg::StateAttribute::MATERIAL));
-            if (mat)
-            {
-                // NB ignoring diffuse.a()
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-                mat->setColorMode(osg::Material::AMBIENT);
-            }
+            applyDrawableProperties(parentNode, drawableProps, composite, true, animflags, true);
 
             // particle system updater (after the emitters and affectors in the scene graph)
             // I think for correct culling needs to be *before* the ParticleSystem, though osg examples do it the other way
@@ -1058,7 +1049,7 @@ namespace NifOsg
             //   above the actual renderable would be tedious.
             std::vector<const Nif::Property*> drawableProps;
             collectDrawableProperties(triShape, drawableProps);
-            applyDrawableProperties(parentNode, drawableProps, composite, !data->colors->empty(), animflags);
+            applyDrawableProperties(parentNode, drawableProps, composite, !data->colors->empty(), animflags, false);
         }
 
         void handleTriShape(const Nif::NiTriShape* triShape, osg::Group* parentNode, SceneUtil::CompositeStateSetUpdater* composite, const std::vector<int>& boundTextures, int animflags)
@@ -1580,8 +1571,26 @@ namespace NifOsg
             }
         }
 
+        struct CompareMaterial
+        {
+            bool operator() (const osg::ref_ptr<osg::Material>& left, const osg::ref_ptr<osg::Material>& right) const
+            {
+                return left->compare(*right) < 0;
+            }
+        };
+
+        osg::Material* shareMaterial(osg::Material* mat)
+        {
+            typedef std::set<osg::ref_ptr<osg::Material>, CompareMaterial> MatCache;
+            static MatCache mats;
+            MatCache::iterator found = mats.find(mat);
+            if (found == mats.end())
+                found = mats.insert(mat).first;
+            return *found;
+        }
+
         void applyDrawableProperties(osg::Node* node, const std::vector<const Nif::Property*>& properties, SceneUtil::CompositeStateSetUpdater* composite,
-                                             bool hasVertexColors, int animflags)
+                                             bool hasVertexColors, int animflags, bool particleMaterial)
         {
             osg::StateSet* stateset = node->getOrCreateStateSet();
 
@@ -1678,6 +1687,18 @@ namespace NifOsg
             if (specFlags == 0)
                 mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f));
 
+            // Particles don't have normals, so can't be diffuse lit.
+            if (particleMaterial)
+            {
+                // NB ignoring diffuse.a()
+                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
+                mat->setColorMode(osg::Material::AMBIENT);
+            }
+
+            // TODO: this could be replaced by a more generic mechanism of sharing any type of State Attribute
+            // apply only for Materials for now
+            mat = shareMaterial(mat);
+
             stateset->setAttributeAndModes(mat, osg::StateAttribute::ON);
         }
 

From 3f08cbff71c3e91035cf96661e367fbf36ccc230 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 01:07:41 +0100
Subject: [PATCH 428/765] Share the state attributes for terrain techniques

Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.
---
 components/terrain/material.cpp | 87 +++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 30 deletions(-)

diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index b9405ef861..1b6cd5d44f 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -15,6 +15,49 @@
 namespace Terrain
 {
 
+    osg::ref_ptr<osg::TexMat> getBlendmapTexMat(int blendmapScale)
+    {
+        static std::map<int, osg::ref_ptr<osg::TexMat> > texMatMap;
+        osg::ref_ptr<osg::TexMat> texMat = texMatMap[blendmapScale];
+        if (!texMat)
+        {
+            texMat = new osg::TexMat;
+            osg::Matrixf matrix;
+            float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
+            matrix.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
+            matrix.preMultScale(osg::Vec3f(scale, scale, 1.f));
+            matrix.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
+
+            texMatMap[blendmapScale] = texMat;
+        }
+        return texMat;
+    }
+
+    osg::ref_ptr<osg::TexMat> getLayerTexMat(float layerTileSize)
+    {
+        static std::map<float, osg::ref_ptr<osg::TexMat> > texMatMap;
+        osg::ref_ptr<osg::TexMat> texMat = texMatMap[layerTileSize];
+        if (!texMat)
+        {
+            texMat = new osg::TexMat;
+            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
+
+            texMatMap[layerTileSize] = texMat;
+        }
+        return texMat;
+    }
+
+    osg::ref_ptr<osg::Depth> getEqualDepth()
+    {
+        static osg::ref_ptr<osg::Depth> depth;
+        if (!depth)
+        {
+            depth = new osg::Depth;
+            depth->setFunction(osg::Depth::EQUAL);
+        }
+        return depth;
+    }
+
     FixedFunctionTechnique::FixedFunctionTechnique(const std::vector<TextureLayer>& layers,
                                                    const std::vector<osg::ref_ptr<osg::Texture2D> >& blendmaps, int blendmapScale, float layerTileSize)
     {
@@ -27,9 +70,8 @@ namespace Terrain
             if (!firstLayer)
             {
                 stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-                osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-                depth->setFunction(osg::Depth::EQUAL);
-                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+
+                stateset->setAttributeAndModes(getEqualDepth(), osg::StateAttribute::ON);
             }
 
             int texunit = 0;
@@ -40,17 +82,15 @@ namespace Terrain
                 stateset->setTextureAttributeAndModes(texunit, blendmap.get());
 
                 // This is to map corner vertices directly to the center of a blendmap texel.
-                osg::Matrixf texMat;
-                float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
-                texMat.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
-                texMat.preMultScale(osg::Vec3f(scale, scale, 1.f));
-                texMat.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
+                stateset->setTextureAttributeAndModes(texunit, getBlendmapTexMat(blendmapScale));
 
-                stateset->setTextureAttributeAndModes(texunit, new osg::TexMat(texMat));
-
-                osg::ref_ptr<osg::TexEnvCombine> texEnvCombine (new osg::TexEnvCombine);
-                texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
-                texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                static osg::ref_ptr<osg::TexEnvCombine> texEnvCombine;
+                if (!texEnvCombine)
+                {
+                    texEnvCombine = new osg::TexEnvCombine;
+                    texEnvCombine->setCombine_RGB(osg::TexEnvCombine::REPLACE);
+                    texEnvCombine->setSource0_RGB(osg::TexEnvCombine::PREVIOUS);
+                }
 
                 stateset->setTextureAttributeAndModes(texunit, texEnvCombine, osg::StateAttribute::ON);
 
@@ -61,9 +101,7 @@ namespace Terrain
             osg::ref_ptr<osg::Texture2D> tex = it->mDiffuseMap;
             stateset->setTextureAttributeAndModes(texunit, tex.get());
 
-            osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
-            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
-            stateset->setTextureAttributeAndModes(texunit, texMat, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texunit, getLayerTexMat(layerTileSize), osg::StateAttribute::ON);
 
             firstLayer = false;
 
@@ -83,18 +121,14 @@ namespace Terrain
             if (!firstLayer)
             {
                 stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
-                osg::ref_ptr<osg::Depth> depth (new osg::Depth);
-                depth->setFunction(osg::Depth::EQUAL);
-                stateset->setAttributeAndModes(depth, osg::StateAttribute::ON);
+                stateset->setAttributeAndModes(getEqualDepth(), osg::StateAttribute::ON);
             }
 
             int texunit = 0;
 
             stateset->setTextureAttributeAndModes(texunit, it->mDiffuseMap);
 
-            osg::ref_ptr<osg::TexMat> texMat (new osg::TexMat);
-            texMat->setMatrix(osg::Matrix::scale(osg::Vec3f(layerTileSize,layerTileSize,1.f)));
-            stateset->setTextureAttributeAndModes(texunit, texMat, osg::StateAttribute::ON);
+            stateset->setTextureAttributeAndModes(texunit, getLayerTexMat(layerTileSize), osg::StateAttribute::ON);
 
             stateset->addUniform(new osg::Uniform("diffuseMap", texunit));
 
@@ -105,14 +139,7 @@ namespace Terrain
 
                 stateset->setTextureAttributeAndModes(texunit, blendmap.get());
 
-                // This is to map corner vertices directly to the center of a blendmap texel.
-                osg::Matrixf texMat;
-                float scale = (blendmapScale/(static_cast<float>(blendmapScale)+1.f));
-                texMat.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
-                texMat.preMultScale(osg::Vec3f(scale, scale, 1.f));
-                texMat.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
-
-                stateset->setTextureAttributeAndModes(texunit, new osg::TexMat(texMat));
+                stateset->setTextureAttributeAndModes(texunit, getBlendmapTexMat(blendmapScale));
                 stateset->addUniform(new osg::Uniform("blendMap", texunit));
             }
 

From 0dbf44b4146ca99a602badd4c91b91c78ddf4be1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 01:35:28 +0100
Subject: [PATCH 429/765] Enable vertex buffer objects in MyGUI RenderManager
 now that OSG 3.4 is a dependency

---
 components/myguiplatform/myguirendermanager.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index 0bc7b0ee1e..eab7aab315 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -131,9 +131,8 @@ public:
             if(texture)
                 state->applyTextureAttribute(0, texture);
 
-            // VBOs disabled due to crash in OSG: http://forum.openscenegraph.org/viewtopic.php?t=14909
-            osg::GLBufferObject* bufferobject = 0;//state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
-            if (0)//bufferobject)
+            osg::GLBufferObject* bufferobject = state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
+            if (bufferobject)
             {
                 state->bindVertexBufferObject(bufferobject);
 

From 58e0e8bd4e0d6ee11967cec537d5e2dab3c43525 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 01:39:09 +0100
Subject: [PATCH 430/765] Enable vertex buffer objects in RigGeometry

---
 components/sceneutil/riggeometry.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 9f3b192527..4bdd8275a1 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -71,6 +71,7 @@ RigGeometry::RigGeometry()
     setCullCallback(new UpdateRigGeometry);
     setUpdateCallback(new UpdateRigBounds);
     setSupportsDisplayList(false);
+    setUseVertexBufferObjects(true);
     setComputeBoundingBoxCallback(new DummyComputeBoundCallback);
 }
 

From fa9689c5e7121acbda5e17371191b33f13c9d14f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 11 Mar 2016 14:04:47 +0100
Subject: [PATCH 431/765] delay command execution until call to Object::apply
 has finished (avoids cutting off the branch we are sitting on)

---
 apps/opencs/view/render/instancemode.cpp | 2 +-
 apps/opencs/view/render/object.cpp       | 9 +++++----
 apps/opencs/view/render/object.hpp       | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 12bc77105f..32373c3952 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -268,7 +268,7 @@ void CSVRender::InstanceMode::dragCompleted()
     {
         if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (iter->get()))
         {
-            objectTag->mObject->apply (undoStack);
+            objectTag->mObject->apply (macro);
         }
     }
 
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index 6ca751ba56..f7bb338cd4 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -19,6 +19,7 @@
 #include "../../model/world/refidcollection.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/universalid.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
@@ -524,7 +525,7 @@ void CSVRender::Object::setScale (float scale)
     adjustTransform();
 }
 
-void CSVRender::Object::apply (QUndoStack& undoStack)
+void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
 {
     const CSMWorld::RefCollection& collection = mData.getReferences();
     QAbstractItemModel *model = mData.getTableModel (CSMWorld::UniversalId::Type_References);
@@ -538,7 +539,7 @@ void CSVRender::Object::apply (QUndoStack& undoStack)
             int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
                 CSMWorld::Columns::ColumnId_PositionXPos+i));
 
-            undoStack.push (new CSMWorld::ModifyCommand (*model,
+            commands.push (new CSMWorld::ModifyCommand (*model,
                 model->index (recordIndex, column), mPositionOverride.pos[i]));
         }
     }
@@ -550,7 +551,7 @@ void CSVRender::Object::apply (QUndoStack& undoStack)
             int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
                 CSMWorld::Columns::ColumnId_PositionXRot+i));
 
-            undoStack.push (new CSMWorld::ModifyCommand (*model,
+            commands.push (new CSMWorld::ModifyCommand (*model,
                 model->index (recordIndex, column), mPositionOverride.rot[i]));
         }
     }
@@ -559,7 +560,7 @@ void CSVRender::Object::apply (QUndoStack& undoStack)
     {
         int column = collection.findColumnIndex (CSMWorld::Columns::ColumnId_Scale);
 
-        undoStack.push (new CSMWorld::ModifyCommand (*model,
+        commands.push (new CSMWorld::ModifyCommand (*model,
             model->index (recordIndex, column), mScaleOverride));
     }
 
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index a5cc141a0f..54a284fa3b 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -37,6 +37,7 @@ namespace CSMWorld
 {
     class Data;
     struct CellRef;
+    class CommandMacro;
 }
 
 namespace CSVRender
@@ -172,7 +173,7 @@ namespace CSVRender
             void setScale (float scale);
 
             /// Apply override changes via command and end edit mode
-            void apply (QUndoStack& undoStack);
+            void apply (CSMWorld::CommandMacro& commands);
 
             void setSubMode (int subMode);
 

From 174dd828940acaf097f5b1e9cef4c1d0d4c42264 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 15:42:14 +0100
Subject: [PATCH 432/765] Manually apply the osg::Light state

Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).
---
 components/sceneutil/lightmanager.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 04ff3b603e..f7c0573a47 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -51,14 +51,27 @@ namespace SceneUtil
             state.applyModelViewMatrix(state.getInitialViewMatrix());
 
             for (unsigned int i=0; i<mLights.size(); ++i)
-            {
-                mLights[i]->setLightNum(i+mIndex);
-                mLights[i]->apply(state);
-            }
+                applyLight((GLenum)((int)GL_LIGHT0 + i + mIndex), mLights[i].get());
 
             state.applyModelViewMatrix(modelViewMatrix);
         }
 
+        void applyLight(GLenum lightNum, const osg::Light* light) const
+        {
+            glLightfv( lightNum, GL_AMBIENT,               light->getAmbient().ptr() );
+            glLightfv( lightNum, GL_DIFFUSE,               light->getDiffuse().ptr() );
+            glLightfv( lightNum, GL_SPECULAR,              light->getSpecular().ptr() );
+            glLightfv( lightNum, GL_POSITION,              light->getPosition().ptr() );
+            // TODO: enable this once spot lights are supported
+            // need to transform SPOT_DIRECTION by the world matrix?
+            //glLightfv( lightNum, GL_SPOT_DIRECTION,        light->getDirection().ptr() );
+            //glLightf ( lightNum, GL_SPOT_EXPONENT,         light->getSpotExponent() );
+            //glLightf ( lightNum, GL_SPOT_CUTOFF,           light->getSpotCutoff() );
+            glLightf ( lightNum, GL_CONSTANT_ATTENUATION,  light->getConstantAttenuation() );
+            glLightf ( lightNum, GL_LINEAR_ATTENUATION,    light->getLinearAttenuation() );
+            glLightf ( lightNum, GL_QUADRATIC_ATTENUATION, light->getQuadraticAttenuation() );
+        }
+
     private:
         unsigned int mIndex;
 

From 4eb090a8d0b7c52cd2c86df2f2f31ee29e1bf635 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 16:09:48 +0100
Subject: [PATCH 433/765] Set the RigGeometry vertex buffer object usage to
 GL_DYNAMIC_DRAW

---
 components/sceneutil/riggeometry.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 4bdd8275a1..fd413acf40 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -72,6 +72,7 @@ RigGeometry::RigGeometry()
     setUpdateCallback(new UpdateRigBounds);
     setSupportsDisplayList(false);
     setUseVertexBufferObjects(true);
+    getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
     setComputeBoundingBoxCallback(new DummyComputeBoundCallback);
 }
 

From aae43dbff5889b1eba6aac3c8eab8ea0a75bd31c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 16:10:39 +0100
Subject: [PATCH 434/765] Set the MorphGeometry vertex buffer object usage to
 GL_DYNAMIC_DRAW

---
 components/nifosg/nifloader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 53b9f33724..0847a368da 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1103,6 +1103,8 @@ namespace NifOsg
 
             morphGeom->setUpdateCallback(NULL);
             morphGeom->setCullCallback(new UpdateMorphGeometry);
+            morphGeom->setUseVertexBufferObjects(true);
+            morphGeom->getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
 
             triShapeToGeometry(triShape, morphGeom, parentNode, composite, boundTextures, animflags);
 

From 50b8260a397cdf588cac2e4c92c5ac8ce6c24556 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 18:21:55 +0100
Subject: [PATCH 435/765] Disable VBOs in RigGeometry while investigating a
 crash possibly related to commit cda8a88f0d9a9fb5f12e3a3

---
 components/sceneutil/riggeometry.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index fd413acf40..c2a2023421 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -71,8 +71,8 @@ RigGeometry::RigGeometry()
     setCullCallback(new UpdateRigGeometry);
     setUpdateCallback(new UpdateRigBounds);
     setSupportsDisplayList(false);
-    setUseVertexBufferObjects(true);
-    getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
+    //setUseVertexBufferObjects(true);
+    //getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
     setComputeBoundingBoxCallback(new DummyComputeBoundCallback);
 }
 

From 9f03982e0b81b02d7eedf1b3e1857a808feb3ad4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 19:08:48 +0100
Subject: [PATCH 436/765] Use a dedicated VBO for RigGeometry's vertices and
 normals

The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries.

The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.
---
 components/sceneutil/riggeometry.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index c2a2023421..5a12b5b4f7 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -71,8 +71,7 @@ RigGeometry::RigGeometry()
     setCullCallback(new UpdateRigGeometry);
     setUpdateCallback(new UpdateRigBounds);
     setSupportsDisplayList(false);
-    //setUseVertexBufferObjects(true);
-    //getOrCreateVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
+    setUseVertexBufferObjects(true);
     setComputeBoundingBoxCallback(new DummyComputeBoundCallback);
 }
 
@@ -121,8 +120,23 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
             setVertexAttribArray(vi,array);
     }
 
-    setVertexArray(dynamic_cast<osg::Array*>(from.getVertexArray()->clone(osg::CopyOp::DEEP_COPY_ALL)));
-    setNormalArray(dynamic_cast<osg::Array*>(from.getNormalArray()->clone(osg::CopyOp::DEEP_COPY_ALL)), osg::Array::BIND_PER_VERTEX);
+
+    osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
+    vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
+
+    osg::ref_ptr<osg::Array> vertexArray = osg::clone(from.getVertexArray(), osg::CopyOp::DEEP_COPY_ALL);
+    if (vertexArray)
+    {
+        vertexArray->setVertexBufferObject(vbo);
+        setVertexArray(vertexArray);
+    }
+
+    osg::ref_ptr<osg::Array> normalArray = osg::clone(from.getNormalArray(), osg::CopyOp::DEEP_COPY_ALL);
+    if (normalArray)
+    {
+        normalArray->setVertexBufferObject(vbo);
+        setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+    }
 }
 
 bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)

From 1abb77f8a11d9e8d748561e6953535f10f1751b0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 19:18:51 +0100
Subject: [PATCH 437/765] Cleanup

---
 components/sceneutil/riggeometry.cpp | 33 +++++++---------------------
 components/sceneutil/riggeometry.hpp |  2 ++
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 5a12b5b4f7..410ab53005 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -94,33 +94,16 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
     if (from.getStateSet())
         setStateSet(from.getStateSet());
 
-    // copy over primitive sets.
+    // shallow copy primitive sets & vertex attributes that we will not modify
     getPrimitiveSetList() = from.getPrimitiveSetList();
+    setColorArray(from.getColorArray());
+    setSecondaryColorArray(from.getSecondaryColorArray());
+    setFogCoordArray(from.getFogCoordArray());
+    setTexCoordArrayList(from.getTexCoordArrayList());
+    setVertexAttribArrayList(from.getVertexAttribArrayList());
 
-    if (from.getColorArray())
-        setColorArray(from.getColorArray());
-
-    if (from.getSecondaryColorArray())
-        setSecondaryColorArray(from.getSecondaryColorArray());
-
-    if (from.getFogCoordArray())
-        setFogCoordArray(from.getFogCoordArray());
-
-    for(unsigned int ti=0;ti<from.getNumTexCoordArrays();++ti)
-    {
-        if (from.getTexCoordArray(ti))
-            setTexCoordArray(ti,from.getTexCoordArray(ti));
-    }
-
-    osg::Geometry::ArrayList& arrayList = from.getVertexAttribArrayList();
-    for(unsigned int vi=0;vi< arrayList.size();++vi)
-    {
-        osg::Array* array = arrayList[vi].get();
-        if (array)
-            setVertexAttribArray(vi,array);
-    }
-
-
+    // vertices and normals are modified every frame, so we need to deep copy them.
+    // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
     osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
     vbo->setUsage(GL_DYNAMIC_DRAW_ARB);
 
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 03c287b812..301d206fa0 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -36,6 +36,8 @@ namespace SceneUtil
 
         void setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap);
 
+        /// Initialize this geometry from the source geometry.
+        /// @note The source geometry will not be modified.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
         // Called automatically by our CullCallback

From d986b1a48b3005607af69865aade5c3cfa36333e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 19:28:53 +0100
Subject: [PATCH 438/765] Add comment

---
 components/sceneutil/riggeometry.hpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 301d206fa0..90d4c1156b 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -13,6 +13,9 @@ namespace SceneUtil
     /// @brief Mesh skinning implementation.
     /// @note A RigGeometry may be attached directly to a Skeleton, or somewhere below a Skeleton.
     /// Note though that the RigGeometry ignores any transforms below the Skeleton, so the attachment point is not that important.
+    /// @note To avoid race conditions, the rig geometry needs to be double buffered. This can be done
+    /// using a FrameSwitch node that has two RigGeometry children. In the future we may want to consider implementing
+    /// the double buffering inside RigGeometry.
     class RigGeometry : public osg::Geometry
     {
     public:

From 97526284f5274f081865a5f1b9f2bf192fc8fa15 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 22:10:59 +0100
Subject: [PATCH 439/765] Allow setting the water level of an interior cell
 with sky (Fixes #3244)

---
 apps/opencs/model/world/nestedcoladapterimp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 82df7bd11a..1bcd6b1b4c 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -915,7 +915,7 @@ namespace CSMWorld
                     cell.mAmbi.mFogDensity : QVariant(QVariant::UserType);
             case 5:
             {
-                if (isInterior && !behaveLikeExterior && interiorWater)
+                if (isInterior && interiorWater)
                     return cell.mWater;
                 else
                     return QVariant(QVariant::UserType);
@@ -981,7 +981,7 @@ namespace CSMWorld
             }
             case 5:
             {
-                if (isInterior && !behaveLikeExterior && interiorWater)
+                if (isInterior && interiorWater)
                     cell.mWater = value.toFloat();
                 else
                     return; // return without saving

From d840c7d5eb89c91c60f97a8eac2fc3b1f8c9ec12 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 11 Mar 2016 22:29:50 +0100
Subject: [PATCH 440/765] Slightly tweak the spawn point heuristics

Fixes an issue with hlaalu building exits
---
 apps/openmw/mwphysics/physicssystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index db1bf52deb..04267d525f 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -221,7 +221,7 @@ namespace MWPhysics
                 collisionWorld->rayTest(from, to, resultCallback1);
 
                 if (resultCallback1.hasHit() &&
-                        ( (toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos).length() > 30
+                        ( (toOsg(resultCallback1.m_hitPointWorld) - tracer.mEndPos).length() > 35
                         || getSlope(tracer.mPlaneNormal) > sMaxSlope))
                 {
                     actor->setOnGround(getSlope(toOsg(resultCallback1.m_hitNormalWorld)) <= sMaxSlope);

From d6b8033b464c5090ea1d42ee0a62d955a362a62d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 12 Mar 2016 13:19:51 +0100
Subject: [PATCH 441/765] handle cell transitions when moving objects

---
 apps/opencs/model/world/cellcoordinates.cpp | 12 ++++++++++++
 apps/opencs/model/world/cellcoordinates.hpp |  5 +++++
 apps/opencs/model/world/ref.cpp             |  9 +++++----
 apps/opencs/view/render/object.cpp          | 12 ++++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index 3ef3e6c693..80ec9dc04d 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -1,5 +1,7 @@
 #include "cellcoordinates.hpp"
 
+#include <cmath>
+
 #include <ostream>
 #include <sstream>
 
@@ -7,6 +9,9 @@ CSMWorld::CellCoordinates::CellCoordinates() : mX (0), mY (0) {}
 
 CSMWorld::CellCoordinates::CellCoordinates (int x, int y) : mX (x), mY (y) {}
 
+CSMWorld::CellCoordinates::CellCoordinates (const std::pair<int, int>& coordinates)
+: mX (coordinates.first), mY (coordinates.second) {}
+
 int CSMWorld::CellCoordinates::getX() const
 {
     return mX;
@@ -49,6 +54,13 @@ std::pair<CSMWorld::CellCoordinates, bool> CSMWorld::CellCoordinates::fromId (
     return std::make_pair (CellCoordinates(), false);
 }
 
+std::pair<int, int> CSMWorld::CellCoordinates::coordinatesToCellIndex (float x, float y)
+{
+    const int cellSize = 8192;
+
+    return std::make_pair (std::floor (x/cellSize), std::floor (y/cellSize));
+}
+
 bool CSMWorld::operator== (const CellCoordinates& left, const CellCoordinates& right)
 {
     return left.getX()==right.getX() && left.getY()==right.getY();
diff --git a/apps/opencs/model/world/cellcoordinates.hpp b/apps/opencs/model/world/cellcoordinates.hpp
index 63db60c29d..f8851a6d94 100644
--- a/apps/opencs/model/world/cellcoordinates.hpp
+++ b/apps/opencs/model/world/cellcoordinates.hpp
@@ -3,6 +3,7 @@
 
 #include <iosfwd>
 #include <string>
+#include <utility>
 
 #include <QMetaType>
 
@@ -19,6 +20,8 @@ namespace CSMWorld
 
             CellCoordinates (int x, int y);
 
+            CellCoordinates (const std::pair<int, int>& coordinates);
+
             int getX() const;
 
             int getY() const;
@@ -34,6 +37,8 @@ namespace CSMWorld
             ///
             /// \note The worldspace part of \a id is ignored
             static std::pair<CellCoordinates, bool> fromId (const std::string& id);
+
+            static std::pair<int, int> coordinatesToCellIndex (float x, float y);
     };
 
     bool operator== (const CellCoordinates& left, const CellCoordinates& right);
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index 638f7ec9ca..e6345ce71b 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -2,6 +2,10 @@
 
 #include <cmath>
 
+#include <sstream>
+
+#include "cellcoordinates.hpp"
+
 CSMWorld::CellRef::CellRef()
 {
     mRefNum.mIndex = 0;
@@ -10,8 +14,5 @@ CSMWorld::CellRef::CellRef()
 
 std::pair<int, int> CSMWorld::CellRef::getCellIndex() const
 {
-    const int cellSize = 8192;
-
-    return std::make_pair (
-        std::floor (mPos.pos[0]/cellSize), std::floor (mPos.pos[1]/cellSize));
+    return CellCoordinates::coordinatesToCellIndex (mPos.pos[0], mPos.pos[1]);
 }
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index f7bb338cd4..cc151ead90 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -20,6 +20,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/commandmacro.hpp"
+#include "../../model/world/cellcoordinates.hpp"
 
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
@@ -542,6 +543,17 @@ void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
             commands.push (new CSMWorld::ModifyCommand (*model,
                 model->index (recordIndex, column), mPositionOverride.pos[i]));
         }
+
+        int column = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
+            CSMWorld::Columns::ColumnId_Cell));
+
+        std::pair<int, int> cellIndex = collection.getRecord (recordIndex).get().getCellIndex();
+
+        /// \todo figure out worldspace (not important until multiple worldspaces are supported)
+        std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId ("");
+
+        commands.push (new CSMWorld::ModifyCommand (*model,
+            model->index (recordIndex, column), QString::fromUtf8 (cellId.c_str())));
     }
 
     if (mOverrideFlags & Override_Rotation)

From 900378a31e0bdeb43093709fc35568f327736dd7 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 12 Mar 2016 13:26:33 +0100
Subject: [PATCH 442/765] changed 'not implemented' warning message for object
 movement

---
 apps/opencs/view/render/instancemovemode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/instancemovemode.cpp b/apps/opencs/view/render/instancemovemode.cpp
index fd42b9f699..9929f5fcb4 100644
--- a/apps/opencs/view/render/instancemovemode.cpp
+++ b/apps/opencs/view/render/instancemovemode.cpp
@@ -7,6 +7,6 @@ CSVRender::InstanceMoveMode::InstanceMoveMode (QWidget *parent)
   "<ul><li>Use primary edit to move instances around freely</li>"
   "<li>Use secondary edit to move instances around within the grid</li>"
   "</ul>"
-  "<font color=Red>Not implemented yet</font color>",
+  "<font color=Red>Grid move not implemented yet</font color>",
   parent)
 {}

From d7c7bb850b27d53ccd52ef47868d9fbd63f8474e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 12 Mar 2016 20:32:42 +0100
Subject: [PATCH 443/765] ToggleAI cleanup

---
 apps/openmw/mwscript/aiextensions.cpp  | 4 +---
 apps/openmw/mwscript/docs/vmformat.txt | 2 +-
 components/compiler/extensions0.cpp    | 4 ++--
 components/compiler/opcodes.hpp        | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index db60d14d18..12e3232725 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -465,7 +465,6 @@ namespace MWScript
                 }
         };
 
-        template<class R>
         class OpToggleAI : public Interpreter::Opcode0
         {
             public:
@@ -520,8 +519,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Ai::opcodeStartCombatExplicit, new OpStartCombat<ExplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombat, new OpStopCombat<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Ai::opcodeStopCombatExplicit, new OpStopCombat<ExplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAIExplicit, new OpToggleAI<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Ai::opcodeToggleAI, new OpToggleAI);
 
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHello, new OpSetAiSetting<ImplicitRef>(0));
             interpreter.installSegment5 (Compiler::Ai::opcodeSetHelloExplicit, new OpSetAiSetting<ExplicitRef>(0));
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index d3070c79b0..e19d7a1ad2 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -364,7 +364,7 @@ op 0x2000221: EnableLevitation
 op 0x2000222: GetLineOfSight
 op 0x2000223: GetLineOfSightExplicit
 op 0x2000224: ToggleAI
-op 0x2000225: ToggleAIExplicit
+op 0x2000225: unused
 op 0x2000226: COE
 op 0x2000227: Cast
 op 0x2000228: Cast, explicit
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 161d8adb42..f67e70522f 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -59,8 +59,8 @@ namespace Compiler
             extensions.registerInstruction ("modfight", "l", opcodeModFight, opcodeModFightExplicit);
             extensions.registerInstruction ("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
             extensions.registerInstruction ("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
-            extensions.registerInstruction ("toggleai", "", opcodeToggleAI, opcodeToggleAI);
-            extensions.registerInstruction ("tai", "", opcodeToggleAI, opcodeToggleAI);
+            extensions.registerInstruction ("toggleai", "", opcodeToggleAI);
+            extensions.registerInstruction ("tai", "", opcodeToggleAI);
             extensions.registerInstruction("startcombat", "c", opcodeStartCombat, opcodeStartCombatExplicit);
             extensions.registerInstruction("stopcombat", "x", opcodeStopCombat, opcodeStopCombatExplicit);
             extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 430b884847..773ac68f1f 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -52,7 +52,6 @@ namespace Compiler
         const int opcodeGetLineOfSight = 0x2000222;
         const int opcodeGetLineOfSightExplicit = 0x2000223;
         const int opcodeToggleAI = 0x2000224;
-        const int opcodeToggleAIExplicit = 0x2000225;
         const int opcodeGetTarget = 0x2000238;
         const int opcodeGetTargetExplicit = 0x2000239;
         const int opcodeStartCombat = 0x200023a;

From 426a6fdcc2bb428877b7db3765b7dc5c028f8de8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 13 Mar 2016 23:37:14 +0100
Subject: [PATCH 444/765] Don't create the save directory on loading a game

This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
---
 apps/openmw/mwstate/charactermanager.cpp | 13 +++++++------
 apps/openmw/mwstate/charactermanager.hpp |  2 --
 apps/openmw/mwstate/statemanagerimp.cpp  | 18 ++++--------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 22192c355d..f2d0315769 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -101,15 +101,16 @@ std::list<MWState::Character>::iterator MWState::CharacterManager::findCharacter
 
 void MWState::CharacterManager::setCurrentCharacter (const Character *character)
 {
-    std::list<Character>::iterator it = findCharacter(character);
+    if (!character)
+        mCurrent = NULL;
+    else
+    {
+        std::list<Character>::iterator it = findCharacter(character);
 
-    mCurrent = &*it;
+        mCurrent = &*it;
+    }
 }
 
-void MWState::CharacterManager::clearCurrentCharacter()
-{
-    mCurrent = 0;
-}
 
 std::list<MWState::Character>::const_iterator MWState::CharacterManager::begin() const
 {
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index c44c10b5a2..64f71af999 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -43,8 +43,6 @@ namespace MWState
 
             void setCurrentCharacter (const Character *character);
 
-            void clearCurrentCharacter();
-
             std::list<Character>::const_iterator begin() const;
 
             std::list<Character>::const_iterator end() const;
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 1bf97cb7ea..1759cdf549 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -54,7 +54,7 @@ void MWState::StateManager::cleanup (bool force)
         MWBase::Environment::get().getMechanicsManager()->clear();
 
         mState = State_NoGame;
-        mCharacterManager.clearCurrentCharacter();
+        mCharacterManager.setCurrentCharacter(NULL);
         mTimePlayed = 0;
 
         MWMechanics::CreatureStats::cleanup();
@@ -333,19 +333,8 @@ void MWState::StateManager::loadGame(const std::string& filepath)
         }
     }
 
-    // have to peek into the save file to get the player name
-    ESM::ESMReader reader;
-    reader.open (filepath);
-    if (reader.getRecName()!=ESM::REC_SAVE)
-        return; // invalid save file -> ignore
-    reader.getRecHeader();
-    ESM::SavedGame profile;
-    profile.load (reader);
-    reader.close();
-
-    MWState::Character* character = mCharacterManager.getCurrentCharacter(true, profile.mPlayerName);
+    MWState::Character* character = getCurrentCharacter(false);
     loadGame(character, filepath);
-    mTimePlayed = profile.mTimePlayed;
 }
 
 void MWState::StateManager::loadGame (const Character *character, const std::string& filepath)
@@ -470,7 +459,8 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
         mState = State_Running;
 
-        Settings::Manager::setString ("character", "Saves",
+        if (character)
+            Settings::Manager::setString ("character", "Saves",
                                       character->getPath().filename().string());
 
         MWBase::Environment::get().getWindowManager()->setNewGame(false);

From 7463c0c3530755567fff14eba029eaed7d875050 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 13 Mar 2016 23:47:57 +0100
Subject: [PATCH 445/765] Addition to last commit, don't create a save
 directory on death

---
 apps/openmw/mwstate/statemanagerimp.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 1759cdf549..8f0b3b74b1 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -109,13 +109,14 @@ void MWState::StateManager::askLoadRecent()
 
     if( !mAskLoadRecent )
     {
-        if(getCurrentCharacter()->begin() == getCurrentCharacter()->end() )//no saves
+        const MWState::Character* character = getCurrentCharacter(false);
+        if(!character || character->begin() == character->end())//no saves
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
         }
         else
         {
-            MWState::Slot lastSave = *getCurrentCharacter()->begin();
+            MWState::Slot lastSave = *character->begin();
             std::vector<std::string> buttons;
             buttons.push_back("#{sYes}");
             buttons.push_back("#{sNo}");

From b7b7c0612dd1f50d1705448fc8c2b79b78dcbdae Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 13 Mar 2016 23:48:44 +0100
Subject: [PATCH 446/765] Make getCurrentCharacter create argument explicit

---
 apps/openmw/mwstate/statemanagerimp.cpp | 12 ++++++------
 apps/openmw/mwstate/statemanagerimp.hpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 8f0b3b74b1..115b47a5d9 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -204,9 +204,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writeScreenshot(profile.mScreenshot);
 
         if (!slot)
-            slot = getCurrentCharacter()->createSlot (profile);
+            slot = getCurrentCharacter(true)->createSlot (profile);
         else
-            slot = getCurrentCharacter()->updateSlot (slot, profile);
+            slot = getCurrentCharacter(true)->updateSlot (slot, profile);
 
         // Write to a memory stream first. If there is an exception during the save process, we don't want to trash the
         // existing save file we are overwriting.
@@ -290,7 +290,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         // If no file was written, clean up the slot
         if (slot && !boost::filesystem::exists(slot->mPath))
-            getCurrentCharacter()->deleteSlot(slot);
+            getCurrentCharacter(true)->deleteSlot(slot);
     }
 }
 
@@ -506,11 +506,11 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
 void MWState::StateManager::quickLoad()
 {
-    if (Character* mCurrentCharacter = getCurrentCharacter (false))
+    if (Character* currentCharacter = getCurrentCharacter (false))
     {
-        if (mCurrentCharacter->begin() == mCurrentCharacter->end())
+        if (currentCharacter->begin() == currentCharacter->end())
             return;
-        loadGame (mCurrentCharacter, mCurrentCharacter->begin()->mPath.string()); //Get newest save
+        loadGame (currentCharacter, currentCharacter->begin()->mPath.string()); //Get newest save
     }
 }
 
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 59dc919d14..44ee98be7f 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -73,7 +73,7 @@ namespace MWState
             virtual void loadGame (const Character *character, const std::string &filepath);
             ///< Load a saved game file belonging to the given character.
 
-            virtual Character *getCurrentCharacter (bool create = true);
+            virtual Character *getCurrentCharacter (bool create);
             ///< \param create Create a new character, if there is no current character.
 
             virtual CharacterIterator characterBegin();

From a0cc9de088e300c4e9ce2a6d8e82c91bbc38a978 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Mar 2016 00:00:11 +0100
Subject: [PATCH 447/765] Make the creation of save file directories even more
 explicit

---
 apps/openmw/mwbase/statemanager.hpp      |  4 +--
 apps/openmw/mwgui/savegamedialog.cpp     |  4 +--
 apps/openmw/mwstate/charactermanager.cpp | 10 ++----
 apps/openmw/mwstate/charactermanager.hpp |  7 ++--
 apps/openmw/mwstate/statemanagerimp.cpp  | 45 +++++++++++++++---------
 apps/openmw/mwstate/statemanagerimp.hpp  |  4 +--
 6 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 79ddbfa2ab..48a95f029f 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -78,8 +78,8 @@ namespace MWBase
             /** Used for quickload **/
             virtual void quickLoad()=0;
 
-            virtual MWState::Character *getCurrentCharacter (bool create = true) = 0;
-            ///< \param create Create a new character, if there is no current character.
+            virtual MWState::Character *getCurrentCharacter () = 0;
+            ///< @note May return null.
 
             virtual CharacterIterator characterBegin() = 0;
             ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 9de2374add..946eac4d98 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -132,7 +132,7 @@ namespace MWGui
         if (mgr->characterBegin() == mgr->characterEnd())
             return;
 
-        mCurrentCharacter = mgr->getCurrentCharacter (false);
+        mCurrentCharacter = mgr->getCurrentCharacter();
 
         std::string directory =
             Misc::StringUtils::lowerCase (Settings::Manager::getString ("character", "Saves"));
@@ -202,7 +202,7 @@ namespace MWGui
 
         if (!load)
         {
-            mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter (false);
+            mCurrentCharacter = MWBase::Environment::get().getStateManager()->getCurrentCharacter();
         }
 
         center();
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index f2d0315769..90b25ab5af 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -32,11 +32,8 @@ MWState::CharacterManager::CharacterManager (const boost::filesystem::path& save
     }
 }
 
-MWState::Character *MWState::CharacterManager::getCurrentCharacter (bool create, const std::string& name)
+MWState::Character *MWState::CharacterManager::getCurrentCharacter ()
 {
-    if (!mCurrent && create)
-        createCharacter(name);
-
     return mCurrent;
 }
 
@@ -56,7 +53,7 @@ void MWState::CharacterManager::deleteSlot(const MWState::Character *character,
     }
 }
 
-void MWState::CharacterManager::createCharacter(const std::string& name)
+MWState::Character* MWState::CharacterManager::createCharacter(const std::string& name)
 {
     std::ostringstream stream;
 
@@ -82,8 +79,7 @@ void MWState::CharacterManager::createCharacter(const std::string& name)
     }
 
     mCharacters.push_back (Character (path, mGame));
-
-    mCurrent = &mCharacters.back();
+    return &mCharacters.back();
 }
 
 std::list<MWState::Character>::iterator MWState::CharacterManager::findCharacter(const MWState::Character* character)
diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp
index 64f71af999..2daf73401f 100644
--- a/apps/openmw/mwstate/charactermanager.hpp
+++ b/apps/openmw/mwstate/charactermanager.hpp
@@ -31,13 +31,12 @@ namespace MWState
 
             CharacterManager (const boost::filesystem::path& saves, const std::string& game);
 
-            Character *getCurrentCharacter (bool create, const std::string& name);
-            ///< \param create Create a new character, if there is no current character.
-            /// \param name The character name to use in case a new character is created.
+            Character *getCurrentCharacter ();
+            ///< @note May return null
 
             void deleteSlot(const MWState::Character *character, const MWState::Slot *slot);
 
-            void createCharacter(const std::string& name);
+            Character* createCharacter(const std::string& name);
             ///< Create new character within saved game management
             /// \param name Name for the character (does not need to be unique)
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 115b47a5d9..e3c8f3df5b 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -109,7 +109,7 @@ void MWState::StateManager::askLoadRecent()
 
     if( !mAskLoadRecent )
     {
-        const MWState::Character* character = getCurrentCharacter(false);
+        const MWState::Character* character = getCurrentCharacter();
         if(!character || character->begin() == character->end())//no saves
         {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
@@ -173,6 +173,16 @@ void MWState::StateManager::endGame()
 
 void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)
 {
+    MWState::Character* character = getCurrentCharacter();
+    if (!character)
+    {
+        MWWorld::ConstPtr player = MWMechanics::getPlayer();
+        std::string name = player.get<ESM::NPC>()->mBase->mName;
+
+        character = mCharacterManager.createCharacter(name);
+        mCharacterManager.setCurrentCharacter(character);
+    }
+
     try
     {
         ESM::SavedGame profile;
@@ -204,9 +214,9 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         writeScreenshot(profile.mScreenshot);
 
         if (!slot)
-            slot = getCurrentCharacter(true)->createSlot (profile);
+            slot = character->createSlot (profile);
         else
-            slot = getCurrentCharacter(true)->updateSlot (slot, profile);
+            slot = character->updateSlot (slot, profile);
 
         // Write to a memory stream first. If there is an exception during the save process, we don't want to trash the
         // existing save file we are overwriting.
@@ -290,7 +300,10 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
 
         // If no file was written, clean up the slot
         if (slot && !boost::filesystem::exists(slot->mPath))
-            getCurrentCharacter(true)->deleteSlot(slot);
+        {
+            character->deleteSlot(slot);
+            character->cleanup();
+        }
     }
 }
 
@@ -306,13 +319,16 @@ void MWState::StateManager::quickSave (std::string name)
     }
 
     const Slot* slot = NULL;
-    Character* mCurrentCharacter = getCurrentCharacter(true); //Get current character
+    Character* currentCharacter = getCurrentCharacter(); //Get current character
 
     //Find quicksave slot
-    for (Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it)
+    if (currentCharacter)
     {
-        if (it->mProfile.mDescription == name)
-            slot = &*it;
+        for (Character::SlotIterator it = currentCharacter->begin(); it != currentCharacter->end(); ++it)
+        {
+            if (it->mProfile.mDescription == name)
+                slot = &*it;
+        }
     }
 
     saveGame(name, slot);
@@ -334,7 +350,7 @@ void MWState::StateManager::loadGame(const std::string& filepath)
         }
     }
 
-    MWState::Character* character = getCurrentCharacter(false);
+    MWState::Character* character = getCurrentCharacter();
     loadGame(character, filepath);
 }
 
@@ -506,7 +522,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
 void MWState::StateManager::quickLoad()
 {
-    if (Character* currentCharacter = getCurrentCharacter (false))
+    if (Character* currentCharacter = getCurrentCharacter ())
     {
         if (currentCharacter->begin() == currentCharacter->end())
             return;
@@ -519,12 +535,9 @@ void MWState::StateManager::deleteGame(const MWState::Character *character, cons
     mCharacterManager.deleteSlot(character, slot);
 }
 
-MWState::Character *MWState::StateManager::getCurrentCharacter (bool create)
+MWState::Character *MWState::StateManager::getCurrentCharacter ()
 {
-    MWWorld::ConstPtr player = MWMechanics::getPlayer();
-    std::string name = player.get<ESM::NPC>()->mBase->mName;
-
-    return mCharacterManager.getCurrentCharacter (create, name);
+    return mCharacterManager.getCurrentCharacter();
 }
 
 MWState::StateManager::CharacterIterator MWState::StateManager::characterBegin()
@@ -545,7 +558,7 @@ void MWState::StateManager::update (float duration)
     if (mAskLoadRecent)
     {
         int iButton = MWBase::Environment::get().getWindowManager()->readPressedButton();
-        MWState::Character *curCharacter = getCurrentCharacter(false);
+        MWState::Character *curCharacter = getCurrentCharacter();
         if(iButton==0 && curCharacter)
         {
             mAskLoadRecent = false;
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 44ee98be7f..5defcdea30 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -73,8 +73,8 @@ namespace MWState
             virtual void loadGame (const Character *character, const std::string &filepath);
             ///< Load a saved game file belonging to the given character.
 
-            virtual Character *getCurrentCharacter (bool create);
-            ///< \param create Create a new character, if there is no current character.
+            virtual Character *getCurrentCharacter ();
+            ///< @note May return null.
 
             virtual CharacterIterator characterBegin();
             ///< Any call to SaveGame and getCurrentCharacter can invalidate the returned

From 50acdf3e479f190eca1d6f2450ce6caf896f9728 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Mar 2016 00:03:02 +0100
Subject: [PATCH 448/765] Move createCharacter inside the try block

---
 apps/openmw/mwstate/statemanagerimp.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index e3c8f3df5b..6cd8ec43b6 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -174,17 +174,18 @@ void MWState::StateManager::endGame()
 void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)
 {
     MWState::Character* character = getCurrentCharacter();
-    if (!character)
-    {
-        MWWorld::ConstPtr player = MWMechanics::getPlayer();
-        std::string name = player.get<ESM::NPC>()->mBase->mName;
-
-        character = mCharacterManager.createCharacter(name);
-        mCharacterManager.setCurrentCharacter(character);
-    }
 
     try
     {
+        if (!character)
+        {
+            MWWorld::ConstPtr player = MWMechanics::getPlayer();
+            std::string name = player.get<ESM::NPC>()->mBase->mName;
+
+            character = mCharacterManager.createCharacter(name);
+            mCharacterManager.setCurrentCharacter(character);
+        }
+
         ESM::SavedGame profile;
 
         MWBase::World& world = *MWBase::Environment::get().getWorld();
@@ -299,7 +300,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
         MWBase::Environment::get().getWindowManager()->interactiveMessageBox(error.str(), buttons);
 
         // If no file was written, clean up the slot
-        if (slot && !boost::filesystem::exists(slot->mPath))
+        if (character && slot && !boost::filesystem::exists(slot->mPath))
         {
             character->deleteSlot(slot);
             character->cleanup();

From e8caafa190545a300245b06ace3f89a5886759d9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Mar 2016 00:29:38 +0100
Subject: [PATCH 449/765] Remove no longer needed applyEffect(osgFX::Effect&)
 in SetFilterSettingsVisitor

No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.
---
 components/resource/scenemanager.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 113406ef68..fef3f49dc0 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -6,7 +6,6 @@
 #include <osg/UserDataContainer>
 
 #include <osgParticle/ParticleSystem>
-#include <osgFX/Effect>
 
 #include <osgUtil/IncrementalCompileOperation>
 
@@ -139,9 +138,6 @@ namespace Resource
 
         virtual void apply(osg::Node& node)
         {
-            if (osgFX::Effect* effect = dynamic_cast<osgFX::Effect*>(&node))
-                applyEffect(*effect);
-
             osg::StateSet* stateset = node.getStateSet();
             if (stateset)
                 applyStateSet(stateset);
@@ -149,19 +145,6 @@ namespace Resource
             traverse(node);
         }
 
-        void applyEffect(osgFX::Effect& effect)
-        {
-            for (int i =0; i<effect.getNumTechniques(); ++i)
-            {
-                osgFX::Technique* tech = effect.getTechnique(i);
-                for (int pass=0; pass<tech->getNumPasses(); ++pass)
-                {
-                    if (tech->getPassStateSet(pass))
-                        applyStateSet(tech->getPassStateSet(pass));
-                }
-            }
-        }
-
         virtual void apply(osg::Geode& geode)
         {
             osg::StateSet* stateset = geode.getStateSet();

From 24ae9f4ac1cdcd74e702ec8f09ccc45a8542b484 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Mar 2016 00:32:32 +0100
Subject: [PATCH 450/765] Remove no longer needed apply(Geode&) in
 SetFilterSettingsVisitor and NodeToShapeVisitor

In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.
---
 components/resource/bulletshapemanager.cpp |  9 ++-------
 components/resource/scenemanager.cpp       | 17 -----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
index 111808e6ed..0a5ed783ef 100644
--- a/components/resource/bulletshapemanager.cpp
+++ b/components/resource/bulletshapemanager.cpp
@@ -1,8 +1,9 @@
 #include "bulletshapemanager.hpp"
 
 #include <osg/NodeVisitor>
-#include <osg/Geode>
 #include <osg/TriangleFunctor>
+#include <osg/Transform>
+#include <osg/Drawable>
 
 #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
 
@@ -62,12 +63,6 @@ public:
 
     }
 
-    virtual void apply(osg::Geode& geode)
-    {
-        for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            apply(*geode.getDrawable(i));
-    }
-
     virtual void apply(osg::Drawable &drawable)
     {
         if (!mTriangleMesh)
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index fef3f49dc0..7bbf08f3a4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -2,7 +2,6 @@
 
 #include <iostream>
 #include <osg/Node>
-#include <osg/Geode>
 #include <osg/UserDataContainer>
 
 #include <osgParticle/ParticleSystem>
@@ -51,7 +50,6 @@ namespace
                     && partsys->getUserDataContainer()->getDescriptions()[0] == "worldspace");
         }
 
-        // in OSG 3.3 and up Drawables can be directly in the scene graph without a Geode decorating them.
         void apply(osg::Drawable& drw)
         {
             if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
@@ -145,21 +143,6 @@ namespace Resource
             traverse(node);
         }
 
-        virtual void apply(osg::Geode& geode)
-        {
-            osg::StateSet* stateset = geode.getStateSet();
-            if (stateset)
-                applyStateSet(stateset);
-
-            for (unsigned int i=0; i<geode.getNumDrawables(); ++i)
-            {
-                osg::Drawable* drw = geode.getDrawable(i);
-                stateset = drw->getStateSet();
-                if (stateset)
-                    applyStateSet(stateset);
-            }
-        }
-
         void applyStateSet(osg::StateSet* stateset)
         {
             const osg::StateSet::TextureAttributeList& texAttributes = stateset->getTextureAttributeList();

From 48047beb9abc3f40aaf09811697702dadcd58972 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 9 Mar 2016 15:29:12 -0500
Subject: [PATCH 451/765] Stripped OSG mouse and keyboard handling.

---
 extern/osgQt/GraphicsWindowQt     |  29 +--
 extern/osgQt/GraphicsWindowQt.cpp | 322 +-----------------------------
 2 files changed, 10 insertions(+), 341 deletions(-)

diff --git a/extern/osgQt/GraphicsWindowQt b/extern/osgQt/GraphicsWindowQt
index 54d069176b..ad456ef445 100644
--- a/extern/osgQt/GraphicsWindowQt
+++ b/extern/osgQt/GraphicsWindowQt
@@ -56,32 +56,15 @@ class GLWidget : public QGLWidget
 
 public:
 
-    GLWidget( QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
-    GLWidget( QGLContext* context, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
-    GLWidget( const QGLFormat& format, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0, bool forwardKeyEvents = false );
+    GLWidget( QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
+    GLWidget( QGLContext* context, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
+    GLWidget( const QGLFormat& format, QWidget* parent = NULL, const QGLWidget* shareWidget = NULL, Qt::WindowFlags f = 0);
     virtual ~GLWidget();
 
     inline void setGraphicsWindow( GraphicsWindowQt* gw ) { _gw = gw; }
     inline GraphicsWindowQt* getGraphicsWindow() { return _gw; }
     inline const GraphicsWindowQt* getGraphicsWindow() const { return _gw; }
 
-    inline bool getForwardKeyEvents() const { return _forwardKeyEvents; }
-    virtual void setForwardKeyEvents( bool f ) { _forwardKeyEvents = f; }
-    
-    inline bool getTouchEventsEnabled() const { return _touchEventsEnabled; }
-    void setTouchEventsEnabled( bool e );
-
-    void setKeyboardModifiers( QInputEvent* event );
-
-    virtual void keyPressEvent( QKeyEvent* event );
-    virtual void keyReleaseEvent( QKeyEvent* event );
-    virtual void mousePressEvent( QMouseEvent* event );
-    virtual void mouseReleaseEvent( QMouseEvent* event );
-    virtual void mouseDoubleClickEvent( QMouseEvent* event );
-    virtual void mouseMoveEvent( QMouseEvent* event );
-    virtual void wheelEvent( QWheelEvent* event );
-    virtual bool gestureEvent( QGestureEvent* event );
-
 protected:
 
     int getNumDeferredEvents()
@@ -114,9 +97,6 @@ protected:
     QQueue<QEvent::Type> _deferredEventQueue;
     QSet<QEvent::Type> _eventCompressor;
 
-    bool _touchEventsEnabled;
-
-    bool _forwardKeyEvents;
     qreal _devicePixelRatio;
 
     virtual void resizeEvent( QResizeEvent* event );
@@ -164,9 +144,6 @@ public:
     virtual std::string getWindowName();
     virtual void useCursor( bool cursorOn );
     virtual void setCursor( MouseCursor cursor );
-    inline bool getTouchEventsEnabled() const { return _widget->getTouchEventsEnabled(); }
-    virtual void setTouchEventsEnabled( bool e ) { _widget->setTouchEventsEnabled(e); }
-
 
     virtual bool valid() const;
     virtual bool realizeImplementation();
diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
index 2001c8b315..770ac9ada0 100644
--- a/extern/osgQt/GraphicsWindowQt.cpp
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -26,98 +26,6 @@
 
 using namespace osgQt;
 
-
-class QtKeyboardMap
-{
-
-public:
-    QtKeyboardMap()
-    {
-        mKeyMap[Qt::Key_Escape     ] = osgGA::GUIEventAdapter::KEY_Escape;
-        mKeyMap[Qt::Key_Delete   ] = osgGA::GUIEventAdapter::KEY_Delete;
-        mKeyMap[Qt::Key_Home       ] = osgGA::GUIEventAdapter::KEY_Home;
-        mKeyMap[Qt::Key_Enter      ] = osgGA::GUIEventAdapter::KEY_KP_Enter;
-        mKeyMap[Qt::Key_End        ] = osgGA::GUIEventAdapter::KEY_End;
-        mKeyMap[Qt::Key_Return     ] = osgGA::GUIEventAdapter::KEY_Return;
-        mKeyMap[Qt::Key_PageUp     ] = osgGA::GUIEventAdapter::KEY_Page_Up;
-        mKeyMap[Qt::Key_PageDown   ] = osgGA::GUIEventAdapter::KEY_Page_Down;
-        mKeyMap[Qt::Key_Left       ] = osgGA::GUIEventAdapter::KEY_Left;
-        mKeyMap[Qt::Key_Right      ] = osgGA::GUIEventAdapter::KEY_Right;
-        mKeyMap[Qt::Key_Up         ] = osgGA::GUIEventAdapter::KEY_Up;
-        mKeyMap[Qt::Key_Down       ] = osgGA::GUIEventAdapter::KEY_Down;
-        mKeyMap[Qt::Key_Backspace  ] = osgGA::GUIEventAdapter::KEY_BackSpace;
-        mKeyMap[Qt::Key_Tab        ] = osgGA::GUIEventAdapter::KEY_Tab;
-        mKeyMap[Qt::Key_Space      ] = osgGA::GUIEventAdapter::KEY_Space;
-        mKeyMap[Qt::Key_Delete     ] = osgGA::GUIEventAdapter::KEY_Delete;
-        mKeyMap[Qt::Key_Alt      ] = osgGA::GUIEventAdapter::KEY_Alt_L;
-        mKeyMap[Qt::Key_Shift    ] = osgGA::GUIEventAdapter::KEY_Shift_L;
-        mKeyMap[Qt::Key_Control  ] = osgGA::GUIEventAdapter::KEY_Control_L;
-        mKeyMap[Qt::Key_Meta     ] = osgGA::GUIEventAdapter::KEY_Meta_L;
-
-        mKeyMap[Qt::Key_F1             ] = osgGA::GUIEventAdapter::KEY_F1;
-        mKeyMap[Qt::Key_F2             ] = osgGA::GUIEventAdapter::KEY_F2;
-        mKeyMap[Qt::Key_F3             ] = osgGA::GUIEventAdapter::KEY_F3;
-        mKeyMap[Qt::Key_F4             ] = osgGA::GUIEventAdapter::KEY_F4;
-        mKeyMap[Qt::Key_F5             ] = osgGA::GUIEventAdapter::KEY_F5;
-        mKeyMap[Qt::Key_F6             ] = osgGA::GUIEventAdapter::KEY_F6;
-        mKeyMap[Qt::Key_F7             ] = osgGA::GUIEventAdapter::KEY_F7;
-        mKeyMap[Qt::Key_F8             ] = osgGA::GUIEventAdapter::KEY_F8;
-        mKeyMap[Qt::Key_F9             ] = osgGA::GUIEventAdapter::KEY_F9;
-        mKeyMap[Qt::Key_F10            ] = osgGA::GUIEventAdapter::KEY_F10;
-        mKeyMap[Qt::Key_F11            ] = osgGA::GUIEventAdapter::KEY_F11;
-        mKeyMap[Qt::Key_F12            ] = osgGA::GUIEventAdapter::KEY_F12;
-        mKeyMap[Qt::Key_F13            ] = osgGA::GUIEventAdapter::KEY_F13;
-        mKeyMap[Qt::Key_F14            ] = osgGA::GUIEventAdapter::KEY_F14;
-        mKeyMap[Qt::Key_F15            ] = osgGA::GUIEventAdapter::KEY_F15;
-        mKeyMap[Qt::Key_F16            ] = osgGA::GUIEventAdapter::KEY_F16;
-        mKeyMap[Qt::Key_F17            ] = osgGA::GUIEventAdapter::KEY_F17;
-        mKeyMap[Qt::Key_F18            ] = osgGA::GUIEventAdapter::KEY_F18;
-        mKeyMap[Qt::Key_F19            ] = osgGA::GUIEventAdapter::KEY_F19;
-        mKeyMap[Qt::Key_F20            ] = osgGA::GUIEventAdapter::KEY_F20;
-
-        mKeyMap[Qt::Key_hyphen         ] = '-';
-        mKeyMap[Qt::Key_Equal         ] = '=';
-
-        mKeyMap[Qt::Key_division      ] = osgGA::GUIEventAdapter::KEY_KP_Divide;
-        mKeyMap[Qt::Key_multiply      ] = osgGA::GUIEventAdapter::KEY_KP_Multiply;
-        mKeyMap[Qt::Key_Minus         ] = '-';
-        mKeyMap[Qt::Key_Plus          ] = '+';
-        //mKeyMap[Qt::Key_H              ] = osgGA::GUIEventAdapter::KEY_KP_Home;
-        //mKeyMap[Qt::Key_                    ] = osgGA::GUIEventAdapter::KEY_KP_Up;
-        //mKeyMap[92                    ] = osgGA::GUIEventAdapter::KEY_KP_Page_Up;
-        //mKeyMap[86                    ] = osgGA::GUIEventAdapter::KEY_KP_Left;
-        //mKeyMap[87                    ] = osgGA::GUIEventAdapter::KEY_KP_Begin;
-        //mKeyMap[88                    ] = osgGA::GUIEventAdapter::KEY_KP_Right;
-        //mKeyMap[83                    ] = osgGA::GUIEventAdapter::KEY_KP_End;
-        //mKeyMap[84                    ] = osgGA::GUIEventAdapter::KEY_KP_Down;
-        //mKeyMap[85                    ] = osgGA::GUIEventAdapter::KEY_KP_Page_Down;
-        mKeyMap[Qt::Key_Insert        ] = osgGA::GUIEventAdapter::KEY_KP_Insert;
-        //mKeyMap[Qt::Key_Delete        ] = osgGA::GUIEventAdapter::KEY_KP_Delete;
-    }
-
-    ~QtKeyboardMap()
-    {
-    }
-
-    int remapKey(QKeyEvent* event)
-    {
-        KeyMap::iterator itr = mKeyMap.find(event->key());
-        if (itr == mKeyMap.end())
-        {
-            return int(*(event->text().toLatin1().data()));
-        }
-        else
-            return itr->second;
-    }
-
-    private:
-    typedef std::map<unsigned int, int> KeyMap;
-    KeyMap mKeyMap;
-};
-
-static QtKeyboardMap s_QtKeyboardMap;
-
-
 /// The object responsible for the scene re-rendering.
 class HeartBeat : public QObject {
 public:
@@ -126,7 +34,7 @@ public:
     osg::observer_ptr< osgViewer::ViewerBase > _viewer;
 
     virtual ~HeartBeat();
-    
+
     void init( osgViewer::ViewerBase *viewer );
     void stopTimer();
     void timerEvent( QTimerEvent *event );
@@ -146,31 +54,20 @@ QPointer<HeartBeat> HeartBeat::heartBeat;
     #define GETDEVICEPIXELRATIO() devicePixelRatio()
 #endif
 
-GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f, bool forwardKeyEvents )
-: QGLWidget(parent, shareWidget, f),
-_gw( NULL ),
-_touchEventsEnabled( false ),
-_forwardKeyEvents( forwardKeyEvents )
+GLWidget::GLWidget( QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(parent, shareWidget, f), _gw( NULL )
 {
     _devicePixelRatio = GETDEVICEPIXELRATIO();
 }
 
-GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
-                    bool forwardKeyEvents )
-: QGLWidget(context, parent, shareWidget, f),
-_gw( NULL ),
-_touchEventsEnabled( false ),
-_forwardKeyEvents( forwardKeyEvents )
+GLWidget::GLWidget( QGLContext* context, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(context, parent, shareWidget, f), _gw( NULL )
 {
     _devicePixelRatio = GETDEVICEPIXELRATIO();
 }
 
-GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f,
-                    bool forwardKeyEvents )
-: QGLWidget(format, parent, shareWidget, f),
-_gw( NULL ),
-_touchEventsEnabled( false ),
-_forwardKeyEvents( forwardKeyEvents )
+GLWidget::GLWidget( const QGLFormat& format, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f)
+: QGLWidget(format, parent, shareWidget, f), _gw( NULL )
 {
     _devicePixelRatio = GETDEVICEPIXELRATIO();
 }
@@ -186,25 +83,6 @@ GLWidget::~GLWidget()
     }
 }
 
-void GLWidget::setTouchEventsEnabled(bool e)
-{
-#ifdef USE_GESTURES
-    if (e==_touchEventsEnabled)
-        return;
-
-    _touchEventsEnabled = e;
-
-    if (_touchEventsEnabled)
-    {
-        grabGesture(Qt::PinchGesture);
-    }
-    else
-    {
-        ungrabGesture(Qt::PinchGesture);
-    }
-#endif
-}
-
 void GLWidget::processDeferredEvents()
 {
     QQueue<QEvent::Type> deferredEventQueueCopy;
@@ -224,10 +102,6 @@ void GLWidget::processDeferredEvents()
 
 bool GLWidget::event( QEvent* event )
 {
-#ifdef USE_GESTURES
-    if ( event->type()==QEvent::Gesture )
-        return gestureEvent(static_cast<QGestureEvent*>(event));
-#endif
 
     // QEvent::Hide
     //
@@ -274,16 +148,6 @@ bool GLWidget::event( QEvent* event )
     return QGLWidget::event( event );
 }
 
-void GLWidget::setKeyboardModifiers( QInputEvent* event )
-{
-    int modkey = event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier);
-    unsigned int mask = 0;
-    if ( modkey & Qt::ShiftModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_SHIFT;
-    if ( modkey & Qt::ControlModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_CTRL;
-    if ( modkey & Qt::AltModifier ) mask |= osgGA::GUIEventAdapter::MODKEY_ALT;
-    _gw->getEventQueue()->getCurrentEventState()->setModKeyMask( mask );
-}
-
 void GLWidget::resizeEvent( QResizeEvent* event )
 {
     const QSize& size = event->size();
@@ -309,178 +173,6 @@ void GLWidget::glDraw()
     _gw->requestRedraw();
 }
 
-void GLWidget::keyPressEvent( QKeyEvent* event )
-{
-    setKeyboardModifiers( event );
-    int value = s_QtKeyboardMap.remapKey( event );
-    _gw->getEventQueue()->keyPress( value );
-
-    // this passes the event to the regular Qt key event processing,
-    // among others, it closes popup windows on ESC and forwards the event to the parent widgets
-    if( _forwardKeyEvents )
-        inherited::keyPressEvent( event );
-}
-
-void GLWidget::keyReleaseEvent( QKeyEvent* event )
-{
-    if( event->isAutoRepeat() )
-    {
-        event->ignore();
-    }
-    else
-    {
-        setKeyboardModifiers( event );
-        int value = s_QtKeyboardMap.remapKey( event );
-        _gw->getEventQueue()->keyRelease( value );
-    }
-
-    // this passes the event to the regular Qt key event processing,
-    // among others, it closes popup windows on ESC and forwards the event to the parent widgets
-    if( _forwardKeyEvents )
-        inherited::keyReleaseEvent( event );
-}
-
-void GLWidget::mousePressEvent( QMouseEvent* event )
-{
-    int button = 0;
-    switch ( event->button() )
-    {
-        case Qt::LeftButton: button = 1; break;
-        case Qt::MidButton: button = 2; break;
-        case Qt::RightButton: button = 3; break;
-        case Qt::NoButton: button = 0; break;
-        default: button = 0; break;
-    }
-    setKeyboardModifiers( event );
-    _gw->getEventQueue()->mouseButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
-}
-
-void GLWidget::mouseReleaseEvent( QMouseEvent* event )
-{
-    int button = 0;
-    switch ( event->button() )
-    {
-        case Qt::LeftButton: button = 1; break;
-        case Qt::MidButton: button = 2; break;
-        case Qt::RightButton: button = 3; break;
-        case Qt::NoButton: button = 0; break;
-        default: button = 0; break;
-    }
-    setKeyboardModifiers( event );
-    _gw->getEventQueue()->mouseButtonRelease( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
-}
-
-void GLWidget::mouseDoubleClickEvent( QMouseEvent* event )
-{
-    int button = 0;
-    switch ( event->button() )
-    {
-        case Qt::LeftButton: button = 1; break;
-        case Qt::MidButton: button = 2; break;
-        case Qt::RightButton: button = 3; break;
-        case Qt::NoButton: button = 0; break;
-        default: button = 0; break;
-    }
-    setKeyboardModifiers( event );
-    _gw->getEventQueue()->mouseDoubleButtonPress( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio, button );
-}
-
-void GLWidget::mouseMoveEvent( QMouseEvent* event )
-{
-    setKeyboardModifiers( event );
-    _gw->getEventQueue()->mouseMotion( event->x()*_devicePixelRatio, event->y()*_devicePixelRatio );
-}
-
-void GLWidget::wheelEvent( QWheelEvent* event )
-{
-    setKeyboardModifiers( event );
-    _gw->getEventQueue()->mouseScroll(
-        event->orientation() == Qt::Vertical ?
-            (event->delta()>0 ? osgGA::GUIEventAdapter::SCROLL_UP : osgGA::GUIEventAdapter::SCROLL_DOWN) :
-            (event->delta()>0 ? osgGA::GUIEventAdapter::SCROLL_LEFT : osgGA::GUIEventAdapter::SCROLL_RIGHT) );
-}
-
-#ifdef USE_GESTURES
-static osgGA::GUIEventAdapter::TouchPhase translateQtGestureState( Qt::GestureState state )
-{
-    osgGA::GUIEventAdapter::TouchPhase touchPhase;
-    switch ( state )
-    {
-        case Qt::GestureStarted:
-            touchPhase = osgGA::GUIEventAdapter::TOUCH_BEGAN;
-            break;
-        case Qt::GestureUpdated:
-            touchPhase = osgGA::GUIEventAdapter::TOUCH_MOVED;
-            break;
-        case Qt::GestureFinished:
-        case Qt::GestureCanceled:
-            touchPhase = osgGA::GUIEventAdapter::TOUCH_ENDED;
-            break;
-        default:
-            touchPhase = osgGA::GUIEventAdapter::TOUCH_UNKNOWN;
-    };
-
-    return touchPhase;
-}
-#endif
-
-
-bool GLWidget::gestureEvent( QGestureEvent* qevent )
-{
-#ifndef USE_GESTURES
-    return false;
-#else
-
-    bool accept = false;
-
-    if ( QPinchGesture* pinch = static_cast<QPinchGesture *>(qevent->gesture(Qt::PinchGesture) ) )
-    {
-    const QPointF qcenterf = pinch->centerPoint();
-    const float angle = pinch->totalRotationAngle();
-    const float scale = pinch->totalScaleFactor();
-
-    const QPoint pinchCenterQt = mapFromGlobal(qcenterf.toPoint());
-    const osg::Vec2 pinchCenter( pinchCenterQt.x(), pinchCenterQt.y() );
-
-        //We don't have absolute positions of the two touches, only a scale and rotation
-        //Hence we create pseudo-coordinates which are reasonable, and centered around the
-        //real position
-        const float radius = (width()+height())/4;
-        const osg::Vec2 vector( scale*cos(angle)*radius, scale*sin(angle)*radius);
-        const osg::Vec2 p0 = pinchCenter+vector;
-        const osg::Vec2 p1 = pinchCenter-vector;
-
-        osg::ref_ptr<osgGA::GUIEventAdapter> event = 0;
-        const osgGA::GUIEventAdapter::TouchPhase touchPhase = translateQtGestureState( pinch->state() );
-        if ( touchPhase==osgGA::GUIEventAdapter::TOUCH_BEGAN )
-        {
-            event = _gw->getEventQueue()->touchBegan(0 , touchPhase, p0[0], p0[1] );
-        }
-        else if ( touchPhase==osgGA::GUIEventAdapter::TOUCH_MOVED )
-        {
-            event = _gw->getEventQueue()->touchMoved( 0, touchPhase, p0[0], p0[1] );
-        }
-        else
-        {
-            event = _gw->getEventQueue()->touchEnded( 0, touchPhase, p0[0], p0[1], 1 );
-        }
-
-        if ( event )
-        {
-            event->addTouchPoint( 1, touchPhase, p1[0], p1[1] );
-            accept = true;
-        }
-    }
-
-    if ( accept )
-        qevent->accept();
-
-    return accept;
-#endif
-}
-
-
-
 GraphicsWindowQt::GraphicsWindowQt( osg::GraphicsContext::Traits* traits, QWidget* parent, const QGLWidget* shareWidget, Qt::WindowFlags f )
 :   _realized(false)
 {

From 38059593a754faac2a12a9fc12e7468a8555225d Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 9 Mar 2016 15:31:38 -0500
Subject: [PATCH 452/765] Removed workaround for OSG input handling in
 RenderWidget.

---
 apps/opencs/view/render/scenewidget.cpp | 20 --------------------
 apps/opencs/view/render/scenewidget.hpp |  2 --
 2 files changed, 22 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 55d9c8195c..21a4c56a4f 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -100,26 +100,6 @@ void RenderWidget::setVisibilityMask(int mask)
     mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
 }
 
-bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
-{
-    // handle event in this widget, is there a better way to do this?
-    if (event->type() == QEvent::MouseButtonPress)
-        mousePressEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::MouseButtonRelease)
-        mouseReleaseEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::MouseMove)
-        mouseMoveEvent(static_cast<QMouseEvent*>(event));
-    if (event->type() == QEvent::KeyPress)
-        keyPressEvent(static_cast<QKeyEvent*>(event));
-    if (event->type() == QEvent::KeyRelease)
-        keyReleaseEvent(static_cast<QKeyEvent*>(event));
-    if (event->type() == QEvent::Wheel)
-        wheelEvent(static_cast<QWheelEvent *>(event));
-
-    // Always pass the event on to GLWidget, i.e. to OSG event queue
-    return QObject::eventFilter(obj, event);
-}
-
 osg::Camera *RenderWidget::getCamera()
 {
     return mView->getCamera();
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 07a7d76008..e759e78c41 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -46,8 +46,6 @@ namespace CSVRender
 
         void setVisibilityMask(int mask);
 
-        bool eventFilter(QObject *, QEvent *);
-
         osg::Camera *getCamera();
 
     protected:

From f4f7afb53b6354591992ed479b4530c8f6b283cd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 10 Mar 2016 03:20:15 -0500
Subject: [PATCH 453/765] Removed now unnecessary installation of event filter.

---
 apps/opencs/view/render/scenewidget.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 21a4c56a4f..504f5cc252 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -57,9 +57,6 @@ RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     layout->addWidget(window->getGLWidget());
     setLayout(layout);
 
-    // Pass events through this widget first
-    window->getGLWidget()->installEventFilter(this);
-
     mView->getCamera()->setGraphicsContext(window);
     mView->getCamera()->setClearColor( osg::Vec4(0.2, 0.2, 0.6, 1.0) );
     mView->getCamera()->setViewport( new osg::Viewport(0, 0, traits->width, traits->height) );

From 9afb0e0f9001c17ce0386a5c9dd35d1cd673f294 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 10 Mar 2016 04:29:24 -0500
Subject: [PATCH 454/765] Input restructuring.

---
 apps/opencs/view/render/scenewidget.cpp      |  96 ++++++++-
 apps/opencs/view/render/scenewidget.hpp      |  24 ++-
 apps/opencs/view/render/worldspacewidget.cpp | 198 ++++++++-----------
 apps/opencs/view/render/worldspacewidget.hpp |  16 +-
 4 files changed, 206 insertions(+), 128 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 504f5cc252..ff6ae25516 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -18,6 +18,8 @@
 
 #include "../widget/scenetoolmode.hpp"
 
+#include "../../model/prefs/state.hpp"
+
 #include "lighting.hpp"
 #include "mask.hpp"
 
@@ -143,7 +145,8 @@ void CompositeViewer::update()
 
 // ---------------------------------------------------
 
-SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget *parent, Qt::WindowFlags f)
+SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget *parent, Qt::WindowFlags f,
+    bool retrieveInput)
     : RenderWidget(parent, f)
     , mResourceSystem(resourceSystem)
     , mLighting(NULL)
@@ -159,6 +162,16 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     /// \todo make shortcut configurable
     QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
     connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
+
+    connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
+        this, SLOT (settingChanged (const CSMPrefs::Setting *)));
+
+    // TODO update this outside of the constructor where virtual methods can be used
+    if (retrieveInput)
+    {
+        CSMPrefs::get()["3D Scene Input"].update();
+        CSMPrefs::get()["Tooltips"].update();
+    }
 }
 
 SceneWidget::~SceneWidget()
@@ -238,4 +251,85 @@ void SceneWidget::setDefaultAmbient (const osg::Vec4f& colour)
     setAmbient(mLighting->getAmbientColour(&mDefaultAmbient));
 }
 
+void SceneWidget::mousePressEvent (QMouseEvent *event)
+{
+    std::string button = mapButton(event);
+
+    // TODO placeholders
+    if (button == "p-navi")
+    {
+    }
+    else if (button == "s-navi")
+    {
+    }
+}
+
+void SceneWidget::mouseReleaseEvent (QMouseEvent *event)
+{
+    std::string button = mapButton(event);
+
+    // TODO placeholders
+    if (button == "p-navi")
+    {
+    }
+    else if (button == "s-navi")
+    {
+    }
+}
+
+void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
+{
+    storeMappingSetting(setting);
+}
+
+bool SceneWidget::storeMappingSetting (const CSMPrefs::Setting *setting)
+{
+    if (setting->getParent()->getKey()!="3D Scene Input")
+        return false;
+
+    static const char * const sMappingSettings[] =
+    {
+        "p-navi", "s-navi",
+        0
+    };
+
+    for (int i=0; sMappingSettings[i]; ++i)
+        if (setting->getKey()==sMappingSettings[i])
+        {
+            QString value = QString::fromUtf8 (setting->toString().c_str());
+
+            Qt::MouseButton button = Qt::NoButton;
+
+            if (value.endsWith ("Left Mouse-Button"))
+                button = Qt::LeftButton;
+            else if (value.endsWith ("Right Mouse-Button"))
+                button = Qt::RightButton;
+            else if (value.endsWith ("Middle Mouse-Button"))
+                button = Qt::MiddleButton;
+            else
+                return false;
+
+            bool ctrl = value.startsWith ("Ctrl-");
+
+            mButtonMapping[std::make_pair (button, ctrl)] = sMappingSettings[i];
+            return true;
+        }
+
+    return false;
+}
+
+std::string SceneWidget::mapButton (QMouseEvent *event)
+{
+    std::pair<Qt::MouseButton, bool> phyiscal (
+        event->button(), event->modifiers() & Qt::ControlModifier);
+
+    std::map<std::pair<Qt::MouseButton, bool>, std::string>::const_iterator iter =
+        mButtonMapping.find (phyiscal);
+
+    if (iter!=mButtonMapping.end())
+        return iter->second;
+
+    return "";
+}
+
 }
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index e759e78c41..8d17fb8a5e 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENCS_VIEW_SCENEWIDGET_H
 #define OPENCS_VIEW_SCENEWIDGET_H
 
+#include <map>
+
 #include <QWidget>
 #include <QTimer>
 
@@ -30,6 +32,11 @@ namespace CSVWidget
     class SceneToolbar;
 }
 
+namespace CSMPrefs
+{
+    class Setting;
+}
+
 namespace CSVRender
 {
     class Lighting;
@@ -62,7 +69,8 @@ namespace CSVRender
     {
         Q_OBJECT
     public:
-        SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0, Qt::WindowFlags f = 0);
+        SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0,
+                Qt::WindowFlags f = 0, bool retrieveInput = true);
         virtual ~SceneWidget();
 
         CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
@@ -78,6 +86,14 @@ namespace CSVRender
 
         void setAmbient(const osg::Vec4f& ambient);
 
+        virtual void mousePressEvent (QMouseEvent *event);
+        virtual void mouseReleaseEvent (QMouseEvent *event);
+
+        /// \return Is \a key a button mapping setting? (ignored otherwise)
+        virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
+
+        std::string mapButton (QMouseEvent *event);
+
         boost::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
         Lighting* mLighting;
@@ -88,6 +104,12 @@ namespace CSVRender
         LightingNight mLightingNight;
         LightingBright mLightingBright;
 
+        std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
+
+    protected slots:
+
+        virtual void settingChanged (const CSMPrefs::Setting *setting);
+
     private slots:
 
         void selectLightingMode (const std::string& mode);
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index df57904735..70aaf7e85d 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -32,7 +32,7 @@
 #include "instancemode.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
-: SceneWidget (document.getData().getResourceSystem(), parent), mSceneElements(0), mRun(0), mDocument(document),
+: SceneWidget (document.getData().getResourceSystem(), parent, 0, false), mSceneElements(0), mRun(0), mDocument(document),
   mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false), mDragX(0), mDragY(0), mDragFactor(0),
   mDragWheelFactor(0), mDragShiftFactor(0),
   mToolTipPos (-1, -1), mShowToolTips(false), mToolTipDelay(0)
@@ -67,13 +67,11 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (debugProfiles, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
         this, SLOT (debugProfileAboutToBeRemoved (const QModelIndex&, int, int)));
 
-    connect (&CSMPrefs::State::get(), SIGNAL (settingChanged (const CSMPrefs::Setting *)),
-        this, SLOT (settingChanged (const CSMPrefs::Setting *)));
-    CSMPrefs::get()["3D Scene Input"].update();
-    CSMPrefs::get()["Tooltips"].update();
-
     mToolTipDelayTimer.setSingleShot (true);
     connect (&mToolTipDelayTimer, SIGNAL (timeout()), this, SLOT (showToolTip()));
+
+    CSMPrefs::get()["3D Scene Input"].update();
+    CSMPrefs::get()["Tooltips"].update();
 }
 
 CSVRender::WorldspaceWidget::~WorldspaceWidget ()
@@ -82,9 +80,6 @@ CSVRender::WorldspaceWidget::~WorldspaceWidget ()
 
 void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setting)
 {
-    if (storeMappingSetting (setting))
-        return;
-
     if (*setting=="3D Scene Input/drag-factor")
         mDragFactor = setting->toDouble();
     else if (*setting=="3D Scene Input/drag-wheel-factor")
@@ -95,6 +90,8 @@ void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setti
         mToolTipDelay = setting->toInt();
     else if (*setting=="Tooltips/scene")
         mShowToolTips = setting->isTrue();
+    else
+        SceneWidget::settingChanged(setting);
 }
 
 void CSVRender::WorldspaceWidget::selectNavigationMode (const std::string& mode)
@@ -418,40 +415,41 @@ void CSVRender::WorldspaceWidget::dragMoveEvent(QDragMoveEvent *event)
 
 bool CSVRender::WorldspaceWidget::storeMappingSetting (const CSMPrefs::Setting *setting)
 {
-    if (setting->getParent()->getKey()!="3D Scene Input")
-        return false;
-
     static const char * const sMappingSettings[] =
     {
-        "p-navi", "s-navi",
         "p-edit", "s-edit",
         "p-select", "s-select",
         0
     };
 
-    for (int i=0; sMappingSettings[i]; ++i)
-        if (setting->getKey()==sMappingSettings[i])
+    if (setting->getParent()->getKey()=="3D Scene Input")
+    {
+        for (int i=0; sMappingSettings[i]; ++i)
         {
-            QString value = QString::fromUtf8 (setting->toString().c_str());
+            if (setting->getKey()==sMappingSettings[i])
+            {
+                QString value = QString::fromUtf8 (setting->toString().c_str());
 
-            Qt::MouseButton button = Qt::NoButton;
+                Qt::MouseButton button = Qt::NoButton;
 
-            if (value.endsWith ("Left Mouse-Button"))
-                button = Qt::LeftButton;
-            else if (value.endsWith ("Right Mouse-Button"))
-                button = Qt::RightButton;
-            else if (value.endsWith ("Middle Mouse-Button"))
-                button = Qt::MiddleButton;
-            else
-                return false;
+                if (value.endsWith ("Left Mouse-Button"))
+                    button = Qt::LeftButton;
+                else if (value.endsWith ("Right Mouse-Button"))
+                    button = Qt::RightButton;
+                else if (value.endsWith ("Middle Mouse-Button"))
+                    button = Qt::MiddleButton;
+                else
+                    return false;
 
-            bool ctrl = value.startsWith ("Ctrl-");
+                bool ctrl = value.startsWith ("Ctrl-");
 
-            mButtonMapping[std::make_pair (button, ctrl)] = sMappingSettings[i];
-            return true;
+                mButtonMapping[std::make_pair (button, ctrl)] = sMappingSettings[i];
+                return true;
+            }
         }
+    }
 
-    return false;
+    return SceneWidget::storeMappingSetting(setting);
 }
 
 osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos)
@@ -496,20 +494,6 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const Q
     return osg::ref_ptr<CSVRender::TagBase>();
 }
 
-std::string CSVRender::WorldspaceWidget::mapButton (QMouseEvent *event)
-{
-    std::pair<Qt::MouseButton, bool> phyiscal (
-        event->button(), event->modifiers() & Qt::ControlModifier);
-
-    std::map<std::pair<Qt::MouseButton, bool>, std::string>::const_iterator iter =
-        mButtonMapping.find (phyiscal);
-
-    if (iter!=mButtonMapping.end())
-        return iter->second;
-
-    return "";
-}
-
 void CSVRender::WorldspaceWidget::dropEvent (QDropEvent* event)
 {
     const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
@@ -615,50 +599,7 @@ void CSVRender::WorldspaceWidget::updateOverlay()
 
 void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 {
-    if (!mDragging)
-    {
-        if (mDragMode.empty())
-        {
-            if (event->globalPos()!=mToolTipPos)
-            {
-                mToolTipPos = event->globalPos();
-
-                if (mShowToolTips)
-                    mToolTipDelayTimer.start (mToolTipDelay);
-            }
-        }
-        else if (mDragMode=="p-navi" || mDragMode=="s-navi")
-        {
-
-        }
-        else if (mDragMode=="p-edit" || mDragMode=="s-edit" || mDragMode=="p-select" || mDragMode=="s-select")
-        {
-            osg::ref_ptr<TagBase> tag = mousePick (event->pos());
-
-            EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-
-            if (mDragMode=="p-edit")
-                mDragging = editMode.primaryEditStartDrag (tag);
-            else if (mDragMode=="s-edit")
-                mDragging = editMode.secondaryEditStartDrag (tag);
-            else if (mDragMode=="p-select")
-                mDragging = editMode.primarySelectStartDrag (tag);
-            else if (mDragMode=="s-select")
-                mDragging = editMode.secondarySelectStartDrag (tag);
-
-            if (mDragging)
-            {
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-                mDragX = event->localPos().x();
-                mDragY = height() - event->localPos().y();
-#else
-                mDragX = event->posF().x();
-                mDragY = height() - event->posF().y();
-#endif
-            }
-        }
-    }
-    else
+    if (mDragging)
     {
         int diffX = event->x() - mDragX;
         int diffY = (height() - event->y()) - mDragY;
@@ -675,59 +616,84 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 
         editMode.drag (diffX, diffY, factor);
     }
+    else if (mDragMode=="p-edit" || mDragMode=="s-edit" || mDragMode=="p-select" || mDragMode=="s-select")
+    {
+        osg::ref_ptr<TagBase> tag = mousePick (event->pos());
+
+        EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+
+        if (mDragMode=="p-edit")
+            mDragging = editMode.primaryEditStartDrag (tag);
+        else if (mDragMode=="s-edit")
+            mDragging = editMode.secondaryEditStartDrag (tag);
+        else if (mDragMode=="p-select")
+            mDragging = editMode.primarySelectStartDrag (tag);
+        else if (mDragMode=="s-select")
+            mDragging = editMode.secondarySelectStartDrag (tag);
+
+        if (mDragging)
+        {
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+            mDragX = event->localPos().x();
+            mDragY = height() - event->localPos().y();
+#else
+            mDragX = event->posF().x();
+            mDragY = height() - event->posF().y();
+#endif
+        }
+    }
+    else
+    {
+        if (event->globalPos()!=mToolTipPos)
+        {
+            mToolTipPos = event->globalPos();
+
+            if (mShowToolTips)
+                mToolTipDelayTimer.start (mToolTipDelay);
+        }
+
+        SceneWidget::mouseMoveEvent(event);
+    }
 }
 
 void CSVRender::WorldspaceWidget::mousePressEvent (QMouseEvent *event)
 {
     std::string button = mapButton (event);
 
-    if (!mDragging)
-        mDragMode = button;
+    if (button=="p-edit" || button=="s-edit" ||
+        button=="p-select" || button=="s-select")
+    {
+        if (!mDragging)
+            mDragMode = button;
+    }
+    else
+        SceneWidget::mousePressEvent(event);
 }
 
 void CSVRender::WorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
 {
     std::string button = mapButton (event);
+    mDragMode.clear();
 
-    if (mDragging)
+    if (button=="p-edit" || button=="s-edit" ||
+        button=="p-select" || button=="s-select")
     {
-        if (mDragMode=="p-navi" || mDragMode=="s-navi")
-        {
-
-        }
-        else if (mDragMode=="p-edit" || mDragMode=="s-edit" ||
-            mDragMode=="p-select" || mDragMode=="s-select")
+        if (mDragging)
         {
             EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
             editMode.dragCompleted();
             mDragging = false;
         }
-    }
-    else
-    {
-        if (button=="p-navi" || button=="s-navi")
-        {
-
-        }
-        else if (button=="p-edit" || button=="s-edit" ||
-            button=="p-select" || button=="s-select")
+        else
         {
             osg::ref_ptr<TagBase> tag = mousePick (event->pos());
 
             handleMouseClick (tag, button, event->modifiers() & Qt::ShiftModifier);
         }
     }
-
-    mDragMode.clear();
-}
-
-void CSVRender::WorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event)
-{
-    if(event->button() == Qt::RightButton)
-    {
-        //mMouse->mouseDoubleClickEvent(event);
-    }
+    else
+        SceneWidget::mouseReleaseEvent(event);
 }
 
 void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
@@ -743,6 +709,8 @@ void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
 
         editMode.dragWheel (event->delta(), factor);
     }
+    else
+        SceneWidget::wheelEvent(event);
 }
 
 void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 4c9c0c31e7..87f22581c6 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -1,8 +1,6 @@
 #ifndef OPENCS_VIEW_WORLDSPACEWIDGET_H
 #define OPENCS_VIEW_WORLDSPACEWIDGET_H
 
-#include <map>
-
 #include <boost/shared_ptr.hpp>
 
 #include <QTimer>
@@ -45,7 +43,6 @@ namespace CSVRender
             CSVWidget::SceneToolRun *mRun;
             CSMDoc::Document& mDocument;
             unsigned int mInteractionMask;
-            std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
             CSVWidget::SceneToolMode *mEditMode;
             bool mLocked;
             std::string mDragMode;
@@ -189,13 +186,17 @@ namespace CSVRender
             virtual void mouseMoveEvent (QMouseEvent *event);
             virtual void mousePressEvent (QMouseEvent *event);
             virtual void mouseReleaseEvent (QMouseEvent *event);
-            virtual void mouseDoubleClickEvent (QMouseEvent *event);
             virtual void wheelEvent (QWheelEvent *event);
             virtual void keyPressEvent (QKeyEvent *event);
 
             virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button,
                 bool shift);
 
+             /// \return Is \a key a button mapping setting? (ignored otherwise)
+            virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
+
+            virtual void settingChanged (const CSMPrefs::Setting *setting);
+
             EditMode *getEditMode();
 
         private:
@@ -206,19 +207,12 @@ namespace CSVRender
 
             void dragMoveEvent(QDragMoveEvent *event);
 
-            /// \return Is \a key a button mapping setting? (ignored otherwise)
-            bool storeMappingSetting (const CSMPrefs::Setting *setting);
-
             osg::ref_ptr<TagBase> mousePick (const QPoint& localPos);
 
-            std::string mapButton (QMouseEvent *event);
-
             virtual std::string getStartupInstruction() = 0;
 
         private slots:
 
-            void settingChanged (const CSMPrefs::Setting *setting);
-
             void selectNavigationMode (const std::string& mode);
 
             virtual void referenceableDataChanged (const QModelIndex& topLeft,

From ebdc21288648b8a2176e4328f0b9e1a8856bd136 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 10 Mar 2016 16:56:14 -0500
Subject: [PATCH 455/765] Moved selectNavigationMode to SceneWidget class,
 centralized camera selection.

---
 apps/opencs/view/render/pagedworldspacewidget.cpp |  4 +---
 apps/opencs/view/render/previewwidget.cpp         |  4 +---
 apps/opencs/view/render/scenewidget.cpp           | 15 +++++++++++++++
 apps/opencs/view/render/scenewidget.hpp           |  2 ++
 .../view/render/unpagedworldspacewidget.cpp       |  2 +-
 apps/opencs/view/render/worldspacewidget.cpp      | 14 +-------------
 apps/opencs/view/render/worldspacewidget.hpp      |  2 --
 7 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index d96f366927..c0861d3516 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -6,8 +6,6 @@
 #include <QMouseEvent>
 #include <QApplication>
 
-#include <osgGA/TrackballManipulator>
-
 #include <components/esm/loadland.hpp>
 
 #include "../../model/world/tablemimedata.hpp"
@@ -117,7 +115,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
     /// \todo do not overwrite manipulator object
     /// \todo move code to useViewHint function
     if (modified && wasEmpty)
-        mView->setCameraManipulator(new osgGA::TrackballManipulator);
+        selectNavigationMode("trackball");
 
     return modified;
 }
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index a03b277d30..7b36451351 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -1,7 +1,5 @@
 #include "previewwidget.hpp"
 
-#include <osgGA/TrackballManipulator>
-
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 
@@ -9,7 +7,7 @@ CSVRender::PreviewWidget::PreviewWidget (CSMWorld::Data& data,
     const std::string& id, bool referenceable, QWidget *parent)
 : SceneWidget (data.getResourceSystem(), parent), mData (data), mObject(data, mRootNode, id, referenceable)
 {
-    mView->setCameraManipulator(new osgGA::TrackballManipulator);
+    selectNavigationMode("trackball");
 
     QAbstractItemModel *referenceables =
         mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index ff6ae25516..6115a9bc3d 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -12,6 +12,9 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 
+#include <osgGA/TrackballManipulator>
+#include <osgGA/FirstPersonManipulator>
+
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/sceneutil/lightmanager.hpp>
@@ -282,6 +285,18 @@ void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
     storeMappingSetting(setting);
 }
 
+void SceneWidget::selectNavigationMode (const std::string& mode)
+{
+    if (mode=="1st")
+        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    else if (mode=="free")
+        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    else if (mode=="orbit")
+        mView->setCameraManipulator(new osgGA::OrbitManipulator);
+    else if (mode=="trackball")
+        mView->setCameraManipulator(new osgGA::TrackballManipulator);
+}
+
 bool SceneWidget::storeMappingSetting (const CSMPrefs::Setting *setting)
 {
     if (setting->getParent()->getKey()!="3D Scene Input")
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 8d17fb8a5e..6870c06abc 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -110,6 +110,8 @@ namespace CSVRender
 
         virtual void settingChanged (const CSMPrefs::Setting *setting);
 
+        void selectNavigationMode (const std::string& mode);
+
     private slots:
 
         void selectLightingMode (const std::string& mode);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 16c28cf930..9c2557438c 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -51,7 +51,7 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
 
     mCell.reset (new Cell (document.getData(), mRootNode, mCellId));
 
-    mView->setCameraManipulator(new osgGA::TrackballManipulator);
+    selectNavigationMode("trackball");
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 70aaf7e85d..14253537d9 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -12,9 +12,6 @@
 #include <QApplication>
 #include <QToolTip>
 
-#include <osgGA/TrackballManipulator>
-#include <osgGA/FirstPersonManipulator>
-
 #include <osgUtil/LineSegmentIntersector>
 
 #include "../../model/world/universalid.hpp"
@@ -94,21 +91,12 @@ void CSVRender::WorldspaceWidget::settingChanged (const CSMPrefs::Setting *setti
         SceneWidget::settingChanged(setting);
 }
 
-void CSVRender::WorldspaceWidget::selectNavigationMode (const std::string& mode)
-{
-    if (mode=="1st")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
-    else if (mode=="free")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
-    else if (mode=="orbit")
-        mView->setCameraManipulator(new osgGA::OrbitManipulator);
-}
 
 void CSVRender::WorldspaceWidget::useViewHint (const std::string& hint) {}
 
 void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
 {
-    mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    selectNavigationMode("1st");
 }
 
 CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 87f22581c6..36aae03290 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -213,8 +213,6 @@ namespace CSVRender
 
         private slots:
 
-            void selectNavigationMode (const std::string& mode);
-
             virtual void referenceableDataChanged (const QModelIndex& topLeft,
                 const QModelIndex& bottomRight) = 0;
 

From 9ed2cf6581f157279d73d19594879675d13b5223 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 13 Mar 2016 23:51:44 -0400
Subject: [PATCH 456/765] Fix callback being skipped

---
 apps/opencs/view/render/worldspacewidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 14253537d9..3cd2c4093a 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -708,7 +708,7 @@ void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)
         abortDrag();
     }
     else
-        RenderWidget::keyPressEvent(event);
+        SceneWidget::keyPressEvent(event);
 }
 
 void CSVRender::WorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)

From 2cff2cd643b7bb15c5a05a369b5608bc5f573324 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 13 Mar 2016 23:55:10 -0400
Subject: [PATCH 457/765] Remove unnecessary override.

---
 apps/opencs/view/render/pagedworldspacewidget.cpp   | 5 -----
 apps/opencs/view/render/unpagedworldspacewidget.cpp | 2 --
 2 files changed, 7 deletions(-)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index c0861d3516..63437cb2c5 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -112,11 +112,6 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
         }
     }
 
-    /// \todo do not overwrite manipulator object
-    /// \todo move code to useViewHint function
-    if (modified && wasEmpty)
-        selectNavigationMode("trackball");
-
     return modified;
 }
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 9c2557438c..4ed71ac961 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -50,8 +50,6 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
     update();
 
     mCell.reset (new Cell (document.getData(), mRootNode, mCellId));
-
-    selectNavigationMode("trackball");
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,

From 08fe914ba10d455d160270442e25d87ac0df82da Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 14 Mar 2016 00:04:11 -0400
Subject: [PATCH 458/765] Preliminary editor camera

---
 apps/opencs/CMakeLists.txt                   |   4 +-
 apps/opencs/view/render/cameracontroller.cpp | 458 +++++++++++++++++++
 apps/opencs/view/render/cameracontroller.hpp | 121 +++++
 apps/opencs/view/render/scenewidget.cpp      |  89 +++-
 apps/opencs/view/render/scenewidget.hpp      |  20 +
 5 files changed, 669 insertions(+), 23 deletions(-)
 create mode 100644 apps/opencs/view/render/cameracontroller.cpp
 create mode 100644 apps/opencs/view/render/cameracontroller.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index ec4737d161..79876224db 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -89,8 +89,8 @@ opencs_units (view/render
     )
 
 opencs_units_noqt (view/render
-    lighting lightingday lightingnight
-    lightingbright object cell terrainstorage tagbase cellarrow cellmarker cellborder
+    lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
+    cellarrow cellmarker cellborder cameracontroller
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
new file mode 100644
index 0000000000..fa2ad85605
--- /dev/null
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -0,0 +1,458 @@
+#include "cameracontroller.hpp"
+
+#include <QKeyEvent>
+
+#include <osg/Camera>
+#include <osg/Matrixd>
+#include <osg/Quat>
+
+namespace CSVRender
+{
+
+    /*
+    Camera Controller
+    */
+
+    const osg::Vec3d CameraController::LocalUp = osg::Vec3d(0, 1, 0);
+    const osg::Vec3d CameraController::LocalLeft = osg::Vec3d(1, 0, 0);
+    const osg::Vec3d CameraController::LocalForward = osg::Vec3d(0, 0, 1);
+
+    const double CameraController::LinearSpeed = 1000;
+    const double CameraController::RotationalSpeed = osg::PI / 2.f;
+    const double CameraController::SpeedMultiplier = 8;
+
+    CameraController::CameraController()
+        : mActive(false)
+        , mModified(false)
+        , mMouseScalar(-1/350.f)
+        , mCamera(NULL)
+    {
+    }
+
+    CameraController::~CameraController()
+    {
+    }
+
+    bool CameraController::isActive() const
+    {
+        return mActive;
+    }
+
+    bool CameraController::isModified() const
+    {
+        return mModified;
+    }
+
+    osg::Camera* CameraController::getCamera() const
+    {
+        return mCamera;
+    }
+
+    double CameraController::getMouseScalar() const
+    {
+        return mMouseScalar;
+    }
+
+    void CameraController::setCamera(osg::Camera* camera)
+    {
+        mCamera = camera;
+        mActive = (mCamera != NULL);
+
+        if (mActive)
+            onActivate();
+    }
+
+    void CameraController::setMouseScalar(double value)
+    {
+        mMouseScalar = value;
+    }
+
+    void CameraController::setModified()
+    {
+        mModified = true;
+    }
+
+    void CameraController::resetModified()
+    {
+        mModified = false;
+    }
+
+    /*
+    Free Camera Controller
+    */
+
+    FreeCameraController::FreeCameraController()
+        : mLockUpright(false)
+        , mFast(false)
+        , mLeft(false)
+        , mRight(false)
+        , mForward(false)
+        , mBackward(false)
+        , mRollLeft(false)
+        , mRollRight(false)
+        , mUp(LocalUp)
+    {
+    }
+
+    void FreeCameraController::fixUpAxis(const osg::Vec3d& up)
+    {
+        mLockUpright = true;
+        mUp = up;
+    }
+
+    void FreeCameraController::unfixUpAxis()
+    {
+        mLockUpright = false;
+    }
+
+    bool FreeCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
+    {
+        if (!isActive())
+            return false;
+
+        if (event->key() == Qt::Key_Q)
+        {
+            mRollLeft = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_E)
+        {
+            mRollRight = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_A)
+        {
+            mLeft = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_D)
+        {
+            mRight = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_W)
+        {
+            mForward = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_S)
+        {
+            mBackward = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_Shift)
+        {
+            mFast = pressed;
+            setModified();
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    bool FreeCameraController::handleMouseMoveEvent(std::string mode, int x, int y)
+    {
+        if (!isActive())
+            return false;
+
+        if (mode == "p-navi")
+        {
+            yaw(x * getMouseScalar());
+            pitch(y * getMouseScalar());
+            setModified();
+        }
+        else if (mode == "s-navi")
+        {
+            translate(LocalLeft * x + LocalUp * -y);
+            setModified();
+        }
+        else if (mode == "t-navi")
+        {
+            translate(LocalForward * x * (mFast ? SpeedMultiplier : 1));
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    void FreeCameraController::update(double dt)
+    {
+        if (!isActive())
+            return;
+
+        double linDist = LinearSpeed * dt;
+        double rotDist = RotationalSpeed * dt;
+
+        if (mFast)
+            linDist *= SpeedMultiplier;
+
+        if (mLeft)
+            translate(LocalLeft * linDist);
+        if (mRight)
+            translate(LocalLeft * -linDist);
+        if (mForward)
+            translate(LocalForward * linDist);
+        if (mBackward)
+            translate(LocalForward * -linDist);
+
+        if (!mLockUpright)
+        {
+            if (mRollLeft)
+                roll(-rotDist);
+            if (mRollRight)
+                roll(rotDist);
+        }
+        else if(isModified())
+        {
+            stabilize();
+        }
+
+        // Normalize the matrix to counter drift
+        getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
+
+        resetModified();
+    }
+
+    void FreeCameraController::yaw(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalUp);
+    }
+
+    void FreeCameraController::pitch(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalLeft);
+    }
+
+    void FreeCameraController::roll(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalForward);
+    }
+
+    void FreeCameraController::translate(const osg::Vec3d& offset)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::translate(offset);
+    }
+
+    void FreeCameraController::stabilize()
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+        getCamera()->setViewMatrixAsLookAt(eye, center, mUp);
+    }
+
+    /*
+    Orbit Camera Controller
+    */
+
+    OrbitCameraController::OrbitCameraController()
+        : mInitialized(false)
+        , mFast(false)
+        , mLeft(false)
+        , mRight(false)
+        , mUp(false)
+        , mDown(false)
+        , mRollLeft(false)
+        , mRollRight(false)
+        , mCenter(0,0,0)
+    {
+    }
+
+    bool OrbitCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
+    {
+        if (!isActive())
+            return false;
+
+        if (!mInitialized)
+            initialize();
+
+        if (event->key() == Qt::Key_Q)
+        {
+            mRollLeft = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_E)
+        {
+            mRollRight = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_A)
+        {
+            mLeft = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_D)
+        {
+            mRight = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_W)
+        {
+            mUp = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_S)
+        {
+            mDown = pressed;
+            setModified();
+        }
+        else if (event->key() == Qt::Key_Shift)
+        {
+            mFast = pressed;
+            setModified();
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    bool OrbitCameraController::handleMouseMoveEvent(std::string mode, int x, int y)
+    {
+        if (!isActive())
+            return false;
+
+        if (!mInitialized)
+            initialize();
+
+        if (mode == "p-navi")
+        {
+            rotateHorizontal(x * getMouseScalar());
+            rotateVertical(y * getMouseScalar());
+            setModified();
+        }
+        else if (mode == "s-navi")
+        {
+            translate(LocalLeft * x + LocalUp * -y);
+            setModified();
+        }
+        else if (mode == "t-navi")
+        {
+            zoom(x * (mFast ? SpeedMultiplier : 1));
+        }
+        else
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    void OrbitCameraController::update(double dt)
+    {
+        if (!isActive())
+            return;
+
+        if (!mInitialized)
+            initialize();
+
+        double rotDist = RotationalSpeed * dt;
+
+        if (mFast)
+            rotDist *= SpeedMultiplier;
+
+        if (mLeft)
+            rotateHorizontal(-rotDist);
+        if (mRight)
+            rotateHorizontal(rotDist);
+        if (mUp)
+            rotateVertical(rotDist);
+        if (mDown)
+            rotateVertical(-rotDist);
+
+        if (mRollLeft)
+            roll(-rotDist);
+        if (mRollRight)
+            roll(rotDist);
+
+        lookAtCenter();
+
+        // Normalize the matrix to counter drift
+        getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
+
+        resetModified();
+    }
+
+    void OrbitCameraController::onActivate()
+    {
+        mInitialized = false;
+    }
+
+    void OrbitCameraController::initialize()
+    {
+        static const int DefaultStartDistance = 10000.f;
+
+        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
+        osg::Vec3d offset = rotation * (LocalForward * DefaultStartDistance);
+
+        mCenter = position + offset;
+
+        mInitialized = true;
+    }
+
+    void OrbitCameraController::rotateHorizontal(double value)
+    {
+        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
+        osg::Vec3d offset = position - mCenter;
+        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+
+        osg::Quat offsetRotation = osg::Quat(value, LocalUp);
+        osg::Vec3d newOffset = (rotation * offsetRotation) * (rotation.inverse() * offset);
+
+        getCamera()->getViewMatrix().setTrans(mCenter + newOffset);
+    }
+
+    void OrbitCameraController::rotateVertical(double value)
+    {
+        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
+        osg::Vec3d offset = position - mCenter;
+        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+
+        osg::Quat offsetRotation = osg::Quat(value, LocalLeft);
+        osg::Vec3d newOffset = (rotation * offsetRotation) * (rotation.inverse() * offset);
+
+        getCamera()->getViewMatrix().setTrans(mCenter + newOffset);
+    }
+
+    void OrbitCameraController::roll(double value)
+    {
+        getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalForward);
+    }
+
+    void OrbitCameraController::translate(const osg::Vec3d& offset)
+    {
+        mCenter += offset;
+        getCamera()->getViewMatrix() *= osg::Matrixd::translate(offset);
+    }
+
+    void OrbitCameraController::zoom(double value)
+    {
+        osg::Vec3d dir = mCenter - getCamera()->getViewMatrix().getTrans();
+        double distance = dir.normalize();
+
+        if (distance > 1 || value < 0)
+        {
+            getCamera()->getViewMatrix() *= osg::Matrixd::translate(dir * value);
+        }
+    }
+
+    void OrbitCameraController::lookAtCenter()
+    {
+        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
+        osg::Vec3d offset = mCenter - position;
+        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+
+        osg::Quat newRotation;
+        newRotation.makeRotate(LocalForward, offset);
+
+        getCamera()->getViewMatrix().setRotate(newRotation);
+    }
+}
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
new file mode 100644
index 0000000000..e45e7bead0
--- /dev/null
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -0,0 +1,121 @@
+#ifndef OPENCS_VIEW_CAMERACONTROLLER_H
+#define OPENCS_VIEW_CAMERACONTROLLER_H
+
+#include <string>
+
+#include <osg/ref_ptr>
+#include <osg/Vec3d>
+
+class QKeyEvent;
+
+namespace osg
+{
+    class Camera;
+}
+
+namespace CSVRender
+{
+    class CameraController
+    {
+        public:
+
+            static const osg::Vec3d LocalUp;
+            static const osg::Vec3d LocalLeft;
+            static const osg::Vec3d LocalForward;
+
+            static const double LinearSpeed;
+            static const double RotationalSpeed;
+            static const double SpeedMultiplier;
+
+            CameraController();
+            virtual ~CameraController();
+
+            bool isActive() const;
+            bool isModified() const;
+
+            osg::Camera* getCamera() const;
+            double getMouseScalar() const;
+
+            void setCamera(osg::Camera*);
+            void setMouseScalar(double value);
+
+            virtual bool handleKeyEvent(QKeyEvent* event, bool pressed) = 0;
+            virtual bool handleMouseMoveEvent(std::string mode, int x, int y) = 0;
+
+            virtual void update(double dt) = 0;
+
+        protected:
+
+            void setModified();
+            void resetModified();
+
+            virtual void onActivate(){}
+
+        private:
+
+            bool mActive, mModified;
+            double mMouseScalar;
+
+            osg::Camera* mCamera;
+    };
+
+    class FreeCameraController : public CameraController
+    {
+        public:
+
+            FreeCameraController();
+
+            void fixUpAxis(const osg::Vec3d& up);
+            void unfixUpAxis();
+
+            bool handleKeyEvent(QKeyEvent* event, bool pressed);
+            bool handleMouseMoveEvent(std::string mode, int x, int y);
+
+            void update(double dt);
+
+        private:
+
+            void yaw(double value);
+            void pitch(double value);
+            void roll(double value);
+            void translate(const osg::Vec3d& offset);
+
+            void stabilize();
+
+            bool mLockUpright;
+            bool mFast, mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
+            osg::Vec3d mUp;
+    };
+
+    class OrbitCameraController : public CameraController
+    {
+        public:
+
+            OrbitCameraController();
+
+            bool handleKeyEvent(QKeyEvent* event, bool pressed);
+            bool handleMouseMoveEvent(std::string mode, int x, int y);
+
+            void update(double dt);
+
+        private:
+
+            void onActivate();
+
+            void initialize();
+
+            void rotateHorizontal(double value);
+            void rotateVertical(double value);
+            void roll(double value);
+            void translate(const osg::Vec3d& offset);
+            void zoom(double value);
+
+            void lookAtCenter();
+
+            bool mInitialized;
+            bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
+            osg::Vec3d mCenter;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 6115a9bc3d..c3b4b9a19f 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -25,6 +25,7 @@
 
 #include "lighting.hpp"
 #include "mask.hpp"
+#include "cameracontroller.hpp"
 
 namespace CSVRender
 {
@@ -141,8 +142,12 @@ CompositeViewer &CompositeViewer::get()
 
 void CompositeViewer::update()
 {
-    mSimulationTime += mFrameTimer.time_s();
+    double dt = mFrameTimer.time_s();
     mFrameTimer.setStartTick();
+
+    emit simulationUpdated(dt);
+
+    mSimulationTime += dt;
     frame(mSimulationTime);
 }
 
@@ -154,7 +159,14 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     , mResourceSystem(resourceSystem)
     , mLighting(NULL)
     , mHasDefaultAmbient(false)
+    , mPrevMouseX(0)
+    , mPrevMouseY(0)
+    , mFreeCamControl(new FreeCameraController())
+    , mOrbitCamControl(new OrbitCameraController())
+    , mCurrentCamControl(mFreeCamControl.get())
 {
+    selectNavigationMode("free");
+
     // we handle lighting manually
     mView->setLightingMode(osgViewer::View::NO_LIGHT);
 
@@ -175,6 +187,8 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
         CSMPrefs::get()["3D Scene Input"].update();
         CSMPrefs::get()["Tooltips"].update();
     }
+
+    connect (&CompositeViewer::get(), SIGNAL (simulationUpdated(double)), this, SLOT (update(double)));
 }
 
 SceneWidget::~SceneWidget()
@@ -256,28 +270,43 @@ void SceneWidget::setDefaultAmbient (const osg::Vec4f& colour)
 
 void SceneWidget::mousePressEvent (QMouseEvent *event)
 {
-    std::string button = mapButton(event);
+    mMouseMode = mapButton(event);
 
-    // TODO placeholders
-    if (button == "p-navi")
-    {
-    }
-    else if (button == "s-navi")
-    {
-    }
+    mPrevMouseX = event->x();
+    mPrevMouseY = event->y();
 }
 
 void SceneWidget::mouseReleaseEvent (QMouseEvent *event)
 {
-    std::string button = mapButton(event);
+    mMouseMode = "";
+}
 
-    // TODO placeholders
-    if (button == "p-navi")
-    {
-    }
-    else if (button == "s-navi")
-    {
-    }
+void SceneWidget::mouseMoveEvent (QMouseEvent *event)
+{
+    mCurrentCamControl->handleMouseMoveEvent(mMouseMode, event->x() - mPrevMouseX, event->y() - mPrevMouseY);
+
+    mPrevMouseX = event->x();
+    mPrevMouseY = event->y();
+}
+
+void SceneWidget::wheelEvent(QWheelEvent *event)
+{
+    mCurrentCamControl->handleMouseMoveEvent("t-navi", event->delta(), 0);
+}
+
+void SceneWidget::keyPressEvent (QKeyEvent *event)
+{
+    mCurrentCamControl->handleKeyEvent(event, true);
+}
+
+void SceneWidget::keyReleaseEvent (QKeyEvent *event)
+{
+    mCurrentCamControl->handleKeyEvent(event, false);
+}
+
+void SceneWidget::update(double dt)
+{
+    mCurrentCamControl->update(dt);
 }
 
 void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
@@ -288,13 +317,31 @@ void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
 void SceneWidget::selectNavigationMode (const std::string& mode)
 {
     if (mode=="1st")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mFreeCamControl.get();
+        mCurrentCamControl->setCamera(getCamera());
+        mFreeCamControl->fixUpAxis(osg::Vec3d(0,0,1));
+    }
     else if (mode=="free")
-        mView->setCameraManipulator(new osgGA::FirstPersonManipulator);
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mFreeCamControl.get();
+        mCurrentCamControl->setCamera(getCamera());
+        mFreeCamControl->unfixUpAxis();
+    }
     else if (mode=="orbit")
-        mView->setCameraManipulator(new osgGA::OrbitManipulator);
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mOrbitCamControl.get();
+        mCurrentCamControl->setCamera(getCamera());
+    }
     else if (mode=="trackball")
-        mView->setCameraManipulator(new osgGA::TrackballManipulator);
+    {
+        mCurrentCamControl->setCamera(NULL);
+        mCurrentCamControl = mOrbitCamControl.get();
+        mCurrentCamControl->setCamera(getCamera());
+    }
 }
 
 bool SceneWidget::storeMappingSetting (const CSMPrefs::Setting *setting)
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 6870c06abc..43f969aca6 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -2,6 +2,7 @@
 #define OPENCS_VIEW_SCENEWIDGET_H
 
 #include <map>
+#include <memory>
 
 #include <QWidget>
 #include <QTimer>
@@ -39,6 +40,9 @@ namespace CSMPrefs
 
 namespace CSVRender
 {
+    class CameraController;
+    class FreeCameraController;
+    class OrbitCameraController;
     class Lighting;
 
     class RenderWidget : public QWidget
@@ -88,6 +92,10 @@ namespace CSVRender
 
         virtual void mousePressEvent (QMouseEvent *event);
         virtual void mouseReleaseEvent (QMouseEvent *event);
+        virtual void mouseMoveEvent (QMouseEvent *event);
+        virtual void wheelEvent (QWheelEvent *event);
+        virtual void keyPressEvent (QKeyEvent *event);
+        virtual void keyReleaseEvent (QKeyEvent *event);
 
         /// \return Is \a key a button mapping setting? (ignored otherwise)
         virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
@@ -104,8 +112,17 @@ namespace CSVRender
         LightingNight mLightingNight;
         LightingBright mLightingBright;
 
+        int mPrevMouseX, mPrevMouseY;
+        std::string mMouseMode;
+        std::auto_ptr<FreeCameraController> mFreeCamControl;
+        std::auto_ptr<OrbitCameraController> mOrbitCamControl;
+        CameraController* mCurrentCamControl;
+
         std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
 
+    public slots:
+        void update(double dt);
+
     protected slots:
 
         virtual void settingChanged (const CSMPrefs::Setting *setting);
@@ -139,6 +156,9 @@ namespace CSVRender
 
     public slots:
         void update();
+
+    signals:
+        void simulationUpdated(double dt);
     };
 
 }

From 59f59a33855c5ebd5767e98d24a02737cfdf3a44 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 14 Mar 2016 00:14:28 -0400
Subject: [PATCH 459/765] Fix indentation

---
 apps/opencs/view/render/scenewidget.hpp | 134 ++++++++++++------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 43f969aca6..7dcc740475 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -47,118 +47,118 @@ namespace CSVRender
 
     class RenderWidget : public QWidget
     {
-        Q_OBJECT
+            Q_OBJECT
 
-    public:
-        RenderWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
-        virtual ~RenderWidget();
+        public:
+            RenderWidget(QWidget* parent = 0, Qt::WindowFlags f = 0);
+            virtual ~RenderWidget();
 
-        void flagAsModified();
+            void flagAsModified();
 
-        void setVisibilityMask(int mask);
+            void setVisibilityMask(int mask);
 
-        osg::Camera *getCamera();
+            osg::Camera *getCamera();
 
-    protected:
+        protected:
 
-        osg::ref_ptr<osgViewer::View> mView;
+            osg::ref_ptr<osgViewer::View> mView;
 
-        osg::Group* mRootNode;
+            osg::Group* mRootNode;
 
-        QTimer mTimer;
+            QTimer mTimer;
     };
 
     // Extension of RenderWidget to support lighting mode selection & toolbar
     class SceneWidget : public RenderWidget
     {
-        Q_OBJECT
-    public:
-        SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0,
-                Qt::WindowFlags f = 0, bool retrieveInput = true);
-        virtual ~SceneWidget();
+            Q_OBJECT
+        public:
+            SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSystem, QWidget* parent = 0,
+                    Qt::WindowFlags f = 0, bool retrieveInput = true);
+            virtual ~SceneWidget();
 
-        CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
-        ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
-        /// is the responsibility of the calling function.
+            CSVWidget::SceneToolMode *makeLightingSelector (CSVWidget::SceneToolbar *parent);
+            ///< \attention The created tool is not added to the toolbar (via addTool). Doing that
+            /// is the responsibility of the calling function.
 
-        void setDefaultAmbient (const osg::Vec4f& colour);
-        ///< \note The actual ambient colour may differ based on lighting settings.
+            void setDefaultAmbient (const osg::Vec4f& colour);
+            ///< \note The actual ambient colour may differ based on lighting settings.
 
-    protected:
-        void setLighting (Lighting *lighting);
-        ///< \attention The ownership of \a lighting is not transferred to *this.
+        protected:
+            void setLighting (Lighting *lighting);
+            ///< \attention The ownership of \a lighting is not transferred to *this.
 
-        void setAmbient(const osg::Vec4f& ambient);
+            void setAmbient(const osg::Vec4f& ambient);
 
-        virtual void mousePressEvent (QMouseEvent *event);
-        virtual void mouseReleaseEvent (QMouseEvent *event);
-        virtual void mouseMoveEvent (QMouseEvent *event);
-        virtual void wheelEvent (QWheelEvent *event);
-        virtual void keyPressEvent (QKeyEvent *event);
-        virtual void keyReleaseEvent (QKeyEvent *event);
+            virtual void mousePressEvent (QMouseEvent *event);
+            virtual void mouseReleaseEvent (QMouseEvent *event);
+            virtual void mouseMoveEvent (QMouseEvent *event);
+            virtual void wheelEvent (QWheelEvent *event);
+            virtual void keyPressEvent (QKeyEvent *event);
+            virtual void keyReleaseEvent (QKeyEvent *event);
 
-        /// \return Is \a key a button mapping setting? (ignored otherwise)
-        virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
+            /// \return Is \a key a button mapping setting? (ignored otherwise)
+            virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
 
-        std::string mapButton (QMouseEvent *event);
+            std::string mapButton (QMouseEvent *event);
 
-        boost::shared_ptr<Resource::ResourceSystem> mResourceSystem;
+            boost::shared_ptr<Resource::ResourceSystem> mResourceSystem;
 
-        Lighting* mLighting;
+            Lighting* mLighting;
 
-        osg::Vec4f mDefaultAmbient;
-        bool mHasDefaultAmbient;
-        LightingDay mLightingDay;
-        LightingNight mLightingNight;
-        LightingBright mLightingBright;
+            osg::Vec4f mDefaultAmbient;
+            bool mHasDefaultAmbient;
+            LightingDay mLightingDay;
+            LightingNight mLightingNight;
+            LightingBright mLightingBright;
 
-        int mPrevMouseX, mPrevMouseY;
-        std::string mMouseMode;
-        std::auto_ptr<FreeCameraController> mFreeCamControl;
-        std::auto_ptr<OrbitCameraController> mOrbitCamControl;
-        CameraController* mCurrentCamControl;
+            int mPrevMouseX, mPrevMouseY;
+            std::string mMouseMode;
+            std::auto_ptr<FreeCameraController> mFreeCamControl;
+            std::auto_ptr<OrbitCameraController> mOrbitCamControl;
+            CameraController* mCurrentCamControl;
 
-        std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
+            std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
 
-    public slots:
-        void update(double dt);
+        public slots:
+            void update(double dt);
 
-    protected slots:
+        protected slots:
 
-        virtual void settingChanged (const CSMPrefs::Setting *setting);
+            virtual void settingChanged (const CSMPrefs::Setting *setting);
 
-        void selectNavigationMode (const std::string& mode);
+            void selectNavigationMode (const std::string& mode);
 
-    private slots:
+        private slots:
 
-        void selectLightingMode (const std::string& mode);
+            void selectLightingMode (const std::string& mode);
 
         signals:
 
-             void focusToolbarRequest();
+            void focusToolbarRequest();
     };
 
 
     // There are rendering glitches when using multiple Viewer instances, work around using CompositeViewer with multiple views
     class CompositeViewer : public QObject, public osgViewer::CompositeViewer
     {
-        Q_OBJECT
-    public:
-        CompositeViewer();
+            Q_OBJECT
+        public:
+            CompositeViewer();
 
-        static CompositeViewer& get();
+            static CompositeViewer& get();
 
-        QTimer mTimer;
+            QTimer mTimer;
 
-    private:
-        osg::Timer mFrameTimer;
-        double mSimulationTime;
+        private:
+            osg::Timer mFrameTimer;
+            double mSimulationTime;
 
-    public slots:
-        void update();
+        public slots:
+            void update();
 
-    signals:
-        void simulationUpdated(double dt);
+        signals:
+            void simulationUpdated(double dt);
     };
 
 }

From 629a558e7b8f6f13698d7e99788cfe6dacd62a82 Mon Sep 17 00:00:00 2001
From: pi03k <pi03k87@gmail.com>
Date: Thu, 17 Mar 2016 22:34:45 +0100
Subject: [PATCH 460/765] Fix for bug 3248

---
 apps/opencs/view/world/scriptsubview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index ee0acb560a..c9b8127f68 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -324,7 +324,9 @@ void CSVWorld::ScriptSubView::switchToRow (int row)
     std::string id = mModel->data (mModel->index (row, idColumn)).toString().toUtf8().constData();
     setUniversalId (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Script, id));
 
-    mEditor->setPlainText (mModel->data (mModel->index (row, mColumn)).toString());
+    bool oldSignalsState =  mEditor->blockSignals( true );
+    mEditor->setPlainText( mModel->data(mModel->index(row, mColumn)).toString() );
+    mEditor->blockSignals( oldSignalsState );
 
     std::vector<std::string> selection (1, id);
     mCommandDispatcher.setSelection (selection);

From 2b38d10449975526169c7ee87b49be39a4dfc94b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:16:46 +0100
Subject: [PATCH 461/765] Always add xbase_anim

---
 apps/openmw/mwrender/npcanimation.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 99106c9207..4e569b0e6b 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -474,7 +474,12 @@ void NpcAnimation::updateNpcBase()
 
     if(mViewMode != VM_FirstPerson)
     {
+        const std::string base = "meshes\\xbase_anim.nif";
+        if (smodel != base)
+            addAnimSource(base);
+
         addAnimSource(smodel);
+
         if(!isWerewolf)
         {
             if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)

From 30402f75e30a23d1b3c66c84cbf1e2c892dd0155 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:24:38 +0100
Subject: [PATCH 462/765] Use xbase_anim_female as the base skeleton for female
 NPCs (Fixes #3258)

---
 apps/openmw/mwrender/npcanimation.cpp | 53 ++++++++++++++++-----------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 4e569b0e6b..eaafe63fd2 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -461,13 +461,32 @@ void NpcAnimation::updateNpcBase()
     }
 
     bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
-    std::string smodel = (mViewMode != VM_FirstPerson) ?
-                         (!isWerewolf ? !isBeast ? "meshes\\base_anim.nif"
-                                                 : "meshes\\base_animkna.nif"
-                                      : "meshes\\wolf\\skin.nif") :
-                         (!isWerewolf ? !isBeast ? "meshes\\base_anim.1st.nif"
-                                                 : "meshes\\base_animkna.1st.nif"
-                                      : "meshes\\wolf\\skin.1st.nif");
+    bool isFemale = !mNpc->isMale();
+
+    std::string smodel;
+    if (mViewMode != VM_FirstPerson)
+    {
+        if (isWerewolf)
+            smodel = "meshes\\wolf\\skin.nif";
+        else if (isBeast)
+            smodel = "meshes\\base_animkna.nif";
+        else if (isFemale)
+            smodel = "meshes\\base_anim_female.nif";
+        else
+            smodel = "meshes\\base_anim.nif";
+    }
+    else
+    {
+        if (isWerewolf)
+            smodel = "meshes\\wolf\\skin.1st.nif";
+        else if (isBeast)
+            smodel = "meshes\\base_animkna.1st.nif";
+        else if (isFemale)
+            smodel = "meshes\\base_anim_female.1st.nif";
+        else
+            smodel = "meshes\\base_anim.1st.nif";
+    }
+
     smodel = Misc::ResourceHelpers::correctActorModelPath(smodel, mResourceSystem->getVFS());
 
     setObjectRoot(smodel, true, true, false);
@@ -484,28 +503,20 @@ void NpcAnimation::updateNpcBase()
         {
             if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
                 addAnimSource("meshes\\xargonian_swimkna.nif");
-            else if(!mNpc->isMale() && !isBeast)
-                addAnimSource("meshes\\xbase_anim_female.nif");
             if(mNpc->mModel.length() > 0)
                 addAnimSource(Misc::ResourceHelpers::correctActorModelPath("meshes\\" + mNpc->mModel, mResourceSystem->getVFS()));
         }
     }
     else
     {
+        const std::string base = "meshes\\xbase_anim.1st.nif";
+        if (smodel != base)
+            addAnimSource(base);
+
+        addAnimSource(smodel);
+
         mObjectRoot->setNodeMask(Mask_FirstPerson);
         mObjectRoot->addCullCallback(new OverrideFieldOfViewCallback(mFirstPersonFieldOfView));
-        if(isWerewolf)
-            addAnimSource(smodel);
-        else
-        {
-            // A bit counter-intuitive, but unlike third-person anims, it seems
-            // beast races get both base_anim.1st.nif and base_animkna.1st.nif.
-            addAnimSource("meshes\\xbase_anim.1st.nif");
-            if(isBeast)
-                addAnimSource("meshes\\xbase_animkna.1st.nif");
-            if(!mNpc->isMale() && !isBeast)
-                addAnimSource("meshes\\xbase_anim_female.1st.nif");
-        }
     }
 
     updateParts();

From 12ec90f9e7f4a6c895b477fe767977422783305e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:38:02 +0100
Subject: [PATCH 463/765] Change default argument, fix GetDisposition

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 2 +-
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp   | 2 +-
 apps/openmw/mwdialogue/filter.cpp               | 2 +-
 apps/openmw/mwgui/dialogue.cpp                  | 2 +-
 apps/openmw/mwgui/tradewindow.cpp               | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index b29859781a..87f1104db4 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -97,7 +97,7 @@ namespace MWBase
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying) = 0;
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = false) = 0;
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true) = 0;
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const = 0;
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index c99e86c2d0..393d2dc98a 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -535,7 +535,7 @@ namespace MWDialogue
         mPermanentDispositionChange += perm;
 
         // change temp disposition so that final disposition is between 0...100
-        float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor));
+        float curDisp = static_cast<float>(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false));
         if (curDisp + mTemporaryDispositionChange < 0)
             mTemporaryDispositionChange = -curDisp;
         else if (curDisp + mTemporaryDispositionChange > 100)
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 223690a719..99e6894113 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -145,7 +145,7 @@ bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info, bool invert
     if (isCreature)
         return true;
 
-    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, true);
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
     // For service refusal, the disposition check is inverted. However, a value of 0 still means "always succeed".
     return invert ? (info.mData.mDisposition == 0 || actorDisposition < info.mData.mDisposition)
                   : (actorDisposition >= info.mData.mDisposition);
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 76f39f5e78..40ec57731f 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -640,7 +640,7 @@ namespace MWGui
         if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
         {
             int disp = std::max(0, std::min(100,
-                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr, true)));
+                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)));
             mDispositionBar->setProgressRange(100);
             mDispositionBar->setProgressPosition(disp);
             mDispositionText->setCaption(MyGUI::utility::toString(disp)+std::string("/100"));
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index d692c8b097..14c78cf0f4 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -346,7 +346,7 @@ namespace MWGui
             else
                 d = int(100 * (b - a) / a);
 
-            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr, true),100));
+            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr),100));
 
             const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
             const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e6a92b9ea6..7cfb937c87 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -581,7 +581,7 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange/* = false */)
+    int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange)
     {
         const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = static_cast<float>(npcSkill.getBaseDisposition());
@@ -672,7 +672,7 @@ namespace MWMechanics
 
         // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered here,
         // otherwise one would get different prices when exiting and re-entering the dialogue window...
-        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr, true),100));
+        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr),100));
         float a = static_cast<float>(std::min(playerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100));
         float b = std::min(0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
         float c = std::min(0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);
@@ -719,7 +719,7 @@ namespace MWMechanics
         float playerRating1, playerRating2, playerRating3;
         getPersuasionRatings(playerStats, playerRating1, playerRating2, playerRating3, true);
 
-        int currentDisposition = std::min(100, std::max(0, int(getDerivedDisposition(npc) + currentTemporaryDispositionDelta)));
+        int currentDisposition = std::min(100, std::max(0, int(getDerivedDisposition(npc, false) + currentTemporaryDispositionDelta)));
 
         float d = 1 - 0.02f * abs(currentDisposition - 50);
         float target1 = d * (playerRating1 - npcRating1 + 50);
@@ -1547,7 +1547,7 @@ namespace MWMechanics
     {
         int disposition = 50;
         if (ptr.getClass().isNpc())
-            disposition = getDerivedDisposition(ptr);
+            disposition = getDerivedDisposition(ptr, false);
 
         int fight = std::max(0, ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
                 + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition))));

From 79eb2d20e0670e77a16ddfb1a32f728945317062 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:39:19 +0100
Subject: [PATCH 464/765] Cleanup

---
 apps/openmw/mwbase/mechanicsmanager.hpp         | 3 +--
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp   | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 5 ++---
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 87f1104db4..e43d1fdc10 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -153,8 +153,7 @@ namespace MWBase
                 PT_Bribe100,
                 PT_Bribe1000
             };
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-                float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange) = 0;
+            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange) = 0;
             ///< Perform a persuasion action on NPC
 
             virtual void forceStateUpdate(const MWWorld::Ptr &ptr) = 0;
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 393d2dc98a..4f0f4f4692 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -529,7 +529,7 @@ namespace MWDialogue
         bool success;
         float temp, perm;
         MWBase::Environment::get().getMechanicsManager()->getPersuasionDispositionChange(
-                    mActor, MWBase::MechanicsManager::PersuasionType(type), mTemporaryDispositionChange,
+                    mActor, MWBase::MechanicsManager::PersuasionType(type),
                     success, temp, perm);
         mTemporaryDispositionChange += temp;
         mPermanentDispositionChange += perm;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7cfb937c87..d02fce94ef 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -702,8 +702,7 @@ namespace MWMechanics
         return mActors.countDeaths (id);
     }
 
-    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-        float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange)
+    void MechanicsManager::getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange)
     {
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
@@ -719,7 +718,7 @@ namespace MWMechanics
         float playerRating1, playerRating2, playerRating3;
         getPersuasionRatings(playerStats, playerRating1, playerRating2, playerRating3, true);
 
-        int currentDisposition = std::min(100, std::max(0, int(getDerivedDisposition(npc, false) + currentTemporaryDispositionDelta)));
+        int currentDisposition = getDerivedDisposition(npc);
 
         float d = 1 - 0.02f * abs(currentDisposition - 50);
         float target1 = d * (playerRating1 - npcRating1 + 50);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index c61dce5215..5acff50a47 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -98,8 +98,7 @@ namespace MWMechanics
             virtual int countDeaths (const std::string& id) const;
             ///< Return the number of deaths for actors with the given ID.
 
-            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
-                float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange);
+            virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange);
             void toLower(std::string npcFaction);
             ///< Perform a persuasion action on NPC
 

From 102f9719f71da2878ce0b06871bef91fc1dcb8b4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:39:27 +0100
Subject: [PATCH 465/765] Remove some garbage

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 5acff50a47..27c6cc1500 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -99,7 +99,6 @@ namespace MWMechanics
             ///< Return the number of deaths for actors with the given ID.
 
             virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type, bool& success, float& tempChange, float& permChange);
-            void toLower(std::string npcFaction);
             ///< Perform a persuasion action on NPC
 
             /// Check if \a observer is potentially aware of \a ptr. Does not do a line of sight check!

From a6e23d03d3a8d456a8696b656ecca8f959709f57 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 00:41:24 +0100
Subject: [PATCH 466/765] Don't clamp disposition twice, clamping is already
 done inside getDerivedDisposition

---
 apps/openmw/mwgui/dialogue.cpp                  | 3 +--
 apps/openmw/mwgui/tradewindow.cpp               | 2 +-
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 40ec57731f..771e1bf95e 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -639,8 +639,7 @@ namespace MWGui
     {
         if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
         {
-            int disp = std::max(0, std::min(100,
-                MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)));
+            int disp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
             mDispositionBar->setProgressRange(100);
             mDispositionBar->setProgressPosition(disp);
             mDispositionText->setCaption(MyGUI::utility::toString(disp)+std::string("/100"));
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 14c78cf0f4..c084ec2439 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -346,7 +346,7 @@ namespace MWGui
             else
                 d = int(100 * (b - a) / a);
 
-            int clampedDisposition = std::max(0, std::min(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr),100));
+            int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
 
             const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
             const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index d02fce94ef..ece0a2fbc8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -672,7 +672,7 @@ namespace MWMechanics
 
         // I suppose the temporary disposition change (second param to getDerivedDisposition()) _has_ to be considered here,
         // otherwise one would get different prices when exiting and re-entering the dialogue window...
-        int clampedDisposition = std::max(0, std::min(getDerivedDisposition(ptr),100));
+        int clampedDisposition = getDerivedDisposition(ptr);
         float a = static_cast<float>(std::min(playerStats.getSkill(ESM::Skill::Mercantile).getModified(), 100));
         float b = std::min(0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
         float c = std::min(0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);

From 0a2724f9f2edf8f281e9ea9c436d1375bbf6934c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Mar 2016 10:28:38 +0100
Subject: [PATCH 467/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6898c7a9ad..4c6aa8895c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -14,6 +14,7 @@ Programmers
 
     Adam Hogan (aurix)
     Aesylwinn
+    aegis
     Aleksandar Jovanov
     Alex Haddad (rainChu)
     Alex McKibben (WeirdSexy)

From fcccacc0faace18b5a66239e22f066133c996776 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 13:57:48 -0400
Subject: [PATCH 468/765] Define a constant for the World Up vector

---
 apps/opencs/view/render/cameracontroller.cpp | 2 ++
 apps/opencs/view/render/cameracontroller.hpp | 2 ++
 apps/opencs/view/render/scenewidget.cpp      | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index fa2ad85605..8fc9c48017 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -13,6 +13,8 @@ namespace CSVRender
     Camera Controller
     */
 
+    const osg::Vec3d CameraController::WorldUp = osg::Vec3d(0, 0, 1);
+
     const osg::Vec3d CameraController::LocalUp = osg::Vec3d(0, 1, 0);
     const osg::Vec3d CameraController::LocalLeft = osg::Vec3d(1, 0, 0);
     const osg::Vec3d CameraController::LocalForward = osg::Vec3d(0, 0, 1);
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index e45e7bead0..44e35069b0 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -19,6 +19,8 @@ namespace CSVRender
     {
         public:
 
+            static const osg::Vec3d WorldUp;
+
             static const osg::Vec3d LocalUp;
             static const osg::Vec3d LocalLeft;
             static const osg::Vec3d LocalForward;
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index c3b4b9a19f..d7049c1b54 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -321,7 +321,7 @@ void SceneWidget::selectNavigationMode (const std::string& mode)
         mCurrentCamControl->setCamera(NULL);
         mCurrentCamControl = mFreeCamControl.get();
         mCurrentCamControl->setCamera(getCamera());
-        mFreeCamControl->fixUpAxis(osg::Vec3d(0,0,1));
+        mFreeCamControl->fixUpAxis(CameraController::WorldUp);
     }
     else if (mode=="free")
     {

From 999869da24b2937939850dcd575db9a894c0af35 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:02:24 -0400
Subject: [PATCH 469/765] Position camera above, near, and looking at the
 scene.

---
 apps/opencs/view/render/cameracontroller.cpp |  8 ++++++++
 apps/opencs/view/render/cameracontroller.hpp |  4 ++++
 apps/opencs/view/render/scenewidget.cpp      | 19 ++++++++++++++++++-
 apps/opencs/view/render/scenewidget.hpp      |  3 +++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 8fc9c48017..7f8f9013c0 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -69,6 +69,14 @@ namespace CSVRender
         mMouseScalar = value;
     }
 
+    void CameraController::setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up)
+    {
+        osg::Vec3d eye = osg::Vec3d(bounds.xMax(), bounds.yMax(), bounds.zMax());
+        osg::Vec3d center = bounds.center();
+
+        getCamera()->setViewMatrixAsLookAt(eye, center, up);
+    }
+
     void CameraController::setModified()
     {
         mModified = true;
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 44e35069b0..156b1cb56f 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include <osg/BoundingBox>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -41,6 +42,9 @@ namespace CSVRender
             void setCamera(osg::Camera*);
             void setMouseScalar(double value);
 
+            // moves the camera to an intelligent position
+            void setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up);
+
             virtual bool handleKeyEvent(QKeyEvent* event, bool pressed) = 0;
             virtual bool handleMouseMoveEvent(std::string mode, int x, int y) = 0;
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index d7049c1b54..ea282ffcd1 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -11,6 +11,8 @@
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
+#include <osg/BoundingBox>
+#include <osg/ComputeBoundsVisitor>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FirstPersonManipulator>
@@ -164,6 +166,7 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     , mFreeCamControl(new FreeCameraController())
     , mOrbitCamControl(new OrbitCameraController())
     , mCurrentCamControl(mFreeCamControl.get())
+    , mCamPositionSet(false)
 {
     selectNavigationMode("free");
 
@@ -306,7 +309,21 @@ void SceneWidget::keyReleaseEvent (QKeyEvent *event)
 
 void SceneWidget::update(double dt)
 {
-    mCurrentCamControl->update(dt);
+    if (mCamPositionSet)
+    {
+        mCurrentCamControl->update(dt);
+    }
+    else
+    {
+        osg::ComputeBoundsVisitor boundsVisitor;
+        osg::BoundingBox &boundingBox(boundsVisitor.getBoundingBox());
+
+        mRootNode->accept(boundsVisitor);
+
+        mCurrentCamControl->setSceneBounds(boundingBox, CameraController::WorldUp);
+
+        mCamPositionSet = true;
+    }
 }
 
 void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index 7dcc740475..dfda1f96cd 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -120,6 +120,9 @@ namespace CSVRender
 
             std::map<std::pair<Qt::MouseButton, bool>, std::string> mButtonMapping;
 
+        private:
+            bool mCamPositionSet;
+
         public slots:
             void update(double dt);
 

From 2b72a04e7a4171af65b4e33a340901b69dd91aa5 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:02:55 -0400
Subject: [PATCH 470/765] Update 1st person up axis ASAP.

---
 apps/opencs/view/render/cameracontroller.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 7f8f9013c0..85301bb628 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -108,6 +108,7 @@ namespace CSVRender
     {
         mLockUpright = true;
         mUp = up;
+        setModified();
     }
 
     void FreeCameraController::unfixUpAxis()

From 4374f69a601d1168b8f7dfe9b1c254782388d56f Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:43:13 -0400
Subject: [PATCH 471/765] Reduce mouse sensitivity

---
 apps/opencs/view/render/cameracontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 85301bb628..f1ed5635bf 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -26,7 +26,7 @@ namespace CSVRender
     CameraController::CameraController()
         : mActive(false)
         , mModified(false)
-        , mMouseScalar(-1/350.f)
+        , mMouseScalar(-1/700.f)
         , mCamera(NULL)
     {
     }

From 7009355bafdd045f7a763341ada105f8096b7038 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:46:53 -0400
Subject: [PATCH 472/765] Remove unused variable

---
 apps/opencs/view/render/pagedworldspacewidget.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 63437cb2c5..8b20d22ba4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -21,7 +21,6 @@
 bool CSVRender::PagedWorldspaceWidget::adjustCells()
 {
     bool modified = false;
-    bool wasEmpty = mCells.empty();
 
     const CSMWorld::IdCollection<CSMWorld::Cell>& cells = mDocument.getData().getCells();
 

From 0e75b4a23488a32490d44f08abcbbed935f8f945 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:49:00 -0400
Subject: [PATCH 473/765] Remove warning about */ outside of comment

---
 extern/osgQt/GraphicsWindowQt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
index 770ac9ada0..46df7216ce 100644
--- a/extern/osgQt/GraphicsWindowQt.cpp
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -708,7 +708,7 @@ void HeartBeat::init( osgViewer::ViewerBase *viewer )
 }
 
 
-void HeartBeat::timerEvent( QTimerEvent */*event*/ )
+void HeartBeat::timerEvent( QTimerEvent * /*event*/ )
 {
     osg::ref_ptr< osgViewer::ViewerBase > viewer;
     if( !_viewer.lock( viewer ) )

From c8bae38a8e42bff2bfc522205ed1ba9bea6dc4ba Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 14:53:10 -0400
Subject: [PATCH 474/765] Remove trackball mode

---
 apps/opencs/view/render/previewwidget.cpp | 2 +-
 apps/opencs/view/render/scenewidget.cpp   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index 7b36451351..2f35103171 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -7,7 +7,7 @@ CSVRender::PreviewWidget::PreviewWidget (CSMWorld::Data& data,
     const std::string& id, bool referenceable, QWidget *parent)
 : SceneWidget (data.getResourceSystem(), parent), mData (data), mObject(data, mRootNode, id, referenceable)
 {
-    selectNavigationMode("trackball");
+    selectNavigationMode("orbit");
 
     QAbstractItemModel *referenceables =
         mData.getTableModel (CSMWorld::UniversalId::Type_Referenceables);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index ea282ffcd1..27c828ec4e 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -353,12 +353,6 @@ void SceneWidget::selectNavigationMode (const std::string& mode)
         mCurrentCamControl = mOrbitCamControl.get();
         mCurrentCamControl->setCamera(getCamera());
     }
-    else if (mode=="trackball")
-    {
-        mCurrentCamControl->setCamera(NULL);
-        mCurrentCamControl = mOrbitCamControl.get();
-        mCurrentCamControl->setCamera(getCamera());
-    }
 }
 
 bool SceneWidget::storeMappingSetting (const CSMPrefs::Setting *setting)

From 2c894acd98ed593c8433e29443f84035a2c74297 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 16:06:35 -0400
Subject: [PATCH 475/765] Create a visual representation of the center of the
 orbit camera. For debugging purposes.

---
 apps/opencs/view/render/cameracontroller.cpp | 24 +++++++++++++++++++-
 apps/opencs/view/render/cameracontroller.hpp |  7 +++++-
 apps/opencs/view/render/scenewidget.cpp      |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index f1ed5635bf..74f72938f6 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -3,8 +3,12 @@
 #include <QKeyEvent>
 
 #include <osg/Camera>
+#include <osg/Geode>
+#include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Quat>
+#include <osg/Shape>
+#include <osg/ShapeDrawable>
 
 namespace CSVRender
 {
@@ -261,7 +265,7 @@ namespace CSVRender
     Orbit Camera Controller
     */
 
-    OrbitCameraController::OrbitCameraController()
+    OrbitCameraController::OrbitCameraController(osg::Group* group)
         : mInitialized(false)
         , mFast(false)
         , mLeft(false)
@@ -271,7 +275,10 @@ namespace CSVRender
         , mRollLeft(false)
         , mRollRight(false)
         , mCenter(0,0,0)
+        , mCenterNode(new osg::PositionAttitudeTransform())
     {
+        group->addChild(mCenterNode);
+        createShape();
     }
 
     bool OrbitCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
@@ -383,6 +390,8 @@ namespace CSVRender
         if (mRollRight)
             roll(rotDist);
 
+        mCenterNode->setPosition(mCenter);
+
         lookAtCenter();
 
         // Normalize the matrix to counter drift
@@ -409,6 +418,19 @@ namespace CSVRender
         mInitialized = true;
     }
 
+    void OrbitCameraController::createShape()
+    {
+        const float boxWidth = 100;
+
+        osg::ref_ptr<osg::Box> box = new osg::Box(osg::Vec3f(0, 0, 0), boxWidth);
+        osg::ref_ptr<osg::ShapeDrawable> drawable = new osg::ShapeDrawable(box);
+        drawable->setColor(osg::Vec4f(0.f, 0.9f, 0.f, 1.f));
+
+        osg::ref_ptr<osg::Geode> geode = new osg::Geode();
+        geode->addChild(drawable);
+        mCenterNode->addChild(geode);
+    }
+
     void OrbitCameraController::rotateHorizontal(double value)
     {
         osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 156b1cb56f..6c89d20f74 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include <osg/BoundingBox>
+#include <osg/PositionAttitudeTransform>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -12,6 +13,7 @@ class QKeyEvent;
 namespace osg
 {
     class Camera;
+    class Group;
 }
 
 namespace CSVRender
@@ -97,7 +99,7 @@ namespace CSVRender
     {
         public:
 
-            OrbitCameraController();
+            OrbitCameraController(osg::Group* group);
 
             bool handleKeyEvent(QKeyEvent* event, bool pressed);
             bool handleMouseMoveEvent(std::string mode, int x, int y);
@@ -109,6 +111,7 @@ namespace CSVRender
             void onActivate();
 
             void initialize();
+            void createShape();
 
             void rotateHorizontal(double value);
             void rotateVertical(double value);
@@ -121,6 +124,8 @@ namespace CSVRender
             bool mInitialized;
             bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
             osg::Vec3d mCenter;
+
+            osg::ref_ptr<osg::PositionAttitudeTransform> mCenterNode;
     };
 }
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 27c828ec4e..dc0041c0f3 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -164,7 +164,7 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     , mPrevMouseX(0)
     , mPrevMouseY(0)
     , mFreeCamControl(new FreeCameraController())
-    , mOrbitCamControl(new OrbitCameraController())
+    , mOrbitCamControl(new OrbitCameraController(mRootNode))
     , mCurrentCamControl(mFreeCamControl.get())
     , mCamPositionSet(false)
 {

From 2903271331b00051c153ad8bd8956dbe89e08b53 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 16:07:15 -0400
Subject: [PATCH 476/765] Correct the center position for the orbit camera
 controller

---
 apps/opencs/view/render/cameracontroller.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 74f72938f6..c70f875659 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -409,11 +409,8 @@ namespace CSVRender
     {
         static const int DefaultStartDistance = 10000.f;
 
-        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
-        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
-        osg::Vec3d offset = rotation * (LocalForward * DefaultStartDistance);
-
-        mCenter = position + offset;
+        osg::Vec3d eye, up;
+        getCamera()->getViewMatrixAsLookAt(eye, mCenter, up, DefaultStartDistance);
 
         mInitialized = true;
     }

From 342d31de76eff1d9c2b0587df7df8a8aeb4cf1a1 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 16:56:40 -0400
Subject: [PATCH 477/765] More fixes to the orbit manipulator

---
 apps/opencs/view/render/cameracontroller.cpp | 55 ++++++++------------
 apps/opencs/view/render/cameracontroller.hpp |  3 +-
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index c70f875659..49e14bfa0b 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -275,6 +275,7 @@ namespace CSVRender
         , mRollLeft(false)
         , mRollRight(false)
         , mCenter(0,0,0)
+        , mDistance(0)
         , mCenterNode(new osg::PositionAttitudeTransform())
     {
         group->addChild(mCenterNode);
@@ -343,7 +344,7 @@ namespace CSVRender
         if (mode == "p-navi")
         {
             rotateHorizontal(x * getMouseScalar());
-            rotateVertical(y * getMouseScalar());
+            rotateVertical(-y * getMouseScalar());
             setModified();
         }
         else if (mode == "s-navi")
@@ -353,7 +354,7 @@ namespace CSVRender
         }
         else if (mode == "t-navi")
         {
-            zoom(x * (mFast ? SpeedMultiplier : 1));
+            zoom(-x * (mFast ? SpeedMultiplier : 1));
         }
         else
         {
@@ -392,8 +393,6 @@ namespace CSVRender
 
         mCenterNode->setPosition(mCenter);
 
-        lookAtCenter();
-
         // Normalize the matrix to counter drift
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
 
@@ -412,6 +411,8 @@ namespace CSVRender
         osg::Vec3d eye, up;
         getCamera()->getViewMatrixAsLookAt(eye, mCenter, up, DefaultStartDistance);
 
+        mDistance = DefaultStartDistance;
+
         mInitialized = true;
     }
 
@@ -430,26 +431,27 @@ namespace CSVRender
 
     void OrbitCameraController::rotateHorizontal(double value)
     {
-        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
-        osg::Vec3d offset = position - mCenter;
-        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
 
-        osg::Quat offsetRotation = osg::Quat(value, LocalUp);
-        osg::Vec3d newOffset = (rotation * offsetRotation) * (rotation.inverse() * offset);
+        osg::Quat rotation = osg::Quat(value, up);
+        osg::Vec3d oldOffset = eye - mCenter;
+        osg::Vec3d newOffset = rotation * oldOffset;
 
-        getCamera()->getViewMatrix().setTrans(mCenter + newOffset);
+        getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
     }
 
     void OrbitCameraController::rotateVertical(double value)
     {
-        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
-        osg::Vec3d offset = position - mCenter;
-        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
 
-        osg::Quat offsetRotation = osg::Quat(value, LocalLeft);
-        osg::Vec3d newOffset = (rotation * offsetRotation) * (rotation.inverse() * offset);
+        osg::Vec3d forward = center - eye;
+        osg::Quat rotation = osg::Quat(value, up ^ forward);
+        osg::Vec3d oldOffset = eye - mCenter;
+        osg::Vec3d newOffset = rotation * oldOffset;
 
-        getCamera()->getViewMatrix().setTrans(mCenter + newOffset);
+        getCamera()->setViewMatrixAsLookAt(mCenter + newOffset, mCenter, up);
     }
 
     void OrbitCameraController::roll(double value)
@@ -465,24 +467,13 @@ namespace CSVRender
 
     void OrbitCameraController::zoom(double value)
     {
-        osg::Vec3d dir = mCenter - getCamera()->getViewMatrix().getTrans();
-        double distance = dir.normalize();
+        mDistance = std::max(10., mDistance + value);
 
-        if (distance > 1 || value < 0)
-        {
-            getCamera()->getViewMatrix() *= osg::Matrixd::translate(dir * value);
-        }
-    }
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up, 1.f);
 
-    void OrbitCameraController::lookAtCenter()
-    {
-        osg::Vec3d position = getCamera()->getViewMatrix().getTrans();
-        osg::Vec3d offset = mCenter - position;
-        osg::Quat rotation = getCamera()->getViewMatrix().getRotate();
+        osg::Vec3d offset = (eye - center) * mDistance;
 
-        osg::Quat newRotation;
-        newRotation.makeRotate(LocalForward, offset);
-
-        getCamera()->getViewMatrix().setRotate(newRotation);
+        getCamera()->setViewMatrixAsLookAt(mCenter + offset, mCenter, up);
     }
 }
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 6c89d20f74..78afe2320a 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -119,11 +119,10 @@ namespace CSVRender
             void translate(const osg::Vec3d& offset);
             void zoom(double value);
 
-            void lookAtCenter();
-
             bool mInitialized;
             bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
             osg::Vec3d mCenter;
+            double mDistance;
 
             osg::ref_ptr<osg::PositionAttitudeTransform> mCenterNode;
     };

From b332704df730af3e3940694dbc8c10a655314c9e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 19 Mar 2016 18:03:59 +0100
Subject: [PATCH 478/765] Switch hand-to-hand attack types randomly when
 "always use best attack" is turned on (Fixes #3259)

---
 apps/openmw/mwmechanics/character.cpp | 28 +++++++++++++++++++++------
 apps/openmw/mwmechanics/character.hpp |  3 ++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 0035ebb1ab..30a4ec9f79 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1281,14 +1281,19 @@ bool CharacterController::updateWeaponState()
                     mAttackType = "shoot";
                 else
                 {
-                    if(isWeapon && mPtr == getPlayer() &&
-                            Settings::Manager::getBool("best attack", "Game"))
+                    if (isWeapon)
                     {
-                        MWWorld::ContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
-                        mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
+                        if(mPtr == getPlayer() &&
+                                Settings::Manager::getBool("best attack", "Game"))
+                        {
+                            MWWorld::ContainerStoreIterator weapon = mPtr.getClass().getInventoryStore(mPtr).getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                            mAttackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
+                        }
+                        else
+                            setAttackTypeBasedOnMovement();
                     }
                     else
-                        determineAttackType();
+                        setAttackTypeRandomly();
                 }
 
                 mAnimation->play(mCurrentWeapon, priorityWeapon,
@@ -2061,7 +2066,18 @@ void CharacterController::updateMagicEffects()
     mAnimation->setLightEffect(light);
 }
 
-void CharacterController::determineAttackType()
+void CharacterController::setAttackTypeRandomly()
+{
+    float random = Misc::Rng::rollProbability();
+    if (random >= 2/3.f)
+        mAttackType = "thrust";
+    else if (random >= 1/3.f)
+        mAttackType = "slash";
+    else
+        mAttackType = "chop";
+}
+
+void CharacterController::setAttackTypeBasedOnMovement()
 {
     float *move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
 
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 6db661ca54..6fab04d64c 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -189,7 +189,8 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     bool mAttackingOrSpell;
 
-    void determineAttackType();
+    void setAttackTypeBasedOnMovement();
+    void setAttackTypeRandomly();
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
 

From 90cc1de46caceb488f0d79ce2adc18a15b68bb65 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 21 Mar 2016 11:46:25 +0100
Subject: [PATCH 479/765] Do not list custom made classes in the pick class
 dialog

---
 apps/openmw/mwgui/class.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 57cd9ca8eb..51d5e45fb4 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -199,6 +199,9 @@ namespace MWGui
             if (!playable) // Only display playable classes
                 continue;
 
+            if (store.get<ESM::Class>().isDynamic(it->mId))
+                continue; // custom-made class not relevant for this dialog
+
             items.push_back(std::make_pair(it->mId, it->mName));
         }
         std::sort(items.begin(), items.end(), sortClasses);

From e38195710525b37c0e6c5eeca41264bdda0ac46f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 21 Mar 2016 11:51:34 +0100
Subject: [PATCH 480/765] Don't assume that class ID and name are equal

---
 apps/openmw/mwgui/charactercreation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 8c2ec68813..a880bca45d 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -177,7 +177,7 @@ namespace MWGui
                     mPickClassDialog = 0;
                     mPickClassDialog = new PickClassDialog();
                     mPickClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
-                    mPickClassDialog->setClassId(mPlayerClass.mName);
+                    mPickClassDialog->setClassId(mPlayerClass.mId);
                     mPickClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogDone);
                     mPickClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onPickClassDialogBack);
                     mPickClassDialog->setVisible(true);

From 157c11398d3ad153f2dd17d5002e0ee67210405d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 21:00:31 +0100
Subject: [PATCH 481/765] Add terrain parallax mapping

---
 apps/openmw/mwrender/renderingmanager.cpp |  4 +-
 apps/openmw/mwrender/terrainstorage.cpp   |  4 +-
 apps/openmw/mwrender/terrainstorage.hpp   |  2 +-
 components/esmterrain/storage.cpp         | 29 +++++++------
 components/esmterrain/storage.hpp         |  3 +-
 components/resource/scenemanager.cpp      |  5 +++
 components/resource/scenemanager.hpp      |  4 ++
 components/terrain/defs.hpp               |  2 +-
 components/terrain/material.cpp           |  1 +
 components/terrain/material.hpp           |  1 +
 components/terrain/terraingrid.cpp        |  1 +
 files/settings-default.cfg                |  4 ++
 files/shaders/terrain_fragment.glsl       | 52 +++++++++++++++--------
 files/shaders/terrain_vertex.glsl         |  6 +--
 14 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 57f784b2c0..52a0b2c617 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -174,6 +174,7 @@ namespace MWRender
         resourceSystem->getSceneManager()->setForcePerPixelLighting(Settings::Manager::getBool("force per pixel lighting", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseNormalMaps(Settings::Manager::getBool("auto use object normal maps", "Shaders"));
         resourceSystem->getSceneManager()->setNormalMapPattern(Settings::Manager::getString("normal map pattern", "Shaders"));
+        resourceSystem->getSceneManager()->setNormalHeightMapPattern(Settings::Manager::getString("normal height map pattern", "Shaders"));
         resourceSystem->getSceneManager()->setAutoUseSpecularMaps(Settings::Manager::getBool("auto use object specular maps", "Shaders"));
         resourceSystem->getSceneManager()->setSpecularMapPattern(Settings::Manager::getString("specular map pattern", "Shaders"));
 
@@ -197,7 +198,8 @@ namespace MWRender
         mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
         mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(),
-                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain normal maps", "Shaders"),
+                                                new TerrainStorage(mResourceSystem->getVFS(), Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getString("normal height map pattern", "Shaders"),
+                                                                   Settings::Manager::getBool("auto use terrain normal maps", "Shaders"),
                                                      Settings::Manager::getString("terrain specular map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain specular maps", "Shaders")),
                                                  Mask_Terrain, &mResourceSystem->getSceneManager()->getShaderManager(), mUnrefQueue.get()));
 
diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp
index cc1c3a0bc8..98386690b9 100644
--- a/apps/openmw/mwrender/terrainstorage.cpp
+++ b/apps/openmw/mwrender/terrainstorage.cpp
@@ -9,8 +9,8 @@
 namespace MWRender
 {
 
-    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
-        : ESMTerrain::Storage(vfs, normalMapPattern, autoUseNormalMaps, specularMapPattern, autoUseSpecularMaps)
+    TerrainStorage::TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
+        : ESMTerrain::Storage(vfs, normalMapPattern, normalHeightMapPattern, autoUseNormalMaps, specularMapPattern, autoUseSpecularMaps)
     {
     }
 
diff --git a/apps/openmw/mwrender/terrainstorage.hpp b/apps/openmw/mwrender/terrainstorage.hpp
index 759c7dfcfb..6fa8b98ce1 100644
--- a/apps/openmw/mwrender/terrainstorage.hpp
+++ b/apps/openmw/mwrender/terrainstorage.hpp
@@ -14,7 +14,7 @@ namespace MWRender
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin);
     public:
 
-        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        TerrainStorage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", const std::string& normalHeightMapPatteern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Get bounds of the whole terrain in cell units
         virtual void getBounds(float& minX, float& maxX, float& minY, float& maxY);
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 86d1e08e64..8a592bfc8c 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -18,9 +18,10 @@ namespace ESMTerrain
 
     const float defaultHeight = ESM::Land::DEFAULT_HEIGHT;
 
-    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
+    Storage::Storage(const VFS::Manager *vfs, const std::string& normalMapPattern, const std::string& normalHeightMapPattern, bool autoUseNormalMaps, const std::string& specularMapPattern, bool autoUseSpecularMaps)
         : mVFS(vfs)
         , mNormalMapPattern(normalMapPattern)
+        , mNormalHeightMapPattern(normalHeightMapPattern)
         , mAutoUseNormalMaps(autoUseNormalMaps)
         , mSpecularMapPattern(specularMapPattern)
         , mAutoUseSpecularMaps(autoUseSpecularMaps)
@@ -512,26 +513,26 @@ namespace ESMTerrain
             return found->second;
 
         Terrain::LayerInfo info;
-        //info.mParallax = false;
+        info.mParallax = false;
         info.mSpecular = false;
         info.mDiffuseMap = texture;
 
-        /*
-        std::string texture_ = texture;
-        boost::replace_last(texture_, ".", "_nh.");
-
-        if (mVFS->exists(texture_))
-        {
-            info.mNormalMap = texture_;
-            info.mParallax = true;
-        }
-        */
         if (mAutoUseNormalMaps)
         {
             std::string texture_ = texture;
-            boost::replace_last(texture_, ".", mNormalMapPattern + ".");
+            boost::replace_last(texture_, ".", mNormalHeightMapPattern + ".");
             if (mVFS->exists(texture_))
+            {
                 info.mNormalMap = texture_;
+                info.mParallax = true;
+            }
+            else
+            {
+                texture_ = texture;
+                boost::replace_last(texture_, ".", mNormalMapPattern + ".");
+                if (mVFS->exists(texture_))
+                    info.mNormalMap = texture_;
+            }
         }
 
         if (mAutoUseSpecularMaps)
@@ -554,7 +555,7 @@ namespace ESMTerrain
     {
         Terrain::LayerInfo info;
         info.mDiffuseMap = "textures\\_land_default.dds";
-        //info.mParallax = false;
+        info.mParallax = false;
         info.mSpecular = false;
         return info;
     }
diff --git a/components/esmterrain/storage.hpp b/components/esmterrain/storage.hpp
index 7b8b844fff..092998b2e7 100644
--- a/components/esmterrain/storage.hpp
+++ b/components/esmterrain/storage.hpp
@@ -27,7 +27,7 @@ namespace ESMTerrain
         virtual const ESM::LandTexture* getLandTexture(int index, short plugin) = 0;
 
     public:
-        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
+        Storage(const VFS::Manager* vfs, const std::string& normalMapPattern = "", const std::string& normalHeightMapPattern = "", bool autoUseNormalMaps = false, const std::string& specularMapPattern = "", bool autoUseSpecularMaps = false);
 
         /// Data is loaded first, if necessary. Will return a 0-pointer if there is no data for
         /// any of the data types specified via \a flags. Will also return a 0-pointer if there
@@ -110,6 +110,7 @@ namespace ESMTerrain
         OpenThreads::Mutex mLayerInfoMutex;
 
         std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
         bool mAutoUseNormalMaps;
 
         std::string mSpecularMapPattern;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 7bbf08f3a4..7078af8d05 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -241,6 +241,11 @@ namespace Resource
         mNormalMapPattern = pattern;
     }
 
+    void SceneManager::setNormalHeightMapPattern(const std::string &pattern)
+    {
+        mNormalHeightMapPattern = pattern;
+    }
+
     void SceneManager::setAutoUseSpecularMaps(bool use)
     {
         mAutoUseSpecularMaps = use;
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
index 00eb68e76d..a2107fc4ac 100644
--- a/components/resource/scenemanager.hpp
+++ b/components/resource/scenemanager.hpp
@@ -63,6 +63,9 @@ namespace Resource
         /// @see ShaderVisitor::setNormalMapPattern
         void setNormalMapPattern(const std::string& pattern);
 
+        /// @see ShaderVisitor::setNormalHeightMapPattern
+        void setNormalHeightMapPattern(const std::string& pattern);
+
         void setAutoUseSpecularMaps(bool use);
 
         void setSpecularMapPattern(const std::string& pattern);
@@ -138,6 +141,7 @@ namespace Resource
         bool mForcePerPixelLighting;
         bool mAutoUseNormalMaps;
         std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
         bool mAutoUseSpecularMaps;
         std::string mSpecularMapPattern;
 
diff --git a/components/terrain/defs.hpp b/components/terrain/defs.hpp
index 10095bec0b..c2342c50d2 100644
--- a/components/terrain/defs.hpp
+++ b/components/terrain/defs.hpp
@@ -18,7 +18,7 @@ namespace Terrain
     {
         std::string mDiffuseMap;
         std::string mNormalMap;
-        //bool mParallax; // Height info in normal map alpha channel?
+        bool mParallax; // Height info in normal map alpha channel?
         bool mSpecular; // Specular info in diffuse map alpha channel?
 
         bool requiresShaders() const { return !mNormalMap.empty() || mSpecular; }
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 1b6cd5d44f..fa87c53ec0 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -157,6 +157,7 @@ namespace Terrain
             defineMap["blendMap"] = !firstLayer ? "1" : "0";
             defineMap["colorMode"] = "2";
             defineMap["specularMap"] = it->mSpecular ? "1" : "0";
+            defineMap["parallax"] = (it->mNormalMap && it->mParallax) ? "1" : "0";
 
             osg::ref_ptr<osg::Shader> vertexShader = shaderManager.getShader("terrain_vertex.glsl", defineMap, osg::Shader::VERTEX);
             osg::ref_ptr<osg::Shader> fragmentShader = shaderManager.getShader("terrain_fragment.glsl", defineMap, osg::Shader::FRAGMENT);
diff --git a/components/terrain/material.hpp b/components/terrain/material.hpp
index 61d5724d7b..c13b21e8fc 100644
--- a/components/terrain/material.hpp
+++ b/components/terrain/material.hpp
@@ -23,6 +23,7 @@ namespace Terrain
     {
         osg::ref_ptr<osg::Texture2D> mDiffuseMap;
         osg::ref_ptr<osg::Texture2D> mNormalMap; // optional
+        bool mParallax;
         bool mSpecular;
     };
 
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index c717a94f6c..231634e1ea 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -160,6 +160,7 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
             for (std::vector<LayerInfo>::const_iterator it = layerList.begin(); it != layerList.end(); ++it)
             {
                 TextureLayer textureLayer;
+                textureLayer.mParallax = it->mParallax;
                 textureLayer.mSpecular = it->mSpecular;
                 osg::ref_ptr<osg::Texture2D> texture = mTextureCache[it->mDiffuseMap];
                 if (!texture)
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c886cee702..ef3d95b3da 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -200,6 +200,10 @@ auto use terrain specular maps = false
 # The filename pattern to probe for when detecting normal maps (see 'auto use object normal maps', 'auto use terrain normal maps')
 normal map pattern = _n
 
+# Alternative filename pattern to probe for when detecting normal maps. Files with this pattern are expected to include 'height' in the alpha channel.
+# This height is used for parallax effects. Works for both terrain and objects.
+normal height map pattern = _nh
+
 # The filename pattern to probe for when detecting object specular maps (see 'auto use object specular maps')
 specular map pattern = _spec
 
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index db43cbd3ee..e1b519932c 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -22,15 +22,47 @@ varying vec4 lighting;
 varying vec4 passColor;
 #endif
 varying vec3 passViewPos;
-varying vec3 passViewNormal;
+varying vec3 passNormal;
+
+#if @parallax
+#define PARALLAX_SCALE 0.04
+#define PARALLAX_BIAS -0.02
+uniform mat4 osg_ViewMatrixInverse;
+#endif
 
 #include "lighting.glsl"
 
 void main()
 {
-    vec2 diffuseMapUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
+    vec2 adjustedUV = (gl_TextureMatrix[0] * vec4(uv, 0.0, 1.0)).xy;
 
-    vec4 diffuseTex = texture2D(diffuseMap, diffuseMapUV);
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, adjustedUV);
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 tangent = vec3(1.0, 0.0, 0.0);
+    vec3 binormal = normalize(cross(tangent, normalizedNormal));
+    tangent = normalize(cross(normalizedNormal, binormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
+    mat3 tbn = mat3(tangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = normalize(gl_NormalMatrix * (tbn * (normalTex.xyz * 2.0 - 1.0)));
+#else
+    vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
+#endif
+
+#if @parallax
+    vec3 cameraPos = osg_ViewMatrixInverse[3].xyz;
+    vec3 eyeDir = normalize(cameraPos - (osg_ViewMatrixInverse * vec4(passViewPos, 1)).xyz);
+    vec3 TSeyeDir = normalize((vec4(normalize(tbn * eyeDir),0)).xyz);
+
+    adjustedUV += TSeyeDir.xy * ( normalTex.a * PARALLAX_SCALE + PARALLAX_BIAS );
+
+    // update normal using new coordinates
+    normalTex = texture2D(normalMap, adjustedUV);
+    viewNormal = normalize(gl_NormalMatrix * (tbn * (normalTex.xyz * 2.0 - 1.0)));
+#endif
+
+    vec4 diffuseTex = texture2D(diffuseMap, adjustedUV);
     gl_FragData[0] = vec4(diffuseTex.xyz, 1.0);
 
 #if @blendMap
@@ -38,20 +70,6 @@ void main()
     gl_FragData[0].a *= texture2D(blendMap, blendMapUV).a;
 #endif
 
-    vec3 viewNormal = passViewNormal;
-
-#if @normalMap
-    vec3 normalTex = texture2D(normalMap, diffuseMapUV).xyz;
-
-    vec3 viewTangent = (gl_ModelViewMatrix * vec4(1.0, 0.0, 0.0, 0.0)).xyz;
-    vec3 viewBinormal = normalize(cross(viewTangent, viewNormal));
-    viewTangent = normalize(cross(viewNormal, viewBinormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
-    mat3 tbn = mat3(viewTangent, viewBinormal, viewNormal);
-
-    viewNormal = normalize(tbn * (normalTex * 2.0 - 1.0));
-#endif
-
-
 #if !PER_PIXEL_LIGHTING
     gl_FragData[0] *= lighting;
 #else
diff --git a/files/shaders/terrain_vertex.glsl b/files/shaders/terrain_vertex.glsl
index 46071d7f01..e2a180153a 100644
--- a/files/shaders/terrain_vertex.glsl
+++ b/files/shaders/terrain_vertex.glsl
@@ -11,7 +11,7 @@ varying vec4 lighting;
 varying vec4 passColor;
 #endif
 varying vec3 passViewPos;
-varying vec3 passViewNormal;
+varying vec3 passNormal;
 
 #include "lighting.glsl"
 
@@ -22,14 +22,14 @@ void main(void)
 
     vec4 viewPos = (gl_ModelViewMatrix * gl_Vertex);
     gl_ClipVertex = viewPos;
-    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
 
 #if !PER_PIXEL_LIGHTING
+    vec3 viewNormal = normalize((gl_NormalMatrix * gl_Normal).xyz);
     lighting = doLighting(viewPos.xyz, viewNormal, gl_Color);
 #else
     passColor = gl_Color;
 #endif
-    passViewNormal = viewNormal;
+    passNormal = gl_Normal.xyz;
     passViewPos = viewPos.xyz;
 
     uv = gl_MultiTexCoord0.xy;

From b4dda045a6723f50dc3bf73a11def7ec94c6f30f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 21:12:16 +0100
Subject: [PATCH 482/765] Pass the tangent in object space

---
 files/shaders/objects_fragment.glsl | 16 +++++++++-------
 files/shaders/objects_vertex.glsl   |  8 ++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 2304d9aded..877e881f63 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -28,7 +28,7 @@ varying vec2 emissiveMapUV;
 #if @normalMap
 uniform sampler2D normalMap;
 varying vec2 normalMapUV;
-varying vec3 viewTangent;
+varying vec3 passTangent;
 #endif
 
 #if @envMap
@@ -52,7 +52,7 @@ varying vec4 lighting;
 varying vec4 passColor;
 #endif
 varying vec3 passViewPos;
-varying vec3 passViewNormal;
+varying vec3 passNormal;
 
 #include "lighting.glsl"
 
@@ -77,15 +77,17 @@ void main()
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
 #endif
 
-    vec3 viewNormal = passViewNormal;
-
 #if @normalMap
     vec3 normalTex = texture2D(normalMap, normalMapUV).xyz;
 
-    vec3 viewBinormal = cross(viewTangent, viewNormal);
-    mat3 tbn = mat3(viewTangent, viewBinormal, viewNormal);
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedTangent = normalize(passTangent);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal);
+    mat3 tbn = mat3(normalizedTangent, binormal, normalizedNormal);
 
-    viewNormal = normalize(tbn * (normalTex * 2.0 - 1.0));
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex * 2.0 - 1.0));
+#else
+    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
 #endif
 
 
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index b65e496663..9aabbe6969 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -22,7 +22,7 @@ varying vec2 emissiveMapUV;
 
 #if @normalMap
 varying vec2 normalMapUV;
-varying vec3 viewTangent;
+varying vec3 passTangent;
 #endif
 
 #if @envMap
@@ -43,7 +43,7 @@ varying vec4 lighting;
 varying vec4 passColor;
 #endif
 varying vec3 passViewPos;
-varying vec3 passViewNormal;
+varying vec3 passNormal;
 
 #include "lighting.glsl"
 
@@ -85,7 +85,7 @@ void main(void)
 
 #if @normalMap
     normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
-    viewTangent = normalize(gl_NormalMatrix * gl_MultiTexCoord7.xyz);
+    passTangent = gl_MultiTexCoord7.xyz;
 #endif
 
 #if @specularMap
@@ -98,5 +98,5 @@ void main(void)
     passColor = gl_Color;
 #endif
     passViewPos = viewPos.xyz;
-    passViewNormal = viewNormal;
+    passNormal = gl_Normal.xyz;
 }

From b59b2c6d6d46729325616a7f7e6047da535107a9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 21:15:20 +0100
Subject: [PATCH 483/765] Move to parallax.glsl

---
 files/shaders/CMakeLists.txt        | 1 +
 files/shaders/parallax.glsl         | 8 ++++++++
 files/shaders/terrain_fragment.glsl | 7 ++-----
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 files/shaders/parallax.glsl

diff --git a/files/shaders/CMakeLists.txt b/files/shaders/CMakeLists.txt
index 31db4a3eb8..0738b5783c 100644
--- a/files/shaders/CMakeLists.txt
+++ b/files/shaders/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SHADER_FILES
     terrain_vertex.glsl
     terrain_fragment.glsl
     lighting.glsl
+    parallax.glsl
 )
 
 copy_all_files(${CMAKE_CURRENT_SOURCE_DIR} ${DDIR} "${SHADER_FILES}")
diff --git a/files/shaders/parallax.glsl b/files/shaders/parallax.glsl
new file mode 100644
index 0000000000..52ea0d2cca
--- /dev/null
+++ b/files/shaders/parallax.glsl
@@ -0,0 +1,8 @@
+#define PARALLAX_SCALE 0.04
+#define PARALLAX_BIAS -0.02
+
+vec2 getParallaxOffset(vec3 eyeDir, mat3 tbn, float height)
+{
+    vec3 TSeyeDir = normalize((vec4(normalize(tbn * eyeDir),0)).xyz);
+    return TSeyeDir.xy * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
+}
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index e1b519932c..14f00a2e14 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -25,12 +25,11 @@ varying vec3 passViewPos;
 varying vec3 passNormal;
 
 #if @parallax
-#define PARALLAX_SCALE 0.04
-#define PARALLAX_BIAS -0.02
 uniform mat4 osg_ViewMatrixInverse;
 #endif
 
 #include "lighting.glsl"
+#include "parallax.glsl"
 
 void main()
 {
@@ -53,9 +52,7 @@ void main()
 #if @parallax
     vec3 cameraPos = osg_ViewMatrixInverse[3].xyz;
     vec3 eyeDir = normalize(cameraPos - (osg_ViewMatrixInverse * vec4(passViewPos, 1)).xyz);
-    vec3 TSeyeDir = normalize((vec4(normalize(tbn * eyeDir),0)).xyz);
-
-    adjustedUV += TSeyeDir.xy * ( normalTex.a * PARALLAX_SCALE + PARALLAX_BIAS );
+    adjustedUV += getParallaxOffset(eyeDir, tbn, normalTex.a);
 
     // update normal using new coordinates
     normalTex = texture2D(normalMap, adjustedUV);

From df6fd5f206a4e29c005101ba10b8e35a2d5f77ec Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 21:22:59 +0100
Subject: [PATCH 484/765] Recognize normalHeightMap in the ShaderVisitor

---
 components/shader/shadervisitor.cpp | 36 +++++++++++++++++++++++++----
 components/shader/shadervisitor.hpp |  3 +++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index 92bdac7b75..a05988f61d 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -25,6 +25,7 @@ namespace Shader
         , mColorMaterial(false)
         , mVertexColorMode(GL_AMBIENT_AND_DIFFUSE)
         , mMaterialOverridden(false)
+        , mNormalHeight(false)
         , mTexStageRequiringTangents(-1)
     {
     }
@@ -120,6 +121,12 @@ namespace Shader
                         if ((texName.empty() || !isTextureNameRecognized(texName)) && unit == 0)
                             texName = "diffuseMap";
 
+                        if (texName == "normalHeightMap")
+                        {
+                            mRequirements.back().mNormalHeight = true;
+                            texName = "normalMap";
+                        }
+
                         if (!texName.empty())
                         {
                             mRequirements.back().mTextures[unit] = texName;
@@ -133,9 +140,9 @@ namespace Shader
                                 writableStateSet->setTextureMode(unit, GL_TEXTURE_2D, osg::StateAttribute::ON);
                                 normalMap = texture;
                             }
-                            if (texName == "diffuseMap")
+                            else if (texName == "diffuseMap")
                                 diffuseMap = texture;
-                            if (texName == "specularMap")
+                            else if (texName == "specularMap")
                                 specularMap = texture;
                         }
                         else
@@ -147,10 +154,28 @@ namespace Shader
             if (mAutoUseNormalMaps && diffuseMap != NULL && normalMap == NULL)
             {
                 std::string normalMap = diffuseMap->getImage(0)->getFileName();
-                boost::replace_last(normalMap, ".", mNormalMapPattern + ".");
-                if (mImageManager.getVFS()->exists(normalMap))
+
+                osg::ref_ptr<osg::Image> image;
+                bool normalHeight = false;
+                std::string normalHeightMap = normalMap;
+                boost::replace_last(normalHeightMap, ".", mNormalHeightMapPattern + ".");
+                if (mImageManager.getVFS()->exists(normalHeightMap))
                 {
-                    osg::ref_ptr<osg::Texture2D> normalMapTex (new osg::Texture2D(mImageManager.getImage(normalMap)));
+                    image = mImageManager.getImage(normalHeightMap);
+                    normalHeight = true;
+                }
+                else
+                {
+                    boost::replace_last(normalMap, ".", mNormalMapPattern + ".");
+                    if (mImageManager.getVFS()->exists(normalMap))
+                    {
+                        image = mImageManager.getImage(normalMap);
+                    }
+                }
+
+                if (image)
+                {
+                    osg::ref_ptr<osg::Texture2D> normalMapTex (new osg::Texture2D(image));
                     normalMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
                     normalMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
                     normalMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));
@@ -165,6 +190,7 @@ namespace Shader
                     mRequirements.back().mTextures[unit] = "normalMap";
                     mRequirements.back().mTexStageRequiringTangents = unit;
                     mRequirements.back().mShaderRequired = true;
+                    mRequirements.back().mNormalHeight = normalHeight;
                 }
             }
             if (mAutoUseSpecularMaps && diffuseMap != NULL && specularMap == NULL)
diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp
index 682a9c60fb..8f4597ff36 100644
--- a/components/shader/shadervisitor.hpp
+++ b/components/shader/shadervisitor.hpp
@@ -39,6 +39,7 @@ namespace Shader
         void setAutoUseNormalMaps(bool use);
 
         void setNormalMapPattern(const std::string& pattern);
+        void setNormalHeightMapPattern(const std::string& pattern);
 
         void setAutoUseSpecularMaps(bool use);
 
@@ -62,6 +63,7 @@ namespace Shader
 
         bool mAutoUseNormalMaps;
         std::string mNormalMapPattern;
+        std::string mNormalHeightMapPattern;
 
         bool mAutoUseSpecularMaps;
         std::string mSpecularMapPattern;
@@ -83,6 +85,7 @@ namespace Shader
             // osg::Material::ColorMode
             int mVertexColorMode;
             bool mMaterialOverridden;
+            bool mNormalHeight; // true if normal map has height info in alpha channel
 
             // -1 == no tangents required
             int mTexStageRequiringTangents;

From 6f31b3d79f77f6b5a4d4606e5c33aaf4e0d3afd8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 21:43:07 +0100
Subject: [PATCH 485/765] Add parallax mapping for objects

---
 components/resource/scenemanager.cpp |  1 +
 components/shader/shadervisitor.cpp  |  7 ++++
 files/shaders/objects_fragment.glsl  | 50 +++++++++++++++++++---------
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index 7078af8d05..e4fc459ac4 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -385,6 +385,7 @@ namespace Resource
             shaderVisitor.setForcePerPixelLighting(mForcePerPixelLighting);
             shaderVisitor.setAutoUseNormalMaps(mAutoUseNormalMaps);
             shaderVisitor.setNormalMapPattern(mNormalMapPattern);
+            shaderVisitor.setNormalHeightMapPattern(mNormalHeightMapPattern);
             shaderVisitor.setAutoUseSpecularMaps(mAutoUseSpecularMaps);
             shaderVisitor.setSpecularMapPattern(mSpecularMapPattern);
             loaded->accept(shaderVisitor);
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index a05988f61d..ea9cb11ace 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -284,6 +284,8 @@ namespace Shader
         defineMap["forcePPL"] = mForcePerPixelLighting ? "1" : "0";
         defineMap["clamp"] = mClampLighting ? "1" : "0";
 
+        defineMap["parallax"] = reqs.mNormalHeight ? "1" : "0";
+
         osg::ref_ptr<osg::Shader> vertexShader (mShaderManager.getShader(mDefaultVsTemplate, defineMap, osg::Shader::VERTEX));
         osg::ref_ptr<osg::Shader> fragmentShader (mShaderManager.getShader(mDefaultFsTemplate, defineMap, osg::Shader::FRAGMENT));
 
@@ -376,6 +378,11 @@ namespace Shader
         mNormalMapPattern = pattern;
     }
 
+    void ShaderVisitor::setNormalHeightMapPattern(const std::string &pattern)
+    {
+        mNormalHeightMapPattern = pattern;
+    }
+
     void ShaderVisitor::setAutoUseSpecularMaps(bool use)
     {
         mAutoUseSpecularMaps = use;
diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 877e881f63..935479e44c 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -54,12 +54,46 @@ varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
+#if @parallax
+uniform mat4 osg_ViewMatrixInverse;
+#endif
+
 #include "lighting.glsl"
+#include "parallax.glsl"
 
 void main()
 {
+    vec2 adjustedDiffuseUV = diffuseMapUV;
+
+#if @normalMap
+    vec4 normalTex = texture2D(normalMap, normalMapUV);
+
+    vec3 normalizedNormal = normalize(passNormal);
+    vec3 normalizedTangent = normalize(passTangent);
+    vec3 binormal = cross(normalizedTangent, normalizedNormal);
+    mat3 tbn = mat3(normalizedTangent, binormal, normalizedNormal);
+
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex.xyz * 2.0 - 1.0));
+#else
+    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
+#endif
+
+#if @parallax
+    vec3 cameraPos = osg_ViewMatrixInverse[3].xyz;
+    vec3 eyeDir = normalize(cameraPos - (osg_ViewMatrixInverse * vec4(passViewPos, 1)).xyz);
+    vec2 offset = getParallaxOffset(eyeDir, tbn, normalTex.a);
+    adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
+
+#if @diffuseMapUV == @normalMapUV
+    // fetch a new normal using updated coordinates
+    normalTex = texture2D(normalMap, adjustedDiffuseUV);
+    viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex.xyz * 2.0 - 1.0));
+#endif
+
+#endif
+
 #if @diffuseMap
-    gl_FragData[0] = texture2D(diffuseMap, diffuseMapUV);
+    gl_FragData[0] = texture2D(diffuseMap, adjustedDiffuseUV);
 #else
     gl_FragData[0] = vec4(1.0, 1.0, 1.0, 1.0);
 #endif
@@ -77,20 +111,6 @@ void main()
     gl_FragData[0].xyz = mix(gl_FragData[0].xyz, decalTex.xyz, decalTex.a);
 #endif
 
-#if @normalMap
-    vec3 normalTex = texture2D(normalMap, normalMapUV).xyz;
-
-    vec3 normalizedNormal = normalize(passNormal);
-    vec3 normalizedTangent = normalize(passTangent);
-    vec3 binormal = cross(normalizedTangent, normalizedNormal);
-    mat3 tbn = mat3(normalizedTangent, binormal, normalizedNormal);
-
-    vec3 viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex * 2.0 - 1.0));
-#else
-    vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
-#endif
-
-
 #if !PER_PIXEL_LIGHTING
     gl_FragData[0] *= lighting;
 #else

From 7a347e34832419fb8283d59f6843939c2316e4ab Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 22:01:56 +0100
Subject: [PATCH 486/765] Store the RigGeometry's source vertices and normals
 directly

---
 components/sceneutil/riggeometry.cpp | 10 ++++++----
 components/sceneutil/riggeometry.hpp |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 410ab53005..edbb6371e5 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -82,12 +82,14 @@ RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
     , mLastFrameNumber(0)
     , mBoundsFirstFrame(true)
 {
-    setSourceGeometry(copy.mSourceGeometry);
+    mSourceVertices = copy.mSourceVertices;
+    mSourceNormals = copy.mSourceNormals;
 }
 
 void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
 {
-    mSourceGeometry = sourceGeometry;
+    mSourceVertices = static_cast<osg::Vec3Array*>(sourceGeometry->getVertexArray());
+    mSourceNormals = static_cast<osg::Vec3Array*>(sourceGeometry->getNormalArray());
 
     osg::Geometry& from = *sourceGeometry;
 
@@ -223,8 +225,8 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     mSkeleton->updateBoneMatrices(nv);
 
     // skinning
-    osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
-    osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
+    osg::Vec3Array* positionSrc = mSourceVertices;
+    osg::Vec3Array* normalSrc = mSourceNormals;
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 90d4c1156b..fb4b914a0a 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -41,6 +41,7 @@ namespace SceneUtil
 
         /// Initialize this geometry from the source geometry.
         /// @note The source geometry will not be modified.
+        /// @note The source geometry's normal and vertex arrays must be an osg::Vec3Array.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
         // Called automatically by our CullCallback
@@ -50,7 +51,8 @@ namespace SceneUtil
         void updateBounds(osg::NodeVisitor* nv);
 
     private:
-        osg::ref_ptr<osg::Geometry> mSourceGeometry;
+        osg::ref_ptr<osg::Vec3Array> mSourceVertices;
+        osg::ref_ptr<osg::Vec3Array> mSourceNormals;
         Skeleton* mSkeleton;
 
         osg::NodePath mSkelToGeomPath;

From 9cf963b75193d8962234b7375aead6eca7a72d11 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 22:13:41 +0100
Subject: [PATCH 487/765] Animate tangents in RigGeometry

---
 components/sceneutil/riggeometry.cpp | 19 +++++++++++++++++++
 components/sceneutil/riggeometry.hpp |  1 +
 2 files changed, 20 insertions(+)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index edbb6371e5..c1f5fda15b 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -84,12 +84,14 @@ RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
 {
     mSourceVertices = copy.mSourceVertices;
     mSourceNormals = copy.mSourceNormals;
+    mSourceTangents = copy.mSourceTangents;
 }
 
 void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
 {
     mSourceVertices = static_cast<osg::Vec3Array*>(sourceGeometry->getVertexArray());
     mSourceNormals = static_cast<osg::Vec3Array*>(sourceGeometry->getNormalArray());
+    mSourceTangents = static_cast<osg::Vec4Array*>(sourceGeometry->getTexCoordArray(7));
 
     osg::Geometry& from = *sourceGeometry;
 
@@ -227,9 +229,18 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     // skinning
     osg::Vec3Array* positionSrc = mSourceVertices;
     osg::Vec3Array* normalSrc = mSourceNormals;
+    osg::Vec4Array* tangentSrc = mSourceTangents;
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
+    osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(getTexCoordArray(7));
+
+    if (tangentDst && !tangentSrc)
+    {
+        // tangents may be set by the ShaderVisitor so may not have existed yet at the time the source geometry was set
+        tangentSrc = osg::clone(tangentDst, osg::CopyOp::DEEP_COPY_ALL);
+        mSourceTangents = tangentSrc;
+    }
 
     for (Bone2VertexMap::const_iterator it = mBone2VertexMap.begin(); it != mBone2VertexMap.end(); ++it)
     {
@@ -253,11 +264,19 @@ void RigGeometry::update(osg::NodeVisitor* nv)
             unsigned short vertex = *vertexIt;
             (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
             (*normalDst)[vertex] = osg::Matrix::transform3x3((*normalSrc)[vertex], resultMat);
+            if (tangentDst)
+            {
+                osg::Vec4f srcTangent = (*tangentSrc)[vertex];
+                osg::Vec3f transformedTangent = osg::Matrix::transform3x3(osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
+                (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
+            }
         }
     }
 
     positionDst->dirty();
     normalDst->dirty();
+    if (tangentDst)
+        tangentDst->dirty();
 }
 
 void RigGeometry::updateBounds(osg::NodeVisitor *nv)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index fb4b914a0a..b6d39a63a5 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -53,6 +53,7 @@ namespace SceneUtil
     private:
         osg::ref_ptr<osg::Vec3Array> mSourceVertices;
         osg::ref_ptr<osg::Vec3Array> mSourceNormals;
+        osg::ref_ptr<osg::Vec4Array> mSourceTangents;
         Skeleton* mSkeleton;
 
         osg::NodePath mSkelToGeomPath;

From 60c8c4fdda82eb2e84c3a4b70e5a67d3e9177766 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 23:28:52 +0100
Subject: [PATCH 488/765] Revert "Animate tangents in RigGeometry"

This reverts commit 9cf963b75193d8962234b7375aead6eca7a72d11.
---
 components/sceneutil/riggeometry.cpp | 19 -------------------
 components/sceneutil/riggeometry.hpp |  1 -
 2 files changed, 20 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index c1f5fda15b..edbb6371e5 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -84,14 +84,12 @@ RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
 {
     mSourceVertices = copy.mSourceVertices;
     mSourceNormals = copy.mSourceNormals;
-    mSourceTangents = copy.mSourceTangents;
 }
 
 void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
 {
     mSourceVertices = static_cast<osg::Vec3Array*>(sourceGeometry->getVertexArray());
     mSourceNormals = static_cast<osg::Vec3Array*>(sourceGeometry->getNormalArray());
-    mSourceTangents = static_cast<osg::Vec4Array*>(sourceGeometry->getTexCoordArray(7));
 
     osg::Geometry& from = *sourceGeometry;
 
@@ -229,18 +227,9 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     // skinning
     osg::Vec3Array* positionSrc = mSourceVertices;
     osg::Vec3Array* normalSrc = mSourceNormals;
-    osg::Vec4Array* tangentSrc = mSourceTangents;
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
-    osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(getTexCoordArray(7));
-
-    if (tangentDst && !tangentSrc)
-    {
-        // tangents may be set by the ShaderVisitor so may not have existed yet at the time the source geometry was set
-        tangentSrc = osg::clone(tangentDst, osg::CopyOp::DEEP_COPY_ALL);
-        mSourceTangents = tangentSrc;
-    }
 
     for (Bone2VertexMap::const_iterator it = mBone2VertexMap.begin(); it != mBone2VertexMap.end(); ++it)
     {
@@ -264,19 +253,11 @@ void RigGeometry::update(osg::NodeVisitor* nv)
             unsigned short vertex = *vertexIt;
             (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
             (*normalDst)[vertex] = osg::Matrix::transform3x3((*normalSrc)[vertex], resultMat);
-            if (tangentDst)
-            {
-                osg::Vec4f srcTangent = (*tangentSrc)[vertex];
-                osg::Vec3f transformedTangent = osg::Matrix::transform3x3(osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
-                (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
-            }
         }
     }
 
     positionDst->dirty();
     normalDst->dirty();
-    if (tangentDst)
-        tangentDst->dirty();
 }
 
 void RigGeometry::updateBounds(osg::NodeVisitor *nv)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index b6d39a63a5..fb4b914a0a 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -53,7 +53,6 @@ namespace SceneUtil
     private:
         osg::ref_ptr<osg::Vec3Array> mSourceVertices;
         osg::ref_ptr<osg::Vec3Array> mSourceNormals;
-        osg::ref_ptr<osg::Vec4Array> mSourceTangents;
         Skeleton* mSkeleton;
 
         osg::NodePath mSkelToGeomPath;

From c73ec7112392d9e61992f12878ca27b5207ac459 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 22 Mar 2016 23:28:57 +0100
Subject: [PATCH 489/765] Revert "Store the RigGeometry's source vertices and
 normals directly"

This reverts commit 7a347e34832419fb8283d59f6843939c2316e4ab.
---
 components/sceneutil/riggeometry.cpp | 10 ++++------
 components/sceneutil/riggeometry.hpp |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index edbb6371e5..410ab53005 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -82,14 +82,12 @@ RigGeometry::RigGeometry(const RigGeometry &copy, const osg::CopyOp &copyop)
     , mLastFrameNumber(0)
     , mBoundsFirstFrame(true)
 {
-    mSourceVertices = copy.mSourceVertices;
-    mSourceNormals = copy.mSourceNormals;
+    setSourceGeometry(copy.mSourceGeometry);
 }
 
 void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
 {
-    mSourceVertices = static_cast<osg::Vec3Array*>(sourceGeometry->getVertexArray());
-    mSourceNormals = static_cast<osg::Vec3Array*>(sourceGeometry->getNormalArray());
+    mSourceGeometry = sourceGeometry;
 
     osg::Geometry& from = *sourceGeometry;
 
@@ -225,8 +223,8 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     mSkeleton->updateBoneMatrices(nv);
 
     // skinning
-    osg::Vec3Array* positionSrc = mSourceVertices;
-    osg::Vec3Array* normalSrc = mSourceNormals;
+    osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
+    osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index fb4b914a0a..90d4c1156b 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -41,7 +41,6 @@ namespace SceneUtil
 
         /// Initialize this geometry from the source geometry.
         /// @note The source geometry will not be modified.
-        /// @note The source geometry's normal and vertex arrays must be an osg::Vec3Array.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
         // Called automatically by our CullCallback
@@ -51,8 +50,7 @@ namespace SceneUtil
         void updateBounds(osg::NodeVisitor* nv);
 
     private:
-        osg::ref_ptr<osg::Vec3Array> mSourceVertices;
-        osg::ref_ptr<osg::Vec3Array> mSourceNormals;
+        osg::ref_ptr<osg::Geometry> mSourceGeometry;
         Skeleton* mSkeleton;
 
         osg::NodePath mSkelToGeomPath;

From 95e80e7eff15508ae8125d578ec75c0bc399afe5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Mar 2016 00:10:22 +0100
Subject: [PATCH 490/765] RigGeometry: don't directly modify the primitive set
 list

This is to ensure that an element buffer object will be assigned to the primitive sets if necessary.
---
 components/sceneutil/riggeometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 410ab53005..87afce034c 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -95,7 +95,7 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
         setStateSet(from.getStateSet());
 
     // shallow copy primitive sets & vertex attributes that we will not modify
-    getPrimitiveSetList() = from.getPrimitiveSetList();
+    setPrimitiveSetList(from.getPrimitiveSetList());
     setColorArray(from.getColorArray());
     setSecondaryColorArray(from.getSecondaryColorArray());
     setFogCoordArray(from.getFogCoordArray());

From d1f6169889914c169d0a3fc19f589d43231a3cc7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Mar 2016 16:48:41 +0100
Subject: [PATCH 491/765] Add special handling of RigGeometry tangents in
 ShaderVisitor

---
 components/sceneutil/riggeometry.cpp | 30 ++++++++++++++++++++++++++++
 components/sceneutil/riggeometry.hpp |  2 ++
 components/shader/shadervisitor.cpp  | 17 ++++++++++++----
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 87afce034c..895ff7e34b 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -99,6 +99,13 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
     setColorArray(from.getColorArray());
     setSecondaryColorArray(from.getSecondaryColorArray());
     setFogCoordArray(from.getFogCoordArray());
+
+    // need to copy over texcoord list manually due to a missing null pointer check in setTexCoordArrayList(), this has been fixed in OSG 3.5
+    osg::Geometry::ArrayList& texCoordList = from.getTexCoordArrayList();
+    for (unsigned int i=0; i<texCoordList.size(); ++i)
+        if (texCoordList[i])
+            setTexCoordArray(i, texCoordList[i], osg::Array::BIND_PER_VERTEX);
+
     setTexCoordArrayList(from.getTexCoordArrayList());
     setVertexAttribArrayList(from.getVertexAttribArrayList());
 
@@ -120,6 +127,19 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
         normalArray->setVertexBufferObject(vbo);
         setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
     }
+
+    if (from.getTexCoordArray(7) && dynamic_cast<osg::Vec4Array*>(from.getTexCoordArray(7)))
+    {
+        // tangents
+        osg::ref_ptr<osg::Array> tangentArray = osg::clone(from.getTexCoordArray(7), osg::CopyOp::DEEP_COPY_ALL);
+        tangentArray->setVertexBufferObject(vbo);
+        setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
+    }
+}
+
+osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry()
+{
+    return mSourceGeometry;
 }
 
 bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv)
@@ -225,9 +245,11 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     // skinning
     osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
     osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
+    osg::Vec4Array* tangentSrc = static_cast<osg::Vec4Array*>(mSourceGeometry->getTexCoordArray(7));
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
+    osg::Vec4Array* tangentDst = static_cast<osg::Vec4Array*>(getTexCoordArray(7));
 
     for (Bone2VertexMap::const_iterator it = mBone2VertexMap.begin(); it != mBone2VertexMap.end(); ++it)
     {
@@ -251,11 +273,19 @@ void RigGeometry::update(osg::NodeVisitor* nv)
             unsigned short vertex = *vertexIt;
             (*positionDst)[vertex] = resultMat.preMult((*positionSrc)[vertex]);
             (*normalDst)[vertex] = osg::Matrix::transform3x3((*normalSrc)[vertex], resultMat);
+            if (tangentDst)
+            {
+                osg::Vec4f srcTangent = (*tangentSrc)[vertex];
+                osg::Vec3f transformedTangent = osg::Matrix::transform3x3(osg::Vec3f(srcTangent.x(), srcTangent.y(), srcTangent.z()), resultMat);
+                (*tangentDst)[vertex] = osg::Vec4f(transformedTangent, srcTangent.w());
+            }
         }
     }
 
     positionDst->dirty();
     normalDst->dirty();
+    if (tangentDst)
+        tangentDst->dirty();
 }
 
 void RigGeometry::updateBounds(osg::NodeVisitor *nv)
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 90d4c1156b..8ce7534029 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -43,6 +43,8 @@ namespace SceneUtil
         /// @note The source geometry will not be modified.
         void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
 
+        osg::ref_ptr<osg::Geometry> getSourceGeometry();
+
         // Called automatically by our CullCallback
         void update(osg::NodeVisitor* nv);
 
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index ea9cb11ace..dbba721c22 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -14,6 +14,7 @@
 
 #include <components/resource/imagemanager.hpp>
 #include <components/vfs/manager.hpp>
+#include <components/sceneutil/riggeometry.hpp>
 
 #include "shadermanager.hpp"
 
@@ -313,24 +314,32 @@ namespace Shader
         {
             const ShaderRequirements& reqs = mRequirements.back();
 
+            osg::ref_ptr<osg::Geometry> sourceGeometry = &geometry;
+            SceneUtil::RigGeometry* rig = dynamic_cast<SceneUtil::RigGeometry*>(&geometry);
+            if (rig)
+                sourceGeometry = rig->getSourceGeometry();
+
             if (mAllowedToModifyStateSets)
             {
                 // make sure that all UV sets are there
                 for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); ++it)
                 {
-                    if (geometry.getTexCoordArray(it->first) == NULL)
-                        geometry.setTexCoordArray(it->first, geometry.getTexCoordArray(0));
+                    if (sourceGeometry->getTexCoordArray(it->first) == NULL)
+                        sourceGeometry->setTexCoordArray(it->first, sourceGeometry->getTexCoordArray(0));
                 }
             }
 
             if (reqs.mTexStageRequiringTangents != -1 && mAllowedToModifyStateSets)
             {
                 osg::ref_ptr<osgUtil::TangentSpaceGenerator> generator (new osgUtil::TangentSpaceGenerator);
-                generator->generate(&geometry, reqs.mTexStageRequiringTangents);
+                generator->generate(sourceGeometry, reqs.mTexStageRequiringTangents);
 
-                geometry.setTexCoordArray(7, generator->getTangentArray(), osg::Array::BIND_PER_VERTEX);
+                sourceGeometry->setTexCoordArray(7, generator->getTangentArray(), osg::Array::BIND_PER_VERTEX);
             }
 
+            if (rig)
+                rig->setSourceGeometry(sourceGeometry);
+
             // TODO: find a better place for the stateset
             if (reqs.mShaderRequired || mForceShaders)
                 createProgram(reqs, geometry);

From cc0afe901fe1520414dd346a6a33c3fbde96b2d0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Mar 2016 17:02:47 +0100
Subject: [PATCH 492/765] Store a pointer to tangents array to avoid potential
 type casting issue

---
 components/sceneutil/riggeometry.cpp | 10 ++++++----
 components/sceneutil/riggeometry.hpp |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 895ff7e34b..a934b87455 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -128,13 +128,15 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
         setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
     }
 
-    if (from.getTexCoordArray(7) && dynamic_cast<osg::Vec4Array*>(from.getTexCoordArray(7)))
+    if (osg::Vec4Array* tangents = dynamic_cast<osg::Vec4Array*>(from.getTexCoordArray(7)))
     {
-        // tangents
-        osg::ref_ptr<osg::Array> tangentArray = osg::clone(from.getTexCoordArray(7), osg::CopyOp::DEEP_COPY_ALL);
+        mSourceTangents = tangents;
+        osg::ref_ptr<osg::Array> tangentArray = osg::clone(tangents, osg::CopyOp::DEEP_COPY_ALL);
         tangentArray->setVertexBufferObject(vbo);
         setTexCoordArray(7, tangentArray, osg::Array::BIND_PER_VERTEX);
     }
+    else
+        mSourceTangents = NULL;
 }
 
 osg::ref_ptr<osg::Geometry> RigGeometry::getSourceGeometry()
@@ -245,7 +247,7 @@ void RigGeometry::update(osg::NodeVisitor* nv)
     // skinning
     osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
     osg::Vec3Array* normalSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getNormalArray());
-    osg::Vec4Array* tangentSrc = static_cast<osg::Vec4Array*>(mSourceGeometry->getTexCoordArray(7));
+    osg::Vec4Array* tangentSrc = mSourceTangents;
 
     osg::Vec3Array* positionDst = static_cast<osg::Vec3Array*>(getVertexArray());
     osg::Vec3Array* normalDst = static_cast<osg::Vec3Array*>(getNormalArray());
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index 8ce7534029..fbd22427bd 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -53,6 +53,7 @@ namespace SceneUtil
 
     private:
         osg::ref_ptr<osg::Geometry> mSourceGeometry;
+        osg::ref_ptr<osg::Vec4Array> mSourceTangents;
         Skeleton* mSkeleton;
 
         osg::NodePath mSkelToGeomPath;

From 8052225460a42256dbf2975e4ae1fa6f8fcc1d80 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Mar 2016 22:56:04 +0100
Subject: [PATCH 493/765] Remove leftover call to setTexCoordArrayList

---
 components/sceneutil/riggeometry.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index a934b87455..4963018890 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -106,7 +106,6 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
         if (texCoordList[i])
             setTexCoordArray(i, texCoordList[i], osg::Array::BIND_PER_VERTEX);
 
-    setTexCoordArrayList(from.getTexCoordArrayList());
     setVertexAttribArrayList(from.getVertexAttribArrayList());
 
     // vertices and normals are modified every frame, so we need to deep copy them.

From 1774f6d9bf98d19715197b5ffd7faaa780254841 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 24 Mar 2016 11:12:05 +0100
Subject: [PATCH 494/765] moved ref num assingment from instance creation to
 save procedure

---
 apps/opencs/model/doc/savingstages.cpp      | 35 ++++++++++++----
 apps/opencs/model/tools/mergestages.cpp     |  1 +
 apps/opencs/model/world/ref.cpp             |  2 +-
 apps/opencs/model/world/ref.hpp             |  1 +
 apps/opencs/model/world/refcollection.cpp   |  1 +
 apps/opencs/view/render/instancemode.cpp    | 19 +--------
 apps/opencs/view/world/referencecreator.cpp | 45 ---------------------
 apps/opencs/view/world/referencecreator.hpp |  7 +---
 8 files changed, 34 insertions(+), 77 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index af9c380a31..775496a194 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -265,13 +265,29 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
     std::map<std::string, std::deque<int> >::const_iterator references =
         mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId));
 
-    if (cell.isModified() || 
+    if (cell.isModified() ||
         cell.mState == CSMWorld::RecordBase::State_Deleted ||
         references!=mState.getSubRecords().end())
     {
         CSMWorld::Cell cellRecord = cell.get();
         bool interior = cellRecord.mId.substr (0, 1)!="#";
 
+        // count new references and adjust RefNumCount accordingsly
+        int newRefNum = cellRecord.mRefNumCounter;
+
+        if (references!=mState.getSubRecords().end())
+        {
+            for (std::deque<int>::const_iterator iter (references->second.begin());
+                iter!=references->second.end(); ++iter)
+            {
+                const CSMWorld::Record<CSMWorld::CellRef>& ref =
+                    mDocument.getData().getReferences().getRecord (*iter);
+
+                if (ref.get().mNew)
+                    ++cellRecord.mRefNumCounter;
+            }
+        }
+
         // write cell data
         writer.startRecord (cellRecord.sRecordId);
 
@@ -309,11 +325,16 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                         stream << "#" << index.first << " " << index.second;
                     }
 
-                    // An empty mOriginalCell is meant to indicate that it is the same as
-                    // the current cell.  It is possible that a moved ref is moved again.
-                    if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
+                    if (refRecord.mNew)
+                    {
+                        refRecord.mRefNum.mIndex = newRefNum++;
+                    }
+                    else if ((refRecord.mOriginalCell.empty() ? refRecord.mCell : refRecord.mOriginalCell)
                             != stream.str() && !interior)
                     {
+                        // An empty mOriginalCell is meant to indicate that it is the same as
+                        // the current cell.  It is possible that a moved ref is moved again.
+
                         ESM::MovedCellRef moved;
                         moved.mRefNum = refRecord.mRefNum;
 
@@ -350,7 +371,7 @@ int CSMDoc::WritePathgridCollectionStage::setup()
 void CSMDoc::WritePathgridCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid = 
+    const CSMWorld::Record<CSMWorld::Pathgrid>& pathgrid =
         mDocument.getData().getPathgrids().getRecord (stage);
 
     if (pathgrid.isModified() || pathgrid.mState == CSMWorld::RecordBase::State_Deleted)
@@ -386,7 +407,7 @@ int CSMDoc::WriteLandCollectionStage::setup()
 void CSMDoc::WriteLandCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::Land>& land = 
+    const CSMWorld::Record<CSMWorld::Land>& land =
         mDocument.getData().getLand().getRecord (stage);
 
     if (land.isModified() || land.mState == CSMWorld::RecordBase::State_Deleted)
@@ -412,7 +433,7 @@ int CSMDoc::WriteLandTextureCollectionStage::setup()
 void CSMDoc::WriteLandTextureCollectionStage::perform (int stage, Messages& messages)
 {
     ESM::ESMWriter& writer = mState.getWriter();
-    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture = 
+    const CSMWorld::Record<CSMWorld::LandTexture>& landTexture =
         mDocument.getData().getLandTextures().getRecord (stage);
 
     if (landTexture.isModified() || landTexture.mState == CSMWorld::RecordBase::State_Deleted)
diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
index f52e8886f0..4d4835ecea 100644
--- a/apps/opencs/model/tools/mergestages.cpp
+++ b/apps/opencs/model/tools/mergestages.cpp
@@ -99,6 +99,7 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
 
         ref.mRefNum.mIndex = mIndex[Misc::StringUtils::lowerCase (ref.mCell)]++;
         ref.mRefNum.mContentFile = 0;
+        ref.mNew = false;
 
         CSMWorld::Record<CSMWorld::CellRef> newRecord (
             CSMWorld::RecordBase::State_ModifiedOnly, 0, &ref);
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index e6345ce71b..0439b94483 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -6,7 +6,7 @@
 
 #include "cellcoordinates.hpp"
 
-CSMWorld::CellRef::CellRef()
+CSMWorld::CellRef::CellRef() : mNew (true)
 {
     mRefNum.mIndex = 0;
     mRefNum.mContentFile = 0;
diff --git a/apps/opencs/model/world/ref.hpp b/apps/opencs/model/world/ref.hpp
index c60392221a..5d10a3a1b3 100644
--- a/apps/opencs/model/world/ref.hpp
+++ b/apps/opencs/model/world/ref.hpp
@@ -13,6 +13,7 @@ namespace CSMWorld
         std::string mId;
         std::string mCell;
         std::string mOriginalCell;
+        bool mNew; // new reference, not counted yet, ref num not assigned yet
 
         CellRef();
 
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 65251a81db..506f9027e4 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -19,6 +19,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     Cell& cell2 = base ? cell.mBase : cell.mModified;
 
     CellRef ref;
+    ref.mNew = false;
     ESM::MovedCellRef mref;
     bool isDeleted = false;
 
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 32373c3952..4c708242ab 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -421,24 +421,7 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                      CSMWorld::Columns::ColumnId_ReferenceableId),
                      QString::fromUtf8 (iter->getId().c_str()));
 
-                std::auto_ptr<CSMWorld::ModifyCommand> incrementCommand;
-
-                if (!noCell)
-                {
-                    // increase reference count in cell
-                    QModelIndex countIndex = cellTable.getModelIndex (cellId,
-                        cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter));
-
-                    int count = cellTable.data (countIndex).toInt();
-
-                    incrementCommand.reset (
-                        new CSMWorld::ModifyCommand (cellTable, countIndex, count+1));
-                }
-
-                CSMWorld::CommandMacro macro (document.getUndoStack());
-                macro.push (createCommand.release());
-                if (incrementCommand.get())
-                    macro.push (incrementCommand.release());
+                document.getUndoStack().push (createCommand.release());
 
                 dropped = true;
             }
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 5428f4e95c..182e374b77 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -26,51 +26,6 @@ void CSVWorld::ReferenceCreator::configureCreateCommand (CSMWorld::CreateCommand
         findColumnIndex (CSMWorld::Columns::ColumnId_Cell);
 
     command.addValue (cellIdColumn, mCell->text());
-
-    // Set RefNum
-    int refNumColumn = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_References)).
-        findColumnIndex (CSMWorld::Columns::ColumnId_RefNum);
-
-    command.addValue (refNumColumn, getRefNumCount());
-}
-
-void CSVWorld::ReferenceCreator::pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
-    const std::string& id)
-{
-    // get the old count
-    std::string cellId = mCell->text().toUtf8().constData();
-
-    CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
-
-    int countColumn = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter);
-
-    QModelIndex countIndex = cellTable.getModelIndex (cellId, countColumn);
-
-    int count = cellTable.data (countIndex).toInt();
-
-    // command for incrementing counter
-    std::auto_ptr<CSMWorld::ModifyCommand> increment (new CSMWorld::ModifyCommand
-        (cellTable, countIndex, count+1));
-
-    CSMWorld::CommandMacro macro (getUndoStack(), command->text());
-    GenericCreator::pushCommand (command, id);
-    macro.push (increment.release());
-}
-
-int CSVWorld::ReferenceCreator::getRefNumCount() const
-{
-    std::string cellId = mCell->text().toUtf8().constData();
-
-    CSMWorld::IdTable& cellTable = dynamic_cast<CSMWorld::IdTable&> (
-        *getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
-
-    int countColumn = cellTable.findColumnIndex (CSMWorld::Columns::ColumnId_RefNumCounter);
-
-    QModelIndex countIndex = cellTable.getModelIndex (cellId, countColumn);
-
-    return cellTable.data (countIndex).toInt();
 }
 
 CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
diff --git a/apps/opencs/view/world/referencecreator.hpp b/apps/opencs/view/world/referencecreator.hpp
index c230d01268..31010fa24a 100644
--- a/apps/opencs/view/world/referencecreator.hpp
+++ b/apps/opencs/view/world/referencecreator.hpp
@@ -29,11 +29,6 @@ namespace CSVWorld
 
             virtual void configureCreateCommand (CSMWorld::CreateCommand& command) const;
 
-            virtual void pushCommand (std::auto_ptr<CSMWorld::CreateCommand> command,
-                const std::string& id);
-
-            int getRefNumCount() const;
-
         public:
 
             ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
@@ -50,7 +45,7 @@ namespace CSVWorld
 
             /// Focus main input widget
             virtual void focus();
- 
+
         private slots:
 
             void cellChanged();

From 92c2a10de46658891659b1c62e7a79a65bd5e486 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 24 Mar 2016 16:52:16 +0100
Subject: [PATCH 495/765] Fall back to 'warrior' for not found class images
 (Fixes #3228)

---
 apps/openmw/mwbase/windowmanager.hpp   |  1 +
 apps/openmw/mwgui/class.cpp            | 17 +++++++++++++++--
 apps/openmw/mwgui/class.hpp            |  2 ++
 apps/openmw/mwgui/levelupdialog.cpp    |  4 +++-
 apps/openmw/mwgui/windowmanagerimp.cpp |  6 ++++++
 apps/openmw/mwgui/windowmanagerimp.hpp |  1 +
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 2d4c0e2cab..77d740b6f8 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -353,6 +353,7 @@ namespace MWBase
             virtual std::string correctIconPath(const std::string& path) = 0;
             virtual std::string correctBookartPath(const std::string& path, int width, int height) = 0;
             virtual std::string correctTexturePath(const std::string& path) = 0;
+            virtual bool textureExists(const std::string& path) = 0;
 
             virtual void removeCell(MWWorld::CellStore* cell) = 0;
             virtual void writeFog(MWWorld::CellStore* cell) = 0;
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index 51d5e45fb4..ab7290e875 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -55,7 +55,9 @@ namespace MWGui
     void GenerateClassResultDialog::setClassId(const std::string &classId)
     {
         mCurrentClassId = classId;
-        mClassImage->setImageTexture(std::string("textures\\levelup\\") + mCurrentClassId + ".dds");
+
+        setClassImage(mClassImage, mCurrentClassId);
+
         mClassName->setCaption(MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>().find(mCurrentClassId)->mName);
 
         center();
@@ -257,7 +259,7 @@ namespace MWGui
             ToolTips::createSkillToolTip(mMajorSkill[i], klass->mData.mSkills[i][1]);
         }
 
-        mClassImage->setImageTexture(std::string("textures\\levelup\\") + mCurrentClassId + ".dds");
+        setClassImage(mClassImage, mCurrentClassId);
     }
 
     /* InfoBoxDialog */
@@ -903,4 +905,15 @@ namespace MWGui
         eventDone(this);
     }
 
+    void setClassImage(MyGUI::ImageBox* imageBox, const std::string &classId)
+    {
+        std::string classImage = std::string("textures\\levelup\\") + classId + ".dds";
+        if (!MWBase::Environment::get().getWindowManager()->textureExists(classImage))
+        {
+            std::cout << "No class image for " << classId << ", falling back to default" << std::endl;
+            classImage = "textures\\levelup\\warrior.dds";
+        }
+        imageBox->setImageTexture(classImage);
+    }
+
 }
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index e36a9a98b6..8206d6b037 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -8,6 +8,8 @@
 
 namespace MWGui
 {
+    void setClassImage(MyGUI::ImageBox* imageBox, const std::string& classId);
+
     class InfoBoxDialog : public WindowModal
     {
     public:
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 4e8d0a02c4..fb9952ba73 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -19,6 +19,8 @@
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 
+#include "class.hpp"
+
 namespace MWGui
 {
     const unsigned int LevelupDialog::sMaxCoins = 3;
@@ -154,7 +156,7 @@ namespace MWGui
                 cls = &*it;
         }
 
-        mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds");
+        setClassImage(mClassImage, cls->mId);
 
         int level = creatureStats.getLevel ()+1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 1b2c455209..54fd31acda 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -2002,6 +2002,12 @@ namespace MWGui
         return Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
     }
 
+    bool WindowManager::textureExists(const std::string &path)
+    {
+        std::string corrected = Misc::ResourceHelpers::correctTexturePath(path, mResourceSystem->getVFS());
+        return mResourceSystem->getVFS()->exists(corrected);
+    }
+
     void WindowManager::createCursors()
     {
         MyGUI::ResourceManager::EnumeratorPtr enumerator = MyGUI::ResourceManager::getInstance().getEnumerator();
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 3cdba8a87f..17a2e38555 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -374,6 +374,7 @@ namespace MWGui
     virtual std::string correctIconPath(const std::string& path);
     virtual std::string correctBookartPath(const std::string& path, int width, int height);
     virtual std::string correctTexturePath(const std::string& path);
+    virtual bool textureExists(const std::string& path);
 
     void removeCell(MWWorld::CellStore* cell);
     void writeFog(MWWorld::CellStore* cell);

From 5bd8ef247da53c610e19db575211581d3f109701 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 24 Mar 2016 17:18:08 +0100
Subject: [PATCH 496/765] Do not adjust the player position when loading a
 savegame (Fixes #2089)

---
 apps/openmw/mwbase/world.hpp            |  6 +++---
 apps/openmw/mwscript/cellextensions.cpp |  6 +++---
 apps/openmw/mwstate/statemanagerimp.cpp |  2 +-
 apps/openmw/mwworld/actionteleport.cpp  |  4 ++--
 apps/openmw/mwworld/scene.cpp           |  8 +++++---
 apps/openmw/mwworld/scene.hpp           |  2 +-
 apps/openmw/mwworld/worldimp.cpp        | 18 +++++++++---------
 apps/openmw/mwworld/worldimp.hpp        |  6 +++---
 8 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index de5f15d64f..e9a76c5653 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -231,15 +231,15 @@ namespace MWBase
 
             virtual float getTimeScaleFactor() const = 0;
 
-            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent=true) = 0;
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< Move to interior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position, bool changeEvent=true) = 0;
+            virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< Move to exterior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent=true) = 0;
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true) = 0;
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const = 0;
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 513c1cc42e..43e8318b2e 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -49,7 +49,7 @@ namespace MWScript
                     world->getPlayer().setTeleported(true);
                     if (world->findExteriorPosition(cell, pos))
                     {
-                        world->changeToExteriorCell(pos);
+                        world->changeToExteriorCell(pos, true);
                         world->fixPosition(world->getPlayerPtr());
                     }
                     else
@@ -57,7 +57,7 @@ namespace MWScript
                         // Change to interior even if findInteriorPosition()
                         // yields false. In this case position will be zero-point.
                         world->findInteriorPosition(cell, pos);
-                        world->changeToInteriorCell(cell, pos);
+                        world->changeToInteriorCell(cell, pos, true);
                     }
                 }
         };
@@ -82,7 +82,7 @@ namespace MWScript
 
                     pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
 
-                    world->changeToExteriorCell (pos);
+                    world->changeToExteriorCell (pos, true);
                     world->fixPosition(world->getPlayerPtr());
                 }
         };
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 6cd8ec43b6..e4b26f8b70 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -495,7 +495,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
         const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
 
         // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
-        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false);
+        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
 
         // Vanilla MW will restart startup scripts when a save game is loaded. This is unintuitive,
         // but some mods may be using it as a reload detector.
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 031f07258c..c9315283dc 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -64,9 +64,9 @@ namespace MWWorld
         {
             world->getPlayer().setTeleported(true);
             if (mCellName.empty())
-                world->changeToExteriorCell (mPosition);
+                world->changeToExteriorCell (mPosition, true);
             else
-                world->changeToInteriorCell (mCellName, mPosition);
+                world->changeToInteriorCell (mCellName, mPosition, true);
         }
         else
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ba28294690..c7ac757b2d 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -444,7 +444,8 @@ namespace MWWorld
             float z = pos.rot[2];
             world->rotateObject(player, x, y, z);
 
-            player.getClass().adjustPosition(player, true);
+            if (adjustPlayerPos)
+                player.getClass().adjustPosition(player, true);
         }
 
         MWBase::MechanicsManager *mechMgr =
@@ -493,7 +494,7 @@ namespace MWWorld
         return mActiveCells;
     }
 
-    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent)
+    void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         CellStore *cell = MWBase::Environment::get().getWorld()->getInterior(cellName);
         bool loadcell = (mCurrentCell == NULL);
@@ -519,7 +520,8 @@ namespace MWWorld
             float z = position.rot[2];
             world->rotateObject(world->getPlayerPtr(), x, y, z);
 
-            world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
+            if (adjustPlayerPos)
+                world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr(), true);
             MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
             return;
         }
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 6cba9c3be7..33886eed46 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -103,7 +103,7 @@ namespace MWWorld
             bool hasCellChanged() const;
             ///< Has the set of active cells changed, since the last frame?
 
-            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent=true);
+            void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
             ///< Move to interior cell.
             /// @param changeEvent Set cellChanged flag?
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 9486126234..8f3fcbd418 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -251,13 +251,13 @@ namespace MWWorld
 
             if (findExteriorPosition (mStartCell, pos))
             {
-                changeToExteriorCell (pos);
+                changeToExteriorCell (pos, true);
                 fixPosition(getPlayerPtr());
             }
             else
             {
                 findInteriorPosition (mStartCell, pos);
-                changeToInteriorCell (mStartCell, pos);
+                changeToInteriorCell (mStartCell, pos, true);
             }
         }
         else
@@ -962,7 +962,7 @@ namespace MWWorld
         return mTimeScale->getFloat();
     }
 
-    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent)
+    void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
@@ -976,11 +976,11 @@ namespace MWWorld
         }
 
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToInteriorCell(cellName, position, changeEvent);
+        mWorldScene->changeToInteriorCell(cellName, position, adjustPlayerPos, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToExteriorCell (const ESM::Position& position, bool changeEvent)
+    void World::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         mPhysics->clearQueuedMovement();
 
@@ -991,17 +991,17 @@ namespace MWWorld
             mRendering->notifyWorldSpaceChanged();
         }
         removeContainerScripts(getPlayerPtr());
-        mWorldScene->changeToExteriorCell(position, true, changeEvent);
+        mWorldScene->changeToExteriorCell(position, adjustPlayerPos, changeEvent);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent)
+    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)
     {
         if (!changeEvent)
             mCurrentWorldSpace = cellId.mWorldspace;
 
         if (cellId.mPaged)
-            changeToExteriorCell (position, changeEvent);
+            changeToExteriorCell (position, adjustPlayerPos, changeEvent);
         else
             changeToInteriorCell (cellId.mWorldspace, position, changeEvent);
     }
@@ -1137,7 +1137,7 @@ namespace MWWorld
             if (isPlayer)
             {
                 if (!newCell->isExterior())
-                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos);
+                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell->getCell()->mName), pos, false);
                 else
                 {
                     if (mWorldScene->isCellActive(*newCell))
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index d1298a39be..c9a1d415d3 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -324,15 +324,15 @@ namespace MWWorld
 
             virtual float getTimeScaleFactor() const;
 
-            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool changeEvent = true);
+            virtual void changeToInteriorCell (const std::string& cellName, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
             ///< Move to interior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToExteriorCell (const ESM::Position& position, bool changeEvent = true);
+            virtual void changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent = true);
             ///< Move to exterior cell.
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool changeEvent=true);
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool adjustPlayerPos, bool changeEvent=true);
             ///< @param changeEvent If false, do not trigger cell change flag or detect worldspace changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const;

From e71aa53574f29860f7bf1e4baa254a44cde78add Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 24 Mar 2016 18:31:37 +0100
Subject: [PATCH 497/765] Don't allow playing a sound/soundgen key more than
 once at the same time on the same object (Fixes #2689)

---
 apps/openmw/mwmechanics/character.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 30a4ec9f79..82c289200a 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -756,6 +756,7 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
     if(evt.compare(0, 7, "sound: ") == 0)
     {
         MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+        sndMgr->stopSound3D(mPtr, evt.substr(7));
         sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
         return;
     }
@@ -796,7 +797,10 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
                                     MWBase::SoundManager::Play_NoPlayerLocal);
             }
             else
+            {
+                sndMgr->stopSound3D(mPtr, sound);
                 sndMgr->playSound3D(mPtr, sound, volume, pitch);
+            }
         }
         return;
     }

From 29078619aadae4fb8df00741aee25d49afbc516c Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Fri, 25 Mar 2016 06:28:11 -0400
Subject: [PATCH 498/765] Fix editor tab order when adding record

---
 apps/opencs/view/world/genericcreator.cpp | 10 +++++++---
 apps/opencs/view/world/genericcreator.hpp |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index df77399417..754cbd201c 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -40,6 +40,10 @@ void CSVWorld::GenericCreator::insertAtBeginning (QWidget *widget, bool stretche
 void CSVWorld::GenericCreator::insertBeforeButtons (QWidget *widget, bool stretched)
 {
     mLayout->insertWidget (mLayout->count()-2, widget, stretched ? 1 : 0);
+
+    // Reset tab order relative to buttons.
+    setTabOrder(widget, mCreate);
+    setTabOrder(mCreate, mCancel);
 }
 
 std::string CSVWorld::GenericCreator::getId() const
@@ -161,12 +165,12 @@ CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undo
     mCreate = new QPushButton ("Create");
     mLayout->addWidget (mCreate);
 
-    QPushButton *cancelButton = new QPushButton ("Cancel");
-    mLayout->addWidget (cancelButton);
+    mCancel = new QPushButton("Cancel");
+    mLayout->addWidget(mCancel);
 
     setLayout (mLayout);
 
-    connect (cancelButton, SIGNAL (clicked (bool)), this, SIGNAL (done()));
+    connect (mCancel, SIGNAL (clicked (bool)), this, SIGNAL (done()));
     connect (mCreate, SIGNAL (clicked (bool)), this, SLOT (create()));
 
     connect (mId, SIGNAL (textChanged (const QString&)), this, SLOT (textChanged (const QString&)));
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index f63c451092..5d67a9b273 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -33,6 +33,7 @@ namespace CSVWorld
             QUndoStack& mUndoStack;
             CSMWorld::UniversalId mListId;
             QPushButton *mCreate;
+            QPushButton *mCancel;
             QLineEdit *mId;
             std::string mErrors;
             QHBoxLayout *mLayout;
@@ -56,6 +57,9 @@ namespace CSVWorld
 
             void insertAtBeginning (QWidget *widget, bool stretched);
 
+            /// \brief Insert given widget before Create and Cancel buttons.
+            /// \param widget Widget to add to layout.
+            /// \param stretched Whether widget should be streched or not.
             void insertBeforeButtons (QWidget *widget, bool stretched);
 
             virtual std::string getId() const;

From 1b4c124fe8a36ef3d62f320ee53f7bae5fb577ec Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Fri, 25 Mar 2016 12:13:55 -0400
Subject: [PATCH 499/765] Create record on Return key press (Feature #3250)

Updated to create record when Return key is pressed while input has
focus. Record is only created if input has been validated (i.e. Create
button is enabled).
---
 apps/opencs/view/world/genericcreator.cpp     | 9 +++++++++
 apps/opencs/view/world/genericcreator.hpp     | 3 +++
 apps/opencs/view/world/infocreator.cpp        | 3 ++-
 apps/opencs/view/world/referencecreator.cpp   | 1 +
 apps/opencs/view/world/startscriptcreator.cpp | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index df77399417..b80625f835 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -170,6 +170,7 @@ CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undo
     connect (mCreate, SIGNAL (clicked (bool)), this, SLOT (create()));
 
     connect (mId, SIGNAL (textChanged (const QString&)), this, SLOT (textChanged (const QString&)));
+    connect (mId, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 
     connect (&mData, SIGNAL (idListChanged()), this, SLOT (dataIdListChanged()));
 }
@@ -205,6 +206,14 @@ void CSVWorld::GenericCreator::textChanged (const QString& text)
     update();
 }
 
+void CSVWorld::GenericCreator::inputReturnPressed()
+{
+    if (mCreate->isEnabled())
+    {
+        create();
+    }
+}
+
 void CSVWorld::GenericCreator::create()
 {
     if (!mLocked)
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index f63c451092..f9f6624bbe 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -112,6 +112,9 @@ namespace CSVWorld
 
             void textChanged (const QString& text);
 
+            /// \brief Create record if able to after Return key is pressed on input.
+            void inputReturnPressed();
+
             void create();
 
             void scopeChanged (int index);
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 1139afd691..243b7d8799 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -60,6 +60,7 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     setManualEditing (false);
 
     connect (mTopic, SIGNAL (textChanged (const QString&)), this, SLOT (topicChanged()));
+    connect (mTopic, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::InfoCreator::cloneMode (const std::string& originId,
@@ -110,7 +111,7 @@ void CSVWorld::InfoCreator::topicChanged()
     update();
 }
 
-CSVWorld::Creator *CSVWorld::InfoCreatorFactory::makeCreator(CSMDoc::Document& document, 
+CSVWorld::Creator *CSVWorld::InfoCreatorFactory::makeCreator(CSMDoc::Document& document,
                                                              const CSMWorld::UniversalId& id) const
 {
     return new InfoCreator(document.getData(),
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 5428f4e95c..82169a1a5f 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -87,6 +87,7 @@ CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack&
     setManualEditing (false);
 
     connect (mCell, SIGNAL (textChanged (const QString&)), this, SLOT (cellChanged()));
+    connect (mCell, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::ReferenceCreator::reset()
diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 7495da035e..1ffcdf06a7 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -53,6 +53,7 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
     insertBeforeButtons(mScript, true);
 
     connect(mScript, SIGNAL (textChanged(const QString&)), this, SLOT (scriptChanged()));
+    connect(mScript, SIGNAL (returnPressed()), this, SLOT (inputReturnPressed()));
 }
 
 void CSVWorld::StartScriptCreator::cloneMode(

From 3a676fc45648798ef4148c883c1524cdf221ffe4 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 18 Mar 2016 16:06:35 -0400
Subject: [PATCH 500/765] Revert "Create a visual representation of the center
 of the orbit camera."

This reverts commit 2c894acd98ed593c8433e29443f84035a2c74297.

# Conflicts:
#	apps/opencs/view/render/cameracontroller.cpp
#	apps/opencs/view/render/cameracontroller.hpp
---
 apps/opencs/view/render/cameracontroller.cpp | 24 +-------------------
 apps/opencs/view/render/cameracontroller.hpp |  7 +-----
 apps/opencs/view/render/scenewidget.cpp      |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 49e14bfa0b..7e677b2dba 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -3,12 +3,8 @@
 #include <QKeyEvent>
 
 #include <osg/Camera>
-#include <osg/Geode>
-#include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Quat>
-#include <osg/Shape>
-#include <osg/ShapeDrawable>
 
 namespace CSVRender
 {
@@ -265,7 +261,7 @@ namespace CSVRender
     Orbit Camera Controller
     */
 
-    OrbitCameraController::OrbitCameraController(osg::Group* group)
+    OrbitCameraController::OrbitCameraController()
         : mInitialized(false)
         , mFast(false)
         , mLeft(false)
@@ -276,10 +272,7 @@ namespace CSVRender
         , mRollRight(false)
         , mCenter(0,0,0)
         , mDistance(0)
-        , mCenterNode(new osg::PositionAttitudeTransform())
     {
-        group->addChild(mCenterNode);
-        createShape();
     }
 
     bool OrbitCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
@@ -391,8 +384,6 @@ namespace CSVRender
         if (mRollRight)
             roll(rotDist);
 
-        mCenterNode->setPosition(mCenter);
-
         // Normalize the matrix to counter drift
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
 
@@ -416,19 +407,6 @@ namespace CSVRender
         mInitialized = true;
     }
 
-    void OrbitCameraController::createShape()
-    {
-        const float boxWidth = 100;
-
-        osg::ref_ptr<osg::Box> box = new osg::Box(osg::Vec3f(0, 0, 0), boxWidth);
-        osg::ref_ptr<osg::ShapeDrawable> drawable = new osg::ShapeDrawable(box);
-        drawable->setColor(osg::Vec4f(0.f, 0.9f, 0.f, 1.f));
-
-        osg::ref_ptr<osg::Geode> geode = new osg::Geode();
-        geode->addChild(drawable);
-        mCenterNode->addChild(geode);
-    }
-
     void OrbitCameraController::rotateHorizontal(double value)
     {
         osg::Vec3d eye, center, up;
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 78afe2320a..cced8a4c3f 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -4,7 +4,6 @@
 #include <string>
 
 #include <osg/BoundingBox>
-#include <osg/PositionAttitudeTransform>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -13,7 +12,6 @@ class QKeyEvent;
 namespace osg
 {
     class Camera;
-    class Group;
 }
 
 namespace CSVRender
@@ -99,7 +97,7 @@ namespace CSVRender
     {
         public:
 
-            OrbitCameraController(osg::Group* group);
+            OrbitCameraController();
 
             bool handleKeyEvent(QKeyEvent* event, bool pressed);
             bool handleMouseMoveEvent(std::string mode, int x, int y);
@@ -111,7 +109,6 @@ namespace CSVRender
             void onActivate();
 
             void initialize();
-            void createShape();
 
             void rotateHorizontal(double value);
             void rotateVertical(double value);
@@ -123,8 +120,6 @@ namespace CSVRender
             bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
             osg::Vec3d mCenter;
             double mDistance;
-
-            osg::ref_ptr<osg::PositionAttitudeTransform> mCenterNode;
     };
 }
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index dc0041c0f3..27c828ec4e 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -164,7 +164,7 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     , mPrevMouseX(0)
     , mPrevMouseY(0)
     , mFreeCamControl(new FreeCameraController())
-    , mOrbitCamControl(new OrbitCameraController(mRootNode))
+    , mOrbitCamControl(new OrbitCameraController())
     , mCurrentCamControl(mFreeCamControl.get())
     , mCamPositionSet(false)
 {

From 3c83128abc5a211a2856fa9eb9b3dc2627d929ec Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 25 Mar 2016 20:47:18 -0400
Subject: [PATCH 501/765] Add more customization.

---
 apps/opencs/view/render/cameracontroller.cpp | 125 +++++++++++++++----
 apps/opencs/view/render/cameracontroller.hpp |  37 ++++--
 2 files changed, 133 insertions(+), 29 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 7e677b2dba..5941cfb1e8 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -19,14 +19,12 @@ namespace CSVRender
     const osg::Vec3d CameraController::LocalLeft = osg::Vec3d(1, 0, 0);
     const osg::Vec3d CameraController::LocalForward = osg::Vec3d(0, 0, 1);
 
-    const double CameraController::LinearSpeed = 1000;
-    const double CameraController::RotationalSpeed = osg::PI / 2.f;
-    const double CameraController::SpeedMultiplier = 8;
-
     CameraController::CameraController()
         : mActive(false)
         , mModified(false)
-        , mMouseScalar(-1/700.f)
+        , mCameraSensitivity(-1/700.f)
+        , mSecondaryMoveMult(50)
+        , mWheelMoveMult(8)
         , mCamera(NULL)
     {
     }
@@ -50,9 +48,19 @@ namespace CSVRender
         return mCamera;
     }
 
-    double CameraController::getMouseScalar() const
+    double CameraController::getCameraSensitivity() const
     {
-        return mMouseScalar;
+        return mCameraSensitivity;
+    }
+
+    double CameraController::getSecondaryMovementMultiplier() const
+    {
+        return mSecondaryMoveMult;
+    }
+
+    double CameraController::getWheelMovementMultiplier() const
+    {
+        return mWheelMoveMult;
     }
 
     void CameraController::setCamera(osg::Camera* camera)
@@ -64,9 +72,19 @@ namespace CSVRender
             onActivate();
     }
 
-    void CameraController::setMouseScalar(double value)
+    void CameraController::setCameraSensitivity(double value)
     {
-        mMouseScalar = value;
+        mCameraSensitivity = value;
+    }
+
+    void CameraController::setSecondaryMovementMultiplier(double value)
+    {
+        mSecondaryMoveMult = value;
+    }
+
+    void CameraController::setWheelMovementMultiplier(double value)
+    {
+        mWheelMoveMult = value;
     }
 
     void CameraController::setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up)
@@ -101,9 +119,42 @@ namespace CSVRender
         , mRollLeft(false)
         , mRollRight(false)
         , mUp(LocalUp)
+        , mLinSpeed(1000)
+        , mRotSpeed(osg::PI / 2)
+        , mSpeedMult(8)
     {
     }
 
+    double FreeCameraController::getLinearSpeed() const
+    {
+        return mLinSpeed;
+    }
+
+    double FreeCameraController::getRotationalSpeed() const
+    {
+        return mRotSpeed;
+    }
+
+    double FreeCameraController::getSpeedMultiplier() const
+    {
+        return mSpeedMult;
+    }
+
+    void FreeCameraController::setLinearSpeed(double value)
+    {
+        mLinSpeed = value;
+    }
+
+    void FreeCameraController::setRotationalSpeed(double value)
+    {
+        mRotSpeed = value;
+    }
+
+    void FreeCameraController::setSpeedMultiplier(double value)
+    {
+        mSpeedMult = value;
+    }
+
     void FreeCameraController::fixUpAxis(const osg::Vec3d& up)
     {
         mLockUpright = true;
@@ -171,18 +222,22 @@ namespace CSVRender
 
         if (mode == "p-navi")
         {
-            yaw(x * getMouseScalar());
-            pitch(y * getMouseScalar());
+            yaw(x * getCameraSensitivity());
+            pitch(y * getCameraSensitivity());
             setModified();
         }
         else if (mode == "s-navi")
         {
-            translate(LocalLeft * x + LocalUp * -y);
+            osg::Vec3d movement;
+            movement += LocalLeft * -x * getSecondaryMovementMultiplier();
+            movement += LocalUp * y * getSecondaryMovementMultiplier();
+
+            translate(movement);
             setModified();
         }
         else if (mode == "t-navi")
         {
-            translate(LocalForward * x * (mFast ? SpeedMultiplier : 1));
+            translate(LocalForward * x * (mFast ? getWheelMovementMultiplier() : 1));
         }
         else
         {
@@ -197,11 +252,11 @@ namespace CSVRender
         if (!isActive())
             return;
 
-        double linDist = LinearSpeed * dt;
-        double rotDist = RotationalSpeed * dt;
+        double linDist = mLinSpeed * dt;
+        double rotDist = mRotSpeed * dt;
 
         if (mFast)
-            linDist *= SpeedMultiplier;
+            linDist *= mSpeedMult;
 
         if (mLeft)
             translate(LocalLeft * linDist);
@@ -272,9 +327,31 @@ namespace CSVRender
         , mRollRight(false)
         , mCenter(0,0,0)
         , mDistance(0)
+        , mOrbitSpeed(osg::PI / 4)
+        , mOrbitSpeedMult(4)
     {
     }
 
+    double OrbitCameraController::getOrbitSpeed() const
+    {
+        return mOrbitSpeed;
+    }
+
+    double OrbitCameraController::getOrbitSpeedMultiplier() const
+    {
+        return mOrbitSpeedMult;
+    }
+
+    void OrbitCameraController::setOrbitSpeed(double value)
+    {
+        mOrbitSpeed = value;
+    }
+
+    void OrbitCameraController::setOrbitSpeedMultiplier(double value)
+    {
+        mOrbitSpeedMult = value;
+    }
+
     bool OrbitCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
     {
         if (!isActive())
@@ -336,18 +413,22 @@ namespace CSVRender
 
         if (mode == "p-navi")
         {
-            rotateHorizontal(x * getMouseScalar());
-            rotateVertical(-y * getMouseScalar());
+            rotateHorizontal(x * getCameraSensitivity());
+            rotateVertical(-y * getCameraSensitivity());
             setModified();
         }
         else if (mode == "s-navi")
         {
-            translate(LocalLeft * x + LocalUp * -y);
+            osg::Vec3d movement;
+            movement += LocalLeft * x * getSecondaryMovementMultiplier();
+            movement += LocalUp * -y * getSecondaryMovementMultiplier();
+
+            translate(movement);
             setModified();
         }
         else if (mode == "t-navi")
         {
-            zoom(-x * (mFast ? SpeedMultiplier : 1));
+            zoom(-x * (mFast ? getWheelMovementMultiplier() : 1));
         }
         else
         {
@@ -365,10 +446,10 @@ namespace CSVRender
         if (!mInitialized)
             initialize();
 
-        double rotDist = RotationalSpeed * dt;
+        double rotDist = mOrbitSpeed * dt;
 
         if (mFast)
-            rotDist *= SpeedMultiplier;
+            rotDist *= mOrbitSpeedMult;
 
         if (mLeft)
             rotateHorizontal(-rotDist);
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index cced8a4c3f..97a5ef2b26 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -26,10 +26,6 @@ namespace CSVRender
             static const osg::Vec3d LocalLeft;
             static const osg::Vec3d LocalForward;
 
-            static const double LinearSpeed;
-            static const double RotationalSpeed;
-            static const double SpeedMultiplier;
-
             CameraController();
             virtual ~CameraController();
 
@@ -37,10 +33,14 @@ namespace CSVRender
             bool isModified() const;
 
             osg::Camera* getCamera() const;
-            double getMouseScalar() const;
+            double getCameraSensitivity() const;
+            double getSecondaryMovementMultiplier() const;
+            double getWheelMovementMultiplier() const;
 
             void setCamera(osg::Camera*);
-            void setMouseScalar(double value);
+            void setCameraSensitivity(double value);
+            void setSecondaryMovementMultiplier(double value);
+            void setWheelMovementMultiplier(double value);
 
             // moves the camera to an intelligent position
             void setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up);
@@ -60,7 +60,9 @@ namespace CSVRender
         private:
 
             bool mActive, mModified;
-            double mMouseScalar;
+            double mCameraSensitivity;
+            double mSecondaryMoveMult;
+            double mWheelMoveMult;
 
             osg::Camera* mCamera;
     };
@@ -71,6 +73,14 @@ namespace CSVRender
 
             FreeCameraController();
 
+            double getLinearSpeed() const;
+            double getRotationalSpeed() const;
+            double getSpeedMultiplier() const;
+
+            void setLinearSpeed(double value);
+            void setRotationalSpeed(double value);
+            void setSpeedMultiplier(double value);
+
             void fixUpAxis(const osg::Vec3d& up);
             void unfixUpAxis();
 
@@ -91,6 +101,10 @@ namespace CSVRender
             bool mLockUpright;
             bool mFast, mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
             osg::Vec3d mUp;
+
+            double mLinSpeed;
+            double mRotSpeed;
+            double mSpeedMult;
     };
 
     class OrbitCameraController : public CameraController
@@ -99,6 +113,12 @@ namespace CSVRender
 
             OrbitCameraController();
 
+            double getOrbitSpeed() const;
+            double getOrbitSpeedMultiplier() const;
+
+            void setOrbitSpeed(double value);
+            void setOrbitSpeedMultiplier(double value);
+
             bool handleKeyEvent(QKeyEvent* event, bool pressed);
             bool handleMouseMoveEvent(std::string mode, int x, int y);
 
@@ -120,6 +140,9 @@ namespace CSVRender
             bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
             osg::Vec3d mCenter;
             double mDistance;
+
+            double mOrbitSpeed;
+            double mOrbitSpeedMult;
     };
 }
 

From dede1718868be15c94fad52672c892000bcec9bb Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 25 Mar 2016 21:35:34 -0400
Subject: [PATCH 502/765] Fix the secondary navigation method for
 OrbitCameraController.

---
 apps/opencs/view/render/cameracontroller.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 5941cfb1e8..518db2076a 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -520,8 +520,14 @@ namespace CSVRender
 
     void OrbitCameraController::translate(const osg::Vec3d& offset)
     {
-        mCenter += offset;
-        getCamera()->getViewMatrix() *= osg::Matrixd::translate(offset);
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        osg::Vec3d newOffset = getCamera()->getViewMatrix().getRotate().inverse() * offset;
+        mCenter += newOffset;
+        eye += newOffset;
+
+        getCamera()->setViewMatrixAsLookAt(eye, mCenter, up);
     }
 
     void OrbitCameraController::zoom(double value)

From bee8977e45f23a135a44df0fc5ce7515562477cd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 25 Mar 2016 22:19:44 -0400
Subject: [PATCH 503/765] Add camera control customization options.

---
 apps/opencs/model/prefs/state.cpp       |  8 +++++
 apps/opencs/view/render/scenewidget.cpp | 40 ++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 772047961c..40c6d47819 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -172,6 +172,14 @@ void CSMPrefs::State::declare()
     inputButtons.add (left).add (cLeft).add (right).add (cRight).add (middle).add (cMiddle);
     declareEnum ("p-navi", "Primary Camera Navigation Button", left).addValues (inputButtons);
     declareEnum ("s-navi", "Secondary Camera Navigation Button", cLeft).addValues (inputButtons);
+    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", -1/750.).setRange(-2.0, 2.0);
+    declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(1.0, 1000.0);
+    declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
+    declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
+    declareDouble ("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
+    declareDouble ("navi-free-speed-mult", "Free Camera Speed Multiplier (from Modifier)", 8).setRange(0.001, 1000.0);
+    declareDouble ("navi-orbit-rot-speed", "Orbital Camera Rotational Speed", 3.14 / 4).setRange(0.001, 6.28);
+    declareDouble ("navi-orbit-speed-mult", "Orbital Camera Speed Multiplier (from Modifier)", 4).setRange(0.001, 1000.0);
     declareEnum ("p-edit", "Primary Editing Button", right).addValues (inputButtons);
     declareEnum ("s-edit", "Secondary Editing Button", cRight).addValues (inputButtons);
     declareEnum ("p-select", "Primary Selection Button", middle).addValues (inputButtons);
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 27c828ec4e..5c565cd2f5 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -328,7 +328,45 @@ void SceneWidget::update(double dt)
 
 void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
 {
-    storeMappingSetting(setting);
+    if (*setting=="3D Scene Input/p-navi-sensitivity")
+    {
+        mFreeCamControl->setCameraSensitivity(setting->toDouble());
+        mOrbitCamControl->setCameraSensitivity(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/s-navi-sensitivity")
+    {
+        mFreeCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+        mOrbitCamControl->setSecondaryMovementMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-wheel-factor")
+    {
+        mFreeCamControl->setWheelMovementMultiplier(setting->toDouble());
+        mOrbitCamControl->setWheelMovementMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-lin-speed")
+    {
+        mFreeCamControl->setLinearSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-rot-speed")
+    {
+        mFreeCamControl->setRotationalSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-free-speed-mult")
+    {
+        mFreeCamControl->setSpeedMultiplier(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-orbit-rot-speed")
+    {
+        mOrbitCamControl->setOrbitSpeed(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/navi-orbit-speed-mult")
+    {
+        mOrbitCamControl->setOrbitSpeedMultiplier(setting->toDouble());
+    }
+    else
+    {
+        storeMappingSetting(setting);
+    }
 }
 
 void SceneWidget::selectNavigationMode (const std::string& mode)

From a0fb242bf859ed7e5d1ca6893a62442a5143343f Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 25 Mar 2016 23:47:05 -0400
Subject: [PATCH 504/765] Slight improvement to camera placement.

---
 apps/opencs/view/render/cameracontroller.cpp | 28 ++++++++++++++++++++
 apps/opencs/view/render/cameracontroller.hpp | 16 +++++++++++
 apps/opencs/view/render/scenewidget.cpp      |  3 +--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 518db2076a..bfdb000899 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -3,6 +3,7 @@
 #include <QKeyEvent>
 
 #include <osg/Camera>
+#include <osg/Drawable>
 #include <osg/Matrixd>
 #include <osg/Quat>
 
@@ -541,4 +542,31 @@ namespace CSVRender
 
         getCamera()->setViewMatrixAsLookAt(mCenter + offset, mCenter, up);
     }
+
+    CameraComputeBoundsVisitor::CameraComputeBoundsVisitor(unsigned int mask)
+        : mMask(mask)
+    {
+    }
+
+    unsigned int CameraComputeBoundsVisitor::getMask() const
+    {
+        return mMask;
+    }
+
+    void CameraComputeBoundsVisitor::setMask(unsigned int value)
+    {
+        mMask = value;
+    }
+
+    void CameraComputeBoundsVisitor::apply(osg::Drawable& drawable)
+    {
+        if (drawable.getNodeMask() & mMask)
+            ComputeBoundsVisitor::apply(drawable);
+    }
+
+    void CameraComputeBoundsVisitor::apply(osg::Transform& transform)
+    {
+        if (transform.getNodeMask() & mMask)
+            ComputeBoundsVisitor::apply(transform);
+    }
 }
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 97a5ef2b26..fefa3a4221 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include <osg/BoundingBox>
+#include <osg/ComputeBoundsVisitor>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -144,6 +145,21 @@ namespace CSVRender
             double mOrbitSpeed;
             double mOrbitSpeedMult;
     };
+
+    class CameraComputeBoundsVisitor : public osg::ComputeBoundsVisitor
+    {
+    public:
+        CameraComputeBoundsVisitor(unsigned int mask);
+
+        unsigned int getMask() const;
+        void setMask(unsigned int mask);
+
+        void apply(osg::Drawable& drawable);
+        void apply(osg::Transform& transform);
+
+    private:
+        unsigned int mMask;
+    };
 }
 
 #endif
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 5c565cd2f5..fe8de40e7b 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -12,7 +12,6 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 #include <osg/BoundingBox>
-#include <osg/ComputeBoundsVisitor>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FirstPersonManipulator>
@@ -315,7 +314,7 @@ void SceneWidget::update(double dt)
     }
     else
     {
-        osg::ComputeBoundsVisitor boundsVisitor;
+        CameraComputeBoundsVisitor boundsVisitor(Mask_Reference | Mask_Terrain);
         osg::BoundingBox &boundingBox(boundsVisitor.getBoundingBox());
 
         mRootNode->accept(boundsVisitor);

From fbe9177f5d86893a82ee1919fc653f1724b148ab Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 26 Mar 2016 00:51:19 -0400
Subject: [PATCH 505/765] Better center picking for the Orbit Camera.

---
 apps/opencs/view/render/cameracontroller.cpp | 30 ++++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index bfdb000899..8e990482c1 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -7,6 +7,10 @@
 #include <osg/Matrixd>
 #include <osg/Quat>
 
+#include <osgUtil/LineSegmentIntersector>
+
+#include "mask.hpp"
+
 namespace CSVRender
 {
 
@@ -481,10 +485,30 @@ namespace CSVRender
     {
         static const int DefaultStartDistance = 10000.f;
 
-        osg::Vec3d eye, up;
-        getCamera()->getViewMatrixAsLookAt(eye, mCenter, up, DefaultStartDistance);
+        // Try to intelligently pick focus object
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
+            osgUtil::Intersector::PROJECTION, osg::Vec3d(0, 0, 0), LocalForward));
 
-        mDistance = DefaultStartDistance;
+        intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
+        osgUtil::IntersectionVisitor visitor(intersector);
+
+        visitor.setTraversalMask(Mask_Reference | Mask_Terrain);
+
+        getCamera()->accept(visitor);
+
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up, DefaultStartDistance);
+
+        if (intersector->getIntersections().begin() != intersector->getIntersections().end())
+        {
+            mCenter = intersector->getIntersections().begin()->getWorldIntersectPoint();
+            mDistance = (eye - center).length();
+        }
+        else
+        {
+            mCenter = center;
+            mDistance = DefaultStartDistance;
+        }
 
         mInitialized = true;
     }

From bc36269617cff8bac9c54bce078c6eea31199bc8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 26 Mar 2016 14:58:36 +0100
Subject: [PATCH 506/765] When a controller is present more than once in the
 same keyframe file, pick the first one (Fixes #2719)

---
 components/nifosg/nifloader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 0847a368da..9db672d9ef 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -333,7 +333,10 @@ namespace NifOsg
                 osg::ref_ptr<NifOsg::KeyframeController> callback(new NifOsg::KeyframeController(key->data.getPtr()));
                 callback->setFunction(boost::shared_ptr<NifOsg::ControllerFunction>(new NifOsg::ControllerFunction(key)));
 
-                target.mKeyframeControllers[strdata->string] = callback;
+                if (target.mKeyframeControllers.find(strdata->string) != target.mKeyframeControllers.end())
+                    std::cerr << "Warning: controller " << strdata->string << " present more than once in " << nif->getFilename() << ", ignoring later version" << std::endl;
+                else
+                    target.mKeyframeControllers[strdata->string] = callback;
             }
         }
 

From 35ff4ec4b174fd049d2ecbdc59de3f58bb1aff93 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 26 Mar 2016 14:15:07 -0400
Subject: [PATCH 507/765] Normalize default camera controls so that is appears
 as if the camera is the object being moved. Also, allow mouse inversion for
 secondary movement.

---
 apps/opencs/model/prefs/state.cpp            | 4 ++--
 apps/opencs/view/render/cameracontroller.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 40c6d47819..2a4d9e8a0c 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -172,8 +172,8 @@ void CSMPrefs::State::declare()
     inputButtons.add (left).add (cLeft).add (right).add (cRight).add (middle).add (cMiddle);
     declareEnum ("p-navi", "Primary Camera Navigation Button", left).addValues (inputButtons);
     declareEnum ("s-navi", "Secondary Camera Navigation Button", cLeft).addValues (inputButtons);
-    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", -1/750.).setRange(-2.0, 2.0);
-    declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(1.0, 1000.0);
+    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", 1/650.).setRange(-2.0, 2.0);
+    declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
     declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
     declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
     declareDouble ("navi-free-rot-speed", "Free Camera Rotational Speed", 3.14 / 2).setRange(0.001, 6.28);
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 8e990482c1..a07061a186 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -27,7 +27,7 @@ namespace CSVRender
     CameraController::CameraController()
         : mActive(false)
         , mModified(false)
-        , mCameraSensitivity(-1/700.f)
+        , mCameraSensitivity(1/650.f)
         , mSecondaryMoveMult(50)
         , mWheelMoveMult(8)
         , mCamera(NULL)

From 08d055ca2309d0230ce3659682c7e98735a2497f Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 26 Mar 2016 14:35:03 -0400
Subject: [PATCH 508/765] Allow setting precision of double preferences. Also
 increase precision of camera sensitivity.

---
 apps/opencs/model/prefs/doublesetting.cpp | 9 ++++++++-
 apps/opencs/model/prefs/doublesetting.hpp | 3 +++
 apps/opencs/model/prefs/state.cpp         | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
index 7c247777d2..531196174a 100644
--- a/apps/opencs/model/prefs/doublesetting.cpp
+++ b/apps/opencs/model/prefs/doublesetting.cpp
@@ -15,10 +15,16 @@
 CSMPrefs::DoubleSetting::DoubleSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, double default_)
 : Setting (parent, values, mutex, key, label),
-  mMin (0), mMax (std::numeric_limits<double>::max()),
+  mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
   mDefault (default_)
 {}
 
+CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)
+{
+    mPrecision = precision;
+    return *this;
+}
+
 CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setRange (double min, double max)
 {
     mMin = min;
@@ -49,6 +55,7 @@ std::pair<QWidget *, QWidget *> CSMPrefs::DoubleSetting::makeWidgets (QWidget *p
     QLabel *label = new QLabel (QString::fromUtf8 (getLabel().c_str()), parent);
 
     QDoubleSpinBox *widget = new QDoubleSpinBox (parent);
+    widget->setDecimals(mPrecision);
     widget->setRange (mMin, mMax);
     widget->setValue (mDefault);
 
diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index 3868f014e2..6fe6b772a5 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -9,6 +9,7 @@ namespace CSMPrefs
     {
             Q_OBJECT
 
+            int mPrecision;
             double mMin;
             double mMax;
             std::string mTooltip;
@@ -21,6 +22,8 @@ namespace CSMPrefs
                 double default_);
 
             // defaults to [0, std::numeric_limits<double>::max()]
+            DoubleSetting& setPrecision (int precision);
+
             DoubleSetting& setRange (double min, double max);
 
             DoubleSetting& setMin (double min);
diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 2a4d9e8a0c..fd6c7b6ed5 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -172,7 +172,7 @@ void CSMPrefs::State::declare()
     inputButtons.add (left).add (cLeft).add (right).add (cRight).add (middle).add (cMiddle);
     declareEnum ("p-navi", "Primary Camera Navigation Button", left).addValues (inputButtons);
     declareEnum ("s-navi", "Secondary Camera Navigation Button", cLeft).addValues (inputButtons);
-    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", 1/650.).setRange(-2.0, 2.0);
+    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", 1/650.).setPrecision(4).setRange(-2.0, 2.0);
     declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
     declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
     declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);

From 09bce73c33c0c7da6235a4d7594b95cfe67489df Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 26 Mar 2016 14:42:33 -0400
Subject: [PATCH 509/765] Fix starting distance not being correctly set.

---
 apps/opencs/view/render/cameracontroller.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index a07061a186..bfff161544 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -502,7 +502,7 @@ namespace CSVRender
         if (intersector->getIntersections().begin() != intersector->getIntersections().end())
         {
             mCenter = intersector->getIntersections().begin()->getWorldIntersectPoint();
-            mDistance = (eye - center).length();
+            mDistance = (eye - mCenter).length();
         }
         else
         {

From 2f8be401cc4fdf6cb8be02a60aa781029264e0d1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 00:25:51 +0200
Subject: [PATCH 510/765] Add the unref work items to the front of the
 workqueue (Bug #3273)

Ensures that memory still gets freed even if the workqueue is overloaded.
---
 apps/openmw/mwworld/cellpreloader.cpp |  2 +-
 components/sceneutil/unrefqueue.cpp   |  2 +-
 components/sceneutil/workqueue.cpp    | 11 +++++++----
 components/sceneutil/workqueue.hpp    |  5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index f2881d68f3..349bc081fb 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -238,7 +238,7 @@ namespace MWWorld
         }
 
         // the resource cache is cleared from the worker thread so that we're not holding up the main thread with delete operations
-        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, mTerrain, timestamp));
+        mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, mTerrain, timestamp), true);
     }
 
     void CellPreloader::setExpiryDelay(double expiryDelay)
diff --git a/components/sceneutil/unrefqueue.cpp b/components/sceneutil/unrefqueue.cpp
index a5eb1654e6..10d5682981 100644
--- a/components/sceneutil/unrefqueue.cpp
+++ b/components/sceneutil/unrefqueue.cpp
@@ -40,7 +40,7 @@ namespace SceneUtil
         if (mWorkItem->mObjects.empty())
             return;
 
-        workQueue->addWorkItem(mWorkItem);
+        workQueue->addWorkItem(mWorkItem, true);
 
         mWorkItem = new UnrefWorkItem;
     }
diff --git a/components/sceneutil/workqueue.cpp b/components/sceneutil/workqueue.cpp
index bbd9f48401..0685493d08 100644
--- a/components/sceneutil/workqueue.cpp
+++ b/components/sceneutil/workqueue.cpp
@@ -55,7 +55,7 @@ WorkQueue::~WorkQueue()
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
         while (!mQueue.empty())
-            mQueue.pop();
+            mQueue.pop_back();
         mIsReleased = true;
         mCondition.broadcast();
     }
@@ -67,7 +67,7 @@ WorkQueue::~WorkQueue()
     }
 }
 
-void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item)
+void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item, bool front)
 {
     if (item->isDone())
     {
@@ -76,7 +76,10 @@ void WorkQueue::addWorkItem(osg::ref_ptr<WorkItem> item)
     }
 
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
-    mQueue.push(item);
+    if (front)
+        mQueue.push_front(item);
+    else
+        mQueue.push_back(item);
     mCondition.signal();
 }
 
@@ -90,7 +93,7 @@ osg::ref_ptr<WorkItem> WorkQueue::removeWorkItem()
     if (!mQueue.empty())
     {
         osg::ref_ptr<WorkItem> item = mQueue.front();
-        mQueue.pop();
+        mQueue.pop_front();
         return item;
     }
     else
diff --git a/components/sceneutil/workqueue.hpp b/components/sceneutil/workqueue.hpp
index bc2e55647c..e7b0151dd6 100644
--- a/components/sceneutil/workqueue.hpp
+++ b/components/sceneutil/workqueue.hpp
@@ -50,7 +50,8 @@ namespace SceneUtil
 
         /// Add a new work item to the back of the queue.
         /// @par The work item's waitTillDone() method may be used by the caller to wait until the work is complete.
-        void addWorkItem(osg::ref_ptr<WorkItem> item);
+        /// @param front If true, add item to the front of the queue. If false (default), add to the back.
+        void addWorkItem(osg::ref_ptr<WorkItem> item, bool front=false);
 
         /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
         /// If the workqueue is in the process of being destroyed, may return NULL.
@@ -59,7 +60,7 @@ namespace SceneUtil
 
     private:
         bool mIsReleased;
-        std::queue<osg::ref_ptr<WorkItem> > mQueue;
+        std::deque<osg::ref_ptr<WorkItem> > mQueue;
 
         OpenThreads::Mutex mMutex;
         OpenThreads::Condition mCondition;

From 4ac276b06c3f9689de342926f0c6bbce5e3e23ea Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 00:39:36 +0200
Subject: [PATCH 511/765] Update the resource cache every frame (Bug #3273)

Not much of a point in limiting this to cell loadings, since the update is done from a background thread and should be fairly cheap anyway if there's nothing to unload.
---
 apps/openmw/mwworld/scene.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index c7ac757b2d..3923747533 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -204,6 +204,8 @@ namespace MWWorld
         }
 
         mRendering.update (duration, paused);
+
+        mPreloader->updateCache(mRendering.getReferenceTime());
     }
 
     void Scene::unloadCell (CellStoreCollection::iterator iter)
@@ -421,8 +423,6 @@ namespace MWWorld
 
         if (changeEvent)
             mCellChanged = true;
-
-        mPreloader->updateCache(mRendering.getReferenceTime());
     }
 
     void Scene::changePlayerCell(CellStore *cell, const ESM::Position &pos, bool adjustPlayerPos)
@@ -557,8 +557,6 @@ namespace MWWorld
         MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
 
         MWBase::Environment::get().getWindowManager()->changeCell(mCurrentCell);
-
-        mPreloader->updateCache(mRendering.getReferenceTime());
     }
 
     void Scene::changeToExteriorCell (const ESM::Position& position, bool adjustPlayerPos, bool changeEvent)

From 83f1ab6d25e38ddaad160722099672e8db3ad582 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 00:44:57 +0200
Subject: [PATCH 512/765] Add a time threshold to the removing of preloaded
 cells when the maximum cache size is reached (Bug #3273)

---
 apps/openmw/mwworld/cellpreloader.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 349bc081fb..a8f146024b 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -204,6 +204,7 @@ namespace MWWorld
             // throw out oldest cell to make room
             PreloadMap::iterator oldestCell = mPreloadCells.begin();
             double oldestTimestamp = DBL_MAX;
+            double threshold = 1.0; // seconds
             for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end(); ++it)
             {
                 if (it->second.mTimeStamp < oldestTimestamp)
@@ -213,7 +214,10 @@ namespace MWWorld
                 }
             }
 
-            mPreloadCells.erase(oldestCell);
+            if (oldestTimestamp + threshold < timestamp)
+                mPreloadCells.erase(oldestCell);
+            else
+                return;
         }
 
         osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));

From 5cda89c15d261bfc371a481794f48094bb6aa544 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 00:48:47 +0200
Subject: [PATCH 513/765] Don't attempt to preload more exterior cells than the
 cache can hold (Bug #3273)

---
 apps/openmw/mwworld/cellpreloader.cpp | 5 +++++
 apps/openmw/mwworld/cellpreloader.hpp | 2 ++
 apps/openmw/mwworld/scene.cpp         | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index a8f146024b..48b058d9e6 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -260,6 +260,11 @@ namespace MWWorld
         mMaxCacheSize = num;
     }
 
+    unsigned int CellPreloader::getMaxCacheSize() const
+    {
+        return mMaxCacheSize;
+    }
+
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index f78e66e754..e236a37833 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -44,6 +44,8 @@ namespace MWWorld
         /// The maximum number of preloaded cells.
         void setMaxCacheSize(unsigned int num);
 
+        unsigned int getMaxCacheSize() const;
+
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
     private:
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 3923747533..33ea9b6a8b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -737,11 +737,14 @@ namespace MWWorld
         {
             int x = cell->getCell()->getGridX();
             int y = cell->getCell()->getGridY();
+            unsigned int numpreloaded = 0;
             for (int dx = -mHalfGridSize; dx <= mHalfGridSize; ++dx)
             {
                 for (int dy = -mHalfGridSize; dy <= mHalfGridSize; ++dy)
                 {
                     mPreloader->preload(MWBase::Environment::get().getWorld()->getExterior(x+dx, y+dy), mRendering.getReferenceTime());
+                    if (++numpreloaded >= mPreloader->getMaxCacheSize())
+                        break;
                 }
             }
         }

From 7a962fd8c5c27b501d3ac199d724ff2b66e48e9a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 01:12:18 +0200
Subject: [PATCH 514/765] Properly escape the keybinding labels (Bug #3281)

A certain key name ("#") was being interpreted as a MyGUI markup code.
---
 apps/openmw/mwinput/inputmanagerimp.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index a46f1778bb..de589e7bb0 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1326,10 +1326,12 @@ namespace MWInput
 
         ICS::Control* c = mInputBinder->getChannel (action)->getAttachedControls ().front().control;
 
-        if (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE) != SDL_SCANCODE_UNKNOWN)
-            return mInputBinder->scancodeToString (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE));
-        else if (mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
-            return "#{sMouse} " + boost::lexical_cast<std::string>(mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE));
+        SDL_Scancode key = mInputBinder->getKeyBinding (c, ICS::Control::INCREASE);
+        unsigned int mouse = mInputBinder->getMouseButtonBinding (c, ICS::Control::INCREASE);
+        if (key != SDL_SCANCODE_UNKNOWN)
+            return MyGUI::TextIterator::toTagsString(mInputBinder->scancodeToString (key));
+        else if (mouse != ICS_MAX_DEVICE_BUTTONS)
+            return "#{sMouse} " + boost::lexical_cast<std::string>(mouse);
         else
             return "#{sNone}";
     }

From 02016f4c56bd83a6a55ccf2482a6aefd8190a05f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 01:26:55 +0200
Subject: [PATCH 515/765] Don't reset the save list when deleting a save (Fixes
 #3279)

---
 apps/openmw/mwgui/savegamedialog.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index 946eac4d98..b3f04ae408 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -86,16 +86,19 @@ namespace MWGui
     {
         MWBase::Environment::get().getStateManager()->deleteGame (mCurrentCharacter, mCurrentSlot);
         mSaveList->removeItemAt(mSaveList->getIndexSelected());
-        onSlotSelected(mSaveList, MyGUI::ITEM_NONE);
+        onSlotSelected(mSaveList, mSaveList->getIndexSelected());
 
-        // The character might be deleted now
-        size_t previousIndex = mCharacterSelection->getIndexSelected();
-        open();
-        if (mCharacterSelection->getItemCount())
+        if (mSaveList->getItemCount() == 0)
         {
-            size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
-            mCharacterSelection->setIndexSelected(nextCharacter);
-            onCharacterSelected(mCharacterSelection, nextCharacter);
+            // The character might be deleted now
+            size_t previousIndex = mCharacterSelection->getIndexSelected();
+            open();
+            if (mCharacterSelection->getItemCount())
+            {
+                size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
+                mCharacterSelection->setIndexSelected(nextCharacter);
+                onCharacterSelected(mCharacterSelection, nextCharacter);
+            }
         }
     }
 

From 2162d9ed02223f7f84de6761acc23c5533277133 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 01:28:13 +0200
Subject: [PATCH 516/765] Restore key focus to the save list when the deletion
 confirmation messagebox is accepted

Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
---
 apps/openmw/mwgui/savegamedialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index b3f04ae408..c4d9bae30a 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -87,6 +87,7 @@ namespace MWGui
         MWBase::Environment::get().getStateManager()->deleteGame (mCurrentCharacter, mCurrentSlot);
         mSaveList->removeItemAt(mSaveList->getIndexSelected());
         onSlotSelected(mSaveList, mSaveList->getIndexSelected());
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mSaveList);
 
         if (mSaveList->getItemCount() == 0)
         {

From e1dda9675d5c4e55eed501cae2ae7ef214a866fa Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 29 Mar 2016 23:28:53 +0200
Subject: [PATCH 517/765] Add "preload instances" setting, disabling this may
 help if you are low on memory.

---
 apps/openmw/mwworld/cellpreloader.cpp | 24 ++++++++++++++++++++----
 apps/openmw/mwworld/cellpreloader.hpp |  4 ++++
 apps/openmw/mwworld/scene.cpp         |  1 +
 files/settings-default.cfg            |  5 +++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/cellpreloader.cpp b/apps/openmw/mwworld/cellpreloader.cpp
index 48b058d9e6..9f613ac80d 100644
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@@ -45,7 +45,7 @@ namespace MWWorld
     {
     public:
         /// Constructor to be called from the main thread.
-        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain)
+        PreloadItem(MWWorld::CellStore* cell, Resource::SceneManager* sceneManager, Resource::BulletShapeManager* bulletShapeManager, Resource::KeyframeManager* keyframeManager, Terrain::World* terrain, bool preloadInstances)
             : mIsExterior(cell->getCell()->isExterior())
             , mX(cell->getCell()->getGridX())
             , mY(cell->getCell()->getGridY())
@@ -53,6 +53,7 @@ namespace MWWorld
             , mBulletShapeManager(bulletShapeManager)
             , mKeyframeManager(keyframeManager)
             , mTerrain(terrain)
+            , mPreloadInstances(preloadInstances)
         {
             ListModelsVisitor visitor (mMeshes);
             if (cell->getState() == MWWorld::CellStore::State_Loaded)
@@ -84,8 +85,16 @@ namespace MWWorld
                     std::string mesh  = *it;
                     mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
 
-                    mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
-                    mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
+                    if (mPreloadInstances)
+                    {
+                        mPreloadedObjects.push_back(mSceneManager->cacheInstance(mesh));
+                        mPreloadedObjects.push_back(mBulletShapeManager->cacheInstance(mesh));
+                    }
+                    else
+                    {
+                        mPreloadedObjects.push_back(mSceneManager->getTemplate(mesh));
+                        mPreloadedObjects.push_back(mBulletShapeManager->getShape(mesh));
+                    }
 
                     size_t slashpos = mesh.find_last_of("/\\");
                     if (slashpos != std::string::npos && slashpos != mesh.size()-1)
@@ -132,6 +141,7 @@ namespace MWWorld
         Resource::BulletShapeManager* mBulletShapeManager;
         Resource::KeyframeManager* mKeyframeManager;
         Terrain::World* mTerrain;
+        bool mPreloadInstances;
 
         // keep a ref to the loaded objects to make sure it stays loaded as long as this cell is in the preloaded state
         std::vector<osg::ref_ptr<const osg::Object> > mPreloadedObjects;
@@ -168,6 +178,7 @@ namespace MWWorld
         , mExpiryDelay(0.0)
         , mMinCacheSize(0)
         , mMaxCacheSize(0)
+        , mPreloadInstances(true)
     {
     }
 
@@ -220,7 +231,7 @@ namespace MWWorld
                 return;
         }
 
-        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain));
+        osg::ref_ptr<PreloadItem> item (new PreloadItem(cell, mResourceSystem->getSceneManager(), mBulletShapeManager, mResourceSystem->getKeyframeManager(), mTerrain, mPreloadInstances));
         mWorkQueue->addWorkItem(item);
 
         mPreloadCells[cell] = PreloadEntry(timestamp, item);
@@ -260,6 +271,11 @@ namespace MWWorld
         mMaxCacheSize = num;
     }
 
+    void CellPreloader::setPreloadInstances(bool preload)
+    {
+        mPreloadInstances = preload;
+    }
+
     unsigned int CellPreloader::getMaxCacheSize() const
     {
         return mMaxCacheSize;
diff --git a/apps/openmw/mwworld/cellpreloader.hpp b/apps/openmw/mwworld/cellpreloader.hpp
index e236a37833..35c52baf60 100644
--- a/apps/openmw/mwworld/cellpreloader.hpp
+++ b/apps/openmw/mwworld/cellpreloader.hpp
@@ -44,6 +44,9 @@ namespace MWWorld
         /// The maximum number of preloaded cells.
         void setMaxCacheSize(unsigned int num);
 
+        /// Enables the creation of instances in the preloading thread.
+        void setPreloadInstances(bool preload);
+
         unsigned int getMaxCacheSize() const;
 
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
@@ -56,6 +59,7 @@ namespace MWWorld
         double mExpiryDelay;
         unsigned int mMinCacheSize;
         unsigned int mMaxCacheSize;
+        bool mPreloadInstances;
 
         struct PreloadEntry
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 33ea9b6a8b..ba9fb95d0b 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -478,6 +478,7 @@ namespace MWWorld
         mPreloader->setExpiryDelay(Settings::Manager::getFloat("preload cell expiry delay", "Cells"));
         mPreloader->setMinCacheSize(Settings::Manager::getInt("preload cell cache min", "Cells"));
         mPreloader->setMaxCacheSize(Settings::Manager::getInt("preload cell cache max", "Cells"));
+        mPreloader->setPreloadInstances(Settings::Manager::getBool("preload instances", "Cells"));
     }
 
     Scene::~Scene()
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ef3d95b3da..3d2cd49bfd 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -52,6 +52,11 @@ preload doors = true
 # Preloading distance threshold
 preload distance = 1000
 
+# Controls whether or not the nodes/collision shapes are pre-"instanced" (i.e. cloned) when a cell is preloaded.
+# Enabling this option slightly reduces the time it takes to transition into a preloaded cell, but also results in higher memory usage
+# proportional to the number of cells that are preloaded.
+preload instances = true
+
 # The minimum amount of cells in the preload cache before unused cells start to get thrown out (see "preload cell expiry delay").
 # This value should be lower or equal to 'preload cell cache max'.
 preload cell cache min = 12

From cf62d860b26f4993f554084403c4a9b017ae5bce Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 30 Mar 2016 01:54:03 +0200
Subject: [PATCH 518/765] Fix the adjustPlayerPos parameter not being respected
 in all cases

---
 apps/openmw/mwworld/scene.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ba9fb95d0b..7061e4418f 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -544,7 +544,7 @@ namespace MWWorld
         // Load cell.
         loadCell (cell, loadingListener, changeEvent);
 
-        changePlayerCell(cell, position, true);
+        changePlayerCell(cell, position, adjustPlayerPos);
 
         // adjust fog
         mRendering.configureFog(mCurrentCell->getCell());

From 7d9dddfa38112bfb6c4ec35bec45e1a70af209a2 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 31 Mar 2016 23:34:47 -0400
Subject: [PATCH 519/765] Place camera farther away, improves preview camera
 placement.

---
 apps/opencs/view/render/cameracontroller.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index bfff161544..d3e1fa53b6 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -94,7 +94,13 @@ namespace CSVRender
 
     void CameraController::setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up)
     {
-        osg::Vec3d eye = osg::Vec3d(bounds.xMax(), bounds.yMax(), bounds.zMax());
+        osg::Vec3d minBounds = bounds.corner(0) - bounds.center();
+        osg::Vec3d maxBounds = bounds.corner(7) - bounds.center();
+
+        osg::Vec3d camOffset = up * maxBounds > 0 ? maxBounds : minBounds;
+        camOffset *= 2;
+
+        osg::Vec3d eye = camOffset + bounds.center();
         osg::Vec3d center = bounds.center();
 
         getCamera()->setViewMatrixAsLookAt(eye, center, up);

From 1e308918911fe28bd032578e2dc765a90953d5f9 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 31 Mar 2016 23:54:20 -0400
Subject: [PATCH 520/765] Broaden selection mask for getting scene bounds if
 nothing is found.

---
 apps/opencs/view/render/scenewidget.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index fe8de40e7b..0515599224 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -319,6 +319,20 @@ void SceneWidget::update(double dt)
 
         mRootNode->accept(boundsVisitor);
 
+        // Remove mask if nothing is found
+        if (!boundingBox.valid())
+        {
+            boundsVisitor.reset();
+            boundsVisitor.setMask(~0);
+            mRootNode->accept(boundsVisitor);
+        }
+
+        // Set a default if there is still nothing found
+        if (!boundingBox.valid())
+        {
+            boundingBox.set(-1, -1, -1, 1, 1, 1);
+        }
+
         mCurrentCamControl->setSceneBounds(boundingBox, CameraController::WorldUp);
 
         mCamPositionSet = true;

From 8f699b5d397093e75301b006c9803b946b60bbdb Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 2 Apr 2016 10:08:03 +0200
Subject: [PATCH 521/765] avoid creating move tags for instances that exist
 only in the currently edited content file

---
 apps/opencs/model/doc/savingstages.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index 775496a194..ee65248e2f 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -11,6 +11,7 @@
 #include <components/misc/stringops.hpp>
 
 #include "../world/infocollection.hpp"
+#include "../world/cellcoordinates.hpp"
 
 #include "document.hpp"
 #include "savingstate.hpp"
@@ -238,7 +239,7 @@ void CSMDoc::CollectionReferencesStage::perform (int stage, Messages& messages)
             // An empty mOriginalCell is meant to indicate that it is the same as
             // the current cell.  It is possible that a moved ref is moved again.
             if ((record.get().mOriginalCell.empty() ?
-                    record.get().mCell : record.get().mOriginalCell) != stream.str() && !interior)
+                    record.get().mCell : record.get().mOriginalCell) != stream.str() && !interior && record.mState!=CSMWorld::RecordBase::State_ModifiedOnly && !record.get().mNew)
                 indices.push_back (i);
             else
                 indices.push_front (i);
@@ -283,7 +284,10 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                 const CSMWorld::Record<CSMWorld::CellRef>& ref =
                     mDocument.getData().getReferences().getRecord (*iter);
 
-                if (ref.get().mNew)
+                if (ref.get().mNew ||
+                    (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
+                    /// \todo consider worldspace
+                    CSMWorld::CellCoordinates (ref.get().getCellIndex()).getId("")!=ref.get().mCell))
                     ++cellRecord.mRefNumCounter;
             }
         }
@@ -325,7 +329,9 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
                         stream << "#" << index.first << " " << index.second;
                     }
 
-                    if (refRecord.mNew)
+                    if (refRecord.mNew ||
+                        (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
+                        refRecord.mCell!=stream.str()))
                     {
                         refRecord.mRefNum.mIndex = newRefNum++;
                     }

From efa2ec21ff8cf2bdcb7017613a3b21e8c4d3e737 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 2 Apr 2016 13:14:46 -0400
Subject: [PATCH 522/765] Cleanup, no need to inherit and override
 osg::ComputeBoundsVisitor

---
 apps/opencs/view/render/cameracontroller.cpp | 27 --------------------
 apps/opencs/view/render/cameracontroller.hpp | 16 ------------
 apps/opencs/view/render/scenewidget.cpp      |  6 +++--
 3 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index d3e1fa53b6..eb0515c28b 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -572,31 +572,4 @@ namespace CSVRender
 
         getCamera()->setViewMatrixAsLookAt(mCenter + offset, mCenter, up);
     }
-
-    CameraComputeBoundsVisitor::CameraComputeBoundsVisitor(unsigned int mask)
-        : mMask(mask)
-    {
-    }
-
-    unsigned int CameraComputeBoundsVisitor::getMask() const
-    {
-        return mMask;
-    }
-
-    void CameraComputeBoundsVisitor::setMask(unsigned int value)
-    {
-        mMask = value;
-    }
-
-    void CameraComputeBoundsVisitor::apply(osg::Drawable& drawable)
-    {
-        if (drawable.getNodeMask() & mMask)
-            ComputeBoundsVisitor::apply(drawable);
-    }
-
-    void CameraComputeBoundsVisitor::apply(osg::Transform& transform)
-    {
-        if (transform.getNodeMask() & mMask)
-            ComputeBoundsVisitor::apply(transform);
-    }
 }
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index fefa3a4221..97a5ef2b26 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -4,7 +4,6 @@
 #include <string>
 
 #include <osg/BoundingBox>
-#include <osg/ComputeBoundsVisitor>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -145,21 +144,6 @@ namespace CSVRender
             double mOrbitSpeed;
             double mOrbitSpeedMult;
     };
-
-    class CameraComputeBoundsVisitor : public osg::ComputeBoundsVisitor
-    {
-    public:
-        CameraComputeBoundsVisitor(unsigned int mask);
-
-        unsigned int getMask() const;
-        void setMask(unsigned int mask);
-
-        void apply(osg::Drawable& drawable);
-        void apply(osg::Transform& transform);
-
-    private:
-        unsigned int mMask;
-    };
 }
 
 #endif
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 0515599224..0ca4950318 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -12,6 +12,7 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 #include <osg/BoundingBox>
+#include <osg/ComputeBoundsVisitor>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FirstPersonManipulator>
@@ -314,8 +315,9 @@ void SceneWidget::update(double dt)
     }
     else
     {
-        CameraComputeBoundsVisitor boundsVisitor(Mask_Reference | Mask_Terrain);
+        osg::ComputeBoundsVisitor boundsVisitor;
         osg::BoundingBox &boundingBox(boundsVisitor.getBoundingBox());
+        boundsVisitor.setNodeMaskOverride(Mask_Reference | Mask_Terrain);
 
         mRootNode->accept(boundsVisitor);
 
@@ -323,7 +325,7 @@ void SceneWidget::update(double dt)
         if (!boundingBox.valid())
         {
             boundsVisitor.reset();
-            boundsVisitor.setMask(~0);
+            boundsVisitor.setNodeMaskOverride(~0);
             mRootNode->accept(boundsVisitor);
         }
 

From a4cc891383221c9eff156926680417c8c1771c00 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 2 Apr 2016 13:36:12 -0400
Subject: [PATCH 523/765] Cleanup, move setup to CameraController class

---
 apps/opencs/view/render/cameracontroller.cpp | 35 +++++++++++++++++---
 apps/opencs/view/render/cameracontroller.hpp |  4 +--
 apps/opencs/view/render/scenewidget.cpp      | 24 +-------------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index eb0515c28b..57c87ecb36 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -2,8 +2,11 @@
 
 #include <QKeyEvent>
 
+#include <osg/BoundingBox>
 #include <osg/Camera>
+#include <osg/ComputeBoundsVisitor>
 #include <osg/Drawable>
+#include <osg/Group>
 #include <osg/Matrixd>
 #include <osg/Quat>
 
@@ -92,16 +95,38 @@ namespace CSVRender
         mWheelMoveMult = value;
     }
 
-    void CameraController::setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up)
+    void CameraController::setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up)
     {
-        osg::Vec3d minBounds = bounds.corner(0) - bounds.center();
-        osg::Vec3d maxBounds = bounds.corner(7) - bounds.center();
+        // Find World bounds
+        osg::ComputeBoundsVisitor boundsVisitor;
+        osg::BoundingBox& boundingBox = boundsVisitor.getBoundingBox();
+
+        boundsVisitor.setNodeMaskOverride(mask);
+        root->accept(boundsVisitor);
+
+        if (!boundingBox.valid())
+        {
+            // Try again without any mask
+            boundsVisitor.reset();
+            boundsVisitor.setNodeMaskOverride(~0);
+            root->accept(boundsVisitor);
+
+            // Last resort, set a default
+            if (!boundingBox.valid())
+            {
+                boundingBox.set(-1, -1, -1, 1, 1, 1);
+            }
+        }
+
+        // Calculate a good starting position
+        osg::Vec3d minBounds = boundingBox.corner(0) - boundingBox.center();
+        osg::Vec3d maxBounds = boundingBox.corner(7) - boundingBox.center();
 
         osg::Vec3d camOffset = up * maxBounds > 0 ? maxBounds : minBounds;
         camOffset *= 2;
 
-        osg::Vec3d eye = camOffset + bounds.center();
-        osg::Vec3d center = bounds.center();
+        osg::Vec3d eye = camOffset + boundingBox.center();
+        osg::Vec3d center = boundingBox.center();
 
         getCamera()->setViewMatrixAsLookAt(eye, center, up);
     }
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 97a5ef2b26..bec76dd431 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -3,7 +3,6 @@
 
 #include <string>
 
-#include <osg/BoundingBox>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -12,6 +11,7 @@ class QKeyEvent;
 namespace osg
 {
     class Camera;
+    class Group;
 }
 
 namespace CSVRender
@@ -43,7 +43,7 @@ namespace CSVRender
             void setWheelMovementMultiplier(double value);
 
             // moves the camera to an intelligent position
-            void setSceneBounds(const osg::BoundingBox& bounds, const osg::Vec3d& up);
+            void setup(osg::Group* root, unsigned int mask, const osg::Vec3d& up);
 
             virtual bool handleKeyEvent(QKeyEvent* event, bool pressed) = 0;
             virtual bool handleMouseMoveEvent(std::string mode, int x, int y) = 0;
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 0ca4950318..9923d6ef0c 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -12,7 +12,6 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 #include <osg/BoundingBox>
-#include <osg/ComputeBoundsVisitor>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FirstPersonManipulator>
@@ -315,28 +314,7 @@ void SceneWidget::update(double dt)
     }
     else
     {
-        osg::ComputeBoundsVisitor boundsVisitor;
-        osg::BoundingBox &boundingBox(boundsVisitor.getBoundingBox());
-        boundsVisitor.setNodeMaskOverride(Mask_Reference | Mask_Terrain);
-
-        mRootNode->accept(boundsVisitor);
-
-        // Remove mask if nothing is found
-        if (!boundingBox.valid())
-        {
-            boundsVisitor.reset();
-            boundsVisitor.setNodeMaskOverride(~0);
-            mRootNode->accept(boundsVisitor);
-        }
-
-        // Set a default if there is still nothing found
-        if (!boundingBox.valid())
-        {
-            boundingBox.set(-1, -1, -1, 1, 1, 1);
-        }
-
-        mCurrentCamControl->setSceneBounds(boundingBox, CameraController::WorldUp);
-
+        mCurrentCamControl->setup(mRootNode, Mask_Reference | Mask_Terrain, CameraController::WorldUp);
         mCamPositionSet = true;
     }
 }

From 99e9017242370f7b61f40df1cc5a31498d13f754 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 2 Apr 2016 13:59:57 -0400
Subject: [PATCH 524/765] Cleanup, externalize mask used to pick center

---
 apps/opencs/view/render/cameracontroller.cpp | 15 ++++++++++++---
 apps/opencs/view/render/cameracontroller.hpp |  3 +++
 apps/opencs/view/render/scenewidget.cpp      |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 57c87ecb36..3967c983d4 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -12,8 +12,6 @@
 
 #include <osgUtil/LineSegmentIntersector>
 
-#include "mask.hpp"
-
 namespace CSVRender
 {
 
@@ -361,6 +359,7 @@ namespace CSVRender
         , mDown(false)
         , mRollLeft(false)
         , mRollRight(false)
+        , mPickingMask(~0)
         , mCenter(0,0,0)
         , mDistance(0)
         , mOrbitSpeed(osg::PI / 4)
@@ -378,6 +377,11 @@ namespace CSVRender
         return mOrbitSpeedMult;
     }
 
+    unsigned int OrbitCameraController::getPickingMask() const
+    {
+        return mPickingMask;
+    }
+
     void OrbitCameraController::setOrbitSpeed(double value)
     {
         mOrbitSpeed = value;
@@ -388,6 +392,11 @@ namespace CSVRender
         mOrbitSpeedMult = value;
     }
 
+    void OrbitCameraController::setPickingMask(unsigned int value)
+    {
+        mPickingMask = value;
+    }
+
     bool OrbitCameraController::handleKeyEvent(QKeyEvent* event, bool pressed)
     {
         if (!isActive())
@@ -523,7 +532,7 @@ namespace CSVRender
         intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_NEAREST);
         osgUtil::IntersectionVisitor visitor(intersector);
 
-        visitor.setTraversalMask(Mask_Reference | Mask_Terrain);
+        visitor.setTraversalMask(mPickingMask);
 
         getCamera()->accept(visitor);
 
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index bec76dd431..7c1f96e15f 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -115,9 +115,11 @@ namespace CSVRender
 
             double getOrbitSpeed() const;
             double getOrbitSpeedMultiplier() const;
+            unsigned int getPickingMask() const;
 
             void setOrbitSpeed(double value);
             void setOrbitSpeedMultiplier(double value);
+            void setPickingMask(unsigned int value);
 
             bool handleKeyEvent(QKeyEvent* event, bool pressed);
             bool handleMouseMoveEvent(std::string mode, int x, int y);
@@ -138,6 +140,7 @@ namespace CSVRender
 
             bool mInitialized;
             bool mFast, mLeft, mRight, mUp, mDown, mRollLeft, mRollRight;
+            unsigned int mPickingMask;
             osg::Vec3d mCenter;
             double mDistance;
 
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 9923d6ef0c..fea29effd0 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -167,6 +167,7 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
     , mCurrentCamControl(mFreeCamControl.get())
     , mCamPositionSet(false)
 {
+    mOrbitCamControl->setPickingMask(Mask_Reference | Mask_Terrain);
     selectNavigationMode("free");
 
     // we handle lighting manually

From 02f991c63ea1077150bdcea612016b047ee6a17b Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 2 Apr 2016 14:02:56 -0400
Subject: [PATCH 525/765] Cleanup, fix comment

---
 apps/opencs/model/prefs/doublesetting.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/prefs/doublesetting.hpp b/apps/opencs/model/prefs/doublesetting.hpp
index 6fe6b772a5..8fd345f4d0 100644
--- a/apps/opencs/model/prefs/doublesetting.hpp
+++ b/apps/opencs/model/prefs/doublesetting.hpp
@@ -21,9 +21,9 @@ namespace CSMPrefs
                 QMutex *mutex, const std::string& key, const std::string& label,
                 double default_);
 
-            // defaults to [0, std::numeric_limits<double>::max()]
             DoubleSetting& setPrecision (int precision);
 
+            // defaults to [0, std::numeric_limits<double>::max()]
             DoubleSetting& setRange (double min, double max);
 
             DoubleSetting& setMin (double min);

From 79c8f69b245f0bf503c933c15f62a58777f568ae Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Apr 2016 20:23:28 +0200
Subject: [PATCH 526/765] Clear the class selected / race selected flags when
 starting a new game (Fixes #3326)

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index ece0a2fbc8..7810df2790 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1540,6 +1540,8 @@ namespace MWMechanics
     {
         mActors.clear();
         mStolenItems.clear();
+        mClassSelected = false;
+        mRaceSelected = false;
     }
 
     bool MechanicsManager::isAggressive(const MWWorld::Ptr &ptr, const MWWorld::Ptr &target)

From 4ef9981544b48677f28cc88de3d9b92c676030f3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 3 Apr 2016 16:30:50 -0400
Subject: [PATCH 527/765] Add ability to set orbit camera center outside of
 class.

---
 apps/opencs/view/render/cameracontroller.cpp | 18 ++++++++++++++++++
 apps/opencs/view/render/cameracontroller.hpp |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 3967c983d4..ab066033b8 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -367,6 +367,11 @@ namespace CSVRender
     {
     }
 
+    osg::Vec3d OrbitCameraController::getCenter() const
+    {
+        return mCenter;
+    }
+
     double OrbitCameraController::getOrbitSpeed() const
     {
         return mOrbitSpeed;
@@ -382,6 +387,19 @@ namespace CSVRender
         return mPickingMask;
     }
 
+    void OrbitCameraController::setCenter(const osg::Vec3d& value)
+    {
+        osg::Vec3d eye, center, up;
+        getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+        mCenter = value;
+        mDistance = (eye - mCenter).length();
+
+        getCamera()->setViewMatrixAsLookAt(eye, mCenter, up);
+
+        mInitialized = true;
+    }
+
     void OrbitCameraController::setOrbitSpeed(double value)
     {
         mOrbitSpeed = value;
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 7c1f96e15f..b1dcc320ae 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -113,10 +113,12 @@ namespace CSVRender
 
             OrbitCameraController();
 
+            osg::Vec3d getCenter() const;
             double getOrbitSpeed() const;
             double getOrbitSpeedMultiplier() const;
             unsigned int getPickingMask() const;
 
+            void setCenter(const osg::Vec3d& center);
             void setOrbitSpeed(double value);
             void setOrbitSpeedMultiplier(double value);
             void setPickingMask(unsigned int value);

From 6c471349f0f36eed48993de43ace2f9cdc1f394d Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 3 Apr 2016 16:32:07 -0400
Subject: [PATCH 528/765] Add context menu for orbit camera.

---
 apps/opencs/CMakeLists.txt                   |  1 +
 apps/opencs/view/render/orbitcameramode.cpp  | 37 ++++++++++++++++++++
 apps/opencs/view/render/orbitcameramode.hpp  | 33 +++++++++++++++++
 apps/opencs/view/render/worldspacewidget.cpp | 36 ++++++++++++++-----
 apps/opencs/view/render/worldspacewidget.hpp |  2 ++
 5 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 apps/opencs/view/render/orbitcameramode.cpp
 create mode 100644 apps/opencs/view/render/orbitcameramode.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 79876224db..816b8d732d 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -86,6 +86,7 @@ opencs_units (view/widget
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
+    orbitcameramode
     )
 
 opencs_units_noqt (view/render
diff --git a/apps/opencs/view/render/orbitcameramode.cpp b/apps/opencs/view/render/orbitcameramode.cpp
new file mode 100644
index 0000000000..e6f3612c6c
--- /dev/null
+++ b/apps/opencs/view/render/orbitcameramode.cpp
@@ -0,0 +1,37 @@
+#include "orbitcameramode.hpp"
+
+#include <QMenu>
+
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    OrbitCameraMode::OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip,
+        QWidget* parent)
+        : ModeButton(icon, tooltip, parent)
+        , mWorldspaceWidget(worldspaceWidget)
+        , mCenterOnSelection(0)
+    {
+    }
+
+    void OrbitCameraMode::activate(CSVWidget::SceneToolbar* toolbar)
+    {
+        mCenterOnSelection = new QAction("Center on selected object", this);
+        connect(mCenterOnSelection, SIGNAL(triggered()), this, SLOT(centerSelection()));
+    }
+
+    bool OrbitCameraMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            menu->addAction(mCenterOnSelection);
+        }
+
+        return true;
+    }
+
+    void OrbitCameraMode::centerSelection()
+    {
+        mWorldspaceWidget->centerOrbitCameraOnSelection();
+    }
+}
diff --git a/apps/opencs/view/render/orbitcameramode.hpp b/apps/opencs/view/render/orbitcameramode.hpp
new file mode 100644
index 0000000000..cd8387084b
--- /dev/null
+++ b/apps/opencs/view/render/orbitcameramode.hpp
@@ -0,0 +1,33 @@
+#ifndef CSV_RENDER_ORBITCAMERAPICKMODE_H
+#define CSV_RENDER_ORBITCAMERAPICKMODE_H
+
+#include "../widget/modebutton.hpp"
+
+namespace CSVRender
+{
+    class WorldspaceWidget;
+
+    class OrbitCameraMode : public CSVWidget::ModeButton
+    {
+            Q_OBJECT
+
+        public:
+
+            OrbitCameraMode(WorldspaceWidget* worldspaceWidget, const QIcon& icon, const QString& tooltip = "",
+                QWidget* parent = 0);
+
+            virtual void activate(CSVWidget::SceneToolbar* toolbar);
+            virtual bool createContextMenu(QMenu* menu);
+
+        private:
+
+            WorldspaceWidget* mWorldspaceWidget;
+            QAction* mCenterOnSelection;
+
+        private slots:
+
+            void centerSelection();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 3cd2c4093a..927ce545fe 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -19,6 +19,8 @@
 
 #include "../../model/prefs/state.hpp"
 
+#include "../render/orbitcameramode.hpp"
+
 #include "../widget/scenetoolmode.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolrun.hpp"
@@ -27,6 +29,7 @@
 #include "mask.hpp"
 #include "editmode.hpp"
 #include "instancemode.hpp"
+#include "cameracontroller.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
 : SceneWidget (document.getData().getResourceSystem(), parent, 0, false), mSceneElements(0), mRun(0), mDocument(document),
@@ -99,6 +102,19 @@ void CSVRender::WorldspaceWidget::selectDefaultNavigationMode()
     selectNavigationMode("1st");
 }
 
+void CSVRender::WorldspaceWidget::centerOrbitCameraOnSelection()
+{
+    std::vector<osg::ref_ptr<TagBase> > selection = getSelection(~0);
+
+    for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it!=selection.end(); ++it)
+    {
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag*> (it->get()))
+        {
+            mOrbitCamControl->setCenter(objectTag->mObject->getPosition().asVec3());
+        }
+    }
+}
+
 CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
     CSVWidget::SceneToolbar *parent)
 {
@@ -123,15 +139,17 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
         "<li>Roll camera with Q and E keys</li>"
         "<li>Hold shift to speed up movement</li>"
         "</ul>");
-    tool->addButton (":scenetoolbar/orbiting-camera", "orbit",
-        "Orbiting Camera"
-        "<ul><li>Always facing the centre point</li>"
-        "<li>Rotate around the centre point via WASD or by moving the mouse while holding the left button</li>"
-        "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
-        "<li>Roll camera with Q and E keys</li>"
-        "<li>Strafing (also vertically) by holding the left mouse button and control (includes relocation of the centre point)</li>"
-        "<li>Hold shift to speed up movement</li>"
-        "</ul>");
+    tool->addButton(
+        new CSVRender::OrbitCameraMode(this, QIcon(":scenetoolbar/orbiting-camera"),
+            "Orbiting Camera"
+            "<ul><li>Always facing the centre point</li>"
+            "<li>Rotate around the centre point via WASD or by moving the mouse while holding the left button</li>"
+            "<li>Mouse wheel moves camera away or towards centre point but can not pass through it</li>"
+            "<li>Roll camera with Q and E keys</li>"
+            "<li>Strafing (also vertically) by holding the left mouse button and control (includes relocation of the centre point)</li>"
+            "<li>Hold shift to speed up movement</li>"
+            "</ul>", tool),
+        "orbit");
 
     connect (tool, SIGNAL (modeChanged (const std::string&)),
         this, SLOT (selectNavigationMode (const std::string&)));
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 36aae03290..b18123944a 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -97,6 +97,8 @@ namespace CSVRender
 
             void selectDefaultNavigationMode();
 
+            void centerOrbitCameraOnSelection();
+
             static DropType getDropType(const std::vector<CSMWorld::UniversalId>& data);
 
             virtual dropRequirments getDropRequirements(DropType type) const;

From 0ef7c778e0e939567d11a9250afc7ddcaed9bc14 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 3 Apr 2016 17:26:34 -0400
Subject: [PATCH 529/765] Cleanup, isModified was a remnant of an old design
 and is only used in the first person camera mode.

---
 apps/opencs/view/render/cameracontroller.cpp | 48 ++++----------------
 apps/opencs/view/render/cameracontroller.hpp |  8 +---
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index ab066033b8..cf10cb3464 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -27,7 +27,6 @@ namespace CSVRender
 
     CameraController::CameraController()
         : mActive(false)
-        , mModified(false)
         , mCameraSensitivity(1/650.f)
         , mSecondaryMoveMult(50)
         , mWheelMoveMult(8)
@@ -44,11 +43,6 @@ namespace CSVRender
         return mActive;
     }
 
-    bool CameraController::isModified() const
-    {
-        return mModified;
-    }
-
     osg::Camera* CameraController::getCamera() const
     {
         return mCamera;
@@ -129,22 +123,13 @@ namespace CSVRender
         getCamera()->setViewMatrixAsLookAt(eye, center, up);
     }
 
-    void CameraController::setModified()
-    {
-        mModified = true;
-    }
-
-    void CameraController::resetModified()
-    {
-        mModified = false;
-    }
-
     /*
     Free Camera Controller
     */
 
     FreeCameraController::FreeCameraController()
         : mLockUpright(false)
+        , mModified(false)
         , mFast(false)
         , mLeft(false)
         , mRight(false)
@@ -193,7 +178,7 @@ namespace CSVRender
     {
         mLockUpright = true;
         mUp = up;
-        setModified();
+        mModified = true;
     }
 
     void FreeCameraController::unfixUpAxis()
@@ -209,37 +194,30 @@ namespace CSVRender
         if (event->key() == Qt::Key_Q)
         {
             mRollLeft = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_E)
         {
             mRollRight = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_A)
         {
             mLeft = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_D)
         {
             mRight = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_W)
         {
             mForward = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_S)
         {
             mBackward = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_Shift)
         {
             mFast = pressed;
-            setModified();
         }
         else
         {
@@ -258,7 +236,6 @@ namespace CSVRender
         {
             yaw(x * getCameraSensitivity());
             pitch(y * getCameraSensitivity());
-            setModified();
         }
         else if (mode == "s-navi")
         {
@@ -267,7 +244,6 @@ namespace CSVRender
             movement += LocalUp * y * getSecondaryMovementMultiplier();
 
             translate(movement);
-            setModified();
         }
         else if (mode == "t-navi")
         {
@@ -308,35 +284,38 @@ namespace CSVRender
             if (mRollRight)
                 roll(rotDist);
         }
-        else if(isModified())
+        else if(mModified)
         {
             stabilize();
+            mModified = false;
         }
 
         // Normalize the matrix to counter drift
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
-
-        resetModified();
     }
 
     void FreeCameraController::yaw(double value)
     {
         getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalUp);
+        mModified = true;
     }
 
     void FreeCameraController::pitch(double value)
     {
         getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalLeft);
+        mModified = true;
     }
 
     void FreeCameraController::roll(double value)
     {
         getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalForward);
+        mModified = true;
     }
 
     void FreeCameraController::translate(const osg::Vec3d& offset)
     {
         getCamera()->getViewMatrix() *= osg::Matrixd::translate(offset);
+        mModified = true;
     }
 
     void FreeCameraController::stabilize()
@@ -426,37 +405,30 @@ namespace CSVRender
         if (event->key() == Qt::Key_Q)
         {
             mRollLeft = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_E)
         {
             mRollRight = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_A)
         {
             mLeft = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_D)
         {
             mRight = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_W)
         {
             mUp = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_S)
         {
             mDown = pressed;
-            setModified();
         }
         else if (event->key() == Qt::Key_Shift)
         {
             mFast = pressed;
-            setModified();
         }
         else
         {
@@ -478,7 +450,6 @@ namespace CSVRender
         {
             rotateHorizontal(x * getCameraSensitivity());
             rotateVertical(-y * getCameraSensitivity());
-            setModified();
         }
         else if (mode == "s-navi")
         {
@@ -487,7 +458,6 @@ namespace CSVRender
             movement += LocalUp * -y * getSecondaryMovementMultiplier();
 
             translate(movement);
-            setModified();
         }
         else if (mode == "t-navi")
         {
@@ -530,8 +500,6 @@ namespace CSVRender
 
         // Normalize the matrix to counter drift
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
-
-        resetModified();
     }
 
     void OrbitCameraController::onActivate()
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index b1dcc320ae..be83181ed0 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -30,7 +30,6 @@ namespace CSVRender
             virtual ~CameraController();
 
             bool isActive() const;
-            bool isModified() const;
 
             osg::Camera* getCamera() const;
             double getCameraSensitivity() const;
@@ -52,14 +51,11 @@ namespace CSVRender
 
         protected:
 
-            void setModified();
-            void resetModified();
-
             virtual void onActivate(){}
 
         private:
 
-            bool mActive, mModified;
+            bool mActive;
             double mCameraSensitivity;
             double mSecondaryMoveMult;
             double mWheelMoveMult;
@@ -98,7 +94,7 @@ namespace CSVRender
 
             void stabilize();
 
-            bool mLockUpright;
+            bool mLockUpright, mModified;
             bool mFast, mLeft, mRight, mForward, mBackward, mRollLeft, mRollRight;
             osg::Vec3d mUp;
 

From ec25998b12b2d5b32ef6e442bc79cfbd5ae360cd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 3 Apr 2016 18:19:20 -0400
Subject: [PATCH 530/765] Cleanup, use setTraversalMask instead of
 setNodeMaskOverride

---
 apps/opencs/view/render/cameracontroller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index cf10cb3464..0ca8aabf15 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -93,14 +93,14 @@ namespace CSVRender
         osg::ComputeBoundsVisitor boundsVisitor;
         osg::BoundingBox& boundingBox = boundsVisitor.getBoundingBox();
 
-        boundsVisitor.setNodeMaskOverride(mask);
+        boundsVisitor.setTraversalMask(mask);
         root->accept(boundsVisitor);
 
         if (!boundingBox.valid())
         {
             // Try again without any mask
             boundsVisitor.reset();
-            boundsVisitor.setNodeMaskOverride(~0);
+            boundsVisitor.setTraversalMask(~0);
             root->accept(boundsVisitor);
 
             // Last resort, set a default

From e127c691e22b94f813e2e9618e4cfaf7234352f4 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 3 Apr 2016 18:23:06 -0400
Subject: [PATCH 531/765] Cleanup, remove some unused includes

---
 apps/opencs/view/render/scenewidget.cpp             | 4 ----
 apps/opencs/view/render/unpagedworldspacewidget.cpp | 2 --
 2 files changed, 6 deletions(-)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index fea29effd0..6379f8eca6 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -11,10 +11,6 @@
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
-#include <osg/BoundingBox>
-
-#include <osgGA/TrackballManipulator>
-#include <osgGA/FirstPersonManipulator>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 4ed71ac961..79ffd4fb0a 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -2,8 +2,6 @@
 
 #include <sstream>
 
-#include <osgGA/TrackballManipulator>
-
 #include <QEvent>
 
 #include <components/sceneutil/util.hpp>

From e07687ee01c0b91165312f55349c6baa92f9cf92 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 4 Apr 2016 18:42:57 -0400
Subject: [PATCH 532/765] Add button for camera mouse inversion in user
 preferences, and separate the sensitivity settings for orbit and free
 cameras.

---
 apps/opencs/model/prefs/state.cpp            |  5 ++++-
 apps/opencs/view/render/cameracontroller.cpp | 21 ++++++++++++++++----
 apps/opencs/view/render/cameracontroller.hpp |  4 +++-
 apps/opencs/view/render/scenewidget.cpp      | 13 +++++++++++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index fd6c7b6ed5..70456ee1d0 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -172,7 +172,10 @@ void CSMPrefs::State::declare()
     inputButtons.add (left).add (cLeft).add (right).add (cRight).add (middle).add (cMiddle);
     declareEnum ("p-navi", "Primary Camera Navigation Button", left).addValues (inputButtons);
     declareEnum ("s-navi", "Secondary Camera Navigation Button", cLeft).addValues (inputButtons);
-    declareDouble ("p-navi-sensitivity", "Camera Sensitivity", 1/650.).setPrecision(4).setRange(-2.0, 2.0);
+    declareDouble ("p-navi-free-sensitivity", "Free Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool ("p-navi-free-invert", "Invert Free Camera Mouse Input", false);
+    declareDouble ("p-navi-orbit-sensitivity", "Orbit Camera Sensitivity", 1/650.).setPrecision(5).setRange(0.0, 1.0);
+    declareBool ("p-navi-orbit-invert", "Invert Orbit Camera Mouse Input", false);
     declareDouble ("s-navi-sensitivity", "Secondary Camera Movement Sensitivity", 50.0).setRange(-1000.0, 1000.0);
     declareDouble ("navi-wheel-factor", "Camera Zoom Sensitivity", 8).setRange(-100.0, 100.0);
     declareDouble ("navi-free-lin-speed", "Free Camera Linear Speed", 1000.0).setRange(1.0, 10000.0);
diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 0ca8aabf15..cefd81003a 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -27,6 +27,7 @@ namespace CSVRender
 
     CameraController::CameraController()
         : mActive(false)
+        , mInverted(false)
         , mCameraSensitivity(1/650.f)
         , mSecondaryMoveMult(50)
         , mWheelMoveMult(8)
@@ -53,6 +54,11 @@ namespace CSVRender
         return mCameraSensitivity;
     }
 
+    bool CameraController::getInverted() const
+    {
+        return mInverted;
+    }
+
     double CameraController::getSecondaryMovementMultiplier() const
     {
         return mSecondaryMoveMult;
@@ -77,6 +83,11 @@ namespace CSVRender
         mCameraSensitivity = value;
     }
 
+    void CameraController::setInverted(bool value)
+    {
+        mInverted = value;
+    }
+
     void CameraController::setSecondaryMovementMultiplier(double value)
     {
         mSecondaryMoveMult = value;
@@ -234,8 +245,9 @@ namespace CSVRender
 
         if (mode == "p-navi")
         {
-            yaw(x * getCameraSensitivity());
-            pitch(y * getCameraSensitivity());
+            double scalar = getCameraSensitivity() * (getInverted() ? -1.0 : 1.0);
+            yaw(x * scalar);
+            pitch(y * scalar);
         }
         else if (mode == "s-navi")
         {
@@ -448,8 +460,9 @@ namespace CSVRender
 
         if (mode == "p-navi")
         {
-            rotateHorizontal(x * getCameraSensitivity());
-            rotateVertical(-y * getCameraSensitivity());
+            double scalar = getCameraSensitivity() * (getInverted() ? -1.0 : 1.0);
+            rotateHorizontal(x * scalar);
+            rotateVertical(-y * scalar);
         }
         else if (mode == "s-navi")
         {
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index be83181ed0..575bbb4ea7 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -33,11 +33,13 @@ namespace CSVRender
 
             osg::Camera* getCamera() const;
             double getCameraSensitivity() const;
+            bool getInverted() const;
             double getSecondaryMovementMultiplier() const;
             double getWheelMovementMultiplier() const;
 
             void setCamera(osg::Camera*);
             void setCameraSensitivity(double value);
+            void setInverted(bool value);
             void setSecondaryMovementMultiplier(double value);
             void setWheelMovementMultiplier(double value);
 
@@ -55,7 +57,7 @@ namespace CSVRender
 
         private:
 
-            bool mActive;
+            bool mActive, mInverted;
             double mCameraSensitivity;
             double mSecondaryMoveMult;
             double mWheelMoveMult;
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 6379f8eca6..2ba3965639 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -318,11 +318,22 @@ void SceneWidget::update(double dt)
 
 void SceneWidget::settingChanged (const CSMPrefs::Setting *setting)
 {
-    if (*setting=="3D Scene Input/p-navi-sensitivity")
+    if (*setting=="3D Scene Input/p-navi-free-sensitivity")
     {
         mFreeCamControl->setCameraSensitivity(setting->toDouble());
+    }
+    else if (*setting=="3D Scene Input/p-navi-orbit-sensitivity")
+    {
         mOrbitCamControl->setCameraSensitivity(setting->toDouble());
     }
+    else if (*setting=="3D Scene Input/p-navi-free-invert")
+    {
+        mFreeCamControl->setInverted(setting->isTrue());
+    }
+    else if (*setting=="3D Scene Input/p-navi-orbit-invert")
+    {
+        mOrbitCamControl->setInverted(setting->isTrue());
+    }
     else if (*setting=="3D Scene Input/s-navi-sensitivity")
     {
         mFreeCamControl->setSecondaryMovementMultiplier(setting->toDouble());

From b111febfc9d8d25dbe2d19af75d6c810a30c69fc Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 4 Apr 2016 20:56:13 -0400
Subject: [PATCH 533/765] Add pitch constraint for first person camera.

---
 apps/opencs/view/render/cameracontroller.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index cefd81003a..68f0c76ef8 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -1,5 +1,7 @@
 #include "cameracontroller.hpp"
 
+#include <cmath>
+
 #include <QKeyEvent>
 
 #include <osg/BoundingBox>
@@ -314,6 +316,24 @@ namespace CSVRender
 
     void FreeCameraController::pitch(double value)
     {
+        const double Constraint = osg::PI / 2 - 0.1;
+
+        if (mLockUpright)
+        {
+            osg::Vec3d eye, center, up;
+            getCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+            osg::Vec3d forward = center - eye;
+            osg::Vec3d left = up ^ forward;
+
+            double pitchAngle = std::acos(up * mUp);
+            if ((mUp ^ up) * left < 0)
+                pitchAngle *= -1;
+
+            if (std::abs(pitchAngle + value) > Constraint)
+                value = (pitchAngle > 0 ? 1 : -1) * Constraint - pitchAngle;
+        }
+
         getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalLeft);
         mModified = true;
     }

From 62af1b67cfe9388ef5851e5c74764f15c6847277 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 5 Apr 2016 09:27:20 +0200
Subject: [PATCH 534/765] increased version number

---
 CMakeLists.txt | 2 +-
 README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baaa241f6c..2fdd0e8e5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 38)
+set(OPENMW_VERSION_MINOR 39)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
diff --git a/README.md b/README.md
index 9de814fd01..b1db74549d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ OpenMW is a recreation of the engine for the popular role-playing game Morrowind
 
 OpenMW also comes with OpenMW-CS, a replacement for Morrowind's TES Construction Set.
 
-* Version: 0.38.0
+* Version: 0.39.0
 * License: GPL (see docs/license/GPL3.txt for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net

From b103e285323a5925ef6b2420fb77516abcec9d49 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 5 Apr 2016 09:33:25 +0200
Subject: [PATCH 535/765] updated changelog

---
 CHANGELOG.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de4a6fc248..d541e39b90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,87 @@
+0.39.0
+------
+
+    Bug #1384: Dark Brotherhood Assassin (and other scripted NPCs?) spawns beneath/inside solid objects
+    Bug #1544: "Drop" drops equipped item in a separate stack
+    Bug #1587: Collision detection glitches
+    Bug #1629: Container UI locks up in Vivec at Jeanne's
+    Bug #1771: Dark Brotherhood Assassin oddity in Eight Plates
+    Bug #1827: Unhandled NiTextureEffect in ex_dwrv_ruin30.nif
+    Bug #2089: When saving while swimming in water in an interior cell, you will be spawned under water on loading
+    Bug #2295: Internal texture not showing, nipixeldata
+    Bug #2363: Corpses don't disappear
+    Bug #2369: Respawns should be timed individually
+    Bug #2393: Сharacter is stuck in the tree
+    Bug #2444: [Mod] NPCs from Animated Morrowind appears not using proper animations
+    Bug #2467: Creatures do not respawn
+    Bug #2515: Ghosts in Ibar-Dad spawn stuck in walls
+    Bug #2610: FixMe script still needs to be implemented
+    Bug #2689: Riekling raider pig constantly screams while running
+    Bug #2719: Vivec don't put their hands on the knees with this replacer (Psymoniser Vivec God Replacement NPC Edition v1.0
+    Bug #2737: Camera shaking when side stepping around object
+    Bug #2760: AI Combat Priority Problem - Use of restoration spell instead of attacking
+    Bug #2806: Stack overflow in LocalScripts::getNext
+    Bug #2807: Collision detection allows player to become stuck inside objects
+    Bug #2814: Stairs to Marandus have improper collision
+    Bug #2925: Ranes Ienith will not appear, breaking the Morag Tong and Thieves Guid questlines
+    Bug #3024: Editor: Creator bar in startscript subview does not accept script ID drops
+    Bug #3046: Sleep creature: Velk is spawned half-underground in the Thirr River Valley
+    Bug #3080: Calling aifollow without operant in local script every frame causes mechanics to overheat + log
+    Bug #3101: Regression: White guar does not move
+    Bug #3108: Game Freeze after Killing Diseased Rat in Foreign Quarter Tomb
+    Bug #3124: Bloodmoon Quest - Rite of the Wolf Giver (BM_WolfGiver) – Innocent victim won't turn werewolf
+    Bug #3125: Improper dialogue window behavior when talking to creatures
+    Bug #3130: Some wandering NPCs disappearing, cannot finish quests
+    Bug #3132: Editor: GMST ID named sMake Enchantment is instead named sMake when making new game from scratch
+    Bug #3133: OpenMW and the OpenCS are writting warnings about scripts that use the function GetDisabled.
+    Bug #3135: Journal entry for The Pigrim's Path missing name
+    Bug #3136: Dropped bow is displaced
+    Bug #3140: Editor: OpenMW-CS fails to open newly converted and saved omwaddon file.
+    Bug #3142: Duplicate Resist Magic message
+    Bug #3143: Azura missing her head
+    Bug #3146: Potion effect showing when ingredient effects are not known
+    Bug #3155: When executing chop attack with a spear, hands turn partly invisible
+    Bug #3161: Fast travel from Silt Strider or Boat Ride will break save files made afterwards
+    Bug #3173: Game Crashes After Casting Recall Spell
+    Bug #3174: Constant effect enchantments play spell animation on dead bodies
+    Bug #3175: Spell effects do not wear down when caster dies
+    Bug #3176: NPCs appearing randomly far away from towns
+    Bug #3177: Submerged corpse floats ontop of water when it shouldn't (Widow Vabdas' Deed quest)
+    Bug #3184: Bacola Closcius in Balmora, South Wall Cornerclub spams magic effects if attacked
+    Bug #3207: Editor: New objects do not render
+    Bug #3212: Arrow of Ranged Silence
+    Bug #3213: Looking at Floor After Magical Transport
+    Bug #3220: The number of remaining ingredients in the alchemy window doesn't go down when failing to brew a potion
+    Bug #3222: Falling through the water in Vivec
+    Bug #3223: Crash at the beginning with MOD (The Symphony)
+    Bug #3228: Purple screen when leveling up.
+    Bug #3233: Infinite disposition via MWDialogue::Filter::testDisposition() glitch
+    Bug #3234: Armor mesh stuck on body in inventory menu
+    Bug #3235: Unlike vanilla, OpenMW don't allow statics and activators cast effects on the player.
+    Bug #3238: Not loading cells when using Poorly Placed Object Fix.esm
+    Bug #3248: Editor: Using the "Next Script" and "Previous Script" buttons changes the record status to "Modified"
+    Bug #3258: Woman biped skeleton
+    Bug #3259: No alternating punches
+    Bug #3262: Crash in class selection menu
+    Bug #3279: Load menu: Deleting a savegame makes scroll bar jump to the top
+    Bug #3326: Starting a new game, getting to class selection, then starting another new game temporarily assigns Acrobat class
+    Bug #3327: Stuck in table after loading when character was sneaking when quicksave
+    Feature #652: Editor: GMST verifier
+    Feature #929: Editor: Info record verifier
+    Feature #1279: Editor: Render cell border markers
+    Feature #2482: Background cell loading and caching of loaded cells
+    Feature #2484: Editor: point lighting
+    Feature #2801: Support NIF bump map textures in osg
+    Feature #2926: Editor: Optional line wrap in script editor wrap lines
+    Feature #3000: Editor: Reimplement 3D scene camera system
+    Feature #3035: Editor: Make scenes a drop target for referenceables
+    Feature #3043: Editor: Render cell markers v2
+    Feature #3164: Editor: Instance Selection Menu
+    Feature #3165: Editor: Instance editing mode - move sub mode
+    Feature #3244: Allow changing water Level of Interiors behaving like exteriors
+    Feature #3250: Editor: Use "Enter" key instead of clicking "Create" button to confirm ID input in Creator Bar
+    Support #3179: Fatal error on startup
+
 0.38.0
 ------
 

From 5e38fcac369c085f2ea4d3be2d9c657f2a3514cd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 02:18:19 -0400
Subject: [PATCH 536/765] Add ability to edit region weather probabilities.

---
 apps/opencs/model/world/columnbase.hpp        |   1 +
 apps/opencs/model/world/columns.cpp           |   4 +
 apps/opencs/model/world/columns.hpp           |   4 +
 apps/opencs/model/world/data.cpp              |  10 +-
 .../model/world/nestedcoladapterimp.cpp       | 101 ++++++++++++++++++
 .../model/world/nestedcoladapterimp.hpp       |  25 +++++
 apps/opencs/view/world/util.cpp               |   7 ++
 7 files changed, 151 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index c75a3c2a12..1eb6a88c1c 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -85,6 +85,7 @@ namespace CSMWorld
             Display_Enchantment,
             //CONCRETE TYPES ENDS HERE
 
+            Display_UnsignedInteger8,
             Display_Integer,
             Display_Float,
             Display_Var,
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 32aa7edcab..b72634bee8 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -326,6 +326,10 @@ namespace CSMWorld
             { ColumnId_Idle7, "Idle 7" },
             { ColumnId_Idle8, "Idle 8" },
 
+            { ColumnId_RegionWeather, "Weather" },
+            { ColumnId_WeatherName, "Type" },
+            { ColumnId_WeatherChance, "Clear" },
+
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
             { ColumnId_UseValue3, "Use value 3" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index a504e5f659..05bedb77d5 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -325,6 +325,10 @@ namespace CSMWorld
             ColumnId_Idle7 = 292,
             ColumnId_Idle8 = 293,
 
+            ColumnId_RegionWeather = 294,
+            ColumnId_WeatherName = 295,
+            ColumnId_WeatherChance = 296,
+
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
             ColumnId_UseValue1 = 0x10000,
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index b54df596cb..5c81d3b08b 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -177,6 +177,14 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
     mRegions.addColumn (new NameColumn<ESM::Region>);
     mRegions.addColumn (new MapColourColumn<ESM::Region>);
     mRegions.addColumn (new SleepListColumn<ESM::Region>);
+    // Region Weather
+    mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionWeather));
+    index = mRegions.getColumns()-1;
+    mRegions.addAdapter (std::make_pair(&mRegions.getColumn(index), new RegionWeatherAdapter ()));
+    mRegions.getNestableColumn(index)->addColumn(
+        new NestedChildColumn (Columns::ColumnId_WeatherName, ColumnBase::Display_String, false));
+    mRegions.getNestableColumn(index)->addColumn(
+        new NestedChildColumn (Columns::ColumnId_WeatherChance, ColumnBase::Display_UnsignedInteger8));
     // Region Sounds
     mRegions.addColumn (new NestedParentColumn<ESM::Region> (Columns::ColumnId_RegionSounds));
     index = mRegions.getColumns()-1;
@@ -1046,7 +1054,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
                 else
                 {
                     mTopics.load (record, mBase);
-                    mDialogue = &mTopics.getRecord (record.mId).get();   
+                    mDialogue = &mTopics.getRecord (record.mId).get();
                 }
             }
 
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 1bcd6b1b4c..3189f76ed9 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -1027,4 +1027,105 @@ namespace CSMWorld
     {
         return 1; // fixed at size 1
     }
+
+    RegionWeatherAdapter::RegionWeatherAdapter () {}
+
+    void RegionWeatherAdapter::addRow(Record<ESM::Region>& record, int position) const
+    {
+        throw std::logic_error ("cannot add a row to a fixed table");
+    }
+
+    void RegionWeatherAdapter::removeRow(Record<ESM::Region>& record, int rowToRemove) const
+    {
+        throw std::logic_error ("cannot remove a row from a fixed table");
+    }
+
+    void RegionWeatherAdapter::setTable(Record<ESM::Region>& record, const NestedTableWrapperBase& nestedTable) const
+    {
+        throw std::logic_error ("table operation not supported");
+    }
+
+    NestedTableWrapperBase* RegionWeatherAdapter::table(const Record<ESM::Region>& record) const
+    {
+        throw std::logic_error ("table operation not supported");
+    }
+
+    QVariant RegionWeatherAdapter::getData(const Record<ESM::Region>& record, int subRowIndex, int subColIndex) const
+    {
+        const char* WeatherNames[] = {
+            "Clear",
+            "Cloudy",
+            "Fog",
+            "Overcast",
+            "Rain",
+            "Thunder",
+            "Ash",
+            "Blight",
+            "Snow",
+            "Blizzard"
+        };
+
+        const ESM::Region& region = record.get();
+
+        if (subColIndex == 0 && subRowIndex >= 0 && subRowIndex < 10)
+        {
+            return WeatherNames[subRowIndex];
+        }
+        else if (subColIndex == 1)
+        {
+            switch (subRowIndex)
+            {
+                case 0: return region.mData.mClear;
+                case 1: return region.mData.mCloudy;
+                case 2: return region.mData.mFoggy;
+                case 3: return region.mData.mOvercast;
+                case 4: return region.mData.mRain;
+                case 5: return region.mData.mThunder;
+                case 6: return region.mData.mAsh;
+                case 7: return region.mData.mBlight;
+                case 8: return region.mData.mA; // Snow
+                case 9: return region.mData.mB; // Blizzard
+                default: break;
+            }
+        }
+
+        throw std::runtime_error("index out of range");
+    }
+
+    void RegionWeatherAdapter::setData(Record<ESM::Region>& record, const QVariant& value, int subRowIndex,
+        int subColIndex) const
+    {
+        ESM::Region region = record.get();
+        unsigned char chance = static_cast<unsigned char>(value.toInt());
+
+        if (subColIndex == 1)
+        {
+            switch (subRowIndex)
+            {
+                case 0: region.mData.mClear = chance; break;
+                case 1: region.mData.mCloudy = chance; break;
+                case 2: region.mData.mFoggy = chance; break;
+                case 3: region.mData.mOvercast = chance; break;
+                case 4: region.mData.mRain = chance; break;
+                case 5: region.mData.mThunder = chance; break;
+                case 6: region.mData.mAsh = chance; break;
+                case 7: region.mData.mBlight = chance; break;
+                case 8: region.mData.mA = chance; break;
+                case 9: region.mData.mB = chance; break;
+                default: throw std::runtime_error("index out of range");
+            }
+
+            record.setModified (region);
+        }
+    }
+
+    int RegionWeatherAdapter::getColumnsCount(const Record<ESM::Region>& record) const
+    {
+        return 2;
+    }
+
+    int RegionWeatherAdapter::getRowsCount(const Record<ESM::Region>& record) const
+    {
+        return 10;
+    }
 }
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index 2fd569bd0d..e24bcb1346 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -540,6 +540,31 @@ namespace CSMWorld
 
         virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
     };
+
+    class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
+    {
+    public:
+        RegionWeatherAdapter ();
+
+        virtual void addRow(Record<ESM::Region>& record, int position) const;
+
+        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+
+        virtual void setTable(Record<ESM::Region>& record,
+                const NestedTableWrapperBase& nestedTable) const;
+
+        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+
+        virtual QVariant getData(const Record<ESM::Region>& record,
+                int subRowIndex, int subColIndex) const;
+
+        virtual void setData(Record<ESM::Region>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
+
+        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+
+        virtual int getRowsCount(const Record<ESM::Region>& record) const;
+    };
 }
 
 #endif // CSM_WOLRD_NESTEDCOLADAPTERIMP_H
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index b0431f71a0..e44606652b 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -212,6 +212,13 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return sb;
         }
 
+        case CSMWorld::ColumnBase::Display_UnsignedInteger8:
+        {
+            DialogueSpinBox *sb = new DialogueSpinBox(parent);
+            sb->setRange(0, UCHAR_MAX);
+            return sb;
+        }
+
         case CSMWorld::ColumnBase::Display_Var:
 
             return new QLineEdit(parent);

From 9a495042ccbe08e285ab2ac9e8a912e5c8a583be Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 02:39:33 -0400
Subject: [PATCH 537/765] Fix indentation.

---
 .../model/world/nestedcoladapterimp.hpp       | 748 +++++++++---------
 1 file changed, 374 insertions(+), 374 deletions(-)

diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index e24bcb1346..b03674b37a 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -42,528 +42,528 @@ namespace CSMWorld
 
     class PathgridPointListAdapter : public NestedColumnAdapter<Pathgrid>
     {
-    public:
-        PathgridPointListAdapter ();
+        public:
+            PathgridPointListAdapter ();
 
-        virtual void addRow(Record<Pathgrid>& record, int position) const;
+            virtual void addRow(Record<Pathgrid>& record, int position) const;
 
-        virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
+            virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<Pathgrid>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<Pathgrid>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
 
-        virtual QVariant getData(const Record<Pathgrid>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<Pathgrid>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<Pathgrid>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<Pathgrid>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<Pathgrid>& record) const;
+            virtual int getColumnsCount(const Record<Pathgrid>& record) const;
 
-        virtual int getRowsCount(const Record<Pathgrid>& record) const;
+            virtual int getRowsCount(const Record<Pathgrid>& record) const;
     };
 
     class PathgridEdgeListAdapter : public NestedColumnAdapter<Pathgrid>
     {
-    public:
-        PathgridEdgeListAdapter ();
+        public:
+            PathgridEdgeListAdapter ();
 
-        virtual void addRow(Record<Pathgrid>& record, int position) const;
+            virtual void addRow(Record<Pathgrid>& record, int position) const;
 
-        virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
+            virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<Pathgrid>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<Pathgrid>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
 
-        virtual QVariant getData(const Record<Pathgrid>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<Pathgrid>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<Pathgrid>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<Pathgrid>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<Pathgrid>& record) const;
+            virtual int getColumnsCount(const Record<Pathgrid>& record) const;
 
-        virtual int getRowsCount(const Record<Pathgrid>& record) const;
+            virtual int getRowsCount(const Record<Pathgrid>& record) const;
     };
 
     class FactionReactionsAdapter : public NestedColumnAdapter<ESM::Faction>
     {
-    public:
-        FactionReactionsAdapter ();
+        public:
+            FactionReactionsAdapter ();
 
-        virtual void addRow(Record<ESM::Faction>& record, int position) const;
+            virtual void addRow(Record<ESM::Faction>& record, int position) const;
 
-        virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const;
+            virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<ESM::Faction>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<ESM::Faction>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const;
 
-        virtual QVariant getData(const Record<ESM::Faction>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<ESM::Faction>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<ESM::Faction>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<ESM::Faction>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<ESM::Faction>& record) const;
+            virtual int getColumnsCount(const Record<ESM::Faction>& record) const;
 
-        virtual int getRowsCount(const Record<ESM::Faction>& record) const;
+            virtual int getRowsCount(const Record<ESM::Faction>& record) const;
     };
 
     class RegionSoundListAdapter : public NestedColumnAdapter<ESM::Region>
     {
-    public:
-        RegionSoundListAdapter ();
+        public:
+            RegionSoundListAdapter ();
 
-        virtual void addRow(Record<ESM::Region>& record, int position) const;
+            virtual void addRow(Record<ESM::Region>& record, int position) const;
 
-        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+            virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<ESM::Region>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<ESM::Region>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
 
-        virtual QVariant getData(const Record<ESM::Region>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<ESM::Region>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<ESM::Region>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<ESM::Region>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+            virtual int getColumnsCount(const Record<ESM::Region>& record) const;
 
-        virtual int getRowsCount(const Record<ESM::Region>& record) const;
+            virtual int getRowsCount(const Record<ESM::Region>& record) const;
     };
 
     template<typename ESXRecordT>
     class SpellListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
-    public:
-        SpellListAdapter () {}
+        public:
+            SpellListAdapter () {}
 
-        virtual void addRow(Record<ESXRecordT>& record, int position) const
-        {
-            ESXRecordT raceOrBthSgn = record.get();
-
-            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
-
-            // blank row
-            std::string spell = "";
-
-            spells.insert(spells.begin()+position, spell);
-
-            record.setModified (raceOrBthSgn);
-        }
-
-        virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
-        {
-            ESXRecordT raceOrBthSgn = record.get();
-
-            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
-
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
-
-            spells.erase(spells.begin()+rowToRemove);
-
-            record.setModified (raceOrBthSgn);
-        }
-
-        virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
-        {
-            ESXRecordT raceOrBthSgn = record.get();
-
-            raceOrBthSgn.mPowers.mList =
-                static_cast<const NestedTableWrapper<std::vector<std::string> >&>(nestedTable).mNestedTable;
-
-            record.setModified (raceOrBthSgn);
-        }
-
-        virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
-        {
-            // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
-        }
-
-        virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
-        {
-            ESXRecordT raceOrBthSgn = record.get();
-
-            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
-
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
-
-            std::string spell = spells[subRowIndex];
-            switch (subColIndex)
+            virtual void addRow(Record<ESXRecordT>& record, int position) const
             {
-                case 0: return QString(spell.c_str());
-                default: throw std::runtime_error("Spells subcolumn index out of range");
-            }
-        }
+                ESXRecordT raceOrBthSgn = record.get();
 
-        virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                    int subRowIndex, int subColIndex) const
-        {
-            ESXRecordT raceOrBthSgn = record.get();
+                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+                // blank row
+                std::string spell = "";
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                throw std::runtime_error ("index out of range");
+                spells.insert(spells.begin()+position, spell);
 
-            std::string spell = spells[subRowIndex];
-            switch (subColIndex)
-            {
-                case 0: spell = value.toString().toUtf8().constData(); break;
-                default: throw std::runtime_error("Spells subcolumn index out of range");
+                record.setModified (raceOrBthSgn);
             }
 
-            raceOrBthSgn.mPowers.mList[subRowIndex] = spell;
+            virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
+            {
+                ESXRecordT raceOrBthSgn = record.get();
 
-            record.setModified (raceOrBthSgn);
-        }
+                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-        virtual int getColumnsCount(const Record<ESXRecordT>& record) const
-        {
-            return 1;
-        }
+                if (rowToRemove < 0 || rowToRemove >= static_cast<int> (spells.size()))
+                    throw std::runtime_error ("index out of range");
 
-        virtual int getRowsCount(const Record<ESXRecordT>& record) const
-        {
-            return static_cast<int>(record.get().mPowers.mList.size());
-        }
+                spells.erase(spells.begin()+rowToRemove);
+
+                record.setModified (raceOrBthSgn);
+            }
+
+            virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
+            {
+                ESXRecordT raceOrBthSgn = record.get();
+
+                raceOrBthSgn.mPowers.mList =
+                    static_cast<const NestedTableWrapper<std::vector<std::string> >&>(nestedTable).mNestedTable;
+
+                record.setModified (raceOrBthSgn);
+            }
+
+            virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
+            {
+                // deleted by dtor of NestedTableStoring
+                return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
+            }
+
+            virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
+            {
+                ESXRecordT raceOrBthSgn = record.get();
+
+                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+
+                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
+                    throw std::runtime_error ("index out of range");
+
+                std::string spell = spells[subRowIndex];
+                switch (subColIndex)
+                {
+                    case 0: return QString(spell.c_str());
+                    default: throw std::runtime_error("Spells subcolumn index out of range");
+                }
+            }
+
+            virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
+                                        int subRowIndex, int subColIndex) const
+            {
+                ESXRecordT raceOrBthSgn = record.get();
+
+                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+
+                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
+                    throw std::runtime_error ("index out of range");
+
+                std::string spell = spells[subRowIndex];
+                switch (subColIndex)
+                {
+                    case 0: spell = value.toString().toUtf8().constData(); break;
+                    default: throw std::runtime_error("Spells subcolumn index out of range");
+                }
+
+                raceOrBthSgn.mPowers.mList[subRowIndex] = spell;
+
+                record.setModified (raceOrBthSgn);
+            }
+
+            virtual int getColumnsCount(const Record<ESXRecordT>& record) const
+            {
+                return 1;
+            }
+
+            virtual int getRowsCount(const Record<ESXRecordT>& record) const
+            {
+                return static_cast<int>(record.get().mPowers.mList.size());
+            }
     };
 
     template<typename ESXRecordT>
     class EffectsListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
-    public:
-        EffectsListAdapter () {}
+        public:
+            EffectsListAdapter () {}
 
-        virtual void addRow(Record<ESXRecordT>& record, int position) const
-        {
-            ESXRecordT magic = record.get();
-
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-            // blank row
-            ESM::ENAMstruct effect;
-            effect.mEffectID = 0;
-            effect.mSkill = -1;
-            effect.mAttribute = -1;
-            effect.mRange = 0;
-            effect.mArea = 0;
-            effect.mDuration = 0;
-            effect.mMagnMin = 0;
-            effect.mMagnMax = 0;
-
-            effectsList.insert(effectsList.begin()+position, effect);
-
-            record.setModified (magic);
-        }
-
-        virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
-        {
-            ESXRecordT magic = record.get();
-
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
-
-            effectsList.erase(effectsList.begin()+rowToRemove);
-
-            record.setModified (magic);
-        }
-
-        virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
-        {
-            ESXRecordT magic = record.get();
-
-            magic.mEffects.mList =
-                static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct> >&>(nestedTable).mNestedTable;
-
-            record.setModified (magic);
-        }
-
-        virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
-        {
-            // deleted by dtor of NestedTableStoring
-            return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
-        }
-
-        virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
-        {
-            ESXRecordT magic = record.get();
-
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
-
-            ESM::ENAMstruct effect = effectsList[subRowIndex];
-            switch (subColIndex)
+            virtual void addRow(Record<ESXRecordT>& record, int position) const
             {
-                case 0:
-                {
-                    if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
-                        return effect.mEffectID;
-                    else
-                        throw std::runtime_error("Magic effects ID unexpected value");
-                }
-                case 1:
-                {
-                    switch (effect.mEffectID)
-                    {
-                        case ESM::MagicEffect::DrainSkill:
-                        case ESM::MagicEffect::DamageSkill:
-                        case ESM::MagicEffect::RestoreSkill:
-                        case ESM::MagicEffect::FortifySkill:
-                        case ESM::MagicEffect::AbsorbSkill:
-                             return effect.mSkill;
-                        default:
-                            return QVariant();
-                    }
-                }
-                case 2:
-                {
-                    switch (effect.mEffectID)
-                    {
-                        case ESM::MagicEffect::DrainAttribute:
-                        case ESM::MagicEffect::DamageAttribute:
-                        case ESM::MagicEffect::RestoreAttribute:
-                        case ESM::MagicEffect::FortifyAttribute:
-                        case ESM::MagicEffect::AbsorbAttribute:
-                             return effect.mAttribute;
-                        default:
-                            return QVariant();
-                    }
-                }
-                case 3:
-                {
-                    if (effect.mRange >=0 && effect.mRange <=2)
-                        return effect.mRange;
-                    else
-                        throw std::runtime_error("Magic effects range unexpected value");
-                }
-                case 4: return effect.mArea;
-                case 5: return effect.mDuration;
-                case 6: return effect.mMagnMin;
-                case 7: return effect.mMagnMax;
-                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
-            }
-        }
+                ESXRecordT magic = record.get();
 
-        virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                    int subRowIndex, int subColIndex) const
-        {
-            ESXRecordT magic = record.get();
+                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
 
-            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+                // blank row
+                ESM::ENAMstruct effect;
+                effect.mEffectID = 0;
+                effect.mSkill = -1;
+                effect.mAttribute = -1;
+                effect.mRange = 0;
+                effect.mArea = 0;
+                effect.mDuration = 0;
+                effect.mMagnMin = 0;
+                effect.mMagnMax = 0;
 
-            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                throw std::runtime_error ("index out of range");
+                effectsList.insert(effectsList.begin()+position, effect);
 
-            ESM::ENAMstruct effect = effectsList[subRowIndex];
-            switch (subColIndex)
-            {
-                case 0:
-                {
-                    effect.mEffectID = static_cast<short>(value.toInt());
-                    break;
-                }
-                case 1:
-                {
-                    effect.mSkill = static_cast<signed char>(value.toInt());
-                    break;
-                }
-                case 2:
-                {
-                    effect.mAttribute = static_cast<signed char>(value.toInt());
-                    break;
-                }
-                case 3:
-                {
-                    effect.mRange = value.toInt();
-                    break;
-                }
-                case 4: effect.mArea = value.toInt(); break;
-                case 5: effect.mDuration = value.toInt(); break;
-                case 6: effect.mMagnMin = value.toInt(); break;
-                case 7: effect.mMagnMax = value.toInt(); break;
-                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                record.setModified (magic);
             }
 
-            magic.mEffects.mList[subRowIndex] = effect;
+            virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
+            {
+                ESXRecordT magic = record.get();
 
-            record.setModified (magic);
-        }
+                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
 
-        virtual int getColumnsCount(const Record<ESXRecordT>& record) const
-        {
-            return 8;
-        }
+                if (rowToRemove < 0 || rowToRemove >= static_cast<int> (effectsList.size()))
+                    throw std::runtime_error ("index out of range");
 
-        virtual int getRowsCount(const Record<ESXRecordT>& record) const
-        {
-            return static_cast<int>(record.get().mEffects.mList.size());
-        }
+                effectsList.erase(effectsList.begin()+rowToRemove);
+
+                record.setModified (magic);
+            }
+
+            virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
+            {
+                ESXRecordT magic = record.get();
+
+                magic.mEffects.mList =
+                    static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct> >&>(nestedTable).mNestedTable;
+
+                record.setModified (magic);
+            }
+
+            virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
+            {
+                // deleted by dtor of NestedTableStoring
+                return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
+            }
+
+            virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
+            {
+                ESXRecordT magic = record.get();
+
+                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
+                    throw std::runtime_error ("index out of range");
+
+                ESM::ENAMstruct effect = effectsList[subRowIndex];
+                switch (subColIndex)
+                {
+                    case 0:
+                    {
+                        if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
+                            return effect.mEffectID;
+                        else
+                            throw std::runtime_error("Magic effects ID unexpected value");
+                    }
+                    case 1:
+                    {
+                        switch (effect.mEffectID)
+                        {
+                            case ESM::MagicEffect::DrainSkill:
+                            case ESM::MagicEffect::DamageSkill:
+                            case ESM::MagicEffect::RestoreSkill:
+                            case ESM::MagicEffect::FortifySkill:
+                            case ESM::MagicEffect::AbsorbSkill:
+                                 return effect.mSkill;
+                            default:
+                                return QVariant();
+                        }
+                    }
+                    case 2:
+                    {
+                        switch (effect.mEffectID)
+                        {
+                            case ESM::MagicEffect::DrainAttribute:
+                            case ESM::MagicEffect::DamageAttribute:
+                            case ESM::MagicEffect::RestoreAttribute:
+                            case ESM::MagicEffect::FortifyAttribute:
+                            case ESM::MagicEffect::AbsorbAttribute:
+                                 return effect.mAttribute;
+                            default:
+                                return QVariant();
+                        }
+                    }
+                    case 3:
+                    {
+                        if (effect.mRange >=0 && effect.mRange <=2)
+                            return effect.mRange;
+                        else
+                            throw std::runtime_error("Magic effects range unexpected value");
+                    }
+                    case 4: return effect.mArea;
+                    case 5: return effect.mDuration;
+                    case 6: return effect.mMagnMin;
+                    case 7: return effect.mMagnMax;
+                    default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                }
+            }
+
+            virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
+                                        int subRowIndex, int subColIndex) const
+            {
+                ESXRecordT magic = record.get();
+
+                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
+                    throw std::runtime_error ("index out of range");
+
+                ESM::ENAMstruct effect = effectsList[subRowIndex];
+                switch (subColIndex)
+                {
+                    case 0:
+                    {
+                        effect.mEffectID = static_cast<short>(value.toInt());
+                        break;
+                    }
+                    case 1:
+                    {
+                        effect.mSkill = static_cast<signed char>(value.toInt());
+                        break;
+                    }
+                    case 2:
+                    {
+                        effect.mAttribute = static_cast<signed char>(value.toInt());
+                        break;
+                    }
+                    case 3:
+                    {
+                        effect.mRange = value.toInt();
+                        break;
+                    }
+                    case 4: effect.mArea = value.toInt(); break;
+                    case 5: effect.mDuration = value.toInt(); break;
+                    case 6: effect.mMagnMin = value.toInt(); break;
+                    case 7: effect.mMagnMax = value.toInt(); break;
+                    default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                }
+
+                magic.mEffects.mList[subRowIndex] = effect;
+
+                record.setModified (magic);
+            }
+
+            virtual int getColumnsCount(const Record<ESXRecordT>& record) const
+            {
+                return 8;
+            }
+
+            virtual int getRowsCount(const Record<ESXRecordT>& record) const
+            {
+                return static_cast<int>(record.get().mEffects.mList.size());
+            }
     };
 
     class InfoListAdapter : public NestedColumnAdapter<Info>
     {
-    public:
-        InfoListAdapter ();
+        public:
+            InfoListAdapter ();
 
-        virtual void addRow(Record<Info>& record, int position) const;
+            virtual void addRow(Record<Info>& record, int position) const;
 
-        virtual void removeRow(Record<Info>& record, int rowToRemove) const;
+            virtual void removeRow(Record<Info>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<Info>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<Info>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
 
-        virtual QVariant getData(const Record<Info>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<Info>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<Info>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<Info>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<Info>& record) const;
+            virtual int getColumnsCount(const Record<Info>& record) const;
 
-        virtual int getRowsCount(const Record<Info>& record) const;
+            virtual int getRowsCount(const Record<Info>& record) const;
     };
 
     class InfoConditionAdapter : public NestedColumnAdapter<Info>
     {
-    public:
-        InfoConditionAdapter ();
+        public:
+            InfoConditionAdapter ();
 
-        virtual void addRow(Record<Info>& record, int position) const;
+            virtual void addRow(Record<Info>& record, int position) const;
 
-        virtual void removeRow(Record<Info>& record, int rowToRemove) const;
+            virtual void removeRow(Record<Info>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<Info>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<Info>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
 
-        virtual QVariant getData(const Record<Info>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<Info>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<Info>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<Info>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<Info>& record) const;
+            virtual int getColumnsCount(const Record<Info>& record) const;
 
-        virtual int getRowsCount(const Record<Info>& record) const;
+            virtual int getRowsCount(const Record<Info>& record) const;
     };
 
     class RaceAttributeAdapter : public NestedColumnAdapter<ESM::Race>
     {
-    public:
-        RaceAttributeAdapter ();
+        public:
+            RaceAttributeAdapter ();
 
-        virtual void addRow(Record<ESM::Race>& record, int position) const;
+            virtual void addRow(Record<ESM::Race>& record, int position) const;
 
-        virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
+            virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<ESM::Race>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<ESM::Race>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
 
-        virtual QVariant getData(const Record<ESM::Race>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<ESM::Race>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<ESM::Race>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<ESM::Race>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<ESM::Race>& record) const;
+            virtual int getColumnsCount(const Record<ESM::Race>& record) const;
 
-        virtual int getRowsCount(const Record<ESM::Race>& record) const;
+            virtual int getRowsCount(const Record<ESM::Race>& record) const;
     };
 
     class RaceSkillsBonusAdapter : public NestedColumnAdapter<ESM::Race>
     {
-    public:
-        RaceSkillsBonusAdapter ();
+        public:
+            RaceSkillsBonusAdapter ();
 
-        virtual void addRow(Record<ESM::Race>& record, int position) const;
+            virtual void addRow(Record<ESM::Race>& record, int position) const;
 
-        virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
+            virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<ESM::Race>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<ESM::Race>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
 
-        virtual QVariant getData(const Record<ESM::Race>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<ESM::Race>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<ESM::Race>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<ESM::Race>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<ESM::Race>& record) const;
+            virtual int getColumnsCount(const Record<ESM::Race>& record) const;
 
-        virtual int getRowsCount(const Record<ESM::Race>& record) const;
+            virtual int getRowsCount(const Record<ESM::Race>& record) const;
     };
 
     class CellListAdapter : public NestedColumnAdapter<CSMWorld::Cell>
     {
-    public:
-        CellListAdapter ();
+        public:
+            CellListAdapter ();
 
-        virtual void addRow(Record<CSMWorld::Cell>& record, int position) const;
+            virtual void addRow(Record<CSMWorld::Cell>& record, int position) const;
 
-        virtual void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const;
+            virtual void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<CSMWorld::Cell>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<CSMWorld::Cell>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const;
 
-        virtual QVariant getData(const Record<CSMWorld::Cell>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<CSMWorld::Cell>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<CSMWorld::Cell>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<CSMWorld::Cell>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<CSMWorld::Cell>& record) const;
+            virtual int getColumnsCount(const Record<CSMWorld::Cell>& record) const;
 
-        virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
+            virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
     };
 
     class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
     {
-    public:
-        RegionWeatherAdapter ();
+        public:
+            RegionWeatherAdapter ();
 
-        virtual void addRow(Record<ESM::Region>& record, int position) const;
+            virtual void addRow(Record<ESM::Region>& record, int position) const;
 
-        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+            virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
 
-        virtual void setTable(Record<ESM::Region>& record,
-                const NestedTableWrapperBase& nestedTable) const;
+            virtual void setTable(Record<ESM::Region>& record,
+                    const NestedTableWrapperBase& nestedTable) const;
 
-        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+            virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
 
-        virtual QVariant getData(const Record<ESM::Region>& record,
-                int subRowIndex, int subColIndex) const;
+            virtual QVariant getData(const Record<ESM::Region>& record,
+                    int subRowIndex, int subColIndex) const;
 
-        virtual void setData(Record<ESM::Region>& record,
-                const QVariant& value, int subRowIndex, int subColIndex) const;
+            virtual void setData(Record<ESM::Region>& record,
+                    const QVariant& value, int subRowIndex, int subColIndex) const;
 
-        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+            virtual int getColumnsCount(const Record<ESM::Region>& record) const;
 
-        virtual int getRowsCount(const Record<ESM::Region>& record) const;
+            virtual int getRowsCount(const Record<ESM::Region>& record) const;
     };
 }
 

From 94d4fb06862ec6e65c38e1dd997b3277cfa42d2a Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 03:11:28 -0400
Subject: [PATCH 538/765] Add check for region weather chances to verifier.

---
 apps/opencs/model/tools/regioncheck.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 2fdff5f388..adb3dcd545 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -33,5 +33,12 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     /// \todo test that the ID in mSleeplist exists
 
+    // test that chances add up to 100
+    int chances = region.mData.mClear + region.mData.mCloudy + region.mData.mFoggy + region.mData.mOvercast +
+        region.mData.mRain + region.mData.mThunder + region.mData.mAsh + region.mData.mBlight +
+        region.mData.mA + region.mData.mB;
+    if (chances != 100)
+        messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
+
     /// \todo check data members that can't be edited in the table view
 }

From 85005626b16852d10cd552716086c7e6e55863f3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 03:11:51 -0400
Subject: [PATCH 539/765] Replace usage of deprecated function.

---
 apps/opencs/model/tools/regioncheck.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index adb3dcd545..7348610804 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -29,7 +29,7 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 
     // test for empty name
     if (region.mName.empty())
-        messages.push_back (std::make_pair (id, region.mId + " has an empty name"));
+        messages.add(id, region.mId + " has an empty name", "", CSMDoc::Message::Severity_Error);
 
     /// \todo test that the ID in mSleeplist exists
 

From 8c358368835672c84a6f8486d74546c977f6d32e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 03:12:10 -0400
Subject: [PATCH 540/765] Fix misnamed identifier.

---
 apps/opencs/model/world/columns.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index b72634bee8..c116ec4e50 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -328,7 +328,7 @@ namespace CSMWorld
 
             { ColumnId_RegionWeather, "Weather" },
             { ColumnId_WeatherName, "Type" },
-            { ColumnId_WeatherChance, "Clear" },
+            { ColumnId_WeatherChance, "Percent Chance" },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },

From a38b086f02868df46e3cef949eb87b36e41ea459 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 6 Apr 2016 13:40:42 +0200
Subject: [PATCH 541/765] updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d541e39b90..6d427fa82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
     Bug #3146: Potion effect showing when ingredient effects are not known
     Bug #3155: When executing chop attack with a spear, hands turn partly invisible
     Bug #3161: Fast travel from Silt Strider or Boat Ride will break save files made afterwards
+    Bug #3163: Editor: Objects dropped to scene do not always save
     Bug #3173: Game Crashes After Casting Recall Spell
     Bug #3174: Constant effect enchantments play spell animation on dead bodies
     Bug #3175: Spell effects do not wear down when caster dies

From 7d89c82f0883b0bc379884f1db6ce85b8f4c7de7 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 6 Apr 2016 10:23:12 -0400
Subject: [PATCH 542/765] Revert "Fix indentation."

This reverts commit 9a495042ccbe08e285ab2ac9e8a912e5c8a583be.
---
 .../model/world/nestedcoladapterimp.hpp       | 744 +++++++++---------
 1 file changed, 372 insertions(+), 372 deletions(-)

diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index b03674b37a..e24bcb1346 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -42,528 +42,528 @@ namespace CSMWorld
 
     class PathgridPointListAdapter : public NestedColumnAdapter<Pathgrid>
     {
-        public:
-            PathgridPointListAdapter ();
+    public:
+        PathgridPointListAdapter ();
 
-            virtual void addRow(Record<Pathgrid>& record, int position) const;
+        virtual void addRow(Record<Pathgrid>& record, int position) const;
 
-            virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
+        virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<Pathgrid>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<Pathgrid>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
 
-            virtual QVariant getData(const Record<Pathgrid>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<Pathgrid>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<Pathgrid>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<Pathgrid>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<Pathgrid>& record) const;
+        virtual int getColumnsCount(const Record<Pathgrid>& record) const;
 
-            virtual int getRowsCount(const Record<Pathgrid>& record) const;
+        virtual int getRowsCount(const Record<Pathgrid>& record) const;
     };
 
     class PathgridEdgeListAdapter : public NestedColumnAdapter<Pathgrid>
     {
-        public:
-            PathgridEdgeListAdapter ();
+    public:
+        PathgridEdgeListAdapter ();
 
-            virtual void addRow(Record<Pathgrid>& record, int position) const;
+        virtual void addRow(Record<Pathgrid>& record, int position) const;
 
-            virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
+        virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<Pathgrid>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<Pathgrid>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const;
 
-            virtual QVariant getData(const Record<Pathgrid>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<Pathgrid>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<Pathgrid>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<Pathgrid>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<Pathgrid>& record) const;
+        virtual int getColumnsCount(const Record<Pathgrid>& record) const;
 
-            virtual int getRowsCount(const Record<Pathgrid>& record) const;
+        virtual int getRowsCount(const Record<Pathgrid>& record) const;
     };
 
     class FactionReactionsAdapter : public NestedColumnAdapter<ESM::Faction>
     {
-        public:
-            FactionReactionsAdapter ();
+    public:
+        FactionReactionsAdapter ();
 
-            virtual void addRow(Record<ESM::Faction>& record, int position) const;
+        virtual void addRow(Record<ESM::Faction>& record, int position) const;
 
-            virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const;
+        virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<ESM::Faction>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<ESM::Faction>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const;
 
-            virtual QVariant getData(const Record<ESM::Faction>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<ESM::Faction>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<ESM::Faction>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<ESM::Faction>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<ESM::Faction>& record) const;
+        virtual int getColumnsCount(const Record<ESM::Faction>& record) const;
 
-            virtual int getRowsCount(const Record<ESM::Faction>& record) const;
+        virtual int getRowsCount(const Record<ESM::Faction>& record) const;
     };
 
     class RegionSoundListAdapter : public NestedColumnAdapter<ESM::Region>
     {
-        public:
-            RegionSoundListAdapter ();
+    public:
+        RegionSoundListAdapter ();
 
-            virtual void addRow(Record<ESM::Region>& record, int position) const;
+        virtual void addRow(Record<ESM::Region>& record, int position) const;
 
-            virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<ESM::Region>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<ESM::Region>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
 
-            virtual QVariant getData(const Record<ESM::Region>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<ESM::Region>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<ESM::Region>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<ESM::Region>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
 
-            virtual int getRowsCount(const Record<ESM::Region>& record) const;
+        virtual int getRowsCount(const Record<ESM::Region>& record) const;
     };
 
     template<typename ESXRecordT>
     class SpellListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
-        public:
-            SpellListAdapter () {}
+    public:
+        SpellListAdapter () {}
 
-            virtual void addRow(Record<ESXRecordT>& record, int position) const
+        virtual void addRow(Record<ESXRecordT>& record, int position) const
+        {
+            ESXRecordT raceOrBthSgn = record.get();
+
+            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+
+            // blank row
+            std::string spell = "";
+
+            spells.insert(spells.begin()+position, spell);
+
+            record.setModified (raceOrBthSgn);
+        }
+
+        virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
+        {
+            ESXRecordT raceOrBthSgn = record.get();
+
+            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (spells.size()))
+                throw std::runtime_error ("index out of range");
+
+            spells.erase(spells.begin()+rowToRemove);
+
+            record.setModified (raceOrBthSgn);
+        }
+
+        virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
+        {
+            ESXRecordT raceOrBthSgn = record.get();
+
+            raceOrBthSgn.mPowers.mList =
+                static_cast<const NestedTableWrapper<std::vector<std::string> >&>(nestedTable).mNestedTable;
+
+            record.setModified (raceOrBthSgn);
+        }
+
+        virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
+        {
+            // deleted by dtor of NestedTableStoring
+            return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
+        }
+
+        virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
+        {
+            ESXRecordT raceOrBthSgn = record.get();
+
+            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
+                throw std::runtime_error ("index out of range");
+
+            std::string spell = spells[subRowIndex];
+            switch (subColIndex)
             {
-                ESXRecordT raceOrBthSgn = record.get();
+                case 0: return QString(spell.c_str());
+                default: throw std::runtime_error("Spells subcolumn index out of range");
+            }
+        }
 
-                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+        virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
+                                    int subRowIndex, int subColIndex) const
+        {
+            ESXRecordT raceOrBthSgn = record.get();
 
-                // blank row
-                std::string spell = "";
+            std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
 
-                spells.insert(spells.begin()+position, spell);
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
+                throw std::runtime_error ("index out of range");
 
-                record.setModified (raceOrBthSgn);
+            std::string spell = spells[subRowIndex];
+            switch (subColIndex)
+            {
+                case 0: spell = value.toString().toUtf8().constData(); break;
+                default: throw std::runtime_error("Spells subcolumn index out of range");
             }
 
-            virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
-            {
-                ESXRecordT raceOrBthSgn = record.get();
+            raceOrBthSgn.mPowers.mList[subRowIndex] = spell;
 
-                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
+            record.setModified (raceOrBthSgn);
+        }
 
-                if (rowToRemove < 0 || rowToRemove >= static_cast<int> (spells.size()))
-                    throw std::runtime_error ("index out of range");
+        virtual int getColumnsCount(const Record<ESXRecordT>& record) const
+        {
+            return 1;
+        }
 
-                spells.erase(spells.begin()+rowToRemove);
-
-                record.setModified (raceOrBthSgn);
-            }
-
-            virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
-            {
-                ESXRecordT raceOrBthSgn = record.get();
-
-                raceOrBthSgn.mPowers.mList =
-                    static_cast<const NestedTableWrapper<std::vector<std::string> >&>(nestedTable).mNestedTable;
-
-                record.setModified (raceOrBthSgn);
-            }
-
-            virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
-            {
-                // deleted by dtor of NestedTableStoring
-                return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
-            }
-
-            virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
-            {
-                ESXRecordT raceOrBthSgn = record.get();
-
-                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
-
-                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                    throw std::runtime_error ("index out of range");
-
-                std::string spell = spells[subRowIndex];
-                switch (subColIndex)
-                {
-                    case 0: return QString(spell.c_str());
-                    default: throw std::runtime_error("Spells subcolumn index out of range");
-                }
-            }
-
-            virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                        int subRowIndex, int subColIndex) const
-            {
-                ESXRecordT raceOrBthSgn = record.get();
-
-                std::vector<std::string>& spells = raceOrBthSgn.mPowers.mList;
-
-                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (spells.size()))
-                    throw std::runtime_error ("index out of range");
-
-                std::string spell = spells[subRowIndex];
-                switch (subColIndex)
-                {
-                    case 0: spell = value.toString().toUtf8().constData(); break;
-                    default: throw std::runtime_error("Spells subcolumn index out of range");
-                }
-
-                raceOrBthSgn.mPowers.mList[subRowIndex] = spell;
-
-                record.setModified (raceOrBthSgn);
-            }
-
-            virtual int getColumnsCount(const Record<ESXRecordT>& record) const
-            {
-                return 1;
-            }
-
-            virtual int getRowsCount(const Record<ESXRecordT>& record) const
-            {
-                return static_cast<int>(record.get().mPowers.mList.size());
-            }
+        virtual int getRowsCount(const Record<ESXRecordT>& record) const
+        {
+            return static_cast<int>(record.get().mPowers.mList.size());
+        }
     };
 
     template<typename ESXRecordT>
     class EffectsListAdapter : public NestedColumnAdapter<ESXRecordT>
     {
-        public:
-            EffectsListAdapter () {}
+    public:
+        EffectsListAdapter () {}
 
-            virtual void addRow(Record<ESXRecordT>& record, int position) const
+        virtual void addRow(Record<ESXRecordT>& record, int position) const
+        {
+            ESXRecordT magic = record.get();
+
+            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+            // blank row
+            ESM::ENAMstruct effect;
+            effect.mEffectID = 0;
+            effect.mSkill = -1;
+            effect.mAttribute = -1;
+            effect.mRange = 0;
+            effect.mArea = 0;
+            effect.mDuration = 0;
+            effect.mMagnMin = 0;
+            effect.mMagnMax = 0;
+
+            effectsList.insert(effectsList.begin()+position, effect);
+
+            record.setModified (magic);
+        }
+
+        virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
+        {
+            ESXRecordT magic = record.get();
+
+            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+            if (rowToRemove < 0 || rowToRemove >= static_cast<int> (effectsList.size()))
+                throw std::runtime_error ("index out of range");
+
+            effectsList.erase(effectsList.begin()+rowToRemove);
+
+            record.setModified (magic);
+        }
+
+        virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
+        {
+            ESXRecordT magic = record.get();
+
+            magic.mEffects.mList =
+                static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct> >&>(nestedTable).mNestedTable;
+
+            record.setModified (magic);
+        }
+
+        virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
+        {
+            // deleted by dtor of NestedTableStoring
+            return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
+        }
+
+        virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
+        {
+            ESXRecordT magic = record.get();
+
+            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
+                throw std::runtime_error ("index out of range");
+
+            ESM::ENAMstruct effect = effectsList[subRowIndex];
+            switch (subColIndex)
             {
-                ESXRecordT magic = record.get();
-
-                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-                // blank row
-                ESM::ENAMstruct effect;
-                effect.mEffectID = 0;
-                effect.mSkill = -1;
-                effect.mAttribute = -1;
-                effect.mRange = 0;
-                effect.mArea = 0;
-                effect.mDuration = 0;
-                effect.mMagnMin = 0;
-                effect.mMagnMax = 0;
-
-                effectsList.insert(effectsList.begin()+position, effect);
-
-                record.setModified (magic);
-            }
-
-            virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const
-            {
-                ESXRecordT magic = record.get();
-
-                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-                if (rowToRemove < 0 || rowToRemove >= static_cast<int> (effectsList.size()))
-                    throw std::runtime_error ("index out of range");
-
-                effectsList.erase(effectsList.begin()+rowToRemove);
-
-                record.setModified (magic);
-            }
-
-            virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const
-            {
-                ESXRecordT magic = record.get();
-
-                magic.mEffects.mList =
-                    static_cast<const NestedTableWrapper<std::vector<ESM::ENAMstruct> >&>(nestedTable).mNestedTable;
-
-                record.setModified (magic);
-            }
-
-            virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const
-            {
-                // deleted by dtor of NestedTableStoring
-                return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
-            }
-
-            virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const
-            {
-                ESXRecordT magic = record.get();
-
-                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                    throw std::runtime_error ("index out of range");
-
-                ESM::ENAMstruct effect = effectsList[subRowIndex];
-                switch (subColIndex)
+                case 0:
                 {
-                    case 0:
-                    {
-                        if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
-                            return effect.mEffectID;
-                        else
-                            throw std::runtime_error("Magic effects ID unexpected value");
-                    }
-                    case 1:
-                    {
-                        switch (effect.mEffectID)
-                        {
-                            case ESM::MagicEffect::DrainSkill:
-                            case ESM::MagicEffect::DamageSkill:
-                            case ESM::MagicEffect::RestoreSkill:
-                            case ESM::MagicEffect::FortifySkill:
-                            case ESM::MagicEffect::AbsorbSkill:
-                                 return effect.mSkill;
-                            default:
-                                return QVariant();
-                        }
-                    }
-                    case 2:
-                    {
-                        switch (effect.mEffectID)
-                        {
-                            case ESM::MagicEffect::DrainAttribute:
-                            case ESM::MagicEffect::DamageAttribute:
-                            case ESM::MagicEffect::RestoreAttribute:
-                            case ESM::MagicEffect::FortifyAttribute:
-                            case ESM::MagicEffect::AbsorbAttribute:
-                                 return effect.mAttribute;
-                            default:
-                                return QVariant();
-                        }
-                    }
-                    case 3:
-                    {
-                        if (effect.mRange >=0 && effect.mRange <=2)
-                            return effect.mRange;
-                        else
-                            throw std::runtime_error("Magic effects range unexpected value");
-                    }
-                    case 4: return effect.mArea;
-                    case 5: return effect.mDuration;
-                    case 6: return effect.mMagnMin;
-                    case 7: return effect.mMagnMax;
-                    default: throw std::runtime_error("Magic Effects subcolumn index out of range");
+                    if (effect.mEffectID >=0 && effect.mEffectID < ESM::MagicEffect::Length)
+                        return effect.mEffectID;
+                    else
+                        throw std::runtime_error("Magic effects ID unexpected value");
                 }
-            }
-
-            virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
-                                        int subRowIndex, int subColIndex) const
-            {
-                ESXRecordT magic = record.get();
-
-                std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
-
-                if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
-                    throw std::runtime_error ("index out of range");
-
-                ESM::ENAMstruct effect = effectsList[subRowIndex];
-                switch (subColIndex)
+                case 1:
                 {
-                    case 0:
+                    switch (effect.mEffectID)
                     {
-                        effect.mEffectID = static_cast<short>(value.toInt());
-                        break;
+                        case ESM::MagicEffect::DrainSkill:
+                        case ESM::MagicEffect::DamageSkill:
+                        case ESM::MagicEffect::RestoreSkill:
+                        case ESM::MagicEffect::FortifySkill:
+                        case ESM::MagicEffect::AbsorbSkill:
+                             return effect.mSkill;
+                        default:
+                            return QVariant();
                     }
-                    case 1:
-                    {
-                        effect.mSkill = static_cast<signed char>(value.toInt());
-                        break;
-                    }
-                    case 2:
-                    {
-                        effect.mAttribute = static_cast<signed char>(value.toInt());
-                        break;
-                    }
-                    case 3:
-                    {
-                        effect.mRange = value.toInt();
-                        break;
-                    }
-                    case 4: effect.mArea = value.toInt(); break;
-                    case 5: effect.mDuration = value.toInt(); break;
-                    case 6: effect.mMagnMin = value.toInt(); break;
-                    case 7: effect.mMagnMax = value.toInt(); break;
-                    default: throw std::runtime_error("Magic Effects subcolumn index out of range");
                 }
-
-                magic.mEffects.mList[subRowIndex] = effect;
-
-                record.setModified (magic);
+                case 2:
+                {
+                    switch (effect.mEffectID)
+                    {
+                        case ESM::MagicEffect::DrainAttribute:
+                        case ESM::MagicEffect::DamageAttribute:
+                        case ESM::MagicEffect::RestoreAttribute:
+                        case ESM::MagicEffect::FortifyAttribute:
+                        case ESM::MagicEffect::AbsorbAttribute:
+                             return effect.mAttribute;
+                        default:
+                            return QVariant();
+                    }
+                }
+                case 3:
+                {
+                    if (effect.mRange >=0 && effect.mRange <=2)
+                        return effect.mRange;
+                    else
+                        throw std::runtime_error("Magic effects range unexpected value");
+                }
+                case 4: return effect.mArea;
+                case 5: return effect.mDuration;
+                case 6: return effect.mMagnMin;
+                case 7: return effect.mMagnMax;
+                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
             }
+        }
 
-            virtual int getColumnsCount(const Record<ESXRecordT>& record) const
+        virtual void setData(Record<ESXRecordT>& record, const QVariant& value,
+                                    int subRowIndex, int subColIndex) const
+        {
+            ESXRecordT magic = record.get();
+
+            std::vector<ESM::ENAMstruct>& effectsList = magic.mEffects.mList;
+
+            if (subRowIndex < 0 || subRowIndex >= static_cast<int> (effectsList.size()))
+                throw std::runtime_error ("index out of range");
+
+            ESM::ENAMstruct effect = effectsList[subRowIndex];
+            switch (subColIndex)
             {
-                return 8;
+                case 0:
+                {
+                    effect.mEffectID = static_cast<short>(value.toInt());
+                    break;
+                }
+                case 1:
+                {
+                    effect.mSkill = static_cast<signed char>(value.toInt());
+                    break;
+                }
+                case 2:
+                {
+                    effect.mAttribute = static_cast<signed char>(value.toInt());
+                    break;
+                }
+                case 3:
+                {
+                    effect.mRange = value.toInt();
+                    break;
+                }
+                case 4: effect.mArea = value.toInt(); break;
+                case 5: effect.mDuration = value.toInt(); break;
+                case 6: effect.mMagnMin = value.toInt(); break;
+                case 7: effect.mMagnMax = value.toInt(); break;
+                default: throw std::runtime_error("Magic Effects subcolumn index out of range");
             }
 
-            virtual int getRowsCount(const Record<ESXRecordT>& record) const
-            {
-                return static_cast<int>(record.get().mEffects.mList.size());
-            }
+            magic.mEffects.mList[subRowIndex] = effect;
+
+            record.setModified (magic);
+        }
+
+        virtual int getColumnsCount(const Record<ESXRecordT>& record) const
+        {
+            return 8;
+        }
+
+        virtual int getRowsCount(const Record<ESXRecordT>& record) const
+        {
+            return static_cast<int>(record.get().mEffects.mList.size());
+        }
     };
 
     class InfoListAdapter : public NestedColumnAdapter<Info>
     {
-        public:
-            InfoListAdapter ();
+    public:
+        InfoListAdapter ();
 
-            virtual void addRow(Record<Info>& record, int position) const;
+        virtual void addRow(Record<Info>& record, int position) const;
 
-            virtual void removeRow(Record<Info>& record, int rowToRemove) const;
+        virtual void removeRow(Record<Info>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<Info>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<Info>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
 
-            virtual QVariant getData(const Record<Info>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<Info>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<Info>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<Info>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<Info>& record) const;
+        virtual int getColumnsCount(const Record<Info>& record) const;
 
-            virtual int getRowsCount(const Record<Info>& record) const;
+        virtual int getRowsCount(const Record<Info>& record) const;
     };
 
     class InfoConditionAdapter : public NestedColumnAdapter<Info>
     {
-        public:
-            InfoConditionAdapter ();
+    public:
+        InfoConditionAdapter ();
 
-            virtual void addRow(Record<Info>& record, int position) const;
+        virtual void addRow(Record<Info>& record, int position) const;
 
-            virtual void removeRow(Record<Info>& record, int rowToRemove) const;
+        virtual void removeRow(Record<Info>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<Info>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<Info>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<Info>& record) const;
 
-            virtual QVariant getData(const Record<Info>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<Info>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<Info>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<Info>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<Info>& record) const;
+        virtual int getColumnsCount(const Record<Info>& record) const;
 
-            virtual int getRowsCount(const Record<Info>& record) const;
+        virtual int getRowsCount(const Record<Info>& record) const;
     };
 
     class RaceAttributeAdapter : public NestedColumnAdapter<ESM::Race>
     {
-        public:
-            RaceAttributeAdapter ();
+    public:
+        RaceAttributeAdapter ();
 
-            virtual void addRow(Record<ESM::Race>& record, int position) const;
+        virtual void addRow(Record<ESM::Race>& record, int position) const;
 
-            virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
+        virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<ESM::Race>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<ESM::Race>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
 
-            virtual QVariant getData(const Record<ESM::Race>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<ESM::Race>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<ESM::Race>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<ESM::Race>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<ESM::Race>& record) const;
+        virtual int getColumnsCount(const Record<ESM::Race>& record) const;
 
-            virtual int getRowsCount(const Record<ESM::Race>& record) const;
+        virtual int getRowsCount(const Record<ESM::Race>& record) const;
     };
 
     class RaceSkillsBonusAdapter : public NestedColumnAdapter<ESM::Race>
     {
-        public:
-            RaceSkillsBonusAdapter ();
+    public:
+        RaceSkillsBonusAdapter ();
 
-            virtual void addRow(Record<ESM::Race>& record, int position) const;
+        virtual void addRow(Record<ESM::Race>& record, int position) const;
 
-            virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
+        virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<ESM::Race>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<ESM::Race>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const;
 
-            virtual QVariant getData(const Record<ESM::Race>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<ESM::Race>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<ESM::Race>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<ESM::Race>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<ESM::Race>& record) const;
+        virtual int getColumnsCount(const Record<ESM::Race>& record) const;
 
-            virtual int getRowsCount(const Record<ESM::Race>& record) const;
+        virtual int getRowsCount(const Record<ESM::Race>& record) const;
     };
 
     class CellListAdapter : public NestedColumnAdapter<CSMWorld::Cell>
     {
-        public:
-            CellListAdapter ();
+    public:
+        CellListAdapter ();
 
-            virtual void addRow(Record<CSMWorld::Cell>& record, int position) const;
+        virtual void addRow(Record<CSMWorld::Cell>& record, int position) const;
 
-            virtual void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const;
+        virtual void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<CSMWorld::Cell>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<CSMWorld::Cell>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const;
 
-            virtual QVariant getData(const Record<CSMWorld::Cell>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<CSMWorld::Cell>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<CSMWorld::Cell>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<CSMWorld::Cell>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<CSMWorld::Cell>& record) const;
+        virtual int getColumnsCount(const Record<CSMWorld::Cell>& record) const;
 
-            virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
+        virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const;
     };
 
     class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
     {
-        public:
-            RegionWeatherAdapter ();
+    public:
+        RegionWeatherAdapter ();
 
-            virtual void addRow(Record<ESM::Region>& record, int position) const;
+        virtual void addRow(Record<ESM::Region>& record, int position) const;
 
-            virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
+        virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const;
 
-            virtual void setTable(Record<ESM::Region>& record,
-                    const NestedTableWrapperBase& nestedTable) const;
+        virtual void setTable(Record<ESM::Region>& record,
+                const NestedTableWrapperBase& nestedTable) const;
 
-            virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
+        virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const;
 
-            virtual QVariant getData(const Record<ESM::Region>& record,
-                    int subRowIndex, int subColIndex) const;
+        virtual QVariant getData(const Record<ESM::Region>& record,
+                int subRowIndex, int subColIndex) const;
 
-            virtual void setData(Record<ESM::Region>& record,
-                    const QVariant& value, int subRowIndex, int subColIndex) const;
+        virtual void setData(Record<ESM::Region>& record,
+                const QVariant& value, int subRowIndex, int subColIndex) const;
 
-            virtual int getColumnsCount(const Record<ESM::Region>& record) const;
+        virtual int getColumnsCount(const Record<ESM::Region>& record) const;
 
-            virtual int getRowsCount(const Record<ESM::Region>& record) const;
+        virtual int getRowsCount(const Record<ESM::Region>& record) const;
     };
 }
 

From 2c90b0b78df3523233d359bcc7eca6d917b5d7b0 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 7 Apr 2016 11:55:49 +0200
Subject: [PATCH 543/765] fix a few spelling mistakes

---
 apps/essimporter/importacdt.cpp              |  2 +-
 apps/opencs/model/world/idtree.cpp           |  2 +-
 apps/opencs/model/world/tablemimedata.hpp    |  2 +-
 apps/openmw/mwrender/water.cpp               |  2 +-
 apps/openmw/mwworld/cellstore.cpp            |  4 ++--
 extern/oics/tinyxml.h                        | 10 +++++-----
 extern/osg-ffmpeg-videoplayer/videostate.cpp |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/essimporter/importacdt.cpp b/apps/essimporter/importacdt.cpp
index 239c46698d..fb0dccaf5e 100644
--- a/apps/essimporter/importacdt.cpp
+++ b/apps/essimporter/importacdt.cpp
@@ -75,7 +75,7 @@ namespace ESSImport
         // unsure at which point between TGTN and CRED
         if (esm.isNextSub("AADT"))
         {
-            // occured when a creature was in the middle of its attack, 44 bytes
+            // occurred when a creature was in the middle of its attack, 44 bytes
             esm.skipHSub();
         }
 
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index 124a94e8ca..7c4551a90c 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -264,7 +264,7 @@ void CSMWorld::IdTree::setNestedTable(const QModelIndex& index, const CSMWorld::
 CSMWorld::NestedTableWrapperBase* CSMWorld::IdTree::nestedTable(const QModelIndex& index) const
 {
     if (!hasChildren(index))
-        throw std::logic_error("Tried to retrive nested table, but index has no children");
+        throw std::logic_error("Tried to retrieve nested table, but index has no children");
 
     return mNestedCollection->nestedTable(index.row(), index.column());
 }
diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp
index a42e975618..3be8054bdb 100644
--- a/apps/opencs/model/world/tablemimedata.hpp
+++ b/apps/opencs/model/world/tablemimedata.hpp
@@ -21,7 +21,7 @@ namespace CSMWorld
 ///
 /// This class provides way to construct mimedata object holding the universalid copy
 /// Universalid is used in the majority of the tables to store type, id, argument types.
-/// This way universalid grants a way to retrive record from the concrete table.
+/// This way universalid grants a way to retrieve record from the concrete table.
 /// Please note, that tablemimedata object can hold multiple universalIds in the vector.
 
     class TableMimeData : public QMimeData
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 2ce4f517c1..ab828a3ad4 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -209,7 +209,7 @@ private:
 };
 
 /// Moves water mesh away from the camera slightly if the camera gets too close on the Z axis.
-/// The offset works around graphics artifacts that occured with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
+/// The offset works around graphics artifacts that occurred with the GL_DEPTH_CLAMP when the camera gets extremely close to the mesh (seen on NVIDIA at least).
 /// Must be added as a Cull callback.
 class FudgeCallback : public osg::NodeCallback
 {
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 87a836f717..1ca452efe2 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -490,7 +490,7 @@ namespace MWWorld
             }
             catch (std::exception& e)
             {
-                std::cerr << "An error occured listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
+                std::cerr << "An error occurred listing references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 
@@ -542,7 +542,7 @@ namespace MWWorld
             }
             catch (std::exception& e)
             {
-                std::cerr << "An error occured loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
+                std::cerr << "An error occurred loading references for cell " << getCell()->getDescription() << ": " << e.what() << std::endl;
             }
         }
 
diff --git a/extern/oics/tinyxml.h b/extern/oics/tinyxml.h
index 50ad417fe5..7237825c5d 100644
--- a/extern/oics/tinyxml.h
+++ b/extern/oics/tinyxml.h
@@ -577,7 +577,7 @@ public:
 	#endif
 
 	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
 
@@ -594,17 +594,17 @@ public:
 	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
 
 	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
 
 	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
 
 	/** Replace a child of this node.
-		Returns a pointer to the new object or NULL if an error occured.
+		Returns a pointer to the new object or NULL if an error occurred.
 	*/
 	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
 
@@ -1471,7 +1471,7 @@ public:
 		@sa SetTabSize, Row, Column
 	*/
 	int ErrorRow() const	{ return errorLocation.row+1; }
-	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
+	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occurred. See ErrorRow()
 
 	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
 		to report the correct values for row and column. It does not change the output
diff --git a/extern/osg-ffmpeg-videoplayer/videostate.cpp b/extern/osg-ffmpeg-videoplayer/videostate.cpp
index 3c9279ea25..5849e87187 100644
--- a/extern/osg-ffmpeg-videoplayer/videostate.cpp
+++ b/extern/osg-ffmpeg-videoplayer/videostate.cpp
@@ -528,7 +528,7 @@ void VideoState::decode_thread_loop(VideoState *self)
         }
     }
     catch(std::exception& e) {
-        std::cerr << "An error occured playing the video: " << e.what () << std::endl;
+        std::cerr << "An error occurred playing the video: " << e.what () << std::endl;
     }
 
     self->mQuit = true;

From a3903d374f8b82fb3bfe55281018828df8b8e9a6 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Thu, 7 Apr 2016 07:45:33 -0400
Subject: [PATCH 544/765] Update script editor tab width (Bug #3286)

---
 apps/opencs/view/world/scriptedit.cpp | 9 ++++++++-
 apps/opencs/view/world/scriptedit.hpp | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index d0146445ac..a6689bf53b 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -52,7 +52,7 @@ CSVWorld::ScriptEdit::ScriptEdit(
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
-    setTabStopWidth (4);
+    setTabWidth();
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
     mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
@@ -194,6 +194,13 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
+void CSVWorld::ScriptEdit::setTabWidth()
+{
+    const int numCharacters = 4;
+    QFontMetrics metrics(mMonoFont);
+    setTabStopWidth(numCharacters * metrics.width(' '));
+}
+
 void CSVWorld::ScriptEdit::wrapLines(bool wrap)
 {
     if (wrap)
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 1f03f050a2..7a3f074e98 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -91,6 +91,9 @@ namespace CSVWorld
 
             bool stringNeedsQuote(const std::string& id) const;
 
+            /// \brief Set tab width for script editor.
+            void setTabWidth();
+
             /// \brief Turn line wrapping in script editor on or off.
             /// \param wrap Whether or not to wrap lines.
             void wrapLines(bool wrap);

From 8703609649c3d87c5def0db6d427cb69df958655 Mon Sep 17 00:00:00 2001
From: Ben Shealy <bentshermann@gmail.com>
Date: Sat, 9 Apr 2016 17:49:21 -0400
Subject: [PATCH 545/765] Allow +/- buttons in trade window to decrease offer
 to 0

---
 apps/openmw/mwgui/tradewindow.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index c084ec2439..ed81677e46 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -476,15 +476,15 @@ namespace MWGui
         // prevent overflows, and prevent entering INT_MIN since abs(INT_MIN) is undefined
         if (mCurrentBalance == INT_MAX || mCurrentBalance == INT_MIN+1)
             return;
-        if(mCurrentBalance<=-1) mCurrentBalance -= 1;
-        if(mCurrentBalance>=1) mCurrentBalance += 1;
+        if (mCurrentBalance < 0) mCurrentBalance -= 1;
+        else mCurrentBalance += 1;
         updateLabels();
     }
 
     void TradeWindow::onDecreaseButtonTriggered()
     {
-        if(mCurrentBalance<-1) mCurrentBalance += 1;
-        if(mCurrentBalance>1) mCurrentBalance -= 1;
+        if (mCurrentBalance < 0) mCurrentBalance += 1;
+        else mCurrentBalance -= 1;
         updateLabels();
     }
 
@@ -495,13 +495,13 @@ namespace MWGui
 
         mPlayerGold->setCaptionWithReplacing("#{sYourGold} " + MyGUI::utility::toString(playerGold));
 
-        if (mCurrentBalance > 0)
+        if (mCurrentBalance < 0)
         {
-            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}");
+            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
         }
         else
         {
-            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalCost}");
+            mTotalBalanceLabel->setCaptionWithReplacing("#{sTotalSold}");
         }
 
         mTotalBalance->setValue(std::abs(mCurrentBalance));

From 85130772cd978ae016311fa335529a1d45513142 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 10 Apr 2016 00:06:02 +0200
Subject: [PATCH 546/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 4c6aa8895c..191d423ed1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -24,6 +24,7 @@ Programmers
     artemutin
     Arthur Moore (EmperorArthur)
     athile
+    Ben Shealy (bentsherman)
     Bret Curtis (psi29a)
     Britt Mathis (galdor557)
     cc9cii

From 96231e17f098e4a56c0a5015ad1e027ab674604a Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sun, 10 Apr 2016 20:21:18 -0500
Subject: [PATCH 547/765] Fix wandering NPCs going off pathgrid

If multiple pathgrids exist in the same cell, sometimes an NPC would port to a different pathgrid that was nearby. This is an issue since it allowed them to do things like travel through walls to inaccessible areas. Now they will only wander along the closest connected pathgrid.
---
 apps/openmw/mwmechanics/aiwander.cpp | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 27c7f6a93f..ad4e596c1e 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -39,6 +39,33 @@ namespace MWMechanics
     // distance must be long enough that NPC will need to move to get there.
     static const int MINIMUM_WANDER_DISTANCE = DESTINATION_TOLERANCE * 2;
 
+    float distanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
+    {
+        return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
+    }
+    
+    int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
+    {
+        assert(grid && !grid->mPoints.empty());
+
+        float distanceBetween = distanceSquared(grid->mPoints[0], pos);
+        int closestIndex = 0;
+
+        // TODO: if this full scan causes performance problems mapping pathgrid
+        //       points to a quadtree may help
+        for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
+        {
+            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
+            if(potentialDistBetween < distanceBetween)
+            {
+                distanceBetween = potentialDistBetween;
+                closestIndex = counter;
+            }
+        }
+
+        return closestIndex;
+    }
+
     const std::string AiWander::sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1] =
     {
         std::string("idle2"),
@@ -729,6 +756,7 @@ namespace MWMechanics
         // infrequently used, therefore no benefit in caching it as a member
         const ESM::Pathgrid *
             pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
+        const MWWorld::CellStore* cellStore = actor.getCell();
 
         mAllowedNodes.clear();
 
@@ -749,14 +777,19 @@ namespace MWMechanics
             // get NPC's position in local (i.e. cell) co-ordinates
             osg::Vec3f npcPos(mInitialActorPosition);
             CoordinateConverter(cell).toLocal(npcPos);
+            
+            // Find closest pathgrid point
+            int closestPointIndex = getClosestPoint(pathgrid, npcPos);
 
             // mAllowedNodes for this actor with pathgrid point indexes based on mDistance
+            // and if the point is connected to the closest current point
             // NOTE: mPoints and mAllowedNodes are in local co-ordinates
             int pointIndex = 0;
             for(unsigned int counter = 0; counter < pathgrid->mPoints.size(); counter++)
             {
                 osg::Vec3f nodePos(PathFinder::MakeOsgVec3(pathgrid->mPoints[counter]));
-                if((npcPos - nodePos).length2() <= mDistance * mDistance)
+                if((npcPos - nodePos).length2() <= mDistance * mDistance &&
+                   cellStore->isPointConnected(closestPointIndex, counter))
                 {
                     mAllowedNodes.push_back(pathgrid->mPoints[counter]);
                     pointIndex = counter;

From 38f5a225eaf9e893bbb581d4e9f7ddcab337302a Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sun, 10 Apr 2016 20:44:08 -0500
Subject: [PATCH 548/765] Refactor PathFinder functions to be useable by
 AiWander

This avoids having to duplicate the distanceSquared and getClosestPoint functions.
---
 apps/openmw/mwmechanics/aiwander.cpp    | 29 +-------------
 apps/openmw/mwmechanics/pathfinding.cpp | 51 ++++---------------------
 apps/openmw/mwmechanics/pathfinding.hpp | 38 ++++++++++++++++++
 3 files changed, 46 insertions(+), 72 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index ad4e596c1e..f0295f3316 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -39,33 +39,6 @@ namespace MWMechanics
     // distance must be long enough that NPC will need to move to get there.
     static const int MINIMUM_WANDER_DISTANCE = DESTINATION_TOLERANCE * 2;
 
-    float distanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
-    {
-        return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
-    }
-    
-    int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
-    {
-        assert(grid && !grid->mPoints.empty());
-
-        float distanceBetween = distanceSquared(grid->mPoints[0], pos);
-        int closestIndex = 0;
-
-        // TODO: if this full scan causes performance problems mapping pathgrid
-        //       points to a quadtree may help
-        for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
-        {
-            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
-            if(potentialDistBetween < distanceBetween)
-            {
-                distanceBetween = potentialDistBetween;
-                closestIndex = counter;
-            }
-        }
-
-        return closestIndex;
-    }
-
     const std::string AiWander::sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1] =
     {
         std::string("idle2"),
@@ -779,7 +752,7 @@ namespace MWMechanics
             CoordinateConverter(cell).toLocal(npcPos);
             
             // Find closest pathgrid point
-            int closestPointIndex = getClosestPoint(pathgrid, npcPos);
+            int closestPointIndex = PathFinder::GetClosestPoint(pathgrid, npcPos);
 
             // mAllowedNodes for this actor with pathgrid point indexes based on mDistance
             // and if the point is connected to the closest current point
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index dbe20fdc05..c8ba867032 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -10,43 +10,6 @@
 
 namespace
 {
-    // Slightly cheaper version for comparisons.
-    // Caller needs to be careful for very short distances (i.e. less than 1)
-    // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
-    //
-    float distanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
-    {
-        return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
-    }
-
-    // Return the closest pathgrid point index from the specified position co
-    // -ordinates.  NOTE: Does not check if there is a sensible way to get there
-    // (e.g. a cliff in front).
-    //
-    // NOTE: pos is expected to be in local co-ordinates, as is grid->mPoints
-    //
-    int getClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
-    {
-        assert(grid && !grid->mPoints.empty());
-
-        float distanceBetween = distanceSquared(grid->mPoints[0], pos);
-        int closestIndex = 0;
-
-        // TODO: if this full scan causes performance problems mapping pathgrid
-        //       points to a quadtree may help
-        for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
-        {
-            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
-            if(potentialDistBetween < distanceBetween)
-            {
-                distanceBetween = potentialDistBetween;
-                closestIndex = counter;
-            }
-        }
-
-        return closestIndex;
-    }
-
     // Chooses a reachable end pathgrid point.  start is assumed reachable.
     std::pair<int, bool> getClosestReachablePoint(const ESM::Pathgrid* grid,
                                                   const MWWorld::CellStore *cell,
@@ -62,7 +25,7 @@ namespace
         //       points to a quadtree may help
         for(unsigned int counter = 0; counter < grid->mPoints.size(); counter++)
         {
-            float potentialDistBetween = distanceSquared(grid->mPoints[counter], pos);
+            float potentialDistBetween = MWMechanics::PathFinder::DistanceSquared(grid->mPoints[counter], pos);
             if (potentialDistBetween < closestDistanceReachable)
             {
                 // found a closer one
@@ -146,7 +109,7 @@ namespace MWMechanics
      * pathgrid point (e.g. wander) then it may be worth while to call
      * pop_back() to remove the redundant entry.
      *
-     * NOTE: co-ordinates must be converted prior to calling getClosestPoint()
+     * NOTE: co-ordinates must be converted prior to calling GetClosestPoint()
      *
      *    |
      *    |       cell
@@ -199,16 +162,16 @@ namespace MWMechanics
             return;
         }
 
-        // NOTE: getClosestPoint expects local co-ordinates
+        // NOTE: GetClosestPoint expects local co-ordinates
         CoordinateConverter converter(mCell->getCell());
 
-        // NOTE: It is possible that getClosestPoint returns a pathgrind point index
+        // NOTE: It is possible that GetClosestPoint returns a pathgrind point index
         //       that is unreachable in some situations. e.g. actor is standing
         //       outside an area enclosed by walls, but there is a pathgrid
         //       point right behind the wall that is closer than any pathgrid
         //       point outside the wall
         osg::Vec3f startPointInLocalCoords(converter.toLocalVec3(startPoint));
-        int startNode = getClosestPoint(mPathgrid, startPointInLocalCoords);
+        int startNode = GetClosestPoint(mPathgrid, startPointInLocalCoords);
 
         osg::Vec3f endPointInLocalCoords(converter.toLocalVec3(endPoint));
         std::pair<int, bool> endNode = getClosestReachablePoint(mPathgrid, cell,
@@ -218,8 +181,8 @@ namespace MWMechanics
         // if it's shorter for actor to travel from start to end, than to travel from either
         // start or end to nearest pathgrid point, just travel from start to end.
         float startToEndLength2 = (endPointInLocalCoords - startPointInLocalCoords).length2();
-        float endTolastNodeLength2 = distanceSquared(mPathgrid->mPoints[endNode.first], endPointInLocalCoords);
-        float startTo1stNodeLength2 = distanceSquared(mPathgrid->mPoints[startNode], startPointInLocalCoords);
+        float endTolastNodeLength2 = DistanceSquared(mPathgrid->mPoints[endNode.first], endPointInLocalCoords);
+        float startTo1stNodeLength2 = DistanceSquared(mPathgrid->mPoints[startNode], startPointInLocalCoords);
         if ((startToEndLength2 < startTo1stNodeLength2) || (startToEndLength2 < endTolastNodeLength2))
         {
             mPath.push_back(endPoint);
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 1765a5cc56..7262842dc7 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -4,6 +4,7 @@
 #include <components/esm/defs.hpp>
 #include <components/esm/loadpgrd.hpp>
 #include <list>
+#include <cassert>
 
 namespace MWWorld
 {
@@ -89,6 +90,43 @@ namespace MWMechanics
             {
                 return osg::Vec3f(static_cast<float>(p.mX), static_cast<float>(p.mY), static_cast<float>(p.mZ));
             }
+            
+            // Slightly cheaper version for comparisons.
+            // Caller needs to be careful for very short distances (i.e. less than 1)
+            // or when accumuating the results i.e. (a + b)^2 != a^2 + b^2
+            //
+            static float DistanceSquared(ESM::Pathgrid::Point point, const osg::Vec3f& pos)
+            {
+                return (MWMechanics::PathFinder::MakeOsgVec3(point) - pos).length2();
+            }
+
+            // Return the closest pathgrid point index from the specified position co
+            // -ordinates.  NOTE: Does not check if there is a sensible way to get there
+            // (e.g. a cliff in front).
+            //
+            // NOTE: pos is expected to be in local co-ordinates, as is grid->mPoints
+            //
+            static int GetClosestPoint(const ESM::Pathgrid* grid, const osg::Vec3f& pos)
+            {
+                assert(grid && !grid->mPoints.empty());
+
+                float distanceBetween = DistanceSquared(grid->mPoints[0], pos);
+                int closestIndex = 0;
+
+                // TODO: if this full scan causes performance problems mapping pathgrid
+                //       points to a quadtree may help
+                for(unsigned int counter = 1; counter < grid->mPoints.size(); counter++)
+                {
+                    float potentialDistBetween = DistanceSquared(grid->mPoints[counter], pos);
+                    if(potentialDistBetween < distanceBetween)
+                    {
+                        distanceBetween = potentialDistBetween;
+                        closestIndex = counter;
+                    }
+                }
+
+                return closestIndex;
+            }
 
         private:
             void buildPath(const ESM::Pathgrid::Point &startPoint, const ESM::Pathgrid::Point &endPoint,

From 2b521b8436954a314c00e8f8f1e9269125091839 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Apr 2016 00:56:41 +0200
Subject: [PATCH 549/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 191d423ed1..b0bb4808ed 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -20,6 +20,7 @@ Programmers
     Alex McKibben (WeirdSexy)
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
+    Austin Salgat (Salgat)
     Artem Kotsynyak (greye)
     artemutin
     Arthur Moore (EmperorArthur)

From 4854d6b093dd04bf6acb0c7bc6da6f7cf4cea84d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 11 Apr 2016 16:52:03 +0200
Subject: [PATCH 550/765] Set the TalkedToPc flag for voiced dialogue (Fixes
 #3346)

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 4f0f4f4692..578b5b9a4e 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -629,7 +629,8 @@ namespace MWDialogue
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
         const ESM::Dialogue *dial = store.get<ESM::Dialogue>().find(topic);
 
-        Filter filter(actor, 0, false);
+        const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
+        Filter filter(actor, 0, creatureStats.hasTalkedToPlayer());
         const ESM::DialInfo *info = filter.search(*dial, false);
         if(info != NULL)
         {

From ba3f4f122a109add4dd28b44026633dd08a1353b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 11 Apr 2016 17:15:02 +0200
Subject: [PATCH 551/765] Account for the stack count in HasSoulGem (Bug #3340)

---
 apps/openmw/mwscript/containerextensions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 4e3e010f7e..366e88f1e3 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -317,7 +317,7 @@ namespace MWScript
                          it != invStore.end(); ++it)
                     {
                         if (::Misc::StringUtils::ciEqual(it->getCellRef().getSoul(), name))
-                            ++count;
+                            count += it->getRefData().getCount();
                     }
                     runtime.push(count);
                 }

From 8cf91e32fa4269f56e26a79767405e6104ce8818 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Apr 2016 21:37:26 +0200
Subject: [PATCH 552/765] ESSImport: Correctly handle item stacks (XIDX tag).
 (Fixes #3340)

---
 apps/essimporter/importinventory.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/essimporter/importinventory.cpp b/apps/essimporter/importinventory.cpp
index 3ec640d3d5..2c87a9a19d 100644
--- a/apps/essimporter/importinventory.cpp
+++ b/apps/essimporter/importinventory.cpp
@@ -21,13 +21,18 @@ namespace ESSImport
             item.mCount = contItem.mCount;
             item.mRelativeEquipmentSlot = -1;
 
-            // seems that a stack of items can have a set of subrecords for each item? rings0000.ess
-            // doesn't make any sense to me, if the values were different then the items shouldn't stack in the first place?
-            // I guess we should double check the stacking logic in OpenMW
-            for (int i=0;i<std::abs(item.mCount);++i)
+            unsigned int itemCount = std::abs(item.mCount);
+            bool separateStacks = false;
+            for (unsigned int i=0;i<itemCount;++i)
             {
-                if (esm.isNextSub("XIDX")) // index in the stack?
-                    esm.skipHSub();
+                bool newStack = esm.isNextSub("XIDX");
+                if (newStack)
+                {
+                    unsigned int idx;
+                    esm.getHT(idx);
+                    separateStacks = true;
+                    item.mCount = 1;
+                }
 
                 item.mSCRI.load(esm);
 
@@ -38,9 +43,13 @@ namespace ESSImport
                 int charge=-1;
                 esm.getHNOT(charge, "XHLT");
                 item.mChargeInt = charge;
+
+                if (newStack)
+                    mItems.push_back(item);
             }
 
-            mItems.push_back(item);
+            if (!separateStacks)
+                mItems.push_back(item);
         }
 
         // equipped items

From c02881a4f8992d41bb5c59ed3beea192563f6852 Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Tue, 12 Apr 2016 21:16:55 -0500
Subject: [PATCH 553/765] Fix creatures not wandering

---
 apps/openmw/mwmechanics/aiwander.cpp | 91 ++++++++++++++++++++++++----
 apps/openmw/mwmechanics/aiwander.hpp |  8 +++
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index f0295f3316..b1df110fba 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -67,6 +67,11 @@ namespace MWMechanics
 
         // AiWander states
         AiWander::WanderState mState;
+
+        // Wandering near spawn logic
+        bool mIsWanderingManually;
+        ESM::Pathgrid::Point mPreviousWanderingNearSpawnLocation;
+        int mStuckTimer;
         
         unsigned short mIdleAnimation;
         std::vector<unsigned short> mBadIdles; // Idle animations that when called cause errors
@@ -81,9 +86,16 @@ namespace MWMechanics
             mGreetingTimer(0),
             mCell(NULL),
             mState(AiWander::Wander_ChooseAction),
+            mIsWanderingManually(false),
+            mStuckTimer(0),
             mIdleAnimation(0),
             mBadIdles()
             {};
+
+        void setState(const AiWander::WanderState wanderState, const bool isManualWander = false) {
+            mState = wanderState;
+            mIsWanderingManually = isManualWander;
+        }
     };
     
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
@@ -227,8 +239,20 @@ namespace MWMechanics
         }
 
         // Actor becomes stationary - see above URL's for previous research
-        if(mAllowedNodes.empty())
+        // If not an NPC and no pathgrid is available, randomly idle or wander around near spawn point
+        if(mAllowedNodes.empty() && !actor.getBase()->mClass->isNpc() && !storage.mIsWanderingManually) {
+            // Typically want to idle for a short time before the next wander
+            if (Misc::Rng::rollDice(100) >= 96) {
+                wanderNearSpawn(actor, storage);
+            }
+        } else if (mAllowedNodes.empty() && !storage.mIsWanderingManually) {
             mDistance = 0;
+        }
+
+        // Detect obstacles if wandering manually
+        if (storage.mIsWanderingManually) {
+            detectManualWanderingObstacles(actor, storage);
+        }
 
         // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
         if(mDistance && cellChange)
@@ -303,11 +327,54 @@ namespace MWMechanics
 
             if (storage.mPathFinder.isPathConstructed())
             {
-                storage.mState = Wander_Walking;
+                storage.setState(Wander_Walking);
             }
         }
     }
 
+    /*
+     * Commands actor to walk to a random location near original spawn location.
+     */
+    void AiWander::wanderNearSpawn(const MWWorld::Ptr& actor, AiWanderStorage& storage) {
+        const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
+        const ESM::Pathgrid::Point originalPosition = actor.getCellRef().getPosition().pos;
+
+        // Determine a random location within radius of original position
+        const float pi = 3.14159265359f;
+        const float randomRadius = Misc::Rng::rollClosedProbability() * MINIMUM_WANDER_DISTANCE * 14.0f;
+        const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
+        const float destinationX = originalPosition.mX + randomRadius * std::cos(randomDirection);
+        const float destinationY = originalPosition.mY + randomRadius * std::sin(randomDirection);
+        ESM::Pathgrid::Point destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, originalPosition.mZ);
+
+        storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
+        storage.mPathFinder.addPointToPath(destinationPosition);
+        storage.mPreviousWanderingNearSpawnLocation = currentPosition;
+        storage.mStuckTimer = 0;
+        storage.setState(Wander_Walking, true);
+    }
+
+    /*
+     * Detects if a manually wandering actor has spent too much time at one spot (stuck by an obstacle)
+     * and stops wandering when that occurs. Uses the unit's speed to help determine how long they should
+     * not be in one spot.
+     */
+    void AiWander::detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage) {
+        const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
+        const float actorSpeed = actor.getClass().getSpeed(actor);
+        const float minimumDistanceTraveled = actorSpeed / 5.0f;
+        if (distanceApart2d(storage.mPreviousWanderingNearSpawnLocation, currentPosition) < minimumDistanceTraveled) {
+            // Hit an obstacle and haven't moved much
+            if (++(storage.mStuckTimer) > 10) {
+                // Stuck too long, stop wandering
+                storage.setState(Wander_ChooseAction);
+                mDistance = 0;
+            }
+        } else {
+            storage.mPreviousWanderingNearSpawnLocation = currentPosition;
+        }
+    }
+
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos)
     {
         switch (storage.mState)
@@ -344,7 +411,7 @@ namespace MWMechanics
             if (mDistance &&            // actor is not intended to be stationary
                 proximityToDoor(actor, MIN_DIST_TO_DOOR_SQUARED*1.6f*1.6f)) // NOTE: checks interior cells only
             {
-                storage.mState = Wander_MoveNow;
+                storage.setState(Wander_MoveNow);
                 mTrimCurrentNode = false; // just in case
                 return;
             }
@@ -364,7 +431,7 @@ namespace MWMechanics
         GreetingState& greetingState = storage.mSaidGreeting;
         if (!checkIdle(actor, storage.mIdleAnimation) && (greetingState == Greet_Done || greetingState == Greet_None))
         {
-            storage.mState = Wander_ChooseAction;
+            storage.setState(Wander_ChooseAction);
         }
     }
 
@@ -375,7 +442,7 @@ namespace MWMechanics
         if (storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], DESTINATION_TOLERANCE))
         {
             stopWalking(actor, storage);
-            storage.mState = Wander_ChooseAction;
+            storage.setState(Wander_ChooseAction);
             mHasReturnPosition = false;
         }
         else
@@ -393,7 +460,7 @@ namespace MWMechanics
 
         if (!idleAnimation && mDistance)
         {
-            storage.mState = Wander_MoveNow;
+            storage.setState(Wander_MoveNow);
             return;
         }
         if(idleAnimation)
@@ -403,14 +470,14 @@ namespace MWMechanics
                 if(!playIdle(actor, idleAnimation))
                 {
                     storage.mBadIdles.push_back(idleAnimation);
-                    storage.mState = Wander_ChooseAction;
+                    storage.setState(Wander_ChooseAction);
                     return;
                 }
             }
         }
         // Recreate vanilla (broken?) behavior of resetting start time of AIWander:
         mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-        storage.mState = Wander_IdleNow;
+        storage.setState(Wander_IdleNow);
     }
 
     void AiWander::evadeObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage, float duration, ESM::Position& pos)
@@ -429,7 +496,7 @@ namespace MWMechanics
                 trimAllowedNodes(mAllowedNodes, storage.mPathFinder);
                 mObstacleCheck.clear();
                 storage.mPathFinder.clearPath();
-                storage.mState = Wander_MoveNow;
+                storage.setState(Wander_MoveNow);
             }
             else // probably walking into another NPC
             {
@@ -451,7 +518,7 @@ namespace MWMechanics
             mObstacleCheck.clear();
 
             stopWalking(actor, storage);
-            storage.mState = Wander_ChooseAction;
+            storage.setState(Wander_ChooseAction);
             mStuckCount = 0;
         }
     }
@@ -526,7 +593,7 @@ namespace MWMechanics
             {
                 stopWalking(actor, storage);
                 mObstacleCheck.clear();
-                storage.mState = Wander_IdleNow;
+                storage.setState(Wander_IdleNow);
             }
 
             turnActorToFacePlayer(actorPos, playerPos, storage);
@@ -579,7 +646,7 @@ namespace MWMechanics
                 mAllowedNodes.push_back(mCurrentNode);
             mCurrentNode = temp;
 
-            storage.mState = Wander_Walking;
+            storage.setState(Wander_Walking);
         }
         // Choose a different node and delete this one from possible nodes because it is uncreachable:
         else
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 683c04bb0d..b8001c7016 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -94,6 +94,8 @@ namespace MWMechanics
                 const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos);
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
+            void wanderNearSpawn(const MWWorld::Ptr& actor, AiWanderStorage& storage);
+            void detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;
@@ -158,6 +160,12 @@ namespace MWMechanics
             static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
 
             static int OffsetToPreventOvercrowding();
+
+            float distanceApart2d(const ESM::Pathgrid::Point& first, const ESM::Pathgrid::Point& second) {
+                const float deltaX = second.mX - first.mX;
+                const float deltaY = second.mY - first.mY;
+                return std::sqrt(deltaX*deltaX + deltaY*deltaY);
+            }
     };
     
     

From 92b352989ace68319e700959269b9777333841a2 Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Wed, 13 Apr 2016 20:48:08 -0500
Subject: [PATCH 554/765] Add logic for NPC wandering without pathgrids

---
 apps/openmw/mwmechanics/aiwander.cpp | 35 ++++++++++++++++------------
 apps/openmw/mwmechanics/aiwander.hpp |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index b1df110fba..0e3d20d4ac 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -232,6 +232,12 @@ namespace MWMechanics
             return true;
         }
 
+        if (!mStoredInitialActorPosition)
+        {
+            mInitialActorPosition = actor.getRefData().getPosition().asVec3();
+            mStoredInitialActorPosition = true;
+        }
+
         // Initialization to discover & store allowed node points for this actor.
         if (mPopulateAvailableNodes)
         {
@@ -239,11 +245,12 @@ namespace MWMechanics
         }
 
         // Actor becomes stationary - see above URL's for previous research
-        // If not an NPC and no pathgrid is available, randomly idle or wander around near spawn point
-        if(mAllowedNodes.empty() && !actor.getBase()->mClass->isNpc() && !storage.mIsWanderingManually) {
+        // If a creature or an NPC with a wander distance and no pathgrid is available,
+        // randomly idle or wander around near spawn point
+        if(mAllowedNodes.empty() && (mDistance > 0 || !actor.getClass().isNpc()) && !storage.mIsWanderingManually) {
             // Typically want to idle for a short time before the next wander
             if (Misc::Rng::rollDice(100) >= 96) {
-                wanderNearSpawn(actor, storage);
+                wanderNearStart(actor, storage, mDistance, actor.getClass().isNpc());
             }
         } else if (mAllowedNodes.empty() && !storage.mIsWanderingManually) {
             mDistance = 0;
@@ -334,18 +341,22 @@ namespace MWMechanics
 
     /*
      * Commands actor to walk to a random location near original spawn location.
+     *
+     * Creatures simply wander a certain distance from their starting location, while NPCs wander a scripted
+     * distance (mDistance) from the position where they started the wander package.
+     * http://www.uesp.net/wiki/Tes3Mod:AIWander
      */
-    void AiWander::wanderNearSpawn(const MWWorld::Ptr& actor, AiWanderStorage& storage) {
+    void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance, bool isNpc) {
         const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
-        const ESM::Pathgrid::Point originalPosition = actor.getCellRef().getPosition().pos;
 
         // Determine a random location within radius of original position
         const float pi = 3.14159265359f;
-        const float randomRadius = Misc::Rng::rollClosedProbability() * MINIMUM_WANDER_DISTANCE * 14.0f;
+        const float maxWanderDistance = isNpc ? wanderDistance : MINIMUM_WANDER_DISTANCE * 14.0f;
+        const float wanderRadius = Misc::Rng::rollClosedProbability() * maxWanderDistance;
         const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
-        const float destinationX = originalPosition.mX + randomRadius * std::cos(randomDirection);
-        const float destinationY = originalPosition.mY + randomRadius * std::sin(randomDirection);
-        ESM::Pathgrid::Point destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, originalPosition.mZ);
+        const float destinationX = mInitialActorPosition.x() + wanderRadius * std::cos(randomDirection);
+        const float destinationY = mInitialActorPosition.y() + wanderRadius * std::sin(randomDirection);
+        ESM::Pathgrid::Point destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, mInitialActorPosition.z());
 
         storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
         storage.mPathFinder.addPointToPath(destinationPosition);
@@ -787,12 +798,6 @@ namespace MWMechanics
 
     void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell)
     {
-        if (!mStoredInitialActorPosition)
-        {
-            mInitialActorPosition = actor.getRefData().getPosition().asVec3();
-            mStoredInitialActorPosition = true;
-        }
-
         // infrequently used, therefore no benefit in caching it as a member
         const ESM::Pathgrid *
             pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index b8001c7016..dde87079ac 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -94,7 +94,7 @@ namespace MWMechanics
                 const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos);
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
-            void wanderNearSpawn(const MWWorld::Ptr& actor, AiWanderStorage& storage);
+            void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance, bool isNpc);
             void detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             int mDistance; // how far the actor can wander from the spawn point

From d784a77f4cbdcdbbc9a4987976baf1b8df929e3f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 15 Apr 2016 00:49:36 +0200
Subject: [PATCH 555/765] Set the default player cell in the StateManager
 (Fixes #3269)

---
 apps/openmw/mwstate/statemanagerimp.cpp | 24 +++++++++++++++++++++---
 apps/openmw/mwworld/player.cpp          |  8 ++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index e4b26f8b70..cb3b4ca225 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -492,10 +492,28 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
         MWWorld::ConstPtr ptr = MWMechanics::getPlayer();
 
-        const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
+        if (ptr.isInCell())
+        {
+            const ESM::CellId& cellId = ptr.getCell()->getCell()->getCellId();
 
-        // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
-        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
+            // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
+            MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false, false);
+        }
+        else
+        {
+            // Cell no longer exists (i.e. changed game files), choose a default cell
+            MWWorld::CellStore* cell = MWBase::Environment::get().getWorld()->getExterior(0,0);
+            float x,y;
+            MWBase::Environment::get().getWorld()->indexToPosition(0,0,x,y,false);
+            ESM::Position pos;
+            pos.pos[0] = x;
+            pos.pos[1] = y;
+            pos.pos[2] = 0; // should be adjusted automatically (adjustPlayerPos=true)
+            pos.rot[0] = 0;
+            pos.rot[1] = 0;
+            pos.rot[2] = 0;
+            MWBase::Environment::get().getWorld()->changeToCell(cell->getCell()->getCellId(), pos, true, false);
+        }
 
         // Vanilla MW will restart startup scripts when a save game is loaded. This is unintuitive,
         // but some mods may be using it as a reload detector.
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 19b66c3c93..bf4f3b33e9 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -355,12 +355,8 @@ namespace MWWorld
             catch (...)
             {
                 std::cerr << "Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl;
-                // Cell no longer exists. Place the player in a default cell.
-                ESM::Position pos = mPlayer.mData.getPosition();
-                MWBase::Environment::get().getWorld()->indexToPosition(0, 0, pos.pos[0], pos.pos[1], true);
-                pos.pos[2] = 0;
-                mPlayer.mData.setPosition(pos);
-                mCellStore = world.getExterior(0,0);
+                // Cell no longer exists. The loader will have to choose a default cell.
+                mCellStore = NULL;
             }
 
             if (!player.mBirthsign.empty())

From 34726c24d99b8e242a79bc22dc97a31801304292 Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Fri, 15 Apr 2016 21:56:41 -0500
Subject: [PATCH 556/765] Fix mDistance being reset prematurely

This was causing wandering without pathgrids to become disabled for most wandering units. Additionally, wandering now behaves the same for both NPCs and creatures.
---
 apps/openmw/mwmechanics/aiwander.cpp | 36 ++++++++++++++++------------
 apps/openmw/mwmechanics/aiwander.hpp |  4 ++--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 0e3d20d4ac..e9957dd603 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -16,6 +16,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/customdata.hpp"
 
 #include "creaturestats.hpp"
 #include "steering.hpp"
@@ -72,6 +73,8 @@ namespace MWMechanics
         bool mIsWanderingManually;
         ESM::Pathgrid::Point mPreviousWanderingNearSpawnLocation;
         int mStuckTimer;
+
+        bool mCanWanderAlongPathGrid;
         
         unsigned short mIdleAnimation;
         std::vector<unsigned short> mBadIdles; // Idle animations that when called cause errors
@@ -88,6 +91,7 @@ namespace MWMechanics
             mState(AiWander::Wander_ChooseAction),
             mIsWanderingManually(false),
             mStuckTimer(0),
+            mCanWanderAlongPathGrid(true),
             mIdleAnimation(0),
             mBadIdles()
             {};
@@ -227,6 +231,9 @@ namespace MWMechanics
     bool AiWander::reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage,
         const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos)
     {
+        if (mDistance <= 0)
+            storage.mCanWanderAlongPathGrid = false;
+
         if (isPackageCompleted(actor, storage))
         {
             return true;
@@ -241,19 +248,19 @@ namespace MWMechanics
         // Initialization to discover & store allowed node points for this actor.
         if (mPopulateAvailableNodes)
         {
-            getAllowedNodes(actor, currentCell->getCell());
+            getAllowedNodes(actor, currentCell->getCell(), storage);
         }
 
         // Actor becomes stationary - see above URL's for previous research
         // If a creature or an NPC with a wander distance and no pathgrid is available,
         // randomly idle or wander around near spawn point
-        if(mAllowedNodes.empty() && (mDistance > 0 || !actor.getClass().isNpc()) && !storage.mIsWanderingManually) {
+        if(mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
             // Typically want to idle for a short time before the next wander
             if (Misc::Rng::rollDice(100) >= 96) {
-                wanderNearStart(actor, storage, mDistance, actor.getClass().isNpc());
+                wanderNearStart(actor, storage, mDistance);
             }
         } else if (mAllowedNodes.empty() && !storage.mIsWanderingManually) {
-            mDistance = 0;
+            storage.mCanWanderAlongPathGrid = false;
         }
 
         // Detect obstacles if wandering manually
@@ -281,7 +288,7 @@ namespace MWMechanics
             playGreetingIfPlayerGetsTooClose(actor, storage);
         }
 
-        if ((wanderState == Wander_MoveNow) && mDistance)
+        if ((wanderState == Wander_MoveNow) && storage.mCanWanderAlongPathGrid)
         {
             // Construct a new path if there isn't one
             if(!storage.mPathFinder.isPathConstructed())
@@ -346,13 +353,12 @@ namespace MWMechanics
      * distance (mDistance) from the position where they started the wander package.
      * http://www.uesp.net/wiki/Tes3Mod:AIWander
      */
-    void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance, bool isNpc) {
+    void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance) {
         const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
 
         // Determine a random location within radius of original position
         const float pi = 3.14159265359f;
-        const float maxWanderDistance = isNpc ? wanderDistance : MINIMUM_WANDER_DISTANCE * 14.0f;
-        const float wanderRadius = Misc::Rng::rollClosedProbability() * maxWanderDistance;
+        const float wanderRadius = Misc::Rng::rollClosedProbability() * wanderDistance;
         const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
         const float destinationX = mInitialActorPosition.x() + wanderRadius * std::cos(randomDirection);
         const float destinationY = mInitialActorPosition.y() + wanderRadius * std::sin(randomDirection);
@@ -376,10 +382,10 @@ namespace MWMechanics
         const float minimumDistanceTraveled = actorSpeed / 5.0f;
         if (distanceApart2d(storage.mPreviousWanderingNearSpawnLocation, currentPosition) < minimumDistanceTraveled) {
             // Hit an obstacle and haven't moved much
-            if (++(storage.mStuckTimer) > 10) {
-                // Stuck too long, stop wandering
+            if (++(storage.mStuckTimer) > 8) {
+                // Stuck too long, wander elsewhere
                 storage.setState(Wander_ChooseAction);
-                mDistance = 0;
+                wanderNearStart(actor, storage, mDistance);
             }
         } else {
             storage.mPreviousWanderingNearSpawnLocation = currentPosition;
@@ -769,7 +775,7 @@ namespace MWMechanics
             return;
 
         if (mPopulateAvailableNodes)
-            getAllowedNodes(actor, actor.getCell()->getCell());
+            getAllowedNodes(actor, actor.getCell()->getCell(), state.get<AiWanderStorage>());
 
         if (mAllowedNodes.empty())
             return;
@@ -796,7 +802,7 @@ namespace MWMechanics
         return static_cast<int>(DESTINATION_TOLERANCE * (Misc::Rng::rollProbability() * 2.0f - 1.0f));
     }
 
-    void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell)
+    void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage)
     {
         // infrequently used, therefore no benefit in caching it as a member
         const ESM::Pathgrid *
@@ -810,14 +816,14 @@ namespace MWMechanics
         // http://www.fliggerty.com/phpBB3/viewtopic.php?f=30&t=5833
         // Note: In order to wander, need at least two points.
         if(!pathgrid || (pathgrid->mPoints.size() < 2))
-            mDistance = 0;
+            storage.mCanWanderAlongPathGrid = false;
 
         // A distance value passed into the constructor indicates how far the
         // actor can  wander from the spawn position.  AiWander assumes that
         // pathgrid points are available, and uses them to randomly select wander
         // destinations within the allowed set of pathgrid points (nodes).
         // ... pathgrids don't usually include water, so swimmers ignore them
-        if (mDistance && !actor.getClass().isPureWaterCreature(actor))
+        if (mDistance && storage.mCanWanderAlongPathGrid && !actor.getClass().isPureWaterCreature(actor))
         {
             // get NPC's position in local (i.e. cell) co-ordinates
             osg::Vec3f npcPos(mInitialActorPosition);
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index dde87079ac..32fda3331b 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -94,7 +94,7 @@ namespace MWMechanics
                 const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos);
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
-            void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance, bool isNpc);
+            void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
             void detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             int mDistance; // how far the actor can wander from the spawn point
@@ -126,7 +126,7 @@ namespace MWMechanics
             // FIXME: move to AiWanderStorage
             std::vector<ESM::Pathgrid::Point> mAllowedNodes;
 
-            void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell);
+            void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage);
 
             // FIXME: move to AiWanderStorage
             ESM::Pathgrid::Point mCurrentNode;

From fc03216d488a18d7b6d92bce4f83422f235302ec Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sat, 16 Apr 2016 12:14:00 -0500
Subject: [PATCH 557/765] Refactor to reuse existing obstacle detection

---
 apps/openmw/mwmechanics/aiwander.cpp | 42 ++++------------------------
 apps/openmw/mwmechanics/aiwander.hpp |  9 +-----
 apps/openmw/mwmechanics/obstacle.cpp |  4 +--
 apps/openmw/mwmechanics/obstacle.hpp |  2 +-
 4 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index e9957dd603..e47105055d 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -69,11 +69,7 @@ namespace MWMechanics
         // AiWander states
         AiWander::WanderState mState;
 
-        // Wandering near spawn logic
         bool mIsWanderingManually;
-        ESM::Pathgrid::Point mPreviousWanderingNearSpawnLocation;
-        int mStuckTimer;
-
         bool mCanWanderAlongPathGrid;
         
         unsigned short mIdleAnimation;
@@ -90,7 +86,6 @@ namespace MWMechanics
             mCell(NULL),
             mState(AiWander::Wander_ChooseAction),
             mIsWanderingManually(false),
-            mStuckTimer(0),
             mCanWanderAlongPathGrid(true),
             mIdleAnimation(0),
             mBadIdles()
@@ -222,14 +217,14 @@ namespace MWMechanics
         if (REACTION_INTERVAL <= lastReaction)
         {
             lastReaction = 0;
-            return reactionTimeActions(actor, storage, currentCell, cellChange, pos);
+            return reactionTimeActions(actor, storage, currentCell, cellChange, pos, duration);
         }
         else
             return false;
     }
 
     bool AiWander::reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage,
-        const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos)
+        const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos, float duration)
     {
         if (mDistance <= 0)
             storage.mCanWanderAlongPathGrid = false;
@@ -263,9 +258,9 @@ namespace MWMechanics
             storage.mCanWanderAlongPathGrid = false;
         }
 
-        // Detect obstacles if wandering manually
-        if (storage.mIsWanderingManually) {
-            detectManualWanderingObstacles(actor, storage);
+        // If Wandering manually and hit an obstacle, stop
+        if (storage.mIsWanderingManually && mObstacleCheck.check(actor, duration*10.0f, 2.5f)) {
+            stopWalking(actor, storage);
         }
 
         // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
@@ -348,10 +343,6 @@ namespace MWMechanics
 
     /*
      * Commands actor to walk to a random location near original spawn location.
-     *
-     * Creatures simply wander a certain distance from their starting location, while NPCs wander a scripted
-     * distance (mDistance) from the position where they started the wander package.
-     * http://www.uesp.net/wiki/Tes3Mod:AIWander
      */
     void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance) {
         const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
@@ -366,32 +357,9 @@ namespace MWMechanics
 
         storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
         storage.mPathFinder.addPointToPath(destinationPosition);
-        storage.mPreviousWanderingNearSpawnLocation = currentPosition;
-        storage.mStuckTimer = 0;
         storage.setState(Wander_Walking, true);
     }
 
-    /*
-     * Detects if a manually wandering actor has spent too much time at one spot (stuck by an obstacle)
-     * and stops wandering when that occurs. Uses the unit's speed to help determine how long they should
-     * not be in one spot.
-     */
-    void AiWander::detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage) {
-        const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
-        const float actorSpeed = actor.getClass().getSpeed(actor);
-        const float minimumDistanceTraveled = actorSpeed / 5.0f;
-        if (distanceApart2d(storage.mPreviousWanderingNearSpawnLocation, currentPosition) < minimumDistanceTraveled) {
-            // Hit an obstacle and haven't moved much
-            if (++(storage.mStuckTimer) > 8) {
-                // Stuck too long, wander elsewhere
-                storage.setState(Wander_ChooseAction);
-                wanderNearStart(actor, storage, mDistance);
-            }
-        } else {
-            storage.mPreviousWanderingNearSpawnLocation = currentPosition;
-        }
-    }
-
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos)
     {
         switch (storage.mState)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 32fda3331b..af23499896 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -91,11 +91,10 @@ namespace MWMechanics
             void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos);
             void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage,
-                const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos);
+                const MWWorld::CellStore*& currentCell, bool cellChange, ESM::Position& pos, float duration);
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
             void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
-            void detectManualWanderingObstacles(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;
@@ -160,12 +159,6 @@ namespace MWMechanics
             static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
 
             static int OffsetToPreventOvercrowding();
-
-            float distanceApart2d(const ESM::Pathgrid::Point& first, const ESM::Pathgrid::Point& second) {
-                const float deltaX = second.mX - first.mX;
-                const float deltaY = second.mY - first.mY;
-                return std::sqrt(deltaX*deltaX + deltaY*deltaY);
-            }
     };
     
     
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 11bbd1e31a..4394168a5a 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -115,13 +115,13 @@ namespace MWMechanics
      * u = how long to move sideways
      *
      */
-    bool ObstacleCheck::check(const MWWorld::Ptr& actor, float duration)
+    bool ObstacleCheck::check(const MWWorld::Ptr& actor, float duration, float scaleMinimumDistance)
     {
         const MWWorld::Class& cls = actor.getClass();
         ESM::Position pos = actor.getRefData().getPosition();
 
         if(mDistSameSpot == -1)
-            mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor);
+            mDistSameSpot = DIST_SAME_SPOT * cls.getSpeed(actor) * scaleMinimumDistance;
 
         float distSameSpot = mDistSameSpot * duration;
 
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index 98cc4e7a08..c8c83d68fd 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -36,7 +36,7 @@ namespace MWMechanics
 
             // Returns true if there is an obstacle and an evasive action
             // should be taken
-            bool check(const MWWorld::Ptr& actor, float duration);
+            bool check(const MWWorld::Ptr& actor, float duration, float scaleMinimumDistance = 1.0f);
 
             // change direction to try to fix "stuck" actor
             void takeEvasiveAction(MWMechanics::Movement& actorMovement);

From 84179c262f8a7ee2448a41640c6b130f758e3ed0 Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sat, 16 Apr 2016 16:39:13 -0500
Subject: [PATCH 558/765] Update manual wandering to prevent actor from
 leaving/entering water

Water creatures will stay in the water, while land creatures will stay on land when wandering.
---
 apps/openmw/mwbase/world.hpp         |  2 +-
 apps/openmw/mwmechanics/aiwander.cpp | 52 ++++++++++++++++++++++------
 apps/openmw/mwmechanics/aiwander.hpp |  2 ++
 apps/openmw/mwworld/worldimp.cpp     |  9 +++--
 apps/openmw/mwworld/worldimp.hpp     |  2 +-
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index e9a76c5653..7376e6b51e 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -428,7 +428,7 @@ namespace MWBase
             virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor) = 0;
             ///< get Line of Sight (morrowind stupid implementation)
 
-            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist) = 0;
+            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false) = 0;
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index e47105055d..7e4d5ea7d5 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -346,18 +346,50 @@ namespace MWMechanics
      */
     void AiWander::wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance) {
         const ESM::Pathgrid::Point currentPosition = actor.getRefData().getPosition().pos;
+        const osg::Vec3f currentPositionVec3f = osg::Vec3f(currentPosition.mX, currentPosition.mY, currentPosition.mZ);
 
-        // Determine a random location within radius of original position
-        const float pi = 3.14159265359f;
-        const float wanderRadius = Misc::Rng::rollClosedProbability() * wanderDistance;
-        const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
-        const float destinationX = mInitialActorPosition.x() + wanderRadius * std::cos(randomDirection);
-        const float destinationY = mInitialActorPosition.y() + wanderRadius * std::sin(randomDirection);
-        ESM::Pathgrid::Point destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, mInitialActorPosition.z());
+        std::size_t attempts = 10; // If a unit can't wander out of water, don't want to hang here
+        osg::Vec3f destination;
+        ESM::Pathgrid::Point destinationPosition;
+        bool isWaterCreature = actor.getClass().isPureWaterCreature(actor);
+        do {
+            // Determine a random location within radius of original position
+            const float pi = 3.14159265359f;
+            const float wanderRadius = Misc::Rng::rollClosedProbability() * wanderDistance;
+            const float randomDirection = Misc::Rng::rollClosedProbability() * 2.0f * pi;
+            const float destinationX = mInitialActorPosition.x() + wanderRadius * std::cos(randomDirection);
+            const float destinationY = mInitialActorPosition.y() + wanderRadius * std::sin(randomDirection);
+            const float destinationZ = mInitialActorPosition.z();
+            destinationPosition = ESM::Pathgrid::Point(destinationX, destinationY, destinationZ);
+            destination = osg::Vec3f(destinationX, destinationY, destinationZ);
 
-        storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
-        storage.mPathFinder.addPointToPath(destinationPosition);
-        storage.setState(Wander_Walking, true);
+            // Check if land creature will walk onto water or if water creature will swim onto land
+            if ((!isWaterCreature && !destinationIsAtWater(actor, destination)) ||
+                (isWaterCreature && destinationThroughGround(currentPositionVec3f, destination))) {
+                storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
+                storage.mPathFinder.addPointToPath(destinationPosition);
+                storage.setState(Wander_Walking, true);
+                return;
+            }
+        } while (attempts--);
+    }
+
+    /*
+     * Returns true if the position provided is above water.
+     */
+    bool AiWander::destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination) {
+        float heightToGroundOrWater = destination.z() - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(destination, osg::Vec3f(0,0,-1), 1000.0, true);
+        osg::Vec3f positionBelowSurface = destination;
+        positionBelowSurface[2] = positionBelowSurface[2] - heightToGroundOrWater - DESTINATION_TOLERANCE;
+        return MWBase::Environment::get().getWorld()->isUnderwater(actor.getCell(), positionBelowSurface);
+    }
+
+    /*
+     * Returns true if the start to end point travels through a collision point (land).
+     */
+    bool AiWander::destinationThroughGround(const osg::Vec3f& startPoint, const osg::Vec3f& destination) {
+        return MWBase::Environment::get().getWorld()->castRay(startPoint.x(), startPoint.y(), startPoint.z(),
+                                                              destination.x(), destination.y(), destination.z());
     }
 
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index af23499896..57d1253d21 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -95,6 +95,8 @@ namespace MWMechanics
             bool isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void returnToStartLocation(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
             void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
+            bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
+            bool destinationThroughGround(const osg::Vec3f& startPoint, const osg::Vec3f& destination);
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8f3fcbd418..a72ee90219 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2389,14 +2389,17 @@ namespace MWWorld
         return mPhysics->getLineOfSight(actor, targetActor);
     }
 
-    float World::getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist)
+    float World::getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater)
     {
         osg::Vec3f to (dir);
         to.normalize();
         to = from + (to * maxDist);
 
-        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(from, to, MWWorld::Ptr(),
-            MWPhysics::CollisionType_World|MWPhysics::CollisionType_HeightMap|MWPhysics::CollisionType_Door);
+        int collisionTypes = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | MWPhysics::CollisionType_Door;
+        if (includeWater) {
+            collisionTypes |= MWPhysics::CollisionType_Water;
+        }
+        MWPhysics::PhysicsSystem::RayResult result = mPhysics->castRay(from, to, MWWorld::Ptr(), collisionTypes);
 
         if (!result.mHit)
             return maxDist;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index c9a1d415d3..7af632d235 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -527,7 +527,7 @@ namespace MWWorld
             virtual bool getLOS(const MWWorld::ConstPtr& actor,const MWWorld::ConstPtr& targetActor);
             ///< get Line of Sight (morrowind stupid implementation)
 
-            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist);
+            virtual float getDistToNearestRayHit(const osg::Vec3f& from, const osg::Vec3f& dir, float maxDist, bool includeWater = false);
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable);
 

From 3dec10c686f3008256f81185b72266e8e8ec483f Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sat, 16 Apr 2016 17:51:13 -0500
Subject: [PATCH 559/765] Update variable to prevent underflowing

While not an issue presently, the variable may be used in the future in a way that could create issues if it underflows.
---
 apps/openmw/mwmechanics/aiwander.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 7e4d5ea7d5..291d3ec73d 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -371,7 +371,7 @@ namespace MWMechanics
                 storage.setState(Wander_Walking, true);
                 return;
             }
-        } while (attempts--);
+        } while (--attempts);
     }
 
     /*

From 25d9b77d100ef3859d0fae2c3af940797fe8c028 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sat, 16 Apr 2016 20:43:10 -0400
Subject: [PATCH 560/765] Add setting for script editor tab width

---
 apps/opencs/model/prefs/state.cpp     | 3 +++
 apps/opencs/view/world/scriptedit.cpp | 9 ++++++---
 apps/opencs/view/world/scriptedit.hpp | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 70456ee1d0..c70e71deb0 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -136,6 +136,9 @@ void CSMPrefs::State::declare()
     declareBool ("wrap-lines", "Wrap Lines", false).
         setTooltip ("Wrap lines longer than width of script editor.");
     declareBool ("mono-font", "Use monospace font", true);
+    declareInt ("tab-width", "Tab Width", 4).
+        setTooltip ("Number of characters for tab width").
+        setRange (1, 10);
     EnumValue warningsNormal ("Normal", "Report warnings as warning");
     declareEnum ("warnings", "Warning Mode", warningsNormal).
         addValue ("Ignore", "Do not report warning").
diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index a6689bf53b..39497ac1e0 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -52,7 +52,7 @@ CSVWorld::ScriptEdit::ScriptEdit(
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
-    setTabWidth();
+    setTabWidth(4);
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
     mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
@@ -194,9 +194,8 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
-void CSVWorld::ScriptEdit::setTabWidth()
+void CSVWorld::ScriptEdit::setTabWidth(const int numCharacters)
 {
-    const int numCharacters = 4;
     QFontMetrics metrics(mMonoFont);
     setTabStopWidth(numCharacters * metrics.width(' '));
 }
@@ -232,6 +231,10 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     {
         wrapLines(setting->isTrue());
     }
+    else if (*setting == "Scripts/tab-width")
+    {
+        setTabWidth(setting->toInt());
+    }
 }
 
 void CSVWorld::ScriptEdit::idListChanged()
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 7a3f074e98..db2936a74a 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -92,7 +92,8 @@ namespace CSVWorld
             bool stringNeedsQuote(const std::string& id) const;
 
             /// \brief Set tab width for script editor.
-            void setTabWidth();
+            /// \param numCharacters Number of characters for tab width.
+            void setTabWidth(const int numCharacters);
 
             /// \brief Turn line wrapping in script editor on or off.
             /// \param wrap Whether or not to wrap lines.

From e9157e920035f1db77718499c851e7bd9d6074e2 Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sat, 16 Apr 2016 20:38:58 -0500
Subject: [PATCH 561/765] Fix idle animation and Fix water creature manual
 wandering

---
 apps/openmw/mwmechanics/aiwander.cpp | 17 +++++++++++++----
 apps/openmw/mwmechanics/aiwander.hpp |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 291d3ec73d..a07106c83b 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -16,7 +16,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/customdata.hpp"
 
 #include "creaturestats.hpp"
 #include "steering.hpp"
@@ -253,14 +252,16 @@ namespace MWMechanics
             // Typically want to idle for a short time before the next wander
             if (Misc::Rng::rollDice(100) >= 96) {
                 wanderNearStart(actor, storage, mDistance);
+            } else {
+                storage.setState(Wander_IdleNow);
             }
         } else if (mAllowedNodes.empty() && !storage.mIsWanderingManually) {
             storage.mCanWanderAlongPathGrid = false;
         }
 
         // If Wandering manually and hit an obstacle, stop
-        if (storage.mIsWanderingManually && mObstacleCheck.check(actor, duration*10.0f, 2.5f)) {
-            stopWalking(actor, storage);
+        if (storage.mIsWanderingManually && mObstacleCheck.check(actor, duration, 2.0f)) {
+            completeManualWalking(actor, storage);
         }
 
         // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
@@ -293,6 +294,8 @@ namespace MWMechanics
                     setPathToAnAllowedNode(actor, storage, pos);
                 }
             } 
+        } else if (storage.mIsWanderingManually && storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], DESTINATION_TOLERANCE)) {
+            completeManualWalking(actor, storage);
         }
 
         return false; // AiWander package not yet completed
@@ -365,7 +368,7 @@ namespace MWMechanics
 
             // Check if land creature will walk onto water or if water creature will swim onto land
             if ((!isWaterCreature && !destinationIsAtWater(actor, destination)) ||
-                (isWaterCreature && destinationThroughGround(currentPositionVec3f, destination))) {
+                (isWaterCreature && !destinationThroughGround(currentPositionVec3f, destination))) {
                 storage.mPathFinder.buildSyncedPath(currentPosition, destinationPosition, actor.getCell(), true);
                 storage.mPathFinder.addPointToPath(destinationPosition);
                 storage.setState(Wander_Walking, true);
@@ -392,6 +395,12 @@ namespace MWMechanics
                                                               destination.x(), destination.y(), destination.z());
     }
 
+    void AiWander::completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage) {
+        stopWalking(actor, storage);
+        mObstacleCheck.clear();
+        storage.setState(Wander_IdleNow);
+    }
+
     void AiWander::doPerFrameActionsForState(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage, ESM::Position& pos)
     {
         switch (storage.mState)
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 57d1253d21..1155100b82 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -97,6 +97,7 @@ namespace MWMechanics
             void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
             bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
             bool destinationThroughGround(const osg::Vec3f& startPoint, const osg::Vec3f& destination);
+            void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage);
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;

From 30493545f172334fb9b11396edaf0a69bd31a44e Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 17 Apr 2016 06:54:31 -0400
Subject: [PATCH 562/765] Update script editor tab width on font change

---
 apps/opencs/view/world/scriptedit.cpp | 13 ++++++++-----
 apps/opencs/view/world/scriptedit.hpp |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 39497ac1e0..6dc0c2f0c0 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -48,11 +48,12 @@ CSVWorld::ScriptEdit::ScriptEdit(
     mLineNumberArea(0),
     mDefaultFont(font()),
     mMonoFont(QFont("Monospace")),
+    mTabCharCount(4),
     mDocument(document),
     mWhiteListQoutes("^[a-z|_]{1}[a-z|0-9|_]{0,}$", Qt::CaseInsensitive)
 {
     wrapLines(false);
-    setTabWidth(4);
+    setTabWidth();
     setUndoRedoEnabled (false); // we use OpenCS-wide undo/redo instead
 
     mAllowedTypes <<CSMWorld::UniversalId::Type_Journal
@@ -194,10 +195,10 @@ bool CSVWorld::ScriptEdit::stringNeedsQuote (const std::string& id) const
     return !(string.contains(mWhiteListQoutes));
 }
 
-void CSVWorld::ScriptEdit::setTabWidth(const int numCharacters)
+void CSVWorld::ScriptEdit::setTabWidth()
 {
-    QFontMetrics metrics(mMonoFont);
-    setTabStopWidth(numCharacters * metrics.width(' '));
+    // Set tab width to specified number of characters using current font.
+    setTabStopWidth(mTabCharCount * fontMetrics().width(' '));
 }
 
 void CSVWorld::ScriptEdit::wrapLines(bool wrap)
@@ -222,6 +223,7 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     else if (*setting == "Scripts/mono-font")
     {
         setFont(setting->isTrue() ? mMonoFont : mDefaultFont);
+        setTabWidth();
     }
     else if (*setting == "Scripts/show-linenum")
     {
@@ -233,7 +235,8 @@ void CSVWorld::ScriptEdit::settingChanged(const CSMPrefs::Setting *setting)
     }
     else if (*setting == "Scripts/tab-width")
     {
-        setTabWidth(setting->toInt());
+        mTabCharCount = setting->toInt();
+        setTabWidth();
     }
 }
 
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index db2936a74a..9d20620754 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -53,6 +53,7 @@ namespace CSVWorld
             LineNumberArea *mLineNumberArea;
             QFont mDefaultFont;
             QFont mMonoFont;
+            int mTabCharCount;
 
         protected:
 
@@ -92,8 +93,7 @@ namespace CSVWorld
             bool stringNeedsQuote(const std::string& id) const;
 
             /// \brief Set tab width for script editor.
-            /// \param numCharacters Number of characters for tab width.
-            void setTabWidth(const int numCharacters);
+            void setTabWidth();
 
             /// \brief Turn line wrapping in script editor on or off.
             /// \param wrap Whether or not to wrap lines.

From e6ab3a4ba9038e3e3891beddee35e0f93d272776 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 17 Apr 2016 06:57:02 -0400
Subject: [PATCH 563/765] Remove unused CSVWorld::ScriptEdit::setMonoFont

---
 apps/opencs/view/world/scriptedit.cpp | 8 --------
 apps/opencs/view/world/scriptedit.hpp | 1 -
 2 files changed, 9 deletions(-)

diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp
index 6dc0c2f0c0..6f27d56569 100644
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@@ -121,14 +121,6 @@ void CSVWorld::ScriptEdit::showLineNum(bool show)
     }
 }
 
-void CSVWorld::ScriptEdit::setMonoFont(bool show)
-{
-    if(show)
-        setFont(mMonoFont);
-    else
-        setFont(mDefaultFont);
-}
-
 bool CSVWorld::ScriptEdit::isChangeLocked() const
 {
     return mChangeLocked!=0;
diff --git a/apps/opencs/view/world/scriptedit.hpp b/apps/opencs/view/world/scriptedit.hpp
index 9d20620754..4977ed8e07 100644
--- a/apps/opencs/view/world/scriptedit.hpp
+++ b/apps/opencs/view/world/scriptedit.hpp
@@ -72,7 +72,6 @@ namespace CSVWorld
             void lineNumberAreaPaintEvent(QPaintEvent *event);
             int lineNumberAreaWidth();
             void showLineNum(bool show);
-            void setMonoFont(bool show);
 
         protected:
 

From f3e9fd49f326cb3fcd65bd8ee128c555ff3045a2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 17 Apr 2016 17:15:13 +0200
Subject: [PATCH 564/765] Don't add the autodetected mw path in global config
 file

The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
---
 components/files/configurationmanager.cpp | 2 --
 files/openmw.cfg                          | 1 -
 files/openmw.cfg.local                    | 1 -
 3 files changed, 4 deletions(-)

diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 9c9cebe96f..5ac3dd695f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -22,7 +22,6 @@ static const char* const applicationName = "OpenMW";
 static const char* const applicationName = "openmw";
 #endif
 
-const char* const mwToken = "?mw?";
 const char* const localToken = "?local?";
 const char* const userDataToken = "?userdata?";
 const char* const globalToken = "?global?";
@@ -45,7 +44,6 @@ ConfigurationManager::~ConfigurationManager()
 
 void ConfigurationManager::setupTokensMapping()
 {
-    mTokensMapping.insert(std::make_pair(mwToken, &FixedPath<>::getInstallPath));
     mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
     mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
     mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 3a9bd87628..199e094036 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -2,7 +2,6 @@
 # Modifications should be done on the user openmw.cfg file instead
 # (see: https://wiki.openmw.org/index.php?title=Paths)
 
-data="?mw?Data Files"
 data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 71cd3bfbfa..0640ec843f 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -3,7 +3,6 @@
 # (see: https://wiki.openmw.org/index.php?title=Paths)
 
 data="?global?data"
-data="?mw?Data Files"
 data=./data
 data-local="?userdata?data"
 resources=./resources

From be16857f96d17b640a2b49b092087cf4d8e7d5dd Mon Sep 17 00:00:00 2001
From: Austin Salgat <salgat@salgat.net>
Date: Sun, 17 Apr 2016 10:46:09 -0500
Subject: [PATCH 565/765] Fix wrong height being used for water detection

---
 apps/openmw/mwmechanics/aiwander.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index a07106c83b..2bdbfe8944 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -381,9 +381,9 @@ namespace MWMechanics
      * Returns true if the position provided is above water.
      */
     bool AiWander::destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination) {
-        float heightToGroundOrWater = destination.z() - MWBase::Environment::get().getWorld()->getDistToNearestRayHit(destination, osg::Vec3f(0,0,-1), 1000.0, true);
+        float heightToGroundOrWater = MWBase::Environment::get().getWorld()->getDistToNearestRayHit(destination, osg::Vec3f(0,0,-1), 1000.0, true);
         osg::Vec3f positionBelowSurface = destination;
-        positionBelowSurface[2] = positionBelowSurface[2] - heightToGroundOrWater - DESTINATION_TOLERANCE;
+        positionBelowSurface[2] = positionBelowSurface[2] - heightToGroundOrWater - 1.0f;
         return MWBase::Environment::get().getWorld()->isUnderwater(actor.getCell(), positionBelowSurface);
     }
 

From 5f34fb0c41d526ab6feee926540d43a592bd9c6c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 20 Apr 2016 11:37:29 +0200
Subject: [PATCH 566/765] Remove call to MYGUI_DBG_BREAK which was removed in
 mygui-git

---
 components/myguiplatform/myguirendermanager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/myguiplatform/myguirendermanager.cpp b/components/myguiplatform/myguirendermanager.cpp
index eab7aab315..7654a28215 100644
--- a/components/myguiplatform/myguirendermanager.cpp
+++ b/components/myguiplatform/myguirendermanager.cpp
@@ -23,7 +23,6 @@
 
 #define MYGUI_PLATFORM_EXCEPT(dest) do { \
     MYGUI_PLATFORM_LOG(Critical, dest); \
-    MYGUI_DBG_BREAK;\
     std::ostringstream stream; \
     stream << dest << "\n"; \
     MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \
@@ -33,7 +32,6 @@
     if ( ! (exp) ) \
     { \
         MYGUI_PLATFORM_LOG(Critical, dest); \
-        MYGUI_DBG_BREAK;\
         std::ostringstream stream; \
         stream << dest << "\n"; \
         MYGUI_BASE_EXCEPT(stream.str().c_str(), "MyGUI"); \

From c2c81c6b1a5a1cc5e436c4af622e7de23169b785 Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Thu, 21 Apr 2016 15:18:30 +0300
Subject: [PATCH 567/765] Reversed the location of original state and current
 state in scene view icon. This way it's much more obvious, assuming the icon
 stays on the left of the actual landscape view. See
 https://forum.openmw.org/viewtopic.php?p=38971#p38971 for more info

---
 files/opencs/raster/scene-view-parts/mask.png | Bin 3419 -> 1903 bytes
 files/opencs/scene-view-status-0.png          | Bin 2029 -> 2170 bytes
 files/opencs/scene-view-status-1.png          | Bin 2787 -> 2861 bytes
 files/opencs/scene-view-status-10.png         | Bin 2589 -> 2719 bytes
 files/opencs/scene-view-status-11.png         | Bin 3186 -> 3215 bytes
 files/opencs/scene-view-status-12.png         | Bin 3025 -> 2907 bytes
 files/opencs/scene-view-status-13.png         | Bin 3279 -> 3327 bytes
 files/opencs/scene-view-status-14.png         | Bin 3133 -> 3077 bytes
 files/opencs/scene-view-status-15.png         | Bin 3354 -> 3416 bytes
 files/opencs/scene-view-status-16.png         | Bin 3078 -> 3206 bytes
 files/opencs/scene-view-status-17.png         | Bin 3265 -> 3340 bytes
 files/opencs/scene-view-status-18.png         | Bin 3201 -> 3334 bytes
 files/opencs/scene-view-status-19.png         | Bin 3327 -> 3438 bytes
 files/opencs/scene-view-status-2.png          | Bin 2296 -> 2425 bytes
 files/opencs/scene-view-status-20.png         | Bin 3256 -> 3329 bytes
 files/opencs/scene-view-status-21.png         | Bin 3398 -> 3444 bytes
 files/opencs/scene-view-status-22.png         | Bin 3389 -> 3452 bytes
 files/opencs/scene-view-status-23.png         | Bin 3464 -> 3536 bytes
 files/opencs/scene-view-status-24.png         | Bin 3249 -> 3345 bytes
 files/opencs/scene-view-status-25.png         | Bin 3355 -> 3446 bytes
 files/opencs/scene-view-status-26.png         | Bin 3351 -> 3447 bytes
 files/opencs/scene-view-status-27.png         | Bin 3426 -> 3522 bytes
 files/opencs/scene-view-status-28.png         | Bin 3388 -> 3461 bytes
 files/opencs/scene-view-status-29.png         | Bin 3491 -> 3550 bytes
 files/opencs/scene-view-status-3.png          | Bin 2927 -> 2996 bytes
 files/opencs/scene-view-status-30.png         | Bin 3489 -> 3563 bytes
 files/opencs/scene-view-status-4.png          | Bin 2708 -> 2517 bytes
 files/opencs/scene-view-status-5.png          | Bin 3049 -> 3071 bytes
 files/opencs/scene-view-status-6.png          | Bin 2877 -> 2771 bytes
 files/opencs/scene-view-status-7.png          | Bin 3144 -> 3199 bytes
 files/opencs/scene-view-status-8.png          | Bin 2432 -> 2557 bytes
 files/opencs/scene-view-status-9.png          | Bin 3096 -> 3126 bytes
 32 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/files/opencs/raster/scene-view-parts/mask.png b/files/opencs/raster/scene-view-parts/mask.png
index e075fe8f5beefb0405be91ff15fd36ccb1edb32d..65c6d736ba8beb881884c0db15078fef21978665 100644
GIT binary patch
delta 1888
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
a0RIL{2gMU933(L&0000<MNUMnLSTXm3!^ju

delta 3416
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

diff --git a/files/opencs/scene-view-status-0.png b/files/opencs/scene-view-status-0.png
index b98230f01319d645f80470da546f7716b00fde04..2b2bb4d294509379447911c7ea22386768c10b3c 100644
GIT binary patch
delta 2073
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
DZ7RuB

delta 1933
zcmV;82XgrO5bY0;B#~_=e+EfJK~!ko?U_l8Tvru_zkA<QV^??e<c{6YZjXv%CthG7
zq6iWYktMPKgm-4a)?&$m1!9R18x~=~2BZifArLIGASPglL{RJq91CHSZuek!w}&3w
z)iu8Puy{4LZ3sgBpe3$Us=7nHI{&%<`R}=>)P-Mq!XCB@UmfKae{XE=+4If4G``c6
zMEe_nX74sR6##~c_cs6~`y9Z&r;y(76w>T-07~{bh14EC`~NcfkpS#b3`lwacE!Nc
zI3@q2tDe06e~Uu@R<I~g|E(PuX!6va>O&+?`CdBbK;)v#%u|g2*KY3^uXgoQ1Hjy6
z7(an3j3c#mq<Rm6e-;vY=*ed>CQm+YZKv(BT6PVk0-%^P391W(+qW^b!ZJWv8pzVB
zEFk!(p=VHb0Za>p9{9erfv6|oO9g;!+1S>T=S)NJ8uxKGmvEa^0?);oID#{Nj7<4p
zcU{ofqP}*M`rR9ZZk_DJEQLd-Q;GrO@t=`6rna+1W%B`zf9f_`8(5Zsp}<|<q`L4P
zc4>;j^ci**uMyO@$k+x&Q)3oQ-0BkBA1tM$LZ;FE+-lU=dbmb)dlSnra4gNl=nz^B
z2D6CJaJQ)a{R#zJ;gkz)?zh#)vMA(IqL9~W5e7aR_wL|(EwYZm_(%am>#jipDCt)m
zp_uOhPbT^ze?U@{(bdIUXr;+Hno_>lQxSnMwE61?FY(;-?_iq#fR~{kQCol7LrSFx
z;FVWygCrW#^`Qu1X!5f+F7aUP7?ve`<>KpDM$|SvSsMl>i}Q!^J-e%+3LzE+BIyA5
z!T07sC#Lt9u4&f4Ne~<dU}gC@uYdQ;WDDOJ@cfyxf1{jxF=lb@C>!f8TbrABp38x$
zDTYd=bO2oX`WXFO2jO?Wxybw1J~Ob+_dm^<BUN7h?2i$FC=}lM^$zd6?Q-nYDm!x%
zSSm**Z?SUc5!Ib9pwg(!-TlVb+C4!eQ5Ym4iHIO^`(0v0gg8##vxNrJM^?G~Rvp_h
zc<E&ue?$?67Qg!Wx45@<GMyc`{QEzEdUDRw9aRaZcdt7zXLA00fh$)U{OE@jlv4Qa
zw{g8B{YVACg)e?-m$zf$j;GtNSS0x@F>z;295cVP%$sjM;I-F^eE!uuzkT~6e}4bP
z?z7WLC2YHEU@UPDMBGoAWIUPgfjD{e2y=^yf1mzjozo|dGhTR?T>ksKaOPZk_kl1B
z6H%087kb|A@qX|Hw08{P*vt$7?_Ix<c-^%4aQ<%`J^E}~00KmWYOTin;u0%sYfOxd
za%^^%;ZmvVeGy^p{(a_`mWX3v_G8mbO^hQ5v(wXj{NOV*S{~aw4VG5cs8n{+0T2W}
ze-GC;xcZmt<cej+CJ)nc>-_QRHO`%Vf%5P$BEstZd)%5|V5EEiLmSL3-@*5NMn*<h
zUfZNnYoe9Hu}sFwWx_B_X$OLU8@J{dp8gb0rbt-7i<K!+EJiFWFHt)E93sN<$_l07
zakAM003#!l+_|^O@`D=1oXx@U61HWaf0aThP)el(!1sNcjVcqTp2xH-nwf(HwcBXl
z<Kg-OVUWZ~wOZp~X^J?GL1O9+7j0&kEElj$BT-msrz0x4G3)=#w2unFBS~Tu&8CMa
z6Qgh(<%}XCgkeA!1PCB;ghUZr+ZD8e$#Nb;t8Q>hJIm+<d@2CKFhoS~{Sc*Kf4G<>
z>)05j)5&}g5QZU;Ty!e6Dj<vuWdYSYz3H9aZBa`v1^`Uc#P<Up?KBe)s^sT`Fz8-<
ztMw*P95YtRb#wj>W%_Hxl4e;Y419oO2eig944SUjH7E=Mnr?uT8wCaBVp4(;X=mZ>
zPJekt+9^jW0OB}K{HPSRsgYQ)e@p|<Pj=?vc8m2&lbmCbu}wO(QA)ZX6{>g5>ASk6
z0$?L|9%tqpF*Z%VbJ{9In~a>g#G{R?*ybv>sS{7Dj??=qbJETHI^(ISP^0By7$!<7
zlu~G|DCRSamy6`G8JzJ?;7f)ejN1ysKx)yUPdko#bEKp~`Qi|VXAUtne^DaiSb(C@
z^4Y4?@q-9u*yJWZNz;o6qj*4Ny4v$tu9Tt*`F_ZjA9nkyeUfG~4xSg_2N60uNoM>k
zwT<f(vL?2nyQMgxM;U2f<|WM-*xel4q?pej2t$PoTibP9FTfZ&LCzYY{@_n!%#f^O
zVbGJzq%JU6w@3xRiP=fCe^vxx#OnPDt{33>^|mJyTBsyXKxe1OA9@vU{aq@xN8~aV
zS;s_my)L~PX<GMz4;LQ-U}%kL4u+j$TNsAIbpygEN=&l~WTrkx)L5dmeUnzTK_P4R
zB)0EtNR>iS925D;zcu-s!`Mh3r4&&l*p_DfQH{z@6A(mebm0iuf7}dFeVN+MO`2|#
zp}d1_B^5h`;vW`M)uFiRZv6lN03~!qSaf7zbY(hYa%Ew3WdJfTF*GePF)cDOR5CI;
zFgH3gH!CnRIxsN(vOZ}5001R)MObuXVRU6WZEs|0W_bWIFflYOF)=MNGE_1$IxsUj
TF*GYMGdeIZ_Q^X>lSv3M$2g?Y

diff --git a/files/opencs/scene-view-status-1.png b/files/opencs/scene-view-status-1.png
index 43b597c01e28d012d26e523cfae5397e0554d31e..ba18877b9b09b37f1d5a625c0baa481eadd875b5 100644
GIT binary patch
delta 2733
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

delta 2700
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
Gk_#<P<tK;$

diff --git a/files/opencs/scene-view-status-10.png b/files/opencs/scene-view-status-10.png
index ca511b9c87f72f85132b661bb9e779c1469ef45d..d6e23431eb358444c839c26bf1271c04645691c8 100644
GIT binary patch
delta 2644
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
CRPVt6

delta 2480
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

diff --git a/files/opencs/scene-view-status-11.png b/files/opencs/scene-view-status-11.png
index 3028217ba9eee5a6ba778f58bbf1558cb9bc23aa..21a77c53300d890269f3531d0412bfa0ad7ac674 100644
GIT binary patch
delta 3090
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

delta 3081
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
XIxsUjF*GYMGdeIZ_Q^X>lU@ulbYc9H

diff --git a/files/opencs/scene-view-status-12.png b/files/opencs/scene-view-status-12.png
index 974519c5492035b8cb936602984064234b6cd5e2..efe608d2e38228b4ec8ecd812bf098e9f8955f3d 100644
GIT binary patch
delta 2779
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

delta 2957
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
DEL6Kt

diff --git a/files/opencs/scene-view-status-13.png b/files/opencs/scene-view-status-13.png
index 4c075704af5a59fc6a79634d564cbc6ea9aa9503..2fe7d40253da031cffc9529ad15f86933e73f956 100644
GIT binary patch
delta 3221
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
Hlb#GQ&@}*&

delta 3175
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
NFfjJXJ5Q6&3^AYOC;0#X

diff --git a/files/opencs/scene-view-status-14.png b/files/opencs/scene-view-status-14.png
index 1e6d726da255b3215e9c9d1a5485fc85bfcfeb7c..56f77199f273149597921f7a6c38951e64a4cb3b 100644
GIT binary patch
delta 2988
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

delta 3047
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

diff --git a/files/opencs/scene-view-status-15.png b/files/opencs/scene-view-status-15.png
index 3a2073628d3911d99cc2fd3836fd504bf3343fc6..5dab523c66b6010b7c9102a865154ca6314485f1 100644
GIT binary patch
delta 3329
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
L4RpcClj#gG<!d&m

delta 3269
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
DtvO|p

diff --git a/files/opencs/scene-view-status-16.png b/files/opencs/scene-view-status-16.png
index d0fb5404766f61cf3c760960a2a0ce621ad4633c..2ff5aba752f11a28c9cc321a9b20c5003cf2022b 100644
GIT binary patch
delta 3117
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
Hlhq3`4)OY@

delta 2991
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

diff --git a/files/opencs/scene-view-status-17.png b/files/opencs/scene-view-status-17.png
index 9d95cc85536e198ba0076bb3b793bbb4ddd59748..1b30b6be13bb46aac2eb3247dc5531414d372166 100644
GIT binary patch
delta 3218
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
EF>d`uR{#J2

delta 3179
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
RD=;%UFfjJXJ5Q6_3^9OqJgxu$

diff --git a/files/opencs/scene-view-status-18.png b/files/opencs/scene-view-status-18.png
index 0a9013aed32788b93054a531b5560b4f3ebc2287..363d396cb460b2c99098a54c9e460713d622738e 100644
GIT binary patch
delta 3218
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
EF<BHVrvLx|

delta 3115
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
F3^9Sl2`c~q

diff --git a/files/opencs/scene-view-status-19.png b/files/opencs/scene-view-status-19.png
index d57fab4465943c7121dca49c833fbc7d9dfbb120..31f90a5d38f6c74f83ff33b0f310cad92e51ac4c 100644
GIT binary patch
delta 3333
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
PGdeIZ4RpcClg<n=Ve^Jr

delta 3242
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

diff --git a/files/opencs/scene-view-status-2.png b/files/opencs/scene-view-status-2.png
index 2c892213b33a3e30634def6b969485e0204b5f49..06e4cd39312e7b9cd2eb50d533413c43b4b3a442 100644
GIT binary patch
delta 2330
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
A`~Uy|

delta 2203
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

diff --git a/files/opencs/scene-view-status-20.png b/files/opencs/scene-view-status-20.png
index 2be69333c26312eea57186c8bd8aa15d8f624c49..5420953eda65aad67bf5ceca038275bc05c3f525 100644
GIT binary patch
delta 3234
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
UIx;aUFf%$ZFb#CU$diW*F<r+tkN^Mx

delta 3126
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
QFf%$ZF!sqiPm|CLF(^swcmMzZ

diff --git a/files/opencs/scene-view-status-21.png b/files/opencs/scene-view-status-21.png
index f5ad22340992db7ca46e87bba6aacbcbc980bed8..7344f3195a23c3f8f874674877ab1195b94b6af2 100644
GIT binary patch
delta 3357
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

delta 3295
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

diff --git a/files/opencs/scene-view-status-22.png b/files/opencs/scene-view-status-22.png
index afb0c7dd5855d79befd867a96748b69c0150e07c..99977a1ccb2e200c4921625f1c9e17d55b49bad9 100644
GIT binary patch
delta 3365
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

delta 3304
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

diff --git a/files/opencs/scene-view-status-23.png b/files/opencs/scene-view-status-23.png
index bee128d24d554f51c6b8024e9bae0a574d040a8f..6c428e5a81f2b73eca12912974195945737ba042 100644
GIT binary patch
delta 3450
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

delta 3343
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
ZGBP?aGdeLeD=;%UFfjJXJ5Q6J4KXW*hNS=i

diff --git a/files/opencs/scene-view-status-24.png b/files/opencs/scene-view-status-24.png
index 677a5644810798e57275527591830dd21554d27b..903a4d5a4bac1c8374836d749d96cbd541841282 100644
GIT binary patch
delta 3221
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
HlYk5{thp`x

delta 3126
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
QFf%$ZF!sqiPm|ybF)Z5dbN~PV

diff --git a/files/opencs/scene-view-status-25.png b/files/opencs/scene-view-status-25.png
index 151278eff6d41440c7543a54ac6bdbfc6cd6bc5b..dd7ad5458fd66d4ba1e87eacd531208d02e0e34c 100644
GIT binary patch
delta 3359
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

delta 3270
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
EF_lzHGXMYp

diff --git a/files/opencs/scene-view-status-26.png b/files/opencs/scene-view-status-26.png
index 3ddeed8f13de51709a3de96788036abffe0495d6..fca0ed8e90d403ad752e0f7505fc5e6aefbeb565 100644
GIT binary patch
delta 3360
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

delta 3266
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
AZ2$lO

diff --git a/files/opencs/scene-view-status-27.png b/files/opencs/scene-view-status-27.png
index 93058121ef1dd83066aa600d3193c39bc9ef5d13..1a888bff97dc32e1dcb09f5547567182f16f1508 100644
GIT binary patch
delta 3398
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

delta 3305
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

diff --git a/files/opencs/scene-view-status-28.png b/files/opencs/scene-view-status-28.png
index 5008026a158aa85d88540122261ef728b29efb1f..5b11fda91e454b11f5d91c56a79871c0cb0444f7 100644
GIT binary patch
delta 3367
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

delta 3296
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

diff --git a/files/opencs/scene-view-status-29.png b/files/opencs/scene-view-status-29.png
index 7b355fe13d974990aefd0997175dc8162c2cec00..211890638825fe2d966edbd03077000df110f154 100644
GIT binary patch
delta 3427
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
F4Ke9blzRXG

delta 3407
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

diff --git a/files/opencs/scene-view-status-3.png b/files/opencs/scene-view-status-3.png
index 5157e170f5050b86b4abdb3412a0223dcf03a138..7d23409f7c5e84db26f93e99fd7d9b31e760d73e 100644
GIT binary patch
delta 2887
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

delta 2820
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
WFf%$aG%GMOIxsNy$vaPzg9|YX<akg3

diff --git a/files/opencs/scene-view-status-30.png b/files/opencs/scene-view-status-30.png
index 0712a548204f8df184360c3ee4ce30b34bb9ac03..825bc772c67e7f712b3a3f82e94c198fd2884f2f 100644
GIT binary patch
delta 3440
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
SF)J`LIxsK|biv4za1Al~aI7Ez

delta 3405
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

diff --git a/files/opencs/scene-view-status-4.png b/files/opencs/scene-view-status-4.png
index f29445f5ab90cc4909ba75453a1cbd581ff54ec3..82057190da94940306ce1ff2cf3af62c63d1dd15 100644
GIT binary patch
delta 2405
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
XIy5;tGBGPKGdeIZ4RpcClVb`oQk#%u

delta 2619
zcmV-B3dHr*6O<K@B#~_<e+jKgL_t(&-tC&nk6c$3#((#|xrVNu+Z_*aJQK%GjD&@V
z5D+4w01*O2cHtk0_ybrVmI$$75f*GfiVzY4!6FM10tt}_%Anv_AvW%IySvkF4?R}b
z_~ygny{hWA%W>Ss4VJi4so!wxz4M*>o$s7`s@1c<4}^O-p8f6!f4_Ti<(@s?yqCsz
zhLYs|2B5iji@YNM43*yB0F>P40PcGV>HD2Rn)@7plKY%O>K;D(|1$cC0NkS(kevf?
zLk!%CQ}QvVs{j1|EehRHuqaUftrgfZ<d$b@6C%0A_jV=^BtFV?Z(;oH-QF=?-Eh8R
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

diff --git a/files/opencs/scene-view-status-5.png b/files/opencs/scene-view-status-5.png
index e77290f6890373220d3e062ffbe64179f6b5283d..79532bf0f74fb67e23f2bf75efb973bcf3218337 100644
GIT binary patch
delta 2982
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

delta 2944
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

diff --git a/files/opencs/scene-view-status-6.png b/files/opencs/scene-view-status-6.png
index a2f9a8a99f34a646fd586e622f6fe1ef4a0f3b45..2b1d385263d589698492182a37322b0001b54a53 100644
GIT binary patch
delta 2680
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

delta 2763
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
RD=;%UFfjJXJ5Q6M3NdYMNSpuw

diff --git a/files/opencs/scene-view-status-7.png b/files/opencs/scene-view-status-7.png
index ce4e20e005db25bb5db28aa4b78e2e58328b208e..9916683309f0f21d017da0d65a6307686eee5c47 100644
GIT binary patch
delta 3110
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
Ai~s-t

delta 3039
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

diff --git a/files/opencs/scene-view-status-8.png b/files/opencs/scene-view-status-8.png
index f0c499832e02ebd50a54fc6c2d26539a575dbe28..406649aac7e6f913b323cb59251464b30717f3c4 100644
GIT binary patch
delta 2426
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

delta 2340
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
K$vaPz%n30+ID=aN

diff --git a/files/opencs/scene-view-status-9.png b/files/opencs/scene-view-status-9.png
index b30c3eec51d268c0ef36b07c1f1d2bfbf3fdb629..cf83a9f7c3cdfbbb5999a37eac941fe00ec4f99a 100644
GIT binary patch
delta 3037
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

delta 3009
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
Dd<D6V


From 5c8756cb2cd309dd9562ad49dc1348466633b8dc Mon Sep 17 00:00:00 2001
From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
Date: Thu, 21 Apr 2016 17:25:53 +0300
Subject: [PATCH 568/765] Add composite icon for exterior cell controls in
 scene view, along with source SVG and a bash script that I used to assemble
 all possible status combinations

---
 .../scene-exterior-parts/0_backdrop.png       | Bin 0 -> 769 bytes
 .../raster/scene-exterior-parts/1_grid.png    | Bin 0 -> 1246 bytes
 .../raster/scene-exterior-parts/2_arrows.png  | Bin 0 -> 1251 bytes
 .../scene-exterior-parts/3_cell_marker.png    | Bin 0 -> 808 bytes
 .../raster/scene-exterior-parts/4_terrain.png | Bin 0 -> 1670 bytes
 .../raster/scene-exterior-parts/5_divider.png | Bin 0 -> 290 bytes
 .../composite_the_icons.sh                    |  18 +
 .../raster/scene-exterior-parts/mask.png      | Bin 0 -> 3540 bytes
 files/opencs/scalable/scene-exterior.svg      | 599 ++++++++++++++++++
 files/opencs/scene-exterior-arrows.png        | Bin 0 -> 1251 bytes
 files/opencs/scene-exterior-borders.png       | Bin 0 -> 1246 bytes
 files/opencs/scene-exterior-marker.png        | Bin 0 -> 808 bytes
 files/opencs/scene-exterior-markers.png       | Bin 0 -> 808 bytes
 files/opencs/scene-exterior-status-0.png      | Bin 0 -> 3289 bytes
 files/opencs/scene-exterior-status-1.png      | Bin 0 -> 3576 bytes
 files/opencs/scene-exterior-status-2.png      | Bin 0 -> 3601 bytes
 files/opencs/scene-exterior-status-3.png      | Bin 0 -> 3894 bytes
 files/opencs/scene-exterior-status-4.png      | Bin 0 -> 3619 bytes
 files/opencs/scene-exterior-status-5.png      | Bin 0 -> 3901 bytes
 files/opencs/scene-exterior-status-6.png      | Bin 0 -> 3940 bytes
 files/opencs/scene-exterior-status-7.png      | Bin 0 -> 3932 bytes
 21 files changed, 617 insertions(+)
 create mode 100644 files/opencs/raster/scene-exterior-parts/0_backdrop.png
 create mode 100644 files/opencs/raster/scene-exterior-parts/1_grid.png
 create mode 100644 files/opencs/raster/scene-exterior-parts/2_arrows.png
 create mode 100644 files/opencs/raster/scene-exterior-parts/3_cell_marker.png
 create mode 100644 files/opencs/raster/scene-exterior-parts/4_terrain.png
 create mode 100644 files/opencs/raster/scene-exterior-parts/5_divider.png
 create mode 100755 files/opencs/raster/scene-exterior-parts/composite_the_icons.sh
 create mode 100644 files/opencs/raster/scene-exterior-parts/mask.png
 create mode 100644 files/opencs/scalable/scene-exterior.svg
 create mode 100644 files/opencs/scene-exterior-arrows.png
 create mode 100644 files/opencs/scene-exterior-borders.png
 create mode 100644 files/opencs/scene-exterior-marker.png
 create mode 100644 files/opencs/scene-exterior-markers.png
 create mode 100644 files/opencs/scene-exterior-status-0.png
 create mode 100644 files/opencs/scene-exterior-status-1.png
 create mode 100644 files/opencs/scene-exterior-status-2.png
 create mode 100644 files/opencs/scene-exterior-status-3.png
 create mode 100644 files/opencs/scene-exterior-status-4.png
 create mode 100644 files/opencs/scene-exterior-status-5.png
 create mode 100644 files/opencs/scene-exterior-status-6.png
 create mode 100644 files/opencs/scene-exterior-status-7.png

diff --git a/files/opencs/raster/scene-exterior-parts/0_backdrop.png b/files/opencs/raster/scene-exterior-parts/0_backdrop.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95983cc15b740a6937ab7170de9a772754d1a1b
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H105)_*Sad;kbZBpK08?dhXJvUHB2#E?VRUn4Y$6~;VRmU`Z)Rp7
zJacGnVRUn4Y(QsiVQFkGV{dIfz!N-%0006!Nkl<ZXo1yO%W}jZ40GE4|1YPPvSp2B
zONJa)GdtmFq#y{(WoBRY!FZbd_4j)WKZoK}BvJjnJMgZ6h*%|NCVd5EGJ%ebE|Biv
z25FjzA|NBK3h`uHLKFd)d;0RK%q%8`gis<_0TKBVHbQTm7QqPc<WJa$u@5Dp62OvY
zg|NP-MPvdH`BOGh$%i740EN72BWBUkA~FHHGvM>P_PK)?;g^`T0<)-5+<VH8G_!3k
z?V=fA-hMVKQGTGZ5A%GB5s~*$$otbLlV@Xx9GL~2)y+?zj)<f7>bNg_1&yeVVBkoE
zLS7xa{07JYK|R}!w$6ZZ4q^skXMl-?%HF^%;;Oz{7hS(o9GG(uGf>CVo%joO|BYq!
zjD6JD3x)u>BiYYyr=1vSzmL8XGW!?My%nhXg$FP(M%u4)tui0PvU=wKuUfw#vru(Q
zp#Fo(+OY8#cmbU^RGl2}q75?!tY<6~S!TA$1<EM`wkHN!h<VefJxhLPj2FHQpVzC?
zX7u#w2<-h2B_<N!pB3qh{K)U#1Hn2kU<}HVu1=VU2qGpgawMSh^yv)B6-s(96zxLQ
zhsw7bf&K0i?OZ6&e!wUT&4V*<o3#%jp<HY&KmsCym1WdZW#?jRK_*}(rIJ?{F-mXE
zfG4ADn-zAq)fX56X6NlQz|H^!E5J-!w5)}qGMc=ZCcx~BeFjc!tFnNB6ZRQs5g+IZ
z80g&Vw2sXPy8;GIEaDbU2|z%n(PMa8z~lG@vRc6Jkzc=B00000NkvXXu0mjfn<7b#

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/1_grid.png b/files/opencs/raster/scene-exterior-parts/1_grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..9711df62ca1ee0989ac6a5df8e981b72c96fa349
GIT binary patch
literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H105)_*Sad;kbZBpK08?dhXJvUHB2#E?VRUn4Y$6~;VRmU`Z)Rp7
zJacGnVRUn4Y(QsiVQFkGV{dIfz!N-%000CTNkl<ZXo2n7TZmO<7zW_yn=#ZhGc83^
zN~;UeFoNhn*@PDh%8nFxA<<1B6m^joQBYPl-X<1-1w~y%2Z*qkg#}qsLI*q9iA+Nw
zv`~~9vx9#Z|7x0a?{V+hYdaM4UGDXN-}}D%KdkrrSEQ8um!oI233M7`0!BN=1dMi!
z2^j4d6ENEG{}vEsoG2b6j^oY1_$XuiXbP$DCp3FL?l}2>Vk%}w83(XG6(`31MHy2o
z>;dd=I<6Hr8f8qz*_eV|*xfB5QO2waYXCb^kq!<!z8yOqWlYBfn1)aBO<h8wjQLoM
zL)e;%w5O%Kk@N#m#+kShr(<&kI3giY#-gg$FL)~zX=hvcoisF2#yPkiGqC}iTNM&z
zT!ic7fBcnHq%TIqp^lC$%2<e7F&oceV=B^-CS#XWV+Zg|D$<7?Vb|GGMj034Zp^`B
z@;`f|dRE{rnfRlrNSkZH>_$%<Wn6{_Fc+`kDjdc`sYn~^#OjKbNJV-V>(Gmp@*Y`-
zH|xf#T|ktvEXsHv4`Nj+(iC~kuf%6j#_}kmHr(2lP?WJuCQV){8ybx1!)ly?NAN<k
z&E7I@rvh3b-XNz>O+rGylTwj>Z#!`W#2eJ;)1i>i?>2mmk5Z8iw*cBP@dh>fv?-+8
zM~g$hDY!!RAs^!HRHQ=<60WI0Y9rnNqt8D=9>$AD3yCs%aS4`U_uw9gGN$2bT#QY4
zJr!vn%2<kfF%fIJLA;5O`!ES><abF_q;J4Zyp)Rc-7%Xu%9w%WxCs-m7i&|I-sm>*
zqoaBu-idi~Z}J|VN=5qW?=g+e<2kY){~p`q>0A_LoYHN=LnF!<CljBCAF)H8k!exJ
zV2e0(2`!M_;Y4gmMf#xneJ<|7jaV<w#;{FB4a8UAe)(`&J%r0b+5L{gtN0}Jn}@!N
z_@-2(ZA}W#tBNj@Z9%O<jv~IjBEF@`*mGrn6`|kFaznDcMW9-Rv_rf>?%WZ-i8~e2
z3Gsi`sliILC8RFmgY{}ObHfU$oA_Yex*M7XLLQe-w_1r0;&tmQWpz?KiOc0Pd}S(9
z?F~&gW}sI-t5;zUo|P@iQmn=LRHUD4!>e%*^vWb}$38rfinMje^RsY=Y{Z_%^QlM!
z9plz;3iaSp+=7D@v8H!C)uq@9+5NsOo5o|@Z_D@{ya#%4J_`A&q(2qu+cxrN;#!=C
zjd-V(e&m=s?Fy)j)O>j<{Dv*5NW0nv9#U^QmdGY@3qEeALu^?<MSKPpAmPhYq`hr3
zZeIUXd09=z=km?;AIHr*o`CA(#$?Qr?|FVmMLN(a;bHJ5$#(u^+0y?sTzlDyfJqpS
zfmEbl>!Uh+L>c38n%s%)!{JmM%e55&aiYG;G{NshPqTgT7u<dKhm!iyV*mgE07*qo
IM6N<$f-zP(Qvd(}

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/2_arrows.png b/files/opencs/raster/scene-exterior-parts/2_arrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..f388255ade579246e67a4a530206cafd32b5210f
GIT binary patch
literal 1251
zcmV<91RVQ`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H105)_*Sad;kbZBpK08?dhXJvUHB2#E?VRUn4Y$6~;VRmU`Z)Rp7
zJacGnVRUn4Y(QsiVQFkGV{dIfz!N-%000CYNkl<ZXo2mQ?@wD*7{|ZQxxKwzhZ!&n
zGnl;)$nc$oLYx@g;!M=A%(&4Ool##Hi7)&Il#K@b2Yg|8ZGym>p{~`%Xv}<L*sxi2
zi8?opF=&v6DWfd3z2`i>Xkp3iy`?bW26I2jP1<vwp7Z_OU+0vV8M_(bc7S`u6L1?(
zz->GMxA6qr#uIQGPrz+F0k`o4+{Ra}^Wt028BO^G?bpBkTz8;e0YGm4cMfGk3IMX9
zOWdD?0sw5~uN@HqK(Zeqls!VFF|(rXz(Fd_^^bU{p+E~plYI8Q&+@iIRGT+_s(X%@
zS~kj|e8B2ng}k4iIX#y7e53k_H^Wc*R<%okI|8D(Q8mDV7y6R3&31i`w@@+~*+-xU
zstqi4#!9`y?fnvk0D}oN!~rCsSO_p~H%hG3D@eV1Jt+#MUyR(pDFNMwBVhY}(_ad{
z+^A4A7yxbp^lD(S_3K&$jBNX5Vw?tWy=X9&8zpiL3Z~!LffXOM>u`JqgrZ(+ThU<T
zgACKZe%sw(;!z{pHr{{koUA200F-OT6A7AVpYI%C!jS3bLpi^MuShU*1ie63hr<Ap
zH4BhJSLp*#^ee2^F=V-#KtF@ksJ__t;bwwcIeV7Xnn>GUU2zZ(nL2lv4Ghf$0y$9<
zVE`;1vCZl95U2Zl=8A@DSq(DOUCryn7||D7C+{V=6Nv<g)`f74Kxe?{001F@zzRXn
z)1Q6G*@_p6qrk*qm#GA_QWbsz)5y){%w+kjZ7b^{OhW)31^}U;2F5a)wbt<#Du@4(
ziAR2Ex;nKJ!Ph9yHIYcrRQr55%0y?BD2Y_S%(ln)U^qTJ4B^zjlgIEd#Q0!1Zr4|J
zA=?e?`n}NqQ{dw3kG3SEk$pQIrWzMcJbvFNuk}1=ZMPLzmgZx7l$cA!d&W`&hix}e
zJ4G`3L?|8WeqZzF|Hx~yVmo2`8Z8FZE#yR<DB=w!`O1Y@_xZdkywjij?ze4ETxR-Y
z=Ru#(HyTtp1*Sc$0R=zZvewxOC@HU*ng(4Gh!N0CdMQXoG!^UlRD$1rerooI?F#;J
zysJY~;$4G$eK4`Uy)!iiOI)+oJHAGzUydvocSNY-2L!1Ef0Y+BbaL{_<^L-9`FJE^
zD2xgvjxnQR#m(<kOD}xzZN0VKc_sGYdjL;a+nJ$}q^AQ4$I{X6Z&=Xq@yRP+ZZ&u+
z-hC7biGUKlU<jvGNotj6AE+WAb((>Vz&Z>fNxdZTMJn2J6&jBmpP2oq=HRi&39uLv
zk~#rc_s$h4oo%nSqkyTYnWg5ntN@kgU}n4N!T_dg39`o0ex4#oqoSjH35W<>{z3ql
zcxF=qtSAHR?gi!bk!y{(MaVKAN={11jBUBM7jhX-z->GMxA6qr=3n$VBi0c$#j^ka
N002ovPDHLkV1jIIIq?7h

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/3_cell_marker.png b/files/opencs/raster/scene-exterior-parts/3_cell_marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2de374b70997a3ff82d6b059105ae13a5347a6c
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*OCMUJH<
z8TmyF!Kp>*sg(*!!5MjpCB>;ZN(wHCWtl1YX=w^J#ZWPa^xVYE9KGcHT)P9pHf;<H
zOv#=ujv*P1Z?D;Ai#SRg`1t(h%)58)t@Y@NU~SUQ6mv;r-e{00e3m=wCF>Vy4?C9=
z?Hpm6I$J!YA5CPA?d}%elie(F=at7pQO7&G_ue`4CVA>Hkwdu!7IW-#wp*X!f0jD2
zBVo?w68{AmYzwUGd>=pf_RWmVu^~7(n1eyU_2Sg&k1W_28uGS#tE;PT*}B!0As|Ee
zk!em63&XXSC2xv$<}A-VrE}WJ<%oT}iqfgib8OBB|E-Jn@%QIu2nb*Z6lr){Hv9L!
zcsU+6^Hu?Ki|2ewQ9-A)8O~V>2I?)9xwY-@>JY8JK9iQnw=I+r4dmFcef#l68bzCR
zc89KhyM9ab+3>w4dp~b~uQl(x?VRclRkeR3@0Q+`FO*5Ynibk>)UGsJqW1pwB~w&y
zZ&Sa$_VL*|{kgG`wU5r6x%2FF|1}wxEqe2>Ze8vtaOWv^x3}N^>F2gZAD_J~*WXLi
zd*Azhn|`O|6JGB+A(8B2a?v|jp5fsN!PT#hdH*hcJei51M24M_!M@HS<l?2|-#cyw
zFmUWO`P!M$WOyv*`rb`<{&6atHVX36blJ0_B96&n!-frK?(MBLuGz8U3`4`b{5=mC
z9KOG658L}Mjzf{7VZozHPNg`Fr6JQ&mDfL3V(^-z@_Y_|i@@`TcmDY8d^Go3*6+ic
zH}|cQm*eTw$d@x^5q!E<-?#AB+tn(I_QZVjJG}F!tl|;N=QR^lJndeo{Cgk#qKM~0
z1%J$OUmu1AW##3c6*$@+R|se4zNvr4<4_KaP38-88DE@ZC`o77Wz29_vf&*z;a=MZ
Z=1VnQxylRHu>un;gQu&X%Q~loCIH#MSKa^s

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/4_terrain.png b/files/opencs/raster/scene-exterior-parts/4_terrain.png
new file mode 100644
index 0000000000000000000000000000000000000000..95901c805bff7f6ef0eabc01b96856efb4d6d6f2
GIT binary patch
literal 1670
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
QZU6uP07*qoM6N<$f|HE=hX4Qo

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/5_divider.png b/files/opencs/raster/scene-exterior-parts/5_divider.png
new file mode 100644
index 0000000000000000000000000000000000000000..b34af53c5af76c6fe0a68bbf98962e900a8edc03
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*OCMUJH<
z8TmyF!Kp>*sg(*!!5MjpCB>;ZN(wHCWtl1YX=w^J#ZWPa^xVYE9KGcHT)P9pHf=x?
zVm)0PLoyoQo_7>%Fkm=faIF5-h0a}^5?XF{y$$zD-|SsK`JUzX&DSih?)Pu~f2rXb
c3Gf@E+a31UH@`a00WD(iboFyt=akR{05RKd)Bpeg

literal 0
HcmV?d00001

diff --git a/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh b/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh
new file mode 100755
index 0000000000..939bda923f
--- /dev/null
+++ b/files/opencs/raster/scene-exterior-parts/composite_the_icons.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Run this from the "parts" directory to composite the final 32 icons
+# Also creates status (masked) variants of the icons while at it
+
+set -e
+
+mkdir -p status
+i=0
+
+for grid in '' '*_grid*'; do
+for arrows in '' '*_arrows*'; do
+for cell_marker in '' '*_cell_marker*'; do
+    files=$(echo $grid $arrows $cell_marker | tr ' ' '\n' | sort -n | tr '\n' ' ')
+    convert *backdrop* $files *terrain* -background transparent -mosaic \
+            -crop '23x48+25+0' *mask* -mosaic status/$i.png
+    i=$((i+1))
+done;done;done;
diff --git a/files/opencs/raster/scene-exterior-parts/mask.png b/files/opencs/raster/scene-exterior-parts/mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd6f63624372affaf3401abe8c488deb6ca6ab3
GIT binary patch
literal 3540
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
O0000<MNUMnLSTZo3B11m

literal 0
HcmV?d00001

diff --git a/files/opencs/scalable/scene-exterior.svg b/files/opencs/scalable/scene-exterior.svg
new file mode 100644
index 0000000000..7021a04404
--- /dev/null
+++ b/files/opencs/scalable/scene-exterior.svg
@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="release.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="20.879288"
+     inkscape:cy="20.372195"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer18"
+     showgrid="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1145"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     borderlayer="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       enabled="true"
+       visible="true"
+       empspacing="5"
+       id="grid3763"
+       type="xygrid" />
+    <sodipodi:guide
+       id="guide3765"
+       position="23.997436,11.766699"
+       orientation="1,0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient7238">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7240" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.090625;"
+         offset="1"
+         id="stop7242" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6025-6">
+      <stop
+         id="stop6027-7"
+         offset="0"
+         style="stop-color:#00b800;stop-opacity:0;" />
+      <stop
+         style="stop-color:#00b800;stop-opacity:1;"
+         offset="0.36666667"
+         id="stop6029-6" />
+      <stop
+         style="stop-color:#00b800;stop-opacity:1;"
+         offset="0.66666669"
+         id="stop6031-9" />
+      <stop
+         id="stop6035-6"
+         offset="1"
+         style="stop-color:#00b800;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="14.000408"
+       x2="42"
+       y1="39.000408"
+       x1="-7"
+       gradientTransform="translate(2.9999999e-8,-2.000408)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6524"
+       xlink:href="#linearGradient6025-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="29.398096"
+       x2="37.608032"
+       y1="28.018894"
+       x1="30.672773"
+       gradientTransform="matrix(-0.83144597,-0.55560561,0.55560561,-0.83144597,45.935299,71.338161)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3975-167"
+       xlink:href="#linearGradient3969-161"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3969-161">
+      <stop
+         id="stop18844"
+         offset="0"
+         style="stop-color:#6f6457;stop-opacity:1" />
+      <stop
+         id="stop18846"
+         offset="1"
+         style="stop-color:#5b534a;stop-opacity:0.3286385" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7010-1-474"
+       id="radialGradient4670-35"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95227996,-0.23567774,0.30143492,1.1936264,-2.8135066,-1.0081679)"
+       cx="26.614479"
+       cy="31.523769"
+       fx="26.614479"
+       fy="31.523769"
+       r="5.2661862" />
+    <linearGradient
+       id="linearGradient7010-1-474">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18850" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:0;"
+         offset="1"
+         id="stop18852" />
+    </linearGradient>
+    <radialGradient
+       r="8.3862238"
+       fy="22.70536"
+       fx="29.436325"
+       cy="22.70536"
+       cx="29.436325"
+       gradientTransform="matrix(-1.9078913,-0.3577294,0.3543385,-1.8898065,77.115924,73.438975)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5037-916"
+       xlink:href="#linearGradient7183-781"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7183-781">
+      <stop
+         id="stop18856"
+         offset="0"
+         style="stop-color:#807460;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6d6459;stop-opacity:1;"
+         offset="0.5"
+         id="stop18858" />
+      <stop
+         id="stop18860"
+         offset="1"
+         style="stop-color:#5b534a;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7010-1-4-568"
+       id="radialGradient4704-570"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.6953365,-0.42516526,-0.53664221,2.1533153,79.941524,-28.543415)"
+       cx="26.264538"
+       cy="30.721058"
+       fx="26.264538"
+       fy="30.721058"
+       r="5.2661862" />
+    <linearGradient
+       id="linearGradient7010-1-4-568">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18864" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:0;"
+         offset="1"
+         id="stop18866" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.097046,-0.45710235,0.82311479,-1.9754762,30.795013,72.834528)"
+       r="10.938465"
+       fy="21.819239"
+       fx="23.476456"
+       cy="21.819239"
+       cx="23.476456"
+       id="radialGradient7024-931"
+       xlink:href="#linearGradient7018-328"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7018-328">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18870" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:1;"
+         offset="1"
+         id="stop18872" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.396372,-0.19828289,0.19312312,1.3600352,-16.605237,-6.5520458)"
+       r="5.2661862"
+       fy="31.523769"
+       fx="26.614479"
+       cy="31.523769"
+       cx="26.614479"
+       id="radialGradient4653-266"
+       xlink:href="#linearGradient7010-731"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient7010-731">
+      <stop
+         style="stop-color:#807460;stop-opacity:1;"
+         offset="0"
+         id="stop18876" />
+      <stop
+         style="stop-color:#5b534a;stop-opacity:1;"
+         offset="1"
+         id="stop18878" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5130"
+       x="-0.1974474"
+       width="1.3948948"
+       y="-0.51336323"
+       height="2.0267265">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0695067"
+         id="feGaussianBlur5132" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7238"
+       id="radialGradient7244"
+       cx="24"
+       cy="24"
+       fx="24"
+       fy="24"
+       r="24"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://www.gnu.org/copyleft/gpl.html" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer20"
+     inkscape:label="preview_backdrop"
+     style="display:none">
+    <rect
+       style="color:#000000;fill:#5e5e5e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5066"
+       width="104.91696"
+       height="71.241005"
+       x="-31.908192"
+       y="-11.573744"
+       ry="2" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer21"
+     inkscape:label="backdrop"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="opacity:0.07000002;color:#000000;fill:url(#radialGradient7244);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7236"
+       width="48"
+       height="48"
+       x="0"
+       y="0"
+       ry="0" />
+  </g>
+  <g
+     style="display:inline"
+     transform="translate(0,-1004.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="credits"
+     sodipodi:insensitive="true">
+    <text
+       sodipodi:linespacing="125%"
+       id="text3111"
+       y="1072.3622"
+       x="24"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       xml:space="preserve"><tspan
+         y="1072.3622"
+         x="24"
+         id="tspan3113"
+         sodipodi:role="line">This icon was designed by</tspan><tspan
+         id="tspan3115"
+         y="1087.3622"
+         x="24"
+         sodipodi:role="line">Sergey &quot;Shnatsel&quot; Davidoff</tspan><tspan
+         id="tspan3117"
+         y="1102.3622"
+         x="24"
+         sodipodi:role="line">for OpenMW content editor</tspan><tspan
+         id="tspan3119"
+         y="1117.3622"
+         x="24"
+         sodipodi:role="line">Licensed under GNU GPLv3</tspan></text>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:label="Green grid"
+     id="layer15"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3963"
+       d="m -15,40.999592 60,-30"
+       style="fill:none;stroke:url(#linearGradient6524);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.085273,-2.9802322e-8)"
+       id="use3979"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,-1,49.960273,59.433592)"
+       id="use3981"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(1,0,0,-1,2.9999999e-8,59.808592)"
+       id="use3983"
+       xlink:href="#path3963"
+       y="0"
+       x="0" />
+  </g>
+  <g
+     style="display:inline"
+     inkscape:label="arrows"
+     id="layer18"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:connector-curvature="0"
+       id="path6548-6"
+       d="M 7.0003592,40 5.7187282,33.53125 5.691,31.668544 19.000359,38 l 0,2 z"
+       inkscape:transform-center-x="-0.82672021"
+       style="color:#000000;fill:#a46932;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:connector-curvature="0"
+       id="path6548"
+       d="M 7.0003592,38.02941 5.7343532,31.665593 19.000359,38 z"
+       inkscape:transform-center-x="-0.82672021"
+       style="color:#000000;fill:#c73838;fill-opacity:0.4642857;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:none"
+       d="m -15.883883,44.257017 60,-30"
+       id="path6591"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.019506,0)"
+       id="use6705"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672001"
+       xlink:href="#path6548-6"
+       y="0"
+       x="0" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.000359,0)"
+       id="use6707"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672021"
+       xlink:href="#path6548"
+       y="0"
+       x="0" />
+    <path
+       style="color:#000000;fill:#a46932;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:transform-center-x="-0.82672021"
+       d="m 41.737185,18.966172 1.266006,6.363817 0.005,2.253488 L 29.773398,21 29.737185,18.995582 z"
+       id="use6709-8"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="-1.3065395"
+       sodipodi:nodetypes="cccccc" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,-1,48.737544,56.995582)"
+       id="use6709"
+       inkscape:transform-center-y="1.3065395"
+       inkscape:transform-center-x="0.8267198"
+       xlink:href="#path6548"
+       y="0"
+       x="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6784"
+       d="m -14.321383,58.322026 60,-30"
+       style="fill:none;stroke:none" />
+    <use
+       height="48"
+       width="48"
+       transform="matrix(-1,0,0,1,49.013105,0)"
+       id="use6790"
+       inkscape:transform-center-y="-1.3065395"
+       inkscape:transform-center-x="0.82672021"
+       xlink:href="#use6709-8"
+       y="0"
+       x="0" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path6548"
+       inkscape:transform-center-x="-0.8267198"
+       inkscape:transform-center-y="1.3065395"
+       id="use6788"
+       transform="matrix(1,0,0,-1,0.2705605,56.995582)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:label="Terrain"
+     id="layer16"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       transform="matrix(0.89115873,-0.45369165,0.89115873,0.45369165,0,0)"
+       y="37.637562"
+       x="-28.283714"
+       height="18.238897"
+       width="18.238897"
+       id="rect3961"
+       style="color:#000000;fill:#6f6453;fill-opacity:1;stroke:none;stroke-width:1.11205709;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sssccccsscss"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0"
+       d="m 25.380453,17.09992 c 0.448985,0.143237 0.854776,0.397902 1.222884,0.736155 1.576994,1.449093 5.6499,3.494788 6.277116,5.823239 0.436921,1.622009 5.290083,6.173714 5.290083,6.173714 0,0 -4.48248,1.970091 -4.50883,3.201844 -0.648493,0.4398 -8.956726,4.582587 -8.956726,4.582587 0,0 -13.419185,-6.274012 -15.544194,-7.801468 1.704099,-1.205773 1.33792,-2.867547 2.943409,-4.109956 1.552359,-1.201295 2.411571,-3.953907 3.352021,-5.340617 0.636931,-0.939166 2.49346,-1.051666 3.42424,-1.602309 1.801206,-1.053489 2.03605,-2.202744 3.429187,-2.217663 0.95667,-0.01024 1.92904,0.19022 3.07081,0.554474 z"
+       style="color:#000000;fill:url(#radialGradient7024-931);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccsccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-2"
+       d="m 30.182359,18.544171 c 0.457569,0.100018 1.017158,2.321731 1.99223,3.503213 1.129552,1.368666 6.609183,8.650854 3.581153,10.009732 -3.098521,1.525151 -11.501378,3.885835 -11.501378,3.885835 0,0 -2.766953,-0.79804 -4.652265,-2.639621 -1.885312,-1.84158 -5.445964,-6.712837 -1.919398,-10.886997 2.369375,-0.857841 3.605956,-0.512218 5.348277,-2.207754 1.495498,-1.024176 5.670382,-1.988134 7.151381,-1.664408 z"
+       style="color:#000000;fill:url(#radialGradient5037-916);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sscccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-6"
+       d="m 38.70681,30.174956 c -0.230709,1.481253 -1.497429,0.887737 -3.235256,1.810349 -4.87473,2.587993 -3.736785,1.036511 -3.736785,1.036511 0,0 -1.749465,-2.67057 -2.462659,-4.280303 -0.255043,-3.550221 -1.473766,-4.080338 -1.315533,-4.04078 1.52261,-1.526788 3.895404,0.01397 4.125891,-2.16444 1.910675,3.395304 2.219325,3.52568 2.825514,4.409866 1.549833,1.540739 4.210949,0.582825 3.798828,3.228797 z"
+       style="opacity:0.73303169;color:#000000;fill:url(#linearGradient3975-167);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8"
+       d="m 30.506535,28.661205 c -0.286832,0.06207 -0.637616,1.440778 -1.24885,2.173962 -0.371672,0.445825 -1.241731,2.021835 -1.241731,2.021835 0,0 2.061612,1.080889 2.963411,1.481521 1.728381,-0.919695 2.275266,-1.008149 4.084661,-2.229151 -0.740871,-1.230476 -0.949334,-2.158444 -2.124637,-2.963802 -0.937469,-0.635565 -1.504474,-0.685257 -2.432854,-0.484365 z"
+       style="color:#000000;fill:url(#radialGradient4670-35);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="sscccscs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8"
+       d="m 23.362157,25.687571 c 1.482597,0.221906 4.553745,0.314958 3.460754,2.55183 -0.45723,0.935748 0.177712,4.221939 0.177712,4.221939 0,0 -3.97963,2.833818 -5.585097,3.556563 -3.077023,-1.65914 -9.505701,-4.859459 -9.505701,-4.859459 0,0 2.122607,-0.80651 3.125322,-2.288344 0.728622,-1.076772 1.39168,-2.139239 2.272245,-2.750673 1.531504,-1.558959 3.406391,-0.828249 6.054765,-0.431856 z"
+       style="color:#000000;fill:url(#radialGradient4704-570);fill-opacity:1;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ssccccs"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8"
+       d="m 24.210883,28.327642 c -0.457569,0.100018 -2.326313,0.342641 -3.05289,1.691252 -1.186317,2.20194 -4.323164,3.567429 -4.323164,3.567429 0,0 6.69174,3.244393 8.130336,3.889987 2.757202,-1.482035 3.629621,-1.624573 6.51606,-3.592147 -1.181875,-1.982841 -1.514426,-3.478208 -3.38933,-4.775996 -1.495498,-1.024176 -2.400013,-1.104251 -3.881012,-0.780525 z"
+       style="color:#000000;fill:url(#radialGradient4653-266);fill-opacity:1;stroke:#535147;stroke-width:0.99999994;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccssscc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-2-5"
+       d="m 32.615577,33.512922 c 1.062838,-0.476966 7.161501,-3.634889 7.161501,-3.634889 0,0 -3.234968,-1.688243 -4.897736,-3.383489 -1.913522,-1.950899 -2.312513,-3.971887 -2.704753,-4.44716 -0.975071,-1.181483 -1.402078,-3.579972 -1.859647,-3.67999 -1.480999,-0.323726 -2.031961,-0.111064 -3.527459,0.913108 -1.874904,1.297788 -0.716877,2.032432 -3.086252,2.890273"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccscsc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-0"
+       d="m 21.415526,36.017904 c -3.077023,-1.705841 -9.505701,-4.996242 -9.505701,-4.996242 0,0 2.122607,-0.829211 3.125322,-2.352756 0.728622,-1.10708 1.39168,-2.199453 2.272245,-2.828098 1.565567,-1.406321 3.09482,-1.720341 5.480241,-0.620789 1.078559,0.497159 1.75386,0.858547 2.709453,0.417094"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4274-5-0-8-8-8-0-9"
+       d="m 15.141878,20.891061 c 0.85846,-1.450515 2.210937,-1.720342 4.684746,-0.31143"
+       style="color:#000000;fill:none;stroke:#535147;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="cell marker"
+     sodipodi:insensitive="true"
+     style="display:inline">
+    <rect
+       style="opacity:0.5;color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5130);enable-background:accumulate"
+       id="rect4346-9"
+       width="13"
+       height="5"
+       x="18"
+       y="7"
+       ry="2"
+       transform="matrix(1.093603,0,0,1.093603,-2.2932737,-0.88922859)" />
+    <rect
+       style="opacity:0.93000034;color:#000000;fill:#57554d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4346"
+       width="13"
+       height="5"
+       x="18"
+       y="7"
+       ry="2" />
+    <path
+       transform="matrix(1.0597281,0,0,0.96469901,-1.5237828,0.35824528)"
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       d="m 20.40625,7.9375 a 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 1,1.4375 -1.0625,1.46875 a 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 0.5,0 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 L 21.71875,9.84375 22.53125,11 a 0.05416374,0.05416374 0 0 0 0,0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 l 0.5,0 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -1.0625,-1.46875 1,-1.4375 a 0.05416374,0.05416374 0 0 0 0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -0.5,0 a 0.05416374,0.05416374 0 0 0 -0.03125,0 0.05416374,0.05416374 0 0 0 0,0.03125 l -0.75,1.125 -0.75,-1.125 a 0.05416374,0.05416374 0 0 0 0,-0.03125 0.05416374,0.05416374 0 0 0 -0.03125,0 l -0.5,0 a 0.05416374,0.05416374 0 0 0 -0.03125,0 z"
+       id="path5013"
+       inkscape:connector-curvature="0" />
+    <g
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       id="text4348-0" />
+    <g
+       style="font-size:5.55187035px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;writing-mode:lr-tb;text-anchor:end;opacity:0.78082192;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       id="text4348-2"
+       transform="matrix(1,0,0,0.9600565,0.03314563,0.37946329)">
+      <path
+         style="marker:none"
+         d="m 26,7.9375 a 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 l 1.1875,1.53125 c 0,0 -0.1155,0.3913824 -0.34375,0.71875 -0.224794,0.322412 -0.561479,0.51476 -0.75,0.6875 a 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 0.03125,0 l 0.53125,0 a 0.05634237,0.05634237 0 0 0 0.03125,0 c 0.393478,-0.169092 0.583736,-0.549796 0.71875,-0.6875 0.03046,-0.03107 0.08097,-0.08081 0.125,-0.15625 0.04403,-0.07544 0.09547,-0.167502 0.15625,-0.28125 0.121556,-0.2274955 0.263021,-0.4974755 0.40625,-0.78125 0.286458,-0.567549 0.5625,-1.125 0.5625,-1.125 a 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.5,0 a 0.05634237,0.05634237 0 0 0 -0.03125,0 0.05634237,0.05634237 0 0 0 0,0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.59375,1.0625 -0.875,-1.0625 a 0.05634237,0.05634237 0 0 0 0,-0.03125 0.05634237,0.05634237 0 0 0 -0.03125,0 l -0.5,0 A 0.05634237,0.05634237 0 0 0 26,7.9375 z"
+         id="path5018"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.77999998;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 24.234375,9.84375 -0.1875,1.53125 0.5,0.15625 0.4375,-1.5 z"
+       id="path4400"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     sodipodi:insensitive="true"
+     style="display:none"
+     inkscape:label="divider"
+     id="layer3"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3771"
+       d="m 24.5,-30.497582 0,88.12502"
+       style="fill:none;stroke:#ac0c0c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-exterior-arrows.png b/files/opencs/scene-exterior-arrows.png
new file mode 100644
index 0000000000000000000000000000000000000000..f388255ade579246e67a4a530206cafd32b5210f
GIT binary patch
literal 1251
zcmV<91RVQ`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H105)_*Sad;kbZBpK08?dhXJvUHB2#E?VRUn4Y$6~;VRmU`Z)Rp7
zJacGnVRUn4Y(QsiVQFkGV{dIfz!N-%000CYNkl<ZXo2mQ?@wD*7{|ZQxxKwzhZ!&n
zGnl;)$nc$oLYx@g;!M=A%(&4Ool##Hi7)&Il#K@b2Yg|8ZGym>p{~`%Xv}<L*sxi2
zi8?opF=&v6DWfd3z2`i>Xkp3iy`?bW26I2jP1<vwp7Z_OU+0vV8M_(bc7S`u6L1?(
zz->GMxA6qr#uIQGPrz+F0k`o4+{Ra}^Wt028BO^G?bpBkTz8;e0YGm4cMfGk3IMX9
zOWdD?0sw5~uN@HqK(Zeqls!VFF|(rXz(Fd_^^bU{p+E~plYI8Q&+@iIRGT+_s(X%@
zS~kj|e8B2ng}k4iIX#y7e53k_H^Wc*R<%okI|8D(Q8mDV7y6R3&31i`w@@+~*+-xU
zstqi4#!9`y?fnvk0D}oN!~rCsSO_p~H%hG3D@eV1Jt+#MUyR(pDFNMwBVhY}(_ad{
z+^A4A7yxbp^lD(S_3K&$jBNX5Vw?tWy=X9&8zpiL3Z~!LffXOM>u`JqgrZ(+ThU<T
zgACKZe%sw(;!z{pHr{{koUA200F-OT6A7AVpYI%C!jS3bLpi^MuShU*1ie63hr<Ap
zH4BhJSLp*#^ee2^F=V-#KtF@ksJ__t;bwwcIeV7Xnn>GUU2zZ(nL2lv4Ghf$0y$9<
zVE`;1vCZl95U2Zl=8A@DSq(DOUCryn7||D7C+{V=6Nv<g)`f74Kxe?{001F@zzRXn
z)1Q6G*@_p6qrk*qm#GA_QWbsz)5y){%w+kjZ7b^{OhW)31^}U;2F5a)wbt<#Du@4(
ziAR2Ex;nKJ!Ph9yHIYcrRQr55%0y?BD2Y_S%(ln)U^qTJ4B^zjlgIEd#Q0!1Zr4|J
zA=?e?`n}NqQ{dw3kG3SEk$pQIrWzMcJbvFNuk}1=ZMPLzmgZx7l$cA!d&W`&hix}e
zJ4G`3L?|8WeqZzF|Hx~yVmo2`8Z8FZE#yR<DB=w!`O1Y@_xZdkywjij?ze4ETxR-Y
z=Ru#(HyTtp1*Sc$0R=zZvewxOC@HU*ng(4Gh!N0CdMQXoG!^UlRD$1rerooI?F#;J
zysJY~;$4G$eK4`Uy)!iiOI)+oJHAGzUydvocSNY-2L!1Ef0Y+BbaL{_<^L-9`FJE^
zD2xgvjxnQR#m(<kOD}xzZN0VKc_sGYdjL;a+nJ$}q^AQ4$I{X6Z&=Xq@yRP+ZZ&u+
z-hC7biGUKlU<jvGNotj6AE+WAb((>Vz&Z>fNxdZTMJn2J6&jBmpP2oq=HRi&39uLv
zk~#rc_s$h4oo%nSqkyTYnWg5ntN@kgU}n4N!T_dg39`o0ex4#oqoSjH35W<>{z3ql
zcxF=qtSAHR?gi!bk!y{(MaVKAN={11jBUBM7jhX-z->GMxA6qr=3n$VBi0c$#j^ka
N002ovPDHLkV1jIIIq?7h

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-borders.png b/files/opencs/scene-exterior-borders.png
new file mode 100644
index 0000000000000000000000000000000000000000..9711df62ca1ee0989ac6a5df8e981b72c96fa349
GIT binary patch
literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H105)_*Sad;kbZBpK08?dhXJvUHB2#E?VRUn4Y$6~;VRmU`Z)Rp7
zJacGnVRUn4Y(QsiVQFkGV{dIfz!N-%000CTNkl<ZXo2n7TZmO<7zW_yn=#ZhGc83^
zN~;UeFoNhn*@PDh%8nFxA<<1B6m^joQBYPl-X<1-1w~y%2Z*qkg#}qsLI*q9iA+Nw
zv`~~9vx9#Z|7x0a?{V+hYdaM4UGDXN-}}D%KdkrrSEQ8um!oI233M7`0!BN=1dMi!
z2^j4d6ENEG{}vEsoG2b6j^oY1_$XuiXbP$DCp3FL?l}2>Vk%}w83(XG6(`31MHy2o
z>;dd=I<6Hr8f8qz*_eV|*xfB5QO2waYXCb^kq!<!z8yOqWlYBfn1)aBO<h8wjQLoM
zL)e;%w5O%Kk@N#m#+kShr(<&kI3giY#-gg$FL)~zX=hvcoisF2#yPkiGqC}iTNM&z
zT!ic7fBcnHq%TIqp^lC$%2<e7F&oceV=B^-CS#XWV+Zg|D$<7?Vb|GGMj034Zp^`B
z@;`f|dRE{rnfRlrNSkZH>_$%<Wn6{_Fc+`kDjdc`sYn~^#OjKbNJV-V>(Gmp@*Y`-
zH|xf#T|ktvEXsHv4`Nj+(iC~kuf%6j#_}kmHr(2lP?WJuCQV){8ybx1!)ly?NAN<k
z&E7I@rvh3b-XNz>O+rGylTwj>Z#!`W#2eJ;)1i>i?>2mmk5Z8iw*cBP@dh>fv?-+8
zM~g$hDY!!RAs^!HRHQ=<60WI0Y9rnNqt8D=9>$AD3yCs%aS4`U_uw9gGN$2bT#QY4
zJr!vn%2<kfF%fIJLA;5O`!ES><abF_q;J4Zyp)Rc-7%Xu%9w%WxCs-m7i&|I-sm>*
zqoaBu-idi~Z}J|VN=5qW?=g+e<2kY){~p`q>0A_LoYHN=LnF!<CljBCAF)H8k!exJ
zV2e0(2`!M_;Y4gmMf#xneJ<|7jaV<w#;{FB4a8UAe)(`&J%r0b+5L{gtN0}Jn}@!N
z_@-2(ZA}W#tBNj@Z9%O<jv~IjBEF@`*mGrn6`|kFaznDcMW9-Rv_rf>?%WZ-i8~e2
z3Gsi`sliILC8RFmgY{}ObHfU$oA_Yex*M7XLLQe-w_1r0;&tmQWpz?KiOc0Pd}S(9
z?F~&gW}sI-t5;zUo|P@iQmn=LRHUD4!>e%*^vWb}$38rfinMje^RsY=Y{Z_%^QlM!
z9plz;3iaSp+=7D@v8H!C)uq@9+5NsOo5o|@Z_D@{ya#%4J_`A&q(2qu+cxrN;#!=C
zjd-V(e&m=s?Fy)j)O>j<{Dv*5NW0nv9#U^QmdGY@3qEeALu^?<MSKPpAmPhYq`hr3
zZeIUXd09=z=km?;AIHr*o`CA(#$?Qr?|FVmMLN(a;bHJ5$#(u^+0y?sTzlDyfJqpS
zfmEbl>!Uh+L>c38n%s%)!{JmM%e55&aiYG;G{NshPqTgT7u<dKhm!iyV*mgE07*qo
IM6N<$f-zP(Qvd(}

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-marker.png b/files/opencs/scene-exterior-marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2de374b70997a3ff82d6b059105ae13a5347a6c
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*OCMUJH<
z8TmyF!Kp>*sg(*!!5MjpCB>;ZN(wHCWtl1YX=w^J#ZWPa^xVYE9KGcHT)P9pHf;<H
zOv#=ujv*P1Z?D;Ai#SRg`1t(h%)58)t@Y@NU~SUQ6mv;r-e{00e3m=wCF>Vy4?C9=
z?Hpm6I$J!YA5CPA?d}%elie(F=at7pQO7&G_ue`4CVA>Hkwdu!7IW-#wp*X!f0jD2
zBVo?w68{AmYzwUGd>=pf_RWmVu^~7(n1eyU_2Sg&k1W_28uGS#tE;PT*}B!0As|Ee
zk!em63&XXSC2xv$<}A-VrE}WJ<%oT}iqfgib8OBB|E-Jn@%QIu2nb*Z6lr){Hv9L!
zcsU+6^Hu?Ki|2ewQ9-A)8O~V>2I?)9xwY-@>JY8JK9iQnw=I+r4dmFcef#l68bzCR
zc89KhyM9ab+3>w4dp~b~uQl(x?VRclRkeR3@0Q+`FO*5Ynibk>)UGsJqW1pwB~w&y
zZ&Sa$_VL*|{kgG`wU5r6x%2FF|1}wxEqe2>Ze8vtaOWv^x3}N^>F2gZAD_J~*WXLi
zd*Azhn|`O|6JGB+A(8B2a?v|jp5fsN!PT#hdH*hcJei51M24M_!M@HS<l?2|-#cyw
zFmUWO`P!M$WOyv*`rb`<{&6atHVX36blJ0_B96&n!-frK?(MBLuGz8U3`4`b{5=mC
z9KOG658L}Mjzf{7VZozHPNg`Fr6JQ&mDfL3V(^-z@_Y_|i@@`TcmDY8d^Go3*6+ic
zH}|cQm*eTw$d@x^5q!E<-?#AB+tn(I_QZVjJG}F!tl|;N=QR^lJndeo{Cgk#qKM~0
z1%J$OUmu1AW##3c6*$@+R|se4zNvr4<4_KaP38-88DE@ZC`o77Wz29_vf&*z;a=MZ
Z=1VnQxylRHu>un;gQu&X%Q~loCIH#MSKa^s

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-markers.png b/files/opencs/scene-exterior-markers.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2de374b70997a3ff82d6b059105ae13a5347a6c
GIT binary patch
literal 808
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*OCMUJH<
z8TmyF!Kp>*sg(*!!5MjpCB>;ZN(wHCWtl1YX=w^J#ZWPa^xVYE9KGcHT)P9pHf;<H
zOv#=ujv*P1Z?D;Ai#SRg`1t(h%)58)t@Y@NU~SUQ6mv;r-e{00e3m=wCF>Vy4?C9=
z?Hpm6I$J!YA5CPA?d}%elie(F=at7pQO7&G_ue`4CVA>Hkwdu!7IW-#wp*X!f0jD2
zBVo?w68{AmYzwUGd>=pf_RWmVu^~7(n1eyU_2Sg&k1W_28uGS#tE;PT*}B!0As|Ee
zk!em63&XXSC2xv$<}A-VrE}WJ<%oT}iqfgib8OBB|E-Jn@%QIu2nb*Z6lr){Hv9L!
zcsU+6^Hu?Ki|2ewQ9-A)8O~V>2I?)9xwY-@>JY8JK9iQnw=I+r4dmFcef#l68bzCR
zc89KhyM9ab+3>w4dp~b~uQl(x?VRclRkeR3@0Q+`FO*5Ynibk>)UGsJqW1pwB~w&y
zZ&Sa$_VL*|{kgG`wU5r6x%2FF|1}wxEqe2>Ze8vtaOWv^x3}N^>F2gZAD_J~*WXLi
zd*Azhn|`O|6JGB+A(8B2a?v|jp5fsN!PT#hdH*hcJei51M24M_!M@HS<l?2|-#cyw
zFmUWO`P!M$WOyv*`rb`<{&6atHVX36blJ0_B96&n!-frK?(MBLuGz8U3`4`b{5=mC
z9KOG658L}Mjzf{7VZozHPNg`Fr6JQ&mDfL3V(^-z@_Y_|i@@`TcmDY8d^Go3*6+ic
zH}|cQm*eTw$d@x^5q!E<-?#AB+tn(I_QZVjJG}F!tl|;N=QR^lJndeo{Cgk#qKM~0
z1%J$OUmu1AW##3c6*$@+R|se4zNvr4<4_KaP38-88DE@ZC`o77Wz29_vf&*z;a=MZ
Z=1VnQxylRHu>un;gQu&X%Q~loCIH#MSKa^s

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-0.png b/files/opencs/scene-exterior-status-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f95de53e3c48c4f2f192d7428aede0854374bb06
GIT binary patch
literal 3289
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
JuS7aT{tveC|1kgn

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-1.png b/files/opencs/scene-exterior-status-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..09427b0c2a6bb889282db02ea2ef26ff2e808a18
GIT binary patch
literal 3576
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

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-2.png b/files/opencs/scene-exterior-status-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..086fe7b0aaed9716d9ef4c0a3daf55819122c167
GIT binary patch
literal 3601
zcmZ{nXE+;d)W<_mqiQ^g)?T$Yv3FDwEsfc#B8U}xrWIQ$wOXsS)kw7jErLFc(UzK_
zh+0kY*rP_##Cr9*-Y@Tm_gvRGzw4a){{PR1`_r9r$HI)2`8qQI0APhez*ZMj`kRal
z7uBAYl6(O=PovvL06=3V%L#)1qNfS5GBXC?hWXbn8eunx)olRa(G36~HW2`zUW{T_
z0f4Xzmvt8aK>Gy%z!O;14%fXnU~n}z17GkWC?+3bF2EEBxfgP=dh&157)uqR0f5V;
zP_U7W*N-m+ky*B1ihB*_qMVMDkA??}5$p)|&zJPsucc*zja;SN9MjoyRCv=1Ug!1;
z_1GXl_umyv`_8sbRf1CNlyWz3+K<vyxpGNNN#I`LQe&^DKM{|W%6v$SDh_FnJa3I~
zdC|82O=8B{lRCSt-*FZl({Xl6jW~7$JQS}#44oE)Ql5+5|ICq>xo=OaZPjslenVLQ
zW?|jvSz`*ukv4%QrKJS~m&paAP;b4wy*U7?9)qucpZ&b##?e%o_!Z3br2NRw&u`(m
zxdOb+akvoVSHL1wm2(Hi6pQg2N$9%5V1N+)M?^Sjys5c4g|ff$VSj~axg6Y<w$UC&
z_!Zg1Th+`Bm`P6HmkAITT@+PzqW#nfe1*eV$UC-<5ZzVU?46_5;^hmSj~ztF1|d5M
z`4f4ncYM4bDA8~(GF7~~DQ}@qaUY$YezU&5&N=1Vf*4qy^q2nc*fYw1*YwBlwO-Aq
z`X9anMJ^eruDU`Z>y8}~C2zTa;}E>5w{D2V3uloWI<kJ1(!}$WkjwHN4<sTMS%}^u
zKJk2O`!7N)a$<R_xB<t9TNQZxB(GbyyUa(R+)6PXa@uQh&Rr7uLln8yAfYtQyx83N
zM0}jF_!Tt<Y*buaEXqi$97PR%X@SiRcK7u3TuH-|qgBTyCsAZF;WjY*@WZdj%%u4v
z-bhNCS<t6`FAKR=fl~G^SU*=X%k+nc`nd*#iB{oI_;As~?)TUd?SP73$0b&<B!m==
zK6QwCz8sj$Kjb|hcu8=q9L1seIh3t{IMPXc+3obGt<d5TTl&n$NW6NFSD6xuRO{8B
zBdwRQDAgO3xTr}hY;V5(HMUpgQx8+paaZ72bh4Uc(B)LQ2b&8so8`ysPxA7(z0)|_
z94*}6-z#tCW@Tjs%$_VfowGkY!X|qai<C-QWx`y*$@FyR;Ec7RBoi@#fBOV{D?;ct
zYz^?(v8V*b%k=v25tEGqx}G%sldOuD!)=g)RSz+;tE|A)@|Dt<<&-umRfl5%Bl11y
zK$S?OEXAw(&$b5buj6nEdNezW@48)RD^MMFWXl(QqmF6roDXV0{An~*1(J_fs(t&3
z)xfJ?3PPe!#ZiO?C84CzWP!Ok^STKn(h<*|tL=>0Jpc*;e<Kbca0p=b&)PpHcJ;O4
zp(aL9mXWCm)5iM+yx^nMj1F-1JYo4Q_JK2YW81QFjzn@yfT6Eg!D#D6&tBwFZ9JWW
zs&n>`ZhrR|_gFz<7KQ2?m6<;x>qkZs2S@1)Te?z1Tb$6a=^T(NteE@QSLSRj3Ew{+
z_!}NlZZ3%>KLe>&)gkV<ZIrj}aZ5J#-Do_fhms{GU-U$9F~+gGydBFGGqHDugC?+F
zk=alY@LmENTj0cO#bGfB8`qec8&0-F_|y>`I2dC;a0`~^e(e)untS?576i@Od2K1F
z%&ot<swY*><-=UX8>=Uvr-rmv^RQxsUmN*;hsXzlT9RJPjWRKc6~tiXH>=Be&6+!d
zhHB_nr)zF*-g8oht~-|c${50+pe3<H@l-iDe*&OR9l%7C$YyRJx!yuX6K&BYy(Fo=
zn)Fl6a^bJ$MGc^2Y3~@C5&b;+E8Nas-zT@25~@17c2;s;^=ekq3IW{Ys)9`yzr5?=
zWywpJ_V2H5Y*F#w$sMRhcVsm^oB#Oz{cjB~Dj(}J4UA<-r7o&TLQRf%=jI^aY6`~0
z*&@4MBgYY4CCMk5K=+Pn!^M|I-*5>JLmAn!=?xm~BtyLXI3T){92?pWXGMyI^>@)4
z;qsKEe$2A~HqmUmV$irug@a)?6QX-$=5^oX{U#u3I^ul8@Ds|oE$FBA)w=c6mI1`q
zxRU5AzYj;ViP?&|DYCUP=DqQac}m~71~`_KL^IT1f@75r<FN)l>&G6))h!ra=YV<3
z={U^Cat$ogKMdYmOwB>jLiyL{YYaRcn6Etz>g+B}EpIz(oSPEjP7iU_-bsiv6RlfY
z9k6~PTEO>B&EvTy%<A$0W_*;s)2vu8SyAXga}vF@M2&E#dFxw`K~0IUeZ?02cFb1w
z!^cvDVTT{e%*@x!orjw)$9c)pEeEo8%*$=}2+g9znFn;fXcGJ>)3^5pr%TXX`zMhb
zoYCuLbf~p;#pky#@#|EjP(uy1=SQ<FMv9=SHRV@geO2N}3{fvk<w$pH<2pm&R&Pi(
z*5s3Mti|x=R03rhcwgvrhU{O!bCc@8@{9LgWHUq?%?}mZZ%c2+WL%}o4XevPoom01
zjR{*K*}`tW56e!#>RMLWgw5Y)c|Z{*tlTNJC`&g&B{aLdjj<84s8p{~dgDco$0<nq
z$uT@_PHG3ozO}L5828p8H2j&>ik)j_3Hb!PFZl5|qHy`<Gbg*Jo#i$Q`Tuz>??Z;g
z7qpy^0_3W%ZgSdD`<ureeki{o&A1$^vdS{{9<YOIn{q-0oiVI|yN>l4DD;q9%2e6B
zG^#|MM_!o3U?#oJ$<+C+nCK?o3VXhTseBzPoy752>K#GWJ|KEOxBlM)(peVVDs{eX
zMDfLEaa_;5im>Kd-L>sao{ZAMJ;!;O$2svB+rl<qPD^QU*b2RrS;48^DH;YZwP<je
z7&{?`<qId4X*e$!1_;_~Nihu_ct6^cpfV%hF?C#TrklP_O-0JJtU?+W%FRltqY%2J
z`nQj&U%kjcN+uaZ2mX$(c|VFX=9<FrezTTB)K%%{8s1gvDXTN(GvPvAvFY-BP6M<3
ztOHwUOYOP!9D3m0ty!%wzZj{I&9?!O)TQ=|2shBe;AtQR`@XH|&qP)R-6sC&l*wRG
zg?tyN+;qwDY5YW6zMU@`kM%^JH%aE5toWtth1n}$_G%NQ`sI2!z0<kgxN4)6NF!7B
zU||T_Bp3*v8&8zDidL%xwo{*q1KC9AU%DF-c)!`paP(X!+v@0zH?!fWTjs#dUzEY3
z_F1@S<e1z2aMl}(JDRFH_W<HjyW;u#y?g}SC@2UUuG{E-CZ;nz5HWW+$cK->Z65a(
zDAsjUPz+D2R`kM>CW|$s?WI+qrFZRb;poI2c~DzjEUz{3HJUi(tDGMntLRZUabjz$
z^6Y%Tcp&VvxsYS?HiahZNTFmB<7hWqQ`=gtQP)AEi*BXYU4}1fDJ-7SMCAhKpztaI
zdH;gkD|vc^%B|fw)SfJ1_qPsy(|PLjbYc?M;ntr#<gB|g)n;T?dIi8Q0)GNS*Cs*h
zZc8wKVG!~C()ad5;7{$)Bc4l;o(v`D2NP$5pMV2P&OD`Rem<aw`KZrJUYvGDQ&)@A
zc5^umPgbX=va8K%^!%k5GSghWC%5F2B7U6wN5Z$2Ub}^)3?5;f^nbBQVrz|<I<1+>
zL4o`!R?k`N3<iX7XD3FInQkVQ<zTH;j(7;u!H}7q!9gdWAvY$Ze|LxwgLhjpz58$6
zni%n2?^BQHQ!@SpDMt%%J$To`b{g+1ND>)oRN^}{qv8rl{?U(*wUTP&47TS;vdg|j
z#o&rcb~;?bFHOhR!-$i!)Gv4CD8XRmv@GMCoCdt!?Ac&FgBoG)o0ea;<H|3Ax7_!h
zUe^xLLO#O%IY6b0>Fj2`68Hh&X7$5!SJj?ux|=CDL?UO*qc#R3^7VG9bu-)Khs2hR
z2nB=i`x{HxjzHHtm&NM&Z3%3@^NmyCiR_}m60(B+&PR&CJ;8S0?T6A!vuk&QKnz;n
zreL+`_jbn+y4rAb8+V+E7<+&J`;97$&(?F*mj5Pu&(TBclL2$l=fjaL&K)6?oT%G>
zpKR=bux+YqUFDzMH-};5Yv_|_1ItcDcee4l^Pz*^lUsWl6)h71<!XwDO*SDsSBg~}
zP$+S75yJw9@K5e=0DhZ7iHn@+`1g!ZWm!#(@*QeNtQe2FQ(V#xlc8@i*o~C}n`C0Y
z7v%fQ^D7rC<ZV@d!hiIMR?Wldr@OM|tE69w#ThmD2w*QOPQ1_RTIuGNnn902J{b(_
z#LpkCl(iO{inr33OGeeYOBc?Jt?lKWo}MuVZ}A?v32I~<u?~$SkW9K|JBgw{nalE>
zwmqZ+GJ!h~zeNTE4q6jv=RGOH7isakX;ly&1GlM8*+xq`%<NA|SefV_V>*psIi_Jc
z<92i+a#QdUW%sv0*JSNJhny!TlLs(~cB3uzRQ+bg((+<s&$&okU*{2I>?@p+Ywq7+
zl}9&e^f+Q;9+zG}0ZMbCF`Wto3-5SC{as5YeXY1~W?j9V?x^miCp1D*=PW{x%cad@
zoBw`wK%u60Lyf{hy#j&(*2rK_<U?UmYcGF9Xb93*R2Ym1_jV8P@DSDw`QMqLrys)G
zSHUg7PrvgY-J}Z#iN6l+h)|@qTQKqh02L)=ki3$byo$1ovbwgqy0(gztdgp>k`i=b
z^!xu2_yxFodp!LA1)3e+?iYe<e>YeMc!WkEf{}oThzJF5e^iJYA`qz%5bRmFt$Y3A
O5&&vy0md1-#QzVYU%vAI

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-3.png b/files/opencs/scene-exterior-status-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..68cdb07d249921636ec9b1a3c06c2d17b473fa22
GIT binary patch
literal 3894
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

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-4.png b/files/opencs/scene-exterior-status-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c984989b54e2e176946cd933a7ef17fc5e749624
GIT binary patch
literal 3619
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

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-5.png b/files/opencs/scene-exterior-status-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..dee32f443eef54176b0188ff46b5ea826e8a76c2
GIT binary patch
literal 3901
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
E1Gd6rF8}}l

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-6.png b/files/opencs/scene-exterior-status-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..877b005e4f984def4269babc95e46cf60ba1d127
GIT binary patch
literal 3940
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

literal 0
HcmV?d00001

diff --git a/files/opencs/scene-exterior-status-7.png b/files/opencs/scene-exterior-status-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a8afeff72496b74106637f66a74f2cba0d9473d
GIT binary patch
literal 3932
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

literal 0
HcmV?d00001


From 091e1bf25d7aaad86e7ffc38580960e3f89d6f59 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 23 Apr 2016 13:54:19 +0200
Subject: [PATCH 569/765] improved scene element visibility buttons

---
 .../opencs/view/render/pagedworldspacewidget.cpp |  15 +++++++--------
 .../opencs/view/render/pagedworldspacewidget.hpp |   5 +++--
 apps/opencs/view/world/scenesubview.cpp          |   2 +-
 files/opencs/grid-view-small.png                 | Bin 472 -> 0 bytes
 files/opencs/grid-view.png                       | Bin 210 -> 0 bytes
 files/opencs/resources.qrc                       |  13 +++++++++++--
 6 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 files/opencs/grid-view-small.png
 delete mode 100644 files/opencs/grid-view.png

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 8b20d22ba4..22b0e38054 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -11,7 +11,7 @@
 #include "../../model/world/tablemimedata.hpp"
 #include "../../model/world/idtable.hpp"
 
-#include "../widget/scenetooltoggle.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolmode.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
@@ -581,16 +581,15 @@ void CSVRender::PagedWorldspaceWidget::reset (unsigned int elementMask)
         iter->second->reset (elementMask);
 }
 
-CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
+CSVWidget::SceneToolToggle2 *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
     CSVWidget::SceneToolbar *parent)
 {
-    mControlElements = new CSVWidget::SceneToolToggle (parent,
-        "Controls & Guides Visibility", ":placeholder");
+    mControlElements = new CSVWidget::SceneToolToggle2 (parent,
+        "Controls & Guides Visibility", ":scenetoolbar/scene-view-marker-c", ":scenetoolbar/scene-view-marker-");
 
-    mControlElements->addButton (":placeholder", Mask_CellMarker, ":placeholder",
-        "Cell marker");
-    mControlElements->addButton (":placeholder", Mask_CellArrow, ":placeholder", "Cell arrows");
-    mControlElements->addButton (":scenetoolbar/grid", Mask_CellBorder, ":scenetoolbar/grid-small", "Cell border");
+    mControlElements->addButton (1, Mask_CellMarker, "Cell Marker");
+    mControlElements->addButton (2, Mask_CellArrow, "Cell Arrows");
+    mControlElements->addButton (4, Mask_CellBorder, "Cell Border");
 
     mControlElements->setSelectionMask (0xffffffff);
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index fe533be2dc..4bdaa38200 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -11,6 +11,7 @@
 namespace CSVWidget
 {
    class SceneToolToggle;
+   class SceneToolToggle2;
 }
 
 namespace CSVRender
@@ -26,7 +27,7 @@ namespace CSVRender
             CSMWorld::CellSelection mSelection;
             std::map<CSMWorld::CellCoordinates, Cell *> mCells;
             std::string mWorldspace;
-            CSVWidget::SceneToolToggle *mControlElements;
+            CSVWidget::SceneToolToggle2 *mControlElements;
             bool mDisplayCellCoord;
 
         private:
@@ -90,7 +91,7 @@ namespace CSVRender
 
             /// \attention The created tool is not added to the toolbar (via addTool). Doing
             /// that is the responsibility of the calling function.
-            virtual CSVWidget::SceneToolToggle *makeControlVisibilitySelector (
+            virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector (
                 CSVWidget::SceneToolbar *parent);
 
             virtual unsigned int getVisibilityMask() const;
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 7014b14864..6240293534 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -112,7 +112,7 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
 
     if (type==widget_Paged)
     {
-        CSVWidget::SceneToolToggle *controlVisibilityTool =
+        CSVWidget::SceneToolToggle2 *controlVisibilityTool =
             dynamic_cast<CSVRender::PagedWorldspaceWidget&> (*widget).
             makeControlVisibilitySelector (toolbar);
 
diff --git a/files/opencs/grid-view-small.png b/files/opencs/grid-view-small.png
deleted file mode 100644
index 6a874f21b0601285bdb1834f5362f74f97f8974e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_00DSOL_t(2&z+OOZWJ*PL|@w;uS7tg
zO`-@z`6oUh=ln?ifHOC){8SDrmK8w|DIVLELwjbI95^s1Pj|^(T~)Tt{f*REKQoZV
zIl|IAtuMW#2HQ`6ut{h(>LD;)H7tqmU*2<h`-rMB?;>g2SKQ&-84189VR>Aez_PF;
zke>;oev0!FXf^<PF_=NcoUTECHfUb&#Rw<(WCryR{F)isuK*KR5Cl>85q0xA&?ca|
z21&wq%tFOrg8Z>M?PlcbimFjaOy@_OG-zA$9o2lIC1LTXD#)3{p+z6P&Hat~Qvmsn
z1fK{H-gf$Lr%M!cTXEq{cdIUMAF(X@vr+evd|j~!yU!oEy8DS5l!rvRXoQW^-hX{J
z)UM`sG(+9|AGbu!`|7T`>cB5*&%5}S+J&_4SRRtA{Ug8(yjFWjPA`7rbl%n-(?wf-
zj@wSip0K0ZBROICc$%=V5vo2h<bNbgvqANQ(Op%Qp+S9xTdexuSM>s?=jAgCp@r@M
O0000<MNUMnLSTaIjL)qA

diff --git a/files/opencs/grid-view.png b/files/opencs/grid-view.png
deleted file mode 100644
index 3b1bcb3133e90c79fe981a0536e72a7e91683b32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7a$D;Kb?2i11Zh|kH}&M
z25w;xW@MN(M*=8V<muuVl5y|tHAAij1rfG{-UTaH-mETFUVrK7EUSihd`>PcU;ZX%
ze0bRW|ETJ6A+~cOZ2SkV&%DilyRKA!&he_(cW(bTbpqMaFZ9-FR)jD!keQLB%#t9!
tiJK9~zR_y3QOyjbV%80AhCe(3jGNC{Y^xHSFbOEc;OXk;vd$@?2>|IcL5lzY

diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 973f414fb7..e9fb12cbe5 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -80,8 +80,6 @@
         <file alias="free-camera">flying eye.png</file>
         <file alias="orbiting-camera">orbit2.png</file>
         <file alias="play">scene-play.png</file>
-        <file alias="grid">grid-view.png</file>
-        <file alias="grid-small">grid-view-small.png</file>
         <file alias="scene-view-1">scene-view-references.png</file>
         <file alias="scene-view-16">scene-view-terrain.png</file>
         <file alias="scene-view-4">scene-view-water.png</file>
@@ -119,5 +117,16 @@
         <file alias="scene-view-c29">scene-view-status-29.png</file>
         <file alias="scene-view-c30">scene-view-status-30.png</file>
         <file alias="scene-view-c31">scene-view-status-31.png</file>
+        <file alias="scene-view-marker-2">scene-exterior-arrows.png</file>
+        <file alias="scene-view-marker-4">scene-exterior-borders.png</file>
+        <file alias="scene-view-marker-1">scene-exterior-marker.png</file>
+        <file alias="scene-view-marker-c0">scene-exterior-status-0.png</file>
+        <file alias="scene-view-marker-c1">scene-exterior-status-1.png</file>
+        <file alias="scene-view-marker-c2">scene-exterior-status-2.png</file>
+        <file alias="scene-view-marker-c3">scene-exterior-status-3.png</file>
+        <file alias="scene-view-marker-c4">scene-exterior-status-4.png</file>
+        <file alias="scene-view-marker-c5">scene-exterior-status-5.png</file>
+        <file alias="scene-view-marker-c6">scene-exterior-status-6.png</file>
+        <file alias="scene-view-marker-c7">scene-exterior-status-7.png</file>
     </qresource>
 </RCC>

From 5edfe8c41ca24c315f78d0ddf8fc0422c21ddf87 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 23 Apr 2016 22:46:24 +0200
Subject: [PATCH 570/765] Reduce the wander fast forward overcrowding offset
 (Fixes #3370)

---
 apps/openmw/mwmechanics/aiwander.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 2bdbfe8944..99a2782321 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -808,7 +808,7 @@ namespace MWMechanics
 
     int AiWander::OffsetToPreventOvercrowding()
     {
-        return static_cast<int>(DESTINATION_TOLERANCE * (Misc::Rng::rollProbability() * 2.0f - 1.0f));
+        return static_cast<int>(20 * (Misc::Rng::rollProbability() * 2.0f - 1.0f));
     }
 
     void AiWander::getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage)

From 32123aec2b389eb91036ab9c509cf452d33cb640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
Date: Mon, 25 Apr 2016 20:01:06 +0200
Subject: [PATCH 571/765] made logarithm function for calculating column widths
 in the output be more generic

---
 apps/esmtool/esmtool.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index be90afec38..c6d6ad6e3d 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -442,12 +442,8 @@ int clone(Arguments& info)
     size_t recordCount = info.data.mRecords.size();
 
     int digitCount = 1; // For a nicer output
-    if (recordCount > 9) ++digitCount;
-    if (recordCount > 99) ++digitCount;
-    if (recordCount > 999) ++digitCount;
-    if (recordCount > 9999) ++digitCount;
-    if (recordCount > 99999) ++digitCount;
-    if (recordCount > 999999) ++digitCount;
+    if (recordCount > 0)
+        digitCount = (int)log10(recordCount) + 1;
 
     std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
 

From 57101c1b19e1f6c101362b7827b3c72e094f1633 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Apr 2016 15:42:11 +0200
Subject: [PATCH 572/765] added namespace and include to previous commit

---
 apps/esmtool/esmtool.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index c6d6ad6e3d..3e5c6aa5db 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -5,6 +5,7 @@
 #include <map>
 #include <set>
 #include <fstream>
+#include <cmath>
 
 #include <boost/program_options.hpp>
 
@@ -354,7 +355,7 @@ int load(Arguments& info)
             esm.getRecHeader(flags);
 
             EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
-            if (record == 0) 
+            if (record == 0)
             {
                 if (std::find(skipped.begin(), skipped.end(), n.val) == skipped.end())
                 {
@@ -391,16 +392,16 @@ int load(Arguments& info)
                 record->print();
             }
 
-            if (record->getType().val == ESM::REC_CELL && loadCells && interested) 
+            if (record->getType().val == ESM::REC_CELL && loadCells && interested)
             {
                 loadCell(record->cast<ESM::Cell>()->get(), esm, info);
             }
 
-            if (save) 
+            if (save)
             {
                 info.data.mRecords.push_back(record);
-            } 
-            else 
+            }
+            else
             {
                 delete record;
             }
@@ -443,7 +444,7 @@ int clone(Arguments& info)
 
     int digitCount = 1; // For a nicer output
     if (recordCount > 0)
-        digitCount = (int)log10(recordCount) + 1;
+        digitCount = (int)std::log10(recordCount) + 1;
 
     std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
 

From 10ac432a8ca36a42f7b661960298b8e57bc9fce9 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Apr 2016 15:43:07 +0200
Subject: [PATCH 573/765] updated credits file

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index b0bb4808ed..3b89bf97b6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -18,6 +18,7 @@ Programmers
     Aleksandar Jovanov
     Alex Haddad (rainChu)
     Alex McKibben (WeirdSexy)
+    alexanderkjall
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
     Austin Salgat (Salgat)

From c7cc170cbfbf8ec36ac2b859d1d86454f9c8ac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
Date: Tue, 26 Apr 2016 19:40:16 +0200
Subject: [PATCH 574/765] Added all generated artifacts from the build process
 to the .gitignore file

---
 .gitignore | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.gitignore b/.gitignore
index 51b8c1f0f4..b68d13cdef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ Doxygen
 .project
 .settings
 .directory
+.idea
 ## qt-creator
 CMakeLists.txt.user*
 
@@ -39,10 +40,33 @@ resources
 /openmw
 /opencs
 /niftest
+bsatool
+openmw-cs
+openmw-essimporter
+openmw-iniimporter
+openmw-launcher
+openmw-wizard
 
 ## generated objects
 apps/openmw/config.hpp
+apps/launcher/ui_contentselector.h
+apps/launcher/ui_settingspage.h
+apps/opencs/ui_contentselector.h
+apps/opencs/ui_filedialog.h
+apps/wizard/qrc_wizard.cxx
+apps/wizard/ui_componentselectionpage.h
+apps/wizard/ui_conclusionpage.h
+apps/wizard/ui_existinginstallationpage.h
+apps/wizard/ui_importpage.h
+apps/wizard/ui_installationpage.h
+apps/wizard/ui_installationtargetpage.h
+apps/wizard/ui_intropage.h
+apps/wizard/ui_languageselectionpage.h
+apps/wizard/ui_methodselectionpage.h
+components/ui_contentselector.h
 docs/mainpage.hpp
+docs/Doxyfile
+docs/DoxyfilePages
 moc_*.cxx
 *.cxx_parameters
 *qrc_launcher.cxx
@@ -54,3 +78,6 @@ moc_*.cxx
 *ui_playpage.h
 *.[ao]
 *.so
+gamecontrollerdb.txt
+openmw.appdata.xml
+

From 93b2f092248404220042e0faa344b55a899dec9f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 29 Apr 2016 17:50:33 +0200
Subject: [PATCH 575/765] Workaround for some AI functions being incorrectly
 handled as AI packages (Bug #3378)

---
 apps/openmw/mwmechanics/aipackage.hpp  |  1 +
 apps/openmw/mwmechanics/aisequence.cpp | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index f938a34a15..aa689f189d 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -41,6 +41,7 @@ namespace MWMechanics
                 TypeIdActivate = 4,
 
                 // These 3 are not really handled as Ai Packages in the MW engine
+                // For compatibility do *not* return these in the getCurrentAiPackage script function..
                 TypeIdCombat = 5,
                 TypeIdPursue = 6,
                 TypeIdAvoidDoor = 7
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index f9016c607c..c71dd5db9d 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -166,10 +166,15 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
         }
 
         MWMechanics::AiPackage* package = mPackages.front();
-        mLastAiPackage = package->getTypeId();
+        int packageTypeId = package->getTypeId();
+        // workaround ai packages not being handled as in the vanilla engine
+        if (packageTypeId != AiPackage::TypeIdCombat
+                       && packageTypeId != AiPackage::TypeIdPursue
+                       && packageTypeId != AiPackage::TypeIdAvoidDoor)
+            mLastAiPackage = packageTypeId;
 
         // if active package is combat one, choose nearest target
-        if (mLastAiPackage == AiPackage::TypeIdCombat)
+        if (packageTypeId == AiPackage::TypeIdCombat)
         {
             std::list<AiPackage *>::iterator itActualCombat;
 
@@ -216,7 +221,6 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                 }
 
                 package = mPackages.front();
-                mLastAiPackage = package->getTypeId();
             }
             else
             {

From 2ca741570891b57261527b91aab966423edc4bbc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 1 May 2016 00:10:50 +0200
Subject: [PATCH 576/765] Handle DialInfo::mFactionLess (Bug #3380)

---
 apps/openmw/mwdialogue/filter.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 99e6894113..042f41f140 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -62,7 +62,15 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
     }
 
     // NPC faction
-    if (!info.mFaction.empty())
+    if (info.mFactionLess)
+    {
+        if (isCreature)
+            return true;
+
+        if (!mActor.getClass().getPrimaryFaction(mActor).empty())
+            return false;
+    }
+    else if (!info.mFaction.empty())
     {
         if (isCreature)
             return true;

From 4dee9604bbac2bb79019a9ae0013d4415444bb75 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 06:29:56 -0400
Subject: [PATCH 577/765] Pathgrid rendering v2

---
 apps/opencs/CMakeLists.txt                    |   2 +-
 apps/opencs/view/render/cell.cpp              |  46 ++
 apps/opencs/view/render/cell.hpp              |  14 +
 .../view/render/pagedworldspacewidget.cpp     |  91 ++++
 .../view/render/pagedworldspacewidget.hpp     |   6 +
 apps/opencs/view/render/pathgrid.cpp          | 474 ++++++++++++++++++
 apps/opencs/view/render/pathgrid.hpp          |  74 +++
 .../view/render/unpagedworldspacewidget.cpp   |  77 ++-
 .../view/render/unpagedworldspacewidget.hpp   |   7 +
 apps/opencs/view/render/worldspacewidget.cpp  |   9 +
 apps/opencs/view/render/worldspacewidget.hpp  |   6 +
 11 files changed, 804 insertions(+), 2 deletions(-)
 create mode 100644 apps/opencs/view/render/pathgrid.cpp
 create mode 100644 apps/opencs/view/render/pathgrid.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 816b8d732d..1c04a12637 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -91,7 +91,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
-    cellarrow cellmarker cellborder cameracontroller
+    cellarrow cellmarker cellborder cameracontroller pathgrid
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 9a352ffad6..35f08f836b 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -14,6 +14,7 @@
 
 #include "mask.hpp"
 #include "terrainstorage.hpp"
+#include "pathgrid.hpp"
 
 bool CSVRender::Cell::removeObject (const std::string& id)
 {
@@ -104,6 +105,11 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
                 mCellBorder->buildShape(esmLand);
             }
         }
+
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+            mPathgrid.reset(new Pathgrid(mCellNode, pathgrids.getRecord(pathgridIndex).get(), mCoordinates));
     }
 }
 
@@ -254,6 +260,46 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     return addObjects (start, end);
 }
 
+void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
+{
+    mPathgrid.reset(new Pathgrid(mCellNode, pathgrid, mCoordinates));
+}
+
+void CSVRender::Cell::pathgridRemoved()
+{
+    mPathgrid.reset();
+}
+
+bool CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    if (mPathgrid.get() != 0)
+    {
+        return mPathgrid->dataChanged(topLeft, bottomRight);
+    }
+
+    return false;
+}
+
+bool CSVRender::Cell::pathgridRowAboutToBeRemoved(const QModelIndex& parent, int start, int end)
+{
+    if (mPathgrid.get() != 0)
+    {
+        return mPathgrid->rowAboutToBeRemoved(parent, start, end);
+    }
+
+    return false;
+}
+
+bool CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
+{
+    if (mPathgrid.get() != 0)
+    {
+        return mPathgrid->rowAdded(parent, start, end);
+    }
+
+    return false;
+}
+
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
 {
     if (elementMask & Mask_Reference)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 631df24aa5..5f6d33e4a9 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -29,12 +29,15 @@ namespace CSMWorld
 {
     class Data;
     class CellCoordinates;
+    class Pathgrid;
 }
 
 namespace CSVRender
 {
     class TagBase;
 
+    class Pathgrid;
+
     class Cell
     {
             CSMWorld::Data& mData;
@@ -46,6 +49,7 @@ namespace CSVRender
             std::auto_ptr<CellArrow> mCellArrows[4];
             std::auto_ptr<CellMarker> mCellMarker;
             std::auto_ptr<CellBorder> mCellBorder;
+            std::auto_ptr<Pathgrid> mPathgrid;
             bool mDeleted;
             int mSubMode;
             unsigned int mSubModeElementMask;
@@ -103,6 +107,16 @@ namespace CSVRender
             /// this cell?
             bool referenceAdded (const QModelIndex& parent, int start, int end);
 
+            void pathgridAdded(const CSMWorld::Pathgrid& pathgrid);
+
+            void pathgridRemoved();
+
+            bool pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            bool pathgridRowAboutToBeRemoved(const QModelIndex& parent, int start, int end);
+
+            bool pathgridRowAdded(const QModelIndex& parent, int start, int end);
+
             void setSelection (int elementMask, Selection mode);
 
             // Select everything that references the same ID as at least one of the elements
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 22b0e38054..08c6e4f685 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -275,6 +275,97 @@ void CSVRender::PagedWorldspaceWidget::referenceAdded (const QModelIndex& parent
             flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (topLeft.parent().isValid())
+    {
+        int row = topLeft.parent().row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end() && searchResult->second->pathgridDataChanged(topLeft, bottomRight))
+            flagAsModified();
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridRemoved();
+                flagAsModified();
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridRowAboutToBeRemoved(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridAdded(pathgrid);
+                flagAsModified();
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridRowAdded(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
 std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 {
     osg::Vec3d eye, center, up;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 4bdaa38200..1a6db7cbd4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -52,6 +52,12 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
             virtual std::string getStartupInstruction();
 
             /// \note Does not update the view or any cell marker
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
new file mode 100644
index 0000000000..80f02c4e19
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -0,0 +1,474 @@
+#include "pathgrid.hpp"
+
+#include <set>
+
+#include <osg/Array>
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+
+#include <components/esm/loadland.hpp>
+
+#include "../../model/world/cellcoordinates.hpp"
+#include "../../model/world/idcollection.hpp"
+#include "../../model/world/pathgrid.hpp"
+
+#include "mask.hpp"
+
+namespace CSVRender
+{
+    const float Pathgrid::PointShapeSize = 50.f;
+
+    Pathgrid::Pathgrid(osg::Group* parent, const CSMWorld::Pathgrid& pathgrid, const CSMWorld::CellCoordinates& coords)
+        : mPathgridData(pathgrid)
+        , mParentNode(parent)
+        , mBaseNode(new osg::PositionAttitudeTransform())
+        , mPointGeometry(new osg::Geometry())
+        , mEdgeNode(new osg::Geode())
+    {
+        const int CoordScalar = ESM::Land::REAL_SIZE;
+
+        mParentNode->addChild(mBaseNode);
+        mBaseNode->setPosition(osg::Vec3(coords.getX() * CoordScalar, coords.getY() * CoordScalar, 0));
+        mBaseNode->setNodeMask(Mask_Pathgrid);
+        mBaseNode->addChild(mEdgeNode);
+
+        constructPointShape();
+        buildGrid();
+    }
+
+    Pathgrid::~Pathgrid()
+    {
+        destroyGrid();
+        mBaseNode->removeChild(mEdgeNode);
+        mParentNode->removeChild(mBaseNode);
+    }
+
+    bool Pathgrid::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+    {
+        const int PointColumn = 3;
+        const int EdgeColumn = 4;
+
+        if (topLeft.parent().isValid())
+        {
+            int start = topLeft.row();
+            int end = bottomRight.row();
+
+            if (topLeft.parent().column() == PointColumn)
+            {
+                std::set<unsigned short> changedEdges;
+
+                for (int row = start; row <= end; ++row)
+                {
+                    // Recreate point
+                    destroyEdges(row);
+                    destroyPoint(row);
+
+                    buildPoint(row);
+                    changedEdges.insert(row);
+
+                    // Correct affected edges
+                    for (unsigned short i = 0; i < mPointData.size(); ++i)
+                    {
+                        PointData& data = mPointData[i];
+                        for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
+                            edge != data.edgeList.end(); ++edge)
+                        {
+                            if (*edge == row)
+                                changedEdges.insert(i);
+                        }
+                    }
+                }
+
+                // Reconstruct edges
+                for (std::set<unsigned short>::iterator index = changedEdges.begin();
+                    index != changedEdges.end(); ++index)
+                {
+                    destroyEdges(*index);
+                    buildEdges(*index);
+                }
+
+                return true;
+            }
+            else if (topLeft.parent().column() == EdgeColumn)
+            {
+                const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
+                const size_t NumEdges = mPathgridData.mEdges.size();
+
+                std::set<unsigned short> changedEdges;
+
+                // Clear edge lists
+                for (int row = start; row <= end; ++row)
+                {
+                    mPointData[row].edgeList.clear();
+                }
+
+                // Recreate edge lists
+                for (size_t i = 0; i < NumEdges; ++i)
+                {
+                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
+                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
+                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
+
+                    if ((v0 >= start && v0 <= end) && (v0 != v1 && v0 < NumPoints && v1 < NumPoints))
+                        mPointData[v0].edgeList.push_back(v1);
+                }
+
+                // Reconstruct edges
+                for (int row = start; row <= end; ++row)
+                {
+                    destroyEdges(row);
+                    buildEdges(row);
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    bool Pathgrid::rowAboutToBeRemoved(const QModelIndex& parent, int start, int end)
+    {
+        const int PointColumn = 3;
+        const int EdgeColumn = 4;
+
+        if (!parent.parent().isValid())
+        {
+            if (parent.column() == PointColumn)
+            {
+                // Dangling edges will be removed and edges past start decremented
+                for (size_t i = 0; i < mPointData.size(); ++i)
+                {
+                    PointData& data = mPointData[i];
+
+                    // They are getting removed anyway
+                    if (i >= (size_t) start && i <= (size_t) end)
+                        continue;
+
+                    bool modified = false;
+
+                    for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
+                        edge != data.edgeList.end();)
+                    {
+                        if (*edge >= start && *edge <= end)
+                        {
+                            edge = data.edgeList.erase(edge);
+                            modified = true;
+                        }
+                        else
+                        {
+                            ++edge;
+                        }
+                    }
+
+                    // Need to do this before modifying the rest
+                    if (modified)
+                    {
+                        destroyEdges(i);
+                        buildEdges(i);
+                    }
+
+                    for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
+                        edge != data.edgeList.end(); ++edge)
+                    {
+                        if (*edge > end)
+                            --(*edge);
+                    }
+                }
+
+                // Remove points
+                for (int i = start; i <= end; ++i)
+                {
+                    destroyEdges(static_cast<unsigned short>(start));
+                    destroyPoint(static_cast<unsigned short>(start));
+                    mPointData.erase(mPointData.begin() + start);
+                }
+
+                return true;
+            }
+            else if (parent.column() == EdgeColumn)
+            {
+                std::set<unsigned short> changedEdges;
+
+                // Remove affected edges
+                for (int i = start; i <= end; ++i)
+                {
+                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
+                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
+                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
+
+                    // Only remove one
+                    for (std::vector<unsigned short>::iterator it = mPointData[v0].edgeList.begin();
+                        it != mPointData[v1].edgeList.end(); ++it)
+                    {
+                        if (*it == v1)
+                        {
+                            mPointData[v0].edgeList.erase(it);
+                            changedEdges.insert(v0);
+                            break;
+                        }
+                    }
+                }
+
+                // Reconstruct edges
+                for (std::set<unsigned short>::iterator index = changedEdges.begin();
+                    index != changedEdges.end(); ++index)
+                {
+                    destroyEdges(*index);
+                    buildEdges(*index);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    bool Pathgrid::rowAdded(const QModelIndex& parent, int start, int end)
+    {
+        const int PointColumn = 3;
+        const int EdgeColumn = 4;
+
+        if (!parent.parent().isValid())
+        {
+            if (parent.column() == PointColumn)
+            {
+                // Edges at and beyond start point have been incremented
+                for (std::vector<PointData>::iterator point = mPointData.begin(); point != mPointData.end(); ++point)
+                {
+                    for (std::vector<unsigned short>::iterator edge = point->edgeList.begin();
+                        edge != point->edgeList.end(); ++edge)
+                    {
+                        if (*edge >= start)
+                            *edge += end - start + 1;
+                    }
+                }
+
+                // Add points
+                mPointData.insert(mPointData.begin() + start, end - start + 1, PointData());
+                for (int row = start; row <= end; ++row)
+                    buildPoint(static_cast<unsigned short>(row));
+
+                return true;
+            }
+            else if (parent.column() == EdgeColumn)
+            {
+                const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
+
+                std::set<unsigned short> changedEdges;
+
+                // Add edges
+                for (int row = start; row <= end; ++row)
+                {
+                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[row];
+                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
+                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
+
+                    if (v0 != v1 && v0 < NumPoints && v1 < NumPoints)
+                    {
+                        mPointData[v0].edgeList.push_back(v1);
+                        changedEdges.insert(v0);
+                    }
+                }
+
+                // Reconstruct edges
+                for (std::set<unsigned short>::iterator index = changedEdges.begin();
+                    index != changedEdges.end(); ++index)
+                {
+                    destroyEdges(*index);
+                    buildEdges(*index);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    void Pathgrid::constructPointShape()
+    {
+        // Construct a diamond
+        const unsigned short VertexCount = 24;
+
+        const osg::Vec3f ShapePoints[6] =
+        {
+            osg::Vec3f( 0.f, 0.f, PointShapeSize),
+            osg::Vec3f(-PointShapeSize/2, -PointShapeSize/2,  0.f),
+            osg::Vec3f(-PointShapeSize/2,  PointShapeSize/2,  0.f),
+            osg::Vec3f( PointShapeSize/2, -PointShapeSize/2,  0.f),
+            osg::Vec3f( PointShapeSize/2,  PointShapeSize/2,  0.f),
+            osg::Vec3f( 0.f, 0.f, -PointShapeSize)
+        };
+
+        const unsigned short ShapeIndices[VertexCount] =
+        {
+            0, 2, 1,
+            0, 1, 3,
+            0, 3, 4,
+            0, 4, 2,
+            5, 1, 2,
+            5, 3, 1,
+            5, 4, 3,
+            5, 2, 4
+        };
+
+        osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array();
+        osg::ref_ptr<osg::Vec3Array> normalArray = new osg::Vec3Array();
+        osg::ref_ptr<osg::Vec4Array> colorArray = new osg::Vec4Array();
+        osg::ref_ptr<osg::DrawElementsUShort> indexArray = new osg::DrawElementsUShort(
+            osg::PrimitiveSet::TRIANGLES, 24);
+
+        for (unsigned short i = 0; i < VertexCount; ++i)
+        {
+            vertexArray->push_back(ShapePoints[ShapeIndices[i]]);
+            indexArray->setElement(i, i);
+        }
+
+        for (unsigned short i = 0; i < VertexCount; i += 3)
+        {
+            osg::Vec3f v1 = vertexArray->at(i+1) - vertexArray->at(i);
+            osg::Vec3f v2 = vertexArray->at(i+2) - vertexArray->at(i);
+            osg::Vec3f normal = v1 ^ v2;
+
+            normalArray->push_back(normal);
+            normalArray->push_back(normal);
+            normalArray->push_back(normal);
+        }
+
+        colorArray->push_back(osg::Vec4f(1.f, 0.f, 0.f, 1.f));
+
+        mPointGeometry->setVertexArray(vertexArray);
+        mPointGeometry->setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
+        mPointGeometry->setColorArray(colorArray, osg::Array::BIND_OVERALL);
+        mPointGeometry->addPrimitiveSet(indexArray);
+    }
+
+    void Pathgrid::buildGrid()
+    {
+        // Note: the number of pathgrid points is limited to the capacity of a signed short
+        const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
+        const size_t NumEdges = mPathgridData.mEdges.size();
+
+        // Make points
+        mPointData.resize(NumPoints);
+        for (unsigned short i = 0; i < NumPoints; ++i)
+            buildPoint(i);
+
+        // Add edges to list
+        for (size_t i = 0; i < NumEdges; ++i)
+        {
+            const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
+            unsigned short v0 = static_cast<unsigned short>(edge.mV0);
+            unsigned short v1 = static_cast<unsigned short>(edge.mV1);
+
+            if (v0 != v1 && v0 < NumPoints && v1 < NumPoints)
+                mPointData[v0].edgeList.push_back(v1);
+        }
+
+        // Make edges
+        for (unsigned short i = 0; i < NumPoints; ++i)
+            buildEdges(i);
+    }
+
+    void Pathgrid::destroyGrid()
+    {
+        const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
+
+        for (unsigned short i = 0; i < NumPoints; ++i)
+        {
+            destroyEdges(i);
+            destroyPoint(i);
+        }
+
+        mPointData.clear();
+    }
+
+    void Pathgrid::buildPoint(unsigned short index)
+    {
+        const CSMWorld::Pathgrid::Point& source = mPathgridData.mPoints[index];
+        PointData& data = mPointData[index];
+
+        data.posNode = new osg::PositionAttitudeTransform();
+        data.posNode->setPosition(osg::Vec3f(source.mX, source.mY, source.mZ));
+        mBaseNode->addChild(data.posNode);
+
+        osg::ref_ptr<osg::Geode> pointNode = new osg::Geode();
+        pointNode->addDrawable(mPointGeometry);
+        data.posNode->addChild(pointNode);
+
+        data.edgeGeometry = new osg::Geometry();
+        mEdgeNode->addDrawable(data.edgeGeometry);
+    }
+
+    void Pathgrid::destroyPoint(unsigned short index)
+    {
+        PointData& data = mPointData[index];
+
+        mBaseNode->removeChild(data.posNode);
+        data.posNode = 0;
+
+        mEdgeNode->removeDrawable(data.edgeGeometry);
+        data.edgeGeometry = 0;
+    }
+
+    void Pathgrid::buildEdges(unsigned short index)
+    {
+        // Note: the number of edges per point is limited to the capacity of an unsigned char
+        const unsigned short VertexCount = static_cast<unsigned short>(mPointData[index].edgeList.size() * 2);
+        const osg::Quat DefaultRotation = osg::Quat(osg::PI / 2.f, osg::Vec3f(0.f, 0.f, 1.f));
+        const osg::Vec3f DefaultDirection = osg::Vec3f(0.f, 1.f, 0.f);
+        const osg::Vec3f Offset = osg::Vec3f(0.f, 0.f, 10.f);
+        const osg::Vec4f StartColor = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
+        const osg::Vec4f EndColor = osg::Vec4f(1.f, 0.5f, 0.f, 1.f);
+
+        if (VertexCount == 0)
+            return;
+
+        // Construct geometry
+        osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array();
+        osg::ref_ptr<osg::Vec4Array> colorArray = new osg::Vec4Array();
+        osg::ref_ptr<osg::DrawElementsUShort> indexArray = new osg::DrawElementsUShort(
+            osg::PrimitiveSet::LINES, VertexCount);
+
+        for (unsigned short i = 0; i < VertexCount; i += 2)
+        {
+            const std::vector<unsigned short>& edges = mPointData[index].edgeList;
+
+            const CSMWorld::Pathgrid::Point& originPoint = mPathgridData.mPoints[index];
+            const CSMWorld::Pathgrid::Point& destPoint = mPathgridData.mPoints[edges[i / 2]];
+
+            osg::Vec3f origin = osg::Vec3f(originPoint.mX, originPoint.mY, originPoint.mZ);
+            osg::Vec3f destination = osg::Vec3f(destPoint.mX, destPoint.mY, destPoint.mZ);
+            osg::Vec3f direction = destination - origin;
+
+            direction.z() = 0;
+            direction.normalize();
+
+            // In case the x,y coordinates are too similar
+            if (direction.isNaN())
+                direction = DefaultDirection;
+
+            vertexArray->push_back(origin + Offset + DefaultRotation.inverse() * direction * 0.33f * PointShapeSize);
+            vertexArray->push_back(destination+ Offset - DefaultRotation * direction * 0.33f * PointShapeSize);
+            colorArray->push_back(StartColor);
+            colorArray->push_back(EndColor);
+            indexArray->setElement(i, i);
+            indexArray->setElement(i + 1, i + 1);
+        }
+
+        osg::ref_ptr<osg::Geometry> edgeGeometry = mPointData[index].edgeGeometry;
+        edgeGeometry->setVertexArray(vertexArray);
+        edgeGeometry->setColorArray(colorArray, osg::Array::BIND_PER_VERTEX);
+        edgeGeometry->addPrimitiveSet(indexArray);
+        edgeGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    }
+
+    void Pathgrid::destroyEdges(unsigned short index)
+    {
+        PointData& data = mPointData[index];
+
+        data.edgeGeometry->setVertexArray(0);
+        data.edgeGeometry->setColorArray(0);
+        data.edgeGeometry->getPrimitiveSetList().clear();
+    }
+}
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
new file mode 100644
index 0000000000..589614a8f5
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -0,0 +1,74 @@
+#ifndef OPENCS_VIEW_PATHGRID_H
+#define OPENCS_VIEW_PATHGRID_H
+
+#include <vector>
+
+#include <osg/ref_ptr>
+#include <QModelIndex>
+
+namespace osg
+{
+    class Geode;
+    class Geometry;
+    class Group;
+    class PositionAttitudeTransform;
+}
+
+namespace CSMWorld
+{
+    struct Pathgrid;
+    class CellCoordinates;
+}
+
+namespace CSVRender
+{
+    class Pathgrid
+    {
+        public:
+
+            Pathgrid(osg::Group* parent, const CSMWorld::Pathgrid& pathgrid, const CSMWorld::CellCoordinates& coords);
+            ~Pathgrid();
+
+            bool dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            bool rowAboutToBeRemoved(const QModelIndex& parent, int start, int end);
+
+            bool rowAdded(const QModelIndex& parent, int start, int end);
+
+        private:
+
+            struct PointData
+            {
+                osg::ref_ptr<osg::PositionAttitudeTransform> posNode;
+                std::vector<unsigned short> edgeList;
+                osg::ref_ptr<osg::Geometry> edgeGeometry;
+            };
+
+            static const float PointShapeSize;
+
+            const CSMWorld::Pathgrid& mPathgridData;
+            std::vector<PointData> mPointData;
+
+            osg::ref_ptr<osg::Group> mParentNode;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+            osg::ref_ptr<osg::Geometry> mPointGeometry;
+            osg::ref_ptr<osg::Geode> mEdgeNode;
+
+            void constructPointShape();
+
+            void buildGrid();
+            void destroyGrid();
+
+            void buildPoint(unsigned short index);
+            void destroyPoint(unsigned short index);
+
+            void buildEdges(unsigned short index);
+            void destroyEdges(unsigned short index);
+
+            // Not implemented
+            Pathgrid(const Pathgrid&);
+            Pathgrid& operator=(const Pathgrid&);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 79ffd4fb0a..c7e875c180 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -32,7 +32,7 @@ void CSVRender::UnpagedWorldspaceWidget::update()
 }
 
 CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
-: WorldspaceWidget (document, parent), mCellId (cellId)
+: WorldspaceWidget (document, parent), mDocument(document), mCellId (cellId)
 {
     mCellsModel = &dynamic_cast<CSMWorld::IdTable&> (
         *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -197,6 +197,81 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (topLeft.parent().isValid())
+    {
+        int row = topLeft.parent().row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId && mCell->pathgridDataChanged(topLeft, bottomRight))
+            flagAsModified();
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridRemoved();
+                flagAsModified();
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridRowAboutToBeRemoved(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridAdded(pathgrid);
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridRowAdded(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
 void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index c5bfd22e65..24b511c4ca 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -25,6 +25,7 @@ namespace CSVRender
     {
             Q_OBJECT
 
+            CSMDoc::Document& mDocument;
             std::string mCellId;
             CSMWorld::IdTable *mCellsModel;
             CSMWorld::IdTable *mReferenceablesModel;
@@ -83,6 +84,12 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
             virtual std::string getStartupInstruction();
 
         protected:
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 927ce545fe..fa5fd0bee0 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -59,6 +59,15 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (references, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
         this, SLOT (referenceAdded (const QModelIndex&, int, int)));
 
+    QAbstractItemModel *pathgrids = document.getData().getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+
+    connect (pathgrids, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
+        this, SLOT (pathgridDataChanged (const QModelIndex&, const QModelIndex&)));
+    connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
+    connect (pathgrids, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAdded (const QModelIndex&, int, int)));
+
     QAbstractItemModel *debugProfiles =
         document.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles);
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index b18123944a..bc528f52d7 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -228,6 +228,12 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end) = 0;
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;
+
             virtual void runRequest (const std::string& profile);
 
             void debugProfileDataChanged (const QModelIndex& topLeft,

From 5580f803fd6ce9e744896522d30dbfc7a35ed345 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Mon, 2 May 2016 07:28:32 -0400
Subject: [PATCH 578/765] Editor: Prevent duplicate pathgrids (Bug #3342)

---
 apps/opencs/model/world/data.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 5c81d3b08b..414329aa24 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1139,7 +1139,8 @@ bool CSMWorld::Data::hasId (const std::string& id) const
         getBodyParts().searchId (id)!=-1 ||
         getSoundGens().searchId (id)!=-1 ||
         getMagicEffects().searchId (id)!=-1 ||
-        getReferenceables().searchId (id)!=-1;
+        getReferenceables().searchId (id)!=-1 ||
+        getPathgrids().searchId (id)!=-1;
 }
 
 int CSMWorld::Data::count (RecordBase::State state) const

From 933504dbd03a9a134adeb160eec43e9d8e97c003 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 15:37:08 -0400
Subject: [PATCH 579/765] Revert "Pathgrid rendering v2"

This reverts commit 4dee9604bbac2bb79019a9ae0013d4415444bb75.
---
 apps/opencs/CMakeLists.txt                    |   2 +-
 apps/opencs/view/render/cell.cpp              |  46 --
 apps/opencs/view/render/cell.hpp              |  14 -
 .../view/render/pagedworldspacewidget.cpp     |  91 ----
 .../view/render/pagedworldspacewidget.hpp     |   6 -
 apps/opencs/view/render/pathgrid.cpp          | 474 ------------------
 apps/opencs/view/render/pathgrid.hpp          |  74 ---
 .../view/render/unpagedworldspacewidget.cpp   |  77 +--
 .../view/render/unpagedworldspacewidget.hpp   |   7 -
 apps/opencs/view/render/worldspacewidget.cpp  |   9 -
 apps/opencs/view/render/worldspacewidget.hpp  |   6 -
 11 files changed, 2 insertions(+), 804 deletions(-)
 delete mode 100644 apps/opencs/view/render/pathgrid.cpp
 delete mode 100644 apps/opencs/view/render/pathgrid.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 1c04a12637..816b8d732d 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -91,7 +91,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
-    cellarrow cellmarker cellborder cameracontroller pathgrid
+    cellarrow cellmarker cellborder cameracontroller
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 35f08f836b..9a352ffad6 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -14,7 +14,6 @@
 
 #include "mask.hpp"
 #include "terrainstorage.hpp"
-#include "pathgrid.hpp"
 
 bool CSVRender::Cell::removeObject (const std::string& id)
 {
@@ -105,11 +104,6 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
                 mCellBorder->buildShape(esmLand);
             }
         }
-
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
-            mPathgrid.reset(new Pathgrid(mCellNode, pathgrids.getRecord(pathgridIndex).get(), mCoordinates));
     }
 }
 
@@ -260,46 +254,6 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     return addObjects (start, end);
 }
 
-void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
-{
-    mPathgrid.reset(new Pathgrid(mCellNode, pathgrid, mCoordinates));
-}
-
-void CSVRender::Cell::pathgridRemoved()
-{
-    mPathgrid.reset();
-}
-
-bool CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    if (mPathgrid.get() != 0)
-    {
-        return mPathgrid->dataChanged(topLeft, bottomRight);
-    }
-
-    return false;
-}
-
-bool CSVRender::Cell::pathgridRowAboutToBeRemoved(const QModelIndex& parent, int start, int end)
-{
-    if (mPathgrid.get() != 0)
-    {
-        return mPathgrid->rowAboutToBeRemoved(parent, start, end);
-    }
-
-    return false;
-}
-
-bool CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
-{
-    if (mPathgrid.get() != 0)
-    {
-        return mPathgrid->rowAdded(parent, start, end);
-    }
-
-    return false;
-}
-
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
 {
     if (elementMask & Mask_Reference)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 5f6d33e4a9..631df24aa5 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -29,15 +29,12 @@ namespace CSMWorld
 {
     class Data;
     class CellCoordinates;
-    class Pathgrid;
 }
 
 namespace CSVRender
 {
     class TagBase;
 
-    class Pathgrid;
-
     class Cell
     {
             CSMWorld::Data& mData;
@@ -49,7 +46,6 @@ namespace CSVRender
             std::auto_ptr<CellArrow> mCellArrows[4];
             std::auto_ptr<CellMarker> mCellMarker;
             std::auto_ptr<CellBorder> mCellBorder;
-            std::auto_ptr<Pathgrid> mPathgrid;
             bool mDeleted;
             int mSubMode;
             unsigned int mSubModeElementMask;
@@ -107,16 +103,6 @@ namespace CSVRender
             /// this cell?
             bool referenceAdded (const QModelIndex& parent, int start, int end);
 
-            void pathgridAdded(const CSMWorld::Pathgrid& pathgrid);
-
-            void pathgridRemoved();
-
-            bool pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-            bool pathgridRowAboutToBeRemoved(const QModelIndex& parent, int start, int end);
-
-            bool pathgridRowAdded(const QModelIndex& parent, int start, int end);
-
             void setSelection (int elementMask, Selection mode);
 
             // Select everything that references the same ID as at least one of the elements
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 08c6e4f685..22b0e38054 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -275,97 +275,6 @@ void CSVRender::PagedWorldspaceWidget::referenceAdded (const QModelIndex& parent
             flagAsModified();
 }
 
-void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (topLeft.parent().isValid())
-    {
-        int row = topLeft.parent().row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-        if (searchResult != mCells.end() && searchResult->second->pathgridDataChanged(topLeft, bottomRight))
-            flagAsModified();
-    }
-}
-
-void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (!parent.isValid())
-    {
-        // Pathgrid going to be deleted
-        for (int row = start; row <= end; ++row)
-        {
-            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-            if (searchResult != mCells.end())
-            {
-                searchResult->second->pathgridRemoved();
-                flagAsModified();
-            }
-        }
-    }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-        if (searchResult != mCells.end())
-        {
-            searchResult->second->pathgridRowAboutToBeRemoved(parent, start, end);
-            flagAsModified();
-        }
-    }
-}
-
-void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (!parent.isValid())
-    {
-        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
-        for (int row = start; row <= end; ++row)
-        {
-            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-            if (searchResult != mCells.end())
-            {
-                searchResult->second->pathgridAdded(pathgrid);
-                flagAsModified();
-            }
-        }
-    }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-        if (searchResult != mCells.end())
-        {
-            searchResult->second->pathgridRowAdded(parent, start, end);
-            flagAsModified();
-        }
-    }
-}
-
 std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 {
     osg::Vec3d eye, center, up;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 1a6db7cbd4..4bdaa38200 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -52,12 +52,6 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
-            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
-
-            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
-
             virtual std::string getStartupInstruction();
 
             /// \note Does not update the view or any cell marker
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
deleted file mode 100644
index 80f02c4e19..0000000000
--- a/apps/opencs/view/render/pathgrid.cpp
+++ /dev/null
@@ -1,474 +0,0 @@
-#include "pathgrid.hpp"
-
-#include <set>
-
-#include <osg/Array>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osg/Group>
-#include <osg/PositionAttitudeTransform>
-
-#include <components/esm/loadland.hpp>
-
-#include "../../model/world/cellcoordinates.hpp"
-#include "../../model/world/idcollection.hpp"
-#include "../../model/world/pathgrid.hpp"
-
-#include "mask.hpp"
-
-namespace CSVRender
-{
-    const float Pathgrid::PointShapeSize = 50.f;
-
-    Pathgrid::Pathgrid(osg::Group* parent, const CSMWorld::Pathgrid& pathgrid, const CSMWorld::CellCoordinates& coords)
-        : mPathgridData(pathgrid)
-        , mParentNode(parent)
-        , mBaseNode(new osg::PositionAttitudeTransform())
-        , mPointGeometry(new osg::Geometry())
-        , mEdgeNode(new osg::Geode())
-    {
-        const int CoordScalar = ESM::Land::REAL_SIZE;
-
-        mParentNode->addChild(mBaseNode);
-        mBaseNode->setPosition(osg::Vec3(coords.getX() * CoordScalar, coords.getY() * CoordScalar, 0));
-        mBaseNode->setNodeMask(Mask_Pathgrid);
-        mBaseNode->addChild(mEdgeNode);
-
-        constructPointShape();
-        buildGrid();
-    }
-
-    Pathgrid::~Pathgrid()
-    {
-        destroyGrid();
-        mBaseNode->removeChild(mEdgeNode);
-        mParentNode->removeChild(mBaseNode);
-    }
-
-    bool Pathgrid::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
-    {
-        const int PointColumn = 3;
-        const int EdgeColumn = 4;
-
-        if (topLeft.parent().isValid())
-        {
-            int start = topLeft.row();
-            int end = bottomRight.row();
-
-            if (topLeft.parent().column() == PointColumn)
-            {
-                std::set<unsigned short> changedEdges;
-
-                for (int row = start; row <= end; ++row)
-                {
-                    // Recreate point
-                    destroyEdges(row);
-                    destroyPoint(row);
-
-                    buildPoint(row);
-                    changedEdges.insert(row);
-
-                    // Correct affected edges
-                    for (unsigned short i = 0; i < mPointData.size(); ++i)
-                    {
-                        PointData& data = mPointData[i];
-                        for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
-                            edge != data.edgeList.end(); ++edge)
-                        {
-                            if (*edge == row)
-                                changedEdges.insert(i);
-                        }
-                    }
-                }
-
-                // Reconstruct edges
-                for (std::set<unsigned short>::iterator index = changedEdges.begin();
-                    index != changedEdges.end(); ++index)
-                {
-                    destroyEdges(*index);
-                    buildEdges(*index);
-                }
-
-                return true;
-            }
-            else if (topLeft.parent().column() == EdgeColumn)
-            {
-                const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
-                const size_t NumEdges = mPathgridData.mEdges.size();
-
-                std::set<unsigned short> changedEdges;
-
-                // Clear edge lists
-                for (int row = start; row <= end; ++row)
-                {
-                    mPointData[row].edgeList.clear();
-                }
-
-                // Recreate edge lists
-                for (size_t i = 0; i < NumEdges; ++i)
-                {
-                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
-                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
-                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
-
-                    if ((v0 >= start && v0 <= end) && (v0 != v1 && v0 < NumPoints && v1 < NumPoints))
-                        mPointData[v0].edgeList.push_back(v1);
-                }
-
-                // Reconstruct edges
-                for (int row = start; row <= end; ++row)
-                {
-                    destroyEdges(row);
-                    buildEdges(row);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    bool Pathgrid::rowAboutToBeRemoved(const QModelIndex& parent, int start, int end)
-    {
-        const int PointColumn = 3;
-        const int EdgeColumn = 4;
-
-        if (!parent.parent().isValid())
-        {
-            if (parent.column() == PointColumn)
-            {
-                // Dangling edges will be removed and edges past start decremented
-                for (size_t i = 0; i < mPointData.size(); ++i)
-                {
-                    PointData& data = mPointData[i];
-
-                    // They are getting removed anyway
-                    if (i >= (size_t) start && i <= (size_t) end)
-                        continue;
-
-                    bool modified = false;
-
-                    for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
-                        edge != data.edgeList.end();)
-                    {
-                        if (*edge >= start && *edge <= end)
-                        {
-                            edge = data.edgeList.erase(edge);
-                            modified = true;
-                        }
-                        else
-                        {
-                            ++edge;
-                        }
-                    }
-
-                    // Need to do this before modifying the rest
-                    if (modified)
-                    {
-                        destroyEdges(i);
-                        buildEdges(i);
-                    }
-
-                    for (std::vector<unsigned short>::iterator edge = data.edgeList.begin();
-                        edge != data.edgeList.end(); ++edge)
-                    {
-                        if (*edge > end)
-                            --(*edge);
-                    }
-                }
-
-                // Remove points
-                for (int i = start; i <= end; ++i)
-                {
-                    destroyEdges(static_cast<unsigned short>(start));
-                    destroyPoint(static_cast<unsigned short>(start));
-                    mPointData.erase(mPointData.begin() + start);
-                }
-
-                return true;
-            }
-            else if (parent.column() == EdgeColumn)
-            {
-                std::set<unsigned short> changedEdges;
-
-                // Remove affected edges
-                for (int i = start; i <= end; ++i)
-                {
-                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
-                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
-                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
-
-                    // Only remove one
-                    for (std::vector<unsigned short>::iterator it = mPointData[v0].edgeList.begin();
-                        it != mPointData[v1].edgeList.end(); ++it)
-                    {
-                        if (*it == v1)
-                        {
-                            mPointData[v0].edgeList.erase(it);
-                            changedEdges.insert(v0);
-                            break;
-                        }
-                    }
-                }
-
-                // Reconstruct edges
-                for (std::set<unsigned short>::iterator index = changedEdges.begin();
-                    index != changedEdges.end(); ++index)
-                {
-                    destroyEdges(*index);
-                    buildEdges(*index);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    bool Pathgrid::rowAdded(const QModelIndex& parent, int start, int end)
-    {
-        const int PointColumn = 3;
-        const int EdgeColumn = 4;
-
-        if (!parent.parent().isValid())
-        {
-            if (parent.column() == PointColumn)
-            {
-                // Edges at and beyond start point have been incremented
-                for (std::vector<PointData>::iterator point = mPointData.begin(); point != mPointData.end(); ++point)
-                {
-                    for (std::vector<unsigned short>::iterator edge = point->edgeList.begin();
-                        edge != point->edgeList.end(); ++edge)
-                    {
-                        if (*edge >= start)
-                            *edge += end - start + 1;
-                    }
-                }
-
-                // Add points
-                mPointData.insert(mPointData.begin() + start, end - start + 1, PointData());
-                for (int row = start; row <= end; ++row)
-                    buildPoint(static_cast<unsigned short>(row));
-
-                return true;
-            }
-            else if (parent.column() == EdgeColumn)
-            {
-                const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
-
-                std::set<unsigned short> changedEdges;
-
-                // Add edges
-                for (int row = start; row <= end; ++row)
-                {
-                    const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[row];
-                    unsigned short v0 = static_cast<unsigned short>(edge.mV0);
-                    unsigned short v1 = static_cast<unsigned short>(edge.mV1);
-
-                    if (v0 != v1 && v0 < NumPoints && v1 < NumPoints)
-                    {
-                        mPointData[v0].edgeList.push_back(v1);
-                        changedEdges.insert(v0);
-                    }
-                }
-
-                // Reconstruct edges
-                for (std::set<unsigned short>::iterator index = changedEdges.begin();
-                    index != changedEdges.end(); ++index)
-                {
-                    destroyEdges(*index);
-                    buildEdges(*index);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    void Pathgrid::constructPointShape()
-    {
-        // Construct a diamond
-        const unsigned short VertexCount = 24;
-
-        const osg::Vec3f ShapePoints[6] =
-        {
-            osg::Vec3f( 0.f, 0.f, PointShapeSize),
-            osg::Vec3f(-PointShapeSize/2, -PointShapeSize/2,  0.f),
-            osg::Vec3f(-PointShapeSize/2,  PointShapeSize/2,  0.f),
-            osg::Vec3f( PointShapeSize/2, -PointShapeSize/2,  0.f),
-            osg::Vec3f( PointShapeSize/2,  PointShapeSize/2,  0.f),
-            osg::Vec3f( 0.f, 0.f, -PointShapeSize)
-        };
-
-        const unsigned short ShapeIndices[VertexCount] =
-        {
-            0, 2, 1,
-            0, 1, 3,
-            0, 3, 4,
-            0, 4, 2,
-            5, 1, 2,
-            5, 3, 1,
-            5, 4, 3,
-            5, 2, 4
-        };
-
-        osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array();
-        osg::ref_ptr<osg::Vec3Array> normalArray = new osg::Vec3Array();
-        osg::ref_ptr<osg::Vec4Array> colorArray = new osg::Vec4Array();
-        osg::ref_ptr<osg::DrawElementsUShort> indexArray = new osg::DrawElementsUShort(
-            osg::PrimitiveSet::TRIANGLES, 24);
-
-        for (unsigned short i = 0; i < VertexCount; ++i)
-        {
-            vertexArray->push_back(ShapePoints[ShapeIndices[i]]);
-            indexArray->setElement(i, i);
-        }
-
-        for (unsigned short i = 0; i < VertexCount; i += 3)
-        {
-            osg::Vec3f v1 = vertexArray->at(i+1) - vertexArray->at(i);
-            osg::Vec3f v2 = vertexArray->at(i+2) - vertexArray->at(i);
-            osg::Vec3f normal = v1 ^ v2;
-
-            normalArray->push_back(normal);
-            normalArray->push_back(normal);
-            normalArray->push_back(normal);
-        }
-
-        colorArray->push_back(osg::Vec4f(1.f, 0.f, 0.f, 1.f));
-
-        mPointGeometry->setVertexArray(vertexArray);
-        mPointGeometry->setNormalArray(normalArray, osg::Array::BIND_PER_VERTEX);
-        mPointGeometry->setColorArray(colorArray, osg::Array::BIND_OVERALL);
-        mPointGeometry->addPrimitiveSet(indexArray);
-    }
-
-    void Pathgrid::buildGrid()
-    {
-        // Note: the number of pathgrid points is limited to the capacity of a signed short
-        const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
-        const size_t NumEdges = mPathgridData.mEdges.size();
-
-        // Make points
-        mPointData.resize(NumPoints);
-        for (unsigned short i = 0; i < NumPoints; ++i)
-            buildPoint(i);
-
-        // Add edges to list
-        for (size_t i = 0; i < NumEdges; ++i)
-        {
-            const CSMWorld::Pathgrid::Edge& edge = mPathgridData.mEdges[i];
-            unsigned short v0 = static_cast<unsigned short>(edge.mV0);
-            unsigned short v1 = static_cast<unsigned short>(edge.mV1);
-
-            if (v0 != v1 && v0 < NumPoints && v1 < NumPoints)
-                mPointData[v0].edgeList.push_back(v1);
-        }
-
-        // Make edges
-        for (unsigned short i = 0; i < NumPoints; ++i)
-            buildEdges(i);
-    }
-
-    void Pathgrid::destroyGrid()
-    {
-        const unsigned short NumPoints = static_cast<unsigned short>(mPathgridData.mPoints.size());
-
-        for (unsigned short i = 0; i < NumPoints; ++i)
-        {
-            destroyEdges(i);
-            destroyPoint(i);
-        }
-
-        mPointData.clear();
-    }
-
-    void Pathgrid::buildPoint(unsigned short index)
-    {
-        const CSMWorld::Pathgrid::Point& source = mPathgridData.mPoints[index];
-        PointData& data = mPointData[index];
-
-        data.posNode = new osg::PositionAttitudeTransform();
-        data.posNode->setPosition(osg::Vec3f(source.mX, source.mY, source.mZ));
-        mBaseNode->addChild(data.posNode);
-
-        osg::ref_ptr<osg::Geode> pointNode = new osg::Geode();
-        pointNode->addDrawable(mPointGeometry);
-        data.posNode->addChild(pointNode);
-
-        data.edgeGeometry = new osg::Geometry();
-        mEdgeNode->addDrawable(data.edgeGeometry);
-    }
-
-    void Pathgrid::destroyPoint(unsigned short index)
-    {
-        PointData& data = mPointData[index];
-
-        mBaseNode->removeChild(data.posNode);
-        data.posNode = 0;
-
-        mEdgeNode->removeDrawable(data.edgeGeometry);
-        data.edgeGeometry = 0;
-    }
-
-    void Pathgrid::buildEdges(unsigned short index)
-    {
-        // Note: the number of edges per point is limited to the capacity of an unsigned char
-        const unsigned short VertexCount = static_cast<unsigned short>(mPointData[index].edgeList.size() * 2);
-        const osg::Quat DefaultRotation = osg::Quat(osg::PI / 2.f, osg::Vec3f(0.f, 0.f, 1.f));
-        const osg::Vec3f DefaultDirection = osg::Vec3f(0.f, 1.f, 0.f);
-        const osg::Vec3f Offset = osg::Vec3f(0.f, 0.f, 10.f);
-        const osg::Vec4f StartColor = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
-        const osg::Vec4f EndColor = osg::Vec4f(1.f, 0.5f, 0.f, 1.f);
-
-        if (VertexCount == 0)
-            return;
-
-        // Construct geometry
-        osg::ref_ptr<osg::Vec3Array> vertexArray = new osg::Vec3Array();
-        osg::ref_ptr<osg::Vec4Array> colorArray = new osg::Vec4Array();
-        osg::ref_ptr<osg::DrawElementsUShort> indexArray = new osg::DrawElementsUShort(
-            osg::PrimitiveSet::LINES, VertexCount);
-
-        for (unsigned short i = 0; i < VertexCount; i += 2)
-        {
-            const std::vector<unsigned short>& edges = mPointData[index].edgeList;
-
-            const CSMWorld::Pathgrid::Point& originPoint = mPathgridData.mPoints[index];
-            const CSMWorld::Pathgrid::Point& destPoint = mPathgridData.mPoints[edges[i / 2]];
-
-            osg::Vec3f origin = osg::Vec3f(originPoint.mX, originPoint.mY, originPoint.mZ);
-            osg::Vec3f destination = osg::Vec3f(destPoint.mX, destPoint.mY, destPoint.mZ);
-            osg::Vec3f direction = destination - origin;
-
-            direction.z() = 0;
-            direction.normalize();
-
-            // In case the x,y coordinates are too similar
-            if (direction.isNaN())
-                direction = DefaultDirection;
-
-            vertexArray->push_back(origin + Offset + DefaultRotation.inverse() * direction * 0.33f * PointShapeSize);
-            vertexArray->push_back(destination+ Offset - DefaultRotation * direction * 0.33f * PointShapeSize);
-            colorArray->push_back(StartColor);
-            colorArray->push_back(EndColor);
-            indexArray->setElement(i, i);
-            indexArray->setElement(i + 1, i + 1);
-        }
-
-        osg::ref_ptr<osg::Geometry> edgeGeometry = mPointData[index].edgeGeometry;
-        edgeGeometry->setVertexArray(vertexArray);
-        edgeGeometry->setColorArray(colorArray, osg::Array::BIND_PER_VERTEX);
-        edgeGeometry->addPrimitiveSet(indexArray);
-        edgeGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-    }
-
-    void Pathgrid::destroyEdges(unsigned short index)
-    {
-        PointData& data = mPointData[index];
-
-        data.edgeGeometry->setVertexArray(0);
-        data.edgeGeometry->setColorArray(0);
-        data.edgeGeometry->getPrimitiveSetList().clear();
-    }
-}
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
deleted file mode 100644
index 589614a8f5..0000000000
--- a/apps/opencs/view/render/pathgrid.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef OPENCS_VIEW_PATHGRID_H
-#define OPENCS_VIEW_PATHGRID_H
-
-#include <vector>
-
-#include <osg/ref_ptr>
-#include <QModelIndex>
-
-namespace osg
-{
-    class Geode;
-    class Geometry;
-    class Group;
-    class PositionAttitudeTransform;
-}
-
-namespace CSMWorld
-{
-    struct Pathgrid;
-    class CellCoordinates;
-}
-
-namespace CSVRender
-{
-    class Pathgrid
-    {
-        public:
-
-            Pathgrid(osg::Group* parent, const CSMWorld::Pathgrid& pathgrid, const CSMWorld::CellCoordinates& coords);
-            ~Pathgrid();
-
-            bool dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-            bool rowAboutToBeRemoved(const QModelIndex& parent, int start, int end);
-
-            bool rowAdded(const QModelIndex& parent, int start, int end);
-
-        private:
-
-            struct PointData
-            {
-                osg::ref_ptr<osg::PositionAttitudeTransform> posNode;
-                std::vector<unsigned short> edgeList;
-                osg::ref_ptr<osg::Geometry> edgeGeometry;
-            };
-
-            static const float PointShapeSize;
-
-            const CSMWorld::Pathgrid& mPathgridData;
-            std::vector<PointData> mPointData;
-
-            osg::ref_ptr<osg::Group> mParentNode;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osg::Geometry> mPointGeometry;
-            osg::ref_ptr<osg::Geode> mEdgeNode;
-
-            void constructPointShape();
-
-            void buildGrid();
-            void destroyGrid();
-
-            void buildPoint(unsigned short index);
-            void destroyPoint(unsigned short index);
-
-            void buildEdges(unsigned short index);
-            void destroyEdges(unsigned short index);
-
-            // Not implemented
-            Pathgrid(const Pathgrid&);
-            Pathgrid& operator=(const Pathgrid&);
-    };
-}
-
-#endif
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index c7e875c180..79ffd4fb0a 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -32,7 +32,7 @@ void CSVRender::UnpagedWorldspaceWidget::update()
 }
 
 CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
-: WorldspaceWidget (document, parent), mDocument(document), mCellId (cellId)
+: WorldspaceWidget (document, parent), mCellId (cellId)
 {
     mCellsModel = &dynamic_cast<CSMWorld::IdTable&> (
         *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -197,81 +197,6 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (topLeft.parent().isValid())
-    {
-        int row = topLeft.parent().row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        if (mCellId == pathgrid.mId && mCell->pathgridDataChanged(topLeft, bottomRight))
-            flagAsModified();
-    }
-}
-
-void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (!parent.isValid())
-    {
-        // Pathgrid going to be deleted
-        for (int row = start; row <= end; ++row)
-        {
-            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-            if (mCellId == pathgrid.mId)
-            {
-                mCell->pathgridRemoved();
-                flagAsModified();
-            }
-        }
-    }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        if (mCellId == pathgrid.mId)
-        {
-            mCell->pathgridRowAboutToBeRemoved(parent, start, end);
-            flagAsModified();
-        }
-    }
-}
-
-void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (!parent.isValid())
-    {
-        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
-        for (int row = start; row <= end; ++row)
-        {
-            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-            if (mCellId == pathgrid.mId)
-            {
-                mCell->pathgridAdded(pathgrid);
-            }
-        }
-    }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        if (mCellId == pathgrid.mId)
-        {
-            mCell->pathgridRowAdded(parent, start, end);
-            flagAsModified();
-        }
-    }
-}
-
 void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 24b511c4ca..c5bfd22e65 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -25,7 +25,6 @@ namespace CSVRender
     {
             Q_OBJECT
 
-            CSMDoc::Document& mDocument;
             std::string mCellId;
             CSMWorld::IdTable *mCellsModel;
             CSMWorld::IdTable *mReferenceablesModel;
@@ -84,12 +83,6 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
-            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
-
-            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
-
             virtual std::string getStartupInstruction();
 
         protected:
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index fa5fd0bee0..927ce545fe 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -59,15 +59,6 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (references, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
         this, SLOT (referenceAdded (const QModelIndex&, int, int)));
 
-    QAbstractItemModel *pathgrids = document.getData().getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
-
-    connect (pathgrids, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
-        this, SLOT (pathgridDataChanged (const QModelIndex&, const QModelIndex&)));
-    connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
-        this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
-    connect (pathgrids, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
-        this, SLOT (pathgridAdded (const QModelIndex&, int, int)));
-
     QAbstractItemModel *debugProfiles =
         document.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles);
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index bc528f52d7..b18123944a 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -228,12 +228,6 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end) = 0;
 
-            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
-
-            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
-
-            virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;
-
             virtual void runRequest (const std::string& profile);
 
             void debugProfileDataChanged (const QModelIndex& topLeft,

From 7fbcc47b151c89822e7e36408819a041ba368697 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 22:08:49 -0400
Subject: [PATCH 580/765] Add pathgrid modified signals.

---
 apps/opencs/view/render/cell.cpp              |  20 ++++
 apps/opencs/view/render/cell.hpp              |  11 ++
 .../view/render/pagedworldspacewidget.cpp     | 101 ++++++++++++++++++
 .../view/render/pagedworldspacewidget.hpp     |   8 ++
 .../view/render/unpagedworldspacewidget.cpp   |  86 ++++++++++++++-
 .../view/render/unpagedworldspacewidget.hpp   |  10 ++
 apps/opencs/view/render/worldspacewidget.cpp  |  11 ++
 apps/opencs/view/render/worldspacewidget.hpp  |   9 ++
 8 files changed, 255 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 9a352ffad6..d841bd9924 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -254,6 +254,26 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     return addObjects (start, end);
 }
 
+void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
+{
+}
+
+void CSVRender::Cell::pathgridRemoved()
+{
+}
+
+void CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+}
+
+void CSVRender::Cell::pathgridRowRemoved(const QModelIndex& parent, int start, int end)
+{
+}
+
+void CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
+{
+}
+
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
 {
     if (elementMask & Mask_Reference)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 631df24aa5..4758a95c3a 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -29,6 +29,7 @@ namespace CSMWorld
 {
     class Data;
     class CellCoordinates;
+    class Pathgrid;
 }
 
 namespace CSVRender
@@ -103,6 +104,16 @@ namespace CSVRender
             /// this cell?
             bool referenceAdded (const QModelIndex& parent, int start, int end);
 
+            void pathgridAdded(const CSMWorld::Pathgrid& pathgrid);
+
+            void pathgridRemoved();
+
+            void pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            void pathgridRowRemoved(const QModelIndex& parent, int start, int end);
+
+            void pathgridRowAdded(const QModelIndex& parent, int start, int end);
+
             void setSelection (int elementMask, Selection mode);
 
             // Select everything that references the same ID as at least one of the elements
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 22b0e38054..1d9b22216c 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -275,6 +275,107 @@ void CSVRender::PagedWorldspaceWidget::referenceAdded (const QModelIndex& parent
             flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (topLeft.parent().isValid())
+    {
+        int row = topLeft.parent().row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridDataChanged(topLeft, bottomRight);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (parent.isValid())
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridRowRemoved(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridRemoved();
+                flagAsModified();
+            }
+        }
+    }
+}
+
+void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+            std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+            if (searchResult != mCells.end())
+            {
+                searchResult->second->pathgridAdded(pathgrid);
+                flagAsModified();
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
+
+        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
+        if (searchResult != mCells.end())
+        {
+            searchResult->second->pathgridRowAdded(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
+
 std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
 {
     osg::Vec3d eye, center, up;
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 4bdaa38200..3cd628df0a 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -52,6 +52,14 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
             virtual std::string getStartupInstruction();
 
             /// \note Does not update the view or any cell marker
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 79ffd4fb0a..84b7a0ca88 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -32,7 +32,7 @@ void CSVRender::UnpagedWorldspaceWidget::update()
 }
 
 CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
-: WorldspaceWidget (document, parent), mCellId (cellId)
+: WorldspaceWidget (document, parent), mDocument(document), mCellId (cellId)
 {
     mCellsModel = &dynamic_cast<CSMWorld::IdTable&> (
         *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -197,6 +197,90 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (topLeft.parent().isValid())
+    {
+        int row = topLeft.parent().row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridDataChanged(topLeft, bottomRight);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (parent.isValid()){
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridRowRemoved(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid going to be deleted
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridRemoved();
+                flagAsModified();
+            }
+        }
+    }
+}
+
+void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent, int start, int end)
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+
+    if (!parent.isValid())
+    {
+        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
+        for (int row = start; row <= end; ++row)
+        {
+            const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+            if (mCellId == pathgrid.mId)
+            {
+                mCell->pathgridAdded(pathgrid);
+                flagAsModified();
+            }
+        }
+    }
+    else
+    {
+        // Pathgrid data was modified
+        int row = parent.row();
+
+        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
+        if (mCellId == pathgrid.mId)
+        {
+            mCell->pathgridRowAdded(parent, start, end);
+            flagAsModified();
+        }
+    }
+}
+
 void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
     CSVWidget::SceneToolToggle2 *tool)
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index c5bfd22e65..f063020325 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -25,6 +25,7 @@ namespace CSVRender
     {
             Q_OBJECT
 
+            CSMDoc::Document& mDocument;
             std::string mCellId;
             CSMWorld::IdTable *mCellsModel;
             CSMWorld::IdTable *mReferenceablesModel;
@@ -83,6 +84,15 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end);
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
+
+
             virtual std::string getStartupInstruction();
 
         protected:
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 927ce545fe..1bd3df9818 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -59,6 +59,17 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     connect (references, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
         this, SLOT (referenceAdded (const QModelIndex&, int, int)));
 
+    QAbstractItemModel *pathgrids = document.getData().getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+
+    connect (pathgrids, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
+        this, SLOT (pathgridDataChanged (const QModelIndex&, const QModelIndex&)));
+    connect (pathgrids, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
+        this, SLOT (pathgridRemoved (const QModelIndex&, int, int)));
+    connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
+    connect (pathgrids, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+        this, SLOT (pathgridAdded (const QModelIndex&, int, int)));
+
     QAbstractItemModel *debugProfiles =
         document.getData().getTableModel (CSMWorld::UniversalId::Type_DebugProfiles);
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index b18123944a..d70694d22c 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -228,6 +228,15 @@ namespace CSVRender
 
             virtual void referenceAdded (const QModelIndex& index, int start, int end) = 0;
 
+            virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
+
+            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end) = 0;
+
+            virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
+
+            virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;
+
+
             virtual void runRequest (const std::string& profile);
 
             void debugProfileDataChanged (const QModelIndex& topLeft,

From d141672b53d83773613b5b1dd5e98650407870fa Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 22:09:48 -0400
Subject: [PATCH 581/765] Pathgrid geometry creator

---
 components/CMakeLists.txt             |   6 +-
 components/sceneutil/pathgridutil.cpp | 155 ++++++++++++++++++++++++++
 components/sceneutil/pathgridutil.hpp |  39 +++++++
 3 files changed, 197 insertions(+), 3 deletions(-)
 create mode 100644 components/sceneutil/pathgridutil.cpp
 create mode 100644 components/sceneutil/pathgridutil.hpp

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 2508cdc825..db8904f2b2 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -22,7 +22,7 @@ endif (GIT_CHECKOUT)
 
 if (OPENGL_ES)
     find_package(OpenGLES REQUIRED)
-else()    
+else()
     find_package(OpenGL REQUIRED)
 endif()
 
@@ -50,7 +50,7 @@ add_component_dir (shader
 
 add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry lightcontroller
-    lightmanager lightutil positionattitudetransform workqueue unrefqueue
+    lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil
     )
 
 add_component_dir (nif
@@ -191,7 +191,7 @@ else()
     set(GL_LIB ${OPENGL_gl_LIBRARY})
 endif()
 
-target_link_libraries(components 
+target_link_libraries(components
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
new file mode 100644
index 0000000000..1bf70168d4
--- /dev/null
+++ b/components/sceneutil/pathgridutil.cpp
@@ -0,0 +1,155 @@
+#include "pathgridutil.hpp"
+
+#include <osg/Geometry>
+
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadpgrd.hpp>
+
+namespace SceneUtil
+{
+    const unsigned short DiamondVertexCount = 24;
+    const float DiamondHalfHeight = 25.f;
+    const float DiamondHalfWidth = 10.f;
+
+    const osg::Vec3f DiamondPoints[6] =
+    {
+        osg::Vec3f( 0.f, 0.f, DiamondHalfHeight * 2.f),
+        osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f(-DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( DiamondHalfWidth,  DiamondHalfWidth,  DiamondHalfHeight),
+        osg::Vec3f( 0.f, 0.f, 0.f)
+    };
+
+    const unsigned short DiamondIndices[DiamondVertexCount] =
+    {
+        0, 2, 1,
+        0, 1, 3,
+        0, 3, 4,
+        0, 4, 2,
+        5, 1, 2,
+        5, 3, 1,
+        5, 4, 3,
+        5, 2, 4
+    };
+
+    const osg::Vec4f DiamondColor = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
+
+    osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)
+    {
+        const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
+        const size_t EdgeCount = pathgrid.mEdges.size();
+
+        const unsigned short VertexCount = PointCount * DiamondVertexCount;
+
+        osg::ref_ptr<osg::Geometry> gridGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
+        osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array(VertexCount);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
+        osg::ref_ptr<osg::DrawElementsUShort> pointIndices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, VertexCount);
+        osg::ref_ptr<osg::DrawElementsUShort> lineIndices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeCount * 2);
+
+        // Add each point/node
+        for (unsigned short i = 0; i < PointCount; ++i)
+        {
+            const ESM::Pathgrid::Point& point = pathgrid.mPoints[i];
+            osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ);
+
+            addPoint(i * DiamondVertexCount, position, vertices, normals, pointIndices);
+        }
+
+        // Add edges
+        unsigned short lineIndex = 0;
+
+        for (ESM::Pathgrid::EdgeList::const_iterator edge = pathgrid.mEdges.begin();
+            edge != pathgrid.mEdges.end(); ++edge)
+        {
+            if (edge->mV0 == edge->mV1 || edge->mV0 < 0 || edge->mV0 >= PointCount ||
+                edge->mV1 < 0 || edge->mV1 >= PointCount)
+                continue;
+
+            const ESM::Pathgrid::Point& from = pathgrid.mPoints[edge->mV0];
+            const ESM::Pathgrid::Point& to = pathgrid.mPoints[edge->mV1];
+
+            osg::Vec3f fromPos = osg::Vec3f(from.mX, from.mY, from.mZ);
+            osg::Vec3f toPos = osg::Vec3f(to.mX, to.mY, to.mZ);
+            osg::Vec3f dir = toPos - fromPos;
+            dir.normalize();
+
+            osg::Quat rot = osg::Quat(-osg::PI / 2, osg::Vec3(0, 0, 1));
+            dir = rot * dir;
+
+            unsigned short diamondIndex = 0;
+            if (dir.isNaN())
+                diamondIndex = 2;
+            else if (dir.y() >= 0 && dir.x() > 0)
+                diamondIndex = 8;
+            else if (dir.x() <= 0 && dir.y() > 0)
+                diamondIndex = 11;
+            else if (dir.y() <= 0 && dir.x() < 0)
+                diamondIndex = 2;
+            else if (dir.x() >= 0 && dir.y() < 0)
+                diamondIndex = 5;
+
+            unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
+            unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
+
+            lineIndices->setElement(lineIndex++, fromIndex * DiamondVertexCount + diamondIndex);
+            lineIndices->setElement(lineIndex++, toIndex * DiamondVertexCount + diamondIndex);
+        }
+
+        lineIndices->resize(lineIndex);
+
+        (*colors)[0] = DiamondColor;
+
+        gridGeometry->setVertexArray(vertices);
+        gridGeometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
+        gridGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        gridGeometry->addPrimitiveSet(pointIndices);
+        gridGeometry->addPrimitiveSet(lineIndices);
+
+        return gridGeometry;
+    }
+
+    PathgridGeometryFactory& PathgridGeometryFactory::get()
+    {
+        static PathgridGeometryFactory instance;
+        return instance;
+    }
+
+    PathgridGeometryFactory::PathgridGeometryFactory()
+    {
+        generateNormals();
+    }
+
+    void PathgridGeometryFactory::generateNormals()
+    {
+        mGeneratedNormals.resize(DiamondVertexCount);
+
+        for (unsigned short i = 0; i < DiamondVertexCount; i += 3)
+        {
+            osg::Vec3f v1 = DiamondPoints[DiamondIndices[i + 1]] - DiamondPoints[DiamondIndices[i]];
+            osg::Vec3f v2 = DiamondPoints[DiamondIndices[i + 2]] - DiamondPoints[DiamondIndices[i]];
+
+            osg::Vec3f normal = v1 ^ v2;
+
+            mGeneratedNormals[i] = normal;
+            mGeneratedNormals[i + 1] = normal;
+            mGeneratedNormals[i + 2] = normal;
+        }
+    }
+
+    void PathgridGeometryFactory::addPoint(unsigned short offset, const osg::Vec3f& position, osg::Vec3Array* vertices,
+                osg::Vec3Array* normals, osg::DrawElementsUShort* indices)
+    {
+        for (unsigned short i = 0; i < DiamondVertexCount; ++i)
+        {
+            (*vertices)[i + offset] = position + DiamondPoints[DiamondIndices[i]];
+            (*normals)[i + offset] = mGeneratedNormals[i];
+            indices->setElement(i + offset, i + offset);
+        }
+    }
+}
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
new file mode 100644
index 0000000000..07f24fe689
--- /dev/null
+++ b/components/sceneutil/pathgridutil.hpp
@@ -0,0 +1,39 @@
+#ifndef OPENMW_COMPONENTS_PATHGRIDUTIL_H
+#define OPENMW_COMPONENTS_PATHGRIDUTIL_H
+
+#include <osg/ref_ptr>
+#include <osg/Geometry>
+
+namespace ESM
+{
+    class Pathgrid;
+}
+
+namespace SceneUtil
+{
+
+    class PathgridGeometryFactory
+    {
+        public:
+
+            osg::ref_ptr<osg::Geometry> create(const ESM::Pathgrid& pathgrid);
+            static PathgridGeometryFactory& get();
+
+        private:
+
+            PathgridGeometryFactory();
+
+            void generateNormals();
+
+            void addPoint(unsigned short offset, const osg::Vec3f& position, osg::Vec3Array* vertices,
+                osg::Vec3Array* normals, osg::DrawElementsUShort* indices);
+
+            // Not implemented
+            PathgridGeometryFactory(const PathgridGeometryFactory&);
+            PathgridGeometryFactory& operator=(const PathgridGeometryFactory&);
+
+            std::vector<osg::Vec3f> mGeneratedNormals;
+    };
+}
+
+#endif

From 5cac8821232a6d6a92334fa15e44ffa904d782cd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 22:10:17 -0400
Subject: [PATCH 582/765] Replace game version of pathgrid rendering with
 component.

---
 apps/openmw/mwrender/pathgrid.cpp | 109 +-----------------------------
 apps/openmw/mwrender/pathgrid.hpp |   3 -
 2 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index d79604a914..8d790e5e0e 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -8,6 +8,7 @@
 
 #include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>
+#include <components/sceneutil/pathgridutil.hpp>
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
@@ -23,107 +24,6 @@
 namespace MWRender
 {
 
-static const int POINT_MESH_BASE = 35;
-
-osg::ref_ptr<osg::Geometry> Pathgrid::createPathgridLines(const ESM::Pathgrid *pathgrid)
-{
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
-
-    for(ESM::Pathgrid::EdgeList::const_iterator it = pathgrid->mEdges.begin();
-        it != pathgrid->mEdges.end();
-        ++it)
-    {
-        const ESM::Pathgrid::Edge &edge = *it;
-        const ESM::Pathgrid::Point &p1 = pathgrid->mPoints[edge.mV0], &p2 = pathgrid->mPoints[edge.mV1];
-
-        osg::Vec3f direction = MWMechanics::PathFinder::MakeOsgVec3(p2) - MWMechanics::PathFinder::MakeOsgVec3(p1);
-        osg::Vec3f lineDisplacement = (direction^osg::Vec3f(0,0,1));
-        lineDisplacement.normalize();
-
-        lineDisplacement = lineDisplacement * POINT_MESH_BASE +
-                                osg::Vec3f(0, 0, 10); // move lines up a little, so they will be less covered by meshes/landscape
-
-        vertices->push_back(MWMechanics::PathFinder::MakeOsgVec3(p1) + lineDisplacement);
-        vertices->push_back(MWMechanics::PathFinder::MakeOsgVec3(p2) + lineDisplacement);
-    }
-
-    geom->setVertexArray(vertices);
-
-    geom->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES, 0, vertices->size()));
-
-    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-    colors->push_back(osg::Vec4(1.f, 1.f, 0.f, 1.f));
-    geom->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-    return geom;
-}
-
-osg::ref_ptr<osg::Geometry> Pathgrid::createPathgridPoints(const ESM::Pathgrid *pathgrid)
-{
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
-
-    const float height = POINT_MESH_BASE * sqrtf(2);
-
-    osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array;
-    osg::ref_ptr<osg::UShortArray> indices = new osg::UShortArray;
-
-    bool first = true;
-    unsigned short startIndex = 0;
-    for(ESM::Pathgrid::PointList::const_iterator it = pathgrid->mPoints.begin();
-        it != pathgrid->mPoints.end();
-        ++it, startIndex += 6)
-    {
-        osg::Vec3f pointPos(MWMechanics::PathFinder::MakeOsgVec3(*it));
-
-        if (!first)
-        {
-            // degenerate triangle from previous octahedron
-            indices->push_back(startIndex - 4); // 2nd point of previous octahedron
-            indices->push_back(startIndex); // start point of current octahedron
-        }
-
-        float pointMeshBase = static_cast<float>(POINT_MESH_BASE);
-
-        vertices->push_back(pointPos + osg::Vec3f(0, 0, height)); // 0
-        vertices->push_back(pointPos + osg::Vec3f(-pointMeshBase, -pointMeshBase, 0)); // 1
-        vertices->push_back(pointPos + osg::Vec3f(pointMeshBase, -pointMeshBase, 0)); // 2
-        vertices->push_back(pointPos + osg::Vec3f(pointMeshBase, pointMeshBase, 0)); // 3
-        vertices->push_back(pointPos + osg::Vec3f(-pointMeshBase, pointMeshBase, 0)); // 4
-        vertices->push_back(pointPos + osg::Vec3f(0, 0, -height)); // 5
-
-        indices->push_back(startIndex + 0);
-        indices->push_back(startIndex + 1);
-        indices->push_back(startIndex + 2);
-        indices->push_back(startIndex + 5);
-        indices->push_back(startIndex + 3);
-        indices->push_back(startIndex + 4);
-        // degenerates
-        indices->push_back(startIndex + 4);
-        indices->push_back(startIndex + 5);
-        indices->push_back(startIndex + 5);
-        // end degenerates
-        indices->push_back(startIndex + 1);
-        indices->push_back(startIndex + 4);
-        indices->push_back(startIndex + 0);
-        indices->push_back(startIndex + 3);
-        indices->push_back(startIndex + 2);
-
-        first = false;
-    }
-
-    geom->setVertexArray(vertices);
-
-    geom->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLE_STRIP, indices->size(), &(*indices)[0]));
-
-    osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array;
-    colors->push_back(osg::Vec4(1.f, 0.f, 0.f, 1.f));
-    geom->setColorArray(colors, osg::Array::BIND_OVERALL);
-
-    return geom;
-}
-
 Pathgrid::Pathgrid(osg::ref_ptr<osg::Group> root)
     : mPathgridEnabled(false)
     , mRootNode(root)
@@ -212,12 +112,9 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
     osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
     cellPathGrid->setPosition(cellPathGridPos);
 
-    osg::ref_ptr<osg::Geometry> lines = createPathgridLines(pathgrid);
+    osg::ref_ptr<osg::Geometry> geometry = SceneUtil::PathgridGeometryFactory::get().create(*pathgrid);
 
-    osg::ref_ptr<osg::Geometry> points = createPathgridPoints(pathgrid);
-
-    cellPathGrid->addChild(lines);
-    cellPathGrid->addChild(points);
+    cellPathGrid->addChild(geometry);
 
     mPathGridRoot->addChild(cellPathGrid);
 
diff --git a/apps/openmw/mwrender/pathgrid.hpp b/apps/openmw/mwrender/pathgrid.hpp
index 39a6d71ed9..22bfa8e73f 100644
--- a/apps/openmw/mwrender/pathgrid.hpp
+++ b/apps/openmw/mwrender/pathgrid.hpp
@@ -48,9 +48,6 @@ namespace MWRender
         void enableCellPathgrid(const MWWorld::CellStore *store);
         void disableCellPathgrid(const MWWorld::CellStore *store);
 
-        // path grid meshes
-        osg::ref_ptr<osg::Geometry> createPathgridLines(const ESM::Pathgrid *pathgrid);
-        osg::ref_ptr<osg::Geometry> createPathgridPoints(const ESM::Pathgrid *pathgrid);
     public:
         Pathgrid(osg::ref_ptr<osg::Group> root);
         ~Pathgrid();

From 8d95b63180fc86a378482b1c7f796d36e9e98eb4 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 22:10:43 -0400
Subject: [PATCH 583/765] Add pathgrid rendering to opencs

---
 apps/opencs/view/render/cell.cpp | 54 ++++++++++++++++++++++++++++++++
 apps/opencs/view/render/cell.hpp |  4 +++
 2 files changed, 58 insertions(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index d841bd9924..955e97e3e3 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,10 +1,14 @@
 #include "cell.hpp"
 
+#include <osg/PositionAttitudeTransform>
+#include <osg/Geode>
+#include <osg/Geometry>
 #include <osg/Group>
 
 #include <components/misc/stringops.hpp>
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
+#include <components/sceneutil/pathgridutil.hpp>
 
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/columns.hpp"
@@ -77,6 +81,16 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     mCellNode = new osg::Group;
     rootNode->addChild(mCellNode);
 
+    osg::ref_ptr<osg::PositionAttitudeTransform> pathgridTransform = new osg::PositionAttitudeTransform();
+    pathgridTransform->setPosition(osg::Vec3f(mCoordinates.getX() * ESM::Land::REAL_SIZE,
+        mCoordinates.getY() * ESM::Land::REAL_SIZE, 0));
+    mCellNode->addChild(pathgridTransform);
+
+    mPathgridGeode = new osg::Geode();
+    pathgridTransform->addChild(mPathgridGeode);
+
+    mPathgridGeometry = 0;
+
     setCellMarker();
 
     if (!mDeleted)
@@ -104,6 +118,15 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
                 mCellBorder->buildShape(esmLand);
             }
         }
+
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
+                pathgrids.getRecord(pathgridIndex).get());
+            mPathgridGeode->addDrawable(mPathgridGeometry);
+        }
     }
 }
 
@@ -256,22 +279,53 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
 
 void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
 {
+    mPathgridGeode->removeDrawable(mPathgridGeometry);
+    mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(pathgrid);
+    mPathgridGeode->addDrawable(mPathgridGeometry);
 }
 
 void CSVRender::Cell::pathgridRemoved()
 {
+    mPathgridGeode->removeDrawable(mPathgridGeometry);
 }
 
 void CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+    int pathgridIndex = pathgrids.searchId(mId);
+    if (pathgridIndex != -1)
+    {
+        mPathgridGeode->removeDrawable(mPathgridGeometry);
+        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
+            pathgrids.getRecord(pathgridIndex).get());
+        mPathgridGeode->addDrawable(mPathgridGeometry);
+    }
 }
 
 void CSVRender::Cell::pathgridRowRemoved(const QModelIndex& parent, int start, int end)
 {
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+    int pathgridIndex = pathgrids.searchId(mId);
+    if (pathgridIndex != -1)
+    {
+        mPathgridGeode->removeDrawable(mPathgridGeometry);
+        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
+            pathgrids.getRecord(pathgridIndex).get());
+        mPathgridGeode->addDrawable(mPathgridGeometry);
+    }
 }
 
 void CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
 {
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+    int pathgridIndex = pathgrids.searchId(mId);
+    if (pathgridIndex != -1)
+    {
+        mPathgridGeode->removeDrawable(mPathgridGeometry);
+        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
+            pathgrids.getRecord(pathgridIndex).get());
+        mPathgridGeode->addDrawable(mPathgridGeometry);
+    }
 }
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 4758a95c3a..0efb8757c3 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -23,6 +23,8 @@ class QModelIndex;
 namespace osg
 {
     class Group;
+    class Geometry;
+    class Geode;
 }
 
 namespace CSMWorld
@@ -41,6 +43,8 @@ namespace CSVRender
             CSMWorld::Data& mData;
             std::string mId;
             osg::ref_ptr<osg::Group> mCellNode;
+            osg::ref_ptr<osg::Geode> mPathgridGeode;
+            osg::ref_ptr<osg::Geometry> mPathgridGeometry;
             std::map<std::string, Object *> mObjects;
             std::auto_ptr<Terrain::TerrainGrid> mTerrain;
             CSMWorld::CellCoordinates mCoordinates;

From 3d26ff08c42597081ba6695e7577dc69d82ef977 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 2 May 2016 23:12:58 -0400
Subject: [PATCH 584/765] Get rid of lighting.

---
 components/sceneutil/pathgridutil.cpp | 76 +++++++++++----------------
 components/sceneutil/pathgridutil.hpp |  7 ---
 2 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 1bf70168d4..e7c3ceccaa 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -7,11 +7,12 @@
 
 namespace SceneUtil
 {
-    const unsigned short DiamondVertexCount = 24;
+    const unsigned short DiamondVertexCount = 6;
+    const unsigned short DiamondIndexCount = 24;
     const float DiamondHalfHeight = 25.f;
     const float DiamondHalfWidth = 10.f;
 
-    const osg::Vec3f DiamondPoints[6] =
+    const osg::Vec3f DiamondPoints[DiamondVertexCount] =
     {
         osg::Vec3f( 0.f, 0.f, DiamondHalfHeight * 2.f),
         osg::Vec3f(-DiamondHalfWidth, -DiamondHalfWidth,  DiamondHalfHeight),
@@ -21,7 +22,7 @@ namespace SceneUtil
         osg::Vec3f( 0.f, 0.f, 0.f)
     };
 
-    const unsigned short DiamondIndices[DiamondVertexCount] =
+    const unsigned short DiamondIndices[DiamondIndexCount] =
     {
         0, 2, 1,
         0, 1, 3,
@@ -41,24 +42,38 @@ namespace SceneUtil
         const size_t EdgeCount = pathgrid.mEdges.size();
 
         const unsigned short VertexCount = PointCount * DiamondVertexCount;
+        const unsigned short ColorCount = 1;
+        const size_t PointIndexCount = PointCount * DiamondIndexCount;
+        const size_t EdgeIndexCount = EdgeCount * 2;
 
         osg::ref_ptr<osg::Geometry> gridGeometry = new osg::Geometry();
 
         osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
-        osg::ref_ptr<osg::Vec3Array> normals = new osg::Vec3Array(VertexCount);
-        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
         osg::ref_ptr<osg::DrawElementsUShort> pointIndices =
-            new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, VertexCount);
+            new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, PointIndexCount);
         osg::ref_ptr<osg::DrawElementsUShort> lineIndices =
-            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeCount * 2);
+            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
 
         // Add each point/node
-        for (unsigned short i = 0; i < PointCount; ++i)
+
+
+        for (unsigned short pointIndex = 0; pointIndex < PointCount; ++pointIndex)
         {
-            const ESM::Pathgrid::Point& point = pathgrid.mPoints[i];
+            const ESM::Pathgrid::Point& point = pathgrid.mPoints[pointIndex];
             osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ);
 
-            addPoint(i * DiamondVertexCount, position, vertices, normals, pointIndices);
+            unsigned short vertexOffset = pointIndex * DiamondVertexCount;
+            unsigned short indexOffset = pointIndex * DiamondIndexCount;
+            for (unsigned short i = 0; i < DiamondVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[i];
+            }
+
+            for (unsigned short i = 0; i < DiamondIndexCount; ++i)
+            {
+                pointIndices->setElement(indexOffset + i, vertexOffset + DiamondIndices[i]);
+            }
         }
 
         // Add edges
@@ -84,15 +99,15 @@ namespace SceneUtil
 
             unsigned short diamondIndex = 0;
             if (dir.isNaN())
-                diamondIndex = 2;
+                diamondIndex = 1;
             else if (dir.y() >= 0 && dir.x() > 0)
-                diamondIndex = 8;
+                diamondIndex = 4;
             else if (dir.x() <= 0 && dir.y() > 0)
-                diamondIndex = 11;
-            else if (dir.y() <= 0 && dir.x() < 0)
                 diamondIndex = 2;
+            else if (dir.y() <= 0 && dir.x() < 0)
+                diamondIndex = 1;
             else if (dir.x() >= 0 && dir.y() < 0)
-                diamondIndex = 5;
+                diamondIndex = 3;
 
             unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
             unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
@@ -106,10 +121,10 @@ namespace SceneUtil
         (*colors)[0] = DiamondColor;
 
         gridGeometry->setVertexArray(vertices);
-        gridGeometry->setNormalArray(normals, osg::Array::BIND_PER_VERTEX);
         gridGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
         gridGeometry->addPrimitiveSet(pointIndices);
         gridGeometry->addPrimitiveSet(lineIndices);
+        gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
         return gridGeometry;
     }
@@ -122,34 +137,5 @@ namespace SceneUtil
 
     PathgridGeometryFactory::PathgridGeometryFactory()
     {
-        generateNormals();
-    }
-
-    void PathgridGeometryFactory::generateNormals()
-    {
-        mGeneratedNormals.resize(DiamondVertexCount);
-
-        for (unsigned short i = 0; i < DiamondVertexCount; i += 3)
-        {
-            osg::Vec3f v1 = DiamondPoints[DiamondIndices[i + 1]] - DiamondPoints[DiamondIndices[i]];
-            osg::Vec3f v2 = DiamondPoints[DiamondIndices[i + 2]] - DiamondPoints[DiamondIndices[i]];
-
-            osg::Vec3f normal = v1 ^ v2;
-
-            mGeneratedNormals[i] = normal;
-            mGeneratedNormals[i + 1] = normal;
-            mGeneratedNormals[i + 2] = normal;
-        }
-    }
-
-    void PathgridGeometryFactory::addPoint(unsigned short offset, const osg::Vec3f& position, osg::Vec3Array* vertices,
-                osg::Vec3Array* normals, osg::DrawElementsUShort* indices)
-    {
-        for (unsigned short i = 0; i < DiamondVertexCount; ++i)
-        {
-            (*vertices)[i + offset] = position + DiamondPoints[DiamondIndices[i]];
-            (*normals)[i + offset] = mGeneratedNormals[i];
-            indices->setElement(i + offset, i + offset);
-        }
     }
 }
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index 07f24fe689..1bb6682267 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -23,16 +23,9 @@ namespace SceneUtil
 
             PathgridGeometryFactory();
 
-            void generateNormals();
-
-            void addPoint(unsigned short offset, const osg::Vec3f& position, osg::Vec3Array* vertices,
-                osg::Vec3Array* normals, osg::DrawElementsUShort* indices);
-
             // Not implemented
             PathgridGeometryFactory(const PathgridGeometryFactory&);
             PathgridGeometryFactory& operator=(const PathgridGeometryFactory&);
-
-            std::vector<osg::Vec3f> mGeneratedNormals;
     };
 }
 

From 7f0cc6e58329b0a00b37415e9f635306976776c9 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 03:17:36 -0400
Subject: [PATCH 585/765] Add a color gradiant to pathgrid nodes to make them
 less of an eyesore.

---
 components/sceneutil/pathgridutil.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index e7c3ceccaa..d72e11968a 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -34,7 +34,15 @@ namespace SceneUtil
         5, 2, 4
     };
 
-    const osg::Vec4f DiamondColor = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
+    const osg::Vec4f DiamondColors[DiamondVertexCount] =
+    {
+        osg::Vec4f(1.f, 0.f, 0.f, 1.f),
+        osg::Vec4f(.9f, .1f, 0.f, 1.f),
+        osg::Vec4f(.9f, .2f, 0.f, 1.f),
+        osg::Vec4f(.9f, .3f, 0.f, 1.f),
+        osg::Vec4f(.9f, .4f, 0.f, 1.f),
+        osg::Vec4f(.8f, .5f, 0.f, 1.f)
+    };
 
     osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)
     {
@@ -42,7 +50,7 @@ namespace SceneUtil
         const size_t EdgeCount = pathgrid.mEdges.size();
 
         const unsigned short VertexCount = PointCount * DiamondVertexCount;
-        const unsigned short ColorCount = 1;
+        const unsigned short ColorCount = VertexCount;
         const size_t PointIndexCount = PointCount * DiamondIndexCount;
         const size_t EdgeIndexCount = EdgeCount * 2;
 
@@ -68,6 +76,7 @@ namespace SceneUtil
             for (unsigned short i = 0; i < DiamondVertexCount; ++i)
             {
                 (*vertices)[vertexOffset + i] = position + DiamondPoints[i];
+                (*colors)[vertexOffset + i] = DiamondColors[i];
             }
 
             for (unsigned short i = 0; i < DiamondIndexCount; ++i)
@@ -118,10 +127,8 @@ namespace SceneUtil
 
         lineIndices->resize(lineIndex);
 
-        (*colors)[0] = DiamondColor;
-
         gridGeometry->setVertexArray(vertices);
-        gridGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        gridGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
         gridGeometry->addPrimitiveSet(pointIndices);
         gridGeometry->addPrimitiveSet(lineIndices);
         gridGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);

From 0eb863d8fc5b72724bf9c43cad9f63b917df53c5 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 03:18:47 -0400
Subject: [PATCH 586/765] Change color to blue to match the pathgrid visibility
 selector in the editor and slightly increase the scaling.

---
 components/sceneutil/pathgridutil.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index d72e11968a..1ba2c006b7 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -9,8 +9,8 @@ namespace SceneUtil
 {
     const unsigned short DiamondVertexCount = 6;
     const unsigned short DiamondIndexCount = 24;
-    const float DiamondHalfHeight = 25.f;
-    const float DiamondHalfWidth = 10.f;
+    const float DiamondHalfHeight = 40.f;
+    const float DiamondHalfWidth = 16.f;
 
     const osg::Vec3f DiamondPoints[DiamondVertexCount] =
     {
@@ -36,12 +36,12 @@ namespace SceneUtil
 
     const osg::Vec4f DiamondColors[DiamondVertexCount] =
     {
-        osg::Vec4f(1.f, 0.f, 0.f, 1.f),
-        osg::Vec4f(.9f, .1f, 0.f, 1.f),
-        osg::Vec4f(.9f, .2f, 0.f, 1.f),
-        osg::Vec4f(.9f, .3f, 0.f, 1.f),
-        osg::Vec4f(.9f, .4f, 0.f, 1.f),
-        osg::Vec4f(.8f, .5f, 0.f, 1.f)
+        osg::Vec4f(0.f, 0.f, 1.f, 1.f),
+        osg::Vec4f(0.f, .05f, .95f, 1.f),
+        osg::Vec4f(0.f, .1f, .95f, 1.f),
+        osg::Vec4f(0.f, .15f, .95f, 1.f),
+        osg::Vec4f(0.f, .2f, .95f, 1.f),
+        osg::Vec4f(0.f, .25f, 9.f, 1.f)
     };
 
     osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)

From 642b1d027342885d0a299694e6a60b4aeee184f9 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 03:27:47 -0400
Subject: [PATCH 587/765] Add mask.

---
 apps/opencs/view/render/cell.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 955e97e3e3..1bd43c23ff 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -84,6 +84,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     osg::ref_ptr<osg::PositionAttitudeTransform> pathgridTransform = new osg::PositionAttitudeTransform();
     pathgridTransform->setPosition(osg::Vec3f(mCoordinates.getX() * ESM::Land::REAL_SIZE,
         mCoordinates.getY() * ESM::Land::REAL_SIZE, 0));
+    pathgridTransform->setNodeMask(Mask_Pathgrid);
     mCellNode->addChild(pathgridTransform);
 
     mPathgridGeode = new osg::Geode();

From c9ada852aa4a0542c1ea8e1d626733fe14951894 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Tue, 3 May 2016 06:19:47 -0400
Subject: [PATCH 588/765] Undo including pathgrids in ID check

---
 apps/opencs/model/world/data.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 414329aa24..5c81d3b08b 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1139,8 +1139,7 @@ bool CSMWorld::Data::hasId (const std::string& id) const
         getBodyParts().searchId (id)!=-1 ||
         getSoundGens().searchId (id)!=-1 ||
         getMagicEffects().searchId (id)!=-1 ||
-        getReferenceables().searchId (id)!=-1 ||
-        getPathgrids().searchId (id)!=-1;
+        getReferenceables().searchId (id)!=-1;
 }
 
 int CSMWorld::Data::count (RecordBase::State state) const

From b129ff96729fdf7424a44ec6d497aaf32107ccc4 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Tue, 3 May 2016 07:24:33 -0400
Subject: [PATCH 589/765] Editor: Add PathgridCreator to find duplicate IDs

---
 apps/opencs/CMakeLists.txt                 |  2 +-
 apps/opencs/view/world/pathgridcreator.cpp | 29 ++++++++++++++++++++++
 apps/opencs/view/world/pathgridcreator.hpp | 26 +++++++++++++++++++
 apps/opencs/view/world/subviews.cpp        |  9 +++++--
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 apps/opencs/view/world/pathgridcreator.cpp
 create mode 100644 apps/opencs/view/world/pathgridcreator.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 816b8d732d..e7312d0ba7 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -67,7 +67,7 @@ opencs_hdrs_noqt (view/doc
 
 opencs_units (view/world
     table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
-    cellcreator referenceablecreator startscriptcreator referencecreator scenesubview
+    cellcreator pathgridcreator referenceablecreator startscriptcreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
     dialoguespinbox recordbuttonbar tableeditidaction scripterrortable extendedcommandconfigurator
     )
diff --git a/apps/opencs/view/world/pathgridcreator.cpp b/apps/opencs/view/world/pathgridcreator.cpp
new file mode 100644
index 0000000000..a305b1249d
--- /dev/null
+++ b/apps/opencs/view/world/pathgridcreator.cpp
@@ -0,0 +1,29 @@
+#include "pathgridcreator.hpp"
+
+#include "../../model/world/data.hpp"
+
+CSVWorld::PathgridCreator::PathgridCreator(
+    CSMWorld::Data& data,
+    QUndoStack& undoStack,
+    const CSMWorld::UniversalId& id,
+    bool relaxedIdRules
+) : GenericCreator(data, undoStack, id, relaxedIdRules)
+{}
+
+std::string CSVWorld::PathgridCreator::getErrors() const
+{
+    std::string pathgridId = getId();
+
+    // Check user input for any errors.
+    std::string errors;
+    if (pathgridId.empty())
+    {
+        errors = "No Pathgrid ID entered";
+    }
+    else if (getData().getPathgrids().searchId(pathgridId) > -1)
+    {
+        errors = "Pathgrid with this ID already exists";
+    }
+
+    return errors;
+}
diff --git a/apps/opencs/view/world/pathgridcreator.hpp b/apps/opencs/view/world/pathgridcreator.hpp
new file mode 100644
index 0000000000..10f64a0a76
--- /dev/null
+++ b/apps/opencs/view/world/pathgridcreator.hpp
@@ -0,0 +1,26 @@
+#ifndef PATHGRIDCREATOR_HPP
+#define PATHGRIDCREATOR_HPP
+
+#include "genericcreator.hpp"
+
+namespace CSVWorld
+{
+    /// \brief Record creator for pathgrids.
+    class PathgridCreator : public GenericCreator
+    {
+        Q_OBJECT
+
+        public:
+
+            PathgridCreator(
+                CSMWorld::Data& data,
+                QUndoStack& undoStack,
+                const CSMWorld::UniversalId& id,
+                bool relaxedIdRules = false);
+
+            /// \return Error description for current user input.
+            virtual std::string getErrors() const;
+    };
+}
+
+#endif // PATHGRIDCREATOR_HPP
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 650f344ed9..69c0c01cce 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -14,6 +14,7 @@
 #include "scenesubview.hpp"
 #include "dialoguecreator.hpp"
 #include "infocreator.hpp"
+#include "pathgridcreator.hpp"
 #include "previewsubview.hpp"
 
 void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
@@ -42,7 +43,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Enchantments,
         CSMWorld::UniversalId::Type_BodyParts,
         CSMWorld::UniversalId::Type_SoundGens,
-        CSMWorld::UniversalId::Type_Pathgrids,
 
         CSMWorld::UniversalId::Type_None // end marker
     };
@@ -75,6 +75,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_JournalInfos,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, InfoCreatorFactory>);
 
+    manager.add (CSMWorld::UniversalId::Type_Pathgrids,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<PathgridCreator> >);
+
     // Subviews for resources tables
     manager.add (CSMWorld::UniversalId::Type_Meshes,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
@@ -125,7 +128,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Enchantment,
         CSMWorld::UniversalId::Type_BodyPart,
         CSMWorld::UniversalId::Type_SoundGen,
-        CSMWorld::UniversalId::Type_Pathgrid,
 
         CSMWorld::UniversalId::Type_None // end marker
     };
@@ -168,6 +170,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_Journal,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, JournalCreatorFactory> (false));
 
+    manager.add (CSMWorld::UniversalId::Type_Pathgrid,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<PathgridCreator> > (false));
+
     manager.add (CSMWorld::UniversalId::Type_DebugProfile,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<GenericCreator, CSMWorld::Scope_Project | CSMWorld::Scope_Session> > (false));
 

From 5009aaaf0d652ff0d7da9e6aad3cb21280369a70 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Tue, 3 May 2016 07:28:10 -0400
Subject: [PATCH 590/765] Update AUTHORS

---
 AUTHORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 3b89bf97b6..36c9690c6e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -102,9 +102,9 @@ Programmers
     Pieter van der Kloet (pvdk)
     pkubik
     Radu-Marius Popovici (rpopovici)
-    rcutmore
     rdimesio
     riothamus
+    Rob Cutmore (rcutmore)
     Robert MacGregor (Ragora)
     Rohit Nirmal
     Roman Melnik (Kromgart)

From b11f5b27173adaffda0a8b5d4e730d6f43a03f14 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 15:06:28 -0400
Subject: [PATCH 591/765] Make edges differently colored.

---
 components/sceneutil/pathgridutil.cpp | 46 +++++++++++++++++++--------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 1ba2c006b7..37c975dff0 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -9,6 +9,11 @@ namespace SceneUtil
 {
     const unsigned short DiamondVertexCount = 6;
     const unsigned short DiamondIndexCount = 24;
+
+    const unsigned short DiamondConnectorVertexCount = 4;
+
+    const unsigned short DiamondTotalVertexCount = DiamondVertexCount + DiamondConnectorVertexCount;
+
     const float DiamondHalfHeight = 40.f;
     const float DiamondHalfWidth = 16.f;
 
@@ -34,6 +39,11 @@ namespace SceneUtil
         5, 2, 4
     };
 
+    const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] =
+    {
+        1, 2, 3, 4
+    };
+
     const osg::Vec4f DiamondColors[DiamondVertexCount] =
     {
         osg::Vec4f(0.f, 0.f, 1.f, 1.f),
@@ -44,12 +54,14 @@ namespace SceneUtil
         osg::Vec4f(0.f, .25f, 9.f, 1.f)
     };
 
+    const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
+
     osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)
     {
         const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
         const size_t EdgeCount = pathgrid.mEdges.size();
 
-        const unsigned short VertexCount = PointCount * DiamondVertexCount;
+        const unsigned short VertexCount = PointCount * DiamondTotalVertexCount;
         const unsigned short ColorCount = VertexCount;
         const size_t PointIndexCount = PointCount * DiamondIndexCount;
         const size_t EdgeIndexCount = EdgeCount * 2;
@@ -64,15 +76,15 @@ namespace SceneUtil
             new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, EdgeIndexCount);
 
         // Add each point/node
-
-
         for (unsigned short pointIndex = 0; pointIndex < PointCount; ++pointIndex)
         {
             const ESM::Pathgrid::Point& point = pathgrid.mPoints[pointIndex];
             osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ);
 
-            unsigned short vertexOffset = pointIndex * DiamondVertexCount;
+            unsigned short vertexOffset = pointIndex * DiamondTotalVertexCount;
             unsigned short indexOffset = pointIndex * DiamondIndexCount;
+
+            // Point
             for (unsigned short i = 0; i < DiamondVertexCount; ++i)
             {
                 (*vertices)[vertexOffset + i] = position + DiamondPoints[i];
@@ -83,6 +95,14 @@ namespace SceneUtil
             {
                 pointIndices->setElement(indexOffset + i, vertexOffset + DiamondIndices[i]);
             }
+
+            // Connectors
+            vertexOffset += DiamondVertexCount;
+            for (unsigned short i = 0; i < DiamondConnectorVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[DiamondConnectorVertices[i]];
+                (*colors)[vertexOffset + i] = DiamondEdgeColor;
+            }
         }
 
         // Add edges
@@ -108,21 +128,21 @@ namespace SceneUtil
 
             unsigned short diamondIndex = 0;
             if (dir.isNaN())
-                diamondIndex = 1;
+                diamondIndex = 0;
             else if (dir.y() >= 0 && dir.x() > 0)
-                diamondIndex = 4;
-            else if (dir.x() <= 0 && dir.y() > 0)
-                diamondIndex = 2;
-            else if (dir.y() <= 0 && dir.x() < 0)
-                diamondIndex = 1;
-            else if (dir.x() >= 0 && dir.y() < 0)
                 diamondIndex = 3;
+            else if (dir.x() <= 0 && dir.y() > 0)
+                diamondIndex = 1;
+            else if (dir.y() <= 0 && dir.x() < 0)
+                diamondIndex = 0;
+            else if (dir.x() >= 0 && dir.y() < 0)
+                diamondIndex = 2;
 
             unsigned short fromIndex = static_cast<unsigned short>(edge->mV0);
             unsigned short toIndex = static_cast<unsigned short>(edge->mV1);
 
-            lineIndices->setElement(lineIndex++, fromIndex * DiamondVertexCount + diamondIndex);
-            lineIndices->setElement(lineIndex++, toIndex * DiamondVertexCount + diamondIndex);
+            lineIndices->setElement(lineIndex++, fromIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
+            lineIndices->setElement(lineIndex++, toIndex * DiamondTotalVertexCount + DiamondVertexCount + diamondIndex);
         }
 
         lineIndices->resize(lineIndex);

From 1f902ff0695d515673db07bc9e7518b2895640b9 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 16:08:12 -0400
Subject: [PATCH 592/765] Remove code duplication.

---
 apps/opencs/view/render/cell.cpp | 56 ++++++++++----------------------
 apps/opencs/view/render/cell.hpp |  2 ++
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 1bd43c23ff..a874513988 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -68,6 +68,19 @@ bool CSVRender::Cell::addObjects (int start, int end)
     return modified;
 }
 
+void CSVRender::Cell::recreatePathgrid()
+{
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+    int pathgridIndex = pathgrids.searchId(mId);
+    if (pathgridIndex != -1)
+    {
+        mPathgridGeode->removeDrawable(mPathgridGeometry);
+        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
+            pathgrids.getRecord(pathgridIndex).get());
+        mPathgridGeode->addDrawable(mPathgridGeometry);
+    }
+}
+
 CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
     bool deleted)
 : mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted), mSubMode (0),
@@ -120,14 +133,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
             }
         }
 
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
-        {
-            mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
-                pathgrids.getRecord(pathgridIndex).get());
-            mPathgridGeode->addDrawable(mPathgridGeometry);
-        }
+        recreatePathgrid();
     }
 }
 
@@ -280,9 +286,7 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
 
 void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
 {
-    mPathgridGeode->removeDrawable(mPathgridGeometry);
-    mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(pathgrid);
-    mPathgridGeode->addDrawable(mPathgridGeometry);
+    recreatePathgrid();
 }
 
 void CSVRender::Cell::pathgridRemoved()
@@ -292,41 +296,17 @@ void CSVRender::Cell::pathgridRemoved()
 
 void CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-    int pathgridIndex = pathgrids.searchId(mId);
-    if (pathgridIndex != -1)
-    {
-        mPathgridGeode->removeDrawable(mPathgridGeometry);
-        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
-            pathgrids.getRecord(pathgridIndex).get());
-        mPathgridGeode->addDrawable(mPathgridGeometry);
-    }
+    recreatePathgrid();
 }
 
 void CSVRender::Cell::pathgridRowRemoved(const QModelIndex& parent, int start, int end)
 {
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-    int pathgridIndex = pathgrids.searchId(mId);
-    if (pathgridIndex != -1)
-    {
-        mPathgridGeode->removeDrawable(mPathgridGeometry);
-        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
-            pathgrids.getRecord(pathgridIndex).get());
-        mPathgridGeode->addDrawable(mPathgridGeometry);
-    }
+    recreatePathgrid();
 }
 
 void CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
 {
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-    int pathgridIndex = pathgrids.searchId(mId);
-    if (pathgridIndex != -1)
-    {
-        mPathgridGeode->removeDrawable(mPathgridGeometry);
-        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
-            pathgrids.getRecord(pathgridIndex).get());
-        mPathgridGeode->addDrawable(mPathgridGeometry);
-    }
+    recreatePathgrid();
 }
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 0efb8757c3..e265fc21c2 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -69,6 +69,8 @@ namespace CSVRender
             /// \return Have any objects been added?
             bool addObjects (int start, int end);
 
+            void recreatePathgrid();
+
         public:
 
             enum Selection

From 14ae232938fd18d41e5773bf1d26fc774c555499 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 3 May 2016 16:11:39 -0400
Subject: [PATCH 593/765] Remove now unnecessary factory class. It was
 originally used for storing normals, but that functionality was removed.

---
 apps/opencs/view/render/cell.cpp      |  3 +--
 apps/openmw/mwrender/pathgrid.cpp     |  2 +-
 components/sceneutil/pathgridutil.cpp | 12 +-----------
 components/sceneutil/pathgridutil.hpp | 17 +----------------
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index a874513988..691b909bbd 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -75,8 +75,7 @@ void CSVRender::Cell::recreatePathgrid()
     if (pathgridIndex != -1)
     {
         mPathgridGeode->removeDrawable(mPathgridGeometry);
-        mPathgridGeometry = SceneUtil::PathgridGeometryFactory::get().create(
-            pathgrids.getRecord(pathgridIndex).get());
+        mPathgridGeometry = SceneUtil::createPathgridGeometry(pathgrids.getRecord(pathgridIndex).get());
         mPathgridGeode->addDrawable(mPathgridGeometry);
     }
 }
diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp
index 8d790e5e0e..aae97fe35a 100644
--- a/apps/openmw/mwrender/pathgrid.cpp
+++ b/apps/openmw/mwrender/pathgrid.cpp
@@ -112,7 +112,7 @@ void Pathgrid::enableCellPathgrid(const MWWorld::CellStore *store)
     osg::ref_ptr<osg::PositionAttitudeTransform> cellPathGrid = new osg::PositionAttitudeTransform;
     cellPathGrid->setPosition(cellPathGridPos);
 
-    osg::ref_ptr<osg::Geometry> geometry = SceneUtil::PathgridGeometryFactory::get().create(*pathgrid);
+    osg::ref_ptr<osg::Geometry> geometry = SceneUtil::createPathgridGeometry(*pathgrid);
 
     cellPathGrid->addChild(geometry);
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 37c975dff0..5d71efd1e7 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -56,7 +56,7 @@ namespace SceneUtil
 
     const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
 
-    osg::ref_ptr<osg::Geometry> PathgridGeometryFactory::create(const ESM::Pathgrid& pathgrid)
+    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
     {
         const unsigned short PointCount = static_cast<unsigned short>(pathgrid.mPoints.size());
         const size_t EdgeCount = pathgrid.mEdges.size();
@@ -155,14 +155,4 @@ namespace SceneUtil
 
         return gridGeometry;
     }
-
-    PathgridGeometryFactory& PathgridGeometryFactory::get()
-    {
-        static PathgridGeometryFactory instance;
-        return instance;
-    }
-
-    PathgridGeometryFactory::PathgridGeometryFactory()
-    {
-    }
 }
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index 1bb6682267..d547bbf3ea 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -11,22 +11,7 @@ namespace ESM
 
 namespace SceneUtil
 {
-
-    class PathgridGeometryFactory
-    {
-        public:
-
-            osg::ref_ptr<osg::Geometry> create(const ESM::Pathgrid& pathgrid);
-            static PathgridGeometryFactory& get();
-
-        private:
-
-            PathgridGeometryFactory();
-
-            // Not implemented
-            PathgridGeometryFactory(const PathgridGeometryFactory&);
-            PathgridGeometryFactory& operator=(const PathgridGeometryFactory&);
-    };
+    osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
 }
 
 #endif

From 40cc6a41642ee4b6128cda59b5516dca0e612b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Moroz?= <michalmoroz@gmail.com>
Date: Wed, 4 May 2016 13:55:36 +0200
Subject: [PATCH 594/765] Changed AiSequence::stack to push_back lower priority
 packages instead of push_front (Bug #3384)

---
 apps/openmw/mwmechanics/aisequence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index c71dd5db9d..7d0bd55ff1 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -299,7 +299,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
         }
     }
 
-    mPackages.push_front (package.clone());
+    mPackages.push_back (package.clone());
 }
 
 AiPackage* MWMechanics::AiSequence::getActivePackage()

From 964ea78367b27eb3c53b34462e2cd08b59265ee4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 4 May 2016 15:57:34 +0200
Subject: [PATCH 595/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 36c9690c6e..88853865ab 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -87,6 +87,7 @@ Programmers
     Michael Mc Donnell
     Michael Papageorgiou (werdanith)
     Michał Bień (Glorf)
+    Michał Moroz (dragonee)
     Miroslav Puda (pakanek)
     MiroslavR
     naclander

From 307f04f827207a0a3960d025bbfda87367337f05 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Fri, 6 May 2016 08:04:15 -0400
Subject: [PATCH 596/765] Editor: Fix issue adding start script (Bug #3331)

Updated to verify column is editable when adding a new record.
---
 apps/opencs/model/world/idtable.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 4d8a0842f2..5f50f22109 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -159,7 +159,11 @@ void CSMWorld::IdTable::addRecordWithData (const std::string& id,
     mIdCollection->appendBlankRecord (id, type);
 
     for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
-        mIdCollection->setData (index, iter->first, iter->second);
+    {
+        int columnIndex = getModelIndex(id, iter->first).column();
+        if (mIdCollection->getColumn(columnIndex).isEditable())
+            mIdCollection->setData(index, iter->first, iter->second);
+    }
 
     endInsertRows();
 }

From 1e7d573f24d53b428e43e29e5c5591524f507b92 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sat, 7 May 2016 20:40:21 +0300
Subject: [PATCH 597/765] Fix uninitialized values in ESMWriter::save

---
 components/esm/esmwriter.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index 4d99991434..b8c78a2b95 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -9,10 +9,13 @@
 namespace ESM
 {
     ESMWriter::ESMWriter()
-        : mStream(NULL)
-        , mEncoder (0)
-        , mRecordCount (0)
-        , mCounting (true)
+        : mRecords()
+        , mStream(NULL)
+        , mHeaderPos()
+        , mEncoder(NULL)
+        , mRecordCount(0)
+        , mCounting(true)
+        , mHeader()
     {}
 
     unsigned int ESMWriter::getVersion() const

From d7046878a828bb0fdaa9b6317568bfa8efa1fb53 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sat, 7 May 2016 20:41:47 +0300
Subject: [PATCH 598/765] Fix uninitialized values in MWMechanics::AiCombat

---
 apps/openmw/mwmechanics/aicombat.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 3aeeedad1f..b1821d64a3 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -107,6 +107,7 @@ namespace MWMechanics
         mActionCooldown(0),
         mStrength(),
         mForceNoShortcut(false),
+        mShortcutFailPos(),
         mLastActorPos(0,0,0),
         mMovement(){}    
 

From d5dfa89060821f3e3f92878f3e10e338c8bca5f0 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <roman-pros@yandex-team.ru>
Date: Sat, 7 May 2016 20:32:51 +0300
Subject: [PATCH 599/765] Rewrite NAME_T into FIXED_STRING.

---
 apps/esmtool/esmtool.cpp                    |  21 ++--
 apps/esmtool/record.cpp                     |   2 +-
 apps/essimporter/importer.cpp               |   4 +-
 apps/opencs/model/world/data.cpp            |   2 +-
 apps/opencs/model/world/refidadapterimp.hpp |   2 +-
 apps/openmw/mwstate/statemanagerimp.cpp     |  14 +--
 apps/openmw/mwworld/esmstore.cpp            |  12 +--
 components/esm/cellref.cpp                  |   2 +-
 components/esm/debugprofile.cpp             |   2 +-
 components/esm/esmcommon.hpp                | 113 +++++++++++++++-----
 components/esm/esmreader.cpp                |  16 +--
 components/esm/filter.cpp                   |   2 +-
 components/esm/loadacti.cpp                 |   2 +-
 components/esm/loadalch.cpp                 |   2 +-
 components/esm/loadappa.cpp                 |   2 +-
 components/esm/loadarmo.cpp                 |   2 +-
 components/esm/loadbody.cpp                 |   2 +-
 components/esm/loadbook.cpp                 |   2 +-
 components/esm/loadbsgn.cpp                 |   2 +-
 components/esm/loadcell.cpp                 |   4 +-
 components/esm/loadclas.cpp                 |   2 +-
 components/esm/loadclot.cpp                 |   2 +-
 components/esm/loadcont.cpp                 |   2 +-
 components/esm/loadcrea.cpp                 |   2 +-
 components/esm/loaddial.cpp                 |   2 +-
 components/esm/loaddoor.cpp                 |   2 +-
 components/esm/loadench.cpp                 |   2 +-
 components/esm/loadfact.cpp                 |   2 +-
 components/esm/loadinfo.cpp                 |   2 +-
 components/esm/loadingr.cpp                 |   2 +-
 components/esm/loadland.cpp                 |   4 +-
 components/esm/loadlevlist.cpp              |   2 +-
 components/esm/loadligh.cpp                 |   2 +-
 components/esm/loadlock.cpp                 |   2 +-
 components/esm/loadltex.cpp                 |   2 +-
 components/esm/loadmgef.cpp                 |   2 +-
 components/esm/loadmisc.cpp                 |   2 +-
 components/esm/loadnpc.cpp                  |   2 +-
 components/esm/loadpgrd.cpp                 |   2 +-
 components/esm/loadprob.cpp                 |   2 +-
 components/esm/loadrace.cpp                 |   2 +-
 components/esm/loadregn.cpp                 |   4 +-
 components/esm/loadrepa.cpp                 |   2 +-
 components/esm/loadscpt.cpp                 |   6 +-
 components/esm/loadskil.cpp                 |   2 +-
 components/esm/loadsndg.cpp                 |   2 +-
 components/esm/loadsoun.cpp                 |   2 +-
 components/esm/loadspel.cpp                 |   2 +-
 components/esm/loadsscr.cpp                 |   2 +-
 components/esm/loadstat.cpp                 |   2 +-
 components/esm/loadtes3.cpp                 |  12 +--
 components/esm/loadweap.cpp                 |   2 +-
 components/esm/transport.cpp                |   4 +-
 53 files changed, 178 insertions(+), 118 deletions(-)

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 3e5c6aa5db..6d2b59ad98 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -357,10 +357,10 @@ int load(Arguments& info)
             EsmTool::RecordBase *record = EsmTool::RecordBase::create(n);
             if (record == 0)
             {
-                if (std::find(skipped.begin(), skipped.end(), n.val) == skipped.end())
+                if (std::find(skipped.begin(), skipped.end(), n.intval) == skipped.end())
                 {
                     std::cout << "Skipping " << n.toString() << " records." << std::endl;
-                    skipped.push_back(n.val);
+                    skipped.push_back(n.intval);
                 }
 
                 esm.skipRecord();
@@ -392,7 +392,7 @@ int load(Arguments& info)
                 record->print();
             }
 
-            if (record->getType().val == ESM::REC_CELL && loadCells && interested)
+            if (record->getType().intval == ESM::REC_CELL && loadCells && interested)
             {
                 loadCell(record->cast<ESM::Cell>()->get(), esm, info);
             }
@@ -405,7 +405,7 @@ int load(Arguments& info)
             {
                 delete record;
             }
-            ++info.data.mRecordStats[n.val];
+            ++info.data.mRecordStats[n.intval];
         }
 
     } catch(std::exception &e) {
@@ -448,14 +448,13 @@ int clone(Arguments& info)
 
     std::cout << "Loaded " << recordCount << " records:" << std::endl << std::endl;
 
-    ESM::NAME name;
-
     int i = 0;
     typedef std::map<int, int> Stats;
     Stats &stats = info.data.mRecordStats;
     for (Stats::iterator it = stats.begin(); it != stats.end(); ++it)
     {
-        name.val = it->first;
+        ESM::NAME name;
+        name.intval = it->first;
         int amount = it->second;
         std::cout << std::setw(digitCount) << amount << " " << name.toString() << "  ";
 
@@ -488,12 +487,12 @@ int clone(Arguments& info)
     for (Records::iterator it = records.begin(); it != records.end() && i > 0; ++it)
     {
         EsmTool::RecordBase *record = *it;
-        name.val = record->getType().val;
+        const ESM::NAME& typeName = record->getType();
 
-        esm.startRecord(name.toString(), record->getFlags());
+        esm.startRecord(typeName.toString(), record->getFlags());
 
         record->save(esm);
-        if (name.val == ESM::REC_CELL) {
+        if (typeName.intval == ESM::REC_CELL) {
             ESM::Cell *ptr = &record->cast<ESM::Cell>()->get();
             if (!info.data.mCellRefs[ptr].empty()) {
                 typedef std::deque<std::pair<ESM::CellRef, bool> > RefList;
@@ -505,7 +504,7 @@ int clone(Arguments& info)
             }
         }
 
-        esm.endRecord(name.toString());
+        esm.endRecord(typeName.toString());
 
         saved++;
         int perc = (int)((saved / (float)recordCount)*100);
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index d7cbea73b0..2382612a4d 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -179,7 +179,7 @@ RecordBase::create(ESM::NAME type)
 {
     RecordBase *record = 0;
 
-    switch (type.val) {
+    switch (type.intval) {
     case ESM::REC_ACTI:
     {
         record = new EsmTool::Record<ESM::Activator>;
diff --git a/apps/essimporter/importer.cpp b/apps/essimporter/importer.cpp
index 3d94f2b90d..f17db309f4 100644
--- a/apps/essimporter/importer.cpp
+++ b/apps/essimporter/importer.cpp
@@ -322,14 +322,14 @@ namespace ESSImport
             ESM::NAME n = esm.getRecName();
             esm.getRecHeader();
 
-            std::map<unsigned int, boost::shared_ptr<Converter> >::iterator it = converters.find(n.val);
+            std::map<unsigned int, boost::shared_ptr<Converter> >::iterator it = converters.find(n.intval);
             if (it != converters.end())
             {
                 it->second->read(esm);
             }
             else
             {
-                if (unknownRecords.insert(n.val).second)
+                if (unknownRecords.insert(n.intval).second)
                 {
                     std::ios::fmtflags f(std::cerr.flags());
                     std::cerr << "unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 5c81d3b08b..70c6d5d7e9 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -942,7 +942,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 
     bool unhandledRecord = false;
 
-    switch (n.val)
+    switch (n.intval)
     {
         case ESM::REC_GLOB: mGlobals.load (*mReader, mBase); break;
         case ESM::REC_GMST: mGmsts.load (*mReader, mBase); break;
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index eff7167def..e828a7f4ef 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1187,7 +1187,7 @@ namespace CSMWorld
 
             std::vector<ESM::ContItem>& list = container.mInventory.mList;
 
-            ESM::ContItem newRow = {0, {""}};
+            ESM::ContItem newRow = ESM::ContItem();
 
             if (position >= (int)list.size())
                 list.push_back(newRow);
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index cb3b4ca225..a8639b94b5 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -385,7 +385,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
             ESM::NAME n = reader.getRecName();
             reader.getRecHeader();
 
-            switch (n.val)
+            switch (n.intval)
             {
                 case ESM::REC_SAVE:
                     {
@@ -405,12 +405,12 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_JOUR_LEGACY:
                 case ESM::REC_QUES:
 
-                    MWBase::Environment::get().getJournal()->readRecord (reader, n.val);
+                    MWBase::Environment::get().getJournal()->readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_DIAS:
 
-                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.val);
+                    MWBase::Environment::get().getDialogueManager()->readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_ALCH:
@@ -433,7 +433,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_ENAB:
                 case ESM::REC_LEVC:
                 case ESM::REC_LEVI:
-                    MWBase::Environment::get().getWorld()->readRecord(reader, n.val, contentFileMap);
+                    MWBase::Environment::get().getWorld()->readRecord(reader, n.intval, contentFileMap);
                     break;
 
                 case ESM::REC_CAM_:
@@ -442,7 +442,7 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
 
                 case ESM::REC_GSCR:
 
-                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.val);
+                    MWBase::Environment::get().getScriptManager()->getGlobalScripts().readRecord (reader, n.intval);
                     break;
 
                 case ESM::REC_GMAP:
@@ -450,13 +450,13 @@ void MWState::StateManager::loadGame (const Character *character, const std::str
                 case ESM::REC_ASPL:
                 case ESM::REC_MARK:
 
-                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.val);
+                    MWBase::Environment::get().getWindowManager()->readRecord(reader, n.intval);
                     break;
 
                 case ESM::REC_DCOU:
                 case ESM::REC_STLN:
 
-                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.val);
+                    MWBase::Environment::get().getMechanicsManager()->readRecord(reader, n.intval);
                     break;
 
                 default:
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 7a1f222c78..4a1763d0aa 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -74,10 +74,10 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         esm.getRecHeader();
 
         // Look up the record type.
-        std::map<int, StoreBase *>::iterator it = mStores.find(n.val);
+        std::map<int, StoreBase *>::iterator it = mStores.find(n.intval);
 
         if (it == mStores.end()) {
-            if (n.val == ESM::REC_INFO) {
+            if (n.intval == ESM::REC_INFO) {
                 if (dialogue)
                 {
                     dialogue->readInfo(esm, esm.getIndex() != 0);
@@ -87,12 +87,12 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                     std::cerr << "error: info record without dialog" << std::endl;
                     esm.skipRecord();
                 }
-            } else if (n.val == ESM::REC_MGEF) {
+            } else if (n.intval == ESM::REC_MGEF) {
                 mMagicEffects.load (esm);
-            } else if (n.val == ESM::REC_SKIL) {
+            } else if (n.intval == ESM::REC_SKIL) {
                 mSkills.load (esm);
             }
-            else if (n.val==ESM::REC_FILT || n.val == ESM::REC_DBGP)
+            else if (n.intval==ESM::REC_FILT || n.intval == ESM::REC_DBGP)
             {
                 // ignore project file only records
                 esm.skipRecord();
@@ -110,7 +110,7 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 continue;
             }
 
-            if (n.val==ESM::REC_DIAL) {
+            if (n.intval==ESM::REC_DIAL) {
                 dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
             } else {
                 dialogue = 0;
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index 14fb14dd48..74d45bb0c3 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -62,7 +62,7 @@ void ESM::CellRef::loadData(ESMReader &esm, bool &isDeleted)
     while (!isLoaded && esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::FourCC<'U','N','A','M'>::value:
                 esm.getHT(mReferenceBlocked);
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 66e338d0c4..17249d8a3b 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -13,7 +13,7 @@ void ESM::DebugProfile::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::SREC_NAME:
                 mId = esm.getHString();
diff --git a/components/esm/esmcommon.hpp b/components/esm/esmcommon.hpp
index d90a3444dd..d635ba6dff 100644
--- a/components/esm/esmcommon.hpp
+++ b/components/esm/esmcommon.hpp
@@ -15,43 +15,98 @@ enum Version
     VER_13 = 0x3fa66666
   };
 
-/* A structure used for holding fixed-length strings. In the case of
-   LEN=4, it can be more efficient to match the string as a 32 bit
-   number, therefore the struct is implemented as a union with an int.
- */
-template <int LEN>
-union NAME_T
+
+// CRTP for FIXED_STRING class, a structure used for holding fixed-length strings
+template< template<size_t> class DERIVED, size_t SIZE>
+class FIXED_STRING_BASE
 {
-    char name[LEN];
-    uint32_t val;
+    /* The following methods must be implemented in derived classes:
+     *   char const* ro_data() const; // return pointer to ro buffer
+     *   char*       rw_data();       // return pointer to rw buffer
+     */
+public:
+    enum { size = SIZE };
 
-  bool operator==(const char *str) const
-  {
-    for(int i=0; i<LEN; i++)
-      if(name[i] != str[i]) return false;
-      else if(name[i] == 0) return true;
-    return str[LEN] == 0;
-  }
-  bool operator!=(const char *str) const { return !((*this)==str); }
+    template<size_t OTHER_SIZE>
+    bool operator==(char const (&str)[OTHER_SIZE]) const
+    {
+        size_t other_len = strnlen(str, OTHER_SIZE);
+        if (other_len != this->length())
+            return false;
+        return std::strncmp(self()->ro_data(), str, size) == 0;
+    }
+    bool operator==(const char* const str) const
+    {
+        char const* const data = self()->ro_data();
+        for(size_t i = 0; i < size; ++i)
+        {
+            if(data[i] != str[i]) return false;
+            else if(data[i] == '\0') return true;
+        }
+        return str[size] == '\0';
+    }
+    bool operator!=(const char* const str) const { return !( (*this) == str ); }
 
-  bool operator==(const std::string &str) const
-  {
-    return (*this) == str.c_str();
-  }
-  bool operator!=(const std::string &str) const { return !((*this)==str); }
+    bool operator==(const std::string& str) const
+    {
+        return (*this) == str.c_str();
+    }
+    bool operator!=(const std::string& str) const { return !( (*this) == str ); }
 
-  bool operator==(uint32_t v) const { return v == val; }
-  bool operator!=(uint32_t v) const { return v != val; }
+    size_t data_size() const { return size; }
+    size_t length() const { return strnlen(self()->ro_data(), size); }
+    std::string toString() const { return std::string(self()->ro_data(), this->length()); }
 
-  std::string toString() const { return std::string(name, strnlen(name, LEN)); }
+    void assign(const std::string& value) { std::strncpy(self()->rw_data(), value.c_str(), size); }
+    void clear() { this->assign(""); }
+private:
+    DERIVED<size> const* self() const
+    {
+        return static_cast<DERIVED<size> const*>(this);
+    }
 
-  void assign (const std::string& value) { std::strncpy (name, value.c_str(), LEN); }
+    // write the non-const version in terms of the const version
+    // Effective C++ 3rd ed., Item 3 (p. 24-25)
+    DERIVED<size>* self()
+    {
+        return const_cast<DERIVED<size>*>(static_cast<FIXED_STRING_BASE const*>(this)->self());
+    }
 };
 
-typedef NAME_T<4> NAME;
-typedef NAME_T<32> NAME32;
-typedef NAME_T<64> NAME64;
-typedef NAME_T<256> NAME256;
+// Generic implementation
+template <size_t SIZE>
+struct FIXED_STRING : public FIXED_STRING_BASE<FIXED_STRING, SIZE>
+{
+    char data[SIZE];
+
+    char const* ro_data() const { return data; }
+    char*       rw_data() { return data; }
+};
+
+// In the case of SIZE=4, it can be more efficient to match the string
+// as a 32 bit number, therefore the struct is implemented as a union with an int.
+template <>
+struct FIXED_STRING<4> : public FIXED_STRING_BASE<FIXED_STRING, 4>
+{
+    union {
+        char data[4];
+        uint32_t intval;
+    };
+
+    using FIXED_STRING_BASE::operator==;
+    using FIXED_STRING_BASE::operator!=;
+
+    bool operator==(uint32_t v) const { return v == intval; }
+    bool operator!=(uint32_t v) const { return v != intval; }
+
+    char const* ro_data() const { return data; }
+    char*       rw_data() { return data; }
+};
+
+typedef FIXED_STRING<4> NAME;
+typedef FIXED_STRING<32> NAME32;
+typedef FIXED_STRING<64> NAME64;
+typedef FIXED_STRING<256> NAME256;
 
 /* This struct defines a file 'context' which can be saved and later
    restored by an ESMReader instance. It will save the position within
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 6ef14a70e0..2a716427ec 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -55,8 +55,8 @@ void ESMReader::close()
     mCtx.leftRec = 0;
     mCtx.leftSub = 0;
     mCtx.subCached = false;
-    mCtx.recName.val = 0;
-    mCtx.subName.val = 0;
+    mCtx.recName.clear();
+    mCtx.subName.clear();
 }
 
 void ESMReader::openRaw(Files::IStreamPtr _esm, const std::string& name)
@@ -204,16 +204,18 @@ void ESMReader::getSubName()
     }
 
     // reading the subrecord data anyway.
-    getExact(mCtx.subName.name, 4);
-    mCtx.leftRec -= 4;
+    const size_t subNameSize = mCtx.subName.data_size();
+    getExact(mCtx.subName.rw_data(), subNameSize);
+    mCtx.leftRec -= subNameSize;
 }
 
 bool ESMReader::isEmptyOrGetName()
 {
     if (mCtx.leftRec)
     {
-        getExact(mCtx.subName.name, 4);
-        mCtx.leftRec -= 4;
+        const size_t subNameSize = mCtx.subName.data_size();
+        getExact(mCtx.subName.rw_data(), subNameSize);
+        mCtx.leftRec -= subNameSize;
         return false;
     }
     return true;
@@ -267,7 +269,7 @@ NAME ESMReader::getRecName()
     if (!hasMoreRecs())
         fail("No more records, getRecName() failed");
     getName(mCtx.recName);
-    mCtx.leftFile -= 4;
+    mCtx.leftFile -= mCtx.recName.data_size();
 
     // Make sure we don't carry over any old cached subrecord
     // names. This can happen in some cases when we skip parts of a
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index c3658f1520..4f0519f80b 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -13,7 +13,7 @@ void ESM::Filter::load (ESMReader& esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        uint32_t name = esm.retSubName().val;
+        uint32_t name = esm.retSubName().intval;
         switch (name)
         {
             case ESM::SREC_NAME:
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index b9934d3d39..ba35535b8f 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index 2049045024..85c24dc2d1 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index 490881fae7..1bd1f93798 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index f2526554af..929c111a98 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -49,7 +49,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index 09113e8d1b..3e5895c2c6 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index 617040be42..d5283b8eb0 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index 9a4d98bb7b..e3b2f76a3a 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index eb9d6b8d8e..3a8a11779e 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -69,7 +69,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mName = esm.getHString();
@@ -114,7 +114,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     int waterl;
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index 61960b87db..1e18bc0540 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -47,7 +47,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index 2ef69e5e91..12f0d495d5 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 739b0d7db6..5ee785fb8d 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -36,7 +36,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index b517820896..ddd49f8df9 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -30,7 +30,7 @@ namespace ESM {
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index bc87c4f57d..5758dc0c46 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -28,7 +28,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                 {
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index 6d8c0978c8..523d8a1efc 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index ae83c63f70..78e2fb5aa3 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -18,7 +18,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index 75c482d201..07611c32fd 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -40,7 +40,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 246baf0265..37fd709080 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -35,7 +35,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'D','A','T','A'>::value:
                     esm.getHT(mData, 12);
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index e00e73ab0b..a18e321ff7 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index b0b072232a..87d0233b5c 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -94,7 +94,7 @@ namespace ESM
         while (!isLoaded && esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','T','V'>::value:
                     esm.getSubHeaderIs(8);
@@ -125,7 +125,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'V','N','M','L'>::value:
                     esm.skipHSub();
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index 8c0d503244..0aed15aa94 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -15,7 +15,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index 20c700b238..2a6dac14b0 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index fc6af86990..b14353ec5a 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp
index a42ae7c5bf..613b706e30 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index eef58aa2f1..e33bd3ab42 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -211,7 +211,7 @@ void MagicEffect::load(ESMReader &esm, bool &isDeleted)
     while (esm.hasMoreSubs())
     {
         esm.getSubName();
-        switch (esm.retSubName().val)
+        switch (esm.retSubName().intval)
         {
             case ESM::FourCC<'I','T','E','X'>::value:
                 mIcon = esm.getHString();
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index 199b4e3b2c..3ba6626505 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index e524e6a7cc..a68c97a6ad 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -26,7 +26,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 69ee60eeb8..15accd95bb 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -46,7 +46,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mCell = esm.getHString();
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index baf466490b..6307df3298 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index a371751446..88ce08c913 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -29,7 +29,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index e5382f50b6..6e0e6db9de 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
@@ -61,10 +61,12 @@ namespace ESM
                     esm.getHT(mMapColor);
                     break;
                 case ESM::FourCC<'S','N','A','M'>::value:
+                {
                     SoundRef sr;
                     esm.getHT(sr, 33);
                     mSoundList.push_back(sr);
                     break;
+                }
                 case ESM::SREC_DELE:
                     esm.skipHSub();
                     isDeleted = true;
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index e4af3d9378..c04691c12f 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index b46d5b658a..1adebe45f3 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -67,15 +67,17 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'S','C','H','D'>::value:
+                {
                     SCHD data;
                     esm.getHT(data, 52);
                     mData = data.mData;
                     mId = data.mName.toString();
                     hasHeader = true;
                     break;
+                }
                 case ESM::FourCC<'S','C','V','R'>::value:
                     // list of local variables
                     loadSCVR(esm);
@@ -113,7 +115,7 @@ namespace ESM
         memset(&data, 0, sizeof(data));
 
         data.mData = mData;
-        memcpy(data.mName.name, mId.c_str(), mId.size());
+        data.mName.assign(mId);
 
         esm.writeHNT("SCHD", data, 52);
 
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index c520897910..36204c9401 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -138,7 +138,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::FourCC<'I','N','D','X'>::value:
                     esm.getHT(mIndex);
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index d84fe624d0..9bd806641b 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index 82f169e54f..3b3dc1eacd 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 728b7bc2a7..947e6c9ec8 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -19,7 +19,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index ab4c09750d..f8854493b9 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 62d495ee34..6c9de22bd1 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -16,7 +16,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 60d411fc63..b16145467c 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -9,8 +9,8 @@ void ESM::Header::blank()
 {
     mData.version = ESM::VER_13;
     mData.type = 0;
-    mData.author.assign ("");
-    mData.desc.assign ("");
+    mData.author.clear();
+    mData.desc.clear();
     mData.records = 0;
     mFormat = CurrentFormat;
     mMaster.clear();
@@ -32,8 +32,8 @@ void ESM::Header::load (ESMReader &esm)
       esm.getSubHeader();
       esm.getT(mData.version);
       esm.getT(mData.type);
-      mData.author.assign(esm.getString(sizeof(mData.author.name)));
-      mData.desc.assign(esm.getString(sizeof(mData.desc.name)));
+      mData.author.assign( esm.getString(mData.author.data_size()) );
+      mData.desc.assign( esm.getString(mData.desc.data_size()) );
       esm.getT(mData.records);
     }
 
@@ -73,8 +73,8 @@ void ESM::Header::save (ESMWriter &esm)
     esm.startSubRecord("HEDR");
     esm.writeT(mData.version);
     esm.writeT(mData.type);
-    esm.writeFixedSizeString(mData.author.toString(), 32);
-    esm.writeFixedSizeString(mData.desc.toString(), 256);
+    esm.writeFixedSizeString(mData.author.toString(), mData.author.data_size());
+    esm.writeFixedSizeString(mData.desc.toString(), mData.desc.data_size());
     esm.writeT(mData.records);
     esm.endRecord("HEDR");
 
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index 880a26bcb3..4a77ff6a00 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -17,7 +17,7 @@ namespace ESM
         while (esm.hasMoreSubs())
         {
             esm.getSubName();
-            switch (esm.retSubName().val)
+            switch (esm.retSubName().intval)
             {
                 case ESM::SREC_NAME:
                     mId = esm.getHString();
diff --git a/components/esm/transport.cpp b/components/esm/transport.cpp
index da0a5f7676..063c033299 100644
--- a/components/esm/transport.cpp
+++ b/components/esm/transport.cpp
@@ -8,13 +8,13 @@ namespace ESM
 
     void Transport::add(ESMReader &esm)
     {
-        if (esm.retSubName().val == ESM::FourCC<'D','O','D','T'>::value)
+        if (esm.retSubName().intval == ESM::FourCC<'D','O','D','T'>::value)
         {
             Dest dodt;
             esm.getHExact(&dodt.mPos, 24);
             mList.push_back(dodt);
         }
-        else if (esm.retSubName().val == ESM::FourCC<'D','N','A','M'>::value)
+        else if (esm.retSubName().intval == ESM::FourCC<'D','N','A','M'>::value)
         {
             mList.back().mCellName = esm.getHString();
         }

From 5ae18640620c81d726551b55da95513a1be14c64 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sat, 7 May 2016 22:23:53 +0300
Subject: [PATCH 600/765] Add unit tests for ESM::FIXED_STRING

---
 apps/openmw_test_suite/CMakeLists.txt         |  2 +
 .../esm/test_fixed_string.cpp                 | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 apps/openmw_test_suite/esm/test_fixed_string.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 2300f97a36..24ea1835aa 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -9,6 +9,8 @@ if (GTEST_FOUND)
         mwworld/test_store.cpp
 
         mwdialogue/test_keywordsearch.cpp
+
+        esm/test_fixed_string.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esm/test_fixed_string.cpp b/apps/openmw_test_suite/esm/test_fixed_string.cpp
new file mode 100644
index 0000000000..59dd7fe66a
--- /dev/null
+++ b/apps/openmw_test_suite/esm/test_fixed_string.cpp
@@ -0,0 +1,75 @@
+#include <gtest/gtest.h>
+#include "components/esm/esmcommon.hpp"
+
+TEST(EsmFixedString, operator__eq_ne)
+{
+    {
+        SCOPED_TRACE("asdc == asdc");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[4] = {'a', 's', 'd', 'c'};
+        std::string ss(s, 4);
+
+        EXPECT_TRUE(name == s);
+        EXPECT_TRUE(name == ss.c_str());
+        EXPECT_TRUE(name == ss);
+    }
+    {
+        SCOPED_TRACE("asdc == asdcx");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[5] = {'a', 's', 'd', 'c', 'x'};
+        std::string ss(s, 5);
+
+        EXPECT_TRUE(name != s);
+        EXPECT_TRUE(name != ss.c_str());
+        EXPECT_TRUE(name != ss);
+    }
+    {
+        SCOPED_TRACE("asdc == asdc[NULL]");
+        ESM::NAME name;
+        name.assign("asdc");
+        char s[5] = {'a', 's', 'd', 'c', '\0'};
+        std::string ss(s, 5);
+
+        EXPECT_TRUE(name == s);
+        EXPECT_TRUE(name == ss.c_str());
+        EXPECT_TRUE(name == ss);
+    }
+}
+
+TEST(EsmFixedString, empty_strings)
+{
+    {
+        SCOPED_TRACE("4 bytes");
+        ESM::NAME empty = ESM::NAME();
+        EXPECT_TRUE(empty == "");
+        EXPECT_TRUE(empty == static_cast<uint32_t>(0));
+        EXPECT_TRUE(empty != "some string");
+        EXPECT_TRUE(empty != static_cast<uint32_t>(42));
+    }
+    {
+        SCOPED_TRACE("32 bytes");
+        ESM::NAME32 empty = ESM::NAME32();
+        EXPECT_TRUE(empty == "");
+        EXPECT_TRUE(empty != "some string");
+    }
+}
+
+TEST(EsmFixedString, struct_size)
+{
+    ASSERT_EQ(4, sizeof(ESM::NAME));
+    ASSERT_EQ(32, sizeof(ESM::NAME32));
+    ASSERT_EQ(64, sizeof(ESM::NAME64));
+    ASSERT_EQ(256, sizeof(ESM::NAME256));
+}
+
+TEST(EsmFixedString, DISABLED_is_pod)
+{
+    /* TODO: enable in C++11
+     * ASSERT_TRUE(std::is_pod<ESM::NAME>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME32>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME64>::value);
+     * ASSERT_TRUE(std::is_pod<ESM::NAME256>::value);
+     */
+}

From e6863c8f796ee4e4fe77589e22d722e3a837cc39 Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 8 May 2016 06:05:52 -0400
Subject: [PATCH 601/765] Editor: Undo editable column check in record add

---
 apps/opencs/model/world/idtable.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 5f50f22109..cebd0ebdbf 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -160,9 +160,7 @@ void CSMWorld::IdTable::addRecordWithData (const std::string& id,
 
     for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
     {
-        int columnIndex = getModelIndex(id, iter->first).column();
-        if (mIdCollection->getColumn(columnIndex).isEditable())
-            mIdCollection->setData(index, iter->first, iter->second);
+        mIdCollection->setData(index, iter->first, iter->second);
     }
 
     endInsertRows();

From 547d783eacdeffa7b04ec6fd596d2cbb4e60afae Mon Sep 17 00:00:00 2001
From: Rob Cutmore <robcutmore@gmail.com>
Date: Sun, 8 May 2016 06:09:40 -0400
Subject: [PATCH 602/765] Editor: Remove overridden configureCreateCommand

StartScriptCreator was incorrectly overriding configureCreateCommand.
This caused issues trying to edit an uneditable column while adding a
new record.
---
 apps/opencs/view/world/startscriptcreator.cpp | 9 ---------
 apps/opencs/view/world/startscriptcreator.hpp | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/apps/opencs/view/world/startscriptcreator.cpp b/apps/opencs/view/world/startscriptcreator.cpp
index 1ffcdf06a7..8911990271 100644
--- a/apps/opencs/view/world/startscriptcreator.cpp
+++ b/apps/opencs/view/world/startscriptcreator.cpp
@@ -24,15 +24,6 @@ CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
     );
 }
 
-void CSVWorld::StartScriptCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
-{
-    CSMWorld::IdTable& table = getStartScriptsTable();
-    int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
-
-    // Set script ID to be added to start scripts table.
-    command.addValue(column, mScript->text());
-}
-
 CSVWorld::StartScriptCreator::StartScriptCreator(
     CSMWorld::Data &data,
     QUndoStack &undoStack,
diff --git a/apps/opencs/view/world/startscriptcreator.hpp b/apps/opencs/view/world/startscriptcreator.hpp
index 473e2fd5f6..72eb67bccd 100644
--- a/apps/opencs/view/world/startscriptcreator.hpp
+++ b/apps/opencs/view/world/startscriptcreator.hpp
@@ -31,10 +31,6 @@ namespace CSVWorld
             /// \return reference to table containing start scripts.
             CSMWorld::IdTable& getStartScriptsTable() const;
 
-            /// \brief Add user input to command for creating start script.
-            /// \param command Creation command to configure.
-            virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
-
         public:
 
             StartScriptCreator(

From 3584e5940203bdec37e80cce33f7ee6f84974bd7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 8 May 2016 18:59:41 +0200
Subject: [PATCH 603/765] Fix incorrect parameter to changeCell (Fixes #3388)

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index a72ee90219..ef353cd2f4 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1003,7 +1003,7 @@ namespace MWWorld
         if (cellId.mPaged)
             changeToExteriorCell (position, adjustPlayerPos, changeEvent);
         else
-            changeToInteriorCell (cellId.mWorldspace, position, changeEvent);
+            changeToInteriorCell (cellId.mWorldspace, position, adjustPlayerPos, changeEvent);
     }
 
     void World::markCellAsUnchanged()

From a6b67154bb0707739d8d3d54afa5800a33ca523e Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 00:04:18 +0300
Subject: [PATCH 604/765] Use builtin compiler version in CMake scripts

---
 CMakeLists.txt | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fdd0e8e5f..2803cbbbe3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,11 +141,11 @@ if (USE_QT)
 endif()
 
 if (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
-	# 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
-	cmake_minimum_required(VERSION 2.8.11)
+    # 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
+    cmake_minimum_required(VERSION 2.8.11)
 else()
-	# We probably support older versions than this.
-	cmake_minimum_required(VERSION 2.6)
+    # We probably support older versions than this.
+    cmake_minimum_required(VERSION 2.6)
 endif()
 
 # Sound setup
@@ -246,12 +246,6 @@ if(OSG_STATIC)
       set(OPENSCENEGRAPH_LIBRARIES ${OPENSCENEGRAPH_LIBRARIES} ${${PLUGIN_NAME}_LIBRARY})
    endmacro()
 
-   macro(use_static_osg_plugin_dep DEPENDENCY)
-      find_package(${DEPENDENCY} REQUIRED)
-
-      set(OPENSCENEGRAPH_LIBRARIES ${OPENSCENEGRAPH_LIBRARIES} ${${DEPENDENCY}_LIBRARIES})
-   endmacro()
-
    add_definitions(-DOSG_LIBRARY_STATIC)
 
    set(PLUGIN_LIST
@@ -272,6 +266,11 @@ if(OSG_STATIC)
        JPEG # needed by osgdb_jpeg
        )
 
+   macro(use_static_osg_plugin_dep DEPENDENCY)
+      find_package(${DEPENDENCY} REQUIRED)
+
+      set(OPENSCENEGRAPH_LIBRARIES ${OPENSCENEGRAPH_LIBRARIES} ${${DEPENDENCY}_LIBRARIES})
+   endmacro()
    foreach(DEPENDENCY ${PLUGIN_DEPS_LIST})
       use_static_osg_plugin_dep(${DEPENDENCY})
    endforeach()
@@ -376,18 +375,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wno-unused-parameter -std=c++98 -pedantic -Wno-long-long")
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
-        execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE CLANG_VERSION)
-        string(REGEX REPLACE ".*version ([0-9\\.]*).*" "\\1" CLANG_VERSION ${CLANG_VERSION})
-        if ("${CLANG_VERSION}" VERSION_GREATER 3.6 OR "${CLANG_VERSION}" VERSION_EQUAL 3.6)
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 3.6)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression")
-        endif ("${CLANG_VERSION}" VERSION_GREATER 3.6 OR "${CLANG_VERSION}" VERSION_EQUAL 3.6)
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
+        endif ()
+    endif()
 
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                OUTPUT_VARIABLE GCC_VERSION)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND "${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter")
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL GNU AND "${GCC_VERSION}" VERSION_GREATER 4.6 OR "${GCC_VERSION}" VERSION_EQUAL 4.6)
+    endif()
 elseif (MSVC)
     # Enable link-time code generation globally for all linking
     if (OPENMW_LTO_BUILD)

From 16fbce91c225426990c727b235dddbaa94dc3c59 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 19:34:17 +0300
Subject: [PATCH 605/765] Implements macro get_version_from_n_defines inside
 PreprocessorUtils

---
 cmake/PreprocessorUtils.cmake | 39 ++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/cmake/PreprocessorUtils.cmake b/cmake/PreprocessorUtils.cmake
index 38462a98d4..7fb135bd32 100644
--- a/cmake/PreprocessorUtils.cmake
+++ b/cmake/PreprocessorUtils.cmake
@@ -36,9 +36,9 @@ endmacro()
 macro(replace_preprocessor_entry VARIABLE KEYWORD NEW_VALUE)
   string(REGEX REPLACE 
     "(// *)?# *define +${KEYWORD} +[^ \n]*"
-	"#define ${KEYWORD} ${NEW_VALUE}"
-	${VARIABLE}_TEMP
-	${${VARIABLE}}
+        "#define ${KEYWORD} ${NEW_VALUE}"
+        ${VARIABLE}_TEMP
+        ${${VARIABLE}}
   )
   set(${VARIABLE} ${${VARIABLE}_TEMP})  
 endmacro()
@@ -51,10 +51,35 @@ macro(set_preprocessor_entry VARIABLE KEYWORD ENABLE)
   endif ()
   string(REGEX REPLACE 
     "(// *)?# *define +${KEYWORD} *\n"
-	${TMP_REPLACE_STR}
-	${VARIABLE}_TEMP
-	${${VARIABLE}}
+        ${TMP_REPLACE_STR}
+        ${VARIABLE}_TEMP
+        ${${VARIABLE}}
   )
   set(${VARIABLE} ${${VARIABLE}_TEMP})  
 endmacro()
-  
+
+
+# get_version_from_n_defines(result_version_name header_path [list of defines...])
+#
+# get_version_from_n_defines(MyPackage_VERSION /Header/Path/HeaderName.h
+#     MYPACKAGE_VERSION_MAJOR
+#     MYPACKAGE_VERSION_MINOR
+# )
+# Function call will get the values of defines MYPACKAGE_VERSION_MAJOR & MYPACKAGE_VERSION_MINOR
+#  from header and set "${MYPACKAGE_VERSION_MAJOR}.${MYPACKAGE_VERSION_MINOR}" into MyPackage_VERSION
+#
+
+function(get_version_from_n_defines OUT_VAR HEADER_PATH)
+    if (NOT EXISTS ${HEADER_PATH})
+        message(FATAL_ERROR "Unable to find '${HEADER_PATH}'")
+        return()
+    endif ()
+    file(READ ${HEADER_PATH} _CONTENT)
+    unset(_DEFINES_LIST)
+    foreach (_DEFINE_NAME ${ARGN})
+        get_preprocessor_entry(_CONTENT ${_DEFINE_NAME} _DEFINE_VALUE)
+        list(APPEND _DEFINES_LIST ${_DEFINE_VALUE})
+    endforeach()
+    string(REPLACE ";" "." _VERSION "${_DEFINES_LIST}")
+    set(${OUT_VAR} "${_VERSION}" PARENT_SCOPE)
+endfunction()

From 81dd16400691764ff827b7eee646b75ab3cd67fd Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 16:45:24 +0300
Subject: [PATCH 606/765] Adds CMake module LibFindMacros to reduce pain in
 find modules

---
 cmake/LibFindMacros.cmake | 266 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 266 insertions(+)
 create mode 100644 cmake/LibFindMacros.cmake

diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
new file mode 100644
index 0000000000..e842cb73a6
--- /dev/null
+++ b/cmake/LibFindMacros.cmake
@@ -0,0 +1,266 @@
+# Version 2.2
+# Public Domain, originally written by Lasse Kärkkäinen <tronic>
+# Maintained at https://github.com/Tronic/cmake-modules
+# Please send your improvements as pull requests on Github.
+
+# Find another package and make it a dependency of the current package.
+# This also automatically forwards the "REQUIRED" argument.
+# Usage: libfind_package(<prefix> <another package> [extra args to find_package])
+macro (libfind_package PREFIX PKG)
+  set(${PREFIX}_args ${PKG} ${ARGN})
+  if (${PREFIX}_FIND_REQUIRED)
+    set(${PREFIX}_args ${${PREFIX}_args} REQUIRED)
+  endif()
+  find_package(${${PREFIX}_args})
+  set(${PREFIX}_DEPENDENCIES ${${PREFIX}_DEPENDENCIES};${PKG})
+  unset(${PREFIX}_args)
+endmacro()
+
+# A simple wrapper to make pkg-config searches a bit easier.
+# Works the same as CMake's internal pkg_check_modules but is always quiet.
+macro (libfind_pkg_check_modules)
+  find_package(PkgConfig QUIET)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(${ARGN} QUIET)
+  endif()
+endmacro()
+
+# Avoid useless copy&pasta by doing what most simple libraries do anyway:
+# pkg-config, find headers, find library.
+# Usage: libfind_pkg_detect(<prefix> <pkg-config args> FIND_PATH <name> [other args] FIND_LIBRARY <name> [other args])
+# E.g. libfind_pkg_detect(SDL2 sdl2 FIND_PATH SDL.h PATH_SUFFIXES SDL2 FIND_LIBRARY SDL2)
+function (libfind_pkg_detect PREFIX)
+  # Parse arguments
+  set(argname pkgargs)
+  foreach (i ${ARGN})
+    if ("${i}" STREQUAL "FIND_PATH")
+      set(argname pathargs)
+    elseif ("${i}" STREQUAL "FIND_LIBRARY")
+      set(argname libraryargs)
+    else()
+      set(${argname} ${${argname}} ${i})
+    endif()
+  endforeach()
+  if (NOT pkgargs)
+    message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
+  endif()
+  # Find library
+  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
+  if (pathargs)
+    find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
+  endif()
+  if (libraryargs)
+    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
+  endif()
+endfunction()
+
+# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
+# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
+# Fourth argument "QUIET" may be used for silently testing different define names.
+# This function does nothing if the version variable is already defined.
+function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
+  # Skip processing if we already have a version or if the include dir was not found
+  if (${PREFIX}_VERSION OR NOT ${PREFIX}_INCLUDE_DIR)
+    return()
+  endif()
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  # Process optional arguments
+  foreach(arg ${ARGN})
+    if (arg STREQUAL "QUIET")
+      set(quiet TRUE)
+    else()
+      message(AUTHOR_WARNING "Unknown argument ${arg} to libfind_version_header ignored.")
+    endif()
+  endforeach()
+  # Read the header and parse for version number
+  set(filename "${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+  if (NOT EXISTS ${filename})
+    if (NOT quiet)
+      message(AUTHOR_WARNING "Unable to find ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+    endif()
+    return()
+  endif()
+  file(READ "${filename}" header)
+  string(REGEX MATCH ".*#[ \t]*define[ \t]+${DEFINE_NAME}[ \t]+((\"([^\n]*)\")|([^\n]*))" match "${header}")
+  # No regex match?
+  if (match STREQUAL header)
+    if (NOT quiet)
+      message(AUTHOR_WARNING "Unable to find \#define ${DEFINE_NAME} \"<version>\" from ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+    endif()
+    return()
+  endif()
+  # Export the version string
+  set(${PREFIX}_VERSION "${CMAKE_MATCH_3}${CMAKE_MATCH_4}" PARENT_SCOPE)
+endfunction()
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+function (libfind_process PREFIX)
+  # Skip processing if already processed during this configuration run
+  if (${PREFIX}_FOUND)
+    return()
+  endif()
+
+  set(found TRUE)  # Start with the assumption that the package was found
+
+  # Did we find any files? Did we miss includes? These are for formatting better error messages.
+  set(some_files FALSE)
+  set(missing_headers FALSE)
+
+  # Shorthands for some variables that we need often
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  set(required ${${PREFIX}_FIND_REQUIRED})
+  set(exactver ${${PREFIX}_FIND_VERSION_EXACT})
+  set(findver "${${PREFIX}_FIND_VERSION}")
+  set(version "${${PREFIX}_VERSION}")
+
+  # Lists of config option names (all, includes, libs)
+  unset(configopts)
+  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
+  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+
+  # Process deps to add to
+  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+      # The package seems to export option lists that we can use, woohoo!
+      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
+      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
+    else()
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
+        # Singular forms can be used
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
+        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
+      endif()
+    endif()
+  endforeach()
+
+  if (includeopts)
+    list(REMOVE_DUPLICATES includeopts)
+  endif()
+
+  if (libraryopts)
+    list(REMOVE_DUPLICATES libraryopts)
+  endif()
+
+  string(REGEX REPLACE ".*[ ;]([^ ;]*(_INCLUDE_DIRS|_LIBRARIES))" "\\1" tmp "${includeopts} ${libraryopts}")
+  if (NOT tmp STREQUAL "${includeopts} ${libraryopts}")
+    message(AUTHOR_WARNING "Plural form ${tmp} found in config options of ${PREFIX}. This works as before but is now deprecated. Please only use singular forms INCLUDE_DIR and LIBRARY, and update your find scripts for LibFindMacros > 2.0 automatic dependency system (most often you can simply remove the PROCESS variables entirely).")
+  endif()
+
+  # Include/library names separated by spaces (notice: not CMake lists)
+  unset(includes)
+  unset(libs)
+
+  # Process all includes and set found false if any are missing
+  foreach (i ${includeopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND includes "${${i}}")
+    else()
+      set(found FALSE)
+      set(missing_headers TRUE)
+    endif()
+  endforeach()
+
+  # Process all libraries and set found false if any are missing
+  foreach (i ${libraryopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND libs "${${i}}")
+    else()
+      set (found FALSE)
+    endif()
+  endforeach()
+
+  # Version checks
+  if (found AND findver)
+    if (NOT version)
+      message(WARNING "The find module for ${PREFIX} does not provide version information, so we'll just assume that it is OK. Please fix the module or remove package version requirements to get rid of this warning.")
+    elseif (version VERSION_LESS findver OR (exactver AND NOT version VERSION_EQUAL findver))
+      set(found FALSE)
+      set(version_unsuitable TRUE)
+    endif()
+  endif()
+
+  # If all-OK, hide all config options, export variables, print status and exit
+  if (found)
+    foreach (i ${configopts})
+      mark_as_advanced(${i})
+    endforeach()
+    if (NOT quiet)
+      message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      if (LIBFIND_DEBUG)
+        message(STATUS "  ${PREFIX}_DEPENDENCIES=${${PREFIX}_DEPENDENCIES}")
+        message(STATUS "  ${PREFIX}_INCLUDE_OPTS=${includeopts}")
+        message(STATUS "  ${PREFIX}_INCLUDE_DIRS=${includes}")
+        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
+        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
+      endif()
+      set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+      set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+      set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+      set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+      set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
+    endif()
+    return()
+  endif()
+
+  # Format messages for debug info and the type of error
+  set(vars "Relevant CMake configuration variables:\n")
+  foreach (i ${configopts})
+    mark_as_advanced(CLEAR ${i})
+    set(val ${${i}})
+    if ("${val}" STREQUAL "${i}-NOTFOUND")
+      set (val "<not found>")
+    elseif (val AND NOT EXISTS ${val})
+      set (val "${val}  (does not exist)")
+    else()
+      set(some_files TRUE)
+    endif()
+    set(vars "${vars}  ${i}=${val}\n")
+  endforeach()
+  set(vars "${vars}You may use CMake GUI, cmake -D or ccmake to modify the values. Delete CMakeCache.txt to discard all values and force full re-detection if necessary.\n")
+  if (version_unsuitable)
+    set(msg "${PREFIX} ${${PREFIX}_VERSION} was found but")
+    if (exactver)
+      set(msg "${msg} only version ${findver} is acceptable.")
+    else()
+      set(msg "${msg} version ${findver} is the minimum requirement.")
+    endif()
+  else()
+    if (missing_headers)
+      set(msg "We could not find development headers for ${PREFIX}. Do you have the necessary dev package installed?")
+    elseif (some_files)
+      set(msg "We only found some files of ${PREFIX}, not all of them. Perhaps your installation is incomplete or maybe we just didn't look in the right place?")
+      if(findver)
+        set(msg "${msg} This could also be caused by incompatible version (if it helps, at least ${PREFIX} ${findver} should work).")
+      endif()
+    else()
+      set(msg "We were unable to find package ${PREFIX}.")
+    endif()
+  endif()
+
+  # Fatal error out if REQUIRED
+  if (required)
+    set(msg "REQUIRED PACKAGE NOT FOUND\n${msg} This package is REQUIRED and you need to install it or adjust CMake configuration in order to continue building ${CMAKE_PROJECT_NAME}.")
+    message(FATAL_ERROR "${msg}\n${vars}")
+  endif()
+  # Otherwise just print a nasty warning
+  if (NOT quiet)
+    message(WARNING "WARNING: MISSING PACKAGE\n${msg} This package is NOT REQUIRED and you may ignore this warning but by doing so you may miss some functionality of ${CMAKE_PROJECT_NAME}. \n${vars}")
+  endif()
+endfunction()
+

From da59ef0f676a5917b87af34727401a401b280a3c Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 17:24:17 +0300
Subject: [PATCH 607/765] Rewrites FindFFmpeg using LibFindMacros handling
 components properly

---
 CMakeLists.txt                               |  10 +-
 apps/openmw/CMakeLists.txt                   |   6 +-
 cmake/FindFFmpeg.cmake                       | 204 +++++++------------
 extern/osg-ffmpeg-videoplayer/CMakeLists.txt |   4 +-
 4 files changed, 85 insertions(+), 139 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2803cbbbe3..89e83704c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,15 +149,7 @@ else()
 endif()
 
 # Sound setup
-unset(FFMPEG_LIBRARIES CACHE)
-
-find_package(FFmpeg REQUIRED)
-
-set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARY} ${SWRESAMPLE_LIBRARIES})
-
-if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND OR NOT SWRESAMPLE_FOUND)
-    message(FATAL_ERROR "FFmpeg component required, but not found!")
-endif()
+find_package(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMPLE)
 # Required for building the FFmpeg headers
 add_definitions(-D__STDC_CONSTANT_MACROS)
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index f2540c7395..5e84f6086d 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -115,7 +115,7 @@ endif ()
 # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
 # when we change the backend.
 include_directories(
-    ${FFMPEG_INCLUDE_DIRS}
+    ${FFmpeg_INCLUDE_DIRS}
 )
 
 target_link_libraries(openmw
@@ -131,7 +131,7 @@ target_link_libraries(openmw
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${OPENAL_LIBRARY}
-    ${FFMPEG_LIBRARIES}
+    ${FFmpeg_LIBRARIES}
     ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${SDL2_LIBRARY}
@@ -183,7 +183,7 @@ if(APPLE)
     find_library(IOKIT_FRAMEWORK IOKit)
     target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
 
-    if (FFMPEG_FOUND)
+    if (FFmpeg_FOUND)
         find_library(COREVIDEO_FRAMEWORK CoreVideo)
         find_library(VDA_FRAMEWORK VideoDecodeAcceleration)
         target_link_libraries(openmw ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK})
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index 74584bf318..99afa69209 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -1,11 +1,14 @@
 # vim: ts=2 sw=2
-# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
+# - Try to find the required ffmpeg components
+#
+# This module accepts the following env variable
+#  FFMPEG_SDK - Can be set to custom install path
 #
 # Once done this will define
-#  FFMPEG_FOUND         - System has the all required components.
-#  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
-#  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
-#  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
+#  FFmpeg_FOUND         - System has the all required components.
+#  FFmpeg_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  FFmpeg_LIBRARIES     - Link these to use the required ffmpeg components.
+#  FFmpeg_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
 #
 # For each of the components it will additionaly set.
 #   - AVCODEC
@@ -16,144 +19,95 @@
 #   - SWSCALE
 #   - SWRESAMPLE
 # the following variables will be defined
-#  <component>_FOUND        - System has <component>
-#  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
-#  <component>_LIBRARIES    - Link these to use <component>
-#  <component>_DEFINITIONS  - Compiler switches required for using <component>
-#  <component>_VERSION      - The components version
+#  FFmpeg_<component>_FOUND        - System has <component>
+#  FFmpeg_<component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
+#  FFmpeg_<component>_LIBRARIES    - Link these to use <component>
+#  FFmpeg_<component>_DEFINITIONS  - Compiler switches required for using <component>
+#  FFmpeg_<component>_VERSION      - The components version
 #
 # Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
 # Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
 # Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
+# Copyright (c) 2016, Roman Proskuryakov, <humbug@deeptown.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+include(LibFindMacros)
 include(FindPackageHandleStandardArgs)
 
-# The default components were taken from a survey over other FindFFMPEG.cmake files
-if (NOT FFmpeg_FIND_COMPONENTS)
-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
-endif ()
-
-#
-### Macro: set_component_found
-#
-# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present.
-#
-macro(set_component_found _component )
-  if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
-    # message(STATUS "  - ${_component} found.")
-    set(${_component}_FOUND TRUE)
-  else ()
-    # message(STATUS "  - ${_component} not found.")
-  endif ()
-endmacro()
-
-#
-### Macro: find_component
-#
-# Checks for the given component by invoking pkgconfig and then looking up the libraries and
-# include directories.
-#
-macro(find_component _component _pkgconfig _library _header)
-
-  if (NOT WIN32)
-     # use pkg-config to get the directories and then use these values
-     # in the FIND_PATH() and FIND_LIBRARY() calls
-     find_package(PkgConfig)
-     if (PKG_CONFIG_FOUND)
-       pkg_check_modules(PC_${_component} ${_pkgconfig})
-     endif ()
-  endif (NOT WIN32)
-
-  find_path(${_component}_INCLUDE_DIRS ${_header}
-    HINTS
-      ${FFMPEGSDK_INC}
-      ${PC_LIB${_component}_INCLUDEDIR}
-      ${PC_LIB${_component}_INCLUDE_DIRS}
-    PATH_SUFFIXES
-      ffmpeg
-  )
-
-  find_library(${_component}_LIBRARIES NAMES ${_library}
-      HINTS
-      ${FFMPEGSDK_LIB}
-      ${PC_LIB${_component}_LIBDIR}
-      ${PC_LIB${_component}_LIBRARY_DIRS}
-  )
-
-  set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-  set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
-
-  set_component_found(${_component})
-
-  mark_as_advanced(
-    ${_component}_INCLUDE_DIRS
-    ${_component}_LIBRARIES
-    ${_component}_DEFINITIONS
-    ${_component}_VERSION)
-
+# Macro: _internal_find_component
+# Checks for the given component by invoking pkgconfig etc.
+macro(_internal_find_component _component _pkgconfig _library _header)
+    set(_package_component FFmpeg_${_component})
+    libfind_pkg_detect(${_package_component} ${_pkgconfig}
+        FIND_PATH ${_header}
+            HINTS $ENV{FFMPEG_SDK}/include
+            PATH_SUFFIXES ffmpeg
+        FIND_LIBRARY ${_library}
+            HINTS $ENV{FFMPEG_SDK}/lib
+    )
+    set(${_package_component}_DEFINITIONS  ${${_package_component}_PKGCONF_CFLAGS_OTHER})
+    set(${_package_component}_VERSION      ${${_package_component}_PKGCONF_VERSION})
+    libfind_process(${_package_component})
 endmacro()
 
 
-# Check for cached results. If there are skip the costly part.
-if (NOT FFMPEG_LIBRARIES)
+# setter for 'hashmap'
+macro(hashmap_set _table _key) # ARGN
+    set(${_table}_${_key} ${ARGN})
+endmacro()
 
-  set (FFMPEGSDK $ENV{FFMPEG_HOME})
-  if (FFMPEGSDK)
-    set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
-    set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
-  endif ()
+# check for key in 'hashmap'
+macro(hashmap_exists _table _key _out_var)
+    if (DEFINED ${_table}_${_key})
+        set(${_out_var} TRUE)
+    else()
+        set(${_out_var} FALSE)
+    endif()
+endmacro()
 
-  # Check for all possible component.
-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
-  find_component(SWRESAMPLE  libswresample  swresample  libswresample/swresample.h)
-  find_component(AVRESAMPLE  libavresample  avresample  libavresample/avresample.h)
+# getter for 'hashmap'
+macro(hashmap_get _table _key _out_var)
+    set(${_out_var} ${${_table}_${_key}})
+endmacro()
 
-  # Check if the required components were found and add their stuff to the FFMPEG_* vars.
-  foreach (_component ${FFmpeg_FIND_COMPONENTS})
-    if (${_component}_FOUND)
-      # message(STATUS "Required component ${_component} present.")
-      set(FFMPEG_LIBRARIES   ${FFMPEG_LIBRARIES}   ${${_component}_LIBRARIES})
-      set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
-      list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
-    else ()
-      # message(STATUS "Required component ${_component} missing.")
-    endif ()
-  endforeach ()
 
-  # Build the include path with duplicates removed.
-  if (FFMPEG_INCLUDE_DIRS)
-    list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
-  endif ()
+# fill 'hashmap' named find_args
+hashmap_set(find_args AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+hashmap_set(find_args AVFORMAT libavformat avformat libavformat/avformat.h)
+hashmap_set(find_args AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+hashmap_set(find_args AVUTIL   libavutil   avutil   libavutil/avutil.h)
+hashmap_set(find_args SWSCALE  libswscale  swscale  libswscale/swscale.h)
+hashmap_set(find_args POSTPROC libpostproc postproc libpostproc/postprocess.h)
+hashmap_set(find_args SWRESAMPLE  libswresample  swresample  libswresample/swresample.h)
+hashmap_set(find_args AVRESAMPLE  libavresample  avresample  libavresample/avresample.h)
 
-  # cache the vars.
-  set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
-  set(FFMPEG_LIBRARIES    ${FFMPEG_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
-  set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
-
-  mark_as_advanced(FFMPEG_INCLUDE_DIRS
-                   FFMPEG_LIBRARIES
-                   FFMPEG_DEFINITIONS)
-
-endif ()
-
-# Now set the noncached _FOUND vars for the components.
-foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE SWRESAMPLE AVRESAMPLE)
-  set_component_found(${_component})
-endforeach ()
-
-# Compile the list of required vars
-set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
+# Check if the required components were found and add their stuff to the FFmpeg_* vars.
 foreach (_component ${FFmpeg_FIND_COMPONENTS})
-  list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
+    hashmap_exists(find_args ${_component} _known_component)
+    if (NOT _known_component)
+        message(FATAL_ERROR "Unknown component '${_component}'")
+    endif()
+    hashmap_get(find_args ${_component} _component_find_args)
+    _internal_find_component(${_component} ${_component_find_args})
+    set(_package_component FFmpeg_${_component})
+    if (${_package_component}_FOUND)
+        list(APPEND FFmpeg_LIBRARIES ${${_package_component}_LIBRARIES})
+        list(APPEND FFmpeg_INCLUDE_DIRS ${${_package_component}_INCLUDE_DIRS})
+        list(APPEND FFmpeg_DEFINITIONS ${${_package_component}_DEFINITIONS})
+    endif ()
 endforeach ()
 
-# Give a nice error message if some of the required vars are missing.
-find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})
+# Build the include path with duplicates removed.
+if (FFmpeg_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIRS)
+endif()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg
+    FOUND_VAR FFmpeg_FOUND
+    HANDLE_COMPONENTS
+    REQUIRED_VARS
+        FFmpeg_LIBRARIES
+        FFmpeg_INCLUDE_DIRS
+)
diff --git a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
index 6009f69de5..5289cd3af9 100644
--- a/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
+++ b/extern/osg-ffmpeg-videoplayer/CMakeLists.txt
@@ -10,8 +10,8 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
     audiofactory.hpp
 )
 
-include_directories(${FFMPEG_INCLUDE_DIRS})
+include_directories(${FFmpeg_INCLUDE_DIRS})
 add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
-target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY})
+target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES} ${Boost_THREAD_LIBRARY})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})

From 4821abc8afb387b34d361d6dacc006ec1d33ebda Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Tue, 10 May 2016 00:29:00 +0300
Subject: [PATCH 608/765] Fixes MSVC CI for FFmpeg

---
 CI/before_script.msvc.sh | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 5aa8d3e9d5..b2db84bd9e 100755
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -405,22 +405,7 @@ printf "FFmpeg 2.5.2... "
 		rm -rf ffmpeg-2.5.2-win$BITS-dev
 	fi
 
-	FFMPEG_SDK="`real_pwd`/FFmpeg"
-	add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \
-		-DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \
-		-DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \
-		-DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \
-		-DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \
-		-DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \
-		-DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \
-		-DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib"
-
+	export FFMPEG_SDK="`real_pwd`/FFmpeg"
 	add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
 
 	if [ $BITS -eq 32 ]; then

From 17a0353a85dde02acfe217cb63349fdb74f7c979 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 10 May 2016 17:36:25 +0200
Subject: [PATCH 609/765] Fix forward declaration mismatch

---
 components/sceneutil/pathgridutil.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index d547bbf3ea..eb1ab1e3e6 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -6,7 +6,7 @@
 
 namespace ESM
 {
-    class Pathgrid;
+    struct Pathgrid;
 }
 
 namespace SceneUtil

From 59cfcb38e28dbafcb25d08f05dd57945b82076de Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 10 May 2016 17:39:57 +0200
Subject: [PATCH 610/765] Scale the sunlight specular color by weather's
 GlareView value (Fixes #3375)

---
 apps/openmw/mwrender/renderingmanager.cpp | 6 +++---
 apps/openmw/mwrender/renderingmanager.hpp | 2 +-
 apps/openmw/mwworld/weather.cpp           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 52a0b2c617..ea3e7b7ee4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -351,11 +351,11 @@ namespace MWRender
         mSunLight->setDirection(osg::Vec3f(1.f,-1.f,-1.f));
     }
 
-    void RenderingManager::setSunColour(const osg::Vec4f &colour)
+    void RenderingManager::setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular)
     {
         // need to wrap this in a StateUpdater?
-        mSunLight->setDiffuse(colour);
-        mSunLight->setSpecular(colour);
+        mSunLight->setDiffuse(diffuse);
+        mSunLight->setSpecular(specular);
     }
 
     void RenderingManager::setSunDirection(const osg::Vec3f &direction)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 59692f45aa..ebe75d39b2 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -91,7 +91,7 @@ namespace MWRender
         void skySetMoonColour(bool red);
 
         void setSunDirection(const osg::Vec3f& direction);
-        void setSunColour(const osg::Vec4f& colour);
+        void setSunColour(const osg::Vec4f& diffuse, const osg::Vec4f& specular);
 
         void configureAmbient(const ESM::Cell* cell);
         void configureFog(const ESM::Cell* cell);
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 03e7b581a0..5987e1971d 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -722,7 +722,7 @@ void WeatherManager::update(float duration, bool paused)
 
     mRendering.configureFog(mResult.mFogDepth, underwaterFog, mResult.mFogColor);
     mRendering.setAmbientColour(mResult.mAmbientColor);
-    mRendering.setSunColour(mResult.mSunColor);
+    mRendering.setSunColour(mResult.mSunColor, mResult.mSunColor * mResult.mGlareView);
 
     mRendering.getSkyManager()->setWeather(mResult);
 

From fcbcc004a3e3817aed1a7fbafa3c2f03534b610c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 11 May 2016 02:35:17 +0200
Subject: [PATCH 611/765] Don't use unordered_map

---
 CMakeLists.txt                            |  6 ------
 apps/openmw/mwworld/worldimp.cpp          | 14 +-------------
 components/files/configurationmanager.hpp | 14 ++------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89e83704c4..516ec48fad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,12 +201,6 @@ if(NOT HAVE_STDINT_H)
     message(FATAL_ERROR "stdint.h was not found" )
 endif()
 
-include (CheckIncludeFileCXX)
-check_include_file_cxx(unordered_map HAVE_UNORDERED_MAP)
-if (HAVE_UNORDERED_MAP)
-    add_definitions(-DHAVE_UNORDERED_MAP)
-endif ()
-
 
 set(BOOST_COMPONENTS system filesystem program_options thread)
 if(WIN32)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ef353cd2f4..b3643cafc0 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1,13 +1,5 @@
 #include "worldimp.hpp"
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <boost/tr1/tr1/unordered_map>
-#elif defined HAVE_UNORDERED_MAP
-#include <unordered_map>
-#else
-#include <tr1/unordered_map>
-#endif
-
 #include <osg/Group>
 #include <osg/ComputeBoundsVisitor>
 
@@ -108,11 +100,7 @@ namespace MWWorld
         }
 
         private:
-#ifdef HAVE_UNORDERED_MAP
-          typedef std::unordered_map<std::string, ContentLoader*> LoadersContainer;
-#else
-          typedef std::tr1::unordered_map<std::string, ContentLoader*> LoadersContainer;
-#endif
+          typedef std::map<std::string, ContentLoader*> LoadersContainer;
           LoadersContainer mLoaders;
     };
 
diff --git a/components/files/configurationmanager.hpp b/components/files/configurationmanager.hpp
index 58ee5c1aef..c05dbbb458 100644
--- a/components/files/configurationmanager.hpp
+++ b/components/files/configurationmanager.hpp
@@ -1,13 +1,7 @@
 #ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 #define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
 
-#if defined(_WIN32) && !defined(__MINGW32__)
-#include <boost/tr1/tr1/unordered_map>
-#elif defined HAVE_UNORDERED_MAP
-#include <unordered_map>
-#else
-#include <tr1/unordered_map>
-#endif
+#include <map>
 
 #include <boost/program_options.hpp>
 
@@ -52,11 +46,7 @@ struct ConfigurationManager
         typedef Files::FixedPath<> FixedPathType;
 
         typedef const boost::filesystem::path& (FixedPathType::*path_type_f)() const;
-    #if defined HAVE_UNORDERED_MAP
-        typedef std::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #else
-        typedef std::tr1::unordered_map<std::string, path_type_f> TokensMappingContainer;
-    #endif
+        typedef std::map<std::string, path_type_f> TokensMappingContainer;
 
         bool loadConfig(const boost::filesystem::path& path,
             boost::program_options::variables_map& variables,

From bd804d30a4d5cb19fbb3bd1b0e8ee2483c866f5e Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 19:33:38 +0300
Subject: [PATCH 612/765] Rewrites FindFreetype using LibFindMacros

---
 cmake/FindFreetype.cmake | 131 ++++++++++++++++++++++++---------------
 1 file changed, 81 insertions(+), 50 deletions(-)

diff --git a/cmake/FindFreetype.cmake b/cmake/FindFreetype.cmake
index fc36d548e2..a5f825098e 100644
--- a/cmake/FindFreetype.cmake
+++ b/cmake/FindFreetype.cmake
@@ -8,62 +8,93 @@
 #-------------------------------------------------------------------
 
 # - Try to find FreeType
+#
+# This module accepts the following env variable
+#  FREETYPE_SDK - Can be set to custom install path
+#
 # Once done, this will define
 #
-#  FREETYPE_FOUND - system has FreeType
-#  FREETYPE_INCLUDE_DIRS - the FreeType include directories 
-#  FREETYPE_LIBRARIES - link these to use FreeType
+#  Freetype_FOUND - system has FreeType
+#  Freetype_INCLUDE_DIRS - the FreeType include directories
+#  Freetype_LIBRARIES - link these to use FreeType
+#  Freetype_VERSION - version of FreeType
+#
+# libfreetype internals:
+#
+# ======================================
+# new versions (2.5.2)
+#
+# file structure:
+#     <prefix>/include/freetype2/ft2build.h
+#     <prefix>/include/freetype2/freetype.h
+# used as:
+#     #include <ft2build.h>
+#     #include <freetype.h>
+# requires:
+#     -I <prefix>/include/freetype2/
+#
+# ======================================
+# old versions (2.4.8, 2.3.5)
+#
+# file structure:
+#     <prefix>/include/ft2build.h
+#     <prefix>/include/freetype2/freetype/freetype.h
+# used as:
+#     #include <ft2build.h>
+#     #include <freetype/freetype.h>
+# requires:
+#     -I <prefix>/include/ -I <prefix>/include/freetype2/
+#
+# ======================================
 
-include(FindPkgMacros)
-findpkg_begin(FREETYPE)
+include(LibFindMacros)
+include(PreprocessorUtils)
 
-# Get path, convert backslashes as ${ENV_${var}}
-getenv_path(FREETYPE_HOME)
-
-# construct search paths
-set(FREETYPE_PREFIX_PATH ${FREETYPE_HOME} ${ENV_FREETYPE_HOME})
-create_search_paths(FREETYPE)
-# redo search if prefix path changed
-clear_if_changed(FREETYPE_PREFIX_PATH
-  FREETYPE_LIBRARY_FWK
-  FREETYPE_LIBRARY_REL
-  FREETYPE_LIBRARY_DBG
-  FREETYPE_INCLUDE_DIR
+set(_REGULAR_INSTALL_PATHS
+    /usr/X11R6
+    /usr/local/X11R6
+    /usr/local/X11
+    /usr/freeware
+    ENV GTKMM_BASEPATH
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
 )
 
-set(FREETYPE_LIBRARY_NAMES freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
-get_debug_names(FREETYPE_LIBRARY_NAMES)
+libfind_pkg_detect(Freetype freetype2
+    FIND_PATH ft2build.h
+        HINTS $ENV{FREETYPE_SDK}
+        PATHS ${_REGULAR_INSTALL_PATHS}
+        PATH_SUFFIXES include freetype2
+    FIND_LIBRARY freetype freetype2311 freetype239 freetype238 freetype235 freetype219
+        HINTS $ENV{FREETYPE_SDK}
+        PATHS ${_REGULAR_INSTALL_PATHS}
+        PATH_SUFFIXES lib
+)
+find_path(Freetype_OLD_INCLUDE_DIR
+    # in new versions of freetype old_include_dir equals to include_dir
+    # see explanation above
+    NAMES freetype/freetype.h freetype.h
+    PATHS ${Freetype_INCLUDE_DIR}
+    PATH_SUFFIXES freetype2
+    NO_DEFAULT_PATH
+)
 
-use_pkgconfig(FREETYPE_PKGC freetype2)
+# get version from freetype.h
+find_file(Freetype_HEADER
+    NAMES freetype.h
+    PATH_SUFFIXES freetype
+    PATHS ${Freetype_OLD_INCLUDE_DIR}
+)
+if (Freetype_HEADER)
+    get_version_from_n_defines(Freetype_VERSION
+        ${Freetype_HEADER}
+        FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH
+    )
+endif()
 
-# prefer static library over framework 
-set(CMAKE_FIND_FRAMEWORK "LAST")
+set(Freetype_PROCESS_INCLUDES Freetype_INCLUDE_DIR Freetype_OLD_INCLUDE_DIR)
+libfind_process(Freetype)
 
-message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-findpkg_framework(FREETYPE)
-message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
-find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
-
-if (SYMBIAN) 
-set(ORIGINAL_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
-set(CMAKE_PREFIX_PATH ${CMAKE_SYSYEM_OUT_DIR})
-message(STATUS "Lib will be searched in Symbian out dir: ${CMAKE_SYSYEM_OUT_DIR}")
-endif (SYMBIAN)
-find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
-find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
-if (SYMBIAN) 
-set(CMAKE_PREFIX_PATH ${ORIGINAL_CMAKE_PREFIX_PATH})
-endif (SYMBIAN)
-
-make_library_set(FREETYPE_LIBRARY)
-
-findpkg_finish(FREETYPE)
-mark_as_advanced(FREETYPE_FT2BUILD_INCLUDE_DIR)
-if (NOT FREETYPE_FT2BUILD_INCLUDE_DIR STREQUAL FREETYPE_INCLUDE_DIR)
-  set(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_FT2BUILD_INCLUDE_DIR})
-endif ()
-
-# Reset framework finding
-set(CMAKE_FIND_FRAMEWORK "FIRST")
+if (Freetype_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES Freetype_INCLUDE_DIRS)
+endif()

From 9645d0cc8aeab969575d413213725ad58b42861e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 12 May 2016 18:21:43 -0400
Subject: [PATCH 613/765] Pass more mouse pick information in scene view
 editor.

---
 apps/opencs/view/render/editmode.cpp          | 16 ++---
 apps/opencs/view/render/editmode.hpp          | 17 +++---
 apps/opencs/view/render/instancemode.cpp      | 30 +++++-----
 apps/opencs/view/render/instancemode.hpp      | 12 ++--
 .../view/render/pagedworldspacewidget.cpp     |  9 +--
 .../view/render/pagedworldspacewidget.hpp     |  2 +-
 apps/opencs/view/render/worldspacewidget.cpp  | 58 ++++++++++++-------
 apps/opencs/view/render/worldspacewidget.hpp  | 13 ++++-
 8 files changed, 92 insertions(+), 65 deletions(-)

diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index be264afc7c..8da000dc93 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -29,30 +29,30 @@ void CSVRender::EditMode::setEditLock (bool locked)
 
 }
 
-void CSVRender::EditMode::primaryEditPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::primaryEditPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondaryEditPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::secondaryEditPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::primarySelectPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::primarySelectPressed (const WorldspaceHitResult& hit) {}
 
-void CSVRender::EditMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag) {}
+void CSVRender::EditMode::secondarySelectPressed (const WorldspaceHitResult& hit) {}
 
-bool CSVRender::EditMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::primaryEditStartDrag (const WorldspaceHitResult& hit)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::secondaryEditStartDrag (const WorldspaceHitResult& hit)
 {
     return false;
 }
 
-bool CSVRender::EditMode::primarySelectStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::primarySelectStartDrag (const WorldspaceHitResult& hit)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondarySelectStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::EditMode::secondarySelectStartDrag (const WorldspaceHitResult& hit)
 {
     return false;
 }
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index f5cef1be29..3381a7105e 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -12,6 +12,7 @@ class QDragMoveEvent;
 namespace CSVRender
 {
     class WorldspaceWidget;
+    struct WorldspaceHitResult;
     class TagBase;
 
     class EditMode : public CSVWidget::ModeButton
@@ -38,36 +39,36 @@ namespace CSVRender
             virtual void setEditLock (bool locked);
 
             /// Default-implementation: Ignored.
-            virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primaryEditPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondaryEditPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void primarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primarySelectPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: Ignored.
-            virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primarySelectStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool primarySelectStartDrag (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondarySelectStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool secondarySelectStartDrag (const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignored
             virtual void drag (int diffX, int diffY, double speedFactor);
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 4c708242ab..52335f2440 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -103,25 +103,25 @@ void CSVRender::InstanceMode::setEditLock (bool locked)
         getWorldspaceWidget().abortDrag();
 }
 
-void CSVRender::InstanceMode::primaryEditPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::primaryEditPressed (const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        primarySelectPressed (tag);
+        primarySelectPressed (hit);
 }
 
-void CSVRender::InstanceMode::secondaryEditPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::secondaryEditPressed (const WorldspaceHitResult& hit)
 {
     if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
-        secondarySelectPressed (tag);
+        secondarySelectPressed (hit);
 }
 
-void CSVRender::InstanceMode::primarySelectPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::primarySelectPressed (const WorldspaceHitResult& hit)
 {
     getWorldspaceWidget().clearSelection (Mask_Reference);
 
-    if (tag)
+    if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
         {
             // hit an Object, select it
             CSVRender::Object* object = objectTag->mObject;
@@ -131,11 +131,11 @@ void CSVRender::InstanceMode::primarySelectPressed (osg::ref_ptr<TagBase> tag)
     }
 }
 
-void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
+void CSVRender::InstanceMode::secondarySelectPressed (const WorldspaceHitResult& hit)
 {
-    if (tag)
+    if (hit.tag)
     {
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
         {
             // hit an Object, toggle its selection state
             CSVRender::Object* object = objectTag->mObject;
@@ -145,15 +145,15 @@ void CSVRender::InstanceMode::secondarySelectPressed (osg::ref_ptr<TagBase> tag)
     }
 }
 
-bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::InstanceMode::primaryEditStartDrag (const WorldspaceHitResult& hit)
 {
     if (mDragMode!=DragMode_None || mLocked)
         return false;
 
-    if (tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+    if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
     {
         getWorldspaceWidget().clearSelection (Mask_Reference);
-        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (tag.get()))
+        if (CSVRender::ObjectTag *objectTag = dynamic_cast<CSVRender::ObjectTag *> (hit.tag.get()))
         {
             CSVRender::Object* object = objectTag->mObject;
             object->setSelected (true);
@@ -177,7 +177,7 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
 
     // \todo check for sub-mode
 
-    if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (tag.get()))
+    if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (hit.tag.get()))
     {
         mDragAxis = objectTag->mAxis;
     }
@@ -189,7 +189,7 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
     return true;
 }
 
-bool CSVRender::InstanceMode::secondaryEditStartDrag (osg::ref_ptr<TagBase> tag)
+bool CSVRender::InstanceMode::secondaryEditStartDrag (const WorldspaceHitResult& hit)
 {
     if (mLocked)
         return false;
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index db7fdaa96e..5b12529123 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -41,17 +41,17 @@ namespace CSVRender
 
             virtual void setEditLock (bool locked);
 
-            virtual void primaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primaryEditPressed (const WorldspaceHitResult& hit);
 
-            virtual void secondaryEditPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondaryEditPressed (const WorldspaceHitResult& hit);
 
-            virtual void primarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void primarySelectPressed (const WorldspaceHitResult& hit);
 
-            virtual void secondarySelectPressed (osg::ref_ptr<TagBase> tag);
+            virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
 
-            virtual bool primaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
 
-            virtual bool secondaryEditStartDrag (osg::ref_ptr<TagBase> tag);
+            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
 
             virtual void drag (int diffX, int diffY, double speedFactor);
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 1d9b22216c..90088f24e3 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -142,14 +142,15 @@ void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
         "terrain-move");
 }
 
-void CSVRender::PagedWorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)
+void CSVRender::PagedWorldspaceWidget::handleMouseClick (const WorldspaceHitResult& hit, const std::string& button,
+    bool shift)
 {
-    if (tag && tag->getMask()==Mask_CellArrow)
+    if (hit.tag && hit.tag->getMask()==Mask_CellArrow)
     {
         if (button=="p-edit" || button=="s-edit")
         {
             if (CellArrowTag *cellArrowTag =
-                dynamic_cast<CSVRender::CellArrowTag *> (tag.get()))
+                dynamic_cast<CSVRender::CellArrowTag *> (hit.tag.get()))
             {
                 CellArrow *arrow = cellArrowTag->getCellArrow();
 
@@ -209,7 +210,7 @@ void CSVRender::PagedWorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> t
         }
     }
 
-    WorldspaceWidget::handleMouseClick (tag, button, shift);
+    WorldspaceWidget::handleMouseClick (hit, button, shift);
 }
 
 void CSVRender::PagedWorldspaceWidget::referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 3cd628df0a..8c17d4fcdc 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -135,7 +135,7 @@ namespace CSVRender
 
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
 
-            virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift);
+            virtual void handleMouseClick (const WorldspaceHitResult& hit, const std::string& button, bool shift);
 
         signals:
 
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 1bd3df9818..e90a4fd5ae 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -469,7 +469,7 @@ bool CSVRender::WorldspaceWidget::storeMappingSetting (const CSMPrefs::Setting *
     return SceneWidget::storeMappingSetting(setting);
 }
 
-osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos)
+CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos)
 {
     // (0,0) is considered the lower left corner of an OpenGL window
     int x = localPos.x();
@@ -499,16 +499,31 @@ osg::ref_ptr<CSVRender::TagBase> CSVRender::WorldspaceWidget::mousePick (const Q
         {
             osg::Node* node = *it;
             if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
-                return tag;
+            {
+                WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
+                if (intersection.indexList.size() >= 3)
+                {
+                    hit.i0 = intersection.indexList[0];
+                    hit.i1 = intersection.indexList[1];
+                    hit.i2 = intersection.indexList[2];
+                }
+                return hit;
+            }
         }
 
-// ignoring terrain for now
-        // must be terrain, report coordinates
-//        std::cout << "Terrain hit at " << intersection.getWorldIntersectPoint().x() << " " << intersection.getWorldIntersectPoint().y() << std::endl;
-//        return;
+        // Something untagged, probably terrain
+        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
+        if (intersection.indexList.size() >= 3)
+        {
+            hit.i0 = intersection.indexList[0];
+            hit.i1 = intersection.indexList[1];
+            hit.i2 = intersection.indexList[2];
+        }
+        return hit;
     }
 
-    return osg::ref_ptr<CSVRender::TagBase>();
+    WorldspaceHitResult hit = { false, 0, 0, 0, 0, osg::Vec3d() };
+    return hit;
 }
 
 void CSVRender::WorldspaceWidget::dropEvent (QDropEvent* event)
@@ -595,10 +610,11 @@ void CSVRender::WorldspaceWidget::showToolTip()
     {
         QPoint pos = QCursor::pos();
 
-        if (osg::ref_ptr<TagBase> tag = mousePick (mapFromGlobal (pos)))
+        WorldspaceHitResult hit = mousePick (mapFromGlobal (pos));
+        if (hit.tag)
         {
             bool hideBasics = CSMPrefs::get()["Tooltips"]["scene-hide-basic"].isTrue();
-            QToolTip::showText (pos, tag->getToolTip (hideBasics), this);
+            QToolTip::showText (pos, hit.tag->getToolTip (hideBasics), this);
         }
     }
 }
@@ -635,18 +651,18 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
     }
     else if (mDragMode=="p-edit" || mDragMode=="s-edit" || mDragMode=="p-select" || mDragMode=="s-select")
     {
-        osg::ref_ptr<TagBase> tag = mousePick (event->pos());
+        WorldspaceHitResult hit = mousePick (event->pos());
 
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
         if (mDragMode=="p-edit")
-            mDragging = editMode.primaryEditStartDrag (tag);
+            mDragging = editMode.primaryEditStartDrag (hit);
         else if (mDragMode=="s-edit")
-            mDragging = editMode.secondaryEditStartDrag (tag);
+            mDragging = editMode.secondaryEditStartDrag (hit);
         else if (mDragMode=="p-select")
-            mDragging = editMode.primarySelectStartDrag (tag);
+            mDragging = editMode.primarySelectStartDrag (hit);
         else if (mDragMode=="s-select")
-            mDragging = editMode.secondarySelectStartDrag (tag);
+            mDragging = editMode.secondarySelectStartDrag (hit);
 
         if (mDragging)
         {
@@ -704,9 +720,9 @@ void CSVRender::WorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
         }
         else
         {
-            osg::ref_ptr<TagBase> tag = mousePick (event->pos());
+            WorldspaceHitResult hit = mousePick (event->pos());
 
-            handleMouseClick (tag, button, event->modifiers() & Qt::ShiftModifier);
+            handleMouseClick (hit, button, event->modifiers() & Qt::ShiftModifier);
         }
     }
     else
@@ -740,18 +756,18 @@ void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)
         SceneWidget::keyPressEvent(event);
 }
 
-void CSVRender::WorldspaceWidget::handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button, bool shift)
+void CSVRender::WorldspaceWidget::handleMouseClick (const WorldspaceHitResult& hit, const std::string& button, bool shift)
 {
     EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
     if (button=="p-edit")
-        editMode.primaryEditPressed (tag);
+        editMode.primaryEditPressed (hit);
     else if (button=="s-edit")
-        editMode.secondaryEditPressed (tag);
+        editMode.secondaryEditPressed (hit);
     else if (button=="p-select")
-        editMode.primarySelectPressed (tag);
+        editMode.primarySelectPressed (hit);
     else if (button=="s-select")
-        editMode.secondarySelectPressed (tag);
+        editMode.secondarySelectPressed (hit);
 }
 
 CSVRender::EditMode *CSVRender::WorldspaceWidget::getEditMode()
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index d70694d22c..4160da3d82 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -4,6 +4,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <QTimer>
+#include <osg/Vec3>
 
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
@@ -35,6 +36,14 @@ namespace CSVRender
     class CellArrow;
     class EditMode;
 
+    struct WorldspaceHitResult
+    {
+        bool hit;
+        osg::ref_ptr<TagBase> tag;
+        unsigned int i0, i1, i2;
+        osg::Vec3d worldPos;
+    };
+
     class WorldspaceWidget : public SceneWidget
     {
             Q_OBJECT
@@ -191,7 +200,7 @@ namespace CSVRender
             virtual void wheelEvent (QWheelEvent *event);
             virtual void keyPressEvent (QKeyEvent *event);
 
-            virtual void handleMouseClick (osg::ref_ptr<TagBase> tag, const std::string& button,
+            virtual void handleMouseClick (const WorldspaceHitResult& hit, const std::string& button,
                 bool shift);
 
              /// \return Is \a key a button mapping setting? (ignored otherwise)
@@ -209,7 +218,7 @@ namespace CSVRender
 
             void dragMoveEvent(QDragMoveEvent *event);
 
-            osg::ref_ptr<TagBase> mousePick (const QPoint& localPos);
+            WorldspaceHitResult mousePick (const QPoint& localPos);
 
             virtual std::string getStartupInstruction() = 0;
 

From 32ba5bf8b87bb25eb09b02ff8eca4c996a22e134 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 12 May 2016 19:35:49 -0400
Subject: [PATCH 614/765] Initial pathgrid editting, support for selection and
 movement.

---
 apps/opencs/CMakeLists.txt                   |   4 +-
 apps/opencs/view/render/cell.cpp             |  50 ++--
 apps/opencs/view/render/cell.hpp             |   6 +-
 apps/opencs/view/render/pathgrid.cpp         | 287 +++++++++++++++++++
 apps/opencs/view/render/pathgrid.hpp         | 105 +++++++
 apps/opencs/view/render/pathgridmode.cpp     | 152 ++++++++++
 apps/opencs/view/render/pathgridmode.hpp     |  53 ++++
 apps/opencs/view/render/worldspacewidget.cpp |   8 +-
 components/sceneutil/pathgridutil.cpp        |  77 +++++
 components/sceneutil/pathgridutil.hpp        |   5 +
 10 files changed, 707 insertions(+), 40 deletions(-)
 create mode 100644 apps/opencs/view/render/pathgrid.cpp
 create mode 100644 apps/opencs/view/render/pathgrid.hpp
 create mode 100644 apps/opencs/view/render/pathgridmode.cpp
 create mode 100644 apps/opencs/view/render/pathgridmode.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index e7312d0ba7..b33dc15085 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -86,12 +86,12 @@ opencs_units (view/widget
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
-    orbitcameramode
+    orbitcameramode pathgridmode
     )
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight lightingbright object cell terrainstorage tagbase
-    cellarrow cellmarker cellborder cameracontroller
+    cellarrow cellmarker cellborder cameracontroller pathgrid
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 691b909bbd..a8e36728cd 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -17,6 +17,7 @@
 #include "../../model/world/cellcoordinates.hpp"
 
 #include "mask.hpp"
+#include "pathgrid.hpp"
 #include "terrainstorage.hpp"
 
 bool CSVRender::Cell::removeObject (const std::string& id)
@@ -68,18 +69,6 @@ bool CSVRender::Cell::addObjects (int start, int end)
     return modified;
 }
 
-void CSVRender::Cell::recreatePathgrid()
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-    int pathgridIndex = pathgrids.searchId(mId);
-    if (pathgridIndex != -1)
-    {
-        mPathgridGeode->removeDrawable(mPathgridGeometry);
-        mPathgridGeometry = SceneUtil::createPathgridGeometry(pathgrids.getRecord(pathgridIndex).get());
-        mPathgridGeode->addDrawable(mPathgridGeometry);
-    }
-}
-
 CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::string& id,
     bool deleted)
 : mData (data), mId (Misc::StringUtils::lowerCase (id)), mDeleted (deleted), mSubMode (0),
@@ -93,17 +82,6 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
     mCellNode = new osg::Group;
     rootNode->addChild(mCellNode);
 
-    osg::ref_ptr<osg::PositionAttitudeTransform> pathgridTransform = new osg::PositionAttitudeTransform();
-    pathgridTransform->setPosition(osg::Vec3f(mCoordinates.getX() * ESM::Land::REAL_SIZE,
-        mCoordinates.getY() * ESM::Land::REAL_SIZE, 0));
-    pathgridTransform->setNodeMask(Mask_Pathgrid);
-    mCellNode->addChild(pathgridTransform);
-
-    mPathgridGeode = new osg::Geode();
-    pathgridTransform->addChild(mPathgridGeode);
-
-    mPathgridGeometry = 0;
-
     setCellMarker();
 
     if (!mDeleted)
@@ -132,7 +110,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
             }
         }
 
-        recreatePathgrid();
+        mPathgrid.reset(new Pathgrid(mData, mCellNode, mId, mCoordinates));
     }
 }
 
@@ -285,27 +263,27 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
 
 void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
 {
-    recreatePathgrid();
+    mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::pathgridRemoved()
 {
-    mPathgridGeode->removeDrawable(mPathgridGeometry);
+    mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
-    recreatePathgrid();
+    mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::pathgridRowRemoved(const QModelIndex& parent, int start, int end)
 {
-    recreatePathgrid();
+    mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
 {
-    recreatePathgrid();
+    mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
@@ -327,6 +305,15 @@ void CSVRender::Cell::setSelection (int elementMask, Selection mode)
             iter->second->setSelected (selected);
         }
     }
+    if (elementMask & Mask_Pathgrid)
+    {
+        switch (mode)
+        {
+            case Selection_Clear: mPathgrid->clearSelected(); break;
+            case Selection_All: mPathgrid->selectAll(); break;
+            case Selection_Invert: mPathgrid->invertSelected(); break;
+        }
+    }
 }
 
 void CSVRender::Cell::selectAllWithSameParentId (int elementMask)
@@ -406,6 +393,9 @@ std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::Cell::getSelection (un
             iter!=mObjects.end(); ++iter)
             if (iter->second->getSelected())
                 result.push_back (iter->second->getTag());
+    if (elementMask & Mask_Pathgrid)
+        if (mPathgrid->isSelected())
+            result.push_back(mPathgrid->getTag());
 
     return result;
 }
@@ -440,4 +430,6 @@ void CSVRender::Cell::reset (unsigned int elementMask)
         for (std::map<std::string, Object *>::const_iterator iter (mObjects.begin());
             iter!=mObjects.end(); ++iter)
             iter->second->reset();
+    if (elementMask & Mask_Pathgrid)
+        mPathgrid->resetMove();
 }
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index e265fc21c2..caf6c59a92 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -36,6 +36,7 @@ namespace CSMWorld
 
 namespace CSVRender
 {
+    class Pathgrid;
     class TagBase;
 
     class Cell
@@ -43,14 +44,13 @@ namespace CSVRender
             CSMWorld::Data& mData;
             std::string mId;
             osg::ref_ptr<osg::Group> mCellNode;
-            osg::ref_ptr<osg::Geode> mPathgridGeode;
-            osg::ref_ptr<osg::Geometry> mPathgridGeometry;
             std::map<std::string, Object *> mObjects;
             std::auto_ptr<Terrain::TerrainGrid> mTerrain;
             CSMWorld::CellCoordinates mCoordinates;
             std::auto_ptr<CellArrow> mCellArrows[4];
             std::auto_ptr<CellMarker> mCellMarker;
             std::auto_ptr<CellBorder> mCellBorder;
+            std::auto_ptr<Pathgrid> mPathgrid;
             bool mDeleted;
             int mSubMode;
             unsigned int mSubModeElementMask;
@@ -69,8 +69,6 @@ namespace CSVRender
             /// \return Have any objects been added?
             bool addObjects (int start, int end);
 
-            void recreatePathgrid();
-
         public:
 
             enum Selection
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
new file mode 100644
index 0000000000..4aa254a449
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -0,0 +1,287 @@
+#include "pathgrid.hpp"
+
+#include <algorithm>
+
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osg/Group>
+#include <osg/PositionAttitudeTransform>
+#include <osg/Vec3>
+
+#include <components/sceneutil/pathgridutil.hpp>
+
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/data.hpp"
+
+namespace CSVRender
+{
+    PathgridTag::PathgridTag(Pathgrid* pathgrid)
+        : TagBase(Mask_Pathgrid), mPathgrid(pathgrid)
+    {
+    }
+
+    Pathgrid* PathgridTag::getPathgrid() const
+    {
+        return mPathgrid;
+    }
+
+    QString PathgridTag::getToolTip(bool hideBasics) const
+    {
+        QString text("Pathgrid: ");
+        text += mPathgrid->getId().c_str();
+
+        if (!hideBasics)
+        {
+            text += "<p>Only one pathgrid may be edited at a time.";
+        }
+
+        return text;
+    }
+
+    Pathgrid::Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
+        const CSMWorld::CellCoordinates& coordinates)
+        : mData(data)
+        , mId(pathgridId)
+        , mCoords(coordinates)
+        , mParent(parent)
+        , mPathgridGeometry(0)
+        , mSelectedGeometry(0)
+        , mTag(new PathgridTag(this))
+    {
+        const float CoordScalar = ESM::Land::REAL_SIZE;
+
+        mBaseNode = new osg::PositionAttitudeTransform ();
+        mBaseNode->setPosition(osg::Vec3f(mCoords.getX() * CoordScalar, mCoords.getY() * CoordScalar, 0.f));
+        mBaseNode->setUserData(mTag);
+        mBaseNode->setNodeMask(Mask_Pathgrid);
+        mParent->addChild(mBaseNode);
+
+        mSelectedNode = new osg::PositionAttitudeTransform();
+        mBaseNode->addChild(mSelectedNode);
+
+        mPathgridGeode = new osg::Geode();
+        mBaseNode->addChild(mPathgridGeode);
+
+        mSelectedGeode = new osg::Geode();
+        mSelectedNode->addChild(mSelectedGeode);
+
+        recreateGeometry();
+    }
+
+    Pathgrid::~Pathgrid()
+    {
+        mParent->removeChild(mBaseNode);
+    }
+
+    const CSMWorld::CellCoordinates& Pathgrid::getCoordinates() const
+    {
+        return mCoords;
+    }
+
+    const std::string& Pathgrid::getId() const
+    {
+        return mId;
+    }
+
+    bool Pathgrid::isSelected() const
+    {
+        return !mSelected.empty();
+    }
+
+    const Pathgrid::NodeList& Pathgrid::getSelected() const
+    {
+        return mSelected;
+    }
+
+    void Pathgrid::selectAll()
+    {
+        mSelected.clear();
+
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source.mPoints.size()); ++i)
+                mSelected.push_back(i);
+
+            recreateSelectedGeometry(source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::toggleSelected(unsigned short node)
+    {
+        NodeList::iterator searchResult = std::find(mSelected.begin(), mSelected.end(), node);
+        if (searchResult != mSelected.end())
+        {
+            mSelected.erase(searchResult);
+        }
+        else
+        {
+            mSelected.push_back(node);
+        }
+
+        recreateSelectedGeometry();
+    }
+
+    void Pathgrid::invertSelected()
+    {
+        NodeList temp = NodeList(mSelected.begin(), mSelected.end());
+        mSelected.clear();
+
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source.mPoints.size()); ++i)
+            {
+                if (std::find(temp.begin(), temp.end(), i) == temp.end())
+                    mSelected.push_back(i);
+            }
+
+            recreateSelectedGeometry(source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::clearSelected()
+    {
+        mSelected.clear();
+        removeSelectedGeometry();
+    }
+
+    void Pathgrid::moveSelected(const osg::Vec3d& offset)
+    {
+        mSelectedNode->setPosition(mSelectedNode->getPosition() + offset);
+    }
+
+    void Pathgrid::resetMove()
+    {
+        mSelectedNode->setPosition(osg::Vec3f(0,0,0));
+    }
+
+    void Pathgrid::applyPosition(CSMWorld::CommandMacro& commands)
+    {
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
+            osg::Vec3d localCoords = mSelectedNode->getPosition();
+
+            int oX = static_cast<int>(localCoords.x());
+            int oY = static_cast<int>(localCoords.y());
+            int oZ = static_cast<int>(localCoords.z());
+
+            CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& collection = mData.getPathgrids();
+            QAbstractItemModel* model = mData.getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+
+            int recordIndex = collection.getIndex (mId);
+            int parentColumn = collection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
+            for (size_t i = 0; i < mSelected.size(); ++i)
+            {
+                const CSMWorld::Pathgrid::Point& point = source.mPoints[mSelected[i]];
+                int row = mSelected[i];
+
+                // X
+                int column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosX);
+                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mX + oX));
+
+                // Y
+                column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosY);
+                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mY + oY));
+
+                // Z
+                column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosZ);
+                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mZ + oZ));
+            }
+        }
+
+        resetMove();
+    }
+
+    void Pathgrid::applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2)
+    {
+        // TODO
+    }
+
+    void Pathgrid::applyEdges(CSMWorld::CommandMacro& commands, unsigned short node)
+    {
+        // TODO
+    }
+
+    osg::ref_ptr<PathgridTag> Pathgrid::getTag() const
+    {
+        return mTag;
+    }
+
+    void Pathgrid::recreateGeometry()
+    {
+        removePathgridGeometry();
+        removeSelectedGeometry();
+
+        // Make new
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
+            mPathgridGeometry = SceneUtil::createPathgridGeometry(source);
+            mPathgridGeode->addDrawable(mPathgridGeometry);
+
+            recreateSelectedGeometry(source);
+        }
+    }
+
+    void Pathgrid::recreateSelectedGeometry()
+    {
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
+        int pathgridIndex = pathgrids.searchId(mId);
+        if (pathgridIndex != -1)
+        {
+            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
+            recreateSelectedGeometry(source);
+        }
+        else
+        {
+            removeSelectedGeometry();
+        }
+    }
+
+    void Pathgrid::recreateSelectedGeometry(const CSMWorld::Pathgrid& source)
+    {
+        removeSelectedGeometry();
+        mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
+        mSelectedGeode->addDrawable(mSelectedGeometry);
+    }
+
+    void Pathgrid::removePathgridGeometry()
+    {
+        if (mPathgridGeometry)
+        {
+            mPathgridGeode->removeDrawable(mPathgridGeometry);
+            mPathgridGeometry.release();
+        }
+    }
+
+    void Pathgrid::removeSelectedGeometry()
+    {
+        if (mSelectedGeometry)
+        {
+            mSelectedGeode->removeDrawable(mSelectedGeometry);
+            mSelectedGeometry.release();
+        }
+    }
+}
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
new file mode 100644
index 0000000000..c1a8f9308f
--- /dev/null
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -0,0 +1,105 @@
+#ifndef CSV_RENDER_PATHGRID_H
+#define CSV_RENDER_PATHGRID_H
+
+#include <vector>
+
+#include <QString>
+#include <osg/ref_ptr>
+
+#include "../../model/world/cellcoordinates.hpp"
+
+#include "tagbase.hpp"
+
+namespace osg
+{
+    class Geode;
+    class Geometry;
+    class Group;
+    class PositionAttitudeTransform;
+    class Vec3d;
+}
+
+namespace CSMWorld
+{
+    class CommandMacro;
+    class Data;
+    class Pathgrid;
+}
+
+namespace CSVRender
+{
+    class Pathgrid;
+
+    class PathgridTag : public TagBase
+    {
+        public:
+
+            PathgridTag (Pathgrid* pathgrid);
+
+            Pathgrid* getPathgrid () const;
+
+            virtual QString getToolTip (bool hideBasics) const;
+
+        private:
+
+            Pathgrid* mPathgrid;
+    };
+
+    class Pathgrid
+    {
+        public:
+
+            typedef std::vector<unsigned short> NodeList;
+
+            Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
+                const CSMWorld::CellCoordinates& coordinates);
+
+            ~Pathgrid();
+
+            const CSMWorld::CellCoordinates& getCoordinates() const;
+            const std::string& getId() const;
+
+            bool isSelected() const;
+            const NodeList& getSelected() const;
+            void selectAll();
+            void toggleSelected(unsigned short node); // Adds to end of vector
+            void invertSelected();
+            void clearSelected();
+
+            void moveSelected(const osg::Vec3d& offset);
+            void resetMove();
+
+            void applyPosition(CSMWorld::CommandMacro& commands);
+            void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
+            void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
+
+            osg::ref_ptr<PathgridTag> getTag() const;
+
+            void recreateGeometry();
+
+        private:
+
+            CSMWorld::Data& mData;
+            std::string mId;
+            CSMWorld::CellCoordinates mCoords;
+
+            NodeList mSelected;
+
+            osg::Group* mParent;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
+            osg::ref_ptr<osg::PositionAttitudeTransform> mSelectedNode;
+            osg::ref_ptr<osg::Geode> mPathgridGeode;
+            osg::ref_ptr<osg::Geode> mSelectedGeode;
+            osg::ref_ptr<osg::Geometry> mPathgridGeometry;
+            osg::ref_ptr<osg::Geometry> mSelectedGeometry;
+
+            osg::ref_ptr<PathgridTag> mTag;
+
+            void recreateSelectedGeometry();
+            void recreateSelectedGeometry(const CSMWorld::Pathgrid& source);
+            void removePathgridGeometry();
+            void removeSelectedGeometry();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
new file mode 100644
index 0000000000..93b6a747d4
--- /dev/null
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -0,0 +1,152 @@
+#include "pathgridmode.hpp"
+
+#include <components/sceneutil/pathgridutil.hpp>
+
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/idtree.hpp"
+
+#include "mask.hpp"
+#include "pathgrid.hpp"
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
+        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid, "Pathgrid editing", parent)
+        , mDragMode(DragMode_None)
+        , mFromNode(0)
+    {
+    }
+
+    void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hit)
+    {
+    }
+
+    void PathgridMode::secondaryEditPressed(const WorldspaceHitResult& hit)
+    {
+    }
+
+    void PathgridMode::primarySelectPressed(const WorldspaceHitResult& hit)
+    {
+        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                tag->getPathgrid()->toggleSelected(node);
+            }
+        }
+    }
+
+    void PathgridMode::secondarySelectPressed(const WorldspaceHitResult& hit)
+    {
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                if (tag->getPathgrid()->getId() != mLastId)
+                {
+                    getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+                    mLastId = tag->getPathgrid()->getId();
+                }
+
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                tag->getPathgrid()->toggleSelected(node);
+
+                return;
+            }
+        }
+
+        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+    }
+
+    bool PathgridMode::primaryEditStartDrag(const WorldspaceHitResult& hit)
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        if (!selection.empty())
+        {
+            mDragMode = DragMode_Move;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    bool PathgridMode::secondaryEditStartDrag(const WorldspaceHitResult& hit)
+    {
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                mDragMode = DragMode_Edge;
+                mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void PathgridMode::drag(int diffX, int diffY, double speedFactor)
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                if (mDragMode == DragMode_Move)
+                {
+                    osg::Vec3d eye, center, up, offset;
+                    getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
+
+                    offset = (up * diffY * speedFactor) + (((center - eye) ^ up) * diffX * speedFactor);
+
+                    tag->getPathgrid()->moveSelected(offset);
+                }
+                else if (mDragMode == DragMode_Edge)
+                {
+                    // TODO make indicators
+                }
+            }
+        }
+    }
+
+    void PathgridMode::dragCompleted()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                if (mDragMode == DragMode_Move)
+                {
+                    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                    QString description = "Move pathgrid node(s)";
+
+                    CSMWorld::CommandMacro macro(undoStack, description);
+                    tag->getPathgrid()->applyPosition(macro);
+                }
+                else if (mDragMode == DragMode_Edge)
+                {
+                    // TODO raycast for other node and apply if needed with mFromNode
+                }
+            }
+        }
+
+        mDragMode = DragMode_None;
+    }
+
+    void PathgridMode::dragAborted()
+    {
+        getWorldspaceWidget().reset(Mask_Pathgrid);
+    }
+}
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
new file mode 100644
index 0000000000..0a84b6b10c
--- /dev/null
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -0,0 +1,53 @@
+#ifndef CSV_RENDER_PATHGRIDMODE_H
+#define CSV_RENDER_PATHGRIDMODE_H
+
+#include <string>
+
+#include "editmode.hpp"
+
+namespace CSVRender
+{
+    class PathgridMode : public EditMode
+    {
+            Q_OBJECT
+
+        public:
+
+            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
+
+            virtual void primaryEditPressed(const WorldspaceHitResult& hit);
+
+            virtual void secondaryEditPressed(const WorldspaceHitResult& hit);
+
+            virtual void primarySelectPressed(const WorldspaceHitResult& hit);
+
+            virtual void secondarySelectPressed(const WorldspaceHitResult& hit);
+
+            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
+
+            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
+
+            virtual void drag (int diffX, int diffY, double speedFactor);
+
+            virtual void dragCompleted();
+
+            /// \note dragAborted will not be called, if the drag is aborted via changing
+            /// editing mode
+            virtual void dragAborted();
+
+        private:
+
+            enum DragMode
+            {
+                DragMode_None,
+                DragMode_Move,
+                DragMode_Edge
+            };
+
+            std::string mLastId;
+            DragMode mDragMode;
+            unsigned short mFromNode;
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index e90a4fd5ae..5963107e97 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -27,8 +27,8 @@
 
 #include "object.hpp"
 #include "mask.hpp"
-#include "editmode.hpp"
 #include "instancemode.hpp"
+#include "pathgridmode.hpp"
 #include "cameracontroller.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
@@ -295,7 +295,7 @@ unsigned int CSVRender::WorldspaceWidget::getVisibilityMask() const
 
 void CSVRender::WorldspaceWidget::setInteractionMask (unsigned int mask)
 {
-    mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow;
+    mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow | Mask_Pathgrid | Mask_Terrain;
 }
 
 unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const
@@ -320,9 +320,7 @@ void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneTo
 {
     /// \todo replace EditMode with suitable subclasses
     tool->addButton (new InstanceMode (this, tool), "object");
-    tool->addButton (
-        new EditMode (this, QIcon (":placeholder"), Mask_Pathgrid, "Pathgrid editing"),
-        "pathgrid");
+    tool->addButton (new PathgridMode (this, tool), "pathgrid");
 }
 
 CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 5d71efd1e7..5078b1edb6 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -9,6 +9,7 @@ namespace SceneUtil
 {
     const unsigned short DiamondVertexCount = 6;
     const unsigned short DiamondIndexCount = 24;
+    const unsigned short DiamondWireframeIndexCount = 24;
 
     const unsigned short DiamondConnectorVertexCount = 4;
 
@@ -16,6 +17,7 @@ namespace SceneUtil
 
     const float DiamondHalfHeight = 40.f;
     const float DiamondHalfWidth = 16.f;
+    const float DiamondWireframeScalar = 1.1f;
 
     const osg::Vec3f DiamondPoints[DiamondVertexCount] =
     {
@@ -39,6 +41,22 @@ namespace SceneUtil
         5, 2, 4
     };
 
+    const unsigned short DiamondWireframeIndices[DiamondWireframeIndexCount] =
+    {
+        0, 1,
+        0, 2,
+        0, 3,
+        0, 4,
+        1, 2,
+        2, 4,
+        4, 3,
+        3, 1,
+        5, 1,
+        5, 2,
+        5, 3,
+        5, 4
+    };
+
     const unsigned short DiamondConnectorVertices[DiamondConnectorVertexCount] =
     {
         1, 2, 3, 4
@@ -55,6 +73,8 @@ namespace SceneUtil
     };
 
     const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
+    const osg::Vec4f DiamondWireColor = osg::Vec4f(0.8f, 1.f, 0.9f, 1.f);
+    const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f);
 
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
     {
@@ -155,4 +175,61 @@ namespace SceneUtil
 
         return gridGeometry;
     }
+
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
+        const std::vector<unsigned short>& selected)
+    {
+        const unsigned short PointCount = selected.size();
+
+        const unsigned short VertexCount = PointCount * DiamondVertexCount;
+        const unsigned short ColorCount = VertexCount;
+        const size_t IndexCount = PointCount * DiamondWireframeIndexCount;
+
+        osg::ref_ptr<osg::Geometry> wireframeGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(VertexCount);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(ColorCount);
+        osg::ref_ptr<osg::DrawElementsUShort> indices =
+            new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, IndexCount);
+
+        osg::Vec3f wireOffset = osg::Vec3f(0, 0, (1 - DiamondWireframeScalar) * DiamondHalfHeight);
+
+        // Add each point/node
+        for (unsigned short it = 0; it < PointCount; ++it)
+        {
+            const ESM::Pathgrid::Point& point = pathgrid.mPoints[selected[it]];
+            osg::Vec3f position = osg::Vec3f(point.mX, point.mY, point.mZ) + wireOffset;
+
+            unsigned short vertexOffset = it * DiamondVertexCount;
+            unsigned short indexOffset = it * DiamondWireframeIndexCount;
+
+            // Point
+            for (unsigned short i = 0; i < DiamondVertexCount; ++i)
+            {
+                (*vertices)[vertexOffset + i] = position + DiamondPoints[i] * DiamondWireframeScalar;
+
+                if (it == PointCount - 1)
+                    (*colors)[vertexOffset + i] = DiamondFocusWireColor;
+                else
+                    (*colors)[vertexOffset + i] = DiamondWireColor;
+            }
+
+            for (unsigned short i = 0; i < DiamondWireframeIndexCount; ++i)
+            {
+                indices->setElement(indexOffset + i, vertexOffset + DiamondWireframeIndices[i]);
+            }
+        }
+
+        wireframeGeometry->setVertexArray(vertices);
+        wireframeGeometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
+        wireframeGeometry->addPrimitiveSet(indices);
+        wireframeGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        return wireframeGeometry;
+    }
+
+    unsigned short getPathgridNode(unsigned short vertexIndex)
+    {
+        return vertexIndex / (DiamondVertexCount + DiamondConnectorVertexCount);
+    }
 }
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index eb1ab1e3e6..9a93ddf91b 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -12,6 +12,11 @@ namespace ESM
 namespace SceneUtil
 {
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
+
+    osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,
+        const std::vector<unsigned short>& selected);
+
+    unsigned short getPathgridNode(unsigned short vertexIndex);
 }
 
 #endif

From f8b43b2a64562046fdafed80df36686b64642426 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 13 May 2016 12:55:35 -0400
Subject: [PATCH 615/765] Rename cryptic variables.

---
 apps/opencs/view/render/pathgridmode.cpp     |  6 +++---
 apps/opencs/view/render/worldspacewidget.cpp | 12 ++++++------
 apps/opencs/view/render/worldspacewidget.hpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 93b6a747d4..d38390025c 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -36,7 +36,7 @@ namespace CSVRender
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
-                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
                 tag->getPathgrid()->toggleSelected(node);
             }
         }
@@ -54,7 +54,7 @@ namespace CSVRender
                     mLastId = tag->getPathgrid()->getId();
                 }
 
-                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
                 tag->getPathgrid()->toggleSelected(node);
 
                 return;
@@ -86,7 +86,7 @@ namespace CSVRender
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
                 mDragMode = DragMode_Edge;
-                mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.i0));
+                mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
                 return true;
             }
         }
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 5963107e97..cd65bd8e87 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -501,9 +501,9 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
                 WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
                 if (intersection.indexList.size() >= 3)
                 {
-                    hit.i0 = intersection.indexList[0];
-                    hit.i1 = intersection.indexList[1];
-                    hit.i2 = intersection.indexList[2];
+                    hit.index0 = intersection.indexList[0];
+                    hit.index1 = intersection.indexList[1];
+                    hit.index2 = intersection.indexList[2];
                 }
                 return hit;
             }
@@ -513,9 +513,9 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
         WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
         if (intersection.indexList.size() >= 3)
         {
-            hit.i0 = intersection.indexList[0];
-            hit.i1 = intersection.indexList[1];
-            hit.i2 = intersection.indexList[2];
+            hit.index0 = intersection.indexList[0];
+            hit.index1 = intersection.indexList[1];
+            hit.index2 = intersection.indexList[2];
         }
         return hit;
     }
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 4160da3d82..2cf8663425 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -40,7 +40,7 @@ namespace CSVRender
     {
         bool hit;
         osg::ref_ptr<TagBase> tag;
-        unsigned int i0, i1, i2;
+        unsigned int index0, index1, index2; // indices of mesh vertices
         osg::Vec3d worldPos;
     };
 

From 3b31e8f66e5e78779b41e99809d34519ad9f221e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 May 2016 19:19:37 +0200
Subject: [PATCH 616/765] Do not set AiPackageDone flag for non-Aipackages
 (Fixes #3392)

---
 apps/openmw/mwmechanics/aisequence.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 7d0bd55ff1..9f6b71db5f 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -155,6 +155,13 @@ bool AiSequence::isPackageDone() const
     return mDone;
 }
 
+bool isActualAiPackage(int packageTypeId)
+{
+    return (packageTypeId != AiPackage::TypeIdCombat
+                   && packageTypeId != AiPackage::TypeIdPursue
+                   && packageTypeId != AiPackage::TypeIdAvoidDoor);
+}
+
 void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
 {
     if(actor != getPlayer())
@@ -168,11 +175,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
         MWMechanics::AiPackage* package = mPackages.front();
         int packageTypeId = package->getTypeId();
         // workaround ai packages not being handled as in the vanilla engine
-        if (packageTypeId != AiPackage::TypeIdCombat
-                       && packageTypeId != AiPackage::TypeIdPursue
-                       && packageTypeId != AiPackage::TypeIdAvoidDoor)
+        if (isActualAiPackage(packageTypeId))
             mLastAiPackage = packageTypeId;
-
         // if active package is combat one, choose nearest target
         if (packageTypeId == AiPackage::TypeIdCombat)
         {
@@ -222,11 +226,6 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
 
                 package = mPackages.front();
             }
-            else
-            {
-                mDone = true;
-                return;
-            }
         }
 
         if (package->execute (actor,characterController,state,duration))
@@ -237,7 +236,8 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
                     std::find(mPackages.begin(), mPackages.end(), package);
             mPackages.erase(toRemove);
             delete package;
-            mDone = true;
+            if (isActualAiPackage(packageTypeId))
+                mDone = true;
         }
         else
         {

From e30bb31a791eaeb403a5b7a0f0c29df316e30086 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 May 2016 22:35:34 +0200
Subject: [PATCH 617/765] Handle the particle node's AutoPlay flag (Bug #3390)

---
 components/nifosg/nifloader.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 9db672d9ef..874ca9eaa1 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -387,6 +387,15 @@ namespace NifOsg
             toSetup->setFunction(boost::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
         }
 
+        void setupParticleController(const Nif::Controller* ctrl, SceneUtil::Controller* toSetup, int particleflags)
+        {
+            bool autoPlay = particleflags & Nif::NiNode::ParticleFlag_AutoPlay;
+            if (autoPlay)
+                toSetup->setSource(boost::shared_ptr<SceneUtil::ControllerSource>(new SceneUtil::FrameTimeSource));
+
+            toSetup->setFunction(boost::shared_ptr<ControllerFunction>(new ControllerFunction(ctrl)));
+        }
+
         void optimize (const Nif::Node* nifNode, osg::Group* node, bool skipMeshes)
         {
             // For nodes with an identity transform, remove the redundant Transform node
@@ -984,7 +993,7 @@ namespace NifOsg
                 emitterNode->addChild(emitter);
 
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
-                setupController(partctrl, callback, animflags);
+                setupParticleController(partctrl, callback, particleflags);
                 emitter->setUpdateCallback(callback);
             }
 

From 0c08f705c5f07354c216535d757230384c1264ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 May 2016 22:36:53 +0200
Subject: [PATCH 618/765] Make the ParticleSystemController freeze the particle
 system instead of the emitter (Bug #3390)

---
 components/nifosg/controller.cpp | 4 ++--
 components/nifosg/nifloader.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index aabe07c866..ce6ab2c488 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -441,9 +441,9 @@ void ParticleSystemController::operator() (osg::Node* node, osg::NodeVisitor* nv
 {
     if (hasInput())
     {
-        osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
+        osgParticle::ParticleSystem* partsys = static_cast<osgParticle::ParticleSystem*>(node);
         float time = getInputValue(nv);
-        emitter->setEnabled(time >= mEmitStart && time < mEmitStop);
+        partsys->setFrozen(!(time >= mEmitStart && time < mEmitStop));
     }
     traverse(node, nv);
 }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 874ca9eaa1..b5311953e3 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -994,7 +994,7 @@ namespace NifOsg
 
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
                 setupParticleController(partctrl, callback, particleflags);
-                emitter->setUpdateCallback(callback);
+                partsys->setUpdateCallback(callback);
             }
 
             // affectors must be attached *after* the emitter in the scene graph for correct update order

From 720207219633d8fa37d5afdbc011b0d8bc09aaba Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 May 2016 22:38:49 +0200
Subject: [PATCH 619/765] Freeze particle systems on construction if the
 AutoPlay flag is missing

---
 components/nifosg/nifloader.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index b5311953e3..324c7796d0 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -995,6 +995,14 @@ namespace NifOsg
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
                 setupParticleController(partctrl, callback, particleflags);
                 partsys->setUpdateCallback(callback);
+
+                if (!(particleflags & Nif::NiNode::ParticleFlag_AutoPlay))
+                {
+                    partsys->setFrozen(true);
+                    // HACK: particle system will not render in Frozen state if there was no update
+                    osg::NodeVisitor nv;
+                    partsys->update(0.0, nv);
+                }
             }
 
             // affectors must be attached *after* the emitter in the scene graph for correct update order

From 62018e802b3a0cd38e0f4d6deb44fcb6608bb476 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 14 May 2016 22:55:14 +0200
Subject: [PATCH 620/765] Minor fix to particle system AutoPlay flag handling

The previous commit broke some magic effects (e.g. shield). The controller's emit start/stop times should control the emitter, while the absence of the ParticleSystem's autoplay flag should freeze the whole particle system if no valid controller source gets assigned. This revised version works for both the Shield effect and the "dagoth ur death sparkles" effect.
---
 components/nifosg/controller.cpp | 7 +++++--
 components/nifosg/nifloader.cpp  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp
index ce6ab2c488..5a3a7ac590 100644
--- a/components/nifosg/controller.cpp
+++ b/components/nifosg/controller.cpp
@@ -439,12 +439,15 @@ ParticleSystemController::ParticleSystemController(const ParticleSystemControlle
 
 void ParticleSystemController::operator() (osg::Node* node, osg::NodeVisitor* nv)
 {
+    osgParticle::ParticleProcessor* emitter = static_cast<osgParticle::ParticleProcessor*>(node);
     if (hasInput())
     {
-        osgParticle::ParticleSystem* partsys = static_cast<osgParticle::ParticleSystem*>(node);
         float time = getInputValue(nv);
-        partsys->setFrozen(!(time >= mEmitStart && time < mEmitStop));
+        emitter->getParticleSystem()->setFrozen(false);
+        emitter->setEnabled(time >= mEmitStart && time < mEmitStop);
     }
+    else
+        emitter->getParticleSystem()->setFrozen(true);
     traverse(node, nv);
 }
 
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 324c7796d0..172d92abeb 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -994,7 +994,7 @@ namespace NifOsg
 
                 osg::ref_ptr<ParticleSystemController> callback(new ParticleSystemController(partctrl));
                 setupParticleController(partctrl, callback, particleflags);
-                partsys->setUpdateCallback(callback);
+                emitter->setUpdateCallback(callback);
 
                 if (!(particleflags & Nif::NiNode::ParticleFlag_AutoPlay))
                 {

From 6e0c3b241366c106543ed5c97678ea6077ae6209 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 15 May 2016 16:28:04 +0200
Subject: [PATCH 621/765] Revert commit
 16ac6e7aacc072e61ac481dd5ec99d9ffb4887be (Fixes #3394)

---
 components/esm/loaddial.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index 5758dc0c46..5924445053 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -78,13 +78,12 @@ namespace ESM
     {
         ESM::DialInfo info;
         info.loadId(esm);
-
         bool isDeleted = false;
+        info.loadData(esm, isDeleted);
+
         if (!merge || mInfo.empty())
         {
-            info.loadData(esm, isDeleted);
             mLookup[info.mId] = std::make_pair(mInfo.insert(mInfo.end(), info), isDeleted);
-
             return;
         }
 
@@ -96,20 +95,10 @@ namespace ESM
         if (lookup != mLookup.end())
         {
             it = lookup->second.first;
-
-            // Merge with existing record. Only the subrecords that are present in
-            // the new record will be overwritten.
-            it->loadData(esm, isDeleted);
-            info = *it;
-
-            // Since the record merging may have changed the next/prev linked list connection, we need to re-insert the record
+            // Since the new version of this record may have changed the next/prev linked list connection, we need to re-insert the record
             mInfo.erase(it);
             mLookup.erase(lookup);
         }
-        else
-        {
-            info.loadData(esm, isDeleted);
-        }
 
         if (info.mNext.empty())
         {

From 85b0c4393bd2b5f9f870c2da07e8298aac542618 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 15 May 2016 16:37:22 +0200
Subject: [PATCH 622/765] Remove obsolete code

---
 components/esm/loadinfo.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 37fd709080..ee6d157080 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -29,9 +29,6 @@ namespace ESM
         mPrev = esm.getHNString("PNAM");
         mNext = esm.getHNString("NNAM");
 
-        // Since there's no way to mark selects as "deleted", we have to clear the SelectStructs from all previous loadings
-        mSelects.clear();
-
         while (esm.hasMoreSubs())
         {
             esm.getSubName();

From 04b537bf5f9e707ed770050e9459a51bac000c87 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 15 May 2016 16:38:04 +0200
Subject: [PATCH 623/765] Minor cleanup

---
 components/esm/loaddial.cpp | 3 +--
 components/esm/loadinfo.cpp | 9 ---------
 components/esm/loadinfo.hpp | 6 +-----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index 5924445053..f06b42250f 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -77,9 +77,8 @@ namespace ESM
     void Dialogue::readInfo(ESMReader &esm, bool merge)
     {
         ESM::DialInfo info;
-        info.loadId(esm);
         bool isDeleted = false;
-        info.loadData(esm, isDeleted);
+        info.load(esm, isDeleted);
 
         if (!merge || mInfo.empty())
         {
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index ee6d157080..38bb163e61 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -9,18 +9,9 @@ namespace ESM
     unsigned int DialInfo::sRecordId = REC_INFO;
 
     void DialInfo::load(ESMReader &esm, bool &isDeleted)
-    {
-        loadId(esm);
-        loadData(esm, isDeleted);
-    }
-
-    void DialInfo::loadId(ESMReader &esm)
     {
         mId = esm.getHNString("INAM");
-    }
 
-    void DialInfo::loadData(ESMReader &esm, bool &isDeleted)
-    {
         isDeleted = false;
 
         mQuestStatus = QS_None;
diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp
index 8123a9ace8..2fbc782ec9 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm/loadinfo.hpp
@@ -106,11 +106,7 @@ struct DialInfo
     };
 
     void load(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Info record
-    void loadId(ESMReader &esm);
-    ///< Loads only Id of Info record (INAM sub-record)
-    void loadData(ESMReader &esm, bool &isDeleted);
-    ///< Loads all sub-records of Info record, except INAM sub-record
+    ///< Loads Info record
 
     void save(ESMWriter &esm, bool isDeleted = false) const;
 

From b0180cb6b47416f7fd31ef7bf1708b3926697f9b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 16 May 2016 02:05:02 +0200
Subject: [PATCH 624/765] Fix current region check (Bug #3391)

---
 apps/openmw/mwworld/weather.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 5987e1971d..1cfba0daf1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -892,8 +892,7 @@ inline void WeatherManager::regionalWeatherChanged(const std::string& regionID,
     MWWorld::ConstPtr player = MWMechanics::getPlayer();
     if(player.isInCell())
     {
-        std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);
-        if(!playerRegion.empty() && (playerRegion == regionID))
+        if(Misc::StringUtils::ciEqual(regionID, mCurrentRegion))
         {
             addWeatherTransition(region.getWeather());
         }

From da6a742bebf886a2fa49fbcd397e6f4a1968ce75 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 16:50:02 -0400
Subject: [PATCH 625/765] Add control description to tooltip.

---
 apps/opencs/view/render/pathgrid.cpp     |  1 -
 apps/opencs/view/render/pathgridmode.cpp | 13 ++++++++++++-
 apps/opencs/view/render/pathgridmode.hpp |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 4aa254a449..bd25a1b287 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -33,7 +33,6 @@ namespace CSVRender
 
         if (!hideBasics)
         {
-            text += "<p>Only one pathgrid may be edited at a time.";
         }
 
         return text;
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index d38390025c..2484dc04a1 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -14,12 +14,23 @@
 namespace CSVRender
 {
     PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
-        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid, "Pathgrid editing", parent)
+        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid, getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
     {
     }
 
+    QString PathgridMode::getTooltip()
+    {
+        return QString(
+            "Pathgrid editing"
+            "<ul><li>Primary edit: Add node to scene</li>"
+            "<li>Secondary edit: Connect selected nodes to node</li>"
+            "<li>Primary drag: Move selected nodes</li>"
+            "<li>Secondary drag: Connect one node to another</li>"
+            "<li>Other operations may be done with the context menu</li>"
+            "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
+    }
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hit)
     {
     }
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index 0a84b6b10c..75611e1f64 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -47,6 +47,8 @@ namespace CSVRender
             std::string mLastId;
             DragMode mDragMode;
             unsigned short mFromNode;
+            QString getTooltip();
+
     };
 }
 

From 55656d68ef12d6f3818e04e1ffa5c95bbb7b868e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:00:58 -0400
Subject: [PATCH 626/765] Cleanup, put duplicated code in function

---
 apps/opencs/view/render/pathgrid.cpp | 108 +++++++++++++++------------
 apps/opencs/view/render/pathgrid.hpp |   6 ++
 2 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index bd25a1b287..4c3db2562c 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -41,6 +41,7 @@ namespace CSVRender
     Pathgrid::Pathgrid(CSMWorld::Data& data, osg::Group* parent, const std::string& pathgridId,
         const CSMWorld::CellCoordinates& coordinates)
         : mData(data)
+        , mPathgridCollection(mData.getPathgrids())
         , mId(pathgridId)
         , mCoords(coordinates)
         , mParent(parent)
@@ -97,15 +98,13 @@ namespace CSVRender
     {
         mSelected.clear();
 
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
-            for (unsigned short i = 0; i < static_cast<unsigned short>(source.mPoints.size()); ++i)
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source->mPoints.size()); ++i)
                 mSelected.push_back(i);
 
-            recreateSelectedGeometry(source);
+            recreateSelectedGeometry(*source);
         }
         else
         {
@@ -130,21 +129,19 @@ namespace CSVRender
 
     void Pathgrid::invertSelected()
     {
-        NodeList temp = NodeList(mSelected.begin(), mSelected.end());
+        NodeList temp = NodeList(mSelected);
         mSelected.clear();
 
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
-            for (unsigned short i = 0; i < static_cast<unsigned short>(source.mPoints.size()); ++i)
+            for (unsigned short i = 0; i < static_cast<unsigned short>(source->mPoints.size()); ++i)
             {
                 if (std::find(temp.begin(), temp.end(), i) == temp.end())
                     mSelected.push_back(i);
             }
 
-            recreateSelectedGeometry(source);
+            recreateSelectedGeometry(*source);
         }
         else
         {
@@ -170,41 +167,44 @@ namespace CSVRender
 
     void Pathgrid::applyPosition(CSMWorld::CommandMacro& commands)
     {
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
             osg::Vec3d localCoords = mSelectedNode->getPosition();
 
-            int oX = static_cast<int>(localCoords.x());
-            int oY = static_cast<int>(localCoords.y());
-            int oZ = static_cast<int>(localCoords.z());
+            int offsetX = static_cast<int>(localCoords.x());
+            int offsetY = static_cast<int>(localCoords.y());
+            int offsetZ = static_cast<int>(localCoords.z());
 
-            CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& collection = mData.getPathgrids();
-            QAbstractItemModel* model = mData.getTableModel (CSMWorld::UniversalId::Type_Pathgrids);
+            QAbstractItemModel* model = mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids);
 
-            int recordIndex = collection.getIndex (mId);
-            int parentColumn = collection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+            int recordIndex = mPathgridCollection.getIndex(mId);
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosX);
+
+            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosY);
+
+            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosZ);
 
             QModelIndex parent = model->index(recordIndex, parentColumn);
 
             for (size_t i = 0; i < mSelected.size(); ++i)
             {
-                const CSMWorld::Pathgrid::Point& point = source.mPoints[mSelected[i]];
-                int row = mSelected[i];
+                const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
+                int row = static_cast<int>(mSelected[i]);
 
-                // X
-                int column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosX);
-                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mX + oX));
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
+                    point.mX + offsetX));
 
-                // Y
-                column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosY);
-                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mY + oY));
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
+                    point.mY + offsetY));
 
-                // Z
-                column = collection.searchNestedColumnIndex(parentColumn, CSMWorld::Columns::ColumnId_PathgridPosZ);
-                commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, column, parent), point.mZ + oZ));
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
+                    point.mZ + offsetZ));
             }
         }
 
@@ -228,30 +228,29 @@ namespace CSVRender
 
     void Pathgrid::recreateGeometry()
     {
-        removePathgridGeometry();
-        removeSelectedGeometry();
-
         // Make new
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
-            mPathgridGeometry = SceneUtil::createPathgridGeometry(source);
+            removePathgridGeometry();
+            mPathgridGeometry = SceneUtil::createPathgridGeometry(*source);
             mPathgridGeode->addDrawable(mPathgridGeometry);
 
-            recreateSelectedGeometry(source);
+            recreateSelectedGeometry(*source);
+        }
+        else
+        {
+            removePathgridGeometry();
+            removeSelectedGeometry();
         }
     }
 
     void Pathgrid::recreateSelectedGeometry()
     {
-        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mData.getPathgrids();
-        int pathgridIndex = pathgrids.searchId(mId);
-        if (pathgridIndex != -1)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid& source = pathgrids.getRecord(pathgridIndex).get();
-            recreateSelectedGeometry(source);
+            recreateSelectedGeometry(*source);
         }
         else
         {
@@ -283,4 +282,15 @@ namespace CSVRender
             mSelectedGeometry.release();
         }
     }
+
+    const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
+    {
+        int index = mPathgridCollection.searchId(mId);
+        if (index != -1)
+        {
+            return &mPathgridCollection.getRecord(index).get();
+        }
+
+        return 0;
+    }
 }
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index c1a8f9308f..2fece6e0d8 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -7,6 +7,8 @@
 #include <osg/ref_ptr>
 
 #include "../../model/world/cellcoordinates.hpp"
+#include "../../model/world/idcollection.hpp"
+#include "../../model/world/subcellcollection.hpp"
 
 #include "tagbase.hpp"
 
@@ -80,6 +82,7 @@ namespace CSVRender
         private:
 
             CSMWorld::Data& mData;
+            CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& mPathgridCollection;
             std::string mId;
             CSMWorld::CellCoordinates mCoords;
 
@@ -99,6 +102,9 @@ namespace CSVRender
             void recreateSelectedGeometry(const CSMWorld::Pathgrid& source);
             void removePathgridGeometry();
             void removeSelectedGeometry();
+
+            const CSMWorld::Pathgrid* getPathgridSource();
+
     };
 }
 

From 8b6cb733693d543f11b731c34733befcfdef9fd4 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:03:00 -0400
Subject: [PATCH 627/765] Add ability to invert selection.

---
 apps/opencs/view/render/pagedworldspacewidget.cpp   | 9 +++++++++
 apps/opencs/view/render/pagedworldspacewidget.hpp   | 3 +++
 apps/opencs/view/render/unpagedworldspacewidget.cpp | 6 ++++++
 apps/opencs/view/render/unpagedworldspacewidget.hpp | 3 +++
 apps/opencs/view/render/worldspacewidget.hpp        | 3 +++
 5 files changed, 24 insertions(+)

diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 90088f24e3..b44d1d58ae 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -606,6 +606,15 @@ void CSVRender::PagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::PagedWorldspaceWidget::invertSelection (int elementMask)
+{
+    for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
+        iter!=mCells.end(); ++iter)
+        iter->second->setSelection (elementMask, Cell::Selection_Invert);
+
+    flagAsModified();
+}
+
 void CSVRender::PagedWorldspaceWidget::selectAll (int elementMask)
 {
     for (std::map<CSMWorld::CellCoordinates, Cell *>::iterator iter = mCells.begin();
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 8c17d4fcdc..95bf0f8464 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -107,6 +107,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask);
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 84b7a0ca88..df28f3f800 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -104,6 +104,12 @@ void CSVRender::UnpagedWorldspaceWidget::clearSelection (int elementMask)
     flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::invertSelection (int elementMask)
+{
+    mCell->setSelection (elementMask, Cell::Selection_Invert);
+    flagAsModified();
+}
+
 void CSVRender::UnpagedWorldspaceWidget::selectAll (int elementMask)
 {
     mCell->setSelection (elementMask, Cell::Selection_All);
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index f063020325..98cc3ef967 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -47,6 +47,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask);
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask);
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask);
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 2cf8663425..70ebae5f8d 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -136,6 +136,9 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the clear operation
             virtual void clearSelection (int elementMask) = 0;
 
+            /// \param elementMask Elements to be affected by the select operation
+            virtual void invertSelection (int elementMask) = 0;
+
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAll (int elementMask) = 0;
 

From f0bbe2c633361a5b51794cd49104e945f28e447d Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:06:40 -0400
Subject: [PATCH 628/765] Add context menu for pathgrid editor.

---
 apps/opencs/view/render/pathgridmode.cpp | 59 +++++++++++++++++++++++-
 apps/opencs/view/render/pathgridmode.hpp | 18 ++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 2484dc04a1..de7b09018b 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -1,5 +1,7 @@
 #include "pathgridmode.hpp"
 
+#include <QMenu>
+
 #include <components/sceneutil/pathgridutil.hpp>
 
 #include "../../model/world/commands.hpp"
@@ -31,8 +33,39 @@ namespace CSVRender
             "<li>Other operations may be done with the context menu</li>"
             "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
     }
-    void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hit)
+
+    void PathgridMode::activate(CSVWidget::SceneToolbar* toolbar)
     {
+        mSelectAll = new QAction("Select all other nodes in cell", this);
+        mInvertSelection = new QAction("Invert selection", this);
+        mClearSelection = new QAction("Clear selection", this);
+        mRemoveSelected = new QAction("Remove selected nodes", this);
+        mRemoveSelectedEdges = new QAction("Remove edges between selected nodes", this);
+
+        connect(mSelectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
+        connect(mInvertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
+        connect(mClearSelection, SIGNAL(triggered()), this, SLOT(clearSelection()));
+        connect(mRemoveSelected, SIGNAL(triggered()), this, SLOT(removeSelected()));
+        connect(mRemoveSelectedEdges, SIGNAL(triggered()), this, SLOT(removeSelectedEdges()));
+
+        EditMode::activate(toolbar);
+    }
+
+    bool PathgridMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            menu->addAction(mSelectAll);
+            menu->addAction(mInvertSelection);
+            menu->addAction(mClearSelection);
+            menu->addAction(mRemoveSelected);
+            menu->addAction(mRemoveSelectedEdges);
+        }
+
+        return true;
+    }
+
+    void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
     }
 
     void PathgridMode::secondaryEditPressed(const WorldspaceHitResult& hit)
@@ -160,4 +193,28 @@ namespace CSVRender
     {
         getWorldspaceWidget().reset(Mask_Pathgrid);
     }
+
+    void PathgridMode::selectAll()
+    {
+        // Select rest of nodes in selected cell
+        getWorldspaceWidget().selectAll(Mask_Pathgrid);
+    }
+
+    void PathgridMode::invertSelection()
+    {
+        getWorldspaceWidget().invertSelection(Mask_Pathgrid);
+    }
+
+    void PathgridMode::clearSelection()
+    {
+        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
+    }
+
+    void PathgridMode::removeSelected()
+    {
+    }
+
+    void PathgridMode::removeSelectedEdges()
+    {
+    }
 }
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index 75611e1f64..b6a650eb4b 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -15,6 +15,10 @@ namespace CSVRender
 
             PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
 
+            virtual void activate(CSVWidget::SceneToolbar* toolbar);
+
+            virtual bool createContextMenu(QMenu* menu);
+
             virtual void primaryEditPressed(const WorldspaceHitResult& hit);
 
             virtual void secondaryEditPressed(const WorldspaceHitResult& hit);
@@ -47,8 +51,22 @@ namespace CSVRender
             std::string mLastId;
             DragMode mDragMode;
             unsigned short mFromNode;
+
+            QAction* mSelectAll;
+            QAction* mInvertSelection;
+            QAction* mClearSelection;
+            QAction* mRemoveSelected;
+            QAction* mRemoveSelectedEdges;
+
             QString getTooltip();
 
+        private slots:
+
+            void selectAll();
+            void invertSelection();
+            void clearSelection();
+            void removeSelected();
+            void removeSelectedEdges();
     };
 }
 

From 9f7c8d559c54fd85f45191d7754f9e27d87aef76 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:16:15 -0400
Subject: [PATCH 629/765] Add focus requirement for context menu.

---
 apps/opencs/view/render/cell.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index a8e36728cd..e383ccad38 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -307,11 +307,23 @@ void CSVRender::Cell::setSelection (int elementMask, Selection mode)
     }
     if (elementMask & Mask_Pathgrid)
     {
+        // Only one pathgrid may be selected, so some operations will only have an effect
+        // if the pathgrid is already focused
         switch (mode)
         {
-            case Selection_Clear: mPathgrid->clearSelected(); break;
-            case Selection_All: mPathgrid->selectAll(); break;
-            case Selection_Invert: mPathgrid->invertSelected(); break;
+            case Selection_Clear:
+                mPathgrid->clearSelected();
+                break;
+
+            case Selection_All:
+                if (mPathgrid->isSelected())
+                    mPathgrid->selectAll();
+                break;
+
+            case Selection_Invert:
+                if (mPathgrid->isSelected())
+                    mPathgrid->invertSelected();
+                break;
         }
     }
 }

From 6fbc10dbbadfe807efe56f0e96fd670571ff53d2 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:20:07 -0400
Subject: [PATCH 630/765] Add ability to get cell, pathgrid, and ability to add
 nodes. Also missing include.

---
 apps/opencs/view/render/cell.cpp              |  5 +++
 apps/opencs/view/render/cell.hpp              |  3 ++
 .../view/render/pagedworldspacewidget.cpp     | 15 +++++++
 .../view/render/pagedworldspacewidget.hpp     |  2 +
 apps/opencs/view/render/pathgrid.cpp          | 42 +++++++++++++++++++
 apps/opencs/view/render/pathgrid.hpp          |  1 +
 apps/opencs/view/render/pathgridmode.cpp      | 32 ++++++++++++++
 .../view/render/unpagedworldspacewidget.cpp   |  5 +++
 .../view/render/unpagedworldspacewidget.hpp   |  2 +
 apps/opencs/view/render/worldspacewidget.hpp  |  4 ++
 10 files changed, 111 insertions(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index e383ccad38..eed394d0b4 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -123,6 +123,11 @@ CSVRender::Cell::~Cell()
     mCellNode->getParent(0)->removeChild(mCellNode);
 }
 
+CSVRender::Pathgrid* CSVRender::Cell::getPathgrid() const
+{
+    return mPathgrid.get();
+}
+
 bool CSVRender::Cell::referenceableDataChanged (const QModelIndex& topLeft,
     const QModelIndex& bottomRight)
 {
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index caf6c59a92..a2efc0077d 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -87,6 +87,9 @@ namespace CSVRender
 
             ~Cell();
 
+            /// \note Returns the pathgrid representation which will exist as long as the cell exists
+            Pathgrid* getPathgrid() const;
+
             /// \return Did this call result in a modification of the visual representation of
             /// this cell?
             bool referenceableDataChanged (const QModelIndex& topLeft,
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index b44d1d58ae..39e7f8361a 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -644,6 +644,21 @@ std::string CSVRender::PagedWorldspaceWidget::getCellId (const osg::Vec3f& point
     return cellCoordinates.getId (mWorldspace);
 }
 
+CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const osg::Vec3d& point) const
+{
+    const int cellSize = 8192;
+
+    CSMWorld::CellCoordinates coords(
+        static_cast<int> (std::floor (point.x()/cellSize)),
+        static_cast<int> (std::floor (point.y()/cellSize)));
+
+    std::map<CSMWorld::CellCoordinates, Cell*>::const_iterator searchResult = mCells.find(coords);
+    if (searchResult != mCells.end())
+        return searchResult->second;
+    else
+        return 0;
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::PagedWorldspaceWidget::getSelection (
     unsigned int elementMask) const
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index 95bf0f8464..c7f035dd98 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -121,6 +121,8 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual Cell* getCell(const osg::Vec3d& point) const;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 4c3db2562c..4df9852cb4 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -13,6 +13,7 @@
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/data.hpp"
+#include "../../model/world/idtree.hpp"
 
 namespace CSVRender
 {
@@ -165,6 +166,47 @@ namespace CSVRender
         mSelectedNode->setPosition(osg::Vec3f(0,0,0));
     }
 
+    void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            osg::Vec3d localCoords = worldPos - mBaseNode->getPosition();
+
+            int posX = static_cast<int>(localCoords.x());
+            int posY = static_cast<int>(localCoords.y());
+            int posZ = static_cast<int>(localCoords.z());
+
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+            int recordIndex = mPathgridCollection.getIndex (mId);
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosX);
+
+            int posYColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosY);
+
+            int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridPosZ);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+            int row = static_cast<int>(source->mPoints.size());
+
+            // Add node
+            commands.push (new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
+            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
+            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
+        }
+        else
+        {
+            // Create pathgrid TODO
+        }
+    }
+
     void Pathgrid::applyPosition(CSMWorld::CommandMacro& commands)
     {
         const CSMWorld::Pathgrid* source = getPathgridSource();
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 2fece6e0d8..a820417408 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -71,6 +71,7 @@ namespace CSVRender
             void moveSelected(const osg::Vec3d& offset);
             void resetMove();
 
+            void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
             void applyPosition(CSMWorld::CommandMacro& commands);
             void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
             void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index de7b09018b..c06618e74a 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -9,6 +9,7 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 
+#include "cell.hpp"
 #include "mask.hpp"
 #include "pathgrid.hpp"
 #include "worldspacewidget.hpp"
@@ -66,6 +67,37 @@ namespace CSVRender
     }
 
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
+    {
+        // Determine placement
+        osg::Vec3d position;
+
+        if (hitResult.hit)
+        {
+            position = hitResult.worldPos;
+        }
+        else
+        {
+            const double DefaultDistance = 500.f;
+
+            osg::Vec3d eye, center, up, offset;
+            getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
+
+            osg::Vec3d direction = center - eye;
+            direction.normalize();
+            position = eye + direction * DefaultDistance;
+        }
+
+        // Get pathgrid cell
+        Cell* cell = getWorldspaceWidget().getCell (position);
+        if (cell)
+        {
+            // Add node
+            QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+            QString description = "Connect node to selected nodes";
+
+            CSMWorld::CommandMacro macro(undoStack, description);
+            cell->getPathgrid()->applyPoint(macro, position);
+        }
     }
 
     void PathgridMode::secondaryEditPressed(const WorldspaceHitResult& hit)
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index df28f3f800..802194bea2 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -127,6 +127,11 @@ std::string CSVRender::UnpagedWorldspaceWidget::getCellId (const osg::Vec3f& poi
     return mCellId;
 }
 
+CSVRender::Cell* CSVRender::UnpagedWorldspaceWidget::getCell(const osg::Vec3d& point) const
+{
+    return mCell.get();
+}
+
 std::vector<osg::ref_ptr<CSVRender::TagBase> > CSVRender::UnpagedWorldspaceWidget::getSelection (
     unsigned int elementMask) const
 {
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index 98cc3ef967..dd4a8a2f7f 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -61,6 +61,8 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const;
 
+            virtual Cell* getCell(const osg::Vec3d& point) const;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const;
 
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 70ebae5f8d..59aacca291 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -33,6 +33,7 @@ namespace CSVWidget
 namespace CSVRender
 {
     class TagBase;
+    class Cell;
     class CellArrow;
     class EditMode;
 
@@ -161,6 +162,9 @@ namespace CSVRender
 
             virtual std::string getCellId (const osg::Vec3f& point) const = 0;
 
+            /// \note Returns the cell if it exists, otherwise a null pointer
+            virtual Cell* getCell(const osg::Vec3d& point) const = 0;
+
             virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
                 const = 0;
 

From aea2380c2ba507a1c0fa1b28ca58d71431e9b9be Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:25:02 -0400
Subject: [PATCH 631/765] Add raytrace to dragCompleted. Implement node drag
 connection, node and edge removal, and some fixes.

---
 apps/opencs/view/render/editmode.cpp         |   2 +-
 apps/opencs/view/render/editmode.hpp         |   2 +-
 apps/opencs/view/render/instancemode.cpp     |   2 +-
 apps/opencs/view/render/instancemode.hpp     |   2 +-
 apps/opencs/view/render/pathgrid.cpp         | 158 ++++++++++++++++++-
 apps/opencs/view/render/pathgrid.hpp         |  11 ++
 apps/opencs/view/render/pathgridmode.cpp     |  92 +++++++++--
 apps/opencs/view/render/pathgridmode.hpp     |   4 +-
 apps/opencs/view/render/worldspacewidget.cpp |   3 +-
 9 files changed, 247 insertions(+), 29 deletions(-)

diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index 8da000dc93..22de542182 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -59,7 +59,7 @@ bool CSVRender::EditMode::secondarySelectStartDrag (const WorldspaceHitResult& h
 
 void CSVRender::EditMode::drag (int diffX, int diffY, double speedFactor) {}
 
-void CSVRender::EditMode::dragCompleted() {}
+void CSVRender::EditMode::dragCompleted(const WorldspaceHitResult& hit) {}
 
 void CSVRender::EditMode::dragAborted() {}
 
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index 3381a7105e..37bbafdb1e 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -74,7 +74,7 @@ namespace CSVRender
             virtual void drag (int diffX, int diffY, double speedFactor);
 
             /// Default-implementation: ignored
-            virtual void dragCompleted();
+            virtual void dragCompleted(const WorldspaceHitResult& hit);
 
             /// Default-implementation: ignored
             ///
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 52335f2440..958d29337e 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -244,7 +244,7 @@ void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
     }
 }
 
-void CSVRender::InstanceMode::dragCompleted()
+void CSVRender::InstanceMode::dragCompleted(const WorldspaceHitResult& hit)
 {
     std::vector<osg::ref_ptr<TagBase> > selection =
         getWorldspaceWidget().getEdited (Mask_Reference);
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 5b12529123..39e3773ad9 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -55,7 +55,7 @@ namespace CSVRender
 
             virtual void drag (int diffX, int diffY, double speedFactor);
 
-            virtual void dragCompleted();
+            virtual void dragCompleted(const WorldspaceHitResult& hit);
 
             /// \note dragAborted will not be called, if the drag is aborted via changing
             /// editing mode
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 4df9852cb4..7807525ef0 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -45,6 +45,8 @@ namespace CSVRender
         , mPathgridCollection(mData.getPathgrids())
         , mId(pathgridId)
         , mCoords(coordinates)
+        , mConnectionIndicator(false)
+        , mConnectionNode(0)
         , mParent(parent)
         , mPathgridGeometry(0)
         , mSelectedGeometry(0)
@@ -161,9 +163,21 @@ namespace CSVRender
         mSelectedNode->setPosition(mSelectedNode->getPosition() + offset);
     }
 
+    void Pathgrid::setupConnectionIndicator(unsigned short node)
+    {
+        mConnectionIndicator = true;
+        mConnectionNode = node;
+        recreateSelectedGeometry();
+    }
+
     void Pathgrid::resetMove()
     {
         mSelectedNode->setPosition(osg::Vec3f(0,0,0));
+        if (mConnectionIndicator)
+        {
+            mConnectionIndicator = false;
+            recreateSelectedGeometry();
+        }
     }
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
@@ -249,18 +263,88 @@ namespace CSVRender
                     point.mZ + offsetZ));
             }
         }
-
-        resetMove();
     }
 
     void Pathgrid::applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2)
     {
-        // TODO
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            addEdge(commands, *source, node1, node2);
+        }
     }
 
     void Pathgrid::applyEdges(CSMWorld::CommandMacro& commands, unsigned short node)
     {
-        // TODO
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            for (size_t i = 0; i < mSelected.size(); ++i)
+            {
+                addEdge(commands, *source, node, mSelected[i]);
+            }
+        }
+    }
+
+    void Pathgrid::applyRemoveNodes(CSMWorld::CommandMacro& commands)
+    {
+        // Source is aquired here to ensure a pathgrid exists
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            // Want to remove from end of row first
+            std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
+
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+
+            for (std::vector<unsigned short>::iterator row = mSelected.begin(); row != mSelected.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, static_cast<int>(*row), parentColumn));
+            }
+        }
+
+        clearSelected();
+    }
+
+    void Pathgrid::applyRemoveEdges(CSMWorld::CommandMacro& commands)
+    {
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
+        {
+            // Want to remove from end of row first
+            std::set<int, std::greater<int> > rowsToRemove;
+            for (size_t i = 0; i <= mSelected.size(); ++i)
+            {
+                for (size_t j = i + 1; j < mSelected.size(); ++j)
+                {
+                    int row = edgeExists(*source, mSelected[i], mSelected[j]);
+                    if (row != -1)
+                    {
+                        rowsToRemove.insert(row);
+                    }
+
+                    row = edgeExists(*source, mSelected[j], mSelected[i]);
+                    if (row != -1)
+                    {
+                        rowsToRemove.insert(row);
+                    }
+                }
+            }
+
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
+            int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+            std::set<int, std::greater<int> >::iterator row;
+            for (row = rowsToRemove.begin(); row != rowsToRemove.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
+            }
+        }
     }
 
     osg::ref_ptr<PathgridTag> Pathgrid::getTag() const
@@ -303,8 +387,25 @@ namespace CSVRender
     void Pathgrid::recreateSelectedGeometry(const CSMWorld::Pathgrid& source)
     {
         removeSelectedGeometry();
-        mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
-        mSelectedGeode->addDrawable(mSelectedGeometry);
+
+        if (mConnectionIndicator)
+        {
+            NodeList tempList = NodeList(mSelected);
+
+            NodeList::iterator searchResult = std::find(tempList.begin(), tempList.end(), mConnectionNode);
+            if (searchResult != tempList.end())
+                tempList.erase(searchResult);
+
+            tempList.push_back(mConnectionNode);
+
+            mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, tempList);
+            mSelectedGeode->addDrawable(mSelectedGeometry);
+        }
+        else
+        {
+            mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
+            mSelectedGeode->addDrawable(mSelectedGeometry);
+        }
     }
 
     void Pathgrid::removePathgridGeometry()
@@ -335,4 +436,49 @@ namespace CSVRender
 
         return 0;
     }
+
+    int Pathgrid::edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2)
+    {
+        for (size_t i = 0; i < source.mEdges.size(); ++i)
+        {
+            if (source.mEdges[i].mV0 == node1 && source.mEdges[i].mV1 == node2)
+                return static_cast<int>(i);
+        }
+
+        return -1;
+    }
+
+    void Pathgrid::addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+        unsigned short node2)
+    {
+        CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+            CSMWorld::UniversalId::Type_Pathgrids));
+
+        int recordIndex = mPathgridCollection.getIndex(mId);
+        int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+        int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+            CSMWorld::Columns::ColumnId_PathgridEdge0);
+
+        int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+            CSMWorld::Columns::ColumnId_PathgridEdge1);
+
+        QModelIndex parent = model->index(recordIndex, parentColumn);
+        int row = static_cast<int>(source.mEdges.size());
+
+        if (edgeExists(source, node1, node2) == -1)
+        {
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node1));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node2));
+            ++row;
+        }
+
+        if (edgeExists(source, node2, node1) == -1)
+        {
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node2));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node1));
+        }
+    }
 }
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index a820417408..62ecef4d66 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -71,10 +71,14 @@ namespace CSVRender
             void moveSelected(const osg::Vec3d& offset);
             void resetMove();
 
+            void setupConnectionIndicator(unsigned short node);
+
             void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
             void applyPosition(CSMWorld::CommandMacro& commands);
             void applyEdge(CSMWorld::CommandMacro& commands, unsigned short node1, unsigned short node2);
             void applyEdges(CSMWorld::CommandMacro& commands, unsigned short node);
+            void applyRemoveNodes(CSMWorld::CommandMacro& commands);
+            void applyRemoveEdges(CSMWorld::CommandMacro& commands);
 
             osg::ref_ptr<PathgridTag> getTag() const;
 
@@ -88,6 +92,8 @@ namespace CSVRender
             CSMWorld::CellCoordinates mCoords;
 
             NodeList mSelected;
+            bool mConnectionIndicator;
+            unsigned short mConnectionNode;
 
             osg::Group* mParent;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
@@ -106,6 +112,11 @@ namespace CSVRender
 
             const CSMWorld::Pathgrid* getPathgridSource();
 
+            int edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2);
+            void addEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+                unsigned short node2);
+            void removeEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
+                unsigned short node2);
     };
 }
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index c06618e74a..e4b0e0994b 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -102,6 +102,22 @@ namespace CSVRender
 
     void PathgridMode::secondaryEditPressed(const WorldspaceHitResult& hit)
     {
+        if (hit.tag)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                if (tag->getPathgrid()->isSelected())
+                {
+                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+
+                    QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                    QString description = "Connect node to selected nodes";
+
+                    CSMWorld::CommandMacro macro(undoStack, description);
+                    tag->getPathgrid()->applyEdges(macro, node);
+                }
+            }
+        }
     }
 
     void PathgridMode::primarySelectPressed(const WorldspaceHitResult& hit)
@@ -112,6 +128,7 @@ namespace CSVRender
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
+                mLastId = tag->getPathgrid()->getId();
                 unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
                 tag->getPathgrid()->toggleSelected(node);
             }
@@ -147,12 +164,9 @@ namespace CSVRender
         if (!selection.empty())
         {
             mDragMode = DragMode_Move;
-            return true;
-        }
-        else
-        {
-            return false;
         }
+
+        return true;
     }
 
     bool PathgridMode::secondaryEditStartDrag(const WorldspaceHitResult& hit)
@@ -162,12 +176,14 @@ namespace CSVRender
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
             {
                 mDragMode = DragMode_Edge;
+                mEdgeId = tag->getPathgrid()->getId();
                 mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
-                return true;
+
+                tag->getPathgrid()->setupConnectionIndicator(mFromNode);
             }
         }
 
-        return false;
+        return true;
     }
 
     void PathgridMode::drag(int diffX, int diffY, double speedFactor)
@@ -189,21 +205,20 @@ namespace CSVRender
                 }
                 else if (mDragMode == DragMode_Edge)
                 {
-                    // TODO make indicators
+                    // TODO Add indicator, need raytrace
                 }
             }
         }
     }
 
-    void PathgridMode::dragCompleted()
+    void PathgridMode::dragCompleted(const WorldspaceHitResult& hit)
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
-
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        if (mDragMode == DragMode_Move)
         {
-            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
             {
-                if (mDragMode == DragMode_Move)
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
                 {
                     QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
                     QString description = "Move pathgrid node(s)";
@@ -211,14 +226,33 @@ namespace CSVRender
                     CSMWorld::CommandMacro macro(undoStack, description);
                     tag->getPathgrid()->applyPosition(macro);
                 }
-                else if (mDragMode == DragMode_Edge)
+            }
+        }
+        else if (mDragMode == DragMode_Edge)
+        {
+            if (hit.tag)
+            {
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
                 {
-                    // TODO raycast for other node and apply if needed with mFromNode
+                    if (tag->getPathgrid()->getId() == mEdgeId)
+                    {
+                        unsigned short toNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+
+                        QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                        QString description = "Add edge between nodes";
+
+                        CSMWorld::CommandMacro macro(undoStack, description);
+                        tag->getPathgrid()->applyEdge(macro, mFromNode, toNode);
+                    }
                 }
             }
+
+            mEdgeId.clear();
+            mFromNode = 0;
         }
 
         mDragMode = DragMode_None;
+        getWorldspaceWidget().reset(Mask_Pathgrid);
     }
 
     void PathgridMode::dragAborted()
@@ -244,9 +278,35 @@ namespace CSVRender
 
     void PathgridMode::removeSelected()
     {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveNodes(macro);
+            }
+        }
     }
 
     void PathgridMode::removeSelectedEdges()
     {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove edges between selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveEdges(macro);
+            }
+        }
     }
 }
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index b6a650eb4b..6a070333d0 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -33,7 +33,7 @@ namespace CSVRender
 
             virtual void drag (int diffX, int diffY, double speedFactor);
 
-            virtual void dragCompleted();
+            virtual void dragCompleted(const WorldspaceHitResult& hit);
 
             /// \note dragAborted will not be called, if the drag is aborted via changing
             /// editing mode
@@ -48,8 +48,8 @@ namespace CSVRender
                 DragMode_Edge
             };
 
-            std::string mLastId;
             DragMode mDragMode;
+            std::string mLastId, mEdgeId;
             unsigned short mFromNode;
 
             QAction* mSelectAll;
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index cd65bd8e87..9146de6199 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -712,8 +712,9 @@ void CSVRender::WorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
         if (mDragging)
         {
             EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
+            WorldspaceHitResult hit = mousePick (event->pos());
 
-            editMode.dragCompleted();
+            editMode.dragCompleted(hit);
             mDragging = false;
         }
         else

From cd3b96b3e8b04beac9cdcc346de658c349d69353 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 17:59:52 -0400
Subject: [PATCH 632/765] Change interaction mask back to original and place
 required masks in PathgridMode.

---
 apps/opencs/view/render/pathgridmode.cpp     | 3 ++-
 apps/opencs/view/render/worldspacewidget.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index e4b0e0994b..d50b42d351 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -17,7 +17,8 @@
 namespace CSVRender
 {
     PathgridMode::PathgridMode(WorldspaceWidget* worldspaceWidget, QWidget* parent)
-        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid, getTooltip(), parent)
+        : EditMode(worldspaceWidget, QIcon(":placeholder"), Mask_Pathgrid | Mask_Terrain | Mask_Reference,
+            getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
     {
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 9146de6199..64c1be0eea 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -295,7 +295,7 @@ unsigned int CSVRender::WorldspaceWidget::getVisibilityMask() const
 
 void CSVRender::WorldspaceWidget::setInteractionMask (unsigned int mask)
 {
-    mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow | Mask_Pathgrid | Mask_Terrain;
+    mInteractionMask = mask | Mask_CellMarker | Mask_CellArrow;
 }
 
 unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const

From d2d22e2f237e2c4619566144c941a330ba119939 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 19:03:40 -0400
Subject: [PATCH 633/765] Clamp node positions in exterior cells.

---
 apps/opencs/view/render/pathgrid.cpp | 35 +++++++++++++++++++++++-----
 apps/opencs/view/render/pathgrid.hpp |  3 +++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 7807525ef0..2e4ec6a1a5 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -10,6 +10,7 @@
 
 #include <components/sceneutil/pathgridutil.hpp>
 
+#include "../../model/world/cell.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/data.hpp"
@@ -45,6 +46,7 @@ namespace CSVRender
         , mPathgridCollection(mData.getPathgrids())
         , mId(pathgridId)
         , mCoords(coordinates)
+        , mInterior(false)
         , mConnectionIndicator(false)
         , mConnectionNode(0)
         , mParent(parent)
@@ -70,6 +72,13 @@ namespace CSVRender
         mSelectedNode->addChild(mSelectedGeode);
 
         recreateGeometry();
+
+        int index = mData.getCells().searchId(mId);
+        if (index != -1)
+        {
+            const CSMWorld::Cell& cell = mData.getCells().getRecord(index).get();
+            mInterior = cell.mData.mFlags & ESM::Cell::Interior;
+        }
     }
 
     Pathgrid::~Pathgrid()
@@ -187,9 +196,9 @@ namespace CSVRender
         {
             osg::Vec3d localCoords = worldPos - mBaseNode->getPosition();
 
-            int posX = static_cast<int>(localCoords.x());
-            int posY = static_cast<int>(localCoords.y());
-            int posZ = static_cast<int>(localCoords.z());
+            int posX = clampToCell(static_cast<int>(localCoords.x()));
+            int posY = clampToCell(static_cast<int>(localCoords.y()));
+            int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
             CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
                 CSMWorld::UniversalId::Type_Pathgrids));
@@ -254,13 +263,13 @@ namespace CSVRender
                 int row = static_cast<int>(mSelected[i]);
 
                 commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
-                    point.mX + offsetX));
+                    clampToCell(point.mX + offsetX)));
 
                 commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
-                    point.mY + offsetY));
+                    clampToCell(point.mY + offsetY)));
 
                 commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
-                    point.mZ + offsetZ));
+                    clampToCell(point.mZ + offsetZ)));
             }
         }
     }
@@ -481,4 +490,18 @@ namespace CSVRender
             commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node1));
         }
     }
+
+    int Pathgrid::clampToCell(int v)
+    {
+        const int CellExtent = ESM::Land::REAL_SIZE;
+
+        if (mInterior)
+            return v;
+        else if (v > CellExtent)
+            return CellExtent;
+        else if (v < 0)
+            return 0;
+        else
+            return v;
+    }
 }
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 62ecef4d66..3a83716d8e 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -90,6 +90,7 @@ namespace CSVRender
             CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& mPathgridCollection;
             std::string mId;
             CSMWorld::CellCoordinates mCoords;
+            bool mInterior;
 
             NodeList mSelected;
             bool mConnectionIndicator;
@@ -117,6 +118,8 @@ namespace CSVRender
                 unsigned short node2);
             void removeEdge(CSMWorld::CommandMacro& commands, const CSMWorld::Pathgrid& source, unsigned short node1,
                 unsigned short node2);
+
+            int clampToCell(int v);
     };
 }
 

From a3363bc09823a02041adf848c4046ed2a2fc6b7e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 21:06:55 -0400
Subject: [PATCH 634/765] Fix and simplify pathgrid update handling, only
 recreate geometry once per frame, and a few naming changes.

---
 apps/opencs/view/render/cell.cpp              | 19 +-----
 apps/opencs/view/render/cell.hpp              |  8 +--
 .../view/render/pagedworldspacewidget.cpp     | 53 ++++-----------
 .../view/render/pagedworldspacewidget.hpp     |  2 -
 apps/opencs/view/render/pathgrid.cpp          | 66 +++++++++++++++----
 apps/opencs/view/render/pathgrid.hpp          | 11 +++-
 .../view/render/unpagedworldspacewidget.cpp   | 49 +++++---------
 .../view/render/unpagedworldspacewidget.hpp   |  2 -
 apps/opencs/view/render/worldspacewidget.cpp  |  2 -
 apps/opencs/view/render/worldspacewidget.hpp  |  2 -
 10 files changed, 96 insertions(+), 118 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index eed394d0b4..b408503d19 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -266,29 +266,14 @@ bool CSVRender::Cell::referenceAdded (const QModelIndex& parent, int start, int
     return addObjects (start, end);
 }
 
-void CSVRender::Cell::pathgridAdded(const CSMWorld::Pathgrid& pathgrid)
+void CSVRender::Cell::pathgridModified()
 {
     mPathgrid->recreateGeometry();
 }
 
 void CSVRender::Cell::pathgridRemoved()
 {
-    mPathgrid->recreateGeometry();
-}
-
-void CSVRender::Cell::pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
-{
-    mPathgrid->recreateGeometry();
-}
-
-void CSVRender::Cell::pathgridRowRemoved(const QModelIndex& parent, int start, int end)
-{
-    mPathgrid->recreateGeometry();
-}
-
-void CSVRender::Cell::pathgridRowAdded(const QModelIndex& parent, int start, int end)
-{
-    mPathgrid->recreateGeometry();
+    mPathgrid->removeGeometry();
 }
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index a2efc0077d..523a6bb83a 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -111,16 +111,10 @@ namespace CSVRender
             /// this cell?
             bool referenceAdded (const QModelIndex& parent, int start, int end);
 
-            void pathgridAdded(const CSMWorld::Pathgrid& pathgrid);
+            void pathgridModified();
 
             void pathgridRemoved();
 
-            void pathgridDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-            void pathgridRowRemoved(const QModelIndex& parent, int start, int end);
-
-            void pathgridRowAdded(const QModelIndex& parent, int start, int end);
-
             void setSelection (int elementMask, Selection mode);
 
             // Select everything that references the same ID as at least one of the elements
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 39e7f8361a..a01df43926 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -280,38 +280,29 @@ void CSVRender::PagedWorldspaceWidget::pathgridDataChanged (const QModelIndex& t
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
+    int rowStart = -1;
+    int rowEnd = -1;
+
     if (topLeft.parent().isValid())
     {
-        int row = topLeft.parent().row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-        if (searchResult != mCells.end())
-        {
-            searchResult->second->pathgridDataChanged(topLeft, bottomRight);
-            flagAsModified();
-        }
+        rowStart = topLeft.parent().row();
+        rowEnd = bottomRight.parent().row();
     }
-}
-
-void CSVRender::PagedWorldspaceWidget::pathgridRemoved (const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (parent.isValid())
+    else
     {
-        // Pathgrid data was modified
-        int row = parent.row();
+        rowStart = topLeft.row();
+        rowEnd = bottomRight.row();
+    }
 
+    for (int row = rowStart; row <= rowEnd; ++row)
+    {
         const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
         CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
 
         std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
         if (searchResult != mCells.end())
         {
-            searchResult->second->pathgridRowRemoved(parent, start, end);
+            searchResult->second->pathgridModified();
             flagAsModified();
         }
     }
@@ -341,11 +332,10 @@ void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelInd
 
 void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
 {
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+   const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
     if (!parent.isValid())
     {
-        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
         for (int row = start; row <= end; ++row)
         {
             const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
@@ -354,26 +344,11 @@ void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent,
             std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
             if (searchResult != mCells.end())
             {
-                searchResult->second->pathgridAdded(pathgrid);
+                searchResult->second->pathgridModified();
                 flagAsModified();
             }
         }
     }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        CSMWorld::CellCoordinates coords = CSMWorld::CellCoordinates(pathgrid.mData.mX, pathgrid.mData.mY);
-
-        std::map<CSMWorld::CellCoordinates, Cell*>::iterator searchResult = mCells.find(coords);
-        if (searchResult != mCells.end())
-        {
-            searchResult->second->pathgridRowAdded(parent, start, end);
-            flagAsModified();
-        }
-    }
 }
 
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index c7f035dd98..6920007087 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -54,8 +54,6 @@ namespace CSVRender
 
             virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end);
-
             virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
 
             virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 2e4ec6a1a5..5c88683446 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -18,6 +18,17 @@
 
 namespace CSVRender
 {
+    class PathgridNodeCallback : public osg::NodeCallback
+    {
+        public:
+
+            virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+            {
+                PathgridTag* tag = dynamic_cast<PathgridTag*>(node->getUserData());
+                tag->getPathgrid()->update();
+            }
+    };
+
     PathgridTag::PathgridTag(Pathgrid* pathgrid)
         : TagBase(Mask_Pathgrid), mPathgrid(pathgrid)
     {
@@ -49,6 +60,8 @@ namespace CSVRender
         , mInterior(false)
         , mConnectionIndicator(false)
         , mConnectionNode(0)
+        , mChangeGeometry(true)
+        , mRemoveGeometry(false)
         , mParent(parent)
         , mPathgridGeometry(0)
         , mSelectedGeometry(0)
@@ -59,6 +72,7 @@ namespace CSVRender
         mBaseNode = new osg::PositionAttitudeTransform ();
         mBaseNode->setPosition(osg::Vec3f(mCoords.getX() * CoordScalar, mCoords.getY() * CoordScalar, 0.f));
         mBaseNode->setUserData(mTag);
+        mBaseNode->setUpdateCallback(new PathgridNodeCallback());
         mBaseNode->setNodeMask(Mask_Pathgrid);
         mParent->addChild(mBaseNode);
 
@@ -116,7 +130,7 @@ namespace CSVRender
             for (unsigned short i = 0; i < static_cast<unsigned short>(source->mPoints.size()); ++i)
                 mSelected.push_back(i);
 
-            recreateSelectedGeometry(*source);
+            createSelectedGeometry(*source);
         }
         else
         {
@@ -136,7 +150,7 @@ namespace CSVRender
             mSelected.push_back(node);
         }
 
-        recreateSelectedGeometry();
+        createSelectedGeometry();
     }
 
     void Pathgrid::invertSelected()
@@ -153,7 +167,7 @@ namespace CSVRender
                     mSelected.push_back(i);
             }
 
-            recreateSelectedGeometry(*source);
+            createSelectedGeometry(*source);
         }
         else
         {
@@ -176,7 +190,7 @@ namespace CSVRender
     {
         mConnectionIndicator = true;
         mConnectionNode = node;
-        recreateSelectedGeometry();
+        createSelectedGeometry();
     }
 
     void Pathgrid::resetMove()
@@ -185,7 +199,7 @@ namespace CSVRender
         if (mConnectionIndicator)
         {
             mConnectionIndicator = false;
-            recreateSelectedGeometry();
+            createSelectedGeometry();
         }
     }
 
@@ -363,7 +377,34 @@ namespace CSVRender
 
     void Pathgrid::recreateGeometry()
     {
-        // Make new
+        mChangeGeometry = true;
+    }
+
+    void Pathgrid::removeGeometry()
+    {
+        mRemoveGeometry = true;
+
+
+    }
+
+    void Pathgrid::update()
+    {
+        if (mRemoveGeometry)
+        {
+            removePathgridGeometry();
+            removeSelectedGeometry();
+        }
+        else if (mChangeGeometry)
+        {
+            createGeometry();
+        }
+
+        mChangeGeometry = false;
+        mRemoveGeometry = false;
+    }
+
+    void Pathgrid::createGeometry()
+    {
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
@@ -371,21 +412,20 @@ namespace CSVRender
             mPathgridGeometry = SceneUtil::createPathgridGeometry(*source);
             mPathgridGeode->addDrawable(mPathgridGeometry);
 
-            recreateSelectedGeometry(*source);
+            createSelectedGeometry(*source);
         }
         else
         {
-            removePathgridGeometry();
-            removeSelectedGeometry();
+            removeGeometry();
         }
     }
 
-    void Pathgrid::recreateSelectedGeometry()
+    void Pathgrid::createSelectedGeometry()
     {
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
-            recreateSelectedGeometry(*source);
+            createSelectedGeometry(*source);
         }
         else
         {
@@ -393,7 +433,7 @@ namespace CSVRender
         }
     }
 
-    void Pathgrid::recreateSelectedGeometry(const CSMWorld::Pathgrid& source)
+    void Pathgrid::createSelectedGeometry(const CSMWorld::Pathgrid& source)
     {
         removeSelectedGeometry();
 
@@ -438,7 +478,7 @@ namespace CSVRender
     const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
     {
         int index = mPathgridCollection.searchId(mId);
-        if (index != -1)
+        if (index != -1 && !mPathgridCollection.getRecord(index).isDeleted())
         {
             return &mPathgridCollection.getRecord(index).get();
         }
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 3a83716d8e..b192ed31b0 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -83,6 +83,9 @@ namespace CSVRender
             osg::ref_ptr<PathgridTag> getTag() const;
 
             void recreateGeometry();
+            void removeGeometry();
+
+            void update();
 
         private:
 
@@ -96,6 +99,9 @@ namespace CSVRender
             bool mConnectionIndicator;
             unsigned short mConnectionNode;
 
+            bool mChangeGeometry;
+            bool mRemoveGeometry;
+
             osg::Group* mParent;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
             osg::ref_ptr<osg::PositionAttitudeTransform> mSelectedNode;
@@ -106,8 +112,9 @@ namespace CSVRender
 
             osg::ref_ptr<PathgridTag> mTag;
 
-            void recreateSelectedGeometry();
-            void recreateSelectedGeometry(const CSMWorld::Pathgrid& source);
+            void createGeometry();
+            void createSelectedGeometry();
+            void createSelectedGeometry(const CSMWorld::Pathgrid& source);
             void removePathgridGeometry();
             void removeSelectedGeometry();
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 802194bea2..d9a85fe352 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -212,32 +212,28 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridDataChanged (const QModelIndex&
 {
     const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
+    int rowStart = -1;
+    int rowEnd = -1;
+
     if (topLeft.parent().isValid())
     {
-        int row = topLeft.parent().row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        if (mCellId == pathgrid.mId)
-        {
-            mCell->pathgridDataChanged(topLeft, bottomRight);
-            flagAsModified();
-        }
+        rowStart = topLeft.parent().row();
+        rowEnd = bottomRight.parent().row();
+    }
+    else
+    {
+        rowStart = topLeft.row();
+        rowEnd = bottomRight.row();
     }
-}
-
-void CSVRender::UnpagedWorldspaceWidget::pathgridRemoved (const QModelIndex& parent, int start, int end)
-{
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
-
-    if (parent.isValid()){
-        // Pathgrid data was modified
-        int row = parent.row();
 
+    for (int row = rowStart; row <= rowEnd; ++row)
+    {
         const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
         if (mCellId == pathgrid.mId)
         {
-            mCell->pathgridRowRemoved(parent, start, end);
+            mCell->pathgridModified();
             flagAsModified();
+            return;
         }
     }
 }
@@ -256,6 +252,7 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelI
             {
                 mCell->pathgridRemoved();
                 flagAsModified();
+                return;
             }
         }
     }
@@ -267,29 +264,17 @@ void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& paren
 
     if (!parent.isValid())
     {
-        // Pathgrid added theoretically, unable to test until it is possible to add pathgrids
         for (int row = start; row <= end; ++row)
         {
             const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
             if (mCellId == pathgrid.mId)
             {
-                mCell->pathgridAdded(pathgrid);
+                mCell->pathgridModified();
                 flagAsModified();
+                return;
             }
         }
     }
-    else
-    {
-        // Pathgrid data was modified
-        int row = parent.row();
-
-        const CSMWorld::Pathgrid& pathgrid = pathgrids.getRecord(row).get();
-        if (mCellId == pathgrid.mId)
-        {
-            mCell->pathgridRowAdded(parent, start, end);
-            flagAsModified();
-        }
-    }
 }
 
 void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index dd4a8a2f7f..57e8d1a198 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -91,8 +91,6 @@ namespace CSVRender
 
             virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end);
-
             virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end);
 
             virtual void pathgridAdded (const QModelIndex& parent, int start, int end);
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 64c1be0eea..ec40d880aa 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -63,8 +63,6 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
 
     connect (pathgrids, SIGNAL (dataChanged (const QModelIndex&, const QModelIndex&)),
         this, SLOT (pathgridDataChanged (const QModelIndex&, const QModelIndex&)));
-    connect (pathgrids, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
-        this, SLOT (pathgridRemoved (const QModelIndex&, int, int)));
     connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
         this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
     connect (pathgrids, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index 59aacca291..e6cd7aab01 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -246,8 +246,6 @@ namespace CSVRender
 
             virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) = 0;
 
-            virtual void pathgridRemoved (const QModelIndex& parent, int start, int end) = 0;
-
             virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) = 0;
 
             virtual void pathgridAdded (const QModelIndex& parent, int start, int end) = 0;

From 9d0228659229f6ffe57db0556c7b14ebfe1ac1cb Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 22:17:03 -0400
Subject: [PATCH 635/765] Remove unused forward declaration.

---
 apps/opencs/view/render/cell.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 523a6bb83a..a5b581d24a 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -31,7 +31,6 @@ namespace CSMWorld
 {
     class Data;
     class CellCoordinates;
-    class Pathgrid;
 }
 
 namespace CSVRender

From 5a7ebab6943c2120740de27834b3e3f6fd0db9e8 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 16 May 2016 23:06:36 -0400
Subject: [PATCH 636/765] Fix forward declaration.

---
 apps/opencs/view/render/pathgrid.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index b192ed31b0..7cab806d34 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -25,7 +25,7 @@ namespace CSMWorld
 {
     class CommandMacro;
     class Data;
-    class Pathgrid;
+    struct Pathgrid;
 }
 
 namespace CSVRender

From 13c2161b27c8c94a9ad58391f9d90ba8be26cb58 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 17 May 2016 16:14:23 -0400
Subject: [PATCH 637/765] Fix memory leak, remove empty if statement, change
 dynamic_cast to static_cast

---
 apps/opencs/view/render/pathgrid.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 5c88683446..5b2dd4f989 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -24,7 +24,7 @@ namespace CSVRender
 
             virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
             {
-                PathgridTag* tag = dynamic_cast<PathgridTag*>(node->getUserData());
+                PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData());
                 tag->getPathgrid()->update();
             }
     };
@@ -44,10 +44,6 @@ namespace CSVRender
         QString text("Pathgrid: ");
         text += mPathgrid->getId().c_str();
 
-        if (!hideBasics)
-        {
-        }
-
         return text;
     }
 
@@ -462,7 +458,7 @@ namespace CSVRender
         if (mPathgridGeometry)
         {
             mPathgridGeode->removeDrawable(mPathgridGeometry);
-            mPathgridGeometry.release();
+            mPathgridGeometry = 0;
         }
     }
 
@@ -471,7 +467,7 @@ namespace CSVRender
         if (mSelectedGeometry)
         {
             mSelectedGeode->removeDrawable(mSelectedGeometry);
-            mSelectedGeometry.release();
+            mSelectedGeometry = 0;
         }
     }
 

From ae0d2c3b9c4434fcd8206a01d711b04bdef9bcbd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 17 May 2016 21:24:16 -0400
Subject: [PATCH 638/765] Refactor edit mode. Remove essentially duplicate
 function.

---
 apps/opencs/view/render/editmode.cpp         |  14 +-
 apps/opencs/view/render/editmode.hpp         |  15 +-
 apps/opencs/view/render/instancemode.cpp     |  20 +--
 apps/opencs/view/render/instancemode.hpp     |  10 +-
 apps/opencs/view/render/pathgridmode.cpp     |  35 ++---
 apps/opencs/view/render/pathgridmode.hpp     |   8 +-
 apps/opencs/view/render/worldspacewidget.cpp | 147 +++++++------------
 apps/opencs/view/render/worldspacewidget.hpp |  13 +-
 8 files changed, 105 insertions(+), 157 deletions(-)

diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index 22de542182..5f0852c909 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -37,29 +37,29 @@ void CSVRender::EditMode::primarySelectPressed (const WorldspaceHitResult& hit)
 
 void CSVRender::EditMode::secondarySelectPressed (const WorldspaceHitResult& hit) {}
 
-bool CSVRender::EditMode::primaryEditStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::EditMode::primaryEditStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondaryEditStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::EditMode::secondaryEditStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::primarySelectStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::EditMode::primarySelectStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-bool CSVRender::EditMode::secondarySelectStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::EditMode::secondarySelectStartDrag (const QPoint& pos)
 {
     return false;
 }
 
-void CSVRender::EditMode::drag (int diffX, int diffY, double speedFactor) {}
+void CSVRender::EditMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor) {}
 
-void CSVRender::EditMode::dragCompleted(const WorldspaceHitResult& hit) {}
+void CSVRender::EditMode::dragCompleted(const QPoint& pos) {}
 
 void CSVRender::EditMode::dragAborted() {}
 
@@ -67,7 +67,7 @@ void CSVRender::EditMode::dragWheel (int diff, double speedFactor) {}
 
 void CSVRender::EditMode::dragEnterEvent (QDragEnterEvent *event) {}
 
-void CSVRender::EditMode::dropEvent (QDropEvent* event) {}
+void CSVRender::EditMode::dropEvent (QDropEvent *event) {}
 
 void CSVRender::EditMode::dragMoveEvent (QDragMoveEvent *event) {}
 
diff --git a/apps/opencs/view/render/editmode.hpp b/apps/opencs/view/render/editmode.hpp
index 37bbafdb1e..f9b7027f98 100644
--- a/apps/opencs/view/render/editmode.hpp
+++ b/apps/opencs/view/render/editmode.hpp
@@ -8,6 +8,7 @@
 class QDragEnterEvent;
 class QDropEvent;
 class QDragMoveEvent;
+class QPoint;
 
 namespace CSVRender
 {
@@ -53,28 +54,28 @@ namespace CSVRender
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool primaryEditStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool primarySelectStartDrag (const WorldspaceHitResult& hit);
+            virtual bool primarySelectStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignore and return false
             ///
             /// \return Drag accepted?
-            virtual bool secondarySelectStartDrag (const WorldspaceHitResult& hit);
+            virtual bool secondarySelectStartDrag (const QPoint& pos);
 
             /// Default-implementation: ignored
-            virtual void drag (int diffX, int diffY, double speedFactor);
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
 
             /// Default-implementation: ignored
-            virtual void dragCompleted(const WorldspaceHitResult& hit);
+            virtual void dragCompleted(const QPoint& pos);
 
             /// Default-implementation: ignored
             ///
@@ -89,7 +90,7 @@ namespace CSVRender
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
             /// Default-implementation: ignored
-            virtual void dropEvent (QDropEvent* event);
+            virtual void dropEvent (QDropEvent *event);
 
             /// Default-implementation: ignored
             virtual void dragMoveEvent (QDragMoveEvent *event);
diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index 958d29337e..df5ba76217 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -2,6 +2,7 @@
 #include "instancemode.hpp"
 
 #include <QDragEnterEvent>
+#include <QPoint>
 
 #include "../../model/prefs/state.hpp"
 
@@ -145,11 +146,12 @@ void CSVRender::InstanceMode::secondarySelectPressed (const WorldspaceHitResult&
     }
 }
 
-bool CSVRender::InstanceMode::primaryEditStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
 {
     if (mDragMode!=DragMode_None || mLocked)
         return false;
 
+    WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     if (hit.tag && CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
     {
         getWorldspaceWidget().clearSelection (Mask_Reference);
@@ -189,7 +191,7 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const WorldspaceHitResult& h
     return true;
 }
 
-bool CSVRender::InstanceMode::secondaryEditStartDrag (const WorldspaceHitResult& hit)
+bool CSVRender::InstanceMode::secondaryEditStartDrag (const QPoint& pos)
 {
     if (mLocked)
         return false;
@@ -197,7 +199,7 @@ bool CSVRender::InstanceMode::secondaryEditStartDrag (const WorldspaceHitResult&
     return false;
 }
 
-void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
+void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, double speedFactor)
 {
     osg::Vec3f eye;
     osg::Vec3f centre;
@@ -244,7 +246,7 @@ void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
     }
 }
 
-void CSVRender::InstanceMode::dragCompleted(const WorldspaceHitResult& hit)
+void CSVRender::InstanceMode::dragCompleted(const QPoint& pos)
 {
     std::vector<osg::ref_ptr<TagBase> > selection =
         getWorldspaceWidget().getEdited (Mask_Reference);
@@ -333,9 +335,9 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
         if (!mime->fromDocument (document))
             return;
 
-        osg::Vec3f insertPoint = getWorldspaceWidget().getIntersectionPoint (event->pos());
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (event->pos(), getWorldspaceWidget().getInteractionMask());
 
-        std::string cellId = getWorldspaceWidget().getCellId (insertPoint);
+        std::string cellId = getWorldspaceWidget().getCellId (hit.worldPos);
 
         CSMWorld::IdTree& cellTable = dynamic_cast<CSMWorld::IdTree&> (
             *document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells));
@@ -412,11 +414,11 @@ void CSVRender::InstanceMode::dropEvent (QDropEvent* event)
                  createCommand->addValue (referencesTable.findColumnIndex (
                      CSMWorld::Columns::ColumnId_Cell), QString::fromUtf8 (cellId.c_str()));
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionXPos), insertPoint.x());
+                     CSMWorld::Columns::ColumnId_PositionXPos), hit.worldPos.x());
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionYPos), insertPoint.y());
+                     CSMWorld::Columns::ColumnId_PositionYPos), hit.worldPos.y());
                  createCommand->addValue (referencesTable.findColumnIndex (
-                     CSMWorld::Columns::ColumnId_PositionZPos), insertPoint.z());
+                     CSMWorld::Columns::ColumnId_PositionZPos), hit.worldPos.z());
                  createCommand->addValue (referencesTable.findColumnIndex (
                      CSMWorld::Columns::ColumnId_ReferenceableId),
                      QString::fromUtf8 (iter->getId().c_str()));
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index 39e3773ad9..4f7937b510 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -49,13 +49,13 @@ namespace CSVRender
 
             virtual void secondarySelectPressed (const WorldspaceHitResult& hit);
 
-            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool primaryEditStartDrag (const QPoint& pos);
 
-            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
 
-            virtual void drag (int diffX, int diffY, double speedFactor);
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
 
-            virtual void dragCompleted(const WorldspaceHitResult& hit);
+            virtual void dragCompleted(const QPoint& pos);
 
             /// \note dragAborted will not be called, if the drag is aborted via changing
             /// editing mode
@@ -65,7 +65,7 @@ namespace CSVRender
 
             virtual void dragEnterEvent (QDragEnterEvent *event);
 
-            virtual void dropEvent (QDropEvent* event);
+            virtual void dropEvent (QDropEvent *event);
 
             virtual int getSubMode() const;
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index d50b42d351..3a2cc600a0 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -1,6 +1,7 @@
 #include "pathgridmode.hpp"
 
 #include <QMenu>
+#include <QPoint>
 
 #include <components/sceneutil/pathgridutil.hpp>
 
@@ -69,27 +70,8 @@ namespace CSVRender
 
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
     {
-        // Determine placement
-        osg::Vec3d position;
-
-        if (hitResult.hit)
-        {
-            position = hitResult.worldPos;
-        }
-        else
-        {
-            const double DefaultDistance = 500.f;
-
-            osg::Vec3d eye, center, up, offset;
-            getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
-
-            osg::Vec3d direction = center - eye;
-            direction.normalize();
-            position = eye + direction * DefaultDistance;
-        }
-
         // Get pathgrid cell
-        Cell* cell = getWorldspaceWidget().getCell (position);
+        Cell* cell = getWorldspaceWidget().getCell (hitResult.worldPos);
         if (cell)
         {
             // Add node
@@ -97,7 +79,7 @@ namespace CSVRender
             QString description = "Connect node to selected nodes";
 
             CSMWorld::CommandMacro macro(undoStack, description);
-            cell->getPathgrid()->applyPoint(macro, position);
+            cell->getPathgrid()->applyPoint(macro, hitResult.worldPos);
         }
     }
 
@@ -158,7 +140,7 @@ namespace CSVRender
         getWorldspaceWidget().clearSelection(Mask_Pathgrid);
     }
 
-    bool PathgridMode::primaryEditStartDrag(const WorldspaceHitResult& hit)
+    bool PathgridMode::primaryEditStartDrag(const QPoint& pos)
     {
         std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
 
@@ -170,8 +152,9 @@ namespace CSVRender
         return true;
     }
 
-    bool PathgridMode::secondaryEditStartDrag(const WorldspaceHitResult& hit)
+    bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
     {
+        WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
         if (hit.tag)
         {
             if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
@@ -187,7 +170,7 @@ namespace CSVRender
         return true;
     }
 
-    void PathgridMode::drag(int diffX, int diffY, double speedFactor)
+    void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
     {
         std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
 
@@ -212,7 +195,7 @@ namespace CSVRender
         }
     }
 
-    void PathgridMode::dragCompleted(const WorldspaceHitResult& hit)
+    void PathgridMode::dragCompleted(const QPoint& pos)
     {
         if (mDragMode == DragMode_Move)
         {
@@ -231,6 +214,8 @@ namespace CSVRender
         }
         else if (mDragMode == DragMode_Edge)
         {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick(pos, getWorldspaceWidget().getInteractionMask());
+
             if (hit.tag)
             {
                 if (PathgridTag* tag = dynamic_cast<PathgridTag*>(hit.tag.get()))
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index 6a070333d0..b6933cb8ea 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -27,13 +27,13 @@ namespace CSVRender
 
             virtual void secondarySelectPressed(const WorldspaceHitResult& hit);
 
-            virtual bool primaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool primaryEditStartDrag (const QPoint& pos);
 
-            virtual bool secondaryEditStartDrag (const WorldspaceHitResult& hit);
+            virtual bool secondaryEditStartDrag (const QPoint& pos);
 
-            virtual void drag (int diffX, int diffY, double speedFactor);
+            virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor);
 
-            virtual void dragCompleted(const WorldspaceHitResult& hit);
+            virtual void dragCompleted(const QPoint& pos);
 
             /// \note dragAborted will not be called, if the drag is aborted via changing
             /// editing mode
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index ec40d880aa..1859401dc0 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -326,39 +326,64 @@ CSMDoc::Document& CSVRender::WorldspaceWidget::getDocument()
     return mDocument;
 }
 
-osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& localPos,
-    unsigned int interactionMask, bool ignoreHidden) const
+CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos,
+    unsigned int interactionMask) const
 {
     // (0,0) is considered the lower left corner of an OpenGL window
     int x = localPos.x();
     int y = height() - localPos.y();
 
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (
-        new osgUtil::LineSegmentIntersector (osgUtil::Intersector::WINDOW, x, y));
+    // Get intersection
+    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
+        osgUtil::Intersector::WINDOW, x, y));
 
-    intersector->setIntersectionLimit (osgUtil::LineSegmentIntersector::NO_LIMIT);
-    osgUtil::IntersectionVisitor visitor (intersector);
+    intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
+    osgUtil::IntersectionVisitor visitor(intersector);
 
-    unsigned int mask = interactionMask;
+    visitor.setTraversalMask(interactionMask);
 
-    if (ignoreHidden)
-        mask &= getVisibilityMask();
+    mView->getCamera()->accept(visitor);
 
-    visitor.setTraversalMask (mask);
-
-    mView->getCamera()->accept (visitor);
-
-    for (osgUtil::LineSegmentIntersector::Intersections::iterator iter = intersector->getIntersections().begin();
-         iter!=intersector->getIntersections().end(); ++iter)
+    // Get relevant data
+    for (osgUtil::LineSegmentIntersector::Intersections::iterator it = intersector->getIntersections().begin();
+         it != intersector->getIntersections().end(); ++it)
     {
-        // reject back-facing polygons
-        osg::Vec3f normal = osg::Matrix::transform3x3 (
-            iter->getWorldIntersectNormal(), mView->getCamera()->getViewMatrix());
+        osgUtil::LineSegmentIntersector::Intersection intersection = *it;
 
-        if (normal.z()>=0)
-            return iter->getWorldIntersectPoint();
+        // reject back-facing polygons
+        osg::Vec3f normal = intersection.getWorldIntersectNormal();
+        normal = osg::Matrix::transform3x3(normal, mView->getCamera()->getViewMatrix());
+        if (normal.z() < 0)
+            continue;
+
+        for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
+        {
+            osg::Node* node = *it;
+            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
+            {
+                WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
+                if (intersection.indexList.size() >= 3)
+                {
+                    hit.index0 = intersection.indexList[0];
+                    hit.index1 = intersection.indexList[1];
+                    hit.index2 = intersection.indexList[2];
+                }
+                return hit;
+            }
+        }
+
+        // Something untagged, probably terrain
+        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
+        if (intersection.indexList.size() >= 3)
+        {
+            hit.index0 = intersection.indexList[0];
+            hit.index1 = intersection.indexList[1];
+            hit.index2 = intersection.indexList[2];
+        }
+        return hit;
     }
 
+    // Default placement
     osg::Matrixd matrix;
     matrix.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
     matrix.preMult (mView->getCamera()->getProjectionMatrix());
@@ -368,10 +393,12 @@ osg::Vec3f CSVRender::WorldspaceWidget::getIntersectionPoint (const QPoint& loca
     osg::Vec3d start = matrix.preMult (intersector->getStart());
     osg::Vec3d end = matrix.preMult (intersector->getEnd());
 
-    osg::Vec3d direction = end-start;
+    osg::Vec3d direction = end - start;
     direction.normalize();
+    direction *= CSMPrefs::get()["Scene Drops"]["distance"].toInt();
 
-    return start + direction * CSMPrefs::get()["Scene Drops"]["distance"].toInt();
+    WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction };
+    return hit;
 }
 
 void CSVRender::WorldspaceWidget::abortDrag()
@@ -465,63 +492,6 @@ bool CSVRender::WorldspaceWidget::storeMappingSetting (const CSMPrefs::Setting *
     return SceneWidget::storeMappingSetting(setting);
 }
 
-CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPoint& localPos)
-{
-    // (0,0) is considered the lower left corner of an OpenGL window
-    int x = localPos.x();
-    int y = height() - localPos.y();
-
-    osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::Intersector::WINDOW, x, y));
-
-    intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
-    osgUtil::IntersectionVisitor visitor(intersector);
-
-    visitor.setTraversalMask(getInteractionMask());
-
-    mView->getCamera()->accept(visitor);
-
-    for (osgUtil::LineSegmentIntersector::Intersections::iterator it = intersector->getIntersections().begin();
-         it != intersector->getIntersections().end(); ++it)
-    {
-        osgUtil::LineSegmentIntersector::Intersection intersection = *it;
-
-        // reject back-facing polygons
-        osg::Vec3f normal = intersection.getWorldIntersectNormal();
-        normal = osg::Matrix::transform3x3(normal, mView->getCamera()->getViewMatrix());
-        if (normal.z() < 0)
-            continue;
-
-        for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
-        {
-            osg::Node* node = *it;
-            if (osg::ref_ptr<CSVRender::TagBase> tag = dynamic_cast<CSVRender::TagBase *>(node->getUserData()))
-            {
-                WorldspaceHitResult hit = { true, tag, 0, 0, 0, intersection.getWorldIntersectPoint() };
-                if (intersection.indexList.size() >= 3)
-                {
-                    hit.index0 = intersection.indexList[0];
-                    hit.index1 = intersection.indexList[1];
-                    hit.index2 = intersection.indexList[2];
-                }
-                return hit;
-            }
-        }
-
-        // Something untagged, probably terrain
-        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
-        if (intersection.indexList.size() >= 3)
-        {
-            hit.index0 = intersection.indexList[0];
-            hit.index1 = intersection.indexList[1];
-            hit.index2 = intersection.indexList[2];
-        }
-        return hit;
-    }
-
-    WorldspaceHitResult hit = { false, 0, 0, 0, 0, osg::Vec3d() };
-    return hit;
-}
-
 void CSVRender::WorldspaceWidget::dropEvent (QDropEvent* event)
 {
     const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData());
@@ -606,7 +576,7 @@ void CSVRender::WorldspaceWidget::showToolTip()
     {
         QPoint pos = QCursor::pos();
 
-        WorldspaceHitResult hit = mousePick (mapFromGlobal (pos));
+        WorldspaceHitResult hit = mousePick (mapFromGlobal (pos), getInteractionMask());
         if (hit.tag)
         {
             bool hideBasics = CSMPrefs::get()["Tooltips"]["scene-hide-basic"].isTrue();
@@ -643,22 +613,20 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
-        editMode.drag (diffX, diffY, factor);
+        editMode.drag (event->pos(), diffX, diffY, factor);
     }
     else if (mDragMode=="p-edit" || mDragMode=="s-edit" || mDragMode=="p-select" || mDragMode=="s-select")
     {
-        WorldspaceHitResult hit = mousePick (event->pos());
-
         EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
 
         if (mDragMode=="p-edit")
-            mDragging = editMode.primaryEditStartDrag (hit);
+            mDragging = editMode.primaryEditStartDrag (event->pos());
         else if (mDragMode=="s-edit")
-            mDragging = editMode.secondaryEditStartDrag (hit);
+            mDragging = editMode.secondaryEditStartDrag (event->pos());
         else if (mDragMode=="p-select")
-            mDragging = editMode.primarySelectStartDrag (hit);
+            mDragging = editMode.primarySelectStartDrag (event->pos());
         else if (mDragMode=="s-select")
-            mDragging = editMode.secondarySelectStartDrag (hit);
+            mDragging = editMode.secondarySelectStartDrag (event->pos());
 
         if (mDragging)
         {
@@ -710,14 +678,13 @@ void CSVRender::WorldspaceWidget::mouseReleaseEvent (QMouseEvent *event)
         if (mDragging)
         {
             EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
-            WorldspaceHitResult hit = mousePick (event->pos());
 
-            editMode.dragCompleted(hit);
+            editMode.dragCompleted(event->pos());
             mDragging = false;
         }
         else
         {
-            WorldspaceHitResult hit = mousePick (event->pos());
+            WorldspaceHitResult hit = mousePick(event->pos(), getInteractionMask());
 
             handleMouseClick (hit, button, event->modifiers() & Qt::ShiftModifier);
         }
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index e6cd7aab01..92d31eb9ee 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -149,16 +149,11 @@ namespace CSVRender
             /// \param elementMask Elements to be affected by the select operation
             virtual void selectAllWithSameParentId (int elementMask) = 0;
 
-            /// Return the next intersection point with scene elements matched by
+            /// Return the next intersection with scene elements matched by
             /// \a interactionMask based on \a localPos and the camera vector.
-            /// If there is no such point, instead a point "in front" of \a localPos will be
+            /// If there is no such intersection, instead a point "in front" of \a localPos will be
             /// returned.
-            ///
-            /// \param ignoreHidden ignore elements specified in interactionMask that are
-            /// flagged as not visible.
-            osg::Vec3f getIntersectionPoint (const QPoint& localPos,
-                unsigned int interactionMask = Mask_Reference | Mask_Terrain,
-                bool ignoreHidden = false) const;
+            WorldspaceHitResult mousePick (const QPoint& localPos, unsigned int interactionMask) const;
 
             virtual std::string getCellId (const osg::Vec3f& point) const = 0;
 
@@ -225,8 +220,6 @@ namespace CSVRender
 
             void dragMoveEvent(QDragMoveEvent *event);
 
-            WorldspaceHitResult mousePick (const QPoint& localPos);
-
             virtual std::string getStartupInstruction() = 0;
 
         private slots:

From e8e915bcdecaf2c35389d92f57ce2867372b0a2e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 18 May 2016 10:46:25 -0400
Subject: [PATCH 639/765] Share selection functionality with instance editing
 mode.

---
 apps/opencs/CMakeLists.txt                    |   2 +-
 .../view/render/instanceselectionmode.cpp     | 112 ++++++------------
 .../view/render/instanceselectionmode.hpp     |  30 ++---
 apps/opencs/view/render/pathgridmode.cpp      |  82 ++-----------
 apps/opencs/view/render/pathgridmode.hpp      |  18 +--
 .../view/render/pathgridselectionmode.cpp     |  71 +++++++++++
 .../view/render/pathgridselectionmode.hpp     |  38 ++++++
 apps/opencs/view/render/selectionmode.cpp     |  77 ++++++++++++
 apps/opencs/view/render/selectionmode.hpp     |  51 ++++++++
 9 files changed, 298 insertions(+), 183 deletions(-)
 create mode 100644 apps/opencs/view/render/pathgridselectionmode.cpp
 create mode 100644 apps/opencs/view/render/pathgridselectionmode.hpp
 create mode 100644 apps/opencs/view/render/selectionmode.cpp
 create mode 100644 apps/opencs/view/render/selectionmode.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index b33dc15085..f8cf1e2d80 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -86,7 +86,7 @@ opencs_units (view/widget
 opencs_units (view/render
     scenewidget worldspacewidget pagedworldspacewidget unpagedworldspacewidget
     previewwidget editmode instancemode instanceselectionmode instancemovemode
-    orbitcameramode pathgridmode
+    orbitcameramode pathgridmode selectionmode pathgridselectionmode
     )
 
 opencs_units_noqt (view/render
diff --git a/apps/opencs/view/render/instanceselectionmode.cpp b/apps/opencs/view/render/instanceselectionmode.cpp
index 5c3aaa8d16..bf8ede0eb4 100644
--- a/apps/opencs/view/render/instanceselectionmode.cpp
+++ b/apps/opencs/view/render/instanceselectionmode.cpp
@@ -1,4 +1,3 @@
-
 #include "instanceselectionmode.hpp"
 
 #include <QMenu>
@@ -10,84 +9,49 @@
 #include "worldspacewidget.hpp"
 #include "object.hpp"
 
-bool CSVRender::InstanceSelectionMode::createContextMenu (QMenu *menu)
+namespace CSVRender
 {
-    if (menu)
+    InstanceSelectionMode::InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget)
+        : SelectionMode(parent, worldspaceWidget, Mask_Reference)
     {
-        menu->addAction (mSelectAll);
-        menu->addAction (mDeselectAll);
-        menu->addAction (mSelectSame);
-        menu->addAction (mDeleteSelection);
+        mSelectSame = new QAction("Extend selection to instances with same object ID", this);
+        mDeleteSelection = new QAction("Delete selected instances", this);
+
+        connect(mSelectSame, SIGNAL(triggered()), this, SLOT(selectSame()));
+        connect(mDeleteSelection, SIGNAL(triggered()), this, SLOT(deleteSelection()));
     }
 
-    return true;
-}
-
-CSVRender::InstanceSelectionMode::InstanceSelectionMode (CSVWidget::SceneToolbar *parent,
-    WorldspaceWidget& worldspaceWidget)
-: CSVWidget::SceneToolMode (parent, "Selection Mode"), mWorldspaceWidget (worldspaceWidget)
-{
-    addButton (":placeholder", "cube-centre",
-        "Centred cube"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection cube outwards</li>"
-        "<li>The selection cube is aligned to the word space axis</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
-    addButton (":placeholder", "cube-corner",
-        "Cube corner to corner"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from one corner of the selection cube to the opposite corner</li>"
-        "<li>The selection cube is aligned to the word space axis</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
-    addButton (":placeholder", "sphere",
-        "Centred sphere"
-        "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection sphere outwards</li>"
-        "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
-        "</ul>"
-        "<font color=Red>Not implemented yet</font color>");
-
-    mSelectAll = new QAction ("Select all instances", this);
-    mDeselectAll = new QAction ("Clear selection", this);
-    mDeleteSelection = new QAction ("Delete selected instances", this);
-    mSelectSame = new QAction ("Extend selection to instances with same object ID", this);
-    connect (mSelectAll, SIGNAL (triggered ()), this, SLOT (selectAll()));
-    connect (mDeselectAll, SIGNAL (triggered ()), this, SLOT (clearSelection()));
-    connect (mDeleteSelection, SIGNAL (triggered ()), this, SLOT (deleteSelection()));
-    connect (mSelectSame, SIGNAL (triggered ()), this, SLOT (selectSame()));
-}
-
-void CSVRender::InstanceSelectionMode::selectAll()
-{
-    mWorldspaceWidget.selectAll (Mask_Reference);
-}
-
-void CSVRender::InstanceSelectionMode::clearSelection()
-{
-    mWorldspaceWidget.clearSelection (Mask_Reference);
-}
-
-void CSVRender::InstanceSelectionMode::deleteSelection()
-{
-    std::vector<osg::ref_ptr<TagBase> > selection =
-        mWorldspaceWidget.getSelection (Mask_Reference);
-
-    CSMWorld::IdTable& referencesTable =
-            dynamic_cast<CSMWorld::IdTable&> (*mWorldspaceWidget.getDocument().getData().
-            getTableModel (CSMWorld::UniversalId::Type_References));
-
-    for (std::vector<osg::ref_ptr<TagBase> >::iterator iter (selection.begin());
-        iter!=selection.end(); ++iter)
+    bool InstanceSelectionMode::createContextMenu(QMenu* menu)
     {
-        CSMWorld::DeleteCommand *command = new CSMWorld::DeleteCommand (referencesTable,
-            static_cast<ObjectTag *> (iter->get())->mObject->getReferenceId());
+        if (menu)
+        {
+            SelectionMode::createContextMenu(menu);
 
-        mWorldspaceWidget.getDocument().getUndoStack().push (command);
+            menu->addAction(mSelectSame);
+            menu->addAction(mDeleteSelection);
+        }
+
+        return true;
+    }
+
+    void InstanceSelectionMode::selectSame()
+    {
+        getWorldspaceWidget().selectAllWithSameParentId(Mask_Reference);
+    }
+
+    void InstanceSelectionMode::deleteSelection()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Reference);
+
+        CSMWorld::IdTable& referencesTable = dynamic_cast<CSMWorld::IdTable&>(
+            *getWorldspaceWidget().getDocument().getData().getTableModel(CSMWorld::UniversalId::Type_References));
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator iter = selection.begin(); iter != selection.end(); ++iter)
+        {
+            CSMWorld::DeleteCommand* command = new CSMWorld::DeleteCommand(referencesTable,
+                static_cast<ObjectTag*>(iter->get())->mObject->getReferenceId());
+
+            getWorldspaceWidget().getDocument().getUndoStack().push(command);
+        }
     }
 }
-
-void CSVRender::InstanceSelectionMode::selectSame()
-{
-    mWorldspaceWidget.selectAllWithSameParentId (Mask_Reference);
-}
diff --git a/apps/opencs/view/render/instanceselectionmode.hpp b/apps/opencs/view/render/instanceselectionmode.hpp
index cac2ca8c20..a590240d97 100644
--- a/apps/opencs/view/render/instanceselectionmode.hpp
+++ b/apps/opencs/view/render/instanceselectionmode.hpp
@@ -1,23 +1,19 @@
 #ifndef CSV_RENDER_INSTANCE_SELECTION_MODE_H
 #define CSV_RENDER_INSTANCE_SELECTION_MODE_H
 
-#include "../widget/scenetoolmode.hpp"
-
-class QAction;
+#include "selectionmode.hpp"
 
 namespace CSVRender
 {
-    class WorldspaceWidget;
-
-    class InstanceSelectionMode : public CSVWidget::SceneToolMode
+    class InstanceSelectionMode : public SelectionMode
     {
             Q_OBJECT
 
-            WorldspaceWidget& mWorldspaceWidget;
-            QAction *mSelectAll;
-            QAction *mDeselectAll;
-            QAction *mDeleteSelection;
-            QAction *mSelectSame;
+        public:
+
+            InstanceSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+
+        protected:
 
             /// Add context menu items to \a menu.
             ///
@@ -25,20 +21,16 @@ namespace CSVRender
             ///
             /// \return Have there been any menu items to be added (if menu is 0 and there
             /// items to be added, the function must return true anyway.
-            virtual bool createContextMenu (QMenu *menu);
+            bool createContextMenu(QMenu* menu);
 
-        public:
+        private:
 
-            InstanceSelectionMode (CSVWidget::SceneToolbar *parent, WorldspaceWidget& worldspaceWidget);
+            QAction* mDeleteSelection;
+            QAction* mSelectSame;
 
         private slots:
 
-            void selectAll();
-
-            void clearSelection();
-
             void deleteSelection();
-
             void selectSame();
     };
 }
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 3a2cc600a0..0dd458346c 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -10,9 +10,12 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/idtree.hpp"
 
+#include "../widget/scenetoolbar.hpp"
+
 #include "cell.hpp"
 #include "mask.hpp"
 #include "pathgrid.hpp"
+#include "pathgridselectionmode.hpp"
 #include "worldspacewidget.hpp"
 
 namespace CSVRender
@@ -22,6 +25,7 @@ namespace CSVRender
             getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
+        , mSelectionMode(0)
     {
     }
 
@@ -39,33 +43,13 @@ namespace CSVRender
 
     void PathgridMode::activate(CSVWidget::SceneToolbar* toolbar)
     {
-        mSelectAll = new QAction("Select all other nodes in cell", this);
-        mInvertSelection = new QAction("Invert selection", this);
-        mClearSelection = new QAction("Clear selection", this);
-        mRemoveSelected = new QAction("Remove selected nodes", this);
-        mRemoveSelectedEdges = new QAction("Remove edges between selected nodes", this);
-
-        connect(mSelectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
-        connect(mInvertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
-        connect(mClearSelection, SIGNAL(triggered()), this, SLOT(clearSelection()));
-        connect(mRemoveSelected, SIGNAL(triggered()), this, SLOT(removeSelected()));
-        connect(mRemoveSelectedEdges, SIGNAL(triggered()), this, SLOT(removeSelectedEdges()));
-
-        EditMode::activate(toolbar);
-    }
-
-    bool PathgridMode::createContextMenu(QMenu* menu)
-    {
-        if (menu)
+        if (!mSelectionMode)
         {
-            menu->addAction(mSelectAll);
-            menu->addAction(mInvertSelection);
-            menu->addAction(mClearSelection);
-            menu->addAction(mRemoveSelected);
-            menu->addAction(mRemoveSelectedEdges);
+            mSelectionMode = new PathgridSelectionMode(toolbar, getWorldspaceWidget());
         }
 
-        return true;
+        EditMode::activate(toolbar);
+        toolbar->addTool(mSelectionMode);
     }
 
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
@@ -245,54 +229,4 @@ namespace CSVRender
     {
         getWorldspaceWidget().reset(Mask_Pathgrid);
     }
-
-    void PathgridMode::selectAll()
-    {
-        // Select rest of nodes in selected cell
-        getWorldspaceWidget().selectAll(Mask_Pathgrid);
-    }
-
-    void PathgridMode::invertSelection()
-    {
-        getWorldspaceWidget().invertSelection(Mask_Pathgrid);
-    }
-
-    void PathgridMode::clearSelection()
-    {
-        getWorldspaceWidget().clearSelection(Mask_Pathgrid);
-    }
-
-    void PathgridMode::removeSelected()
-    {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
-
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
-        {
-            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
-            {
-                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
-                QString description = "Remove selected nodes";
-
-                CSMWorld::CommandMacro macro(undoStack, description);
-                tag->getPathgrid()->applyRemoveNodes(macro);
-            }
-        }
-    }
-
-    void PathgridMode::removeSelectedEdges()
-    {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
-
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
-        {
-            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
-            {
-                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
-                QString description = "Remove edges between selected nodes";
-
-                CSMWorld::CommandMacro macro(undoStack, description);
-                tag->getPathgrid()->applyRemoveEdges(macro);
-            }
-        }
-    }
 }
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index b6933cb8ea..908eefa5b2 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -7,6 +7,8 @@
 
 namespace CSVRender
 {
+    class PathgridSelectionMode;
+
     class PathgridMode : public EditMode
     {
             Q_OBJECT
@@ -17,8 +19,6 @@ namespace CSVRender
 
             virtual void activate(CSVWidget::SceneToolbar* toolbar);
 
-            virtual bool createContextMenu(QMenu* menu);
-
             virtual void primaryEditPressed(const WorldspaceHitResult& hit);
 
             virtual void secondaryEditPressed(const WorldspaceHitResult& hit);
@@ -52,21 +52,9 @@ namespace CSVRender
             std::string mLastId, mEdgeId;
             unsigned short mFromNode;
 
-            QAction* mSelectAll;
-            QAction* mInvertSelection;
-            QAction* mClearSelection;
-            QAction* mRemoveSelected;
-            QAction* mRemoveSelectedEdges;
+            PathgridSelectionMode* mSelectionMode;
 
             QString getTooltip();
-
-        private slots:
-
-            void selectAll();
-            void invertSelection();
-            void clearSelection();
-            void removeSelected();
-            void removeSelectedEdges();
     };
 }
 
diff --git a/apps/opencs/view/render/pathgridselectionmode.cpp b/apps/opencs/view/render/pathgridselectionmode.cpp
new file mode 100644
index 0000000000..db41faf50d
--- /dev/null
+++ b/apps/opencs/view/render/pathgridselectionmode.cpp
@@ -0,0 +1,71 @@
+#include "pathgridselectionmode.hpp"
+
+#include <QMenu>
+#include <QAction>
+
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commandmacro.hpp"
+
+#include "worldspacewidget.hpp"
+#include "pathgrid.hpp"
+
+namespace CSVRender
+{
+    PathgridSelectionMode::PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget)
+        : SelectionMode(parent, worldspaceWidget, Mask_Pathgrid)
+    {
+        mRemoveSelectedNodes = new QAction("Remove selected nodes", this);
+        mRemoveSelectedEdges = new QAction("Remove edges between selected nodes", this);
+
+        connect(mRemoveSelectedNodes, SIGNAL(triggered()), this, SLOT(removeSelectedNodes()));
+        connect(mRemoveSelectedEdges, SIGNAL(triggered()), this, SLOT(removeSelectedEdges()));
+    }
+
+    bool PathgridSelectionMode::createContextMenu(QMenu* menu)
+    {
+        if (menu)
+        {
+            SelectionMode::createContextMenu(menu);
+
+            menu->addAction(mRemoveSelectedNodes);
+            menu->addAction(mRemoveSelectedEdges);
+        }
+
+        return true;
+    }
+
+    void PathgridSelectionMode::removeSelectedNodes()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveNodes(macro);
+            }
+        }
+    }
+
+    void PathgridSelectionMode::removeSelectedEdges()
+    {
+        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+
+        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        {
+            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            {
+                QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
+                QString description = "Remove edges between selected nodes";
+
+                CSMWorld::CommandMacro macro(undoStack, description);
+                tag->getPathgrid()->applyRemoveEdges(macro);
+            }
+        }
+    }
+}
diff --git a/apps/opencs/view/render/pathgridselectionmode.hpp b/apps/opencs/view/render/pathgridselectionmode.hpp
new file mode 100644
index 0000000000..e4cb1e0440
--- /dev/null
+++ b/apps/opencs/view/render/pathgridselectionmode.hpp
@@ -0,0 +1,38 @@
+#ifndef CSV_RENDER_PATHGRID_SELECTION_MODE_H
+#define CSV_RENDER_PATHGRID_SELECTION_MODE_H
+
+#include "selectionmode.hpp"
+
+namespace CSVRender
+{
+    class PathgridSelectionMode : public SelectionMode
+    {
+            Q_OBJECT
+
+        public:
+
+            PathgridSelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget);
+
+        protected:
+
+            /// Add context menu items to \a menu.
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            bool createContextMenu(QMenu* menu);
+
+        private:
+
+            QAction* mRemoveSelectedNodes;
+            QAction* mRemoveSelectedEdges;
+
+        private slots:
+
+            void removeSelectedNodes();
+            void removeSelectedEdges();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/render/selectionmode.cpp b/apps/opencs/view/render/selectionmode.cpp
new file mode 100644
index 0000000000..82a3c49e45
--- /dev/null
+++ b/apps/opencs/view/render/selectionmode.cpp
@@ -0,0 +1,77 @@
+#include "selectionmode.hpp"
+
+#include <QMenu>
+#include <QAction>
+
+#include "worldspacewidget.hpp"
+
+namespace CSVRender
+{
+    SelectionMode::SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
+        unsigned int interactionMask)
+        : SceneToolMode(parent, "Selection mode")
+        , mWorldspaceWidget(worldspaceWidget)
+        , mInteractionMask(interactionMask)
+    {
+        addButton(":placeholder", "cube-centre",
+            "Centred cube"
+            "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection cube outwards</li>"
+            "<li>The selection cube is aligned to the word space axis</li>"
+            "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        addButton(":placeholder", "cube-corner",
+            "Cube corner to corner"
+            "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from one corner of the selection cube to the opposite corner</li>"
+            "<li>The selection cube is aligned to the word space axis</li>"
+            "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+        addButton(":placeholder", "sphere",
+            "Centred sphere"
+            "<ul><li>Drag with primary (make instances the selection) or secondary (invert selection state) select button from the centre of the selection sphere outwards</li>"
+            "<li>If context selection mode is enabled, a drag with primary/secondary edit not starting on an instance will have the same effect</li>"
+            "</ul>"
+            "<font color=Red>Not implemented yet</font color>");
+
+        mSelectAll = new QAction("Select all", this);
+        mDeselectAll = new QAction("Clear selection", this);
+        mInvertSelection = new QAction("Invert selection", this);
+
+        connect(mSelectAll, SIGNAL(triggered()), this, SLOT(selectAll()));
+        connect(mDeselectAll, SIGNAL(triggered()), this, SLOT(clearSelection()));
+        connect(mInvertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
+    }
+
+    WorldspaceWidget& SelectionMode::getWorldspaceWidget()
+    {
+        return mWorldspaceWidget;
+    }
+
+    bool SelectionMode::createContextMenu (QMenu* menu)
+    {
+        if (menu)
+        {
+            menu->addAction(mSelectAll);
+            menu->addAction(mDeselectAll);
+            menu->addAction(mInvertSelection);
+        }
+
+        return true;
+    }
+
+    void SelectionMode::selectAll()
+    {
+        getWorldspaceWidget().selectAll(mInteractionMask);
+    }
+
+    void SelectionMode::clearSelection()
+    {
+        getWorldspaceWidget().clearSelection(mInteractionMask);
+    }
+
+    void SelectionMode::invertSelection()
+    {
+        getWorldspaceWidget().invertSelection(mInteractionMask);
+    }
+}
diff --git a/apps/opencs/view/render/selectionmode.hpp b/apps/opencs/view/render/selectionmode.hpp
new file mode 100644
index 0000000000..f28888bfde
--- /dev/null
+++ b/apps/opencs/view/render/selectionmode.hpp
@@ -0,0 +1,51 @@
+#ifndef CSV_RENDER_SELECTION_MODE_H
+#define CSV_RENDER_SELECTION_MODE_H
+
+#include "../widget/scenetoolmode.hpp"
+
+#include "mask.hpp"
+
+class QAction;
+
+namespace CSVRender
+{
+    class WorldspaceWidget;
+
+    class SelectionMode : public CSVWidget::SceneToolMode
+    {
+            Q_OBJECT
+
+        public:
+
+            SelectionMode(CSVWidget::SceneToolbar* parent, WorldspaceWidget& worldspaceWidget,
+                unsigned int interactionMask);
+
+        protected:
+
+            WorldspaceWidget& getWorldspaceWidget();
+
+            /// Add context menu items to \a menu.
+            ///
+            /// \attention menu can be a 0-pointer
+            ///
+            /// \return Have there been any menu items to be added (if menu is 0 and there
+            /// items to be added, the function must return true anyway.
+            virtual bool createContextMenu (QMenu* menu);
+
+        private:
+
+            WorldspaceWidget& mWorldspaceWidget;
+            unsigned int mInteractionMask;
+            QAction* mSelectAll;
+            QAction* mDeselectAll;
+            QAction* mInvertSelection;
+
+        protected slots:
+
+            virtual void selectAll();
+            virtual void clearSelection();
+            virtual void invertSelection();
+    };
+}
+
+#endif

From 1781aaaa2721401c8b097a4e3c6c12529d2c9bb3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 18 May 2016 12:17:26 -0400
Subject: [PATCH 640/765] Drag indicator.

---
 apps/opencs/view/render/cell.cpp         |  2 +-
 apps/opencs/view/render/pathgrid.cpp     | 69 ++++++++++++++++++++++--
 apps/opencs/view/render/pathgrid.hpp     |  9 +++-
 apps/opencs/view/render/pathgridmode.cpp | 30 ++++++++---
 components/sceneutil/pathgridutil.cpp    |  2 -
 components/sceneutil/pathgridutil.hpp    |  3 ++
 6 files changed, 100 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index b408503d19..dc22fd5110 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -433,5 +433,5 @@ void CSVRender::Cell::reset (unsigned int elementMask)
             iter!=mObjects.end(); ++iter)
             iter->second->reset();
     if (elementMask & Mask_Pathgrid)
-        mPathgrid->resetMove();
+        mPathgrid->resetIndicators();
 }
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 5b2dd4f989..7c6c8eb9e7 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 
+#include <osg/Array>
 #include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
@@ -61,6 +62,7 @@ namespace CSVRender
         , mParent(parent)
         , mPathgridGeometry(0)
         , mSelectedGeometry(0)
+        , mConnectionGeometry(0)
         , mTag(new PathgridTag(this))
     {
         const float CoordScalar = ESM::Land::REAL_SIZE;
@@ -189,12 +191,50 @@ namespace CSVRender
         createSelectedGeometry();
     }
 
-    void Pathgrid::resetMove()
+    void Pathgrid::adjustConnectionIndicator(unsigned short node)
+    {
+        if (mConnectionIndicator)
+        {
+            const CSMWorld::Pathgrid* source = getPathgridSource();
+            if (source)
+            {
+                const CSMWorld::Pathgrid::Point& pointA = source->mPoints[mConnectionNode];
+                const CSMWorld::Pathgrid::Point& pointB = source->mPoints[node];
+
+                osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
+                osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
+
+                createConnectionGeometry(start, end);
+            }
+        }
+    }
+
+    void Pathgrid::adjustConnectionIndicator(const osg::Vec3d& pos)
+    {
+        if (mConnectionIndicator)
+        {
+            const CSMWorld::Pathgrid* source = getPathgridSource();
+            if (source)
+            {
+                const CSMWorld::Pathgrid::Point& point = source->mPoints[mConnectionNode];
+
+                osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
+                osg::Vec3f end = pos - mBaseNode->getPosition();
+                createConnectionGeometry(start, end);
+            }
+        }
+    }
+
+    void Pathgrid::resetIndicators()
     {
         mSelectedNode->setPosition(osg::Vec3f(0,0,0));
         if (mConnectionIndicator)
         {
             mConnectionIndicator = false;
+
+            mPathgridGeode->removeDrawable(mConnectionGeometry);
+            mConnectionGeometry = 0;
+
             createSelectedGeometry();
         }
     }
@@ -379,8 +419,6 @@ namespace CSVRender
     void Pathgrid::removeGeometry()
     {
         mRemoveGeometry = true;
-
-
     }
 
     void Pathgrid::update()
@@ -471,6 +509,31 @@ namespace CSVRender
         }
     }
 
+    void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end)
+    {
+        if (mConnectionGeometry)
+            mPathgridGeode->removeDrawable(mConnectionGeometry);
+
+        mConnectionGeometry = new osg::Geometry();
+
+        osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(2);
+        osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
+        osg::ref_ptr<osg::DrawElementsUShort> indices = new osg::DrawElementsUShort(osg::PrimitiveSet::LINES, 2);
+
+        (*vertices)[0] = start;
+        (*vertices)[1] = end;
+        (*colors)[0] = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f);
+        indices->setElement(0, 0);
+        indices->setElement(1, 1);
+
+        mConnectionGeometry->setVertexArray(vertices);
+        mConnectionGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        mConnectionGeometry->addPrimitiveSet(indices);
+        mConnectionGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+
+        mPathgridGeode->addDrawable(mConnectionGeometry);
+    }
+
     const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
     {
         int index = mPathgridCollection.searchId(mId);
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 7cab806d34..9f6cf2686e 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -69,9 +69,11 @@ namespace CSVRender
             void clearSelected();
 
             void moveSelected(const osg::Vec3d& offset);
-            void resetMove();
-
             void setupConnectionIndicator(unsigned short node);
+            void adjustConnectionIndicator(unsigned short node);
+            void adjustConnectionIndicator(const osg::Vec3d& pos);
+
+            void resetIndicators();
 
             void applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos);
             void applyPosition(CSMWorld::CommandMacro& commands);
@@ -109,6 +111,7 @@ namespace CSVRender
             osg::ref_ptr<osg::Geode> mSelectedGeode;
             osg::ref_ptr<osg::Geometry> mPathgridGeometry;
             osg::ref_ptr<osg::Geometry> mSelectedGeometry;
+            osg::ref_ptr<osg::Geometry> mConnectionGeometry;
 
             osg::ref_ptr<PathgridTag> mTag;
 
@@ -118,6 +121,8 @@ namespace CSVRender
             void removePathgridGeometry();
             void removeSelectedGeometry();
 
+            void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end);
+
             const CSMWorld::Pathgrid* getPathgridSource();
 
             int edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2);
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 0dd458346c..423497a24d 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -156,13 +156,13 @@ namespace CSVRender
 
     void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)
     {
-        std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
-
-        for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
+        if (mDragMode == DragMode_Move)
         {
-            if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
+            std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection(Mask_Pathgrid);
+
+            for (std::vector<osg::ref_ptr<TagBase> >::iterator it = selection.begin(); it != selection.end(); ++it)
             {
-                if (mDragMode == DragMode_Move)
+                if (PathgridTag* tag = dynamic_cast<PathgridTag*>(it->get()))
                 {
                     osg::Vec3d eye, center, up, offset;
                     getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, center, up);
@@ -171,10 +171,26 @@ namespace CSVRender
 
                     tag->getPathgrid()->moveSelected(offset);
                 }
-                else if (mDragMode == DragMode_Edge)
+            }
+        }
+        else if (mDragMode == DragMode_Edge)
+        {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+
+            Cell* cell = getWorldspaceWidget().getCell(hit.worldPos);
+            if (cell)
+            {
+                PathgridTag* tag = 0;
+                if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
                 {
-                    // TODO Add indicator, need raytrace
+                    unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
+                    cell->getPathgrid()->adjustConnectionIndicator(node);
                 }
+                else
+                {
+                    cell->getPathgrid()->adjustConnectionIndicator(hit.worldPos);
+                }
+
             }
         }
     }
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 5078b1edb6..48e3981323 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -15,8 +15,6 @@ namespace SceneUtil
 
     const unsigned short DiamondTotalVertexCount = DiamondVertexCount + DiamondConnectorVertexCount;
 
-    const float DiamondHalfHeight = 40.f;
-    const float DiamondHalfWidth = 16.f;
     const float DiamondWireframeScalar = 1.1f;
 
     const osg::Vec3f DiamondPoints[DiamondVertexCount] =
diff --git a/components/sceneutil/pathgridutil.hpp b/components/sceneutil/pathgridutil.hpp
index 9a93ddf91b..de0ff35ed3 100644
--- a/components/sceneutil/pathgridutil.hpp
+++ b/components/sceneutil/pathgridutil.hpp
@@ -11,6 +11,9 @@ namespace ESM
 
 namespace SceneUtil
 {
+    const float DiamondHalfHeight = 40.f;
+    const float DiamondHalfWidth = 16.f;
+
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid);
 
     osg::ref_ptr<osg::Geometry> createPathgridSelectedWireframe(const ESM::Pathgrid& pathgrid,

From 374982180931025cc06709c36e2e5a2508d643af Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 May 2016 21:37:24 +0200
Subject: [PATCH 641/765] Choose a random death animation for actors that start
 the game as dead (Fixes #3397)

---
 apps/openmw/mwmechanics/character.cpp     | 18 ++++++++++++++----
 apps/openmw/mwmechanics/character.hpp     |  1 +
 apps/openmw/mwmechanics/creaturestats.cpp |  6 +++---
 apps/openmw/mwmechanics/creaturestats.hpp |  8 ++++----
 components/esm/creaturestats.cpp          |  6 +++---
 components/esm/creaturestats.hpp          |  2 +-
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 82c289200a..5ab195e64d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -629,6 +629,13 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
                     false, 1.0f, "start", "stop", startpoint, 0);
 }
 
+CharacterState CharacterController::chooseRandomDeathState()
+{
+    int selected=0;
+    chooseRandomGroup("death", &selected);
+    return static_cast<CharacterState>(CharState_Death1 + (selected-1));
+}
+
 void CharacterController::playRandomDeath(float startpoint)
 {
     if (mPtr == getPlayer())
@@ -652,9 +659,7 @@ void CharacterController::playRandomDeath(float startpoint)
     }
     else
     {
-        int selected=0;
-        chooseRandomGroup("death", &selected);
-        mDeathState = static_cast<CharacterState>(CharState_Death1 + (selected-1));
+        mDeathState = chooseRandomDeathState();
     }
     playDeath(startpoint, mDeathState);
 }
@@ -716,7 +721,12 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
         {
             // Set the death state, but don't play it yet
             // We will play it in the first frame, but only if no script set the skipAnim flag
-            mDeathState = static_cast<CharacterState>(CharState_Death1 + mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation());
+            signed char deathanim = mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation();
+            if (deathanim == -1)
+                mDeathState = chooseRandomDeathState();
+            else
+                mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
+
             mFloatToSurface = false;
         }
     }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 6fab04d64c..685bdf1cbe 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -207,6 +207,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void updateMagicEffects();
 
     void playDeath(float startpoint, CharacterState death);
+    CharacterState chooseRandomDeathState();
     void playRandomDeath(float startpoint = 0.0f);
 
     /// choose a random animation group with \a prefix and numeric suffix
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 13396e3fae..7d1dc4d2fb 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -22,7 +22,7 @@ namespace MWMechanics
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
           mFallHeight(0), mRecalcMagicka(false), mLastRestock(0,0), mGoldPool(0), mActorId(-1),
-          mDeathAnimation(0), mTimeOfDeath(), mLevel (0)
+          mDeathAnimation(-1), mTimeOfDeath(), mLevel (0)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
@@ -617,12 +617,12 @@ namespace MWMechanics
         esm.getHNT(sActorId, "COUN");
     }
 
-    unsigned char CreatureStats::getDeathAnimation() const
+    signed char CreatureStats::getDeathAnimation() const
     {
         return mDeathAnimation;
     }
 
-    void CreatureStats::setDeathAnimation(unsigned char index)
+    void CreatureStats::setDeathAnimation(signed char index)
     {
         mDeathAnimation = index;
     }
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 734e873196..8965dedaca 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -62,8 +62,8 @@ namespace MWMechanics
 
         int mActorId;
 
-        // The index of the death animation that was played
-        unsigned char mDeathAnimation;
+        // The index of the death animation that was played, or -1 if none played
+        signed char mDeathAnimation;
 
         MWWorld::TimeStamp mTimeOfDeath;
 
@@ -258,8 +258,8 @@ namespace MWMechanics
         void setGoldPool(int pool);
         int getGoldPool() const;
 
-        unsigned char getDeathAnimation() const;
-        void setDeathAnimation(unsigned char index);
+        signed char getDeathAnimation() const; // -1 means not decided
+        void setDeathAnimation(signed char index);
 
         MWWorld::TimeStamp getTimeOfDeath() const;
 
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index 9b60382e9b..a48ce54725 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -84,7 +84,7 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mActorId = -1;
     esm.getHNOT (mActorId, "ACID");
 
-    mDeathAnimation = 0;
+    mDeathAnimation = -1;
     esm.getHNOT (mDeathAnimation, "DANM");
 
     mTimeOfDeath.mDay = 0;
@@ -194,7 +194,7 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mActorId != -1)
         esm.writeHNT ("ACID", mActorId);
 
-    if (mDeathAnimation)
+    if (mDeathAnimation != -1)
         esm.writeHNT ("DANM", mDeathAnimation);
 
     if (mTimeOfDeath.mHour != 0 && mTimeOfDeath.mDay != 0)
@@ -247,6 +247,6 @@ void ESM::CreatureStats::blank()
     mFallHeight = 0.f;
     mRecalcDynamicStats = false;
     mDrawState = 0;
-    mDeathAnimation = 0;
+    mDeathAnimation = -1;
     mLevel = 1;
 }
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index 66b708e27c..a99cca9446 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -56,7 +56,7 @@ namespace ESM
         std::string mLastHitAttemptObject;
         bool mRecalcDynamicStats;
         int mDrawState;
-        unsigned char mDeathAnimation;
+        signed char mDeathAnimation;
         ESM::TimeStamp mTimeOfDeath;
 
         int mLevel;

From 0efbdb25eebce18ebae1152d89f3ef133141443f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 May 2016 22:30:14 +0200
Subject: [PATCH 642/765] Improve const-correctness in Animation

---
 apps/openmw/mwmechanics/character.cpp |  4 ++--
 apps/openmw/mwmechanics/character.hpp |  4 ++--
 apps/openmw/mwrender/animation.cpp    | 16 ++++++++--------
 apps/openmw/mwrender/animation.hpp    | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 5ab195e64d..7080650242 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -227,7 +227,7 @@ public:
     { return weap.type == type; }
 };
 
-std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num)
+std::string CharacterController::chooseRandomGroup (const std::string& prefix, int* num) const
 {
     int numAnims=0;
     while (mAnimation->hasAnimation(prefix + toString(numAnims+1)))
@@ -629,7 +629,7 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
                     false, 1.0f, "start", "stop", startpoint, 0);
 }
 
-CharacterState CharacterController::chooseRandomDeathState()
+CharacterState CharacterController::chooseRandomDeathState() const
 {
     int selected=0;
     chooseRandomGroup("death", &selected);
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 685bdf1cbe..757e2a19f7 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -207,12 +207,12 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void updateMagicEffects();
 
     void playDeath(float startpoint, CharacterState death);
-    CharacterState chooseRandomDeathState();
+    CharacterState chooseRandomDeathState() const;
     void playRandomDeath(float startpoint = 0.0f);
 
     /// choose a random animation group with \a prefix and numeric suffix
     /// @param num if non-NULL, the chosen animation number will be written here
-    std::string chooseRandomGroup (const std::string& prefix, int* num = NULL);
+    std::string chooseRandomGroup (const std::string& prefix, int* num = NULL) const;
 
     bool updateCarriedLeftVisible(WeaponType weaptype) const;
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 5435a8c58c..c049fa62e4 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -259,7 +259,7 @@ namespace MWRender
 
         ControllerMap mControllerMap[Animation::sNumBlendMasks];
 
-        const std::multimap<float, std::string>& getTextKeys();
+        const std::multimap<float, std::string>& getTextKeys() const;
     };
 
     class ResetAccumRootCallback : public osg::NodeCallback
@@ -314,7 +314,7 @@ namespace MWRender
             mInsert->removeChild(mObjectRoot);
     }
 
-    MWWorld::Ptr Animation::getPtr()
+    MWWorld::ConstPtr Animation::getPtr() const
     {
         return mPtr;
     }
@@ -338,7 +338,7 @@ namespace MWRender
             mResetAccumRootCallback->setAccumulate(mAccumulate);
     }
 
-    size_t Animation::detectBlendMask(osg::Node* node)
+    size_t Animation::detectBlendMask(const osg::Node* node) const
     {
         static const char sBlendMaskRoots[sNumBlendMasks][32] = {
             "", /* Lower body / character root */
@@ -364,7 +364,7 @@ namespace MWRender
         return 0;
     }
 
-    const std::multimap<float, std::string> &Animation::AnimSource::getTextKeys()
+    const std::multimap<float, std::string> &Animation::AnimSource::getTextKeys() const
     {
         return mKeyframes->mTextKeys;
     }
@@ -441,7 +441,7 @@ namespace MWRender
         mAnimSources.clear();
     }
 
-    bool Animation::hasAnimation(const std::string &anim)
+    bool Animation::hasAnimation(const std::string &anim) const
     {
         AnimSourceList::const_iterator iter(mAnimSources.begin());
         for(;iter != mAnimSources.end();++iter)
@@ -1098,7 +1098,7 @@ namespace MWRender
     }
 
     // TODO: Should not be here
-    osg::Vec4f Animation::getEnchantmentColor(MWWorld::Ptr item)
+    osg::Vec4f Animation::getEnchantmentColor(const MWWorld::ConstPtr& item) const
     {
         osg::Vec4f result(1,1,1,1);
         std::string enchantmentName = item.getClass().getEnchantment(item);
@@ -1198,9 +1198,9 @@ namespace MWRender
         }
     }
 
-    void Animation::getLoopingEffects(std::vector<int> &out)
+    void Animation::getLoopingEffects(std::vector<int> &out) const
     {
-        for (std::vector<EffectParams>::iterator it = mEffects.begin(); it != mEffects.end(); ++it)
+        for (std::vector<EffectParams>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
         {
             if (it->mLoop)
                 out.push_back(it->mEffectId);
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 1d7930566a..e9d79ced1f 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -270,7 +270,7 @@ protected:
      */
     void resetActiveGroups();
 
-    size_t detectBlendMask(osg::Node* node);
+    size_t detectBlendMask(const osg::Node* node) const;
 
     /* Updates the position of the accum root node for the given time, and
      * returns the wanted movement vector from the previous time. */
@@ -315,7 +315,7 @@ protected:
      */
     virtual void addControllers();
 
-    osg::Vec4f getEnchantmentColor(MWWorld::Ptr item);
+    osg::Vec4f getEnchantmentColor(const MWWorld::ConstPtr& item) const;
 
     void addGlow(osg::ref_ptr<osg::Node> node, osg::Vec4f glowColor);
 
@@ -327,7 +327,7 @@ public:
     Animation(const MWWorld::Ptr &ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem);
     virtual ~Animation();
 
-    MWWorld::Ptr getPtr();
+    MWWorld::ConstPtr getPtr() const;
 
     /// Set active flag on the object skeleton, if one exists.
     /// @see SceneUtil::Skeleton::setActive
@@ -349,11 +349,11 @@ public:
      */
     void addEffect (const std::string& model, int effectId, bool loop = false, const std::string& bonename = "", std::string texture = "");
     void removeEffect (int effectId);
-    void getLoopingEffects (std::vector<int>& out);
+    void getLoopingEffects (std::vector<int>& out) const;
 
     virtual void updatePtr(const MWWorld::Ptr &ptr);
 
-    bool hasAnimation(const std::string &anim);
+    bool hasAnimation(const std::string &anim) const;
 
     // Specifies the axis' to accumulate on. Non-accumulated axis will just
     // move visually, but not affect the actual movement. Each x/y/z value

From a9561f738ace7a5a7cb231dd1da829e39ef91a28 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 May 2016 22:34:27 +0200
Subject: [PATCH 643/765] Move RemoveParticlesVisitor to animation.cpp

---
 apps/openmw/mwrender/animation.cpp | 46 ++++++++++++++++++++++++
 apps/openmw/mwrender/objects.cpp   | 56 ------------------------------
 2 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index c049fa62e4..04b3d0e9ab 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -10,6 +10,7 @@
 #include <osg/Material>
 
 #include <osgParticle/ParticleSystem>
+#include <osgParticle/ParticleProcessor>
 
 #include <components/nifosg/nifloader.hpp>
 
@@ -47,6 +48,44 @@
 namespace
 {
 
+    /// Removes all particle systems and related nodes in a subgraph.
+    class RemoveParticlesVisitor : public osg::NodeVisitor
+    {
+    public:
+        RemoveParticlesVisitor()
+            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
+        { }
+
+        virtual void apply(osg::Node &node)
+        {
+            if (dynamic_cast<osgParticle::ParticleProcessor*>(&node))
+                mToRemove.push_back(&node);
+
+            traverse(node);
+        }
+
+        virtual void apply(osg::Drawable& drw)
+        {
+            if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
+                mToRemove.push_back(partsys);
+        }
+
+        void remove()
+        {
+            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
+            {
+                // FIXME: a Drawable might have more than one parent
+                osg::Node* node = *it;
+                if (node->getNumParents())
+                    node->getParent(0)->removeChild(node);
+            }
+            mToRemove.clear();
+        }
+
+    private:
+        std::vector<osg::ref_ptr<osg::Node> > mToRemove;
+    };
+
     class GlowUpdater : public SceneUtil::StateSetUpdater
     {
     public:
@@ -1439,6 +1478,13 @@ namespace MWRender
         }
         if (ptr.getTypeName() == typeid(ESM::Light).name() && allowLight)
             addExtraLight(getOrCreateObjectRoot(), ptr.get<ESM::Light>()->mBase);
+
+        if (!allowLight)
+        {
+            RemoveParticlesVisitor visitor;
+            mObjectRoot->accept(visitor);
+            visitor.remove();
+        }
     }
 
     Animation::AnimState::~AnimState()
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index e40863622f..2408d1ba0c 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -5,12 +5,6 @@
 #include <osg/Group>
 #include <osg/UserDataContainer>
 
-#include <osgParticle/ParticleSystem>
-#include <osgParticle/ParticleProcessor>
-
-#include <components/resource/scenemanager.hpp>
-
-#include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 
@@ -22,49 +16,6 @@
 #include "creatureanimation.hpp"
 #include "vismask.hpp"
 
-namespace
-{
-
-    /// Removes all particle systems and related nodes in a subgraph.
-    class RemoveParticlesVisitor : public osg::NodeVisitor
-    {
-    public:
-        RemoveParticlesVisitor()
-            : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
-        { }
-
-        virtual void apply(osg::Node &node)
-        {
-            if (dynamic_cast<osgParticle::ParticleProcessor*>(&node))
-                mToRemove.push_back(&node);
-
-            traverse(node);
-        }
-
-        virtual void apply(osg::Drawable& drw)
-        {
-            if (osgParticle::ParticleSystem* partsys = dynamic_cast<osgParticle::ParticleSystem*>(&drw))
-                mToRemove.push_back(partsys);
-        }
-
-        void remove()
-        {
-            for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
-            {
-                // FIXME: a Drawable might have more than one parent
-                osg::Node* node = *it;
-                if (node->getNumParents())
-                    node->getParent(0)->removeChild(node);
-            }
-            mToRemove.clear();
-        }
-
-    private:
-        std::vector<osg::ref_ptr<osg::Node> > mToRemove;
-    };
-
-}
-
 
 namespace MWRender
 {
@@ -124,13 +75,6 @@ void Objects::insertModel(const MWWorld::Ptr &ptr, const std::string &mesh, bool
 
     std::auto_ptr<ObjectAnimation> anim (new ObjectAnimation(ptr, mesh, mResourceSystem, animated, allowLight));
 
-    if (!allowLight)
-    {
-        RemoveParticlesVisitor visitor;
-        anim->getObjectRoot()->accept(visitor);
-        visitor.remove();
-    }
-
     mObjects.insert(std::make_pair(ptr, anim.release()));
 }
 

From 44dd67ee0f6aa817899b6952ec3d33bf68bbc779 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 May 2016 22:35:25 +0200
Subject: [PATCH 644/765] Fix a potential crash for lights without a model that
 have "off by default" flag set

---
 apps/openmw/mwrender/animation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 04b3d0e9ab..ddff61ac7a 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -1479,7 +1479,7 @@ namespace MWRender
         if (ptr.getTypeName() == typeid(ESM::Light).name() && allowLight)
             addExtraLight(getOrCreateObjectRoot(), ptr.get<ESM::Light>()->mBase);
 
-        if (!allowLight)
+        if (!allowLight && mObjectRoot)
         {
             RemoveParticlesVisitor visitor;
             mObjectRoot->accept(visitor);

From b86250036c0417c5cf0fe9a3dae1d3c57921254b Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 19 May 2016 18:33:15 -0400
Subject: [PATCH 645/765] Add ability to add pathgrids.

---
 apps/opencs/model/world/commands.cpp | 31 ++++++++++++++++++++++++++++
 apps/opencs/model/world/commands.hpp |  9 ++++++++
 apps/opencs/view/render/pathgrid.cpp | 18 +++++++++-------
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index f8c72a3909..602d32f0f0 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -8,9 +8,11 @@
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 
+#include "idcollection.hpp"
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "nestedtablewrapper.hpp"
+#include "pathgrid.hpp"
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
@@ -235,6 +237,35 @@ void CSMWorld::CloneCommand::undo()
     mModel.removeRow (mModel.getModelIndex (mId, 0).row());
 }
 
+CSMWorld::CreatePathgridCommand::CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent)
+    : CreateCommand(model, id, parent)
+{
+    setType(UniversalId::Type_Pathgrid);
+}
+
+void CSMWorld::CreatePathgridCommand::redo()
+{
+    CreateCommand::redo();
+
+    Record<Pathgrid> record = static_cast<const Record<Pathgrid>& >(mModel.getRecord(mId));
+    record.get().blank();
+    record.get().mCell = mId;
+
+    if (!mId.empty() && mId[0]=='#')
+    {
+        int x, y;
+        char ignore;
+
+        std::istringstream stream (mId);
+        if (stream >> ignore >> x >> y)
+        {
+            record.get().mData.mX = x;
+            record.get().mData.mY = y;
+        }
+    }
+
+    mModel.setRecord(mId, record, mType);
+}
 
 CSMWorld::UpdateCellCommand::UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent)
 : QUndoCommand (parent), mModel (model), mRow (row)
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 23ffccbd7e..b54a1d5acb 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -153,6 +153,15 @@ namespace CSMWorld
             virtual void undo();
     };
 
+    class CreatePathgridCommand : public CreateCommand
+    {
+        public:
+
+            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+
+            virtual void redo();
+    };
+
     /// \brief Update cell ID according to x/y-coordinates
     ///
     /// \note The new value will be calculated in the first call to redo instead of the
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 7c6c8eb9e7..368fde5ee8 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -241,6 +241,10 @@ namespace CSVRender
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
     {
+
+        CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
+
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
@@ -250,9 +254,6 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
-            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
-                CSMWorld::UniversalId::Type_Pathgrids));
-
             int recordIndex = mPathgridCollection.getIndex (mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
@@ -269,14 +270,15 @@ namespace CSVRender
             int row = static_cast<int>(source->mPoints.size());
 
             // Add node
-            commands.push (new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
-            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
-            commands.push (new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
         }
         else
         {
-            // Create pathgrid TODO
+            CSMWorld::CreatePathgridCommand* createCmd = new CSMWorld::CreatePathgridCommand(*model, mId);
+            commands.push(createCmd);
         }
     }
 

From 703dba902bc06c17b24fa05e66718b752d0a9655 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 20 May 2016 00:40:59 +0200
Subject: [PATCH 646/765] Set the shader path in OpenCS

---
 apps/opencs/model/doc/document.cpp | 2 +-
 apps/opencs/model/world/data.cpp   | 6 +++++-
 apps/opencs/model/world/data.hpp   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 19891363fa..87fbccb3f3 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -274,7 +274,7 @@ CSMDoc::Document::Document (const VFS::Manager* vfs, const Files::ConfigurationM
     const Fallback::Map* fallback,
     ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager,
     const std::vector<std::string>& blacklistedScripts)
-: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager, fallback),
+: mVFS(vfs), mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager, fallback, resDir),
   mTools (*this, encoding),
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 70c6d5d7e9..8b0a9b384d 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -10,6 +10,8 @@
 #include <components/esm/loadglob.hpp>
 #include <components/esm/cellref.hpp>
 
+#include <components/resource/scenemanager.hpp>
+
 #include "idtable.hpp"
 #include "idtree.hpp"
 #include "columnimp.hpp"
@@ -59,11 +61,13 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
     return number;
 }
 
-CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback)
+CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir)
 : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
   mResourcesManager (resourcesManager), mFallbackMap(fallback),
   mReader (0), mDialogue (0), mReaderIndex(0), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
 {
+    mResourceSystem->getSceneManager()->setShaderPath((resDir / "shaders").string());
+
     int index = 0;
 
     mGlobals.addColumn (new StringIdColumn<ESM::Global>);
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index e5b8229c4f..f0c3dcd417 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -138,7 +138,7 @@ namespace CSMWorld
 
         public:
 
-            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback);
+            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir);
 
             virtual ~Data();
 

From 799ed300eaa85a6592b6bfe17e5ccfa5e725eef3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 21 May 2016 14:36:07 -0400
Subject: [PATCH 647/765] Use cell coordinates class, fix undo description.

---
 apps/opencs/model/world/commands.cpp     | 15 +++++----------
 apps/opencs/view/render/pathgridmode.cpp |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 602d32f0f0..5f94223765 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -8,6 +8,7 @@
 #include <QAbstractItemModel>
 #include <QAbstractProxyModel>
 
+#include "cellcoordinates.hpp"
 #include "idcollection.hpp"
 #include "idtable.hpp"
 #include "idtree.hpp"
@@ -251,17 +252,11 @@ void CSMWorld::CreatePathgridCommand::redo()
     record.get().blank();
     record.get().mCell = mId;
 
-    if (!mId.empty() && mId[0]=='#')
+    std::pair<CellCoordinates, bool> coords = CellCoordinates::fromId(mId);
+    if (coords.second)
     {
-        int x, y;
-        char ignore;
-
-        std::istringstream stream (mId);
-        if (stream >> ignore >> x >> y)
-        {
-            record.get().mData.mX = x;
-            record.get().mData.mY = y;
-        }
+        record.get().mData.mX = coords.first.getX();
+        record.get().mData.mY = coords.first.getY();
     }
 
     mModel.setRecord(mId, record, mType);
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 423497a24d..a4ab394970 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -60,7 +60,7 @@ namespace CSVRender
         {
             // Add node
             QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
-            QString description = "Connect node to selected nodes";
+            QString description = "Add node";
 
             CSMWorld::CommandMacro macro(undoStack, description);
             cell->getPathgrid()->applyPoint(macro, hitResult.worldPos);

From 6199663bd84c50366ba046545fe4f2de0b093b0a Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 21 May 2016 18:59:43 -0400
Subject: [PATCH 648/765] Fix data corruption issues. - Point connection count
 not being set - Nested undo not restoring table (for pathgrid scene editing,
 editor     nested undo is still broken)

---
 apps/opencs/model/world/commands.cpp          | 34 +++++++
 apps/opencs/model/world/commands.hpp          | 27 ++++++
 .../model/world/nestedcoladapterimp.cpp       | 96 +++++++++++++++----
 apps/opencs/view/render/pathgrid.cpp          | 38 +++-----
 4 files changed, 155 insertions(+), 40 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 5f94223765..b48d6eba2c 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -301,6 +301,40 @@ void CSMWorld::UpdateCellCommand::undo()
     mModel.setData (mIndex, mOld);
 }
 
+CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow,
+    int nestedColumn, int parentColumn, const QVariant& new_, QUndoCommand* parent)
+    : QUndoCommand(parent)
+    , NestedTableStoring(model, id, parentColumn)
+    , mModel(model)
+    , mId(id)
+    , mNestedRow(nestedRow)
+    , mNestedColumn(nestedColumn)
+    , mParentColumn(parentColumn)
+    , mNew(new_)
+{
+    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
+    setText (("Modify " + title + " sub-table of " + mId).c_str());
+
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
+}
+
+void CSMWorld::ModifyNestedCommand::redo()
+{
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    QModelIndex nestedIndex = mModel.index(mNestedRow, mNestedColumn, parentIndex);
+    mModel.setData(nestedIndex, mNew);
+    mModifyParentCommand->redo();
+}
+
+
+void CSMWorld::ModifyNestedCommand::undo()
+{
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    mModel.setNestedTable(parentIndex, getOld());
+    mModifyParentCommand->undo();
+}
+
 
 CSMWorld::DeleteNestedCommand::DeleteNestedCommand (IdTree& model,
                                                     const std::string& id,
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index b54a1d5acb..b51720df8a 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -199,6 +199,33 @@ namespace CSMWorld
         const NestedTableWrapperBase& getOld() const;
     };
 
+    class ModifyNestedCommand : public QUndoCommand, private NestedTableStoring
+    {
+            IdTree& mModel;
+
+            std::string mId;
+
+            int mNestedRow;
+
+            int mNestedColumn;
+
+            int mParentColumn;
+
+            QVariant mNew;
+
+            // The command to redo/undo the Modified status of a record
+            ModifyCommand *mModifyParentCommand;
+
+        public:
+
+            ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow, int nestedColumn,
+                int parentColumn, const QVariant& new_, QUndoCommand* parent = 0);
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+
     class DeleteNestedCommand : public QUndoCommand, private NestedTableStoring
     {
             IdTree& mModel;
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 3189f76ed9..814406a7c5 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -33,10 +33,10 @@ namespace CSMWorld
         std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
         for (;iter != pathgrid.mEdges.end(); ++iter)
         {
-            if ((*iter).mV0 >= position)
-                (*iter).mV0++;
-            if ((*iter).mV1 >= position)
-                (*iter).mV1++;
+            if (iter->mV0 >= position)
+                ++iter->mV0;
+            if (iter->mV1 >= position)
+                ++iter->mV1;
         }
 
         points.insert(points.begin()+position, point);
@@ -61,15 +61,20 @@ namespace CSMWorld
         std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
         for (; iter != pathgrid.mEdges.end();)
         {
-            if (((*iter).mV0 == rowToRemove) || ((*iter).mV1 == rowToRemove))
+            if (iter->mV0 == rowToRemove || iter->mV1 == rowToRemove)
+            {
+                if (static_cast<size_t>(iter->mV0) < points.size())
+                    --points[iter->mV0].mConnectionNum;
+
                 iter = pathgrid.mEdges.erase(iter);
+            }
             else
             {
-                if ((*iter).mV0 > rowToRemove)
-                    (*iter).mV0--;
+                if (iter->mV0 > rowToRemove)
+                    --iter->mV0;
 
-                if ((*iter).mV1 > rowToRemove)
-                    (*iter).mV1--;
+                if (iter->mV1 > rowToRemove)
+                    --iter->mV1;
 
                 ++iter;
             }
@@ -152,8 +157,13 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
+        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
         ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
 
+        // Can only add valid point indices
+        if (points.empty())
+            return;
+
         // blank row
         ESM::Pathgrid::Edge edge;
         edge.mV0 = 0;
@@ -164,7 +174,12 @@ namespace CSMWorld
         //
         // Currently the code assumes that the end user to know what he/she is doing.
         // e.g. Edges come in pairs, from points a->b and b->a
-        edges.insert(edges.begin()+position, edge);
+
+        // Even edges between the same node and itself need to be counted
+        ++points[edge.mV0].mConnectionNum;
+
+        // Edge needs to be ordered, since edge.mV0 is 0, add at start
+        edges.insert(edges.begin(), edge);
 
         record.setModified (pathgrid);
     }
@@ -173,11 +188,16 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
+        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
         ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
 
         if (rowToRemove < 0 || rowToRemove >= static_cast<int> (edges.size()))
             throw std::runtime_error ("index out of range");
 
+        ESM::Pathgrid::Edge& edge = edges[rowToRemove];
+        if (static_cast<size_t>(edge.mV0) < points.size())
+            --pathgrid.mPoints[edge.mV0].mConnectionNum;
+
         edges.erase(edges.begin()+rowToRemove);
 
         record.setModified (pathgrid);
@@ -188,8 +208,13 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
+        // Set points because point data (edge count) is tied to edges
+        pathgrid.mPoints =
+            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mPoints;
+        pathgrid.mData.mS2 =
+            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mData.mS2;
         pathgrid.mEdges =
-            static_cast<const NestedTableWrapper<ESM::Pathgrid::EdgeList> &>(nestedTable).mNestedTable;
+            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mEdges;
 
         record.setModified (pathgrid);
     }
@@ -197,7 +222,7 @@ namespace CSMWorld
     NestedTableWrapperBase* PathgridEdgeListAdapter::table(const Record<Pathgrid>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new NestedTableWrapper<ESM::Pathgrid::EdgeList>(record.get().mEdges);
+        return new PathgridPointsWrap(record.get());
     }
 
     QVariant PathgridEdgeListAdapter::getData(const Record<Pathgrid>& record,
@@ -224,20 +249,57 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (pathgrid.mEdges.size()))
+        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
+        ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
+
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (edges.size()))
             throw std::runtime_error ("index out of range");
 
+        // Point indices must exist
+        if (value.toInt() < 0 || value.toUInt() >= points.size())
+            return;
+
         ESM::Pathgrid::Edge edge = pathgrid.mEdges[subRowIndex];
         switch (subColIndex)
         {
             case 0: return; // return without saving
-            case 1: edge.mV0 = value.toInt(); break;
-            case 2: edge.mV1 = value.toInt(); break;
+            case 1:
+            {
+                edges.erase(edges.begin()+subRowIndex);
+
+                if (static_cast<size_t>(edge.mV0) < points.size())
+                    --points[edge.mV0].mConnectionNum;
+
+                edge.mV0 = value.toInt();
+
+                // Place in correct order
+                if (static_cast<size_t>(edge.mV0) < points.size())
+                    ++points[edge.mV0].mConnectionNum;
+
+                ESM::Pathgrid::EdgeList::iterator it = edges.begin();
+                for (; it != edges.end(); ++it)
+                {
+                    if (edge.mV0 <= it->mV0)
+                    {
+                        edges.insert(it, edge);
+                        break;
+                    }
+                }
+
+                if (it == edges.end())
+                    edges.push_back(edge);
+
+                break;
+            }
+            case 2:
+
+                edge.mV1 = value.toInt();
+                edges[subRowIndex] = edge;
+                break;
+
             default: throw std::runtime_error("Pathgrid edge subcolumn index out of range");
         }
 
-        pathgrid.mEdges[subRowIndex] = edge;
-
         record.setModified (pathgrid);
     }
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 368fde5ee8..939558be96 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -254,7 +254,6 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
-            int recordIndex = mPathgridCollection.getIndex (mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -266,14 +265,13 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
-            QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
 
             // Add node
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn, posX));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn, posY));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn, posZ));
         }
         else
         {
@@ -293,9 +291,9 @@ namespace CSVRender
             int offsetY = static_cast<int>(localCoords.y());
             int offsetZ = static_cast<int>(localCoords.z());
 
-            QAbstractItemModel* model = mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids);
+            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
+                CSMWorld::UniversalId::Type_Pathgrids));
 
-            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -307,20 +305,18 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
-            QModelIndex parent = model->index(recordIndex, parentColumn);
-
             for (size_t i = 0; i < mSelected.size(); ++i)
             {
                 const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
                 int row = static_cast<int>(mSelected[i]);
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn,
                     clampToCell(point.mX + offsetX)));
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn,
                     clampToCell(point.mY + offsetY)));
 
-                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn,
                     clampToCell(point.mZ + offsetZ)));
             }
         }
@@ -564,7 +560,6 @@ namespace CSVRender
         CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
             CSMWorld::UniversalId::Type_Pathgrids));
 
-        int recordIndex = mPathgridCollection.getIndex(mId);
         int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
         int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -573,22 +568,19 @@ namespace CSVRender
         int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
             CSMWorld::Columns::ColumnId_PathgridEdge1);
 
-        QModelIndex parent = model->index(recordIndex, parentColumn);
-        int row = static_cast<int>(source.mEdges.size());
-
         if (edgeExists(source, node1, node2) == -1)
         {
-            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node1));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node2));
-            ++row;
+            // Set first edge last since that reorders the edge list
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node2));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node1));
         }
 
         if (edgeExists(source, node2, node1) == -1)
         {
-            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node2));
-            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node1));
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node1));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node2));
         }
     }
 

From 774e1497b6b058cc103af6426b883d94860e48e0 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 23 May 2016 15:51:36 -0400
Subject: [PATCH 649/765] Fix editor undo for nested data.

---
 apps/opencs/model/world/commands.cpp | 96 +++++++++++++++++-----------
 apps/opencs/model/world/commands.hpp | 15 ++---
 apps/opencs/view/render/pathgrid.cpp | 28 +++++---
 3 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index b48d6eba2c..308b5386e0 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -17,7 +17,13 @@
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
-    : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
+    : QUndoCommand (parent)
+    , mModel (&model)
+    , mIndex (index)
+    , mNew (new_)
+    , mHasRecordState(false)
+    , mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
+    , mModifyNestedCommand(0)
 {
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
     {
@@ -28,40 +34,57 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
 
     if (mIndex.parent().isValid())
     {
-        setText ("Modify " + dynamic_cast<CSMWorld::IdTree*>(mModel)->nestedHeaderData (
-                    mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+        IdTree& tree = static_cast<CSMWorld::IdTree&>(*mModel);
+
+        mModifyNestedCommand = new ModifyNestedCommand(tree, mIndex, new_, this);
+        setText(mModifyNestedCommand->text());
     }
     else
     {
         setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
-    }
 
-    // Remember record state before the modification
-    if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
-    {
-        mHasRecordState = true;
-        int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
-
-        int rowIndex = mIndex.row();
-        if (mIndex.parent().isValid())
+        // Remember record state before the modification
+        if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
         {
-            rowIndex = mIndex.parent().row();
-        }
+            mHasRecordState = true;
+            int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
 
-        mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
-        mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
+            int rowIndex = mIndex.row();
+            if (mIndex.parent().isValid())
+            {
+                rowIndex = mIndex.parent().row();
+            }
+
+            mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
+            mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
+        }
     }
 }
 
 void CSMWorld::ModifyCommand::redo()
 {
-    mOld = mModel->data (mIndex, Qt::EditRole);
-    mModel->setData (mIndex, mNew);
+    if (mModifyNestedCommand)
+    {
+        mModifyNestedCommand->redo();
+    }
+    else
+    {
+        mOld = mModel->data (mIndex, Qt::EditRole);
+        mModel->setData (mIndex, mNew);
+    }
 }
 
 void CSMWorld::ModifyCommand::undo()
 {
-    mModel->setData (mIndex, mOld);
+    if (mModifyNestedCommand)
+    {
+        mModifyNestedCommand->undo();
+    }
+    else
+    {
+        mModel->setData (mIndex, mOld);
+    }
+
     if (mHasRecordState)
     {
         mModel->setData(mRecordStateIndex, mOldRecordState);
@@ -301,37 +324,29 @@ void CSMWorld::UpdateCellCommand::undo()
     mModel.setData (mIndex, mOld);
 }
 
-CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow,
-    int nestedColumn, int parentColumn, const QVariant& new_, QUndoCommand* parent)
+CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const QModelIndex& index, const QVariant& new_,
+    QUndoCommand* parent)
     : QUndoCommand(parent)
-    , NestedTableStoring(model, id, parentColumn)
+    , NestedTableStoring(model, index.parent())
     , mModel(model)
-    , mId(id)
-    , mNestedRow(nestedRow)
-    , mNestedColumn(nestedColumn)
-    , mParentColumn(parentColumn)
+    , mIndex(index)
     , mNew(new_)
 {
-    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
-    setText (("Modify " + title + " sub-table of " + mId).c_str());
+    setText("Modify " + model.nestedHeaderData(mIndex.parent().column(), mIndex.column(), Qt::Horizontal,
+        Qt::DisplayRole).toString());
 
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
+    mModifyParentCommand = new ModifyCommand(mModel, mIndex.parent(), mIndex.parent().data(Qt::EditRole), this);
 }
 
 void CSMWorld::ModifyNestedCommand::redo()
 {
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    QModelIndex nestedIndex = mModel.index(mNestedRow, mNestedColumn, parentIndex);
-    mModel.setData(nestedIndex, mNew);
+    mModel.setData(mIndex, mNew);
     mModifyParentCommand->redo();
 }
 
-
 void CSMWorld::ModifyNestedCommand::undo()
 {
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModel.setNestedTable(parentIndex, getOld());
+    mModel.setNestedTable(mIndex.parent(), getOld());
     mModifyParentCommand->undo();
 }
 
@@ -402,7 +417,14 @@ void CSMWorld::AddNestedCommand::undo()
 }
 
 CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn)
-    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn))) {}
+    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn)))
+{
+}
+
+CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const QModelIndex& parentIndex)
+    : mOld(model.nestedTable(parentIndex))
+{
+}
 
 CSMWorld::NestedTableStoring::~NestedTableStoring()
 {
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index b51720df8a..d0aed97c70 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -23,6 +23,7 @@ namespace CSMWorld
     class IdTree;
     struct RecordBase;
     struct NestedTableWrapperBase;
+    class ModifyNestedCommand;
 
     class ModifyCommand : public QUndoCommand
     {
@@ -35,6 +36,8 @@ namespace CSMWorld
             QModelIndex mRecordStateIndex;
             CSMWorld::RecordBase::State mOldRecordState;
 
+            ModifyNestedCommand* mModifyNestedCommand;
+
         public:
 
             ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
@@ -191,6 +194,7 @@ namespace CSMWorld
 
     public:
         NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn);
+        NestedTableStoring(const IdTree& model, const QModelIndex& parentIndex);
 
         ~NestedTableStoring();
 
@@ -203,13 +207,7 @@ namespace CSMWorld
     {
             IdTree& mModel;
 
-            std::string mId;
-
-            int mNestedRow;
-
-            int mNestedColumn;
-
-            int mParentColumn;
+            QModelIndex mIndex;
 
             QVariant mNew;
 
@@ -218,8 +216,7 @@ namespace CSMWorld
 
         public:
 
-            ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow, int nestedColumn,
-                int parentColumn, const QVariant& new_, QUndoCommand* parent = 0);
+            ModifyNestedCommand (IdTree& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent = 0);
 
             virtual void redo();
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 939558be96..b3b582b7a1 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -254,6 +254,7 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
+            int recordIndex = mPathgridCollection.getIndex (mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -265,13 +266,14 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
+            QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
 
             // Add node
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn, posX));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn, posY));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn, posZ));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posXColumn, parent), posX));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posYColumn, parent), posY));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posZColumn, parent), posZ));
         }
         else
         {
@@ -294,6 +296,7 @@ namespace CSVRender
             CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
                 CSMWorld::UniversalId::Type_Pathgrids));
 
+            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -305,18 +308,20 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
             for (size_t i = 0; i < mSelected.size(); ++i)
             {
                 const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
                 int row = static_cast<int>(mSelected[i]);
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posXColumn, parent),
                     clampToCell(point.mX + offsetX)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posYColumn, parent),
                     clampToCell(point.mY + offsetY)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posZColumn, parent),
                     clampToCell(point.mZ + offsetZ)));
             }
         }
@@ -560,6 +565,7 @@ namespace CSVRender
         CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
             CSMWorld::UniversalId::Type_Pathgrids));
 
+        int recordIndex = mPathgridCollection.getIndex(mId);
         int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
         int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -568,19 +574,21 @@ namespace CSVRender
         int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
             CSMWorld::Columns::ColumnId_PathgridEdge1);
 
+        QModelIndex parent = model->index(recordIndex, parentColumn);
+
         if (edgeExists(source, node1, node2) == -1)
         {
             // Set first edge last since that reorders the edge list
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node2));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node1));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge1Column, parent), node2));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge0Column, parent), node1));
         }
 
         if (edgeExists(source, node2, node1) == -1)
         {
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node1));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node2));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge1Column, parent), node1));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge0Column, parent), node2));
         }
     }
 

From 18897348d7ad245bfc1ce1d5f3ed18fd5f2d5e9e Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 24 May 2016 01:12:46 -0400
Subject: [PATCH 650/765] Fix weapon values not being properly set in editor.

---
 apps/opencs/model/world/refidadapterimp.cpp | 31 +++++++++++++--------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index 7885bf5958..5f48b4315e 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1440,26 +1440,28 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
     Record<ESM::Weapon>& record = static_cast<Record<ESM::Weapon>&> (
         data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Weapon)));
 
+    ESM::Weapon weapon = record.get();
+
     if (column==mColumns.mType)
-        record.get().mData.mType = value.toInt();
+        weapon.mData.mType = value.toInt();
     else if (column==mColumns.mHealth)
-        record.get().mData.mHealth = value.toInt();
+        weapon.mData.mHealth = value.toInt();
     else if (column==mColumns.mSpeed)
-        record.get().mData.mSpeed = value.toFloat();
+        weapon.mData.mSpeed = value.toFloat();
     else if (column==mColumns.mReach)
-        record.get().mData.mReach = value.toFloat();
+        weapon.mData.mReach = value.toFloat();
     else if (column==mColumns.mChop[0])
-        record.get().mData.mChop[0] = value.toInt();
+        weapon.mData.mChop[0] = value.toInt();
     else if (column==mColumns.mChop[1])
-        record.get().mData.mChop[1] = value.toInt();
+        weapon.mData.mChop[1] = value.toInt();
     else if (column==mColumns.mSlash[0])
-        record.get().mData.mSlash[0] = value.toInt();
+        weapon.mData.mSlash[0] = value.toInt();
     else if (column==mColumns.mSlash[1])
-        record.get().mData.mSlash[1] = value.toInt();
+        weapon.mData.mSlash[1] = value.toInt();
     else if (column==mColumns.mThrust[0])
-        record.get().mData.mThrust[0] = value.toInt();
+        weapon.mData.mThrust[0] = value.toInt();
     else if (column==mColumns.mThrust[1])
-        record.get().mData.mThrust[1] = value.toInt();
+        weapon.mData.mThrust[1] = value.toInt();
     else
     {
         std::map<const RefIdColumn *, unsigned int>::const_iterator iter =
@@ -1468,11 +1470,16 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
         if (iter!=mColumns.mFlags.end())
         {
             if (value.toInt()!=0)
-                record.get().mData.mFlags |= iter->second;
+                weapon.mData.mFlags |= iter->second;
             else
-                record.get().mData.mFlags &= ~iter->second;
+                weapon.mData.mFlags &= ~iter->second;
         }
         else
+        {
             EnchantableRefIdAdapter<ESM::Weapon>::setData (column, data, index, value);
+            return; // Don't overwrite changes made by base class
+        }
     }
+
+    record.setModified(weapon);
 }

From 3f1df4caa69d48b0dad31dee4a741e7c03e7dc1b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 24 May 2016 13:21:43 +0200
Subject: [PATCH 651/765] Don't auto-equip ammunition (Fixes #3401)

---
 apps/openmw/mwworld/inventorystore.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 318b7c5ec9..08436b2386 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -255,6 +255,9 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
                 // Equipping weapons is handled by AiCombat. Anything else (lockpicks, probes) can't be used by NPCs anyway (yet)
                 continue;
 
+            if (iter.getType() == MWWorld::ContainerStore::Type_Weapon)
+                continue;
+
             if (slots_.at (*iter2)!=end())
             {
                 Ptr old = *slots_.at (*iter2);

From 5eaaed05fc0ad2bb66233bfb3450efb456dbfcf1 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 24 May 2016 17:31:00 -0400
Subject: [PATCH 652/765] Improve mouse pick culling.

---
 apps/opencs/view/render/worldspacewidget.cpp | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 1859401dc0..f8c3af2bba 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -1,7 +1,6 @@
 #include "worldspacewidget.hpp"
 
 #include <algorithm>
-#include <iostream>
 
 #include <QEvent>
 #include <QDragEnterEvent>
@@ -333,9 +332,20 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     int x = localPos.x();
     int y = height() - localPos.y();
 
+    // Convert from screen space to world space
+    osg::Matrixd wpvMat;
+    wpvMat.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
+    wpvMat.preMult (mView->getCamera()->getProjectionMatrix());
+    wpvMat.preMult (mView->getCamera()->getViewMatrix());
+    wpvMat = osg::Matrixd::inverse (wpvMat);
+
+    osg::Vec3d start = wpvMat.preMult (osg::Vec3d(x, y, 0));
+    osg::Vec3d end = wpvMat.preMult (osg::Vec3d(x, y, 1));
+    osg::Vec3d direction = end - start;
+
     // Get intersection
     osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(
-        osgUtil::Intersector::WINDOW, x, y));
+        osgUtil::Intersector::MODEL, start, end));
 
     intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::NO_LIMIT);
     osgUtil::IntersectionVisitor visitor(intersector);
@@ -351,10 +361,10 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
         osgUtil::LineSegmentIntersector::Intersection intersection = *it;
 
         // reject back-facing polygons
-        osg::Vec3f normal = intersection.getWorldIntersectNormal();
-        normal = osg::Matrix::transform3x3(normal, mView->getCamera()->getViewMatrix());
-        if (normal.z() < 0)
+        if (direction * intersection.getWorldIntersectNormal() > 0)
+        {
             continue;
+        }
 
         for (std::vector<osg::Node*>::iterator it = intersection.nodePath.begin(); it != intersection.nodePath.end(); ++it)
         {
@@ -384,16 +394,6 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     }
 
     // Default placement
-    osg::Matrixd matrix;
-    matrix.preMult (mView->getCamera()->getViewport()->computeWindowMatrix());
-    matrix.preMult (mView->getCamera()->getProjectionMatrix());
-    matrix.preMult (mView->getCamera()->getViewMatrix());
-    matrix = osg::Matrixd::inverse (matrix);
-
-    osg::Vec3d start = matrix.preMult (intersector->getStart());
-    osg::Vec3d end = matrix.preMult (intersector->getEnd());
-
-    osg::Vec3d direction = end - start;
     direction.normalize();
     direction *= CSMPrefs::get()["Scene Drops"]["distance"].toInt();
 

From cc4655e9c7f2b54edd58a179513bd7b8f9957b91 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 24 May 2016 18:19:05 -0400
Subject: [PATCH 653/765] Cleanup and slight change to pathgrid editing
 controls. Now that there is a drag indicator, it is easy to tell if an
 operation is active or not.

---
 apps/opencs/model/world/commands.cpp              | 6 +-----
 apps/opencs/model/world/nestedcoladapterimp.cpp   | 3 ++-
 apps/opencs/view/render/pagedworldspacewidget.cpp | 2 +-
 apps/opencs/view/render/pathgridmode.cpp          | 6 ++++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 308b5386e0..d53d3f17cd 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -36,6 +36,7 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
     {
         IdTree& tree = static_cast<CSMWorld::IdTree&>(*mModel);
 
+        // ModifyNestedCommand will add its own command to change the modify status if needed
         mModifyNestedCommand = new ModifyNestedCommand(tree, mIndex, new_, this);
         setText(mModifyNestedCommand->text());
     }
@@ -48,12 +49,7 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
         {
             mHasRecordState = true;
             int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
-
             int rowIndex = mIndex.row();
-            if (mIndex.parent().isValid())
-            {
-                rowIndex = mIndex.parent().row();
-            }
 
             mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
             mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 814406a7c5..1fad55329d 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -265,6 +265,7 @@ namespace CSMWorld
             case 0: return; // return without saving
             case 1:
             {
+                // Remove current and add new while adjusting each points connection count
                 edges.erase(edges.begin()+subRowIndex);
 
                 if (static_cast<size_t>(edge.mV0) < points.size())
@@ -272,10 +273,10 @@ namespace CSMWorld
 
                 edge.mV0 = value.toInt();
 
-                // Place in correct order
                 if (static_cast<size_t>(edge.mV0) < points.size())
                     ++points[edge.mV0].mConnectionNum;
 
+                // Place in correct order
                 ESM::Pathgrid::EdgeList::iterator it = edges.begin();
                 for (; it != edges.end(); ++it)
                 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index a01df43926..1dba1306e4 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -332,7 +332,7 @@ void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelInd
 
 void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
 {
-   const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
     if (!parent.isValid())
     {
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index a4ab394970..fc16d7d993 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -131,9 +131,10 @@ namespace CSVRender
         if (!selection.empty())
         {
             mDragMode = DragMode_Move;
+            return true;
         }
 
-        return true;
+        return false;
     }
 
     bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
@@ -148,10 +149,11 @@ namespace CSVRender
                 mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
 
                 tag->getPathgrid()->setupConnectionIndicator(mFromNode);
+                return true;
             }
         }
 
-        return true;
+        return false;
     }
 
     void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)

From 56548b384d692184ac8cc4fdef9531390ad5c569 Mon Sep 17 00:00:00 2001
From: makson96 <makson96@gmail.com>
Date: Wed, 25 May 2016 00:41:36 +0200
Subject: [PATCH 654/765] Include FindPkgMacros to use make_library_set

In CMakList.txt there is make_library_set and macro for it is defined in FindPkgMacros, so FindPkgMacros needs to be imported to avoid Error: Unknown CMake command "make_library_set".
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516ec48fad..4d94f79f0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,6 +221,7 @@ if(OSG_STATIC)
 
       # For now, users wishing to do a static build will need to pass the path to where the plugins reside
       # More clever logic would need to deduce the path, probably installed under <OpenSceneGraph>/lib/osgPlugins-<X.X.X>
+      include(FindPkgMacros)
       find_library(${PLUGIN_NAME}_LIBRARY_REL NAMES ${PLUGIN_NAME} HINTS ${OSG_PLUGIN_LIB_SEARCH_PATH})
       find_library(${PLUGIN_NAME}_LIBRARY_DBG NAMES ${PLUGIN_NAME_DBG} HINTS ${OSG_PLUGIN_LIB_SEARCH_PATH})
       make_library_set(${PLUGIN_NAME}_LIBRARY)

From 5d4f58c82842f03a8f44a2caaa9a64c99a0bd9d8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 25 May 2016 21:37:56 +0200
Subject: [PATCH 655/765] Fix being unable to activate objects when scripts are
 disabled

The if statement was a leftover of the previous activate implementation and is no longer needed.
---
 apps/openmw/mwworld/worldimp.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b3643cafc0..f2a03b876a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3178,13 +3178,10 @@ namespace MWWorld
     {
         breakInvisibility(actor);
 
-        if (mScriptsEnabled)
+        if (object.getRefData().activate())
         {
-            if (object.getRefData().activate())
-            {
-                boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
-                action->execute (actor);
-            }
+            boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
+            action->execute (actor);
         }
     }
 

From a2153a62131e7f100886df6761e4d9b8f561027c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 25 May 2016 21:41:05 +0200
Subject: [PATCH 656/765] Remove outdated comment

---
 apps/openmw/mwworld/worldimp.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f2a03b876a..22a8daa9bf 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3189,8 +3189,6 @@ namespace MWWorld
     {
         bool operator() (Ptr ptr)
         {
-            // Can't reset actors that were moved to a different cell, because we don't know what cell they came from.
-            // This could be fixed once we properly track actor cell changes, but may not be desirable behaviour anyhow.
             if (ptr.getClass().isActor() && ptr.getCellRef().hasContentFile())
             {
                 const ESM::Position& origPos = ptr.getCellRef().getPosition();

From bb81e89c08498130f5605424515d6fd99990df27 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 25 May 2016 22:48:43 -0400
Subject: [PATCH 657/765] Revert "Cleanup and slight change to pathgrid editing
 controls."

This reverts commit cc4655e9c7f2b54edd58a179513bd7b8f9957b91.
---
 apps/opencs/model/world/commands.cpp              | 6 +++++-
 apps/opencs/model/world/nestedcoladapterimp.cpp   | 3 +--
 apps/opencs/view/render/pagedworldspacewidget.cpp | 2 +-
 apps/opencs/view/render/pathgridmode.cpp          | 6 ++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index d53d3f17cd..308b5386e0 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -36,7 +36,6 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
     {
         IdTree& tree = static_cast<CSMWorld::IdTree&>(*mModel);
 
-        // ModifyNestedCommand will add its own command to change the modify status if needed
         mModifyNestedCommand = new ModifyNestedCommand(tree, mIndex, new_, this);
         setText(mModifyNestedCommand->text());
     }
@@ -49,7 +48,12 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
         {
             mHasRecordState = true;
             int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
+
             int rowIndex = mIndex.row();
+            if (mIndex.parent().isValid())
+            {
+                rowIndex = mIndex.parent().row();
+            }
 
             mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
             mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 1fad55329d..814406a7c5 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -265,7 +265,6 @@ namespace CSMWorld
             case 0: return; // return without saving
             case 1:
             {
-                // Remove current and add new while adjusting each points connection count
                 edges.erase(edges.begin()+subRowIndex);
 
                 if (static_cast<size_t>(edge.mV0) < points.size())
@@ -273,10 +272,10 @@ namespace CSMWorld
 
                 edge.mV0 = value.toInt();
 
+                // Place in correct order
                 if (static_cast<size_t>(edge.mV0) < points.size())
                     ++points[edge.mV0].mConnectionNum;
 
-                // Place in correct order
                 ESM::Pathgrid::EdgeList::iterator it = edges.begin();
                 for (; it != edges.end(); ++it)
                 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 1dba1306e4..a01df43926 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -332,7 +332,7 @@ void CSVRender::PagedWorldspaceWidget::pathgridAboutToBeRemoved (const QModelInd
 
 void CSVRender::PagedWorldspaceWidget::pathgridAdded(const QModelIndex& parent, int start, int end)
 {
-    const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
+   const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids = mDocument.getData().getPathgrids();
 
     if (!parent.isValid())
     {
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index fc16d7d993..a4ab394970 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -131,10 +131,9 @@ namespace CSVRender
         if (!selection.empty())
         {
             mDragMode = DragMode_Move;
-            return true;
         }
 
-        return false;
+        return true;
     }
 
     bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
@@ -149,11 +148,10 @@ namespace CSVRender
                 mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
 
                 tag->getPathgrid()->setupConnectionIndicator(mFromNode);
-                return true;
             }
         }
 
-        return false;
+        return true;
     }
 
     void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)

From ec90da731c34f697e8c8f1e77522333556a1fd56 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 25 May 2016 22:52:02 -0400
Subject: [PATCH 658/765] Redo slight change to pathgrid editing controls, lost
 in revert

---
 apps/opencs/view/render/pathgridmode.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index a4ab394970..fc16d7d993 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -131,9 +131,10 @@ namespace CSVRender
         if (!selection.empty())
         {
             mDragMode = DragMode_Move;
+            return true;
         }
 
-        return true;
+        return false;
     }
 
     bool PathgridMode::secondaryEditStartDrag(const QPoint& pos)
@@ -148,10 +149,11 @@ namespace CSVRender
                 mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
 
                 tag->getPathgrid()->setupConnectionIndicator(mFromNode);
+                return true;
             }
         }
 
-        return true;
+        return false;
     }
 
     void PathgridMode::drag(const QPoint& pos, int diffX, int diffY, double speedFactor)

From 9a567b3712c9a9575f03266884cbeece5c2764b5 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 25 May 2016 22:52:41 -0400
Subject: [PATCH 659/765] Revert "Fix editor undo for nested data."

This reverts commit 774e1497b6b058cc103af6426b883d94860e48e0.
---
 apps/opencs/model/world/commands.cpp | 96 +++++++++++-----------------
 apps/opencs/model/world/commands.hpp | 15 +++--
 apps/opencs/view/render/pathgrid.cpp | 28 +++-----
 3 files changed, 56 insertions(+), 83 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 308b5386e0..b48d6eba2c 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -17,13 +17,7 @@
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
-    : QUndoCommand (parent)
-    , mModel (&model)
-    , mIndex (index)
-    , mNew (new_)
-    , mHasRecordState(false)
-    , mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
-    , mModifyNestedCommand(0)
+    : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
     {
@@ -34,57 +28,40 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
 
     if (mIndex.parent().isValid())
     {
-        IdTree& tree = static_cast<CSMWorld::IdTree&>(*mModel);
-
-        mModifyNestedCommand = new ModifyNestedCommand(tree, mIndex, new_, this);
-        setText(mModifyNestedCommand->text());
+        setText ("Modify " + dynamic_cast<CSMWorld::IdTree*>(mModel)->nestedHeaderData (
+                    mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
     }
     else
     {
         setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+    }
 
-        // Remember record state before the modification
-        if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
+    // Remember record state before the modification
+    if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
+    {
+        mHasRecordState = true;
+        int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
+
+        int rowIndex = mIndex.row();
+        if (mIndex.parent().isValid())
         {
-            mHasRecordState = true;
-            int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
-
-            int rowIndex = mIndex.row();
-            if (mIndex.parent().isValid())
-            {
-                rowIndex = mIndex.parent().row();
-            }
-
-            mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
-            mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
+            rowIndex = mIndex.parent().row();
         }
+
+        mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
+        mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
     }
 }
 
 void CSMWorld::ModifyCommand::redo()
 {
-    if (mModifyNestedCommand)
-    {
-        mModifyNestedCommand->redo();
-    }
-    else
-    {
-        mOld = mModel->data (mIndex, Qt::EditRole);
-        mModel->setData (mIndex, mNew);
-    }
+    mOld = mModel->data (mIndex, Qt::EditRole);
+    mModel->setData (mIndex, mNew);
 }
 
 void CSMWorld::ModifyCommand::undo()
 {
-    if (mModifyNestedCommand)
-    {
-        mModifyNestedCommand->undo();
-    }
-    else
-    {
-        mModel->setData (mIndex, mOld);
-    }
-
+    mModel->setData (mIndex, mOld);
     if (mHasRecordState)
     {
         mModel->setData(mRecordStateIndex, mOldRecordState);
@@ -324,29 +301,37 @@ void CSMWorld::UpdateCellCommand::undo()
     mModel.setData (mIndex, mOld);
 }
 
-CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const QModelIndex& index, const QVariant& new_,
-    QUndoCommand* parent)
+CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow,
+    int nestedColumn, int parentColumn, const QVariant& new_, QUndoCommand* parent)
     : QUndoCommand(parent)
-    , NestedTableStoring(model, index.parent())
+    , NestedTableStoring(model, id, parentColumn)
     , mModel(model)
-    , mIndex(index)
+    , mId(id)
+    , mNestedRow(nestedRow)
+    , mNestedColumn(nestedColumn)
+    , mParentColumn(parentColumn)
     , mNew(new_)
 {
-    setText("Modify " + model.nestedHeaderData(mIndex.parent().column(), mIndex.column(), Qt::Horizontal,
-        Qt::DisplayRole).toString());
+    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
+    setText (("Modify " + title + " sub-table of " + mId).c_str());
 
-    mModifyParentCommand = new ModifyCommand(mModel, mIndex.parent(), mIndex.parent().data(Qt::EditRole), this);
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
 }
 
 void CSMWorld::ModifyNestedCommand::redo()
 {
-    mModel.setData(mIndex, mNew);
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    QModelIndex nestedIndex = mModel.index(mNestedRow, mNestedColumn, parentIndex);
+    mModel.setData(nestedIndex, mNew);
     mModifyParentCommand->redo();
 }
 
+
 void CSMWorld::ModifyNestedCommand::undo()
 {
-    mModel.setNestedTable(mIndex.parent(), getOld());
+    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+    mModel.setNestedTable(parentIndex, getOld());
     mModifyParentCommand->undo();
 }
 
@@ -417,14 +402,7 @@ void CSMWorld::AddNestedCommand::undo()
 }
 
 CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn)
-    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn)))
-{
-}
-
-CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const QModelIndex& parentIndex)
-    : mOld(model.nestedTable(parentIndex))
-{
-}
+    : mOld(model.nestedTable(model.getModelIndex(id, parentColumn))) {}
 
 CSMWorld::NestedTableStoring::~NestedTableStoring()
 {
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index d0aed97c70..b51720df8a 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -23,7 +23,6 @@ namespace CSMWorld
     class IdTree;
     struct RecordBase;
     struct NestedTableWrapperBase;
-    class ModifyNestedCommand;
 
     class ModifyCommand : public QUndoCommand
     {
@@ -36,8 +35,6 @@ namespace CSMWorld
             QModelIndex mRecordStateIndex;
             CSMWorld::RecordBase::State mOldRecordState;
 
-            ModifyNestedCommand* mModifyNestedCommand;
-
         public:
 
             ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
@@ -194,7 +191,6 @@ namespace CSMWorld
 
     public:
         NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn);
-        NestedTableStoring(const IdTree& model, const QModelIndex& parentIndex);
 
         ~NestedTableStoring();
 
@@ -207,7 +203,13 @@ namespace CSMWorld
     {
             IdTree& mModel;
 
-            QModelIndex mIndex;
+            std::string mId;
+
+            int mNestedRow;
+
+            int mNestedColumn;
+
+            int mParentColumn;
 
             QVariant mNew;
 
@@ -216,7 +218,8 @@ namespace CSMWorld
 
         public:
 
-            ModifyNestedCommand (IdTree& model, const QModelIndex& index, const QVariant& new_, QUndoCommand* parent = 0);
+            ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow, int nestedColumn,
+                int parentColumn, const QVariant& new_, QUndoCommand* parent = 0);
 
             virtual void redo();
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index b3b582b7a1..939558be96 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -254,7 +254,6 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
-            int recordIndex = mPathgridCollection.getIndex (mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -266,14 +265,13 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
-            QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
 
             // Add node
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posXColumn, parent), posX));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posYColumn, parent), posY));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posZColumn, parent), posZ));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn, posX));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn, posY));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn, posZ));
         }
         else
         {
@@ -296,7 +294,6 @@ namespace CSVRender
             CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
                 CSMWorld::UniversalId::Type_Pathgrids));
 
-            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -308,20 +305,18 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
-            QModelIndex parent = model->index(recordIndex, parentColumn);
-
             for (size_t i = 0; i < mSelected.size(); ++i)
             {
                 const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
                 int row = static_cast<int>(mSelected[i]);
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posXColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn,
                     clampToCell(point.mX + offsetX)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posYColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn,
                     clampToCell(point.mY + offsetY)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(row, posZColumn, parent),
+                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn,
                     clampToCell(point.mZ + offsetZ)));
             }
         }
@@ -565,7 +560,6 @@ namespace CSVRender
         CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
             CSMWorld::UniversalId::Type_Pathgrids));
 
-        int recordIndex = mPathgridCollection.getIndex(mId);
         int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
         int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -574,21 +568,19 @@ namespace CSVRender
         int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
             CSMWorld::Columns::ColumnId_PathgridEdge1);
 
-        QModelIndex parent = model->index(recordIndex, parentColumn);
-
         if (edgeExists(source, node1, node2) == -1)
         {
             // Set first edge last since that reorders the edge list
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge1Column, parent), node2));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge0Column, parent), node1));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node2));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node1));
         }
 
         if (edgeExists(source, node2, node1) == -1)
         {
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge1Column, parent), node1));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, model->index(0, edge0Column, parent), node2));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node1));
+            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node2));
         }
     }
 

From 239727531fa228ab95e6b84b3ff373cb0a167d9d Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 25 May 2016 22:53:17 -0400
Subject: [PATCH 660/765] Revert "Fix data corruption issues."

This reverts commit 6199663bd84c50366ba046545fe4f2de0b093b0a.
---
 apps/opencs/model/world/commands.cpp          | 34 -------
 apps/opencs/model/world/commands.hpp          | 27 ------
 .../model/world/nestedcoladapterimp.cpp       | 96 ++++---------------
 apps/opencs/view/render/pathgrid.cpp          | 38 +++++---
 4 files changed, 40 insertions(+), 155 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index b48d6eba2c..5f94223765 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -301,40 +301,6 @@ void CSMWorld::UpdateCellCommand::undo()
     mModel.setData (mIndex, mOld);
 }
 
-CSMWorld::ModifyNestedCommand::ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow,
-    int nestedColumn, int parentColumn, const QVariant& new_, QUndoCommand* parent)
-    : QUndoCommand(parent)
-    , NestedTableStoring(model, id, parentColumn)
-    , mModel(model)
-    , mId(id)
-    , mNestedRow(nestedRow)
-    , mNestedColumn(nestedColumn)
-    , mParentColumn(parentColumn)
-    , mNew(new_)
-{
-    std::string title = model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
-    setText (("Modify " + title + " sub-table of " + mId).c_str());
-
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
-}
-
-void CSMWorld::ModifyNestedCommand::redo()
-{
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    QModelIndex nestedIndex = mModel.index(mNestedRow, mNestedColumn, parentIndex);
-    mModel.setData(nestedIndex, mNew);
-    mModifyParentCommand->redo();
-}
-
-
-void CSMWorld::ModifyNestedCommand::undo()
-{
-    QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
-    mModel.setNestedTable(parentIndex, getOld());
-    mModifyParentCommand->undo();
-}
-
 
 CSMWorld::DeleteNestedCommand::DeleteNestedCommand (IdTree& model,
                                                     const std::string& id,
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index b51720df8a..b54a1d5acb 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -199,33 +199,6 @@ namespace CSMWorld
         const NestedTableWrapperBase& getOld() const;
     };
 
-    class ModifyNestedCommand : public QUndoCommand, private NestedTableStoring
-    {
-            IdTree& mModel;
-
-            std::string mId;
-
-            int mNestedRow;
-
-            int mNestedColumn;
-
-            int mParentColumn;
-
-            QVariant mNew;
-
-            // The command to redo/undo the Modified status of a record
-            ModifyCommand *mModifyParentCommand;
-
-        public:
-
-            ModifyNestedCommand (IdTree& model, const std::string& id, int nestedRow, int nestedColumn,
-                int parentColumn, const QVariant& new_, QUndoCommand* parent = 0);
-
-            virtual void redo();
-
-            virtual void undo();
-    };
-
     class DeleteNestedCommand : public QUndoCommand, private NestedTableStoring
     {
             IdTree& mModel;
diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 814406a7c5..3189f76ed9 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -33,10 +33,10 @@ namespace CSMWorld
         std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
         for (;iter != pathgrid.mEdges.end(); ++iter)
         {
-            if (iter->mV0 >= position)
-                ++iter->mV0;
-            if (iter->mV1 >= position)
-                ++iter->mV1;
+            if ((*iter).mV0 >= position)
+                (*iter).mV0++;
+            if ((*iter).mV1 >= position)
+                (*iter).mV1++;
         }
 
         points.insert(points.begin()+position, point);
@@ -61,20 +61,15 @@ namespace CSMWorld
         std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
         for (; iter != pathgrid.mEdges.end();)
         {
-            if (iter->mV0 == rowToRemove || iter->mV1 == rowToRemove)
-            {
-                if (static_cast<size_t>(iter->mV0) < points.size())
-                    --points[iter->mV0].mConnectionNum;
-
+            if (((*iter).mV0 == rowToRemove) || ((*iter).mV1 == rowToRemove))
                 iter = pathgrid.mEdges.erase(iter);
-            }
             else
             {
-                if (iter->mV0 > rowToRemove)
-                    --iter->mV0;
+                if ((*iter).mV0 > rowToRemove)
+                    (*iter).mV0--;
 
-                if (iter->mV1 > rowToRemove)
-                    --iter->mV1;
+                if ((*iter).mV1 > rowToRemove)
+                    (*iter).mV1--;
 
                 ++iter;
             }
@@ -157,13 +152,8 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
-        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
         ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
 
-        // Can only add valid point indices
-        if (points.empty())
-            return;
-
         // blank row
         ESM::Pathgrid::Edge edge;
         edge.mV0 = 0;
@@ -174,12 +164,7 @@ namespace CSMWorld
         //
         // Currently the code assumes that the end user to know what he/she is doing.
         // e.g. Edges come in pairs, from points a->b and b->a
-
-        // Even edges between the same node and itself need to be counted
-        ++points[edge.mV0].mConnectionNum;
-
-        // Edge needs to be ordered, since edge.mV0 is 0, add at start
-        edges.insert(edges.begin(), edge);
+        edges.insert(edges.begin()+position, edge);
 
         record.setModified (pathgrid);
     }
@@ -188,16 +173,11 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
-        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
         ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
 
         if (rowToRemove < 0 || rowToRemove >= static_cast<int> (edges.size()))
             throw std::runtime_error ("index out of range");
 
-        ESM::Pathgrid::Edge& edge = edges[rowToRemove];
-        if (static_cast<size_t>(edge.mV0) < points.size())
-            --pathgrid.mPoints[edge.mV0].mConnectionNum;
-
         edges.erase(edges.begin()+rowToRemove);
 
         record.setModified (pathgrid);
@@ -208,13 +188,8 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
-        // Set points because point data (edge count) is tied to edges
-        pathgrid.mPoints =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mPoints;
-        pathgrid.mData.mS2 =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mData.mS2;
         pathgrid.mEdges =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mEdges;
+            static_cast<const NestedTableWrapper<ESM::Pathgrid::EdgeList> &>(nestedTable).mNestedTable;
 
         record.setModified (pathgrid);
     }
@@ -222,7 +197,7 @@ namespace CSMWorld
     NestedTableWrapperBase* PathgridEdgeListAdapter::table(const Record<Pathgrid>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new PathgridPointsWrap(record.get());
+        return new NestedTableWrapper<ESM::Pathgrid::EdgeList>(record.get().mEdges);
     }
 
     QVariant PathgridEdgeListAdapter::getData(const Record<Pathgrid>& record,
@@ -249,57 +224,20 @@ namespace CSMWorld
     {
         Pathgrid pathgrid = record.get();
 
-        ESM::Pathgrid::PointList& points = pathgrid.mPoints;
-        ESM::Pathgrid::EdgeList& edges = pathgrid.mEdges;
-
-        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (edges.size()))
+        if (subRowIndex < 0 || subRowIndex >= static_cast<int> (pathgrid.mEdges.size()))
             throw std::runtime_error ("index out of range");
 
-        // Point indices must exist
-        if (value.toInt() < 0 || value.toUInt() >= points.size())
-            return;
-
         ESM::Pathgrid::Edge edge = pathgrid.mEdges[subRowIndex];
         switch (subColIndex)
         {
             case 0: return; // return without saving
-            case 1:
-            {
-                edges.erase(edges.begin()+subRowIndex);
-
-                if (static_cast<size_t>(edge.mV0) < points.size())
-                    --points[edge.mV0].mConnectionNum;
-
-                edge.mV0 = value.toInt();
-
-                // Place in correct order
-                if (static_cast<size_t>(edge.mV0) < points.size())
-                    ++points[edge.mV0].mConnectionNum;
-
-                ESM::Pathgrid::EdgeList::iterator it = edges.begin();
-                for (; it != edges.end(); ++it)
-                {
-                    if (edge.mV0 <= it->mV0)
-                    {
-                        edges.insert(it, edge);
-                        break;
-                    }
-                }
-
-                if (it == edges.end())
-                    edges.push_back(edge);
-
-                break;
-            }
-            case 2:
-
-                edge.mV1 = value.toInt();
-                edges[subRowIndex] = edge;
-                break;
-
+            case 1: edge.mV0 = value.toInt(); break;
+            case 2: edge.mV1 = value.toInt(); break;
             default: throw std::runtime_error("Pathgrid edge subcolumn index out of range");
         }
 
+        pathgrid.mEdges[subRowIndex] = edge;
+
         record.setModified (pathgrid);
     }
 
diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 939558be96..368fde5ee8 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -254,6 +254,7 @@ namespace CSVRender
             int posY = clampToCell(static_cast<int>(localCoords.y()));
             int posZ = clampToCell(static_cast<int>(localCoords.z()));
 
+            int recordIndex = mPathgridCollection.getIndex (mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -265,13 +266,14 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
+            QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
 
             // Add node
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn, posX));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn, posY));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn, posZ));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent), posZ));
         }
         else
         {
@@ -291,9 +293,9 @@ namespace CSVRender
             int offsetY = static_cast<int>(localCoords.y());
             int offsetZ = static_cast<int>(localCoords.z());
 
-            CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
-                CSMWorld::UniversalId::Type_Pathgrids));
+            QAbstractItemModel* model = mData.getTableModel(CSMWorld::UniversalId::Type_Pathgrids);
 
+            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             int posXColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -305,18 +307,20 @@ namespace CSVRender
             int posZColumn = mPathgridCollection.searchNestedColumnIndex(parentColumn,
                 CSMWorld::Columns::ColumnId_PathgridPosZ);
 
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
             for (size_t i = 0; i < mSelected.size(); ++i)
             {
                 const CSMWorld::Pathgrid::Point& point = source->mPoints[mSelected[i]];
                 int row = static_cast<int>(mSelected[i]);
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posXColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent),
                     clampToCell(point.mX + offsetX)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posYColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent),
                     clampToCell(point.mY + offsetY)));
 
-                commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, row, posZColumn, parentColumn,
+                commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posZColumn, parent),
                     clampToCell(point.mZ + offsetZ)));
             }
         }
@@ -560,6 +564,7 @@ namespace CSVRender
         CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
             CSMWorld::UniversalId::Type_Pathgrids));
 
+        int recordIndex = mPathgridCollection.getIndex(mId);
         int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
 
         int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
@@ -568,19 +573,22 @@ namespace CSVRender
         int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
             CSMWorld::Columns::ColumnId_PathgridEdge1);
 
+        QModelIndex parent = model->index(recordIndex, parentColumn);
+        int row = static_cast<int>(source.mEdges.size());
+
         if (edgeExists(source, node1, node2) == -1)
         {
-            // Set first edge last since that reorders the edge list
-            commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node2));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node1));
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node1));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node2));
+            ++row;
         }
 
         if (edgeExists(source, node2, node1) == -1)
         {
-            commands.push(new CSMWorld::AddNestedCommand(*model, mId, 0, parentColumn));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge1Column, parentColumn, node1));
-            commands.push(new CSMWorld::ModifyNestedCommand(*model, mId, 0, edge0Column, parentColumn, node2));
+            commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge0Column, parent), node2));
+            commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, edge1Column, parent), node1));
         }
     }
 

From 564d0db68cda16af7c1c8bdd2779f8046aa339bd Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 26 May 2016 22:11:27 -0400
Subject: [PATCH 661/765] Move pathgrid abstraction handling to save code.

---
 .../model/world/nestedcoladapterimp.cpp       | 52 +++----------------
 .../model/world/nestedcoladapterimp.hpp       | 15 ------
 components/esm/loadpgrd.cpp                   | 32 ++++++++++--
 3 files changed, 34 insertions(+), 65 deletions(-)

diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp
index 3189f76ed9..464757cd43 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.cpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.cpp
@@ -27,20 +27,8 @@ namespace CSMWorld
         point.mConnectionNum = 0;
         point.mUnknown = 0;
 
-        // inserting a point should trigger re-indexing of the edges
-        //
-        // FIXME: does not auto refresh edges table view
-        std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
-        for (;iter != pathgrid.mEdges.end(); ++iter)
-        {
-            if ((*iter).mV0 >= position)
-                (*iter).mV0++;
-            if ((*iter).mV1 >= position)
-                (*iter).mV1++;
-        }
-
         points.insert(points.begin()+position, point);
-        pathgrid.mData.mS2 += 1; // increment the number of points
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -54,28 +42,10 @@ namespace CSMWorld
         if (rowToRemove < 0 || rowToRemove >= static_cast<int> (points.size()))
             throw std::runtime_error ("index out of range");
 
-        // deleting a point should trigger re-indexing of the edges
-        // dangling edges are not allowed and hence removed
-        //
-        // FIXME: does not auto refresh edges table view
-        std::vector<ESM::Pathgrid::Edge>::iterator iter = pathgrid.mEdges.begin();
-        for (; iter != pathgrid.mEdges.end();)
-        {
-            if (((*iter).mV0 == rowToRemove) || ((*iter).mV1 == rowToRemove))
-                iter = pathgrid.mEdges.erase(iter);
-            else
-            {
-                if ((*iter).mV0 > rowToRemove)
-                    (*iter).mV0--;
-
-                if ((*iter).mV1 > rowToRemove)
-                    (*iter).mV1--;
-
-                ++iter;
-            }
-        }
+        // Do not remove dangling edges, does not work with current undo mechanism
+        // Do not automatically adjust indices, what would be done with dangling edges?
         points.erase(points.begin()+rowToRemove);
-        pathgrid.mData.mS2 -= 1; // decrement the number of points
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -84,14 +54,8 @@ namespace CSMWorld
             const NestedTableWrapperBase& nestedTable) const
     {
         Pathgrid pathgrid = record.get();
-
-        pathgrid.mPoints =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mPoints;
-        pathgrid.mData.mS2 =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mData.mS2;
-        // also update edges in case points were added/removed
-        pathgrid.mEdges =
-            static_cast<const PathgridPointsWrap &>(nestedTable).mRecord.mEdges;
+        pathgrid.mPoints = static_cast<const NestedTableWrapper<ESM::Pathgrid::PointList> &>(nestedTable).mNestedTable;
+        pathgrid.mData.mS2 = pathgrid.mPoints.size();
 
         record.setModified (pathgrid);
     }
@@ -99,7 +63,7 @@ namespace CSMWorld
     NestedTableWrapperBase* PathgridPointListAdapter::table(const Record<Pathgrid>& record) const
     {
         // deleted by dtor of NestedTableStoring
-        return new PathgridPointsWrap(record.get());
+        return new NestedTableWrapper<ESM::Pathgrid::PointList>(record.get().mPoints);
     }
 
     QVariant PathgridPointListAdapter::getData(const Record<Pathgrid>& record,
@@ -147,7 +111,6 @@ namespace CSMWorld
 
     PathgridEdgeListAdapter::PathgridEdgeListAdapter () {}
 
-    // ToDo: seems to be auto-sorted in the dialog table display after insertion
     void PathgridEdgeListAdapter::addRow(Record<Pathgrid>& record, int position) const
     {
         Pathgrid pathgrid = record.get();
@@ -218,7 +181,6 @@ namespace CSMWorld
         }
     }
 
-    // ToDo: detect duplicates in mEdges
     void PathgridEdgeListAdapter::setData(Record<Pathgrid>& record,
             const QVariant& value, int subRowIndex, int subColIndex) const
     {
diff --git a/apps/opencs/model/world/nestedcoladapterimp.hpp b/apps/opencs/model/world/nestedcoladapterimp.hpp
index e24bcb1346..131f547a5c 100644
--- a/apps/opencs/model/world/nestedcoladapterimp.hpp
+++ b/apps/opencs/model/world/nestedcoladapterimp.hpp
@@ -25,21 +25,6 @@ namespace CSMWorld
     struct Pathgrid;
     struct Info;
 
-    struct PathgridPointsWrap : public NestedTableWrapperBase
-    {
-        ESM::Pathgrid mRecord;
-
-        PathgridPointsWrap(ESM::Pathgrid pathgrid)
-            : mRecord(pathgrid) {}
-
-        virtual ~PathgridPointsWrap() {}
-
-        virtual int size() const
-        {
-            return mRecord.mPoints.size(); // used in IdTree::setNestedTable()
-        }
-    };
-
     class PathgridPointListAdapter : public NestedColumnAdapter<Pathgrid>
     {
     public:
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 15accd95bb..708685e727 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -127,6 +127,28 @@ namespace ESM
 
     void Pathgrid::save(ESMWriter &esm, bool isDeleted) const
     {
+        // Correct connection count and sort edges by point
+        // Can probably be optimized
+        PointList correctedPoints = mPoints;
+        std::vector<int> sortedEdges;
+
+        sortedEdges.reserve(mEdges.size());
+
+        for (size_t point = 0; point < correctedPoints.size(); ++point)
+        {
+            correctedPoints[point].mConnectionNum = 0;
+
+            for (EdgeList::const_iterator it = mEdges.begin(); it != mEdges.end(); ++it)
+            {
+                if (static_cast<size_t>(it->mV0) == point)
+                {
+                    sortedEdges.push_back(it->mV1);
+                    ++correctedPoints[point].mConnectionNum;
+                }
+            }
+        }
+
+        // Save
         esm.writeHNCString("NAME", mCell);
         esm.writeHNT("DATA", mData, 12);
 
@@ -136,22 +158,22 @@ namespace ESM
             return;
         }
 
-        if (!mPoints.empty())
+        if (!correctedPoints.empty())
         {
             esm.startSubRecord("PGRP");
-            for (PointList::const_iterator it = mPoints.begin(); it != mPoints.end(); ++it)
+            for (PointList::const_iterator it = correctedPoints.begin(); it != correctedPoints.end(); ++it)
             {
                 esm.writeT(*it);
             }
             esm.endRecord("PGRP");
         }
 
-        if (!mEdges.empty())
+        if (!sortedEdges.empty())
         {
             esm.startSubRecord("PGRC");
-            for (std::vector<Edge>::const_iterator it = mEdges.begin(); it != mEdges.end(); ++it)
+            for (std::vector<int>::const_iterator it = sortedEdges.begin(); it != sortedEdges.end(); ++it)
             {
-                esm.writeT(it->mV1);
+                esm.writeT(*it);
             }
             esm.endRecord("PGRC");
         }

From d0ef95a1e172ea591d8d4e99c6a83b47d70fde45 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 26 May 2016 22:13:47 -0400
Subject: [PATCH 662/765] Make adjustments to pathgrid modification code.

---
 apps/opencs/view/render/pathgrid.cpp | 68 ++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index 368fde5ee8..b1c3be854d 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -269,7 +269,7 @@ namespace CSVRender
             QModelIndex parent = model->index(recordIndex, parentColumn);
             int row = static_cast<int>(source->mPoints.size());
 
-            // Add node
+            // Add node to end of list
             commands.push(new CSMWorld::AddNestedCommand(*model, mId, row, parentColumn));
             commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posXColumn, parent), posX));
             commands.push(new CSMWorld::ModifyCommand(*model, model->index(row, posYColumn, parent), posY));
@@ -349,22 +349,80 @@ namespace CSVRender
 
     void Pathgrid::applyRemoveNodes(CSMWorld::CommandMacro& commands)
     {
-        // Source is aquired here to ensure a pathgrid exists
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
-            // Want to remove from end of row first
-            std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
-
             CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
                 CSMWorld::UniversalId::Type_Pathgrids));
 
+            // Want to remove nodes from end of list first
+            std::sort(mSelected.begin(), mSelected.end(), std::greater<int>());
+
+            int recordIndex = mPathgridCollection.getIndex(mId);
             int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
 
             for (std::vector<unsigned short>::iterator row = mSelected.begin(); row != mSelected.end(); ++row)
             {
                 commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, static_cast<int>(*row), parentColumn));
             }
+
+            // Fix/remove edges
+            std::set<int, std::greater<int> > edgeRowsToRemove;
+
+            parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+
+            int edge0Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridEdge0);
+
+            int edge1Column = mPathgridCollection.searchNestedColumnIndex(parentColumn,
+                CSMWorld::Columns::ColumnId_PathgridEdge1);
+
+            QModelIndex parent = model->index(recordIndex, parentColumn);
+
+            for (size_t edge = 0; edge < source->mEdges.size(); ++edge)
+            {
+                int adjustment0 = 0;
+                int adjustment1 = 0;
+
+                // Determine necessary adjustment
+                for (std::vector<unsigned short>::iterator point = mSelected.begin(); point != mSelected.end(); ++point)
+                {
+                    if (source->mEdges[edge].mV0 == *point || source->mEdges[edge].mV1 == *point)
+                    {
+                        edgeRowsToRemove.insert(static_cast<int>(edge));
+
+                        adjustment0 = 0; // No need to adjust, its getting removed
+                        adjustment1 = 0;
+                        break;
+                    }
+
+                    if (source->mEdges[edge].mV0 > *point)
+                        --adjustment0;
+
+                    if (source->mEdges[edge].mV1 > *point)
+                        --adjustment1;
+                }
+
+                if (adjustment0 != 0)
+                {
+                    int adjustedEdge = source->mEdges[edge].mV0 + adjustment0;
+                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge0Column, parent),
+                        adjustedEdge));
+                }
+
+                if (adjustment1 != 0)
+                {
+                    int adjustedEdge = source->mEdges[edge].mV1 + adjustment1;
+                    commands.push(new CSMWorld::ModifyCommand(*model, model->index(edge, edge1Column, parent),
+                        adjustedEdge));
+                }
+            }
+
+            std::set<int, std::greater<int> >::iterator row;
+            for (row = edgeRowsToRemove.begin(); row != edgeRowsToRemove.end(); ++row)
+            {
+                commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, *row, parentColumn));
+            }
         }
 
         clearSelected();

From ded8862e9dc3c45f2d89e9c4cb8fbff63f2e8c7a Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 26 May 2016 22:44:02 -0400
Subject: [PATCH 663/765] Insert nested rows after selected row, or at start if
 none selected.

---
 apps/opencs/view/world/nestedtable.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index 23d5664396..0ccb88ce50 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -119,9 +119,14 @@ void CSVWorld::NestedTable::removeRowActionTriggered()
 
 void CSVWorld::NestedTable::addNewRowActionTriggered()
 {
+    int row = 0;
+
+    if (!selectionModel()->selectedRows().empty())
+        row = selectionModel()->selectedRows().back().row() + 1;
+
     mDocument.getUndoStack().push(new CSMWorld::AddNestedCommand(*(mModel->model()),
                                                                  mModel->getParentId(),
-                                                                 selectionModel()->selectedRows().size(),
+                                                                 row,
                                                                  mModel->getParentColumn()));
 }
 

From e396e6f2eac60fde8e641b3879087bb85551dcdd Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 27 May 2016 17:42:17 +0200
Subject: [PATCH 664/765] Adjust the eye level for line of sight checks (Fixes
 #3407)

---
 apps/openmw/mwphysics/physicssystem.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 04267d525f..4f6ba9f122 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 
 #include <osg/Group>
+#include <osg/io_utils>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btConeShape.h>
@@ -946,8 +947,10 @@ namespace MWPhysics
         if (!physactor1 || !physactor2)
             return false;
 
-        osg::Vec3f pos1 (physactor1->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.8)); // eye level
-        osg::Vec3f pos2 (physactor2->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.8));
+        osg::Vec3f pos1 (physactor1->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.9)); // eye level
+        osg::Vec3f pos2 (physactor2->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.9));
+
+        std::cout << "pos1 is " << pos1 << " pos2 " << pos2 << std::endl;
 
         RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap|CollisionType_Door);
 

From d4870071673defe3bf31cd66c9f96365c31faf1a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 27 May 2016 17:43:36 +0200
Subject: [PATCH 665/765] Remove debug code

---
 apps/openmw/mwphysics/physicssystem.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 4f6ba9f122..3b9917198a 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -3,7 +3,6 @@
 #include <stdexcept>
 
 #include <osg/Group>
-#include <osg/io_utils>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
 #include <BulletCollision/CollisionShapes/btConeShape.h>
@@ -950,8 +949,6 @@ namespace MWPhysics
         osg::Vec3f pos1 (physactor1->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor1->getHalfExtents().z() * 0.9)); // eye level
         osg::Vec3f pos2 (physactor2->getCollisionObjectPosition() + osg::Vec3f(0,0,physactor2->getHalfExtents().z() * 0.9));
 
-        std::cout << "pos1 is " << pos1 << " pos2 " << pos2 << std::endl;
-
         RayResult result = castRay(pos1, pos2, MWWorld::Ptr(), CollisionType_World|CollisionType_HeightMap|CollisionType_Door);
 
         return !result.mHit;

From bded4f86f05898fcd91f4f98d01ef2c9df19df42 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 27 May 2016 13:13:49 -0400
Subject: [PATCH 666/765] Remove connection number check

---
 apps/opencs/model/tools/pathgridcheck.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/apps/opencs/model/tools/pathgridcheck.cpp b/apps/opencs/model/tools/pathgridcheck.cpp
index 69ee5a8098..3cd4a1b09c 100644
--- a/apps/opencs/model/tools/pathgridcheck.cpp
+++ b/apps/opencs/model/tools/pathgridcheck.cpp
@@ -70,20 +70,6 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
 
     for (unsigned int i = 0; i < pathgrid.mPoints.size(); ++i)
     {
-        // check the connection number for each point matches the edge connections
-        if (pathgrid.mPoints[i].mConnectionNum > pointList[i].mConnectionNum)
-        {
-            std::ostringstream ss;
-            ss << " has has less edges than expected for point " << i;
-            messages.add (id, pathgrid.mId + ss.str(), "", CSMDoc::Message::Severity_Error);
-        }
-        else if (pathgrid.mPoints[i].mConnectionNum < pointList[i].mConnectionNum)
-        {
-            std::ostringstream ss;
-            ss << " has has more edges than expected for point " << i;
-            messages.add (id, pathgrid.mId + ss.str(), "", CSMDoc::Message::Severity_Error);
-        }
-
         // check that edges are bidirectional
         bool foundReverse = false;
         for (unsigned int j = 0; j < pointList[i].mOtherIndex.size(); ++j)

From 90620081c77758df86baf70c566984a39e575624 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 27 May 2016 13:15:35 -0400
Subject: [PATCH 667/765] Fix handling of deleted pathgrids.

---
 apps/opencs/view/render/pathgrid.cpp | 30 +++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index b1c3be854d..f2920d7fb3 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -277,8 +277,31 @@ namespace CSVRender
         }
         else
         {
-            CSMWorld::CreatePathgridCommand* createCmd = new CSMWorld::CreatePathgridCommand(*model, mId);
-            commands.push(createCmd);
+            int index = mPathgridCollection.searchId(mId);
+            if (index == -1)
+            {
+                // Does not exist
+                commands.push(new CSMWorld::CreatePathgridCommand(*model, mId));
+            }
+            else
+            {
+                source = &mPathgridCollection.getRecord(index).get();
+
+                // Deleted, so revert and remove all data
+                commands.push(new CSMWorld::RevertCommand(*model, mId));
+
+                int parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridPoints);
+                for (int row = source->mPoints.size() - 1; row >= 0; --row)
+                {
+                    commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, row, parentColumn));
+                }
+
+                parentColumn = mPathgridCollection.findColumnIndex(CSMWorld::Columns::ColumnId_PathgridEdges);
+                for (int row = source->mEdges.size() - 1; row >= 0; --row)
+                {
+                    commands.push(new CSMWorld::DeleteNestedCommand(*model, mId, row, parentColumn));
+                }
+            }
         }
     }
 
@@ -510,7 +533,8 @@ namespace CSVRender
         }
         else
         {
-            removeGeometry();
+            removePathgridGeometry();
+            removeSelectedGeometry();
         }
     }
 

From 496cb85b01d1565f0b1a6c614b3ce983c3515fbe Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 28 May 2016 20:25:55 +0200
Subject: [PATCH 668/765] Do not cancel Ai packages when on loading (Fixes
 #3409)

This piece of code was an attempt to fix up save games made before commit d3b76b70063da765b107a766142a681bd7ad5f73 , but ended up introducing a new bug.
---
 apps/openmw/mwmechanics/aisequence.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 9f6b71db5f..13c368f747 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -409,21 +409,6 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
         if (!package.get())
             continue;
 
-        // remove previous packages if required
-        if (package->shouldCancelPreviousAi())
-        {
-            for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end();)
-            {
-                if((*it)->canCancel())
-                {
-                    delete *it;
-                    it = mPackages.erase(it);
-                }
-                else
-                    ++it;
-            }
-        }
-
         mPackages.push_back(package.release());
     }
 }

From 63ca8b73fc326f0c2d6e473a66a8e95740ea1bcd Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sun, 29 May 2016 03:33:06 +0300
Subject: [PATCH 669/765] 	fix: use Freetype in FindMYGUI instead of
 FREETYPE

---
 cmake/FindMyGUI.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
index 85a1055f6b..0b3ac730ef 100644
--- a/cmake/FindMyGUI.cmake
+++ b/cmake/FindMyGUI.cmake
@@ -54,7 +54,7 @@ IF (WIN32) #Windows
 
         if ( MYGUI_STATIC )
            set(LIB_SUFFIX "Static")
-           find_package(freetype)
+           find_package(Freetype)
         endif ( MYGUI_STATIC )
 
         find_library ( MYGUI_LIBRARIES_REL NAMES MyGUIEngine${LIB_SUFFIX}.lib HINTS ${MYGUI_LIB_DIR} PATH_SUFFIXES "" release relwithdebinfo minsizerel )
@@ -116,19 +116,19 @@ IF (NOT WIN32) # This does not work on Windows for paths with spaces in them
 	SEPARATE_ARGUMENTS(MYGUI_LIBRARIES)
 ENDIF (NOT WIN32)
 
-SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} ${FREETYPE_LIBRARIES})
+SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} ${Freetype_LIBRARIES})
 
 SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "")
 SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "")
 SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "")
 
 IF (NOT APPLE OR NOT MYGUI_STATIC) # we need explicit freetype libs only on OS X for static build, for other cases just make it TRUE
-    SET(FREETYPE_LIBRARIES TRUE)
+    SET(Freetype_LIBRARIES TRUE)
 ENDIF (NOT APPLE OR NOT MYGUI_STATIC)
 
-IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES)
+IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND Freetype_LIBRARIES)
     SET(MYGUI_FOUND TRUE)
-ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES)
+ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND Freetype_LIBRARIES)
 
 IF (MYGUI_FOUND)
     MARK_AS_ADVANCED(MYGUI_LIB_DIR)
@@ -152,7 +152,7 @@ ENDIF (MYGUI_FOUND)
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(MyGUI DEFAULT_MSG
     MYGUI_INCLUDE_DIRS
-    FREETYPE_LIBRARIES
+    Freetype_LIBRARIES
     MYGUI_LIBRARIES)
 
 CMAKE_POLICY(POP)

From bce66c629ab54c47b151dc951657c713a157e63b Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Sun, 29 May 2016 01:02:22 +0900
Subject: [PATCH 670/765] Change editor-placed AI packages to cycle

---
 apps/openmw/mwmechanics/aiescort.cpp   |  8 ++++++++
 apps/openmw/mwmechanics/aipackage.cpp  | 19 +++++++++++++++++--
 apps/openmw/mwmechanics/aipackage.hpp  |  7 +++++++
 apps/openmw/mwmechanics/aisequence.cpp |  5 +++++
 apps/openmw/mwmechanics/aitravel.cpp   |  4 ++++
 apps/openmw/mwmechanics/aiwander.cpp   | 26 +++++++++++++++-----------
 apps/openmw/mwmechanics/aiwander.hpp   |  2 ++
 7 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 1fc6c52a43..48d30f3e77 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -72,7 +72,11 @@ namespace MWMechanics
         {
             mRemainingDuration -= duration;
             if (duration <= 0)
+            {
+                // Reset mStarted to false so that package can be repeated again
+                mStarted = false;
                 return true;
+            }
         }
 
         if (!mCellId.empty() && mCellId != actor.getCell()->getCell()->getCellId().mWorldspace)
@@ -100,7 +104,11 @@ namespace MWMechanics
             point.mConnectionNum = 0;
             point.mUnknown = 0;
             if(pathTo(actor,point,duration)) //Returns true on path complete
+            {
+                // Reset mStarted to false so that package can be repeated again
+                mStarted = false;
                 return true;
+            }
             mMaxDist = 450;
         }
         else
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 863fe05ef7..b08f922763 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -45,7 +45,12 @@ bool MWMechanics::AiPackage::shouldCancelPreviousAi() const
     return true;
 }
 
-MWMechanics::AiPackage::AiPackage() : mTimer(0.26f) { //mTimer starts at .26 to force initial pathbuild
+bool MWMechanics::AiPackage::getRepeat() const
+{
+    return true;
+}
+
+MWMechanics::AiPackage::AiPackage() : mTimer(0.26f), mStarted(false) { //mTimer starts at .26 to force initial pathbuild
 
 }
 
@@ -74,7 +79,13 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
     if(mTimer > 0.25)
     {
         const ESM::Cell *cell = actor.getCell()->getCell();
-        if (doesPathNeedRecalc(dest, cell)) { //Only rebuild path if it's moved
+        // If repeating an AI package (mStarted has been set to false again), build a new path if needed so package doesn't immediately end
+        if (!mStarted && distance(pos.pos, dest) > 10) {
+            mStarted = true;
+            mPathFinder.buildSyncedPath(pos.pos, dest, actor.getCell(), true); //Rebuild path, in case the target has moved
+            mPrevDest = dest;
+        }
+        else if (doesPathNeedRecalc(dest, cell)) { //Only rebuild path if it's moved
             mPathFinder.buildSyncedPath(pos.pos, dest, actor.getCell(), true); //Rebuild path, in case the target has moved
             mPrevDest = dest;
         }
@@ -94,7 +105,11 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Po
     /// Checks if you aren't moving; attempts to unstick you
     //************************
     if(mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1])) //Path finished?
+    {
+        // Reset mTimer so that path will be built right away when a package is repeated
+        mTimer = 0.26f;
         return true;
+    }
     else
     {
         evadeObstacles(actor, duration, pos);
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index aa689f189d..0cf2854796 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -87,6 +87,10 @@ namespace MWMechanics
             /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
             virtual bool shouldCancelPreviousAi() const;
 
+            /// Return true if this package should repeat. Can only be false for AIWander, if AIWander is assigned
+            /// assigned through the console or script.
+            virtual bool getRepeat() const;
+
             bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
 
         protected:
@@ -104,6 +108,9 @@ namespace MWMechanics
 
             float mTimer;
 
+            // Set to true once package starts actually being executed
+            bool mStarted;
+
             ESM::Pathgrid::Point mPrevDest;
 
         private:
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 13c368f747..11f3908546 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -230,6 +230,11 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
 
         if (package->execute (actor,characterController,state,duration))
         {
+            // Put repeating noncombat AI packages on the end of the stack so they can be used again
+            if (isActualAiPackage(packageTypeId) && package->getRepeat())
+            {
+                mPackages.push_back(package->clone());
+            }
             // To account for the rare case where AiPackage::execute() queued another AI package
             // (e.g. AiPursue executing a dialogue script that uses startCombat)
             std::list<MWMechanics::AiPackage*>::iterator toRemove =
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 1585a3007f..3026b4393f 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -58,9 +58,13 @@ namespace MWMechanics
         if (!isWithinMaxRange(osg::Vec3f(mX, mY, mZ), pos.asVec3()))
             return false;
 
+        if (!mStarted)
+            mStarted = true;
+
         if (pathTo(actor, ESM::Pathgrid::Point(static_cast<int>(mX), static_cast<int>(mY), static_cast<int>(mZ)), duration))
         {
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+            mStarted = false;
             return true;
         }
         return false;
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 99a2782321..beb975cc4f 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -123,8 +123,6 @@ namespace MWMechanics
         if(mDuration == 0)
             mTimeOfDay = 0;
 
-        mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-
         mPopulateAvailableNodes = true;
 
     }
@@ -202,6 +200,13 @@ namespace MWMechanics
             mPopulateAvailableNodes = true;
         }
 
+        if (!mStarted)
+        {
+            // Set mStartTime once this package starts being executed
+            mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
+            mStarted = true;
+        }
+
         cStats.setDrawState(DrawState_Nothing);
         cStats.setMovementFlag(CreatureStats::Flag_Run, false);
 
@@ -230,6 +235,8 @@ namespace MWMechanics
 
         if (isPackageCompleted(actor, storage))
         {
+            // Reset mStarted so that package will get a new mStarttime when it repeats
+            mStarted = false;
             return true;
         }
 
@@ -301,6 +308,11 @@ namespace MWMechanics
         return false; // AiWander package not yet completed
     }
 
+    bool AiWander::getRepeat() const
+    { 
+         return mRepeat; 
+    }
+
     bool AiWander::isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage)
     {
         if (mDuration)
@@ -310,15 +322,8 @@ namespace MWMechanics
             if ((currentTime.getHour() >= mStartTime.getHour() + mDuration) ||
                 (int(currentTime.getHour()) == 0 && currentTime.getDay() != mStartTime.getDay()))
             {
-                if (!mRepeat)
-                {
                     stopWalking(actor, storage);
                     return true;
-                }
-                else
-                {
-                    mStartTime = currentTime;
-                }
             }
         }
         // if get here, not yet completed
@@ -501,8 +506,7 @@ namespace MWMechanics
                 }
             }
         }
-        // Recreate vanilla (broken?) behavior of resetting start time of AIWander:
-        mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
+
         storage.setState(Wander_IdleNow);
     }
 
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 1155100b82..026febb025 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -58,6 +58,8 @@ namespace MWMechanics
 
             virtual void fastForward(const MWWorld::Ptr& actor, AiState& state);
             
+            bool getRepeat() const;
+            
             enum GreetingState {
                 Greet_None,
                 Greet_InProgress,

From 03c0b84edddd27b8c934d56ef4e8baa9f75a408f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 29 May 2016 14:59:46 +0200
Subject: [PATCH 671/765] Update AUTHORS.md

---
 AUTHORS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 88853865ab..893b7315f0 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -21,6 +21,7 @@ Programmers
     alexanderkjall
     Alexander Nadeau (wareya)
     Alexander Olofsson (Ace)
+    Allofich
     Austin Salgat (Salgat)
     Artem Kotsynyak (greye)
     artemutin
@@ -108,6 +109,7 @@ Programmers
     Rob Cutmore (rcutmore)
     Robert MacGregor (Ragora)
     Rohit Nirmal
+    Roman (kpp)
     Roman Melnik (Kromgart)
     Roman Proskuryakov (humbug)
     Sandy Carter (bwrsandman)

From b83f522ecdca5d388843a2a23e5e4f8c62b9454c Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 29 May 2016 13:26:29 -0400
Subject: [PATCH 672/765] Changes to color scheme, slight change to drag
 indicator, change tooltip description.

---
 apps/opencs/view/render/pathgrid.cpp     | 17 +++++++++++++----
 apps/opencs/view/render/pathgrid.hpp     |  2 +-
 apps/opencs/view/render/pathgridmode.cpp |  1 -
 components/sceneutil/pathgridutil.cpp    |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index f2920d7fb3..a284717829 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -204,7 +204,7 @@ namespace CSVRender
                 osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
                 osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
 
-                createConnectionGeometry(start, end);
+                createConnectionGeometry(start, end, true);
             }
         }
     }
@@ -220,7 +220,7 @@ namespace CSVRender
 
                 osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
                 osg::Vec3f end = pos - mBaseNode->getPosition();
-                createConnectionGeometry(start, end);
+                createConnectionGeometry(start, end, false);
             }
         }
     }
@@ -593,7 +593,7 @@ namespace CSVRender
         }
     }
 
-    void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end)
+    void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
     {
         if (mConnectionGeometry)
             mPathgridGeode->removeDrawable(mConnectionGeometry);
@@ -606,7 +606,16 @@ namespace CSVRender
 
         (*vertices)[0] = start;
         (*vertices)[1] = end;
-        (*colors)[0] = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f);
+
+        if (valid)
+        {
+            (*colors)[0] = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
+        }
+        else
+        {
+            (*colors)[0] = osg::Vec4f(1.f, 0.f, 0.f, 1.f);
+        }
+
         indices->setElement(0, 0);
         indices->setElement(1, 1);
 
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 9f6cf2686e..415b252e0d 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -121,7 +121,7 @@ namespace CSVRender
             void removePathgridGeometry();
             void removeSelectedGeometry();
 
-            void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end);
+            void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
 
             const CSMWorld::Pathgrid* getPathgridSource();
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index fc16d7d993..e9d6080994 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -37,7 +37,6 @@ namespace CSVRender
             "<li>Secondary edit: Connect selected nodes to node</li>"
             "<li>Primary drag: Move selected nodes</li>"
             "<li>Secondary drag: Connect one node to another</li>"
-            "<li>Other operations may be done with the context menu</li>"
             "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
     }
 
diff --git a/components/sceneutil/pathgridutil.cpp b/components/sceneutil/pathgridutil.cpp
index 48e3981323..1497beb2b8 100644
--- a/components/sceneutil/pathgridutil.cpp
+++ b/components/sceneutil/pathgridutil.cpp
@@ -71,8 +71,8 @@ namespace SceneUtil
     };
 
     const osg::Vec4f DiamondEdgeColor = osg::Vec4f(0.5f, 1.f, 1.f, 1.f);
-    const osg::Vec4f DiamondWireColor = osg::Vec4f(0.8f, 1.f, 0.9f, 1.f);
-    const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.4f, 1.f, 0.4f, 1.f);
+    const osg::Vec4f DiamondWireColor = osg::Vec4f(0.72f, 0.f, 0.96f, 1.f);
+    const osg::Vec4f DiamondFocusWireColor = osg::Vec4f(0.91f, 0.66f, 1.f, 1.f);
 
     osg::ref_ptr<osg::Geometry> createPathgridGeometry(const ESM::Pathgrid& pathgrid)
     {

From 83c86cd1bee3fafa48ae2336591678b13e0eb044 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sun, 29 May 2016 13:26:48 -0400
Subject: [PATCH 673/765] Implement context-select functionality.

---
 apps/opencs/view/render/pathgridmode.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index e9d6080994..714c548a76 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -5,6 +5,8 @@
 
 #include <components/sceneutil/pathgridutil.hpp>
 
+#include "../../model/prefs/state.hpp"
+
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commandmacro.hpp"
 #include "../../model/world/idtable.hpp"
@@ -53,9 +55,12 @@ namespace CSVRender
 
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
     {
-        // Get pathgrid cell
-        Cell* cell = getWorldspaceWidget().getCell (hitResult.worldPos);
-        if (cell)
+        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue() &&
+            dynamic_cast<PathgridTag*>(hitResult.tag.get()))
+        {
+            primarySelectPressed(hitResult);
+        }
+        else if (Cell* cell = getWorldspaceWidget().getCell (hitResult.worldPos))
         {
             // Add node
             QUndoStack& undoStack = getWorldspaceWidget().getDocument().getUndoStack();
@@ -127,6 +132,17 @@ namespace CSVRender
     {
         std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
 
+        if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue())
+        {
+            WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
+
+            if (dynamic_cast<PathgridTag*>(hit.tag.get()))
+            {
+                primarySelectPressed(hit);
+                selection = getWorldspaceWidget().getSelection (Mask_Pathgrid);
+            }
+        }
+
         if (!selection.empty())
         {
             mDragMode = DragMode_Move;

From 4e06c2cc1f5e7cfd4e7e92b5618ece630d2831d3 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 30 May 2016 02:29:24 +0300
Subject: [PATCH 674/765] Update AUTHORS.md. kpp and humbug is the same person
 =)

---
 AUTHORS.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 893b7315f0..6d577ccc26 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -109,9 +109,8 @@ Programmers
     Rob Cutmore (rcutmore)
     Robert MacGregor (Ragora)
     Rohit Nirmal
-    Roman (kpp)
     Roman Melnik (Kromgart)
-    Roman Proskuryakov (humbug)
+    Roman Proskuryakov (kpp)
     Sandy Carter (bwrsandman)
     Scott Howard
     Sebastian Wick (swick)

From f23b551bfa9fc859b84fa6232b5540d5a02f848a Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 30 May 2016 04:15:11 +0300
Subject: [PATCH 675/765] Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in
 wiki Fix #942

---
 CI/before_script.msvc.sh | 2 +-
 cmake/FindFFmpeg.cmake   | 9 +++++----
 cmake/FindFreetype.cmake | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index b2db84bd9e..ca8084dda4 100755
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -405,7 +405,7 @@ printf "FFmpeg 2.5.2... "
 		rm -rf ffmpeg-2.5.2-win$BITS-dev
 	fi
 
-	export FFMPEG_SDK="`real_pwd`/FFmpeg"
+	export FFMPEG_HOME="`real_pwd`/FFmpeg"
 	add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll
 
 	if [ $BITS -eq 32 ]; then
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index 99afa69209..830030e32d 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -2,7 +2,7 @@
 # - Try to find the required ffmpeg components
 #
 # This module accepts the following env variable
-#  FFMPEG_SDK - Can be set to custom install path
+#  FFMPEG_HOME - Can be set to custom install path
 #
 # Once done this will define
 #  FFmpeg_FOUND         - System has the all required components.
@@ -42,10 +42,11 @@ macro(_internal_find_component _component _pkgconfig _library _header)
     set(_package_component FFmpeg_${_component})
     libfind_pkg_detect(${_package_component} ${_pkgconfig}
         FIND_PATH ${_header}
-            HINTS $ENV{FFMPEG_SDK}/include
-            PATH_SUFFIXES ffmpeg
+            HINTS $ENV{FFMPEG_HOME}
+            PATH_SUFFIXES include ffmpeg
         FIND_LIBRARY ${_library}
-            HINTS $ENV{FFMPEG_SDK}/lib
+            HINTS $ENV{FFMPEG_HOME}
+            PATH_SUFFIXES lib
     )
     set(${_package_component}_DEFINITIONS  ${${_package_component}_PKGCONF_CFLAGS_OTHER})
     set(${_package_component}_VERSION      ${${_package_component}_PKGCONF_VERSION})
diff --git a/cmake/FindFreetype.cmake b/cmake/FindFreetype.cmake
index a5f825098e..c154628da5 100644
--- a/cmake/FindFreetype.cmake
+++ b/cmake/FindFreetype.cmake
@@ -10,7 +10,7 @@
 # - Try to find FreeType
 #
 # This module accepts the following env variable
-#  FREETYPE_SDK - Can be set to custom install path
+#  FREETYPE_DIR - Can be set to custom install path
 #
 # Once done, this will define
 #
@@ -62,11 +62,11 @@ set(_REGULAR_INSTALL_PATHS
 
 libfind_pkg_detect(Freetype freetype2
     FIND_PATH ft2build.h
-        HINTS $ENV{FREETYPE_SDK}
+        HINTS $ENV{FREETYPE_DIR}
         PATHS ${_REGULAR_INSTALL_PATHS}
         PATH_SUFFIXES include freetype2
     FIND_LIBRARY freetype freetype2311 freetype239 freetype238 freetype235 freetype219
-        HINTS $ENV{FREETYPE_SDK}
+        HINTS $ENV{FREETYPE_DIR}
         PATHS ${_REGULAR_INSTALL_PATHS}
         PATH_SUFFIXES lib
 )

From 280b20ccb7375d51878bc4f53bc36b1579825f8d Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Tue, 31 May 2016 07:14:28 +0300
Subject: [PATCH 676/765] Fix libfind_process for quiet packages

---
 cmake/LibFindMacros.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
index e842cb73a6..0ddbcba081 100644
--- a/cmake/LibFindMacros.cmake
+++ b/cmake/LibFindMacros.cmake
@@ -200,6 +200,11 @@ function (libfind_process PREFIX)
     foreach (i ${configopts})
       mark_as_advanced(${i})
     endforeach()
+    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
     if (NOT quiet)
       message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
       if (LIBFIND_DEBUG)
@@ -209,11 +214,6 @@ function (libfind_process PREFIX)
         message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
         message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
       endif()
-      set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
-      set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
-      set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
-      set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
-      set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
     endif()
     return()
   endif()

From 3bcd23022aa45c1aaf55ae65b2c4e0c29fb13ea1 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Mon, 9 May 2016 19:33:24 +0300
Subject: [PATCH 677/765] Rewrites FindBullet using LibFindMacros handling
 version properly

---
 CI/before_script.msvc.sh   |   7 +--
 CMakeLists.txt             |   7 +--
 apps/openmw/CMakeLists.txt |   1 -
 cmake/FindBullet.cmake     | 125 +++++++++++++++++--------------------
 components/CMakeLists.txt  |   4 +-
 5 files changed, 61 insertions(+), 83 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index ca8084dda4..3dee19be2a 100755
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -376,12 +376,7 @@ printf "Bullet 2.83.5... "
 		mv Bullet-2.83.5-win$BITS Bullet
 	fi
 
-	BULLET_SDK="`real_pwd`/Bullet"
-	add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
-		-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
-		-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
-		-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
-		-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"
+	export BULLET_ROOT="`real_pwd`/Bullet"
 
 	echo Done.
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d94f79f0d..a3d20b7359 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,10 +281,7 @@ endif()
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(SDL2 REQUIRED)
 find_package(OpenAL REQUIRED)
-find_package(Bullet REQUIRED)
-if (NOT BULLET_FOUND OR BULLET_VERSION VERSION_LESS 283)
-    message(FATAL_ERROR "OpenMW requires Bullet version 2.83 or later")
-endif()
+find_package(Bullet 283 REQUIRED COMPONENTS BulletCollision LinearMath)
 
 include_directories("."
     SYSTEM
@@ -292,7 +289,7 @@ include_directories("."
     ${Boost_INCLUDE_DIR}
     ${MYGUI_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
-    ${BULLET_INCLUDE_DIRS}
+    ${Bullet_INCLUDE_DIRS}
 )
 
 link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${MYGUI_LIB_DIR})
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 5e84f6086d..28abaaf52e 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -132,7 +132,6 @@ target_link_libraries(openmw
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${OPENAL_LIBRARY}
     ${FFmpeg_LIBRARIES}
-    ${BULLET_LIBRARIES}
     ${MYGUI_LIBRARIES}
     ${SDL2_LIBRARY}
     "osg-ffmpeg-videoplayer"
diff --git a/cmake/FindBullet.cmake b/cmake/FindBullet.cmake
index d70815dd50..6d68bed707 100644
--- a/cmake/FindBullet.cmake
+++ b/cmake/FindBullet.cmake
@@ -1,18 +1,20 @@
 # - Try to find the Bullet physics engine
 #
-#  This module defines the following variables
-#
-#  BULLET_FOUND - Was bullet found
-#  BULLET_INCLUDE_DIRS - the Bullet include directories
-#  BULLET_LIBRARIES - Link to this, by default it includes
-#                     all bullet components (Dynamics,
-#                     Collision, LinearMath, & SoftBody)
-#
-#  This module accepts the following variables
-#
+# This module accepts the following env variables
 #  BULLET_ROOT - Can be set to bullet install path or Windows build path
 #
-
+# Once done this will define
+#  Bullet_FOUND         - System has the all required components.
+#  Bullet_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  Bullet_LIBRARIES     - Link these to use the required bullet components.
+#  Bullet_VERSION       - Version of libbullet
+#
+# For each of the components
+#   - LinearMath
+#   - BulletCollision
+#   - BulletSoftBody
+#   - BulletDynamics
+#
 # Copyright (c) 2009, Philip Lowman <philip at yhbt.com>
 # Modified for OpenMW to parse BT_BULLET_VERSION.
 #
@@ -20,67 +22,52 @@
 # BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-include(PreprocessorUtils)
+include(LibFindMacros)
 
-set(BULLET_ROOT $ENV{BULLET_ROOT})
-
-macro(_FIND_BULLET_LIBRARY _var)
-  find_library(${_var}
-     NAMES
-        ${ARGN}
-     PATHS
-        ${BULLET_ROOT}
-		${BULLET_ROOT}/lib/Debug
-		${BULLET_ROOT}/lib/Release
-        ${BULLET_ROOT}/out/release8/libs
-        ${BULLET_ROOT}/out/debug8/libs
-     PATH_SUFFIXES lib
-  )
-  mark_as_advanced(${_var})
+# Macro: _internal_find_bullet_library
+# Checks for the given component by invoking pkgconfig etc.
+macro(_internal_find_bullet_library _lib)
+    libfind_pkg_detect(Bullet_${_lib} bullet
+        FIND_LIBRARY ${_lib}
+            HINTS $ENV{BULLET_ROOT}
+            PATH_SUFFIXES lib
+    )
+    libfind_process(Bullet_${_lib})
 endmacro()
 
-macro(_BULLET_APPEND_LIBRARIES _list _release)
-   set(_debug ${_release}_DEBUG)
-   if(${_debug})
-      set(${_list} ${${_list}} optimized ${${_release}} debug ${${_debug}})
-   else()
-      set(${_list} ${${_list}} ${${_release}})
-   endif()
-endmacro()
+set(_known_components LinearMath BulletCollision BulletSoftBody BulletDynamics)
 
-find_path(BULLET_INCLUDE_DIR NAMES btBulletCollisionCommon.h
-  PATHS
-    ${BULLET_ROOT}/include
-    ${BULLET_ROOT}/src
-  PATH_SUFFIXES bullet
+# Check if the required components were found and add their stuff to the Bullet_* vars.
+foreach (_component ${Bullet_FIND_COMPONENTS})
+    list(FIND _known_components ${_component} _known_component)
+    if (_known_component EQUAL -1)
+        message(FATAL_ERROR "Unknown component '${_component}'")
+    endif()
+
+    set(Bullet_${_component}_Debug_FIND_QUIETLY TRUE) # don't spam messages with optional Debug component
+    _internal_find_bullet_library(${_component})
+    _internal_find_bullet_library(${_component}_Debug)
+
+    if (Bullet_${_component}_Debug_FOUND)
+        set(Bullet_LIBRARIES ${Bullet_LIBRARIES} optimized ${Bullet_${_component}_LIBRARIES} debug ${Bullet_${_component}_Debug_LIBRARIES})
+    else()
+        set(Bullet_LIBRARIES ${Bullet_LIBRARIES} ${Bullet_${_component}_LIBRARIES})
+    endif()
+endforeach()
+
+libfind_pkg_detect(Bullet bullet
+    FIND_PATH btBulletCollisionCommon.h
+        HINTS $ENV{BULLET_ROOT}
+        PATH_SUFFIXES include/bullet
 )
+set(Bullet_INCLUDE_DIRS ${Bullet_INCLUDE_DIR})
+libfind_version_header(Bullet LinearMath/btScalar.h BT_BULLET_VERSION)
 
-# Find the libraries
-
-#_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY        BulletDynamics)
-#_FIND_BULLET_LIBRARY(BULLET_DYNAMICS_LIBRARY_DEBUG  BulletDynamics_Debug BulletDynamics_d)
-_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY       BulletCollision)
-_FIND_BULLET_LIBRARY(BULLET_COLLISION_LIBRARY_DEBUG BulletCollision_Debug BulletCollision_d)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY            BulletMath LinearMath)
-_FIND_BULLET_LIBRARY(BULLET_MATH_LIBRARY_DEBUG      BulletMath_Debug BulletMath_d LinearMath_debug LinearMath_d)
-
-
-# handle the QUIETLY and REQUIRED arguments and set BULLET_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet DEFAULT_MSG
-    #BULLET_DYNAMICS_LIBRARY
-    BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
-    BULLET_INCLUDE_DIR)
-
-set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
-if(BULLET_FOUND)
-   #_BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_DYNAMICS_LIBRARY)
-   _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_COLLISION_LIBRARY)
-   _BULLET_APPEND_LIBRARIES(BULLET_LIBRARIES BULLET_MATH_LIBRARY)
-
-    find_file(BULLET_BTSCALAR_FILE NAMES btScalar.h PATHS "${BULLET_INCLUDE_DIR}/LinearMath")
-    file(READ ${BULLET_BTSCALAR_FILE} BULLET_BTSCALAR_CONTENT)
-    get_preprocessor_entry(BULLET_BTSCALAR_CONTENT BT_BULLET_VERSION BULLET_VERSION)
-    message(STATUS "Bullet version: ${BULLET_VERSION}")
-endif()
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bullet
+    FOUND_VAR Bullet_FOUND
+    VERSION_VAR Bullet_VERSION
+    HANDLE_COMPONENTS
+    REQUIRED_VARS
+        Bullet_LIBRARIES
+        Bullet_INCLUDE_DIR
+)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index db8904f2b2..7a07cd59ec 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -181,7 +181,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     endif()
 endif ()
 
-include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Bullet_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(components STATIC ${COMPONENT_FILES} ${MOC_SRCS} ${ESM_UI_HDR})
 
@@ -205,7 +205,7 @@ target_link_libraries(components
     ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
     ${OSGANIMATION_LIBRARIES}
-    ${BULLET_LIBRARIES}
+    ${Bullet_LIBRARIES}
     ${SDL2_LIBRARY}
     # For MyGUI platform
     ${GL_LIB}

From 2ce1da688f71b0a07fc3385b606fc1872d3745f6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 2 Jun 2016 16:25:23 +0200
Subject: [PATCH 678/765] ESS-Import: fix handling of first person camera state
 (Bug #3416)

---
 apps/essimporter/convertplayer.cpp | 2 +-
 apps/essimporter/importplayer.hpp  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/essimporter/convertplayer.cpp b/apps/essimporter/convertplayer.cpp
index 5718201f74..00a2a10f51 100644
--- a/apps/essimporter/convertplayer.cpp
+++ b/apps/essimporter/convertplayer.cpp
@@ -28,7 +28,7 @@ namespace ESSImport
         if (pcdt.mPNAM.mDrawState & PCDT::DrawState_Spell)
             out.mObject.mCreatureStats.mDrawState = 2;
 
-        firstPersonCam = (pcdt.mPNAM.mCameraState == PCDT::CameraState_FirstPerson);
+        firstPersonCam = !(pcdt.mPNAM.mCameraFlags & PCDT::CameraFlag_ThirdPerson);
 
         for (std::vector<std::string>::const_iterator it = pcdt.mKnownDialogueTopics.begin();
              it != pcdt.mKnownDialogueTopics.end(); ++it)
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index bc6b94be28..3e537cc162 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -43,10 +43,9 @@ struct PCDT
         DrawState_Weapon = 0x80,
         DrawState_Spell = 0x100
     };
-    enum CameraState
+    enum CameraFlags
     {
-        CameraState_FirstPerson = 0x8,
-        CameraState_ThirdPerson = 0xa
+        CameraFlag_ThirdPerson = 0x2
     };
 
 #pragma pack(push)
@@ -64,7 +63,7 @@ struct PCDT
     struct PNAM
     {
         short mDrawState; // DrawState
-        short mCameraState; // CameraState
+        short mCameraFlags; // CameraFlags
         unsigned int mLevelProgress;
         float mSkillProgress[27]; // skill progress, non-uniform scaled
         unsigned char mSkillIncreases[8]; // number of skill increases for each attribute

From ab2089bbf35bfb7f6636d8bfb1ab45ce51836580 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 2 Jun 2016 21:19:02 +0200
Subject: [PATCH 679/765] Throw an exception if placeAt is passed an invalid
 direction parameter

---
 apps/openmw/mwscript/transformationextensions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index e9e13e74f6..abde8c973b 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -508,6 +508,9 @@ namespace MWScript
                     Interpreter::Type_Integer direction = runtime[0].mInteger;
                     runtime.pop();
 
+                    if (direction < 0 || direction > 3)
+                        throw std::runtime_error ("invalid direction");
+
                     if (count<0)
                         throw std::runtime_error ("count must be non-negative");
 

From 3645b3357e224db2a5e52c1d91f8f0e7afa68017 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 2 Jun 2016 21:24:19 +0200
Subject: [PATCH 680/765] Fix improper assignement of spawn point in placeAt
 for non-actors (Bug #3417)

---
 apps/openmw/mwworld/worldimp.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 22a8daa9bf..cb6f8b195b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1326,10 +1326,11 @@ namespace MWWorld
 
         int fallbackDirections[4] = {direction, (direction+3)%4, (direction+2)%4, (direction+1)%4};
 
+        osg::Vec3f spawnPoint = pos;
+
         for (int i=0; i<4; ++i)
         {
             direction = fallbackDirections[i];
-            osg::Vec3f spawnPoint = pos;
             if (direction == 0) spawnPoint = pos + (orientation * osg::Vec3f(0,1,0)) * distance;
             else if(direction == 1) spawnPoint = pos - (orientation * osg::Vec3f(0,1,0)) * distance;
             else if(direction == 2) spawnPoint = pos - (orientation * osg::Vec3f(1,0,0)) * distance;
@@ -1345,12 +1346,12 @@ namespace MWWorld
                                                                pos.x(), pos.y(), pos.z() + 20))
             {
                 // safe
-                ipos.pos[0] = spawnPoint.x();
-                ipos.pos[1] = spawnPoint.y();
-                ipos.pos[2] = spawnPoint.z();
                 break;
             }
         }
+        ipos.pos[0] = spawnPoint.x();
+        ipos.pos[1] = spawnPoint.y();
+        ipos.pos[2] = spawnPoint.z();
 
         if (!referenceObject.getClass().isActor())
         {

From 5085afa3d775906d1ccae4004cc1fd2a0e7944b9 Mon Sep 17 00:00:00 2001
From: Ben Shealy <bentshermann@gmail.com>
Date: Sat, 4 Jun 2016 12:28:47 -0400
Subject: [PATCH 681/765] Moved mechanics code from MWGui::TradeWindow to
 MWMechanics::Trading

---
 apps/openmw/CMakeLists.txt          |  2 +-
 apps/openmw/mwgui/tradewindow.cpp   | 84 +++++------------------------
 apps/openmw/mwgui/tradewindow.hpp   |  3 ++
 apps/openmw/mwmechanics/trading.cpp | 84 +++++++++++++++++++++++++++++
 apps/openmw/mwmechanics/trading.hpp | 17 ++++++
 5 files changed, 119 insertions(+), 71 deletions(-)
 create mode 100644 apps/openmw/mwmechanics/trading.cpp
 create mode 100644 apps/openmw/mwmechanics/trading.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 5e84f6086d..fc480d2558 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -84,7 +84,7 @@ add_openmw_dir (mwmechanics
     drawstate spells activespells npcstats aipackage aisequence aipursue alchemy aiwander aitravel aifollow aiavoiddoor
     aiescort aiactivate aicombat repair enchanting pathfinding pathgrid security spellsuccess spellcasting
     disease pickpocket levelledlist combat steering obstacle autocalcspell difficultyscaling aicombataction actor summoning
-    character actors objects aistate coordinateconverter
+    character actors objects aistate coordinateconverter trading
     )
 
 add_openmw_dir (mwstate
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index ed81677e46..e191c16bb4 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -4,8 +4,6 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_ControllerManager.h>
 
-#include <components/misc/rng.hpp>
-
 #include <components/widgets/numericeditbox.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -19,8 +17,8 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"
 #include "itemview.hpp"
@@ -323,77 +321,23 @@ namespace MWGui
             }
         }
 
-        // TODO: move to mwmechanics
+        bool offerAccepted = mTrading.haggle(player, mPtr, mCurrentBalance, mCurrentMerchantOffer);
 
-        // Is the player buying?
-        bool buying = (mCurrentMerchantOffer < 0);
+        // apply disposition change if merchant is NPC
+        if ( mPtr.getClass().isNpc() ) {
+            int dispositionDelta = offerAccepted
+                ? gmst.find("iBarterSuccessDisposition")->getInt()
+                : gmst.find("iBarterFailDisposition")->getInt();
 
-        if(mCurrentBalance > mCurrentMerchantOffer)
-        {
-            //if npc is a creature: reject (no haggle)
-            if (mPtr.getTypeName() != typeid(ESM::NPC).name())
-            {
-                MWBase::Environment::get().getWindowManager()->
-                    messageBox("#{sNotifyMessage9}");
-                return;
-            }
-
-            int a = abs(mCurrentMerchantOffer);
-            int b = abs(mCurrentBalance);
-            int d = 0;
-            if (buying)
-                d = int(100 * (a - b) / a);
-            else
-                d = int(100 * (b - a) / a);
-
-            int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr);
-
-            const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
-            const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
-
-            float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
-            float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
-            float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
-            float d1 = static_cast<float>(mPtr.getClass().getSkill(mPtr, ESM::Skill::Mercantile));
-            float e1 = 0.1f * sellerStats.getAttribute(ESM::Attribute::Luck).getModified();
-            float f1 = 0.2f * sellerStats.getAttribute(ESM::Attribute::Personality).getModified();
-
-            float dispositionTerm = gmst.find("fDispositionMod")->getFloat() * (clampedDisposition - 50);
-            float pcTerm = (dispositionTerm - 50 + a1 + b1 + c1) * playerStats.getFatigueTerm();
-            float npcTerm = (d1 + e1 + f1) * sellerStats.getFatigueTerm();
-            float x = gmst.find("fBargainOfferMulti")->getFloat() * d + gmst.find("fBargainOfferBase")->getFloat();
-            if (buying)
-                x += abs(int(pcTerm - npcTerm));
-            else
-                x += abs(int(npcTerm - pcTerm));
-
-            int roll = Misc::Rng::rollDice(100) + 1;
-            if(roll > x || (mCurrentMerchantOffer < 0) != (mCurrentBalance < 0)) //trade refused
-            {
-                MWBase::Environment::get().getWindowManager()->
-                    messageBox("#{sNotifyMessage9}");
-
-                int iBarterFailDisposition = gmst.find("iBarterFailDisposition")->getInt();
-                if (mPtr.getClass().isNpc())
-                    MWBase::Environment::get().getDialogueManager()->applyDispositionChange(iBarterFailDisposition);
-                return;
-            }
-
-            //skill use!
-            float skillGain = 0.f;
-            int finalPrice = std::abs(mCurrentBalance);
-            int initialMerchantOffer = std::abs(mCurrentMerchantOffer);
-            if (!buying && (finalPrice > initialMerchantOffer) && finalPrice > 0)
-                skillGain = floor(100 * (finalPrice - initialMerchantOffer) / float(finalPrice));
-            else if (buying && (finalPrice < initialMerchantOffer) && initialMerchantOffer > 0)
-                skillGain = floor(100 * (initialMerchantOffer - finalPrice) / float(initialMerchantOffer));
-
-            player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
+            MWBase::Environment::get().getDialogueManager()->applyDispositionChange(dispositionDelta);
         }
 
-        int iBarterSuccessDisposition = gmst.find("iBarterSuccessDisposition")->getInt();
-        if (mPtr.getClass().isNpc())
-            MWBase::Environment::get().getDialogueManager()->applyDispositionChange(iBarterSuccessDisposition);
+        // display message on haggle failure
+        if ( !offerAccepted ) {
+            MWBase::Environment::get().getWindowManager()->
+                messageBox("#{sNotifyMessage9}");
+            return;
+        }
 
         // make the item transfer
         mTradeModel->transferItems();
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index a23196d70e..4b03c8d904 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -1,6 +1,8 @@
 #ifndef MWGUI_TRADEWINDOW_H
 #define MWGUI_TRADEWINDOW_H
 
+#include "../mwmechanics/trading.hpp"
+
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"
 
@@ -40,6 +42,7 @@ namespace MWGui
             ItemView* mItemView;
             SortFilterItemModel* mSortModel;
             TradeItemModel* mTradeModel;
+            MWMechanics::Trading mTrading;
 
             static const float sBalanceChangeInitialPause; // in seconds
             static const float sBalanceChangeInterval; // in seconds
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
new file mode 100644
index 0000000000..c4ef5103e3
--- /dev/null
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -0,0 +1,84 @@
+#include "trading.hpp"
+
+#include <components/misc/rng.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwmechanics/creaturestats.hpp"
+
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
+namespace MWMechanics
+{
+    Trading::Trading() {}
+
+    bool Trading::haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer)
+    {
+        // accept if merchant offer is better than player offer
+        if ( playerOffer <= merchantOffer ) {
+            return true;
+        }
+
+        // reject if npc is a creature
+        if ( merchant.getTypeName() != typeid(ESM::NPC).name() ) {
+            return false;
+        }
+
+        const MWWorld::Store<ESM::GameSetting> &gmst =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+        // Is the player buying?
+        bool buying = (merchantOffer < 0);
+
+        int a = std::abs(merchantOffer);
+        int b = std::abs(playerOffer);
+        int d = (buying)
+            ? int(100 * (a - b) / a)
+            : int(100 * (b - a) / a);
+
+        int clampedDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(merchant);
+
+        const MWMechanics::CreatureStats &merchantStats = merchant.getClass().getCreatureStats(merchant);
+        const MWMechanics::CreatureStats &playerStats = player.getClass().getCreatureStats(player);
+
+        float a1 = static_cast<float>(player.getClass().getSkill(player, ESM::Skill::Mercantile));
+        float b1 = 0.1f * playerStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float c1 = 0.2f * playerStats.getAttribute(ESM::Attribute::Personality).getModified();
+        float d1 = static_cast<float>(merchant.getClass().getSkill(merchant, ESM::Skill::Mercantile));
+        float e1 = 0.1f * merchantStats.getAttribute(ESM::Attribute::Luck).getModified();
+        float f1 = 0.2f * merchantStats.getAttribute(ESM::Attribute::Personality).getModified();
+
+        float dispositionTerm = gmst.find("fDispositionMod")->getFloat() * (clampedDisposition - 50);
+        float pcTerm = (dispositionTerm - 50 + a1 + b1 + c1) * playerStats.getFatigueTerm();
+        float npcTerm = (d1 + e1 + f1) * merchantStats.getFatigueTerm();
+        float x = gmst.find("fBargainOfferMulti")->getFloat() * d
+            + gmst.find("fBargainOfferBase")->getFloat()
+            + std::abs(int(pcTerm - npcTerm));
+
+        int roll = Misc::Rng::rollDice(100) + 1;
+
+        // reject if roll fails
+        // (or if player tries to buy things and get money)
+        if ( roll > x || (merchantOffer < 0 && 0 < playerOffer) ) {
+            return false;
+        }
+
+        // apply skill gain on successful barter
+        float skillGain = 0.f;
+        int finalPrice = std::abs(playerOffer);
+        int initialMerchantOffer = std::abs(merchantOffer);
+
+        if ( !buying && (finalPrice > initialMerchantOffer) ) {
+            skillGain = floor(100.f * (finalPrice - initialMerchantOffer) / finalPrice);
+        }
+        else if ( buying && (finalPrice < initialMerchantOffer) ) {
+            skillGain = floor(100.f * (initialMerchantOffer - finalPrice) / initialMerchantOffer);
+        }
+        player.getClass().skillUsageSucceeded(player, ESM::Skill::Mercantile, 0, skillGain);
+
+        return true;
+    }
+}
diff --git a/apps/openmw/mwmechanics/trading.hpp b/apps/openmw/mwmechanics/trading.hpp
new file mode 100644
index 0000000000..e006370dde
--- /dev/null
+++ b/apps/openmw/mwmechanics/trading.hpp
@@ -0,0 +1,17 @@
+#ifndef OPENMW_MECHANICS_TRADING_H
+#define OPENMW_MECHANICS_TRADING_H
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWMechanics
+{
+    class Trading
+    {
+    public:
+        Trading();
+
+        bool haggle(const MWWorld::Ptr& player, const MWWorld::Ptr& merchant, int playerOffer, int merchantOffer);
+    };
+}
+
+#endif

From 3409d8a9227564b9498e6331789650be9355e214 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Sat, 4 Jun 2016 12:38:17 -0400
Subject: [PATCH 682/765] Change pathgrid node movement to be visually
 consistent, some renaming

---
 apps/opencs/view/render/pathgrid.cpp     | 131 ++++++++++-------------
 apps/opencs/view/render/pathgrid.hpp     |  19 ++--
 apps/opencs/view/render/pathgridmode.cpp |   6 +-
 3 files changed, 68 insertions(+), 88 deletions(-)

diff --git a/apps/opencs/view/render/pathgrid.cpp b/apps/opencs/view/render/pathgrid.cpp
index a284717829..9eb2765d38 100644
--- a/apps/opencs/view/render/pathgrid.cpp
+++ b/apps/opencs/view/render/pathgrid.cpp
@@ -55,14 +55,13 @@ namespace CSVRender
         , mId(pathgridId)
         , mCoords(coordinates)
         , mInterior(false)
-        , mConnectionIndicator(false)
-        , mConnectionNode(0)
+        , mDragOrigin(0)
         , mChangeGeometry(true)
         , mRemoveGeometry(false)
+        , mUseOffset(true)
         , mParent(parent)
         , mPathgridGeometry(0)
-        , mSelectedGeometry(0)
-        , mConnectionGeometry(0)
+        , mDragGeometry(0)
         , mTag(new PathgridTag(this))
     {
         const float CoordScalar = ESM::Land::REAL_SIZE;
@@ -74,15 +73,9 @@ namespace CSVRender
         mBaseNode->setNodeMask(Mask_Pathgrid);
         mParent->addChild(mBaseNode);
 
-        mSelectedNode = new osg::PositionAttitudeTransform();
-        mBaseNode->addChild(mSelectedNode);
-
         mPathgridGeode = new osg::Geode();
         mBaseNode->addChild(mPathgridGeode);
 
-        mSelectedGeode = new osg::Geode();
-        mSelectedNode->addChild(mSelectedGeode);
-
         recreateGeometry();
 
         int index = mData.getCells().searchId(mId);
@@ -181,67 +174,56 @@ namespace CSVRender
 
     void Pathgrid::moveSelected(const osg::Vec3d& offset)
     {
-        mSelectedNode->setPosition(mSelectedNode->getPosition() + offset);
+        mUseOffset = true;
+        mMoveOffset += offset;
+
+        recreateGeometry();
     }
 
-    void Pathgrid::setupConnectionIndicator(unsigned short node)
+    void Pathgrid::setDragOrigin(unsigned short node)
     {
-        mConnectionIndicator = true;
-        mConnectionNode = node;
-        createSelectedGeometry();
+        mDragOrigin = node;
     }
 
-    void Pathgrid::adjustConnectionIndicator(unsigned short node)
+    void Pathgrid::setDragEndpoint(unsigned short node)
     {
-        if (mConnectionIndicator)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid* source = getPathgridSource();
-            if (source)
-            {
-                const CSMWorld::Pathgrid::Point& pointA = source->mPoints[mConnectionNode];
-                const CSMWorld::Pathgrid::Point& pointB = source->mPoints[node];
+            const CSMWorld::Pathgrid::Point& pointA = source->mPoints[mDragOrigin];
+            const CSMWorld::Pathgrid::Point& pointB = source->mPoints[node];
 
-                osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
-                osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
+            osg::Vec3f start = osg::Vec3f(pointA.mX, pointA.mY, pointA.mZ + SceneUtil::DiamondHalfHeight);
+            osg::Vec3f end = osg::Vec3f(pointB.mX, pointB.mY, pointB.mZ + SceneUtil::DiamondHalfHeight);
 
-                createConnectionGeometry(start, end, true);
-            }
+            createDragGeometry(start, end, true);
         }
     }
 
-    void Pathgrid::adjustConnectionIndicator(const osg::Vec3d& pos)
+    void Pathgrid::setDragEndpoint(const osg::Vec3d& pos)
     {
-        if (mConnectionIndicator)
+        const CSMWorld::Pathgrid* source = getPathgridSource();
+        if (source)
         {
-            const CSMWorld::Pathgrid* source = getPathgridSource();
-            if (source)
-            {
-                const CSMWorld::Pathgrid::Point& point = source->mPoints[mConnectionNode];
+            const CSMWorld::Pathgrid::Point& point = source->mPoints[mDragOrigin];
 
-                osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
-                osg::Vec3f end = pos - mBaseNode->getPosition();
-                createConnectionGeometry(start, end, false);
-            }
+            osg::Vec3f start = osg::Vec3f(point.mX, point.mY, point.mZ + SceneUtil::DiamondHalfHeight);
+            osg::Vec3f end = pos - mBaseNode->getPosition();
+            createDragGeometry(start, end, false);
         }
     }
 
     void Pathgrid::resetIndicators()
     {
-        mSelectedNode->setPosition(osg::Vec3f(0,0,0));
-        if (mConnectionIndicator)
-        {
-            mConnectionIndicator = false;
+        mUseOffset = false;
+        mMoveOffset.set(0, 0, 0);
 
-            mPathgridGeode->removeDrawable(mConnectionGeometry);
-            mConnectionGeometry = 0;
-
-            createSelectedGeometry();
-        }
+        mPathgridGeode->removeDrawable(mDragGeometry);
+        mDragGeometry = 0;
     }
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
     {
-
         CSMWorld::IdTree* model = dynamic_cast<CSMWorld::IdTree*>(mData.getTableModel(
                 CSMWorld::UniversalId::Type_Pathgrids));
 
@@ -310,7 +292,7 @@ namespace CSVRender
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
-            osg::Vec3d localCoords = mSelectedNode->getPosition();
+            osg::Vec3d localCoords = mMoveOffset;
 
             int offsetX = static_cast<int>(localCoords.x());
             int offsetY = static_cast<int>(localCoords.y());
@@ -525,6 +507,21 @@ namespace CSVRender
         const CSMWorld::Pathgrid* source = getPathgridSource();
         if (source)
         {
+            CSMWorld::Pathgrid temp;
+            if (mUseOffset)
+            {
+                temp = *source;
+
+                for (NodeList::iterator it = mSelected.begin(); it != mSelected.end(); ++it)
+                {
+                    temp.mPoints[*it].mX += mMoveOffset.x();
+                    temp.mPoints[*it].mY += mMoveOffset.y();
+                    temp.mPoints[*it].mZ += mMoveOffset.z();
+                }
+
+                source = &temp;
+            }
+
             removePathgridGeometry();
             mPathgridGeometry = SceneUtil::createPathgridGeometry(*source);
             mPathgridGeode->addDrawable(mPathgridGeometry);
@@ -555,24 +552,8 @@ namespace CSVRender
     {
         removeSelectedGeometry();
 
-        if (mConnectionIndicator)
-        {
-            NodeList tempList = NodeList(mSelected);
-
-            NodeList::iterator searchResult = std::find(tempList.begin(), tempList.end(), mConnectionNode);
-            if (searchResult != tempList.end())
-                tempList.erase(searchResult);
-
-            tempList.push_back(mConnectionNode);
-
-            mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, tempList);
-            mSelectedGeode->addDrawable(mSelectedGeometry);
-        }
-        else
-        {
-            mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
-            mSelectedGeode->addDrawable(mSelectedGeometry);
-        }
+        mSelectedGeometry = SceneUtil::createPathgridSelectedWireframe(source, mSelected);
+        mPathgridGeode->addDrawable(mSelectedGeometry);
     }
 
     void Pathgrid::removePathgridGeometry()
@@ -588,17 +569,17 @@ namespace CSVRender
     {
         if (mSelectedGeometry)
         {
-            mSelectedGeode->removeDrawable(mSelectedGeometry);
+            mPathgridGeode->removeDrawable(mSelectedGeometry);
             mSelectedGeometry = 0;
         }
     }
 
-    void Pathgrid::createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
+    void Pathgrid::createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid)
     {
-        if (mConnectionGeometry)
-            mPathgridGeode->removeDrawable(mConnectionGeometry);
+        if (mDragGeometry)
+            mPathgridGeode->removeDrawable(mDragGeometry);
 
-        mConnectionGeometry = new osg::Geometry();
+        mDragGeometry = new osg::Geometry();
 
         osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array(2);
         osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array(1);
@@ -619,12 +600,12 @@ namespace CSVRender
         indices->setElement(0, 0);
         indices->setElement(1, 1);
 
-        mConnectionGeometry->setVertexArray(vertices);
-        mConnectionGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
-        mConnectionGeometry->addPrimitiveSet(indices);
-        mConnectionGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        mDragGeometry->setVertexArray(vertices);
+        mDragGeometry->setColorArray(colors, osg::Array::BIND_OVERALL);
+        mDragGeometry->addPrimitiveSet(indices);
+        mDragGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-        mPathgridGeode->addDrawable(mConnectionGeometry);
+        mPathgridGeode->addDrawable(mDragGeometry);
     }
 
     const CSMWorld::Pathgrid* Pathgrid::getPathgridSource()
diff --git a/apps/opencs/view/render/pathgrid.hpp b/apps/opencs/view/render/pathgrid.hpp
index 415b252e0d..181a62b442 100644
--- a/apps/opencs/view/render/pathgrid.hpp
+++ b/apps/opencs/view/render/pathgrid.hpp
@@ -5,6 +5,7 @@
 
 #include <QString>
 #include <osg/ref_ptr>
+#include <osg/Vec3d>
 
 #include "../../model/world/cellcoordinates.hpp"
 #include "../../model/world/idcollection.hpp"
@@ -18,7 +19,6 @@ namespace osg
     class Geometry;
     class Group;
     class PositionAttitudeTransform;
-    class Vec3d;
 }
 
 namespace CSMWorld
@@ -69,9 +69,9 @@ namespace CSVRender
             void clearSelected();
 
             void moveSelected(const osg::Vec3d& offset);
-            void setupConnectionIndicator(unsigned short node);
-            void adjustConnectionIndicator(unsigned short node);
-            void adjustConnectionIndicator(const osg::Vec3d& pos);
+            void setDragOrigin(unsigned short node);
+            void setDragEndpoint(unsigned short node);
+            void setDragEndpoint(const osg::Vec3d& pos);
 
             void resetIndicators();
 
@@ -98,20 +98,19 @@ namespace CSVRender
             bool mInterior;
 
             NodeList mSelected;
-            bool mConnectionIndicator;
-            unsigned short mConnectionNode;
+            osg::Vec3d mMoveOffset;
+            unsigned short mDragOrigin;
 
             bool mChangeGeometry;
             bool mRemoveGeometry;
+            bool mUseOffset;
 
             osg::Group* mParent;
             osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-            osg::ref_ptr<osg::PositionAttitudeTransform> mSelectedNode;
             osg::ref_ptr<osg::Geode> mPathgridGeode;
-            osg::ref_ptr<osg::Geode> mSelectedGeode;
             osg::ref_ptr<osg::Geometry> mPathgridGeometry;
             osg::ref_ptr<osg::Geometry> mSelectedGeometry;
-            osg::ref_ptr<osg::Geometry> mConnectionGeometry;
+            osg::ref_ptr<osg::Geometry> mDragGeometry;
 
             osg::ref_ptr<PathgridTag> mTag;
 
@@ -121,7 +120,7 @@ namespace CSVRender
             void removePathgridGeometry();
             void removeSelectedGeometry();
 
-            void createConnectionGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
+            void createDragGeometry(const osg::Vec3f& start, const osg::Vec3f& end, bool valid);
 
             const CSMWorld::Pathgrid* getPathgridSource();
 
diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 714c548a76..87ec805564 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -163,7 +163,7 @@ namespace CSVRender
                 mEdgeId = tag->getPathgrid()->getId();
                 mFromNode = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
 
-                tag->getPathgrid()->setupConnectionIndicator(mFromNode);
+                tag->getPathgrid()->setDragOrigin(mFromNode);
                 return true;
             }
         }
@@ -201,11 +201,11 @@ namespace CSVRender
                 if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
                 {
                     unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));
-                    cell->getPathgrid()->adjustConnectionIndicator(node);
+                    cell->getPathgrid()->setDragEndpoint(node);
                 }
                 else
                 {
-                    cell->getPathgrid()->adjustConnectionIndicator(hit.worldPos);
+                    cell->getPathgrid()->setDragEndpoint(hit.worldPos);
                 }
 
             }

From 065d6a391d8eab6d35baf87f42a15e37f109ff5e Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Mon, 6 Jun 2016 01:14:17 +0900
Subject: [PATCH 683/765] Don't repeat sequences of only one non-wander AI

---
 apps/openmw/mwmechanics/aipackage.cpp  |  2 +-
 apps/openmw/mwmechanics/aipackage.hpp  |  3 +--
 apps/openmw/mwmechanics/aisequence.cpp | 23 +++++++++++++++++++++--
 apps/openmw/mwmechanics/aisequence.hpp |  3 +++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index b08f922763..aefb39f6b5 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -47,7 +47,7 @@ bool MWMechanics::AiPackage::shouldCancelPreviousAi() const
 
 bool MWMechanics::AiPackage::getRepeat() const
 {
-    return true;
+    return false;
 }
 
 MWMechanics::AiPackage::AiPackage() : mTimer(0.26f), mStarted(false) { //mTimer starts at .26 to force initial pathbuild
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index 0cf2854796..fb862189d1 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -87,8 +87,7 @@ namespace MWMechanics
             /// Upon adding this Ai package, should the Ai Sequence attempt to cancel previous Ai packages (default true)?
             virtual bool shouldCancelPreviousAi() const;
 
-            /// Return true if this package should repeat. Can only be false for AIWander, if AIWander is assigned
-            /// assigned through the console or script.
+            /// Return true if this package should repeat. Currently only used for Wander packages.
             virtual bool getRepeat() const;
 
             bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 11f3908546..412df3742d 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -29,13 +29,14 @@ void AiSequence::copy (const AiSequence& sequence)
         mPackages.push_back ((*iter)->clone());
 }
 
-AiSequence::AiSequence() : mDone (false), mLastAiPackage(-1) {}
+AiSequence::AiSequence() : mDone (false), mRepeat(false), mLastAiPackage(-1) {}
 
 AiSequence::AiSequence (const AiSequence& sequence)
 {
     copy (sequence);
     mDone = sequence.mDone;
     mLastAiPackage = sequence.mLastAiPackage;
+    mRepeat = sequence.mRepeat;
 }
 
 AiSequence& AiSequence::operator= (const AiSequence& sequence)
@@ -231,7 +232,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
         if (package->execute (actor,characterController,state,duration))
         {
             // Put repeating noncombat AI packages on the end of the stack so they can be used again
-            if (isActualAiPackage(packageTypeId) && package->getRepeat())
+            if (isActualAiPackage(packageTypeId) && (mRepeat || package->getRepeat()))
             {
                 mPackages.push_back(package->clone());
             }
@@ -292,6 +293,7 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
             else
                 ++it;
         }
+        mRepeat=false;
     }
 
     // insert new package in correct place depending on priority
@@ -317,6 +319,10 @@ AiPackage* MWMechanics::AiSequence::getActivePackage()
 
 void AiSequence::fill(const ESM::AIPackageList &list)
 {
+    // If there is more than one package in the list, enable repeating
+    if (!list.mList.empty() && list.mList.begin() != (list.mList.end()-1))
+        mRepeat = true;
+
     for (std::vector<ESM::AIPackage>::const_iterator it = list.mList.begin(); it != list.mList.end(); ++it)
     {
         MWMechanics::AiPackage* package;
@@ -366,6 +372,19 @@ void AiSequence::readState(const ESM::AiSequence::AiSequence &sequence)
     if (!sequence.mPackages.empty())
         clear();
 
+    // If there is more than one non-combat, non-pursue package in the list, enable repeating.
+    int count = 0;
+    for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
+         it != sequence.mPackages.end(); ++it)
+    {    
+        if (isActualAiPackage(it->mType))
+            count++;
+    }
+
+    if (count > 1)
+        mRepeat = true;
+
+    // Load packages
     for (std::vector<ESM::AiSequence::AiPackageContainer>::const_iterator it = sequence.mPackages.begin();
          it != sequence.mPackages.end(); ++it)
     {
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 1eefe7c697..0c200c26bf 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -40,6 +40,9 @@ namespace MWMechanics
             ///Finished with top AIPackage, set for one frame
             bool mDone;
 
+            ///Does this AI sequence repeat (repeating of Wander packages handled separately)
+            bool mRepeat;
+
             ///Copy AiSequence
             void copy (const AiSequence& sequence);
 

From 9eab3b172824e3c2afabf8c03ece45d7d2d49606 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 6 Jun 2016 01:04:14 +0200
Subject: [PATCH 684/765] Fix crash in race dialog when no head or hair are
 available

---
 apps/openmw/mwgui/race.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index aa229de72d..6c08f7dc1a 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -326,8 +326,11 @@ namespace MWGui
         record.mRace = mCurrentRaceId;
         record.setIsMale(mGenderIndex == 0);
 
-        record.mHead = mAvailableHeads[mFaceIndex];
-        record.mHair = mAvailableHairs[mHairIndex];
+        if (mFaceIndex >= 0 && mFaceIndex < int(mAvailableHeads.size()))
+            record.mHead = mAvailableHeads[mFaceIndex];
+
+        if (mHairIndex >= 0 && mHairIndex < int(mAvailableHairs.size()))
+            record.mHair = mAvailableHairs[mHairIndex];
 
         try
         {

From a1f323f5283aae895f4d2dc3c5ddece22a05f4b3 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 6 Jun 2016 13:32:27 +0200
Subject: [PATCH 685/765] Fix build against OSG 3.5.3

---
 extern/osgQt/GraphicsWindowQt     |  3 ---
 extern/osgQt/GraphicsWindowQt.cpp | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/extern/osgQt/GraphicsWindowQt b/extern/osgQt/GraphicsWindowQt
index ad456ef445..3be1da0515 100644
--- a/extern/osgQt/GraphicsWindowQt
+++ b/extern/osgQt/GraphicsWindowQt
@@ -37,9 +37,6 @@ namespace osgQt
 // forward declarations
 class GraphicsWindowQt;
 
-/// The function sets the WindowingSystem to Qt.
-void initQtWindowingSystem();
-
 /** The function sets the viewer that will be used after entering
  *  the Qt main loop (QCoreApplication::exec()).
  *
diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
index 46df7216ce..78a2ae6161 100644
--- a/extern/osgQt/GraphicsWindowQt.cpp
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -639,20 +639,6 @@ private:
 };
 
 
-// declare C entry point for static compilation.
-extern "C" void graphicswindow_Qt(void)
-{
-    osg::GraphicsContext::setWindowingSystemInterface(QtWindowingSystem::getInterface());
-}
-
-
-void osgQt::initQtWindowingSystem()
-{
-    graphicswindow_Qt();
-}
-
-
-
 void osgQt::setViewer( osgViewer::ViewerBase *viewer )
 {
     HeartBeat::instance()->init( viewer );

From f64bc3c7efef603046daf51071bb94c2ce3b411f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 6 Jun 2016 23:50:22 +0200
Subject: [PATCH 686/765] Pass the victim to commitCrime on pickpocket
 detection (Fixes #3424)

---
 apps/openmw/mwgui/container.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index e1b5c120af..00df18e1db 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -271,7 +271,7 @@ namespace MWGui
             {
                 int value = item.mBase.getClass().getValue(item.mBase) * count;
                 MWBase::Environment::get().getMechanicsManager()->commitCrime(
-                            player, MWWorld::Ptr(), MWBase::MechanicsManager::OT_Theft, value, true);
+                            player, mPtr, MWBase::MechanicsManager::OT_Theft, value, true);
                 MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
                 mPickpocketDetected = true;
                 return false;

From dfc2f3469acd8197a491024cd21252806591b341 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jun 2016 01:36:09 +0200
Subject: [PATCH 687/765] Don't play music if no playlist is set

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index ae8601594a..4d1aa0b4db 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -837,7 +837,7 @@ namespace MWSound
         timePassed = 0.0f;
 
         // Make sure music is still playing
-        if(!isMusicPlaying())
+        if(!isMusicPlaying() && !mCurrentPlaylist.empty())
             startRandomTitle();
 
         Environment env = Env_Normal;

From f417d7780a95ac4a84e3cc18cfe1334e11e4c60f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jun 2016 01:53:16 +0200
Subject: [PATCH 688/765] Fix the enemy nearby check (Bug #3423)

---
 apps/openmw/mwbase/mechanicsmanager.hpp       |  2 +
 apps/openmw/mwinput/inputmanagerimp.cpp       |  2 +-
 apps/openmw/mwmechanics/actors.cpp            | 45 +++++++++++++------
 apps/openmw/mwmechanics/actors.hpp            |  3 ++
 .../mwmechanics/mechanicsmanagerimp.cpp       |  6 ++-
 .../mwmechanics/mechanicsmanagerimp.hpp       |  1 +
 apps/openmw/mwworld/player.cpp                |  5 +++
 apps/openmw/mwworld/player.hpp                |  2 +
 8 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index e43d1fdc10..690afab956 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -193,6 +193,8 @@ namespace MWBase
             /** ie AiCombat is active and the target is the actor **/
             virtual std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor) = 0;
 
+            virtual std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor) = 0;
+
             virtual void playerLoaded() = 0;
 
             virtual int countSavedGameRecords() const = 0;
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index de589e7bb0..6c2e695e6b 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -957,7 +957,7 @@ namespace MWInput
         if (!MWBase::Environment::get().getWindowManager()->getRestEnabled () || MWBase::Environment::get().getWindowManager()->isGuiMode ())
             return;
 
-        if(mPlayer->isInCombat()) {//Check if in combat
+        if(mPlayer->enemiesNearby()) {//Check if in combat
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}"); //Nope,
             return;
         }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 4a689d964e..ecda432a75 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -145,6 +145,9 @@ void getRestorationPerHourOfSleep (const MWWorld::Ptr& ptr, float& health, float
 namespace MWMechanics
 {
 
+    const float aiProcessingDistance = 7168;
+    const float sqrAiProcessingDistance = aiProcessingDistance*aiProcessingDistance;
+
     class SoulTrap : public MWMechanics::EffectSourceVisitor
     {
         MWWorld::Ptr mCreature;
@@ -291,7 +294,7 @@ namespace MWMechanics
         const ESM::Position& actor1Pos = actor1.getRefData().getPosition();
         const ESM::Position& actor2Pos = actor2.getRefData().getPosition();
         float sqrDist = (actor1Pos.asVec3() - actor2Pos.asVec3()).length2();
-        if (sqrDist > 7168*7168)
+        if (sqrDist > sqrAiProcessingDistance)
             return;
 
         // pure water creatures won't try to fight with the target on the ground
@@ -974,19 +977,17 @@ namespace MWMechanics
 
             int hostilesCount = 0; // need to know this to play Battle music
 
-            // AI processing is only done within distance of 7168 units to the player. Note the "AI distance" slider doesn't affect this
-            // (it only does some throttling for targets beyond the "AI distance", so doesn't give any guarantees as to whether AI will be enabled or not)
-            // This distance could be made configurable later, but the setting must be marked with a big warning:
-            // using higher values will make a quest in Bloodmoon harder or impossible to complete (bug #1876)
-            const float sqrProcessingDistance = 7168*7168;
-
             /// \todo move update logic to Actor class where appropriate
 
              // AI and magic effects update
             for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
+                // AI processing is only done within distance of 7168 units to the player. Note the "AI distance" slider doesn't affect this
+                // (it only does some throttling for targets beyond the "AI distance", so doesn't give any guarantees as to whether AI will be enabled or not)
+                // This distance could be made configurable later, but the setting must be marked with a big warning:
+                // using higher values will make a quest in Bloodmoon harder or impossible to complete (bug #1876)
                 bool inProcessingRange = (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        <= sqrProcessingDistance;
+                        <= sqrAiProcessingDistance;
 
                 iter->second->getCharacterController()->setActive(inProcessingRange);
 
@@ -1064,7 +1065,7 @@ namespace MWMechanics
             {
                 if (iter->first != player &&
                         (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2()
-                        > sqrProcessingDistance)
+                        > sqrAiProcessingDistance)
                     continue;
 
                 if (iter->first.getClass().getCreatureStats(iter->first).isParalyzed())
@@ -1391,23 +1392,41 @@ namespace MWMechanics
         return list;
     }
 
+
+
     std::list<MWWorld::Ptr> Actors::getActorsFighting(const MWWorld::Ptr& actor) {
         std::list<MWWorld::Ptr> list;
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
-        getObjectsInRange(position,
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fAlarmRadius")->getFloat(),
-            neighbors); //only care about those within the alarm disance
+        getObjectsInRange(position, aiProcessingDistance, neighbors);
         for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();++iter)
         {
             const MWWorld::Class &cls = iter->getClass();
-            CreatureStats &stats = cls.getCreatureStats(*iter);
+            const CreatureStats &stats = cls.getCreatureStats(*iter);
             if (!stats.isDead() && stats.getAiSequence().isInCombat(actor))
                 list.push_front(*iter);
         }
         return list;
     }
 
+    std::list<MWWorld::Ptr> Actors::getEnemiesNearby(const MWWorld::Ptr& actor)
+    {
+        std::list<MWWorld::Ptr> list;
+        std::vector<MWWorld::Ptr> neighbors;
+        osg::Vec3f position (actor.getRefData().getPosition().asVec3());
+        getObjectsInRange(position, aiProcessingDistance, neighbors);
+        for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();++iter)
+        {
+            const CreatureStats &stats = iter->getClass().getCreatureStats(*iter);
+            if (stats.isDead())
+                continue;
+            if (stats.getAiSequence().isInCombat(actor) || MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor))
+                list.push_back(*iter);
+        }
+        return list;
+    }
+
+
     void Actors::write (ESM::ESMWriter& writer, Loading::Listener& listener) const
     {
         writer.startRecord(ESM::REC_DCOU);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 0bdf611d2a..6eb062ca28 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -123,6 +123,9 @@ namespace MWMechanics
             /**ie AiCombat is active and the target is the actor **/
             std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
 
+            /// Unlike getActorsFighting, also returns actors that *would* fight the given actor if they saw him.
+            std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
+
             void write (ESM::ESMWriter& writer, Loading::Listener& listener) const;
 
             void readRecord (ESM::ESMReader& reader, uint32_t type);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7810df2790..0e1869ff18 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -928,7 +928,7 @@ namespace MWMechanics
             return true;
         }
 
-        if(MWMechanics::isPlayerInCombat()) {
+        if(MWBase::Environment::get().getWorld()->getPlayer().enemiesNearby()) {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage2}");
             return true;
         }
@@ -1507,6 +1507,10 @@ namespace MWMechanics
         return mActors.getActorsFighting(actor);
     }
 
+    std::list<MWWorld::Ptr> MechanicsManager::getEnemiesNearby(const MWWorld::Ptr& actor) {
+        return mActors.getEnemiesNearby(actor);
+    }
+
     int MechanicsManager::countSavedGameRecords() const
     {
         return 1 // Death counter
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 27c6cc1500..693f49c941 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -153,6 +153,7 @@ namespace MWMechanics
             virtual std::list<int> getActorsFollowingIndices(const MWWorld::Ptr& actor);
 
             virtual std::list<MWWorld::Ptr> getActorsFighting(const MWWorld::Ptr& actor);
+            virtual std::list<MWWorld::Ptr> getEnemiesNearby(const MWWorld::Ptr& actor);
 
             virtual bool toggleAI();
             virtual bool isAIActive();
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index bf4f3b33e9..0fcb2eb6d1 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -258,6 +258,11 @@ namespace MWWorld
         return MWBase::Environment::get().getMechanicsManager()->getActorsFighting(getPlayer()).size() != 0;
     }
 
+    bool Player::enemiesNearby()
+    {
+        return MWBase::Environment::get().getMechanicsManager()->getEnemiesNearby(getPlayer()).size() != 0;
+    }
+
     void Player::markPosition(CellStore *markedCell, ESM::Position markedPosition)
     {
         mMarkedCell = markedCell;
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 595dd89fc6..1575018032 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -109,6 +109,8 @@ namespace MWWorld
         ///Checks all nearby actors to see if anyone has an aipackage against you
         bool isInCombat();
 
+        bool enemiesNearby();
+
         void clear();
 
         void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;

From 8fb8c2bae5138e90a7f4e0e24bf16c525ada420e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jun 2016 02:42:57 +0200
Subject: [PATCH 689/765] Fix "part has no parents" warning message caused by
 nodes being destroyed in the incorrect order

---
 apps/openmw/mwrender/creatureanimation.cpp | 1 +
 apps/openmw/mwrender/npcanimation.cpp      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 9cd35ecde6..d4e48e1fd2 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -75,6 +75,7 @@ void CreatureWeaponAnimation::showCarriedLeft(bool show)
 
 void CreatureWeaponAnimation::updateParts()
 {
+    mAmmunition.reset();
     mWeapon.reset();
     mShield.reset();
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index eaafe63fd2..e44e2fb302 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -567,6 +567,7 @@ void NpcAnimation::updateParts()
     static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]);
 
     bool wasArrowAttached = (mAmmunition.get() != NULL);
+    mAmmunition.reset();
 
     MWWorld::InventoryStore& inv = mPtr.getClass().getInventoryStore(mPtr);
     for(size_t i = 0;i < slotlistsize && mViewMode != VM_HeadOnly;i++)

From 12eea9ed69ed15726b101c193b2644af4584426c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jun 2016 14:52:44 +0200
Subject: [PATCH 690/765] Remove magic number in getMaxActivationDistance

---
 apps/openmw/mwworld/worldimp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index cb6f8b195b..f84386ae40 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1005,7 +1005,7 @@ namespace MWWorld
             return static_cast<float>(mActivationDistanceOverride);
 
         static const int iMaxActivateDist = getStore().get<ESM::GameSetting>().find("iMaxActivateDist")->getInt();
-        return iMaxActivateDist * 5.f / 4.f;
+        return static_cast<float>(iMaxActivateDist);
     }
 
     MWWorld::Ptr World::getFacedObject()

From 7657684dadf0bc937b869fd122a316ec6e5fe6d6 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Tue, 7 Jun 2016 13:22:39 -0400
Subject: [PATCH 691/765] Fix mouse tracking to fix tooltip behavior. Also hide
 tooltips when the mouse is moved.

---
 apps/opencs/view/render/scenewidget.cpp      | 3 +++
 apps/opencs/view/render/worldspacewidget.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 2ba3965639..93d3be8656 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -173,6 +173,9 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
 
     mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
 
+    // Recieve mouse move event even if mouse button is not pressed
+    setMouseTracking(true);
+
     /// \todo make shortcut configurable
     QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
     connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index f8c3af2bba..782dc53541 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -646,7 +646,10 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
             mToolTipPos = event->globalPos();
 
             if (mShowToolTips)
+            {
+                QToolTip::hideText();
                 mToolTipDelayTimer.start (mToolTipDelay);
+            }
         }
 
         SceneWidget::mouseMoveEvent(event);

From 165f048792183e26166a78f13205371103abaae9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jun 2016 22:01:44 +0200
Subject: [PATCH 692/765] Do not count dead NPCs as observers (Fixes #3434)

---
 apps/openmw/mwmechanics/actors.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ecda432a75..38611374f5 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1144,14 +1144,19 @@ namespace MWMechanics
 
                     for (PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
                     {
+                        MWWorld::Ptr observer = iter->first;
+
                         if (iter->first == player)  // not the player
                             continue;
 
+                        if (observer.getClass().getCreatureStats(observer).isDead())
+                            continue;
+
                         // is the player in range and can they be detected
-                        if ((iter->first.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius
-                            && MWBase::Environment::get().getWorld()->getLOS(player, iter->first))
+                        if ((observer.getRefData().getPosition().asVec3() - player.getRefData().getPosition().asVec3()).length2() <= radius*radius
+                            && MWBase::Environment::get().getWorld()->getLOS(player, observer))
                         {
-                            if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, iter->first))
+                            if (MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, observer))
                             {
                                 detected = true;
                                 avoidedNotice = false;

From 2f39a6e20d8159544026ae85f0eec194402fbc6b Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Wed, 8 Jun 2016 13:25:47 -0400
Subject: [PATCH 693/765] Fix camera input not being reset when focus for
 widget is lost.

---
 apps/opencs/view/render/cameracontroller.cpp | 22 ++++++++++++++++++++
 apps/opencs/view/render/cameracontroller.hpp |  6 ++++++
 apps/opencs/view/render/scenewidget.cpp      |  6 ++++++
 apps/opencs/view/render/scenewidget.hpp      |  1 +
 extern/osgQt/GraphicsWindowQt.cpp            |  1 -
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 68f0c76ef8..dc356827a8 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -308,6 +308,17 @@ namespace CSVRender
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
     }
 
+    void FreeCameraController::resetInput()
+    {
+        mFast = false;
+        mLeft = false;
+        mRight = false;
+        mForward = false;
+        mBackward = false;
+        mRollLeft = false;
+        mRollRight = false;
+    }
+
     void FreeCameraController::yaw(double value)
     {
         getCamera()->getViewMatrix() *= osg::Matrixd::rotate(value, LocalUp);
@@ -535,6 +546,17 @@ namespace CSVRender
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
     }
 
+    void OrbitCameraController::resetInput()
+    {
+        mFast = false;
+        mLeft = false;
+        mRight =false;
+        mUp = false;
+        mDown = false;
+        mRollLeft = false;
+        mRollRight = false;
+    }
+
     void OrbitCameraController::onActivate()
     {
         mInitialized = false;
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 575bbb4ea7..f9021f04bf 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -51,6 +51,8 @@ namespace CSVRender
 
             virtual void update(double dt) = 0;
 
+            virtual void resetInput() = 0;
+
         protected:
 
             virtual void onActivate(){}
@@ -87,6 +89,8 @@ namespace CSVRender
 
             void update(double dt);
 
+            void resetInput();
+
         private:
 
             void yaw(double value);
@@ -126,6 +130,8 @@ namespace CSVRender
 
             void update(double dt);
 
+            void resetInput();
+
         private:
 
             void onActivate();
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 93d3be8656..b2b5b30d63 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -175,6 +175,7 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
 
     // Recieve mouse move event even if mouse button is not pressed
     setMouseTracking(true);
+    setFocusPolicy(Qt::StrongFocus);
 
     /// \todo make shortcut configurable
     QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
@@ -291,6 +292,11 @@ void SceneWidget::mouseMoveEvent (QMouseEvent *event)
     mPrevMouseY = event->y();
 }
 
+void SceneWidget::focusOutEvent (QFocusEvent *event)
+{
+    mCurrentCamControl->resetInput();
+}
+
 void SceneWidget::wheelEvent(QWheelEvent *event)
 {
     mCurrentCamControl->handleMouseMoveEvent("t-navi", event->delta(), 0);
diff --git a/apps/opencs/view/render/scenewidget.hpp b/apps/opencs/view/render/scenewidget.hpp
index dfda1f96cd..4df49543a3 100644
--- a/apps/opencs/view/render/scenewidget.hpp
+++ b/apps/opencs/view/render/scenewidget.hpp
@@ -96,6 +96,7 @@ namespace CSVRender
             virtual void wheelEvent (QWheelEvent *event);
             virtual void keyPressEvent (QKeyEvent *event);
             virtual void keyReleaseEvent (QKeyEvent *event);
+            virtual void focusOutEvent (QFocusEvent *event);
 
             /// \return Is \a key a button mapping setting? (ignored otherwise)
             virtual bool storeMappingSetting (const CSMPrefs::Setting *setting);
diff --git a/extern/osgQt/GraphicsWindowQt.cpp b/extern/osgQt/GraphicsWindowQt.cpp
index 78a2ae6161..17150bed4b 100644
--- a/extern/osgQt/GraphicsWindowQt.cpp
+++ b/extern/osgQt/GraphicsWindowQt.cpp
@@ -245,7 +245,6 @@ bool GraphicsWindowQt::init( QWidget* parent, const QGLWidget* shareWidget, Qt::
     // initialize widget properties
     _widget->setAutoBufferSwap( false );
     _widget->setMouseTracking( true );
-    _widget->setFocusPolicy( Qt::WheelFocus );
     _widget->setGraphicsWindow( this );
     useCursor( _traits->useCursor );
 

From abcd2219e85a4229664a98fdc34ea9276608321a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 8 Jun 2016 22:12:52 +0200
Subject: [PATCH 694/765] Ignore the calling actor in getEnemiesNearby /
 getActorsFighting

---
 apps/openmw/mwmechanics/actors.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 38611374f5..564805e3f4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1404,11 +1404,13 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, aiProcessingDistance, neighbors);
-        for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();++iter)
+        for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
         {
             const MWWorld::Class &cls = iter->getClass();
             const CreatureStats &stats = cls.getCreatureStats(*iter);
-            if (!stats.isDead() && stats.getAiSequence().isInCombat(actor))
+            if (stats.isDead() || *iter == actor)
+                continue;
+            if (stats.getAiSequence().isInCombat(actor))
                 list.push_front(*iter);
         }
         return list;
@@ -1420,10 +1422,10 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, aiProcessingDistance, neighbors);
-        for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();++iter)
+        for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
         {
             const CreatureStats &stats = iter->getClass().getCreatureStats(*iter);
-            if (stats.isDead())
+            if (stats.isDead() || *iter == actor)
                 continue;
             if (stats.getAiSequence().isInCombat(actor) || MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor))
                 list.push_back(*iter);

From 256439f884a34bec5dd63823d340ea8002a2364f Mon Sep 17 00:00:00 2001
From: Daniel Pettersson <svaante@gmail.com>
Date: Thu, 9 Jun 2016 21:23:36 +0200
Subject: [PATCH 695/765] Added 1.5 bonus for ranged weapons when weapons are
 rated

---
 apps/openmw/mwmechanics/aicombataction.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index cee2aae9c4..f62c34fc8a 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -109,6 +109,10 @@ namespace MWMechanics
             return 0.f;
 
         float rating=0.f;
+        float bonus=0.f;
+
+        if (weapon->mData.mType >= ESM::Weapon::MarksmanBow && weapon->mData.mType <= ESM::Weapon::MarksmanThrown)
+            bonus+=1.5f;
 
         if (weapon->mData.mType >= ESM::Weapon::MarksmanBow)
         {
@@ -160,7 +164,7 @@ namespace MWMechanics
         if (skill != -1)
             rating *= actor.getClass().getSkill(actor, skill) / 100.f;
 
-        return rating;
+        return rating + bonus;
     }
 
     float rateSpell(const ESM::Spell *spell, const MWWorld::Ptr &actor, const MWWorld::Ptr& enemy)

From 55ac1fab68b40c8a0492dc8a4227127fbd029e17 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Fri, 10 Jun 2016 00:56:01 +0900
Subject: [PATCH 696/765] Change Wander duration to run on a counter

---
 apps/openmw/mwmechanics/aiwander.cpp | 42 +++++++++++++++++-----------
 apps/openmw/mwmechanics/aiwander.hpp |  2 +-
 components/esm/aisequence.cpp        |  4 +--
 components/esm/aisequence.hpp        |  7 ++++-
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index beb975cc4f..0bf02aba99 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -97,8 +97,8 @@ namespace MWMechanics
     };
     
     AiWander::AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat):
-        mDistance(distance), mDuration(duration), mTimeOfDay(timeOfDay), mIdle(idle), mRepeat(repeat)
-      , mStoredInitialActorPosition(false)
+        mDistance(distance), mDuration(duration), mRemainingDuration(duration), mTimeOfDay(timeOfDay), mIdle(idle),
+        mRepeat(repeat), mStoredInitialActorPosition(false)
     {
         mIdle.resize(8, 0);
         init();
@@ -122,6 +122,11 @@ namespace MWMechanics
             mDuration = 0;
         if(mDuration == 0)
             mTimeOfDay = 0;
+        if(mDuration > 24)
+        {
+            mDuration = 24;
+            mRemainingDuration = (mDuration);
+        }
 
         mPopulateAvailableNodes = true;
 
@@ -200,12 +205,7 @@ namespace MWMechanics
             mPopulateAvailableNodes = true;
         }
 
-        if (!mStarted)
-        {
-            // Set mStartTime once this package starts being executed
-            mStartTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-            mStarted = true;
-        }
+        mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
 
         cStats.setDrawState(DrawState_Nothing);
         cStats.setMovementFlag(CreatureStats::Flag_Run, false);
@@ -235,8 +235,9 @@ namespace MWMechanics
 
         if (isPackageCompleted(actor, storage))
         {
-            // Reset mStarted so that package will get a new mStarttime when it repeats
-            mStarted = false;
+            // Reset package so it can be used again
+            mRemainingDuration=mDuration;
+            init();
             return true;
         }
 
@@ -317,10 +318,8 @@ namespace MWMechanics
     {
         if (mDuration)
         {
-            // End package if duration is complete or mid-night hits:
-            MWWorld::TimeStamp currentTime = MWBase::Environment::get().getWorld()->getTimeStamp();
-            if ((currentTime.getHour() >= mStartTime.getHour() + mDuration) ||
-                (int(currentTime.getHour()) == 0 && currentTime.getDay() != mStartTime.getDay()))
+            // End package if duration is complete
+            if (mRemainingDuration <= 0)
             {
                     stopWalking(actor, storage);
                     return true;
@@ -784,6 +783,8 @@ namespace MWMechanics
 
     void AiWander::fastForward(const MWWorld::Ptr& actor, AiState &state)
     {
+        // Update duration counter
+        mRemainingDuration--;
         if (mDistance == 0)
             return;
 
@@ -923,11 +924,17 @@ namespace MWMechanics
 
     void AiWander::writeState(ESM::AiSequence::AiSequence &sequence) const
     {
+        float remainingDuration;
+        if (mRemainingDuration > 0 && mRemainingDuration < 24)
+            remainingDuration = mRemainingDuration;
+        else
+            remainingDuration = mDuration;
+
         std::auto_ptr<ESM::AiSequence::AiWander> wander(new ESM::AiSequence::AiWander());
         wander->mData.mDistance = mDistance;
         wander->mData.mDuration = mDuration;
         wander->mData.mTimeOfDay = mTimeOfDay;
-        wander->mStartTime = mStartTime.toEsm();
+        wander->mDurationData.mRemainingDuration = remainingDuration;
         assert (mIdle.size() == 8);
         for (int i=0; i<8; ++i)
             wander->mData.mIdle[i] = mIdle[i];
@@ -945,15 +952,18 @@ namespace MWMechanics
     AiWander::AiWander (const ESM::AiSequence::AiWander* wander)
         : mDistance(wander->mData.mDistance)
         , mDuration(wander->mData.mDuration)
+        , mRemainingDuration(wander->mDurationData.mRemainingDuration)
         , mTimeOfDay(wander->mData.mTimeOfDay)
         , mRepeat(wander->mData.mShouldRepeat != 0)
         , mStoredInitialActorPosition(wander->mStoredInitialActorPosition)
-        , mStartTime(MWWorld::TimeStamp(wander->mStartTime))
     {
         if (mStoredInitialActorPosition)
             mInitialActorPosition = wander->mInitialActorPosition;
         for (int i=0; i<8; ++i)
             mIdle.push_back(wander->mData.mIdle[i]);
+        if (mRemainingDuration <= 0 || mRemainingDuration >= 24)
+            mRemainingDuration = mDuration;
+
 
         init();
     }
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 026febb025..c7fbd1bd30 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -103,6 +103,7 @@ namespace MWMechanics
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;
+            float mRemainingDuration;
             int mTimeOfDay;
             std::vector<unsigned char> mIdle;
             bool mRepeat;
@@ -123,7 +124,6 @@ namespace MWMechanics
 
             
 
-            MWWorld::TimeStamp mStartTime;
 
             // allowed pathgrid nodes based on mDistance from the spawn point
             // in local coordinates of mCell
diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index 5b36f9a4cd..4733139402 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -15,7 +15,7 @@ namespace AiSequence
     void AiWander::load(ESMReader &esm)
     {
         esm.getHNT (mData, "DATA");
-        esm.getHNT(mStartTime, "STAR");
+        esm.getHNT(mDurationData, "STAR");
         mStoredInitialActorPosition = false;
         if (esm.isNextSub("POS_"))
         {
@@ -27,7 +27,7 @@ namespace AiSequence
     void AiWander::save(ESMWriter &esm) const
     {
         esm.writeHNT ("DATA", mData);
-        esm.writeHNT ("STAR", mStartTime);
+        esm.writeHNT ("STAR", mDurationData);
         if (mStoredInitialActorPosition)
             esm.writeHNT ("POS_", mInitialActorPosition);
     }
diff --git a/components/esm/aisequence.hpp b/components/esm/aisequence.hpp
index 2560fbe7df..b1ee9b1f14 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm/aisequence.hpp
@@ -46,6 +46,11 @@ namespace ESM
         unsigned char mIdle[8];
         unsigned char mShouldRepeat;
     };
+    struct AiWanderDuration
+    {
+        float mRemainingDuration;
+        int unused;
+    };
     struct AiTravelData
     {
         float   mX, mY, mZ;
@@ -61,7 +66,7 @@ namespace ESM
     struct AiWander : AiPackage
     {
         AiWanderData mData;
-        ESM::TimeStamp mStartTime;
+        AiWanderDuration mDurationData; // was ESM::TimeStamp mStartTime;
 
         bool mStoredInitialActorPosition;
         ESM::Vector3 mInitialActorPosition;

From ae503000531145de54d5bedf43ef108f7fd12a96 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Thu, 9 Jun 2016 15:42:40 -0400
Subject: [PATCH 697/765] Add ability to remove multiple rows in subrecords.

---
 apps/opencs/view/world/nestedtable.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp
index 0ccb88ce50..d791377b81 100644
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@@ -9,6 +9,7 @@
 #include "../../model/world/universalid.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/commanddispatcher.hpp"
+#include "../../model/world/commandmacro.hpp"
 
 #include "tableeditidaction.hpp"
 #include "util.hpp"
@@ -63,7 +64,7 @@ CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
             connect(mAddNewRowAction, SIGNAL(triggered()),
                     this, SLOT(addNewRowActionTriggered()));
 
-            mRemoveRowAction = new QAction (tr ("Remove row"), this);
+            mRemoveRowAction = new QAction (tr ("Remove rows"), this);
 
             connect(mRemoveRowAction, SIGNAL(triggered()),
                     this, SLOT(removeRowActionTriggered()));
@@ -100,10 +101,8 @@ void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 
     if (mAddNewRowAction && mRemoveRowAction)
     {
-        if (selectionModel()->selectedRows().size() == 1)
-            menu.addAction(mRemoveRowAction);
-
         menu.addAction(mAddNewRowAction);
+        menu.addAction(mRemoveRowAction);
     }
 
     menu.exec (event->globalPos());
@@ -111,10 +110,15 @@ void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 
 void CSVWorld::NestedTable::removeRowActionTriggered()
 {
-    mDocument.getUndoStack().push(new CSMWorld::DeleteNestedCommand(*(mModel->model()),
-                                                                    mModel->getParentId(),
-                                                                    selectionModel()->selectedRows().begin()->row(),
-                                                                    mModel->getParentColumn()));
+    CSMWorld::CommandMacro macro(mDocument.getUndoStack(),
+        selectionModel()->selectedRows().size() > 1 ? tr("Remove rows") : "");
+
+    // Remove rows in reverse order
+    for (int i = selectionModel()->selectedRows().size() - 1; i >= 0; --i)
+    {
+        macro.push(new CSMWorld::DeleteNestedCommand(*(mModel->model()), mModel->getParentId(),
+            selectionModel()->selectedRows()[i].row(), mModel->getParentColumn()));
+    }
 }
 
 void CSVWorld::NestedTable::addNewRowActionTriggered()

From 24f43f62725420a2e8209adc4bcad5463f87c8c1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 00:02:29 +0200
Subject: [PATCH 698/765] Update AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6d577ccc26..b97642aba1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -119,6 +119,7 @@ Programmers
     smbas
     Stefan Galowicz (bogglez)
     Stanislav Bobrov (Jiub)
+    svaante
     Sylvain Thesnieres (Garvek)
     t6
     terrorfisch

From ce91637cf9441a903dc6b20b9fe0614fc2bfbaca Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 01:05:43 +0200
Subject: [PATCH 699/765] Do not use/assign the camera distance in first person
 mode (Fixes #3421)

---
 apps/openmw/mwrender/camera.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 5a3f2bea36..92b9553f13 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -69,6 +69,8 @@ namespace MWRender
         mMainCam.yaw = 0.f;
         mMainCam.offset = 400.f;
 
+        mCameraDistance = mMaxCameraDistance;
+
         mUpdateCallback = new UpdateRenderCameraCallback(this);
         mCamera->addUpdateCallback(mUpdateCallback);
     }
@@ -108,7 +110,7 @@ namespace MWRender
 
         osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
 
-        osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0);
+        osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
         position += offset;
 
         osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
@@ -187,12 +189,6 @@ namespace MWRender
 
         mFirstPersonView = !mFirstPersonView;
         processViewChange();
-
-        if (mFirstPersonView) {
-            mCameraDistance = 0.f;
-        } else {
-            mCameraDistance = mMaxCameraDistance;
-        }
     }
     
     void Camera::allowVanityMode(bool allow)
@@ -313,6 +309,8 @@ namespace MWRender
 
     float Camera::getCameraDistance() const
     {
+        if (isFirstPerson())
+            return 0.f;
         return mCameraDistance;
     }
 
@@ -395,7 +393,7 @@ namespace MWRender
 
         osg::Quat orient =  osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
 
-        osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0);
+        osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
         camera = focal + offset;
     }
 

From c47a679ac91374ae56345c4a7bc6bb455b09d6ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 01:39:37 +0200
Subject: [PATCH 700/765] Fix queueing of vanity mode toggle (Bug #3421)

---
 apps/openmw/mwrender/camera.cpp | 4 +++-
 apps/openmw/mwrender/camera.hpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 92b9553f13..484c44bec7 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -56,6 +56,7 @@ namespace MWRender
       mMaxCameraDistance(192.f),
       mDistanceAdjusted(false),
       mVanityToggleQueued(false),
+      mVanityToggleQueuedValue(false),
       mViewModeToggleQueued(false),
       mCameraDistance(0.f)
     {
@@ -150,7 +151,7 @@ namespace MWRender
             // Now process the view changes we queued earlier
             if (mVanityToggleQueued)
             {
-                toggleVanityMode(!mVanity.enabled);
+                toggleVanityMode(mVanityToggleQueuedValue);
                 mVanityToggleQueued = false;
             }
             if (mViewModeToggleQueued)
@@ -205,6 +206,7 @@ namespace MWRender
         if (isFirstPerson() && !mAnimation->upperBodyReady())
         {
             mVanityToggleQueued = true;
+            mVanityToggleQueuedValue = enable;
             return false;
         }
 
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index fab63cd3f2..f0e53ebdd2 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -52,6 +52,7 @@ namespace MWRender
         bool mDistanceAdjusted;
 
         bool mVanityToggleQueued;
+        bool mVanityToggleQueuedValue;
         bool mViewModeToggleQueued;
 
         float mCameraDistance;

From a00e4de5c3a13195ce257e31d1fd8a54d8faf8b2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 01:44:32 +0200
Subject: [PATCH 701/765] Fix another bug related to vanity mode toggle

---
 apps/openmw/mwrender/camera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 484c44bec7..4ece14f16f 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -203,7 +203,7 @@ namespace MWRender
     {
         // Changing the view will stop all playing animations, so if we are playing
         // anything important, queue the view change for later
-        if (isFirstPerson() && !mAnimation->upperBodyReady())
+        if (mFirstPersonView && !mAnimation->upperBodyReady())
         {
             mVanityToggleQueued = true;
             mVanityToggleQueuedValue = enable;

From 943d9d97dc241d0470b91fced648183bfccf85c4 Mon Sep 17 00:00:00 2001
From: Daniel Pettersson <svaante@gmail.com>
Date: Fri, 10 Jun 2016 15:22:12 +0200
Subject: [PATCH 702/765] Slowfall now stops momentum when jumping

---
 apps/openmw/mwphysics/physicssystem.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 3b9917198a..d1dca5f3fd 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -448,6 +448,10 @@ namespace MWPhysics
                 inertia.z() += time * -627.2f;
                 if (inertia.z() < 0)
                     inertia.z() *= slowFall;
+                if (slowFall < 1.f) {
+                    inertia.x() = 0;
+                    inertia.y() = 0;
+                }
                 physicActor->setInertialForce(inertia);
             }
             physicActor->setOnGround(isOnGround);

From f6c3b44cfba97a89600f62e80660edc4df084d4c Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 10 Jun 2016 12:10:14 -0400
Subject: [PATCH 703/765] Fix QTimer not being stopped in right thread

---
 apps/opencs/model/doc/documentmanager.cpp |  1 +
 apps/opencs/model/doc/loader.cpp          | 18 ++++++++++++++----
 apps/opencs/model/doc/loader.hpp          |  6 ++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index cbb255ebb9..87fb960c1a 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -41,6 +41,7 @@ CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& con
 CSMDoc::DocumentManager::~DocumentManager()
 {
     mLoaderThread.quit();
+    mLoader.stop();
     mLoader.hasThingsToDo().wakeAll();
     mLoaderThread.wait();
 
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 166e6f3dbf..51b1b5884e 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -1,6 +1,6 @@
 #include "loader.hpp"
 
-#include <QTimer>
+#include <iostream>
 
 #include "../tools/reportmodel.hpp"
 
@@ -11,11 +11,12 @@ CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLoaded (0), mRecordsLeft (fa
 
 
 CSMDoc::Loader::Loader()
+    : mShouldStop(false)
 {
-    QTimer *timer = new QTimer (this);
+    mTimer = new QTimer (this);
 
-    connect (timer, SIGNAL (timeout()), this, SLOT (load()));
-    timer->start();
+    connect (mTimer, SIGNAL (timeout()), this, SLOT (load()));
+    mTimer->start();
 }
 
 QWaitCondition& CSMDoc::Loader::hasThingsToDo()
@@ -23,6 +24,11 @@ QWaitCondition& CSMDoc::Loader::hasThingsToDo()
     return mThingsToDo;
 }
 
+void CSMDoc::Loader::stop()
+{
+    mShouldStop = true;
+}
+
 void CSMDoc::Loader::load()
 {
     if (mDocuments.empty())
@@ -30,6 +36,10 @@ void CSMDoc::Loader::load()
         mMutex.lock();
         mThingsToDo.wait (&mMutex);
         mMutex.unlock();
+
+        if (mShouldStop)
+            mTimer->stop();
+
         return;
     }
 
diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
index d1ee38f9f1..ce5bc5848a 100644
--- a/apps/opencs/model/doc/loader.hpp
+++ b/apps/opencs/model/doc/loader.hpp
@@ -5,6 +5,7 @@
 
 #include <QObject>
 #include <QMutex>
+#include <QTimer>
 #include <QWaitCondition>
 
 namespace CSMDoc
@@ -28,12 +29,17 @@ namespace CSMDoc
             QWaitCondition mThingsToDo;
             std::vector<std::pair<Document *, Stage> > mDocuments;
 
+            QTimer* mTimer;
+            bool mShouldStop;
+
         public:
 
             Loader();
 
             QWaitCondition& hasThingsToDo();
 
+            void stop();
+
         private slots:
 
             void load();

From 8fcc1911d98dbd4d041418591592cad2c7998ca5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 23:29:41 +0200
Subject: [PATCH 704/765] Use fCombatDistance as the creature attack range

---
 apps/openmw/mwclass/creature.cpp     | 9 +++------
 apps/openmw/mwmechanics/aicombat.cpp | 5 +++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 182177d521..c111fce369 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -242,13 +242,10 @@ namespace MWClass
 
         MWMechanics::applyFatigueLoss(ptr, weapon, attackStrength);
 
-        // TODO: where is the distance defined?
-        float dist = 200.f;
+        float dist = gmst.find("fCombatDistance")->getFloat();
         if (!weapon.isEmpty())
-        {
-            const float fCombatDistance = gmst.find("fCombatDistance")->getFloat();
-            dist = fCombatDistance * weapon.get<ESM::Weapon>()->mBase->mData.mReach;
-        }
+            dist *= weapon.get<ESM::Weapon>()->mBase->mData.mReach;
+
         std::pair<MWWorld::Ptr, osg::Vec3f> result = MWBase::Environment::get().getWorld()->getHitContact(ptr, dist);
         if (result.first.isEmpty())
             return; // Didn't hit anything
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index b1821d64a3..196ef1c3ff 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -261,6 +261,7 @@ namespace MWMechanics
 
         // Get weapon characteristics
         MWBase::World* world = MWBase::Environment::get().getWorld();
+        static const float fCombatDistance = world->getStore().get<ESM::GameSetting>().find("fCombatDistance")->getFloat();
         if (actorClass.hasInventoryStore(actor))
         {
             //Get weapon range
@@ -279,12 +280,12 @@ namespace MWMechanics
                 weapon = weaponSlot->get<ESM::Weapon>()->mBase;
                 weapRange = weapon->mData.mReach;
             }
-            weapRange *= 100.0f;
+            weapRange *= fCombatDistance;
         }
         else //is creature
         {
             weaptype = actorClass.getCreatureStats(actor).getDrawState() == DrawState_Spell ? WeapType_Spell : WeapType_HandToHand;
-            weapRange = 150.0f; //TODO: use true attack range (the same problem in Creature::hit)
+            weapRange = fCombatDistance;
         }
 
         bool distantCombat = false;

From c6601ab2ab53b22b907638646e18a3697535aa25 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 23:30:41 +0200
Subject: [PATCH 705/765] Do not use the collision box offset for combat hit
 tests (Fixes #3201)

---
 apps/openmw/mwworld/worldimp.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f84386ae40..313fe73b1e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1047,13 +1047,25 @@ namespace MWWorld
         return osg::Matrixf::translate(actor.getRefData().getPosition().asVec3());
     }
 
-
     std::pair<MWWorld::Ptr,osg::Vec3f> World::getHitContact(const MWWorld::ConstPtr &ptr, float distance)
     {
         const ESM::Position &posdata = ptr.getRefData().getPosition();
 
         osg::Quat rot = osg::Quat(posdata.rot[0], osg::Vec3f(-1,0,0)) * osg::Quat(posdata.rot[2], osg::Vec3f(0,0,-1));
-        osg::Vec3f pos = getActorHeadTransform(ptr).getTrans();
+
+        osg::Vec3f pos = ptr.getRefData().getPosition().asVec3();
+
+        if (ptr == getPlayerPtr())
+            pos = getActorHeadTransform(ptr).getTrans(); // special cased for better aiming with the camera
+        else
+        {
+            // general case, compatible with all types of different creatures
+            // note: we intentionally do *not* use the collision box offset here, this is required to make
+            // some flying creatures work that have their collision box offset in the air
+            osg::Vec3f halfExtents = mPhysics->getHalfExtents(ptr);
+            pos.z() += halfExtents.z() * 2 * 0.75;
+            distance += halfExtents.y();
+        }
 
         std::pair<MWWorld::Ptr,osg::Vec3f> result = mPhysics->getHitContact(ptr, pos, rot, distance);
         if(result.first.isEmpty())
@@ -3221,15 +3233,19 @@ namespace MWWorld
 
     osg::Vec3f World::aimToTarget(const ConstPtr &actor, const MWWorld::ConstPtr& target)
     {
-        osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
+        osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
+        weaponPos.z() += mPhysics->getHalfExtents(actor).z() * 2 * 0.75;
         osg::Vec3f targetPos = mPhysics->getCollisionObjectPosition(target);
         return (targetPos - weaponPos);
     }
 
     float World::getHitDistance(const ConstPtr &actor, const ConstPtr &target)
     {
-        osg::Vec3f weaponPos = getActorHeadTransform(actor).getTrans();
-        return mPhysics->getHitDistance(weaponPos, target);
+        osg::Vec3f weaponPos = actor.getRefData().getPosition().asVec3();
+        osg::Vec3f halfExtents = mPhysics->getHalfExtents(actor);
+        weaponPos.z() += halfExtents.z() * 2 * 0.75;
+
+        return mPhysics->getHitDistance(weaponPos, target) - halfExtents.y();
     }
 
     void World::preloadCommonAssets()

From a85932a62baea0b4967e79125b8186843b880470 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 23:33:47 +0200
Subject: [PATCH 706/765] Ignore the collision box offset when launching
 projectiles (Fixes #3201)

---
 apps/openmw/mwworld/projectilemanager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 3fafadec3b..90fba827f9 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -117,11 +117,13 @@ namespace MWWorld
                                             const ESM::EffectList &effects, const Ptr &caster, const std::string &sourceName,
                                             const osg::Vec3f& fallbackDirection)
     {
-        osg::Vec3f pos;
+        osg::Vec3f pos = caster.getRefData().getPosition().asVec3();
         if (caster.getClass().isActor())
-            pos = mPhysics->getCollisionObjectPosition(caster) + osg::Vec3f(0,0,mPhysics->getHalfExtents(caster).z() * 0.5); // Spawn at 0.75 * ActorHeight
-        else
-            pos = caster.getRefData().getPosition().asVec3();
+        {
+            // Spawn at 0.75 * ActorHeight
+            // Note: we ignore the collision box offset, this is required to make some flying creatures work as intended.
+            pos.z() += mPhysics->getHalfExtents(caster).z() * 2 * 0.75;
+        }
 
         if (MWBase::Environment::get().getWorld()->isUnderwater(caster.getCell(), pos)) // Underwater casting not possible
             return;

From cb8daaaee14649b702d26e198396fdc85687837e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 11 Jun 2016 00:25:09 +0200
Subject: [PATCH 707/765] Do not query the texture's image in
 osgMyGUI::OSGTexture

Doing so could result in a race condition if the draw thread is about to delete the image (UnRefImageDataAfterApply enabled)
---
 components/myguiplatform/myguitexture.cpp | 24 ++++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/components/myguiplatform/myguitexture.cpp b/components/myguiplatform/myguitexture.cpp
index 2ba78c26b3..85ff3e3b5a 100644
--- a/components/myguiplatform/myguitexture.cpp
+++ b/components/myguiplatform/myguitexture.cpp
@@ -86,9 +86,12 @@ namespace osgMyGUI
         if (!mImageManager)
             throw std::runtime_error("No imagemanager set");
 
-        mTexture = new osg::Texture2D(mImageManager->getImage(fname));
+        osg::ref_ptr<osg::Image> image (mImageManager->getImage(fname));
+        mTexture = new osg::Texture2D(image);
         mTexture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
         mTexture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        mTexture->setTextureWidth(image->s());
+        mTexture->setTextureHeight(image->t());
         // disable mip-maps
         mTexture->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
 
@@ -107,8 +110,6 @@ namespace osgMyGUI
     {
         if(!mTexture.valid())
             return 0;
-        osg::Image *image = mTexture->getImage();
-        if(image) return image->s();
         return mTexture->getTextureWidth();
     }
 
@@ -116,8 +117,6 @@ namespace osgMyGUI
     {
         if(!mTexture.valid())
             return 0;
-        osg::Image *image = mTexture->getImage();
-        if(image) return image->t();
         return mTexture->getTextureHeight();
     }
 
@@ -128,15 +127,12 @@ namespace osgMyGUI
         if (mLockedImage.valid())
             throw std::runtime_error("Texture already locked");
 
-        mLockedImage = mTexture->getImage();
-        if(!mLockedImage.valid())
-        {
-            mLockedImage = new osg::Image();
-            mLockedImage->allocateImage(
-                mTexture->getTextureWidth(), mTexture->getTextureHeight(), mTexture->getTextureDepth(),
-                mTexture->getSourceFormat(), mTexture->getSourceType()
-            );
-        }
+        mLockedImage = new osg::Image();
+        mLockedImage->allocateImage(
+            mTexture->getTextureWidth(), mTexture->getTextureHeight(), mTexture->getTextureDepth(),
+            mTexture->getSourceFormat(), mTexture->getSourceType()
+        );
+
         return mLockedImage->data();
     }
 

From 7a30ef5cc1eb6a9b1c16920b219422ce28a315a6 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 11 Jun 2016 17:45:56 +0200
Subject: [PATCH 708/765] Do not consider actors following the player as
 hostiles

---
 apps/openmw/mwmechanics/actors.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 564805e3f4..92f5fc5fd8 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1422,12 +1422,15 @@ namespace MWMechanics
         std::vector<MWWorld::Ptr> neighbors;
         osg::Vec3f position (actor.getRefData().getPosition().asVec3());
         getObjectsInRange(position, aiProcessingDistance, neighbors);
+
+        std::list<MWWorld::Ptr> followers = getActorsFollowing(actor);
         for(std::vector<MWWorld::Ptr>::const_iterator iter(neighbors.begin());iter != neighbors.end();++iter)
         {
             const CreatureStats &stats = iter->getClass().getCreatureStats(*iter);
             if (stats.isDead() || *iter == actor)
                 continue;
-            if (stats.getAiSequence().isInCombat(actor) || MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor))
+            const bool isFollower = std::find(followers.begin(), followers.end(), *iter) != followers.end();
+            if (stats.getAiSequence().isInCombat(actor) || (MWBase::Environment::get().getMechanicsManager()->isAggressive(*iter, actor) && !isFollower))
                 list.push_back(*iter);
         }
         return list;

From 844cbc5a145e4db2683ba8f601da23b953467104 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 11 Jun 2016 17:46:30 +0200
Subject: [PATCH 709/765] Add isNullAction() method to fix compiler warning

---
 apps/openmw/mwgui/sortfilteritemmodel.cpp | 9 ++++++---
 apps/openmw/mwworld/action.hpp            | 3 +++
 apps/openmw/mwworld/nullaction.hpp        | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 1d086f2ee3..9c73db3407 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -132,9 +132,12 @@ namespace MWGui
                 && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
             return false;
 
-        if ((mFilter & Filter_OnlyUsableItems) && typeid(*base.getClass().use(base)) == typeid(MWWorld::NullAction)
-                && base.getClass().getScript(base).empty())
-            return false;
+        if ((mFilter & Filter_OnlyUsableItems) && base.getClass().getScript(base).empty())
+        {
+            boost::shared_ptr<MWWorld::Action> actionOnUse = base.getClass().use(base);
+            if (!actionOnUse || actionOnUse->isNullAction())
+                return false;
+        }
 
         return true;
     }
diff --git a/apps/openmw/mwworld/action.hpp b/apps/openmw/mwworld/action.hpp
index 3e0e8ad1bd..38907cf442 100644
--- a/apps/openmw/mwworld/action.hpp
+++ b/apps/openmw/mwworld/action.hpp
@@ -32,6 +32,9 @@ namespace MWWorld
 
             virtual ~Action();
 
+            virtual bool isNullAction() { return false; }
+            ///< Is running this action a no-op? (default false)
+
             void execute (const Ptr& actor);
 
             void setSound (const std::string& id);
diff --git a/apps/openmw/mwworld/nullaction.hpp b/apps/openmw/mwworld/nullaction.hpp
index 7ef8b4a065..5461d87112 100644
--- a/apps/openmw/mwworld/nullaction.hpp
+++ b/apps/openmw/mwworld/nullaction.hpp
@@ -9,6 +9,8 @@ namespace MWWorld
     class NullAction : public Action
     {
             virtual void executeImp (const Ptr& actor) {}
+
+            virtual bool isNullAction() { return true; }
     };
 }
 

From b6230bd31f2e2986465a274f2b64c926e72e0db1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 11 Jun 2016 18:09:02 +0200
Subject: [PATCH 710/765] Reject weather dialogue conditions when in an
 interior cell (Fixes #3437)

---
 apps/openmw/mwdialogue/filter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 042f41f140..9f31fdda6e 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -169,6 +169,11 @@ bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
         // If not currently in a choice, we reject all conditions that test against choices.
         return false;
 
+    if (select.getFunction() == SelectWrapper::Function_Weather && !(MWBase::Environment::get().getWorld()->isCellExterior() || MWBase::Environment::get().getWorld()->isCellQuasiExterior()))
+        // Reject weather conditions in interior cells
+        // Note that the original engine doesn't include the "|| isCellQuasiExterior()" check, which could be considered a bug.
+        return false;
+
     switch (select.getType())
     {
         case SelectWrapper::Type_None: return true;

From 37afe966cfa6d1bcc1fee445d0768d18a44cc251 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 11 Jun 2016 21:25:40 +0200
Subject: [PATCH 711/765] Update comment

---
 apps/openmw/mwmechanics/aiwander.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index c7fbd1bd30..2a277de162 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -35,7 +35,7 @@ namespace MWMechanics
             /// Constructor
             /** \param distance Max distance the ACtor will wander
                 \param duration Time, in hours, that this package will be preformed
-                \param timeOfDay Start time of the package, if it has a duration. Currently unimplemented
+                \param timeOfDay Currently unimplemented. Not functional in the original engine.
                 \param idle Chances of each idle to play (9 in total)
                 \param repeat Repeat wander or not **/
             AiWander(int distance, int duration, int timeOfDay, const std::vector<unsigned char>& idle, bool repeat);

From a825882c6b552a606d6f2b34d07f97af51e680d8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Jun 2016 00:04:50 +0200
Subject: [PATCH 712/765] Process death events at the end of the death
 animation (Fixes #1873)

---
 apps/openmw/mwclass/creature.cpp          |  3 ++
 apps/openmw/mwclass/npc.cpp               |  2 +
 apps/openmw/mwmechanics/actors.cpp        | 43 ++++++++++------
 apps/openmw/mwmechanics/character.cpp     | 60 ++++++++++++-----------
 apps/openmw/mwmechanics/character.hpp     | 10 +++-
 apps/openmw/mwmechanics/creaturestats.cpp | 15 +++++-
 apps/openmw/mwmechanics/creaturestats.hpp |  6 ++-
 components/esm/creaturestats.cpp          |  7 +++
 components/esm/creaturestats.hpp          |  1 +
 components/esm/savedgame.cpp              |  2 +-
 10 files changed, 100 insertions(+), 49 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index c111fce369..51c83eee1c 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -134,6 +134,9 @@ namespace MWClass
             data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Flee, ref->mBase->mAiData.mFlee);
             data->mCreatureStats.setAiSetting (MWMechanics::CreatureStats::AI_Alarm, ref->mBase->mAiData.mAlarm);
 
+            if (data->mCreatureStats.isDead())
+                data->mCreatureStats.setDeathAnimationFinished(true);
+
             // spells
             for (std::vector<std::string>::const_iterator iter (ref->mBase->mSpells.mList.begin());
                 iter!=ref->mBase->mSpells.mList.end(); ++iter)
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index ee0112ac94..52cd562d1e 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -351,6 +351,8 @@ namespace MWClass
 
                 data->mNpcStats.setNeedRecalcDynamicStats(true);
             }
+            if (data->mNpcStats.isDead())
+                data->mNpcStats.setDeathAnimationFinished(true);
 
             // race powers
             const ESM::Race *race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 92f5fc5fd8..ce3297d616 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -20,6 +20,7 @@
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 
 #include "../mwmechanics/spellcasting.hpp"
 
@@ -1208,25 +1209,14 @@ namespace MWMechanics
                     continue;
             }
 
-            if (iter->second->getCharacterController()->kill())
+            CharacterController::KillResult killResult = iter->second->getCharacterController()->kill();
+            if (killResult == CharacterController::Result_DeathAnimStarted)
             {
-                // TODO: It's not known whether the soundgen tags scream, roar, and moan are reliable 
-                // for NPCs since some of the npc death animation files are missing them.
-
                 // Play dying words
+                // Note: It's not known whether the soundgen tags scream, roar, and moan are reliable
+                // for NPCs since some of the npc death animation files are missing them.
                 MWBase::Environment::get().getDialogueManager()->say(iter->first, "hit");
 
-                iter->first.getClass().getCreatureStats(iter->first).notifyDied();
-
-                ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
-
-                // Make sure spell effects are removed
-                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
-                {
-                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
-                    spells.purge(stats.getActorId());
-                }
-
                 // Apply soultrap
                 if (iter->first.getTypeName() == typeid(ESM::Creature).name())
                 {
@@ -1245,6 +1235,29 @@ namespace MWMechanics
                 if (cls.isEssential(iter->first))
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sKilledEssential}");
             }
+            else if (killResult == CharacterController::Result_DeathAnimJustFinished)
+            {
+                iter->first.getClass().getCreatureStats(iter->first).notifyDied();
+
+                ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
+
+                // Make sure spell effects are removed
+                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
+                {
+                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
+                    spells.purge(stats.getActorId());
+                }
+
+                if( iter->first == getPlayer())
+                {
+                    //player's death animation is over
+                    MWBase::Environment::get().getStateManager()->askLoadRecent();
+                }
+
+                // Play Death Music if it was the player dying
+                if(iter->first == getPlayer())
+                    MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
+            }
         }
     }
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 7080650242..eeeea37eed 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -40,7 +40,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/statemanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
@@ -719,15 +718,20 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
             mIdleState = CharState_Idle;
         else
         {
-            // Set the death state, but don't play it yet
-            // We will play it in the first frame, but only if no script set the skipAnim flag
-            signed char deathanim = mPtr.getClass().getCreatureStats(mPtr).getDeathAnimation();
-            if (deathanim == -1)
-                mDeathState = chooseRandomDeathState();
-            else
-                mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
+            const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+            if (cStats.isDeathAnimationFinished())
+            {
+                // Set the death state, but don't play it yet
+                // We will play it in the first frame, but only if no script set the skipAnim flag
+                signed char deathanim = cStats.getDeathAnimation();
+                if (deathanim == -1)
+                    mDeathState = chooseRandomDeathState();
+                else
+                    mDeathState = static_cast<CharacterState>(CharState_Death1 + deathanim);
 
-            mFloatToSurface = false;
+                mFloatToSurface = false;
+            }
+            // else: nothing to do, will detect death in the next frame and start playing death animation
         }
     }
     else
@@ -2000,30 +2004,28 @@ void CharacterController::forceStateUpdate()
     mAnimation->runAnimation(0.f);
 }
 
-bool CharacterController::kill()
+CharacterController::KillResult CharacterController::kill()
 {
-    if( isDead() )
+    if (mDeathState == CharState_None)
     {
-        if( mPtr == getPlayer() && !isAnimPlaying(mCurrentDeath) )
-        {
-            //player's death animation is over
-            MWBase::Environment::get().getStateManager()->askLoadRecent();
-        }
-        return false;
+        playRandomDeath();
+
+        mAnimation->disable(mCurrentIdle);
+
+        mIdleState = CharState_None;
+        mCurrentIdle.clear();
+        return Result_DeathAnimStarted;
     }
 
-    playRandomDeath();
-
-    mAnimation->disable(mCurrentIdle);
-
-    mIdleState = CharState_None;
-    mCurrentIdle.clear();
-
-    // Play Death Music if it was the player dying
-    if(mPtr == getPlayer())
-        MWBase::Environment::get().getSoundManager()->streamMusic("Special/MW_Death.mp3");
-
-    return true;
+    MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
+    if (isAnimPlaying(mCurrentDeath))
+        return Result_DeathAnimPlaying;
+    if (!cStats.isDeathAnimationFinished())
+    {
+        cStats.setDeathAnimationFinished(true);
+        return Result_DeathAnimJustFinished;
+    }
+    return Result_DeathAnimFinished;
 }
 
 void CharacterController::resurrect()
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 757e2a19f7..9bea4b78c6 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -234,8 +234,14 @@ public:
     void skipAnim();
     bool isAnimPlaying(const std::string &groupName);
 
-    /// @return false if the character has already been killed before
-    bool kill();
+    enum KillResult
+    {
+        Result_DeathAnimStarted,
+        Result_DeathAnimPlaying,
+        Result_DeathAnimJustFinished,
+        Result_DeathAnimFinished
+    };
+    KillResult kill();
 
     void resurrect();
     bool isDead() const
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index 7d1dc4d2fb..e33a6f7bdc 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -17,7 +17,7 @@ namespace MWMechanics
     int CreatureStats::sActorId = 0;
 
     CreatureStats::CreatureStats()
-        : mDrawState (DrawState_Nothing), mDead (false), mDied (false), mMurdered(false), mFriendlyHits (0),
+        : mDrawState (DrawState_Nothing), mDead (false), mDeathAnimationFinished(false), mDied (false), mMurdered(false), mFriendlyHits (0),
           mTalkedTo (false), mAlarmed (false), mAttacked (false),
           mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false),
           mHitRecovery(false), mBlock(false), mMovementFlags(0),
@@ -236,6 +236,16 @@ namespace MWMechanics
         return mDead;
     }
 
+    bool CreatureStats::isDeathAnimationFinished() const
+    {
+        return mDeathAnimationFinished;
+    }
+
+    void CreatureStats::setDeathAnimationFinished(bool finished)
+    {
+        mDeathAnimationFinished = finished;
+    }
+
     void CreatureStats::notifyDied()
     {
         mDied = true;
@@ -275,6 +285,7 @@ namespace MWMechanics
 
             mDynamic[0].setCurrent(mDynamic[0].getModified());
             mDead = false;
+            mDeathAnimationFinished = false;
         }
     }
 
@@ -482,6 +493,7 @@ namespace MWMechanics
         state.mGoldPool = mGoldPool;
 
         state.mDead = mDead;
+        state.mDeathAnimationFinished = mDeathAnimationFinished;
         state.mDied = mDied;
         state.mMurdered = mMurdered;
         // The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism
@@ -533,6 +545,7 @@ namespace MWMechanics
         mGoldPool = state.mGoldPool;
 
         mDead = state.mDead;
+        mDeathAnimationFinished = state.mDeathAnimationFinished;
         mDied = state.mDied;
         mMurdered = state.mMurdered;
         mTalkedTo = state.mTalkedTo;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 8965dedaca..1718576030 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -34,7 +34,8 @@ namespace MWMechanics
         Stat<int> mAiSettings[4];
         AiSequence mAiSequence;
         bool mDead;
-        bool mDied;
+        bool mDeathAnimationFinished;
+        bool mDied; // flag for OnDeath script function
         bool mMurdered;
         int mFriendlyHits;
         bool mTalkedTo;
@@ -161,6 +162,9 @@ namespace MWMechanics
 
         bool isDead() const;
 
+        bool isDeathAnimationFinished() const;
+        void setDeathAnimationFinished(bool finished);
+
         void notifyDied();
 
         bool hasDied() const;
diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index a48ce54725..4c795a5325 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -20,6 +20,9 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mDead = false;
     esm.getHNOT (mDead, "DEAD");
 
+    mDeathAnimationFinished = false;
+    esm.getHNOT (mDeathAnimationFinished, "DFNT");
+
     mDied = false;
     esm.getHNOT (mDied, "DIED");
 
@@ -140,6 +143,9 @@ void ESM::CreatureStats::save (ESMWriter &esm) const
     if (mDead)
         esm.writeHNT ("DEAD", mDead);
 
+    if (mDeathAnimationFinished)
+        esm.writeHNT ("DFNT", mDeathAnimationFinished);
+
     if (mDied)
         esm.writeHNT ("DIED", mDied);
 
@@ -233,6 +239,7 @@ void ESM::CreatureStats::blank()
     mActorId = -1;
     mHasAiSettings = false;
     mDead = false;
+    mDeathAnimationFinished = false;
     mDied = false;
     mMurdered = false;
     mTalkedTo = false;
diff --git a/components/esm/creaturestats.hpp b/components/esm/creaturestats.hpp
index a99cca9446..55af9d5092 100644
--- a/components/esm/creaturestats.hpp
+++ b/components/esm/creaturestats.hpp
@@ -40,6 +40,7 @@ namespace ESM
         int mActorId;
 
         bool mDead;
+        bool mDeathAnimationFinished;
         bool mDied;
         bool mMurdered;
         bool mTalkedTo;
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index cf9f68c9a8..3220f496e0 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -5,7 +5,7 @@
 #include "defs.hpp"
 
 unsigned int ESM::SavedGame::sRecordId = ESM::REC_SAVE;
-int ESM::SavedGame::sCurrentFormat = 2;
+int ESM::SavedGame::sCurrentFormat = 3;
 
 void ESM::SavedGame::load (ESMReader &esm)
 {

From b7e45b046d3c70265aa978193d1d4419d56a5649 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Jun 2016 00:12:06 +0200
Subject: [PATCH 713/765] When a summoned creature dies, wait for its death
 animation to complete before removing it (Bug #3439)

---
 apps/openmw/mwmechanics/summoning.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index cf77714855..177378e037 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -26,8 +26,6 @@ namespace MWMechanics
         MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
         if (!ptr.isEmpty())
         {
-            // TODO: Show death animation before deleting? We shouldn't allow looting the corpse while the animation
-            // plays though, which is a rather lame exploit in vanilla.
             MWBase::Environment::get().getWorld()->deleteObject(ptr);
 
             const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
@@ -157,7 +155,7 @@ namespace MWMechanics
         for (std::map<CreatureStats::SummonKey, int>::iterator it = creatureMap.begin(); it != creatureMap.end(); )
         {
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->second);
-            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead())
+            if (!ptr.isEmpty() && ptr.getClass().getCreatureStats(ptr).isDead() && ptr.getClass().getCreatureStats(ptr).isDeathAnimationFinished())
             {
                 // Purge the magic effect so a new creature can be summoned if desired
                 creatureStats.getActiveSpells().purgeEffect(it->first.first, it->first.second);

From 910ad76e29bb0507e978da57a749aca12d4067f0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Jun 2016 00:41:13 +0200
Subject: [PATCH 714/765] Remove spell effects when a summoned creature expires
 (Bug #3439)

---
 apps/openmw/mwmechanics/actors.cpp    | 19 +++++++++++++------
 apps/openmw/mwmechanics/actors.hpp    |  2 ++
 apps/openmw/mwmechanics/summoning.cpp |  7 ++++++-
 apps/openmw/mwmechanics/summoning.hpp |  3 ++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ce3297d616..23f2978e66 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -688,7 +688,9 @@ namespace MWMechanics
         creatureStats.getActiveSpells().visitEffectSources(updateSummonedCreatures);
         if (ptr.getClass().hasInventoryStore(ptr))
             ptr.getClass().getInventoryStore(ptr).visitEffectSources(updateSummonedCreatures);
-        updateSummonedCreatures.finish();
+        std::set<int> deleted = updateSummonedCreatures.process();
+        for (std::set<int>::const_iterator it = deleted.begin(); it != deleted.end(); ++it)
+            purgeSpellEffects(*it);
     }
 
     void Actors::calculateNpcStatModifiers (const MWWorld::Ptr& ptr, float duration)
@@ -1242,11 +1244,7 @@ namespace MWMechanics
                 ++mDeathCount[Misc::StringUtils::lowerCase(iter->first.getCellRef().getRefId())];
 
                 // Make sure spell effects are removed
-                for (PtrActorMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
-                {
-                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
-                    spells.purge(stats.getActorId());
-                }
+                purgeSpellEffects(stats.getActorId());
 
                 if( iter->first == getPlayer())
                 {
@@ -1261,6 +1259,15 @@ namespace MWMechanics
         }
     }
 
+    void Actors::purgeSpellEffects(int casterActorId)
+    {
+        for (PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        {
+            MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
+            spells.purge(casterActorId);
+        }
+    }
+
     void Actors::restoreDynamicStats(bool sleep)
     {
         for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 6eb062ca28..2dae6b1fb4 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -43,6 +43,8 @@ namespace MWMechanics
 
             void killDeadActors ();
 
+            void purgeSpellEffects (int casterActorId);
+
         public:
 
             Actors();
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 177378e037..5108e40ffd 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -61,8 +61,10 @@ namespace MWMechanics
         }
     }
 
-    void UpdateSummonedCreatures::finish()
+    std::set<int> UpdateSummonedCreatures::process()
     {
+        std::set<int> deletedCreatures;
+
         static std::map<int, std::string> summonMap;
         if (summonMap.empty())
         {
@@ -101,6 +103,7 @@ namespace MWMechanics
             {
                 // Effect has ended
                 cleanupSummonedCreature(creatureStats, it->second);
+                deletedCreatures.insert(it->second);
                 creatureMap.erase(it++);
                 continue;
             }
@@ -188,6 +191,8 @@ namespace MWMechanics
             else
                 ++it;
         }
+
+        return deletedCreatures;
     }
 
 }
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 8e418cdeb4..2e1c488569 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -21,7 +21,8 @@ namespace MWMechanics
                             float magnitude, float remainingTime = -1, float totalTime = -1);
 
         /// To call after all effect sources have been visited
-        void finish();
+        /// Returns list of actorIds for creatures that have been deleted due to the magic effect having expired
+        std::set<int> process();
 
     private:
         MWWorld::Ptr mActor;

From 4acfe1a7e4a677585c7baecfb786272811fcdc06 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Jun 2016 02:43:33 +0200
Subject: [PATCH 715/765] Move cleanupSummonedCreature to the mechanics manager
 (Bug #3439)

---
 apps/openmw/mwbase/mechanicsmanager.hpp       |  2 ++
 apps/openmw/mwmechanics/actors.cpp            | 28 +++++++++++++--
 apps/openmw/mwmechanics/actors.hpp            |  3 ++
 .../mwmechanics/mechanicsmanagerimp.cpp       |  5 +++
 .../mwmechanics/mechanicsmanagerimp.hpp       |  2 ++
 apps/openmw/mwmechanics/spellcasting.cpp      |  3 +-
 apps/openmw/mwmechanics/summoning.cpp         | 34 +++----------------
 apps/openmw/mwmechanics/summoning.hpp         |  5 +--
 8 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/apps/openmw/mwbase/mechanicsmanager.hpp b/apps/openmw/mwbase/mechanicsmanager.hpp
index 690afab956..a0e9da26ac 100644
--- a/apps/openmw/mwbase/mechanicsmanager.hpp
+++ b/apps/openmw/mwbase/mechanicsmanager.hpp
@@ -229,6 +229,8 @@ namespace MWBase
             /// Sets the NPC's Acrobatics skill to match the fWerewolfAcrobatics GMST.
             /// It only applies to the current form the NPC is in.
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor) = 0;
+
+            virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId) = 0;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 23f2978e66..f627e62ae4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -688,9 +688,7 @@ namespace MWMechanics
         creatureStats.getActiveSpells().visitEffectSources(updateSummonedCreatures);
         if (ptr.getClass().hasInventoryStore(ptr))
             ptr.getClass().getInventoryStore(ptr).visitEffectSources(updateSummonedCreatures);
-        std::set<int> deleted = updateSummonedCreatures.process();
-        for (std::set<int>::const_iterator it = deleted.begin(); it != deleted.end(); ++it)
-            purgeSpellEffects(*it);
+        updateSummonedCreatures.process();
     }
 
     void Actors::calculateNpcStatModifiers (const MWWorld::Ptr& ptr, float duration)
@@ -1259,6 +1257,30 @@ namespace MWMechanics
         }
     }
 
+    void Actors::cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
+    {
+        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
+        if (!ptr.isEmpty())
+        {
+            MWBase::Environment::get().getWorld()->deleteObject(ptr);
+
+            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
+                    .search("VFX_Summon_End");
+            if (fx)
+                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
+                    "", ptr.getRefData().getPosition().asVec3());
+        }
+        else if (creatureActorId != -1)
+        {
+            // We didn't find the creature. It's probably in an inactive cell.
+            // Add to graveyard so we can delete it when the cell becomes active.
+            std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
+            graveyard.push_back(creatureActorId);
+        }
+
+        purgeSpellEffects(creatureActorId);
+    }
+
     void Actors::purgeSpellEffects(int casterActorId)
     {
         for (PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 2dae6b1fb4..644864e7fc 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -19,6 +19,7 @@ namespace MWWorld
 namespace MWMechanics
 {
     class Actor;
+    class CreatureStats;
 
     class Actors
     {
@@ -113,6 +114,8 @@ namespace MWMechanics
 
             void getObjectsInRange(const osg::Vec3f& position, float radius, std::vector<MWWorld::Ptr>& out);
 
+            void cleanupSummonedCreature (CreatureStats& casterStats, int creatureActorId);
+
             ///Returns the list of actors which are siding with the given actor in fights
             /**ie AiFollow or AiEscort is active and the target is the actor **/
             std::list<MWWorld::Ptr> getActorsSidingWith(const MWWorld::Ptr& actor);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 0e1869ff18..6dd14be114 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1700,4 +1700,9 @@ namespace MWMechanics
         stats.getSkill(ESM::Skill::Acrobatics).setBase(gmst.find("fWerewolfAcrobatics")->getInt());
     }
 
+    void MechanicsManager::cleanupSummonedCreature(const MWWorld::Ptr &caster, int creatureActorId)
+    {
+        mActors.cleanupSummonedCreature(caster.getClass().getCreatureStats(caster), creatureActorId);
+    }
+
 }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 693f49c941..793a8158e3 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -189,6 +189,8 @@ namespace MWMechanics
             virtual void setWerewolf(const MWWorld::Ptr& actor, bool werewolf);
             virtual void applyWerewolfAcrobatics(const MWWorld::Ptr& actor);
 
+            virtual void cleanupSummonedCreature(const MWWorld::Ptr& caster, int creatureActorId);
+
         private:
             void reportCrime (const MWWorld::Ptr& ptr, const MWWorld::Ptr& victim,
                                       OffenseType type, int arg=0);
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 8882d14a88..842951362e 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -26,7 +26,6 @@
 
 #include "magiceffects.hpp"
 #include "npcstats.hpp"
-#include "summoning.hpp"
 #include "actorutil.hpp"
 
 namespace
@@ -510,7 +509,7 @@ namespace MWMechanics
                     std::map<CreatureStats::SummonKey, int>::iterator found = targetStats.getSummonedCreatureMap().find(std::make_pair(effectIt->mEffectID, mId));
                     if (found != targetStats.getSummonedCreatureMap().end())
                     {
-                        cleanupSummonedCreature(targetStats, found->second);
+                        MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(target, found->second);
                         targetStats.getSummonedCreatureMap().erase(found);
                     }
                 }
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 5108e40ffd..9b094ba323 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -4,6 +4,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwmechanics/spellcasting.hpp"
 
@@ -21,28 +22,6 @@
 namespace MWMechanics
 {
 
-    void cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId)
-    {
-        MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaActorId(creatureActorId);
-        if (!ptr.isEmpty())
-        {
-            MWBase::Environment::get().getWorld()->deleteObject(ptr);
-
-            const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                    .search("VFX_Summon_End");
-            if (fx)
-                MWBase::Environment::get().getWorld()->spawnEffect("meshes\\" + fx->mModel,
-                    "", ptr.getRefData().getPosition().asVec3());
-        }
-        else if (creatureActorId != -1)
-        {
-            // We didn't find the creature. It's probably in an inactive cell.
-            // Add to graveyard so we can delete it when the cell becomes active.
-            std::vector<int>& graveyard = casterStats.getSummonedCreatureGraveyard();
-            graveyard.push_back(creatureActorId);
-        }
-    }
-
     UpdateSummonedCreatures::UpdateSummonedCreatures(const MWWorld::Ptr &actor)
         : mActor(actor)
     {
@@ -61,10 +40,8 @@ namespace MWMechanics
         }
     }
 
-    std::set<int> UpdateSummonedCreatures::process()
+    void UpdateSummonedCreatures::process()
     {
-        std::set<int> deletedCreatures;
-
         static std::map<int, std::string> summonMap;
         if (summonMap.empty())
         {
@@ -102,8 +79,7 @@ namespace MWMechanics
             if (!found)
             {
                 // Effect has ended
-                cleanupSummonedCreature(creatureStats, it->second);
-                deletedCreatures.insert(it->second);
+                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
                 creatureMap.erase(it++);
                 continue;
             }
@@ -165,7 +141,7 @@ namespace MWMechanics
                 if (mActor.getClass().hasInventoryStore(ptr))
                     mActor.getClass().getInventoryStore(mActor).purgeEffect(it->first.first, it->first.second);
 
-                cleanupSummonedCreature(creatureStats, it->second);
+                MWBase::Environment::get().getMechanicsManager()->cleanupSummonedCreature(mActor, it->second);
                 creatureMap.erase(it++);
             }
             else
@@ -191,8 +167,6 @@ namespace MWMechanics
             else
                 ++it;
         }
-
-        return deletedCreatures;
     }
 
 }
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 2e1c488569..3a60e2b682 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -21,8 +21,7 @@ namespace MWMechanics
                             float magnitude, float remainingTime = -1, float totalTime = -1);
 
         /// To call after all effect sources have been visited
-        /// Returns list of actorIds for creatures that have been deleted due to the magic effect having expired
-        std::set<int> process();
+        void process();
 
     private:
         MWWorld::Ptr mActor;
@@ -30,8 +29,6 @@ namespace MWMechanics
         std::set<std::pair<int, std::string> > mActiveEffects;
     };
 
-    void cleanupSummonedCreature (MWMechanics::CreatureStats& casterStats, int creatureActorId);
-
 }
 
 #endif

From edb41b5b0867fd52e497c4b1fe2b33016f47e880 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sun, 12 Jun 2016 14:27:45 +0300
Subject: [PATCH 716/765] Rewrites FindLIBUNSHIELD using LibFindMacros

Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
---
 CMakeLists.txt              |  5 ++++
 apps/wizard/CMakeLists.txt  | 14 ++--------
 cmake/FindLIBUNSHIELD.cmake | 53 ++++++++++++++-----------------------
 3 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3d20b7359..c96a18e036 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,11 @@ if (WIN32)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 endif()
 
+if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
+    find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
+    set(OPENMW_USE_UNSHIELD TRUE)
+endif()
+
 option(OPENGL_ES "enable opengl es support" FALSE )
 
 if (OPENGL_ES)
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index 4be5fb2b76..dcd9444909 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -1,13 +1,3 @@
-if (WIN32) # windows users can just run the morrowind installer
-    set(OPENMW_USE_UNSHIELD FALSE)
-else()
-    set(OPENMW_USE_UNSHIELD TRUE)
-
-    find_package(LIBUNSHIELD REQUIRED)
-    if(NOT LIBUNSHIELD_FOUND)
-        message(FATAL_ERROR "Failed to find Unshield library")
-    endif(NOT LIBUNSHIELD_FOUND)
-endif()
 
 set(WIZARD
     componentselectionpage.cpp
@@ -103,7 +93,7 @@ endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if (OPENMW_USE_UNSHIELD)
-    include_directories(${LIBUNSHIELD_INCLUDE_DIR})
+    include_directories(${LIBUNSHIELD_INCLUDE_DIRS})
 endif()
 
 add_executable(openmw-wizard
@@ -132,7 +122,7 @@ else()
 endif()
 
 if (OPENMW_USE_UNSHIELD)
-    target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARY})
+    target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARIES})
 endif()
 
 
diff --git a/cmake/FindLIBUNSHIELD.cmake b/cmake/FindLIBUNSHIELD.cmake
index f0fa4cc824..285740b635 100644
--- a/cmake/FindLIBUNSHIELD.cmake
+++ b/cmake/FindLIBUNSHIELD.cmake
@@ -1,8 +1,8 @@
 # Locate LIBUNSHIELD
 # This module defines
-# LIBUNSHIELD_LIBRARY
+# LIBUNSHIELD_LIBRARIES
 # LIBUNSHIELD_FOUND, if false, do not try to link to LibUnshield
-# LIBUNSHIELD_INCLUDE_DIR, where to find the headers
+# LIBUNSHIELD_INCLUDE_DIRS, where to find the headers
 #
 # Created by Tom Mason (wheybags) for OpenMW (http://openmw.org), based on FindMPG123.cmake
 #
@@ -12,37 +12,24 @@
 # function. Do we really need to repeat this stuff for every single
 # library when they all work the same? </today's rant>
 
-FIND_PATH(LIBUNSHIELD_INCLUDE_DIR libunshield.h
-  HINTS
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-  /usr/include
+include(LibFindMacros)
+
+set(POSSIBLE_LOCATIONS
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local
+    /usr
+    /sw # Fink
+    /opt/local # DarwinPorts
+    /opt/csw # Blastwave
+    /opt
+    /usr/include
 )
 
-FIND_LIBRARY(LIBUNSHIELD_LIBRARY 
-  unshield
-  HINTS
-#  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/lib
+libfind_pkg_detect(LIBUNSHIELD libunshield
+    FIND_PATH libunshield.h
+        HINTS ${POSSIBLE_LOCATIONS}
+    FIND_LIBRARY unshield
+        HINTS ${POSSIBLE_LOCATIONS}
 )
-
-IF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR)
-  SET(LIBUNSHIELD_FOUND "YES")
-ENDIF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR)
-
+libfind_process(LIBUNSHIELD)

From 197e81206a3554edf160759ce350000e3b795f3e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 12 Jun 2016 19:42:59 +0200
Subject: [PATCH 717/765] Assume mDeathAnimationFinished is true for older save
 files

---
 components/esm/creaturestats.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/esm/creaturestats.cpp b/components/esm/creaturestats.cpp
index 4c795a5325..c19dfcf022 100644
--- a/components/esm/creaturestats.cpp
+++ b/components/esm/creaturestats.cpp
@@ -23,6 +23,9 @@ void ESM::CreatureStats::load (ESMReader &esm)
     mDeathAnimationFinished = false;
     esm.getHNOT (mDeathAnimationFinished, "DFNT");
 
+    if (esm.getFormat() < 3 && mDead)
+        mDeathAnimationFinished = true;
+
     mDied = false;
     esm.getHNOT (mDied, "DIED");
 

From 57b75d2cd1eee96f2333325145dfa05d230f43c9 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sun, 12 Jun 2016 20:09:14 +0300
Subject: [PATCH 718/765] Teaches LibFindMacros to find version from 'const int
 NAME = 42;'

---
 cmake/LibFindMacros.cmake | 153 +++++++++++++++++++++++++++++++-------
 1 file changed, 125 insertions(+), 28 deletions(-)

diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake
index 0ddbcba081..56b39a1ad9 100644
--- a/cmake/LibFindMacros.cmake
+++ b/cmake/LibFindMacros.cmake
@@ -3,6 +3,8 @@
 # Maintained at https://github.com/Tronic/cmake-modules
 # Please send your improvements as pull requests on Github.
 
+include(CMakeParseArguments)
+
 # Find another package and make it a dependency of the current package.
 # This also automatically forwards the "REQUIRED" argument.
 # Usage: libfind_package(<prefix> <another package> [extra args to find_package])
@@ -54,43 +56,138 @@ function (libfind_pkg_detect PREFIX)
   endif()
 endfunction()
 
-# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
-# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
-# Fourth argument "QUIET" may be used for silently testing different define names.
+# libfind_header_path(<PREFIX> [PATHS <path> [<path> ...]] NAMES <name> [name ...] VAR <out_var> [QUIET])
+# Get fullpath of the first found header looking inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+# Usage: libfind_header_path(Foobar NAMES foobar/version.h VAR filepath)
+function (libfind_header_path PREFIX)
+  set(options QUIET)
+  set(one_value_keywords VAR PATH)
+  set(multi_value_keywords NAMES PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_VAR OR NOT OPT_NAMES)
+    message(FATAL_ERROR "Arguments VAR, NAMES are required!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+  endif()
+  set(paths ${OPT_PATHS} ${PREFIX}_INCLUDE_DIR)
+
+  foreach(name ${OPT_NAMES})
+    foreach(path ${paths})
+      set(filepath "${${path}}/${name}")
+      # check for existance
+      if (EXISTS ${filepath})
+        set(${OPT_VAR} ${filepath} PARENT_SCOPE) # export path
+        return()
+      endif()
+    endforeach()
+  endforeach()
+
+  # report error if not found
+  set(${OPT_VAR} NOTFOUND PARENT_SCOPE)
+  if (NOT quiet)
+    message(AUTHOR_WARNING "Unable to find '${OPT_NAMES}'")
+  endif()
+endfunction()
+
+# libfind_version_n_header(<PREFIX>
+#  NAMES <name> [<name> ...]
+#  DEFINES <define> [<define> ...] | CONSTANTS <const> [<const> ...]
+#  [PATHS <path> [<path> ...]]
+#  [QUIET]
+# )
+# Collect all defines|constants from a header inside <PREFIX>_INCLUDE_DIR or in the given PATHS
+#  output stored to <PREFIX>_VERSION.
 # This function does nothing if the version variable is already defined.
-function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
-  # Skip processing if we already have a version or if the include dir was not found
-  if (${PREFIX}_VERSION OR NOT ${PREFIX}_INCLUDE_DIR)
+# Usage: libfind_version_n_header(Foobar NAMES foobar/version.h DEFINES FOOBAR_VERSION_MAJOR FOOBAR_VERSION_MINOR)
+function (libfind_version_n_header PREFIX)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
     return()
   endif()
-  set(quiet ${${PREFIX}_FIND_QUIETLY})
-  # Process optional arguments
-  foreach(arg ${ARGN})
-    if (arg STREQUAL "QUIET")
-      set(quiet TRUE)
-    else()
-      message(AUTHOR_WARNING "Unknown argument ${arg} to libfind_version_header ignored.")
-    endif()
-  endforeach()
-  # Read the header and parse for version number
-  set(filename "${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
-  if (NOT EXISTS ${filename})
-    if (NOT quiet)
-      message(AUTHOR_WARNING "Unable to find ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
-    endif()
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords NAMES PATHS DEFINES CONSTANTS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (NOT OPT_NAMES OR (NOT OPT_DEFINES AND NOT OPT_CONSTANTS))
+    message(FATAL_ERROR "Arguments NAMES, DEFINES|CONSTANTS are required!")
+  endif()
+  if (OPT_DEFINES AND OPT_CONSTANTS)
+    message(FATAL_ERROR "Either DEFINES or CONSTANTS must be set!")
+  endif()
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(quiet TRUE)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  # Read the header
+  libfind_header_path(${PREFIX} NAMES ${OPT_NAMES} PATHS ${OPT_PATHS} VAR filename ${force_quiet})
+  if (NOT filename)
     return()
   endif()
   file(READ "${filename}" header)
-  string(REGEX MATCH ".*#[ \t]*define[ \t]+${DEFINE_NAME}[ \t]+((\"([^\n]*)\")|([^\n]*))" match "${header}")
-  # No regex match?
-  if (match STREQUAL header)
-    if (NOT quiet)
-      message(AUTHOR_WARNING "Unable to find \#define ${DEFINE_NAME} \"<version>\" from ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+  # Parse for version number
+  unset(version_parts)
+  foreach(define_name ${OPT_DEFINES})
+    string(REGEX MATCH "# *define +${define_name} +((\"([^\n]*)\")|([^ \n]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find \#define ${define_name} \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
     endif()
+  endforeach()
+  foreach(constant_name ${OPT_CONSTANTS})
+    string(REGEX MATCH "${constant_name} *= *((\"([^\;]*)\")|([^ \;]*))" match "${header}")
+    # No regex match?
+    if (NOT match OR match STREQUAL header)
+      if (NOT quiet)
+        message(AUTHOR_WARNING "Unable to find ${constant_name} = \"<version>\" from ${filename}")
+      endif()
+      return()
+    else()
+      list(APPEND version_parts "${CMAKE_MATCH_3}${CMAKE_MATCH_4}")
+    endif()
+  endforeach()
+
+  # Export the version string
+  string(REPLACE ";" "." version "${version_parts}")
+  set(${PREFIX}_VERSION "${version}" PARENT_SCOPE)
+endfunction()
+
+# libfind_version_header(<PREFIX> <HEADER> <DEFINE_NAME> [PATHS <path> [<path> ...]] [QUIET])
+# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
+# This function does nothing if the version variable is already defined.
+# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
+function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
+  # Skip processing if we already have a version
+  if (${PREFIX}_VERSION)
     return()
   endif()
-  # Export the version string
-  set(${PREFIX}_VERSION "${CMAKE_MATCH_3}${CMAKE_MATCH_4}" PARENT_SCOPE)
+
+  set(options QUIET)
+  set(one_value_keywords )
+  set(multi_value_keywords PATHS)
+  CMAKE_PARSE_ARGUMENTS(OPT "${options}" "${one_value_keywords}" "${multi_value_keywords}" ${ARGN})
+  if (OPT_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "Calling function with unused arguments '${OPT_UNPARSED_ARGUMENTS}'!")
+  endif()
+  if (OPT_QUIET OR ${PREFIX}_FIND_QUIETLY)
+    set(force_quiet "QUIET") # to propagate argument QUIET
+  endif()
+
+  libfind_version_n_header(${PREFIX} NAMES ${VERSION_H} PATHS ${OPT_PATHS} DEFINES ${DEFINE_NAME} ${force_quiet})
+  set(${PREFIX}_VERSION "${${PREFIX}_VERSION}" PARENT_SCOPE)
 endfunction()
 
 # Do the final processing once the paths have been detected.

From 4d0544e61a75083d7ea16793fd3b43cffe8a746c Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sun, 12 Jun 2016 20:11:53 +0300
Subject: [PATCH 719/765] Adds FindTinyXML.cmake

---
 cmake/FindTinyXML.cmake | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 cmake/FindTinyXML.cmake

diff --git a/cmake/FindTinyXML.cmake b/cmake/FindTinyXML.cmake
new file mode 100644
index 0000000000..d79a21c4a7
--- /dev/null
+++ b/cmake/FindTinyXML.cmake
@@ -0,0 +1,20 @@
+# Try to find TinyXML library
+
+# Once done this will define
+#  TinyXML_FOUND         - System has the all required components.
+#  TinyXML_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  TinyXML_LIBRARIES     - Link these to use TinyXML.
+#
+
+include(LibFindMacros)
+include(PreprocessorUtils)
+
+libfind_pkg_detect(TinyXML tinyxml
+    FIND_PATH tinyxml.h
+    FIND_LIBRARY tinyxml
+)
+libfind_version_n_header(TinyXML
+    NAMES tinyxml.h
+    CONSTANTS TIXML_MAJOR_VERSION TIXML_MINOR_VERSION TIXML_PATCH_VERSION
+)
+libfind_process(TinyXML)

From 28c63aea72c5bb5ea53bf69e3216edf97f4def52 Mon Sep 17 00:00:00 2001
From: Roman Proskuryakov <humbug@deeptown.org>
Date: Sun, 12 Jun 2016 21:03:33 +0300
Subject: [PATCH 720/765] Uses FindTinyXML to find package

---
 CMakeLists.txt             | 15 +++----------
 apps/openmw/CMakeLists.txt |  2 +-
 extern/oics/CMakeLists.txt | 43 ++++++++++++++------------------------
 3 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96a18e036..14a1c15c80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,17 +155,10 @@ add_definitions(-D__STDC_CONSTANT_MACROS)
 
 # TinyXML
 option(USE_SYSTEM_TINYXML "Use system TinyXML library instead of internal." OFF)
-if(USE_SYSTEM_TINYXML)
-    find_library(TINYXML_LIBRARIES tinyxml)
-    find_path(TINYXML_INCLUDE_DIR tinyxml.h)
-    message(STATUS "Found TinyXML: ${TINYXML_LIBRARIES} ${TINYXML_INCLUDE_DIR}")
+if (USE_SYSTEM_TINYXML)
+    find_package(TinyXML REQUIRED)
     add_definitions (-DTIXML_USE_STL)
-    if(TINYXML_LIBRARIES AND TINYXML_INCLUDE_DIR)
-        include_directories(${TINYXML_INCLUDE_DIR})
-        message(STATUS "Using system TinyXML library.")
-    else()
-        message(FATAL_ERROR "Detection of system TinyXML incomplete.")
-    endif()
+    include_directories(SYSTEM ${TinyXML_INCLUDE_DIRS})
 endif()
 
 # Platform specific
@@ -676,8 +669,6 @@ if (WIN32)
     endforeach(d)
 
     set_target_properties(components PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
-    # oics uses tinyxml, which has an initialized but unused variable
-    set_target_properties(oics PROPERTIES COMPILE_FLAGS "${WARNINGS} /wd4189 ${MT_BUILD}")
     set_target_properties(osg-ffmpeg-videoplayer PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
 
     if (BUILD_BSATOOL)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 8e938e0335..f7a9fea3c2 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -165,7 +165,7 @@ if (ANDROID)
 endif (ANDROID)
 
 if (USE_SYSTEM_TINYXML)
-    target_link_libraries(openmw ${TINYXML_LIBRARIES})
+    target_link_libraries(openmw ${TinyXML_LIBRARIES})
 endif()
 
 if (NOT UNIX)
diff --git a/extern/oics/CMakeLists.txt b/extern/oics/CMakeLists.txt
index 52ffb42a26..00d77f52c6 100644
--- a/extern/oics/CMakeLists.txt
+++ b/extern/oics/CMakeLists.txt
@@ -1,32 +1,21 @@
-set(OICS_LIBRARY "oics")
-
-# Sources
-
-set(OICS_SOURCE_FILES
-	ICSChannel.cpp
-	ICSControl.cpp
-	ICSInputControlSystem.cpp
-	ICSInputControlSystem_keyboard.cpp
-	ICSInputControlSystem_mouse.cpp
-	ICSInputControlSystem_joystick.cpp
-	ICSPrerequisites.h
-)
-
-set(TINYXML_SOURCE_FILES
-	tinyxml.cpp
-	tinyxmlparser.cpp
-	tinyxmlerror.cpp
-	tinystr.cpp	
+add_library(oics STATIC
+    ICSChannel.cpp
+    ICSControl.cpp
+    ICSInputControlSystem.cpp
+    ICSInputControlSystem_keyboard.cpp
+    ICSInputControlSystem_mouse.cpp
+    ICSInputControlSystem_joystick.cpp
+    ICSPrerequisites.h
 )
 
 if(USE_SYSTEM_TINYXML)
-    add_library(${OICS_LIBRARY} STATIC ${OICS_SOURCE_FILES})
-    target_link_libraries(${OICS_LIBRARY} ${TINYXML_LIBRARIES})
+    target_link_libraries(oics ${TinyXML_LIBRARIES})
 else()
-    add_library(${OICS_LIBRARY} STATIC
-    ${OICS_SOURCE_FILES}
-    ${TINYXML_SOURCE_FILES})
+    add_library(local_tinyxml STATIC
+        tinyxml.cpp
+        tinyxmlparser.cpp
+        tinyxmlerror.cpp
+        tinystr.cpp
+    )
+    target_link_libraries(oics local_tinyxml)
 endif()
-
-# Does this do anything?
-link_directories(${CMAKE_CURRENT_BINARY_DIR})

From 3ec4ee6290801d6e95381f72fe1428c32a5b927d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 13 Jun 2016 02:06:44 +0200
Subject: [PATCH 721/765] Make a copy of map key to work around it being
 invalidated (Fixes #3329)

---
 apps/openmw/mwmechanics/actors.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f627e62ae4..a1031f4c89 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -997,7 +997,8 @@ namespace MWMechanics
 
                 if (!iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
-                    updateActor(iter->first, duration);
+                    MWWorld::Ptr actor = iter->first; // make a copy of the map key to avoid it being invalidated when the player teleports
+                    updateActor(actor, duration);
                     if (MWBase::Environment::get().getWorld()->hasCellChanged())
                     {
                         return; // for now abort update of the old cell when cell changes by teleportation magic effect

From 3bebbab78e752730b59b9e2987ca1861cb1d5402 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Sat, 11 Jun 2016 22:34:49 +0900
Subject: [PATCH 722/765] Duration fixes for Follow and Escort

---
 apps/openmw/mwmechanics/aiescort.cpp | 40 +++++++++++++++-------------
 apps/openmw/mwmechanics/aiescort.hpp |  5 +++-
 apps/openmw/mwmechanics/aifollow.cpp | 32 +++++++++++++++-------
 apps/openmw/mwmechanics/aifollow.hpp |  5 +++-
 apps/openmw/mwmechanics/aitravel.cpp |  2 +-
 components/esm/aisequence.cpp        |  2 +-
 components/esm/aisequence.hpp        |  2 +-
 7 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 48d30f3e77..36aebfe4a3 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -24,29 +24,19 @@
 namespace MWMechanics
 {
     AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z)
-    : mActorId(actorId), mX(x), mY(y), mZ(z), mRemainingDuration(static_cast<float>(duration))
+    : mActorId(actorId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
         mMaxDist = 450;
-
-        // The CS Help File states that if a duration is given, the AI package will run for that long
-        // BUT if a location is givin, it "trumps" the duration so it will simply escort to that location.
-        if(mX != 0 || mY != 0 || mZ != 0)
-            mRemainingDuration = 0;
     }
 
     AiEscort::AiEscort(const std::string &actorId, const std::string &cellId,int duration, float x, float y, float z)
-    : mActorId(actorId), mCellId(cellId), mX(x), mY(y), mZ(z), mRemainingDuration(static_cast<float>(duration))
+    : mActorId(actorId), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration), mRemainingDuration(static_cast<float>(duration))
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
         mMaxDist = 450;
-
-        // The CS Help File states that if a duration is given, the AI package will run for that long
-        // BUT if a location is given, it "trumps" the duration so it will simply escort to that location.
-        if(mX != 0 || mY != 0 || mZ != 0)
-            mRemainingDuration = 0;
     }
 
     AiEscort::AiEscort(const ESM::AiSequence::AiEscort *escort)
@@ -56,6 +46,12 @@ namespace MWMechanics
         , mCellX(std::numeric_limits<int>::max())
         , mCellY(std::numeric_limits<int>::max())
     {
+        // mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+        // The exact value of mDuration only matters for repeating packages 
+        if (mRemainingDuration != 0)
+            mDuration = 1;
+        else
+            mDuration = 0;
     }
 
 
@@ -68,13 +64,13 @@ namespace MWMechanics
     {
         // If AiEscort has ran for as long or longer then the duration specified
         // and the duration is not infinite, the package is complete.
-        if(mRemainingDuration != 0)
+        if(mDuration > 0)
         {
-            mRemainingDuration -= duration;
-            if (duration <= 0)
+            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+            if (mRemainingDuration <= 0)
             {
-                // Reset mStarted to false so that package can be repeated again
-                mStarted = false;
+                mRemainingDuration = mDuration;
+                mStarted = false; // Reset to false so this package will build path again when repeating
                 return true;
             }
         }
@@ -105,8 +101,8 @@ namespace MWMechanics
             point.mUnknown = 0;
             if(pathTo(actor,point,duration)) //Returns true on path complete
             {
-                // Reset mStarted to false so that package can be repeated again
-                mStarted = false;
+                mRemainingDuration = mDuration;
+                mStarted = false; // Reset to false so this package will build path again when repeating
                 return true;
             }
             mMaxDist = 450;
@@ -147,5 +143,11 @@ namespace MWMechanics
         package.mPackage = escort.release();
         sequence.mPackages.push_back(package);
     }
+
+void AiEscort::fastForward(const MWWorld::Ptr& actor, AiState &state)
+{
+    // Update duration counter
+    mRemainingDuration--;
+}
 }
 
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index 677cf6f430..dcb136ca47 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -42,6 +42,8 @@ namespace MWMechanics
 
             void writeState(ESM::AiSequence::AiSequence &sequence) const;
 
+            void fastForward(const MWWorld::Ptr& actor, AiState& state);
+
         private:
             std::string mActorId;
             std::string mCellId;
@@ -49,7 +51,8 @@ namespace MWMechanics
             float mY;
             float mZ;
             float mMaxDist;
-            float mRemainingDuration; // In seconds
+            float mDuration; // In hours
+            float mRemainingDuration; // In hours
 
             int mCellX;
             int mCellY;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 02daec19e5..dd2219c457 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -28,30 +28,35 @@ struct AiFollowStorage : AiTemporaryBase
 int AiFollow::mFollowIndexCounter = 0;
 
 AiFollow::AiFollow(const std::string &actorId,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mCommanded(false), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+: mAlwaysFollow(false), mCommanded(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mActorRefId(actorId), mActorId(-1), mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
 }
+
 AiFollow::AiFollow(const std::string &actorId,const std::string &cellId,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mCommanded(false), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
+: mAlwaysFollow(false), mCommanded(false), mDuration(duration), mRemainingDuration(duration), mX(x), mY(y), mZ(z)
 , mActorRefId(actorId), mActorId(-1), mCellId(cellId), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
 }
 
 AiFollow::AiFollow(const std::string &actorId, bool commanded)
-: mAlwaysFollow(true), mCommanded(commanded), mRemainingDuration(0), mX(0), mY(0), mZ(0)
+: mAlwaysFollow(true), mCommanded(commanded), mDuration(0), mRemainingDuration(0), mX(0), mY(0), mZ(0)
 , mActorRefId(actorId), mActorId(-1), mCellId(""), mActive(false), mFollowIndex(mFollowIndexCounter++)
 {
-
 }
 
 AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
-    : mAlwaysFollow(follow->mAlwaysFollow), mCommanded(follow->mCommanded), mRemainingDuration(follow->mRemainingDuration)
+    : mCommanded(follow->mCommanded), mRemainingDuration(follow->mRemainingDuration)
     , mX(follow->mData.mX), mY(follow->mData.mY), mZ(follow->mData.mZ)
     , mActorRefId(follow->mTargetId), mActorId(-1)
     , mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++)
 {
-
+// mDuration isn't saved in the save file, so just giving it "1" for now if the package has a duration.
+// The exact value of mDuration only matters for repeating packages
+    if (mRemainingDuration != 0)
+       mDuration = 1;
+    else
+       mDuration = 0;
 }
 
 bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
@@ -101,11 +106,14 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
     if(!mAlwaysFollow) //Update if you only follow for a bit
     {
          //Check if we've run out of time
-        if (mRemainingDuration != 0)
+        if (mDuration != 0)
         {
-            mRemainingDuration -= duration;
-            if (duration <= 0)
+            mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
+            if (mRemainingDuration <= 0)
+            {
+                mRemainingDuration = mDuration;
                 return true;
+            }
         }
 
         if((pos.pos[0]-mX)*(pos.pos[0]-mX) +
@@ -228,4 +236,10 @@ int AiFollow::getFollowIndex() const
     return mFollowIndex;
 }
 
+void AiFollow::fastForward(const MWWorld::Ptr& actor, AiState &state)
+{
+    // Update duration counter
+    mRemainingDuration--;
+}
+
 }
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 0f955879a4..719909ebc8 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -50,12 +50,15 @@ namespace MWMechanics
 
             int getFollowIndex() const;
 
+            void fastForward(const MWWorld::Ptr& actor, AiState& state);
+
         private:
             /// This will make the actor always follow.
             /** Thus ignoring mDuration and mX,mY,mZ (used for summoned creatures). **/
             bool mAlwaysFollow;
             bool mCommanded;
-            float mRemainingDuration; // Seconds
+            float mDuration; // Hours
+            float mRemainingDuration; // Hours
             float mX;
             float mY;
             float mZ;
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 3026b4393f..5375644be5 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -64,7 +64,7 @@ namespace MWMechanics
         if (pathTo(actor, ESM::Pathgrid::Point(static_cast<int>(mX), static_cast<int>(mY), static_cast<int>(mZ)), duration))
         {
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-            mStarted = false;
+            mStarted = false; // Reset to false so this package will build path again when repeating
             return true;
         }
         return false;
diff --git a/components/esm/aisequence.cpp b/components/esm/aisequence.cpp
index 4733139402..71f87b1703 100644
--- a/components/esm/aisequence.cpp
+++ b/components/esm/aisequence.cpp
@@ -15,7 +15,7 @@ namespace AiSequence
     void AiWander::load(ESMReader &esm)
     {
         esm.getHNT (mData, "DATA");
-        esm.getHNT(mDurationData, "STAR");
+        esm.getHNT(mDurationData, "STAR"); // was mStartTime
         mStoredInitialActorPosition = false;
         if (esm.isNextSub("POS_"))
         {
diff --git a/components/esm/aisequence.hpp b/components/esm/aisequence.hpp
index b1ee9b1f14..52446d38f4 100644
--- a/components/esm/aisequence.hpp
+++ b/components/esm/aisequence.hpp
@@ -66,7 +66,7 @@ namespace ESM
     struct AiWander : AiPackage
     {
         AiWanderData mData;
-        AiWanderDuration mDurationData; // was ESM::TimeStamp mStartTime;
+        AiWanderDuration mDurationData; // was ESM::TimeStamp mStartTime
 
         bool mStoredInitialActorPosition;
         ESM::Vector3 mInitialActorPosition;

From 824cd3be224fd47ad5a68336a2d73173d0997cd4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 14 Jun 2016 22:25:25 +0200
Subject: [PATCH 723/765] Do not set _boundingBoxComputed which is no longer
 used

---
 components/sceneutil/riggeometry.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 4963018890..e0746801cd 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -315,8 +315,6 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
     }
 
     _boundingBox = box;
-    _boundingBoxComputed = true;
-    // in OSG 3.3.3 and up Drawable inherits from Node, so has a bounding sphere as well.
     _boundingSphere = osg::BoundingSphere(_boundingBox);
     _boundingSphereComputed = true;
     for (unsigned int i=0; i<getNumParents(); ++i)

From b5cb11ff0772d30834d03d1cfc674563dd62ed29 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Jun 2016 03:14:44 +0200
Subject: [PATCH 724/765] Split refreshCurrentAnims into multiple functions

---
 apps/openmw/mwmechanics/character.cpp | 180 ++++++++++++++------------
 apps/openmw/mwmechanics/character.hpp |   6 +
 2 files changed, 104 insertions(+), 82 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index eeeea37eed..4052a37b70 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -238,88 +238,83 @@ std::string CharacterController::chooseRandomGroup (const std::string& prefix, i
     return prefix + toString(roll);
 }
 
-void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
+void CharacterController::refreshHitRecoilAnims()
 {
-    // hit recoils/knockdown animations handling
-    if(mPtr.getClass().isActor())
+    bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
+    bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
+    bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
+    if(mHitState == CharState_None)
     {
-        bool recovery = mPtr.getClass().getCreatureStats(mPtr).getHitRecovery();
-        bool knockdown = mPtr.getClass().getCreatureStats(mPtr).getKnockedDown();
-        bool block = mPtr.getClass().getCreatureStats(mPtr).getBlock();
-        if(mHitState == CharState_None)
+        if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
+                || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
+                && mAnimation->hasAnimation("knockout"))
         {
-            if ((mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() < 0
-                    || mPtr.getClass().getCreatureStats(mPtr).getFatigue().getBase() == 0)
-                    && mAnimation->hasAnimation("knockout"))
-            {
-                mHitState = CharState_KnockOut;
-                mCurrentHit = "knockout";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
-                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
-            }
-            else if(knockdown && mAnimation->hasAnimation("knockdown"))
-            {
-                mHitState = CharState_KnockDown;
-                mCurrentHit = "knockdown";
-                mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-            }
-            else if (recovery)
-            {
-                std::string anim = chooseRandomGroup("hit");
-                if (mAnimation->hasAnimation(anim))
-                {
-                    mHitState = CharState_Hit;
-                    mCurrentHit = anim;
-                    mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
-                }
-            }
-            else if (block && mAnimation->hasAnimation("shield"))
-            {
-                mHitState = CharState_Block;
-                mCurrentHit = "shield";
-                MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
-                priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
-                mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
-            }
-
-            // Cancel upper body animations
-            if (mHitState == CharState_KnockDown || mHitState == CharState_KnockOut)
-            {
-                if (mUpperBodyState > UpperCharState_WeapEquiped)
-                {
-                    mAnimation->disable(mCurrentWeapon);
-                    mUpperBodyState = UpperCharState_WeapEquiped;
-                }
-                else if (mUpperBodyState > UpperCharState_Nothing && mUpperBodyState < UpperCharState_WeapEquiped)
-                {
-                    mAnimation->disable(mCurrentWeapon);
-                    mUpperBodyState = UpperCharState_Nothing;
-                }
-            }
+            mHitState = CharState_KnockOut;
+            mCurrentHit = "knockout";
+            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, false, 1, "start", "stop", 0.0f, ~0ul);
+            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(true);
         }
-        else if(!mAnimation->isPlaying(mCurrentHit))
-        {
-            mCurrentHit.erase();
-            if (knockdown)
-                mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
-            if (recovery)
-                mPtr.getClass().getCreatureStats(mPtr).setHitRecovery(false);
-            if (block)
-                mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
-            mHitState = CharState_None;
-        }
-        else if (mHitState == CharState_KnockOut && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0)
+        else if(knockdown && mAnimation->hasAnimation("knockdown"))
         {
             mHitState = CharState_KnockDown;
-            mAnimation->disable(mCurrentHit);
-            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
+            mCurrentHit = "knockdown";
+            mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
+        }
+        else if (recovery)
+        {
+            std::string anim = chooseRandomGroup("hit");
+            if (mAnimation->hasAnimation(anim))
+            {
+                mHitState = CharState_Hit;
+                mCurrentHit = anim;
+                mAnimation->play(mCurrentHit, Priority_Hit, MWRender::Animation::BlendMask_All, true, 1, "start", "stop", 0.0f, 0);
+            }
+        }
+        else if (block && mAnimation->hasAnimation("shield"))
+        {
+            mHitState = CharState_Block;
+            mCurrentHit = "shield";
+            MWRender::Animation::AnimPriority priorityBlock (Priority_Hit);
+            priorityBlock[MWRender::Animation::BoneGroup_LeftArm] = Priority_Block;
+            mAnimation->play(mCurrentHit, priorityBlock, MWRender::Animation::BlendMask_All, true, 1, "block start", "block stop", 0.0f, 0);
+        }
+
+        // Cancel upper body animations
+        if (mHitState == CharState_KnockDown || mHitState == CharState_KnockOut)
+        {
+            if (mUpperBodyState > UpperCharState_WeapEquiped)
+            {
+                mAnimation->disable(mCurrentWeapon);
+                mUpperBodyState = UpperCharState_WeapEquiped;
+            }
+            else if (mUpperBodyState > UpperCharState_Nothing && mUpperBodyState < UpperCharState_WeapEquiped)
+            {
+                mAnimation->disable(mCurrentWeapon);
+                mUpperBodyState = UpperCharState_Nothing;
+            }
         }
     }
+    else if(!mAnimation->isPlaying(mCurrentHit))
+    {
+        mCurrentHit.erase();
+        if (knockdown)
+            mPtr.getClass().getCreatureStats(mPtr).setKnockedDown(false);
+        if (recovery)
+            mPtr.getClass().getCreatureStats(mPtr).setHitRecovery(false);
+        if (block)
+            mPtr.getClass().getCreatureStats(mPtr).setBlock(false);
+        mHitState = CharState_None;
+    }
+    else if (mHitState == CharState_KnockOut && mPtr.getClass().getCreatureStats(mPtr).getFatigue().getCurrent() > 0)
+    {
+        mHitState = CharState_KnockDown;
+        mAnimation->disable(mCurrentHit);
+        mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
+    }
+}
 
-    const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
-    if (!mPtr.getClass().isBipedal(mPtr))
-        weap = sWeaponTypeListEnd;
-
+void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, bool force)
+{
     if(force || jump != mJumpState)
     {
         bool startAtLoop = (jump == mJumpState);
@@ -358,7 +353,10 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
                              1.0f, "loop stop", "stop", 0.0f, 0);
         }
     }
+}
 
+void CharacterController::refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, bool force)
+{
     if(force || movement != mMovementState)
     {
         mMovementState = movement;
@@ -466,16 +464,10 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
                              1.f, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
         }
     }
+}
 
-    // idle handled last as it can depend on the other states
-    // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
-    // the idle animation should be displayed
-    if ((mUpperBodyState != UpperCharState_Nothing
-            || (mMovementState != CharState_None && mMovementState != CharState_TurnLeft && mMovementState != CharState_TurnRight)
-            || mHitState != CharState_None)
-            && !mPtr.getClass().isBipedal(mPtr))
-        idle = CharState_None;
-
+void CharacterController::refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force)
+{
     if(force || idle != mIdleState)
     {
         mIdleState = idle;
@@ -513,6 +505,30 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
     }
 }
 
+void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force)
+{
+    if (mPtr.getClass().isActor())
+        refreshHitRecoilAnims();
+
+    const WeaponInfo *weap = std::find_if(sWeaponTypeList, sWeaponTypeListEnd, FindWeaponType(mWeaponType));
+    if (!mPtr.getClass().isBipedal(mPtr))
+        weap = sWeaponTypeListEnd;
+
+    refreshJumpAnims(weap, jump, force);
+    refreshMovementAnims(weap, movement, force);
+
+    // idle handled last as it can depend on the other states
+    // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming update),
+    // the idle animation should be displayed
+    if ((mUpperBodyState != UpperCharState_Nothing
+            || (mMovementState != CharState_None && mMovementState != CharState_TurnLeft && mMovementState != CharState_TurnRight)
+            || mHitState != CharState_None)
+            && !mPtr.getClass().isBipedal(mPtr))
+        idle = CharState_None;
+
+    refreshIdleAnims(weap, idle, force);
+}
+
 
 void getWeaponGroup(WeaponType weaptype, std::string &group)
 {
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 9bea4b78c6..b7e5feb6ff 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -140,6 +140,8 @@ enum JumpingState {
     JumpState_Landing
 };
 
+struct WeaponInfo;
+
 class CharacterController : public MWRender::Animation::TextKeyListener
 {
     MWWorld::Ptr mPtr;
@@ -193,6 +195,10 @@ class CharacterController : public MWRender::Animation::TextKeyListener
     void setAttackTypeRandomly();
 
     void refreshCurrentAnims(CharacterState idle, CharacterState movement, JumpingState jump, bool force=false);
+    void refreshHitRecoilAnims();
+    void refreshJumpAnims(const WeaponInfo* weap, JumpingState jump, bool force=false);
+    void refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, bool force=false);
+    void refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force=false);
 
     void clearAnimQueue();
 

From 693d3cea4a0feac8fe765da5db03d4ad291df3b7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Jun 2016 19:38:04 +0200
Subject: [PATCH 725/765] Float to surface fix

---
 apps/openmw/mwmechanics/character.cpp   | 2 +-
 apps/openmw/mwphysics/physicssystem.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 4052a37b70..c20153206d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1938,7 +1938,7 @@ void CharacterController::update(float duration)
     if (mSkipAnim)
         mAnimation->updateEffects(duration);
 
-    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead())
+    if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr))
         moved.z() = 1.0;
 
     // Update movement
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index d1dca5f3fd..95de8430d6 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -280,9 +280,9 @@ namespace MWPhysics
             {
                 velocity = (osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * movement;
 
-                if (velocity.z() > 0.f)
+                if (velocity.z() > 0.f && physicActor->getOnGround())
                     inertia = velocity;
-                if(!physicActor->getOnGround())
+                else if(!physicActor->getOnGround())
                 {
                     velocity = velocity + physicActor->getInertialForce();
                 }

From c2b51112f2dc9fa605c8f3d672bb936e6ce784bd Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Thu, 16 Jun 2016 03:43:09 +0900
Subject: [PATCH 726/765] AI package cleanups

---
 apps/openmw/mwmechanics/aiescort.cpp |   3 +-
 apps/openmw/mwmechanics/aiwander.cpp | 146 ++++++++++++++-------------
 apps/openmw/mwmechanics/aiwander.hpp |  49 ++-------
 3 files changed, 85 insertions(+), 113 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 36aebfe4a3..03532cbae5 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -16,7 +16,6 @@
 #include "movement.hpp"
 
 /*
-    TODO: Test vanilla behavior on passing x0, y0, and z0 with duration of anything including 0.
     TODO: Different behavior for AIEscort a d x y z and AIEscortCell a c d x y z.
     TODO: Take account for actors being in different cells.
 */
@@ -109,7 +108,7 @@ namespace MWMechanics
         }
         else
         {
-            // Stop moving if the player is to far away
+            // Stop moving if the player is too far away
             MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
             actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
             mMaxDist = 250;
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 0bf02aba99..a6694c3146 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -75,6 +75,21 @@ namespace MWMechanics
         std::vector<unsigned short> mBadIdles; // Idle animations that when called cause errors
 
         PathFinder mPathFinder;
+
+        // do we need to calculate allowed nodes based on mDistance
+        bool mPopulateAvailableNodes;
+
+        // allowed pathgrid nodes based on mDistance from the spawn point
+        // in local coordinates of mCell
+        std::vector<ESM::Pathgrid::Point> mAllowedNodes;
+
+        ESM::Pathgrid::Point mCurrentNode;
+        bool mTrimCurrentNode;
+
+        ObstacleCheck mObstacleCheck;
+
+        float mDoorCheckDuration;
+        int mStuckCount;
         
         AiWanderStorage():
             mTargetAngleRadians(0),
@@ -87,7 +102,12 @@ namespace MWMechanics
             mIsWanderingManually(false),
             mCanWanderAlongPathGrid(true),
             mIdleAnimation(0),
-            mBadIdles()
+            mBadIdles(),
+            mPopulateAvailableNodes(true),
+            mAllowedNodes(),
+            mTrimCurrentNode(false),
+            mDoorCheckDuration(0), // TODO: maybe no longer needed
+            mStuckCount(0)
             {};
 
         void setState(const AiWander::WanderState wanderState, const bool isManualWander = false) {
@@ -108,11 +128,6 @@ namespace MWMechanics
     {
         // NOTE: mDistance and mDuration must be set already
 
-
-        mStuckCount = 0;// TODO: maybe no longer needed
-        mDoorCheckDuration = 0;
-        mTrimCurrentNode = false;
-
         mHasReturnPosition = false;
         mReturnPosition = osg::Vec3f(0,0,0);
 
@@ -120,16 +135,6 @@ namespace MWMechanics
             mDistance = 0;
         if(mDuration < 0)
             mDuration = 0;
-        if(mDuration == 0)
-            mTimeOfDay = 0;
-        if(mDuration > 24)
-        {
-            mDuration = 24;
-            mRemainingDuration = (mDuration);
-        }
-
-        mPopulateAvailableNodes = true;
-
     }
 
     AiPackage * MWMechanics::AiWander::clone() const
@@ -202,7 +207,7 @@ namespace MWMechanics
         if(!currentCell || cellChange)
         {
             currentCell = actor.getCell();
-            mPopulateAvailableNodes = true;
+            storage.mPopulateAvailableNodes = true;
         }
 
         mRemainingDuration -= ((duration*MWBase::Environment::get().getWorld()->getTimeScaleFactor()) / 3600);
@@ -248,7 +253,7 @@ namespace MWMechanics
         }
 
         // Initialization to discover & store allowed node points for this actor.
-        if (mPopulateAvailableNodes)
+        if (storage.mPopulateAvailableNodes)
         {
             getAllowedNodes(actor, currentCell->getCell(), storage);
         }
@@ -256,19 +261,19 @@ namespace MWMechanics
         // Actor becomes stationary - see above URL's for previous research
         // If a creature or an NPC with a wander distance and no pathgrid is available,
         // randomly idle or wander around near spawn point
-        if(mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
+        if(storage.mAllowedNodes.empty() && mDistance > 0 && !storage.mIsWanderingManually) {
             // Typically want to idle for a short time before the next wander
             if (Misc::Rng::rollDice(100) >= 96) {
                 wanderNearStart(actor, storage, mDistance);
             } else {
                 storage.setState(Wander_IdleNow);
             }
-        } else if (mAllowedNodes.empty() && !storage.mIsWanderingManually) {
+        } else if (storage.mAllowedNodes.empty() && !storage.mIsWanderingManually) {
             storage.mCanWanderAlongPathGrid = false;
         }
 
         // If Wandering manually and hit an obstacle, stop
-        if (storage.mIsWanderingManually && mObstacleCheck.check(actor, duration, 2.0f)) {
+        if (storage.mIsWanderingManually && storage.mObstacleCheck.check(actor, duration, 2.0f)) {
             completeManualWalking(actor, storage);
         }
 
@@ -297,7 +302,7 @@ namespace MWMechanics
             // Construct a new path if there isn't one
             if(!storage.mPathFinder.isPathConstructed())
             {
-                if (!mAllowedNodes.empty())
+                if (!storage.mAllowedNodes.empty())
                 {
                     setPathToAnAllowedNode(actor, storage, pos);
                 }
@@ -314,6 +319,7 @@ namespace MWMechanics
          return mRepeat; 
     }
 
+
     bool AiWander::isPackageCompleted(const MWWorld::Ptr& actor, AiWanderStorage& storage)
     {
         if (mDuration)
@@ -401,7 +407,7 @@ namespace MWMechanics
 
     void AiWander::completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage) {
         stopWalking(actor, storage);
-        mObstacleCheck.clear();
+        storage.mObstacleCheck.clear();
         storage.setState(Wander_IdleNow);
     }
 
@@ -434,15 +440,15 @@ namespace MWMechanics
     void AiWander::onIdleStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage)
     {
         // Check if an idle actor is  too close to a door - if so start walking
-        mDoorCheckDuration += duration;
-        if (mDoorCheckDuration >= DOOR_CHECK_INTERVAL)
+        storage.mDoorCheckDuration += duration;
+        if (storage.mDoorCheckDuration >= DOOR_CHECK_INTERVAL)
         {
-            mDoorCheckDuration = 0;    // restart timer
+            storage.mDoorCheckDuration = 0;    // restart timer
             if (mDistance &&            // actor is not intended to be stationary
                 proximityToDoor(actor, MIN_DIST_TO_DOOR_SQUARED*1.6f*1.6f)) // NOTE: checks interior cells only
             {
                 storage.setState(Wander_MoveNow);
-                mTrimCurrentNode = false; // just in case
+                storage.mTrimCurrentNode = false; // just in case
                 return;
             }
         }
@@ -515,15 +521,15 @@ namespace MWMechanics
         zTurn(actor, storage.mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]));
 
         MWMechanics::Movement& movement = actor.getClass().getMovementSettings(actor);
-        if (mObstacleCheck.check(actor, duration))
+        if (storage.mObstacleCheck.check(actor, duration))
         {
             // first check if we're walking into a door
             if (proximityToDoor(actor)) // NOTE: checks interior cells only
             {
                 // remove allowed points then select another random destination
-                mTrimCurrentNode = true;
-                trimAllowedNodes(mAllowedNodes, storage.mPathFinder);
-                mObstacleCheck.clear();
+                storage.mTrimCurrentNode = true;
+                trimAllowedNodes(storage.mAllowedNodes, storage.mPathFinder);
+                storage.mObstacleCheck.clear();
                 storage.mPathFinder.clearPath();
                 storage.setState(Wander_MoveNow);
             }
@@ -531,9 +537,9 @@ namespace MWMechanics
             {
                 // TODO: diagonal should have same animation as walk forward
                 //       but doesn't seem to do that?
-                mObstacleCheck.takeEvasiveAction(movement);
+                storage.mObstacleCheck.takeEvasiveAction(movement);
             }
-            mStuckCount++;  // TODO: maybe no longer needed
+            storage.mStuckCount++;  // TODO: maybe no longer needed
         }
         else
         {
@@ -541,14 +547,14 @@ namespace MWMechanics
         }
 
         // if stuck for sufficiently long, act like current location was the destination
-        if (mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset
+        if (storage.mStuckCount >= COUNT_BEFORE_RESET) // something has gone wrong, reset
         {
             //std::cout << "Reset \""<< cls.getName(actor) << "\"" << std::endl;
-            mObstacleCheck.clear();
+            storage.mObstacleCheck.clear();
 
             stopWalking(actor, storage);
             storage.setState(Wander_ChooseAction);
-            mStuckCount = 0;
+            storage.mStuckCount = 0;
         }
     }
 
@@ -621,7 +627,7 @@ namespace MWMechanics
             if (storage.mState == Wander_Walking)
             {
                 stopWalking(actor, storage);
-                mObstacleCheck.clear();
+                storage.mObstacleCheck.clear();
                 storage.setState(Wander_IdleNow);
             }
 
@@ -653,8 +659,8 @@ namespace MWMechanics
 
     void AiWander::setPathToAnAllowedNode(const MWWorld::Ptr& actor, AiWanderStorage& storage, const ESM::Position& actorPos)
     {
-        unsigned int randNode = Misc::Rng::rollDice(mAllowedNodes.size());
-        ESM::Pathgrid::Point dest(mAllowedNodes[randNode]);
+        unsigned int randNode = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        ESM::Pathgrid::Point dest(storage.mAllowedNodes[randNode]);
         ToWorldCoordinates(dest, storage.mCell->getCell());
 
         // actor position is already in world co-ordinates
@@ -666,20 +672,20 @@ namespace MWMechanics
         if (storage.mPathFinder.isPathConstructed())
         {
             // Remove this node as an option and add back the previously used node (stops NPC from picking the same node):
-            ESM::Pathgrid::Point temp = mAllowedNodes[randNode];
-            mAllowedNodes.erase(mAllowedNodes.begin() + randNode);
+            ESM::Pathgrid::Point temp = storage.mAllowedNodes[randNode];
+            storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
             // check if mCurrentNode was taken out of mAllowedNodes
-            if (mTrimCurrentNode && mAllowedNodes.size() > 1)
-                mTrimCurrentNode = false;
+            if (storage.mTrimCurrentNode && storage.mAllowedNodes.size() > 1)
+                storage.mTrimCurrentNode = false;
             else
-                mAllowedNodes.push_back(mCurrentNode);
-            mCurrentNode = temp;
+                storage.mAllowedNodes.push_back(storage.mCurrentNode);
+            storage.mCurrentNode = temp;
 
             storage.setState(Wander_Walking);
         }
         // Choose a different node and delete this one from possible nodes because it is uncreachable:
         else
-            mAllowedNodes.erase(mAllowedNodes.begin() + randNode);
+            storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + randNode);
     }
 
     void AiWander::ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell)
@@ -788,17 +794,17 @@ namespace MWMechanics
         if (mDistance == 0)
             return;
 
-        if (mPopulateAvailableNodes)
-            getAllowedNodes(actor, actor.getCell()->getCell(), state.get<AiWanderStorage>());
+        AiWanderStorage& storage = state.get<AiWanderStorage>();
+        if (storage.mPopulateAvailableNodes)
+            getAllowedNodes(actor, actor.getCell()->getCell(), storage);
 
-        if (mAllowedNodes.empty())
+        if (storage.mAllowedNodes.empty())
             return;
 
+        int index = Misc::Rng::rollDice(storage.mAllowedNodes.size());
+        ESM::Pathgrid::Point dest = storage.mAllowedNodes[index];
         state.moveIn(new AiWanderStorage());
 
-        int index = Misc::Rng::rollDice(mAllowedNodes.size());
-        ESM::Pathgrid::Point dest = mAllowedNodes[index];
-
         dest.mX += OffsetToPreventOvercrowding();
         dest.mY += OffsetToPreventOvercrowding();
         ToWorldCoordinates(dest, actor.getCell()->getCell());
@@ -808,7 +814,7 @@ namespace MWMechanics
         actor.getClass().adjustPosition(actor, false);
 
         // may have changed cell
-        mPopulateAvailableNodes = true;
+        storage.mPopulateAvailableNodes = true;
     }
 
     int AiWander::OffsetToPreventOvercrowding()
@@ -823,7 +829,7 @@ namespace MWMechanics
             pathgrid = MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*cell);
         const MWWorld::CellStore* cellStore = actor.getCell();
 
-        mAllowedNodes.clear();
+        storage.mAllowedNodes.clear();
 
         // If there is no path this actor doesn't go anywhere. See:
         // https://forum.openmw.org/viewtopic.php?t=1556
@@ -856,40 +862,40 @@ namespace MWMechanics
                 if((npcPos - nodePos).length2() <= mDistance * mDistance &&
                    cellStore->isPointConnected(closestPointIndex, counter))
                 {
-                    mAllowedNodes.push_back(pathgrid->mPoints[counter]);
+                    storage.mAllowedNodes.push_back(pathgrid->mPoints[counter]);
                     pointIndex = counter;
                 }
             }
-            if (mAllowedNodes.size() == 1)
+            if (storage.mAllowedNodes.size() == 1)
             {
-                AddNonPathGridAllowedPoints(npcPos, pathgrid, pointIndex);
+                AddNonPathGridAllowedPoints(npcPos, pathgrid, pointIndex, storage);
             }
-            if(!mAllowedNodes.empty())
+            if(!storage.mAllowedNodes.empty())
             {
-                SetCurrentNodeToClosestAllowedNode(npcPos);
+                SetCurrentNodeToClosestAllowedNode(npcPos, storage);
             }
         }
 
-        mPopulateAvailableNodes = false;
+        storage.mPopulateAvailableNodes = false;
     }
 
     // When only one path grid point in wander distance, 
     // additional points for NPC to wander to are:
     // 1. NPC's initial location
     // 2. Partway along the path between the point and its connected points.
-    void AiWander::AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex)
+    void AiWander::AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage)
     {
-        mAllowedNodes.push_back(PathFinder::MakePathgridPoint(npcPos));
+        storage.mAllowedNodes.push_back(PathFinder::MakePathgridPoint(npcPos));
         for (std::vector<ESM::Pathgrid::Edge>::const_iterator it = pathGrid->mEdges.begin(); it != pathGrid->mEdges.end(); ++it)
         {
             if (it->mV0 == pointIndex)
             {
-                AddPointBetweenPathGridPoints(pathGrid->mPoints[it->mV0], pathGrid->mPoints[it->mV1]);
+                AddPointBetweenPathGridPoints(pathGrid->mPoints[it->mV0], pathGrid->mPoints[it->mV1], storage);
             }
         }
     }
 
-    void AiWander::AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end)
+    void AiWander::AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage)
     {
         osg::Vec3f vectorStart = PathFinder::MakeOsgVec3(start);
         osg::Vec3f delta = PathFinder::MakeOsgVec3(end) - vectorStart;
@@ -901,16 +907,16 @@ namespace MWMechanics
         // must not travel longer than distance between waypoints or NPC goes past waypoint
         distance = std::min(distance, static_cast<int>(length));
         delta *= distance;
-        mAllowedNodes.push_back(PathFinder::MakePathgridPoint(vectorStart + delta));
+        storage.mAllowedNodes.push_back(PathFinder::MakePathgridPoint(vectorStart + delta));
     }
 
-    void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos)
+    void AiWander::SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage)
     {
         float distanceToClosestNode = std::numeric_limits<float>::max();
         unsigned int index = 0;
-        for (unsigned int counterThree = 0; counterThree < mAllowedNodes.size(); counterThree++)
+        for (unsigned int counterThree = 0; counterThree < storage.mAllowedNodes.size(); counterThree++)
         {
-            osg::Vec3f nodePos(PathFinder::MakeOsgVec3(mAllowedNodes[counterThree]));
+            osg::Vec3f nodePos(PathFinder::MakeOsgVec3(storage.mAllowedNodes[counterThree]));
             float tempDist = (npcPos - nodePos).length2();
             if (tempDist < distanceToClosestNode)
             {
@@ -918,8 +924,8 @@ namespace MWMechanics
                 distanceToClosestNode = tempDist;
             }
         }
-        mCurrentNode = mAllowedNodes[index];
-        mAllowedNodes.erase(mAllowedNodes.begin() + index);
+        storage.mCurrentNode = storage.mAllowedNodes[index];
+        storage.mAllowedNodes.erase(storage.mAllowedNodes.begin() + index);
     }
 
     void AiWander::writeState(ESM::AiSequence::AiSequence &sequence) const
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 2a277de162..d652d4799e 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -10,7 +10,6 @@
 
 #include "../mwworld/timestamp.hpp"
 
-
 #include "aistate.hpp"
 
 namespace ESM
@@ -23,9 +22,7 @@ namespace ESM
 }
 
 namespace MWMechanics
-{    
-    
-    
+{       
     struct AiWanderStorage;
 
     /// \brief Causes the Actor to wander within a specified range
@@ -42,8 +39,6 @@ namespace MWMechanics
 
             AiWander (const ESM::AiSequence::AiWander* wander);
 
-            
-
             virtual AiPackage *clone() const;
 
             virtual bool execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration);
@@ -72,10 +67,10 @@ namespace MWMechanics
                 Wander_MoveNow,
                 Wander_Walking
             };
+
         private:
             // NOTE: mDistance and mDuration must be set already
             void init();
-            
             void stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage);
 
             /// Have the given actor play an idle animation
@@ -107,42 +102,16 @@ namespace MWMechanics
             int mTimeOfDay;
             std::vector<unsigned char> mIdle;
             bool mRepeat;
-            
 
             bool mHasReturnPosition; // NOTE: Could be removed if mReturnPosition was initialized to actor position,
                                     // if we had the actor in the AiWander constructor...
             osg::Vec3f mReturnPosition;
-
             osg::Vec3f mInitialActorPosition;
             bool mStoredInitialActorPosition;
 
-           
-
-            // do we need to calculate allowed nodes based on mDistance
-            bool mPopulateAvailableNodes;
-
-
-            
-
-
-            // allowed pathgrid nodes based on mDistance from the spawn point
-            // in local coordinates of mCell
-            // FIXME: move to AiWanderStorage
-            std::vector<ESM::Pathgrid::Point> mAllowedNodes;
-
             void getAllowedNodes(const MWWorld::Ptr& actor, const ESM::Cell* cell, AiWanderStorage& storage);
-
-            // FIXME: move to AiWanderStorage
-            ESM::Pathgrid::Point mCurrentNode;
-            bool mTrimCurrentNode;
-            void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
-                                  const PathFinder& pathfinder);
-
-
-            // FIXME: move to AiWanderStorage
-//             ObstacleCheck mObstacleCheck;
-            float mDoorCheckDuration;
-            int mStuckCount;
+            
+            void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes, const PathFinder& pathfinder);
 
             // constants for converting idleSelect values into groupNames
             enum GroupIndex
@@ -154,19 +123,17 @@ namespace MWMechanics
             /// convert point from local (i.e. cell) to world co-ordinates
             void ToWorldCoordinates(ESM::Pathgrid::Point& point, const ESM::Cell * cell);
 
-            void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos);
+            void SetCurrentNodeToClosestAllowedNode(osg::Vec3f npcPos, AiWanderStorage& storage);
 
-            void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex);
+            void AddNonPathGridAllowedPoints(osg::Vec3f npcPos, const ESM::Pathgrid * pathGrid, int pointIndex, AiWanderStorage& storage);
 
-            void AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end);
+            void AddPointBetweenPathGridPoints(const ESM::Pathgrid::Point& start, const ESM::Pathgrid::Point& end, AiWanderStorage& storage);
 
             /// lookup table for converting idleSelect value to groupName
             static const std::string sIdleSelectToGroupName[GroupIndex_MaxIdle - GroupIndex_MinIdle + 1];
 
             static int OffsetToPreventOvercrowding();
-    };
-    
-    
+    }; 
 }
 
 #endif

From aa5a643e3b32449cb287bb0c5bb6735cd4f3803b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 16 Jun 2016 17:31:17 +0200
Subject: [PATCH 727/765] Fix incorrect multiplication order of TBN matrix (Bug
 #3440)

---
 files/shaders/parallax.glsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/shaders/parallax.glsl b/files/shaders/parallax.glsl
index 52ea0d2cca..097a59ed11 100644
--- a/files/shaders/parallax.glsl
+++ b/files/shaders/parallax.glsl
@@ -1,8 +1,8 @@
 #define PARALLAX_SCALE 0.04
 #define PARALLAX_BIAS -0.02
 
-vec2 getParallaxOffset(vec3 eyeDir, mat3 tbn, float height)
+vec2 getParallaxOffset(vec3 eyeDir, mat3 tbnTranspose, float height)
 {
-    vec3 TSeyeDir = normalize((vec4(normalize(tbn * eyeDir),0)).xyz);
+    vec3 TSeyeDir = normalize(eyeDir * tbnTranspose);
     return TSeyeDir.xy * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
 }

From 6a1fd050744e7363f1de15bee6c4880cfa7a1c53 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 16 Jun 2016 17:32:27 +0200
Subject: [PATCH 728/765] Fix the coordinate frame for eyeDir, minor cleanup
 (Bug #3440)

---
 files/shaders/objects_fragment.glsl | 13 +++++++------
 files/shaders/terrain_fragment.glsl | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 935479e44c..b0d51afaee 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -71,23 +71,24 @@ void main()
     vec3 normalizedNormal = normalize(passNormal);
     vec3 normalizedTangent = normalize(passTangent);
     vec3 binormal = cross(normalizedTangent, normalizedNormal);
-    mat3 tbn = mat3(normalizedTangent, binormal, normalizedNormal);
+    mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex.xyz * 2.0 - 1.0));
+    vec3 viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
 #else
     vec3 viewNormal = gl_NormalMatrix * normalize(passNormal);
 #endif
 
 #if @parallax
-    vec3 cameraPos = osg_ViewMatrixInverse[3].xyz;
-    vec3 eyeDir = normalize(cameraPos - (osg_ViewMatrixInverse * vec4(passViewPos, 1)).xyz);
-    vec2 offset = getParallaxOffset(eyeDir, tbn, normalTex.a);
+    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
+    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
+    vec3 eyeDir = normalize(cameraPos - objectPos);
+    vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a);
     adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
 
 #if @diffuseMapUV == @normalMapUV
     // fetch a new normal using updated coordinates
     normalTex = texture2D(normalMap, adjustedDiffuseUV);
-    viewNormal = gl_NormalMatrix * normalize(tbn * (normalTex.xyz * 2.0 - 1.0));
+    viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));
 #endif
 
 #endif
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 14f00a2e14..d05a94687a 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -42,21 +42,22 @@ void main()
     vec3 tangent = vec3(1.0, 0.0, 0.0);
     vec3 binormal = normalize(cross(tangent, normalizedNormal));
     tangent = normalize(cross(normalizedNormal, binormal)); // note, now we need to re-cross to derive tangent again because it wasn't orthonormal
-    mat3 tbn = mat3(tangent, binormal, normalizedNormal);
+    mat3 tbnTranspose = mat3(tangent, binormal, normalizedNormal);
 
-    vec3 viewNormal = normalize(gl_NormalMatrix * (tbn * (normalTex.xyz * 2.0 - 1.0)));
+    vec3 viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
 #else
     vec3 viewNormal = normalize(gl_NormalMatrix * passNormal);
 #endif
 
 #if @parallax
-    vec3 cameraPos = osg_ViewMatrixInverse[3].xyz;
-    vec3 eyeDir = normalize(cameraPos - (osg_ViewMatrixInverse * vec4(passViewPos, 1)).xyz);
-    adjustedUV += getParallaxOffset(eyeDir, tbn, normalTex.a);
+    vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
+    vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
+    vec3 eyeDir = normalize(cameraPos - objectPos);
+    adjustedUV += getParallaxOffset(eyeDir, tbnTranspose, normalTex.a);
 
     // update normal using new coordinates
     normalTex = texture2D(normalMap, adjustedUV);
-    viewNormal = normalize(gl_NormalMatrix * (tbn * (normalTex.xyz * 2.0 - 1.0)));
+    viewNormal = normalize(gl_NormalMatrix * (tbnTranspose * (normalTex.xyz * 2.0 - 1.0)));
 #endif
 
     vec4 diffuseTex = texture2D(diffuseMap, adjustedUV);

From 6f5b68859f721d36db668b48b66c88bf50895c99 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 16 Jun 2016 17:33:54 +0200
Subject: [PATCH 729/765] Comment out UV test that is not working

---
 files/shaders/objects_fragment.glsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index b0d51afaee..8f21e72477 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -85,7 +85,9 @@ void main()
     vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a);
     adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
 
-#if @diffuseMapUV == @normalMapUV
+    // TODO: check not working as the same UV buffer is being bound to different targets
+    // if diffuseMapUV == normalMapUV
+#if 1
     // fetch a new normal using updated coordinates
     normalTex = texture2D(normalMap, adjustedDiffuseUV);
     viewNormal = gl_NormalMatrix * normalize(tbnTranspose * (normalTex.xyz * 2.0 - 1.0));

From 8e23c37668acafd072cbde6a8310be9680dda6e0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 16 Jun 2016 18:07:10 +0200
Subject: [PATCH 730/765] Flip the parallax offset Y component based on tangent
 parity (Bug #3440)

---
 files/shaders/objects_fragment.glsl | 6 +++---
 files/shaders/objects_vertex.glsl   | 4 ++--
 files/shaders/parallax.glsl         | 4 ++--
 files/shaders/terrain_fragment.glsl | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index 8f21e72477..ac8c2d591d 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -28,7 +28,7 @@ varying vec2 emissiveMapUV;
 #if @normalMap
 uniform sampler2D normalMap;
 varying vec2 normalMapUV;
-varying vec3 passTangent;
+varying vec4 passTangent;
 #endif
 
 #if @envMap
@@ -69,7 +69,7 @@ void main()
     vec4 normalTex = texture2D(normalMap, normalMapUV);
 
     vec3 normalizedNormal = normalize(passNormal);
-    vec3 normalizedTangent = normalize(passTangent);
+    vec3 normalizedTangent = normalize(passTangent.xyz);
     vec3 binormal = cross(normalizedTangent, normalizedNormal);
     mat3 tbnTranspose = mat3(normalizedTangent, binormal, normalizedNormal);
 
@@ -82,7 +82,7 @@ void main()
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
     vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
     vec3 eyeDir = normalize(cameraPos - objectPos);
-    vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a);
+    vec2 offset = getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, (passTangent.w > 0) ? -1.f : 1.f);
     adjustedDiffuseUV += offset; // only offset diffuse for now, other textures are more likely to be using a completely different UV set
 
     // TODO: check not working as the same UV buffer is being bound to different targets
diff --git a/files/shaders/objects_vertex.glsl b/files/shaders/objects_vertex.glsl
index 9aabbe6969..e140cd6ad3 100644
--- a/files/shaders/objects_vertex.glsl
+++ b/files/shaders/objects_vertex.glsl
@@ -22,7 +22,7 @@ varying vec2 emissiveMapUV;
 
 #if @normalMap
 varying vec2 normalMapUV;
-varying vec3 passTangent;
+varying vec4 passTangent;
 #endif
 
 #if @envMap
@@ -85,7 +85,7 @@ void main(void)
 
 #if @normalMap
     normalMapUV = (gl_TextureMatrix[@normalMapUV] * gl_MultiTexCoord@normalMapUV).xy;
-    passTangent = gl_MultiTexCoord7.xyz;
+    passTangent = gl_MultiTexCoord7.xyzw;
 #endif
 
 #if @specularMap
diff --git a/files/shaders/parallax.glsl b/files/shaders/parallax.glsl
index 097a59ed11..433dbcd3e4 100644
--- a/files/shaders/parallax.glsl
+++ b/files/shaders/parallax.glsl
@@ -1,8 +1,8 @@
 #define PARALLAX_SCALE 0.04
 #define PARALLAX_BIAS -0.02
 
-vec2 getParallaxOffset(vec3 eyeDir, mat3 tbnTranspose, float height)
+vec2 getParallaxOffset(vec3 eyeDir, mat3 tbnTranspose, float height, float flipY)
 {
     vec3 TSeyeDir = normalize(eyeDir * tbnTranspose);
-    return TSeyeDir.xy * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
+    return vec2(TSeyeDir.x, TSeyeDir.y * flipY) * ( height * PARALLAX_SCALE + PARALLAX_BIAS );
 }
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index d05a94687a..0995a2d44e 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -53,7 +53,7 @@ void main()
     vec3 cameraPos = (gl_ModelViewMatrixInverse * vec4(0,0,0,1)).xyz;
     vec3 objectPos = (gl_ModelViewMatrixInverse * vec4(passViewPos, 1)).xyz;
     vec3 eyeDir = normalize(cameraPos - objectPos);
-    adjustedUV += getParallaxOffset(eyeDir, tbnTranspose, normalTex.a);
+    adjustedUV += getParallaxOffset(eyeDir, tbnTranspose, normalTex.a, 1.f);
 
     // update normal using new coordinates
     normalTex = texture2D(normalMap, adjustedUV);

From bc04989448418044d90c4aefd312139b87922687 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 17 Jun 2016 00:20:53 +0200
Subject: [PATCH 731/765] Remove unused uniforms

---
 files/shaders/objects_fragment.glsl | 4 ----
 files/shaders/terrain_fragment.glsl | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/files/shaders/objects_fragment.glsl b/files/shaders/objects_fragment.glsl
index ac8c2d591d..b3a0150aff 100644
--- a/files/shaders/objects_fragment.glsl
+++ b/files/shaders/objects_fragment.glsl
@@ -54,10 +54,6 @@ varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
-#if @parallax
-uniform mat4 osg_ViewMatrixInverse;
-#endif
-
 #include "lighting.glsl"
 #include "parallax.glsl"
 
diff --git a/files/shaders/terrain_fragment.glsl b/files/shaders/terrain_fragment.glsl
index 0995a2d44e..134e838c08 100644
--- a/files/shaders/terrain_fragment.glsl
+++ b/files/shaders/terrain_fragment.glsl
@@ -24,10 +24,6 @@ varying vec4 passColor;
 varying vec3 passViewPos;
 varying vec3 passNormal;
 
-#if @parallax
-uniform mat4 osg_ViewMatrixInverse;
-#endif
-
 #include "lighting.glsl"
 #include "parallax.glsl"
 

From c18de847980350e32eb0684a54cacd7daeaee013 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 17 Jun 2016 02:26:52 +0200
Subject: [PATCH 732/765] Fix a crash that could occur when two or more plugins
 move a deleted ref to another cell (Fixes #3446)

---
 apps/openmw/mwworld/store.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d1ba0ef0b5..d28e465c22 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -512,12 +512,13 @@ namespace MWWorld
             bool deleted = false;
             cell->getNextRef(esm, ref, deleted);
 
-            // Add data required to make reference appear in the correct cell.
-            // We should not need to test for duplicates, as this part of the code is pre-cell merge.
-            cell->mMovedRefs.push_back(cMRef);
-            // But there may be duplicates here!
             if (!deleted)
             {
+                // Add data required to make reference appear in the correct cell.
+                // We should not need to test for duplicates, as this part of the code is pre-cell merge.
+                cell->mMovedRefs.push_back(cMRef);
+
+                // But there may be duplicates here!
                 ESM::CellRefTracker::iterator iter = std::find(cellAlt->mLeasedRefs.begin(), cellAlt->mLeasedRefs.end(), ref.mRefNum);
                 if (iter == cellAlt->mLeasedRefs.end())
                   cellAlt->mLeasedRefs.push_back(ref);
@@ -680,7 +681,10 @@ namespace MWWorld
                         ESM::MovedCellRef target0 = *itold;
                         ESM::Cell *wipecell = const_cast<ESM::Cell*>(search(target0.mTarget[0], target0.mTarget[1]));
                         ESM::CellRefTracker::iterator it_lease = std::find(wipecell->mLeasedRefs.begin(), wipecell->mLeasedRefs.end(), it->mRefNum);
-                        wipecell->mLeasedRefs.erase(it_lease);
+                        if (it_lease != wipecell->mLeasedRefs.end())
+                            wipecell->mLeasedRefs.erase(it_lease);
+                        else
+                            std::cerr << "can't find " << it->mRefNum.mIndex << " " << it->mRefNum.mContentFile  << " in leasedRefs " << std::endl;
                         *itold = *it;
                     }
                     else

From f549b5fb7a89175bec81a4821cad53d4d72a65b4 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 17 Jun 2016 04:34:31 +0200
Subject: [PATCH 733/765] Add missing include

---
 apps/openmw/mwworld/store.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d28e465c22..4cddbcdfb1 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -8,6 +8,7 @@
 
 #include <stdexcept>
 #include <sstream>
+#include <iostream>
 
 namespace
 {

From 4a38fb8650cedcf6a1ff86e8327b37ef3dd23179 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Fri, 17 Jun 2016 20:50:46 +0900
Subject: [PATCH 734/765] Use namespace block in aiactivate

---
 apps/openmw/mwmechanics/aiactivate.cpp | 116 +++++++++++++------------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 8761ca37fa..f6bb048cc2 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -12,63 +12,67 @@
 #include "steering.hpp"
 #include "movement.hpp"
 
-MWMechanics::AiActivate::AiActivate(const std::string &objectId)
-    : mObjectId(objectId)
+namespace MWMechanics
 {
-}
-MWMechanics::AiActivate *MWMechanics::AiActivate::clone() const
-{
-    return new AiActivate(*this);
-}
-bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
-{
-    ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
-    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
-
-    actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
-
-    if(target == MWWorld::Ptr() ||
-        !target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
-                                                                            // with the MechanicsManager
-            )
-        return true;   //Target doesn't exist
-
-    //Set the target desition from the actor
-    ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
-
-    if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
-        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
-        MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
-
-        MWBase::Environment::get().getWorld()->activate(target, actor);
-
-        return true;
-    }
-    else {
-        pathTo(actor, dest, duration); //Go to the destination
+    AiActivate::AiActivate(const std::string &objectId)
+        : mObjectId(objectId)
+    {
     }
 
-    return false;
-}
-
-int MWMechanics::AiActivate::getTypeId() const
-{
-    return TypeIdActivate;
-}
-
-void MWMechanics::AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
-{
-    std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
-    activate->mTargetId = mObjectId;
-
-    ESM::AiSequence::AiPackageContainer package;
-    package.mType = ESM::AiSequence::Ai_Activate;
-    package.mPackage = activate.release();
-    sequence.mPackages.push_back(package);
-}
-
-MWMechanics::AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
-    : mObjectId(activate->mTargetId)
-{
-
+    AiActivate *MWMechanics::AiActivate::clone() const
+    {
+        return new AiActivate(*this);
+    }
+
+    bool AiActivate::execute (const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
+    {
+        ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
+        const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mObjectId, false); //The target to follow
+
+        actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
+
+        if(target == MWWorld::Ptr() ||
+            !target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
+                                                                                // with the MechanicsManager
+                )
+            return true;   //Target doesn't exist
+
+        //Set the target desition from the actor
+        ESM::Pathgrid::Point dest = target.getRefData().getPosition().pos;
+
+        if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
+            actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
+            MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
+
+            MWBase::Environment::get().getWorld()->activate(target, actor);
+
+            return true;
+        }
+        else {
+            pathTo(actor, dest, duration); //Go to the destination
+        }
+
+        return false;
+    }
+
+    int AiActivate::getTypeId() const
+    {
+        return TypeIdActivate;
+    }
+
+    void AiActivate::writeState(ESM::AiSequence::AiSequence &sequence) const
+    {
+        std::auto_ptr<ESM::AiSequence::AiActivate> activate(new ESM::AiSequence::AiActivate());
+        activate->mTargetId = mObjectId;
+
+        ESM::AiSequence::AiPackageContainer package;
+        package.mType = ESM::AiSequence::Ai_Activate;
+        package.mPackage = activate.release();
+        sequence.mPackages.push_back(package);
+    }
+
+    AiActivate::AiActivate(const ESM::AiSequence::AiActivate *activate)
+        : mObjectId(activate->mTargetId)
+    {
+    }
 }

From b1be3596dc9e60330376c78415dc9c810c93dda1 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Fri, 17 Jun 2016 23:07:16 +0900
Subject: [PATCH 735/765] Cleanup of #include statements

---
 apps/openmw/mwmechanics/activespells.cpp        |  1 -
 apps/openmw/mwmechanics/activespells.hpp        |  6 +++---
 apps/openmw/mwmechanics/actors.cpp              |  4 ++--
 apps/openmw/mwmechanics/actors.hpp              |  3 ++-
 apps/openmw/mwmechanics/aiactivate.cpp          |  3 +--
 apps/openmw/mwmechanics/aiactivate.hpp          |  1 +
 apps/openmw/mwmechanics/aiavoiddoor.cpp         |  4 ++--
 apps/openmw/mwmechanics/aiavoiddoor.hpp         |  6 +++++-
 apps/openmw/mwmechanics/aicombat.cpp            |  1 -
 apps/openmw/mwmechanics/aicombat.hpp            |  9 ++++-----
 apps/openmw/mwmechanics/aicombataction.cpp      | 10 +++++-----
 apps/openmw/mwmechanics/aicombataction.hpp      |  4 ++--
 apps/openmw/mwmechanics/aiescort.cpp            |  3 +--
 apps/openmw/mwmechanics/aiescort.hpp            |  1 +
 apps/openmw/mwmechanics/aifollow.cpp            |  3 ++-
 apps/openmw/mwmechanics/aifollow.hpp            |  5 ++++-
 apps/openmw/mwmechanics/aipackage.cpp           |  5 +++--
 apps/openmw/mwmechanics/aipackage.hpp           |  2 +-
 apps/openmw/mwmechanics/aipursue.cpp            |  2 --
 apps/openmw/mwmechanics/aisequence.cpp          | 11 +++++------
 apps/openmw/mwmechanics/aisequence.hpp          |  1 -
 apps/openmw/mwmechanics/aiwander.hpp            |  5 ++---
 apps/openmw/mwmechanics/alchemy.cpp             |  1 -
 apps/openmw/mwmechanics/character.cpp           | 13 ++++++-------
 apps/openmw/mwmechanics/combat.cpp              | 11 +++++------
 apps/openmw/mwmechanics/difficultyscaling.cpp   |  4 ++--
 apps/openmw/mwmechanics/disease.hpp             |  3 ++-
 apps/openmw/mwmechanics/enchanting.cpp          |  1 +
 apps/openmw/mwmechanics/enchanting.hpp          |  7 ++++++-
 apps/openmw/mwmechanics/levelledlist.hpp        |  6 ++++--
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 10 ++++------
 apps/openmw/mwmechanics/objects.cpp             |  4 ++--
 apps/openmw/mwmechanics/pathfinding.cpp         |  2 ++
 apps/openmw/mwmechanics/pathfinding.hpp         |  5 +++--
 apps/openmw/mwmechanics/pathgrid.hpp            |  3 ++-
 apps/openmw/mwmechanics/spellcasting.cpp        |  1 -
 apps/openmw/mwmechanics/spellcasting.hpp        |  4 ++--
 apps/openmw/mwmechanics/summoning.cpp           |  4 +---
 apps/openmw/mwmechanics/summoning.hpp           |  3 ++-
 apps/openmw/mwmechanics/trading.cpp             |  4 ++--
 40 files changed, 92 insertions(+), 84 deletions(-)

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index c98f7d8293..52c05fdfac 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -1,7 +1,6 @@
 #include "activespells.hpp"
 
 #include <components/misc/rng.hpp>
-
 #include <components/misc/stringops.hpp>
 
 #include <components/esm/loadmgef.hpp>
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index 3842ee61c5..0f1f803b73 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -5,13 +5,13 @@
 #include <vector>
 #include <string>
 
+#include <components/esm/defs.hpp>
+#include <components/esm/activespells.hpp>
+
 #include "../mwworld/timestamp.hpp"
 
 #include "magiceffects.hpp"
 
-#include <components/esm/defs.hpp>
-#include <components/esm/activespells.hpp>
-
 namespace MWMechanics
 {
     /// \brief Lasting spell effects
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a1031f4c89..fa398950d6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -6,6 +6,7 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/loadnpc.hpp>
+
 #include <components/sceneutil/positionattitudetransform.hpp>
 
 #include "../mwworld/esmstore.hpp"
@@ -22,8 +23,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/statemanager.hpp"
 
-#include "../mwmechanics/spellcasting.hpp"
-
+#include "spellcasting.hpp"
 #include "npcstats.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 644864e7fc..1db676b2a6 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -7,9 +7,10 @@
 #include <map>
 #include <list>
 
-#include "movement.hpp"
 #include "../mwbase/world.hpp"
 
+#include "movement.hpp"
+
 namespace MWWorld
 {
     class Ptr;
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index f6bb048cc2..3c55042280 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -5,10 +5,9 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "../mwworld/class.hpp"
 
+#include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 
diff --git a/apps/openmw/mwmechanics/aiactivate.hpp b/apps/openmw/mwmechanics/aiactivate.hpp
index 2ca985be9a..8de4be69fa 100644
--- a/apps/openmw/mwmechanics/aiactivate.hpp
+++ b/apps/openmw/mwmechanics/aiactivate.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AIACTIVATE_H
 
 #include "aipackage.hpp"
+
 #include <string>
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 100b666e89..bb03ff53b2 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -3,12 +3,12 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+
 #include "../mwworld/class.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
 #include "actorutil.hpp"
-
-
 #include "steering.hpp"
 
 MWMechanics::AiAvoidDoor::AiAvoidDoor(const MWWorld::ConstPtr& doorPtr)
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.hpp b/apps/openmw/mwmechanics/aiavoiddoor.hpp
index 41c41b1f57..7344a1797c 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.hpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.hpp
@@ -2,11 +2,15 @@
 #define GAME_MWMECHANICS_AIAVOIDDOOR_H
 
 #include "aipackage.hpp"
+
 #include <string>
-#include "pathfinding.hpp"
+
 #include <components/esm/defs.hpp>
+
 #include "../mwworld/class.hpp"
 
+#include "pathfinding.hpp"
+
 namespace MWMechanics
 {
     /// \brief AiPackage to have an actor avoid an opening door
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 196ef1c3ff..87d744a60a 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -16,7 +16,6 @@
 #include "steering.hpp"
 #include "movement.hpp"
 #include "character.hpp"
-
 #include "aicombataction.hpp"
 #include "combat.hpp"
 
diff --git a/apps/openmw/mwmechanics/aicombat.hpp b/apps/openmw/mwmechanics/aicombat.hpp
index 2b364001ff..1cfac58061 100644
--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@@ -3,16 +3,15 @@
 
 #include "aipackage.hpp"
 
-#include "pathfinding.hpp"
-
-#include "movement.hpp"
-#include "obstacle.hpp"
+#include <boost/shared_ptr.hpp>
 
 #include "../mwworld/cellstore.hpp" // for Doors
 
 #include "../mwbase/world.hpp"
 
-#include <boost/shared_ptr.hpp>
+#include "pathfinding.hpp"
+#include "movement.hpp"
+#include "obstacle.hpp"
 
 namespace ESM
 {
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index f62c34fc8a..39c11c6780 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -1,5 +1,8 @@
 #include "aicombataction.hpp"
 
+#include <components/esm/loadench.hpp>
+#include <components/esm/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
@@ -8,11 +11,8 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
 
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-
-#include <components/esm/loadench.hpp>
-#include <components/esm/loadmgef.hpp>
+#include "npcstats.hpp"
+#include "spellcasting.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/aicombataction.hpp b/apps/openmw/mwmechanics/aicombataction.hpp
index 6f5cbfbc29..bc635ceb20 100644
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@@ -3,11 +3,11 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <components/esm/loadspel.hpp>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"
 
-#include <components/esm/loadspel.hpp>
-
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 03532cbae5..2d7b8b9f67 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -10,8 +10,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
+#include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
 
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index dcb136ca47..7195822714 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWMECHANICS_AIESCORT_H
 
 #include "aipackage.hpp"
+
 #include <string>
 
 #include "pathfinding.hpp"
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index dd2219c457..1b843f8508 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -6,11 +6,12 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
-
 #include "steering.hpp"
 
 namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 719909ebc8..e46205b951 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -2,10 +2,13 @@
 #define GAME_MWMECHANICS_AIFOLLOW_H
 
 #include "aipackage.hpp"
+
 #include <string>
-#include "pathfinding.hpp"
+
 #include <components/esm/defs.hpp>
 
+#include "pathfinding.hpp"
+
 namespace ESM
 {
 namespace AiSequence
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index aefb39f6b5..dc23f922c0 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -8,12 +8,13 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
+#include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "creaturestats.hpp"
 #include "movement.hpp"
-#include "../mwworld/action.hpp"
-
 #include "steering.hpp"
 #include "actorutil.hpp"
 #include "coordinateconverter.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index fb862189d1..8f6ddb1116 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -1,9 +1,9 @@
 #ifndef GAME_MWMECHANICS_AIPACKAGE_H
 #define GAME_MWMECHANICS_AIPACKAGE_H
 
-#include "pathfinding.hpp"
 #include <components/esm/defs.hpp>
 
+#include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
 
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index 055801fde0..be16f49a22 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -8,8 +8,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/action.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "movement.hpp"
 #include "creaturestats.hpp"
 
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 412df3742d..ed9db102f0 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -2,9 +2,13 @@
 
 #include <limits>
 
+#include <components/esm/aisequence.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 #include "aipackage.hpp"
 #include "aistate.hpp"
-
 #include "aiwander.hpp"
 #include "aiescort.hpp"
 #include "aitravel.hpp"
@@ -14,11 +18,6 @@
 #include "aipursue.hpp"
 #include "actorutil.hpp"
 
-#include <components/esm/aisequence.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/aisequence.hpp b/apps/openmw/mwmechanics/aisequence.hpp
index 0c200c26bf..c7c32979ee 100644
--- a/apps/openmw/mwmechanics/aisequence.hpp
+++ b/apps/openmw/mwmechanics/aisequence.hpp
@@ -4,7 +4,6 @@
 #include <list>
 
 #include <components/esm/loadnpc.hpp>
-//#include "aistate.hpp"
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index d652d4799e..64a54a66b6 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -5,11 +5,10 @@
 
 #include <vector>
 
-#include "pathfinding.hpp"
-#include "obstacle.hpp"
-
 #include "../mwworld/timestamp.hpp"
 
+#include "pathfinding.hpp"
+#include "obstacle.hpp"
 #include "aistate.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index d02376d232..322d592801 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -15,7 +15,6 @@
 #include <components/esm/loadgmst.hpp>
 #include <components/esm/loadmgef.hpp>
 
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c20153206d..0b1c96186c 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -21,13 +21,6 @@
 
 #include <iostream>
 
-
-#include "movement.hpp"
-#include "npcstats.hpp"
-#include "creaturestats.hpp"
-#include "security.hpp"
-#include "actorutil.hpp"
-
 #include <components/misc/rng.hpp>
 
 #include <components/settings/settings.hpp>
@@ -46,6 +39,12 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
 
+#include "movement.hpp"
+#include "npcstats.hpp"
+#include "creaturestats.hpp"
+#include "security.hpp"
+#include "actorutil.hpp"
+
 namespace
 {
 
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 8d9d4cb3ac..df2793bcb7 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -8,17 +8,16 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
-
-#include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/movement.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-#include "../mwmechanics/difficultyscaling.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include "../mwbase/windowmanager.hpp"
+#include "npcstats.hpp"
+#include "movement.hpp"
+#include "spellcasting.hpp"
+#include "difficultyscaling.hpp"
 #include "actorutil.hpp"
 
 namespace
diff --git a/apps/openmw/mwmechanics/difficultyscaling.cpp b/apps/openmw/mwmechanics/difficultyscaling.cpp
index 950fe33cf4..693587eda3 100644
--- a/apps/openmw/mwmechanics/difficultyscaling.cpp
+++ b/apps/openmw/mwmechanics/difficultyscaling.cpp
@@ -1,11 +1,11 @@
 #include "difficultyscaling.hpp"
 
+#include <components/settings/settings.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwworld/esmstore.hpp"
 
-#include <components/settings/settings.hpp>
-
 #include "actorutil.hpp"
 
 float scaleDamage(float damage, const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim)
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index 25bde56ab8..5746af2a2f 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -6,14 +6,15 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
+
 #include "spells.hpp"
 #include "creaturestats.hpp"
 #include "actorutil.hpp"
 
-
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 102e3787ad..57ece6a793 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -6,6 +6,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/esmstore.hpp"
+
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index 2c05d2d2e9..a53027bb9c 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -1,10 +1,15 @@
 #ifndef GAME_MWMECHANICS_ENCHANTING_H
 #define GAME_MWMECHANICS_ENCHANTING_H
+
 #include <string>
-#include "../mwworld/ptr.hpp"
+
 #include <components/esm/effectlist.hpp>
+
+#include "../mwworld/ptr.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 namespace MWMechanics
 {
     class Enchanting
diff --git a/apps/openmw/mwmechanics/levelledlist.hpp b/apps/openmw/mwmechanics/levelledlist.hpp
index edfef53581..fb06d89357 100644
--- a/apps/openmw/mwmechanics/levelledlist.hpp
+++ b/apps/openmw/mwmechanics/levelledlist.hpp
@@ -1,16 +1,18 @@
 #ifndef OPENMW_MECHANICS_LEVELLEDLIST_H
 #define OPENMW_MECHANICS_LEVELLEDLIST_H
 
-#include <components/misc/rng.hpp>
-
 #include <iostream>
 
+#include <components/misc/rng.hpp>
+
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "creaturestats.hpp"
 #include "actorutil.hpp"
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 6dd14be114..a7623d7cf2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -11,18 +11,16 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/player.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
-#include "../mwworld/class.hpp"
-#include "../mwworld/player.hpp"
-
-#include "../mwmechanics/aicombat.hpp"
-#include "../mwmechanics/aipursue.hpp"
-
+#include "aicombat.hpp"
+#include "aipursue.hpp"
 #include "spellcasting.hpp"
 #include "autocalcspell.hpp"
 #include "npcstats.hpp"
diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp
index 94b552a38f..7d7c0bfaea 100644
--- a/apps/openmw/mwmechanics/objects.cpp
+++ b/apps/openmw/mwmechanics/objects.cpp
@@ -2,11 +2,11 @@
 
 #include <iostream>
 
-#include "movement.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "movement.hpp"
+
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index c8ba867032..51127de2ad 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -1,4 +1,5 @@
 #include "pathfinding.hpp"
+
 #include <limits>
 
 #include "../mwbase/world.hpp"
@@ -6,6 +7,7 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/cellstore.hpp"
+
 #include "coordinateconverter.hpp"
 
 namespace
diff --git a/apps/openmw/mwmechanics/pathfinding.hpp b/apps/openmw/mwmechanics/pathfinding.hpp
index 7262842dc7..00a8fe0e44 100644
--- a/apps/openmw/mwmechanics/pathfinding.hpp
+++ b/apps/openmw/mwmechanics/pathfinding.hpp
@@ -1,11 +1,12 @@
 #ifndef GAME_MWMECHANICS_PATHFINDING_H
 #define GAME_MWMECHANICS_PATHFINDING_H
 
-#include <components/esm/defs.hpp>
-#include <components/esm/loadpgrd.hpp>
 #include <list>
 #include <cassert>
 
+#include <components/esm/defs.hpp>
+#include <components/esm/loadpgrd.hpp>
+
 namespace MWWorld
 {
     class CellStore;
diff --git a/apps/openmw/mwmechanics/pathgrid.hpp b/apps/openmw/mwmechanics/pathgrid.hpp
index 67fbacdeda..ab418ae78b 100644
--- a/apps/openmw/mwmechanics/pathgrid.hpp
+++ b/apps/openmw/mwmechanics/pathgrid.hpp
@@ -1,9 +1,10 @@
 #ifndef GAME_MWMECHANICS_PATHGRID_H
 #define GAME_MWMECHANICS_PATHGRID_H
 
-#include <components/esm/loadpgrd.hpp>
 #include <list>
 
+#include <components/esm/loadpgrd.hpp>
+
 namespace ESM
 {
     struct Cell;
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 842951362e..4059702d35 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -19,7 +19,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
-
 #include "../mwworld/inventorystore.hpp"
 
 #include "../mwrender/animation.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 5bc6180580..ae20a39d01 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -1,10 +1,10 @@
 #ifndef MWMECHANICS_SPELLSUCCESS_H
 #define MWMECHANICS_SPELLSUCCESS_H
 
-#include "../mwworld/ptr.hpp"
-
 #include <components/esm/loadskil.hpp>
 
+#include "../mwworld/ptr.hpp"
+
 namespace ESM
 {
     struct Spell;
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 9b094ba323..3ff8cf667c 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -6,8 +6,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwmechanics/spellcasting.hpp"
-
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/manualref.hpp"
@@ -15,10 +13,10 @@
 
 #include "../mwrender/animation.hpp"
 
+#include "spellcasting.hpp"
 #include "creaturestats.hpp"
 #include "aifollow.hpp"
 
-
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 3a60e2b682..b2a3c60eac 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -3,9 +3,10 @@
 
 #include <set>
 
-#include "magiceffects.hpp"
 #include "../mwworld/ptr.hpp"
 
+#include "magiceffects.hpp"
+
 namespace MWMechanics
 {
 
diff --git a/apps/openmw/mwmechanics/trading.cpp b/apps/openmw/mwmechanics/trading.cpp
index c4ef5103e3..469b454df5 100644
--- a/apps/openmw/mwmechanics/trading.cpp
+++ b/apps/openmw/mwmechanics/trading.cpp
@@ -6,11 +6,11 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
 
+#include "creaturestats.hpp"
+
 namespace MWMechanics
 {
     Trading::Trading() {}

From be25e2ba7512bfba4e077aa3cdf14c0e83af6bcd Mon Sep 17 00:00:00 2001
From: terrorfisch <terrorfisch@mailbox.org>
Date: Mon, 20 Jun 2016 10:24:51 +0200
Subject: [PATCH 736/765] Make NPCs use both hands in weaponless combat.

---
 apps/openmw/mwmechanics/aicombat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 87d744a60a..ce66b045a6 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -688,7 +688,7 @@ ESM::Weapon::AttackType chooseBestAttack(const ESM::Weapon* weapon, MWMechanics:
         float roll = Misc::Rng::rollClosedProbability();
         if(roll <= 0.333f)  //side punch
         {
-            movement.mPosition[0] = Misc::Rng::rollClosedProbability() ? 1.0f : -1.0f;
+            movement.mPosition[0] = (Misc::Rng::rollClosedProbability() < 0.5f) ? 1.0f : -1.0f;
             movement.mPosition[1] = 0;
             attackType = ESM::Weapon::AT_Slash;
         }

From 5d3aebd04b910e076f8e86551f10685e003e6285 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Wed, 22 Jun 2016 01:39:21 +0900
Subject: [PATCH 737/765] Update disposition check between persuasion attempts

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 793a8158e3..6a923072a6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -92,7 +92,7 @@ namespace MWMechanics
             virtual int getBarterOffer(const MWWorld::Ptr& ptr,int basePrice, bool buying);
             ///< This is used by every service to determine the price of objects given the trading skills of the player and NPC.
 
-            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = false);
+            virtual int getDerivedDisposition(const MWWorld::Ptr& ptr, bool addTemporaryDispositionChange = true);
             ///< Calculate the diposition of an NPC toward the player.
 
             virtual int countDeaths (const std::string& id) const;

From 57640b8161622a48e0b465d9e853ceb2d4824cda Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Fri, 24 Jun 2016 01:04:16 +0100
Subject: [PATCH 738/765] Improve the MSVC prebuild script to allow compiled
 binaries to be run directly with no further modification

---
 CI/before_script.msvc.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 mode change 100755 => 100644 CI/before_script.msvc.sh

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
old mode 100755
new mode 100644
index 3dee19be2a..c0ac12d049
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -653,6 +653,19 @@ if [ -z $CI ]; then
 		cp "$DLL" $CONFIGURATION/osgPlugins-3.3.8
 	done
 	echo
+	
+	echo "Copying Runtime Resources/Config Files"
+	
+	echo "  gamecontrollerdb.txt"
+	cp $CONFIGURATION/../gamecontrollerdb.txt $CONFIGURATION/gamecontrollerdb.txt
+	echo "  openmw.cfg"
+	cp $CONFIGURATION/../openmw.cfg.install $CONFIGURATION/openmw.cfg
+	echo "  openmw-cs.cfg"
+	cp $CONFIGURATION/../openmw-cs.cfg $CONFIGURATION/openmw-cs.cfg
+	echo "  settings-default.cfg"
+	cp $CONFIGURATION/../settings-default.cfg $CONFIGURATION/settings-default.cfg
+	echo "  resources/"
+	cp -r $CONFIGURATION/../resources $CONFIGURATION/resources
 fi
 
 exit $RET

From dc468dd139a7560446b0a88c8639473c69292e3b Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Sat, 25 Jun 2016 00:38:59 +0900
Subject: [PATCH 739/765] Fix magicka and fatigue calculations from fortifying
 attributes

---
 apps/openmw/mwmechanics/actors.cpp        |  7 +++++--
 apps/openmw/mwmechanics/creaturestats.cpp |  4 +++-
 apps/openmw/mwmechanics/stat.cpp          | 18 ------------------
 apps/openmw/mwmechanics/stat.hpp          |  4 ----
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index fa398950d6..f28e2cc522 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -425,7 +425,9 @@ namespace MWMechanics
 
         DynamicStat<float> magicka = creatureStats.getMagicka();
         float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
-        magicka.modify(diff);
+        float currentToBaseRatio = (magicka.getCurrent() / magicka.getBase());
+        magicka.setModified(magicka.getModified() + diff, 0);
+        magicka.setCurrent(magicka.getBase() * currentToBaseRatio);
         creatureStats.setMagicka(magicka);
     }
 
@@ -553,8 +555,9 @@ namespace MWMechanics
             DynamicStat<float> stat = creatureStats.getDynamic(i);
             stat.setModifier(effects.get(ESM::MagicEffect::FortifyHealth+i).getMagnitude() -
                              effects.get(ESM::MagicEffect::DrainHealth+i).getMagnitude(),
+                             // Magicka can be decreased below zero due to a fortify effect wearing off
                              // Fatigue can be decreased below zero meaning the actor will be knocked out
-                             i == 2);
+                             i == 1 || i == 2);
 
             creatureStats.setDynamic(i, stat);
         }
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index e33a6f7bdc..be51cea25d 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -157,7 +157,9 @@ namespace MWMechanics
                 int endurance    = getAttribute(ESM::Attribute::Endurance).getModified();
                 DynamicStat<float> fatigue = getFatigue();
                 float diff = (strength+willpower+agility+endurance) - fatigue.getBase();
-                fatigue.modify(diff);
+                float currentToBaseRatio = (fatigue.getCurrent() / fatigue.getBase());
+                fatigue.setModified(fatigue.getModified() + diff, 0);
+                fatigue.setCurrent(fatigue.getBase() * currentToBaseRatio);
                 setFatigue(fatigue);
             }
         }
diff --git a/apps/openmw/mwmechanics/stat.cpp b/apps/openmw/mwmechanics/stat.cpp
index 6eb5e0246d..cf1f228c08 100644
--- a/apps/openmw/mwmechanics/stat.cpp
+++ b/apps/openmw/mwmechanics/stat.cpp
@@ -33,18 +33,6 @@ namespace MWMechanics
         mBase = mModified = value;
     }
     template<typename T>
-    void Stat<T>::modify(const T& diff)
-    {
-        mBase += diff;
-        if(mBase >= static_cast<T>(0))
-            mModified += diff;
-        else
-        {
-            mModified += diff - mBase;
-            mBase = static_cast<T>(0);
-        }
-    }
-    template<typename T>
     void Stat<T>::setBase (const T& value)
     {
         T diff = value - mBase;
@@ -139,12 +127,6 @@ namespace MWMechanics
             mCurrent = getModified();
     }
     template<typename T>
-    void DynamicStat<T>::modify (const T& diff, bool allowCurrentDecreaseBelowZero)
-    {
-        mStatic.modify (diff);
-        setCurrent (getCurrent()+diff, allowCurrentDecreaseBelowZero);
-    }
-    template<typename T>
     void DynamicStat<T>::setCurrent (const T& value, bool allowDecreaseBelowZero)
     {
         if (value > mCurrent)
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index c075f5fa7b..5b58006344 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -32,7 +32,6 @@ namespace MWMechanics
 
             /// Set base and modified to \a value.
             void set (const T& value);
-            void modify(const T& diff);
 
             /// Set base and adjust modified accordingly.
             void setBase (const T& value);
@@ -85,9 +84,6 @@ namespace MWMechanics
             /// Set modified value an adjust base accordingly.
             void setModified (T value, const T& min, const T& max = std::numeric_limits<T>::max());
 
-            /// Change modified relatively.
-            void modify (const T& diff, bool allowCurrentDecreaseBelowZero=false);
-
             void setCurrent (const T& value, bool allowDecreaseBelowZero = false);
             void setModifier (const T& modifier, bool allowCurrentDecreaseBelowZero=false);
 

From dfc62c99b457bae218f7478db46730028b15766c Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sun, 26 Jun 2016 03:22:58 +0200
Subject: [PATCH 740/765] Show correct class image in level-up dialog (Fixes
 #3443)

---
 apps/openmw/mwgui/levelupdialog.cpp  | 103 ++++++++++++++++++++++++++-
 apps/openmw/mwgui/levelupdialog.hpp  |   2 +
 apps/openmw/mwmechanics/npcstats.cpp |  14 ++++
 apps/openmw/mwmechanics/npcstats.hpp |   5 +-
 components/esm/npcstats.cpp          |   6 ++
 components/esm/npcstats.hpp          |   1 +
 6 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index fb9952ba73..6d36a9c429 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -156,7 +156,9 @@ namespace MWGui
                 cls = &*it;
         }
 
-        setClassImage(mClassImage, cls->mId);
+        setClassImage(mClassImage, getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
+                                                        pcStats.getSkillIncreasesForSpecialization(1),
+                                                        pcStats.getSkillIncreasesForSpecialization(2)));
 
         int level = creatureStats.getLevel ()+1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
@@ -248,4 +250,103 @@ namespace MWGui
         }
         assignCoins();
     }
+
+    std::string LevelupDialog::getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases)
+    {
+        std::string ret = "acrobat";
+
+        int total = combatIncreases + magicIncreases + stealthIncreases;
+        if (total == 0)
+            return ret;
+
+        int combatFraction = static_cast<int>(static_cast<float>(combatIncreases) / total * 10.f);
+        int magicFraction = static_cast<int>(static_cast<float>(magicIncreases) / total * 10.f);
+        int stealthFraction = static_cast<int>(static_cast<float>(stealthIncreases) / total * 10.f);
+
+        if (combatFraction > 7)
+            ret = "warrior";
+        else if (magicFraction > 7)
+            ret = "mage";
+        else if (stealthFraction > 7)
+            ret = "thief";
+
+        switch (combatFraction)
+        {
+            case 7:
+                ret = "warrior";
+                break;
+            case 6:
+                if (stealthFraction == 1)
+                    ret = "barbarian";
+                else if (stealthFraction == 3)
+                    ret = "crusader";
+                else
+                    ret = "knight";
+                break;
+            case 5:
+                if (stealthFraction == 3)
+                    ret = "scout";
+                else
+                    ret = "archer";
+                break;
+            case 4:
+                ret = "rogue";
+                break;
+            default:
+                break;
+        }
+
+        switch (magicFraction)
+        {
+            case 7:
+                ret = "mage";
+                break;
+            case 6:
+                if (combatFraction == 2)
+                    ret = "sorcerer";
+                else if (combatIncreases == 3)
+                    ret = "healer";
+                else
+                    ret = "battlemage";
+                break;
+            case 5:
+                ret = "witchhunter";
+                break;
+            case 4:
+                ret = "spellsword";
+                // In vanilla there's also code for "nightblade", however it seems to be unreachable.
+                break;
+            default:
+                break;
+        }
+
+        switch (stealthFraction)
+        {
+            case 7:
+                ret = "thief";
+                break;
+            case 6:
+                if (magicFraction == 1)
+                    ret = "agent";
+                else if (magicIncreases == 3)
+                    ret = "assassin";
+                else
+                    ret = "acrobat";
+                break;
+            case 5:
+                if (magicIncreases == 3)
+                    ret = "monk";
+                else
+                    ret = "pilgrim";
+                break;
+            case 3:
+                if (magicFraction == 3 && stealthFraction == 3)
+                    ret = "bard";
+                break;
+            default:
+                break;
+        }
+
+        return ret;
+    }
 }
diff --git a/apps/openmw/mwgui/levelupdialog.hpp b/apps/openmw/mwgui/levelupdialog.hpp
index e5edbd53c8..d49f7536df 100644
--- a/apps/openmw/mwgui/levelupdialog.hpp
+++ b/apps/openmw/mwgui/levelupdialog.hpp
@@ -39,6 +39,8 @@ namespace MWGui
         void resetCoins();
 
         void setAttributeValues();
+
+        std::string getLevelupClassImage(const int combatIncreases, const int magicIncreases, const int stealthIncreases);
     };
 
 }
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 10d603ff14..8bea109d09 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -34,6 +34,7 @@ MWMechanics::NpcStats::NpcStats()
     , mIsWerewolf(false)
 {
     mSkillIncreases.resize (ESM::Attribute::Length, 0);
+    mSpecIncreases.resize(3, 0);
 }
 
 int MWMechanics::NpcStats::getBaseDisposition() const
@@ -255,6 +256,8 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
         MWBase::Environment::get().getWorld ()->getStore ().get<ESM::Skill>().find(skillIndex);
     mSkillIncreases[skill->mData.mAttribute] += increase;
 
+    mSpecIncreases[skill->mData.mSpecialization] += gmst.find("iLevelupSpecialization")->getInt();
+
     // Play sound & skill progress notification
     /// \todo check if character is the player, if levelling is ever implemented for NPCs
     MWBase::Environment::get().getSoundManager ()->playSound ("skillraise", 1, 1);
@@ -326,6 +329,11 @@ int MWMechanics::NpcStats::getLevelupAttributeMultiplier(int attribute) const
     return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(gmst.str())->getInt();
 }
 
+int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
+{
+    return mSpecIncreases[spec];
+}
+
 void MWMechanics::NpcStats::flagAsUsed (const std::string& id)
 {
     mUsedIds.insert (id);
@@ -469,6 +477,9 @@ void MWMechanics::NpcStats::writeState (ESM::NpcStats& state) const
     for (int i=0; i<ESM::Attribute::Length; ++i)
         state.mSkillIncrease[i] = mSkillIncreases[i];
 
+    for (int i=0; i<3; ++i)
+        state.mSpecIncreases[i] = mSpecIncreases[i];
+
     std::copy (mUsedIds.begin(), mUsedIds.end(), std::back_inserter (state.mUsedIds));
 
     state.mTimeToStartDrowning = mTimeToStartDrowning;
@@ -508,6 +519,9 @@ void MWMechanics::NpcStats::readState (const ESM::NpcStats& state)
     for (int i=0; i<ESM::Attribute::Length; ++i)
         mSkillIncreases[i] = state.mSkillIncrease[i];
 
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = state.mSpecIncreases[i];
+
     for (std::vector<std::string>::const_iterator iter (state.mUsedIds.begin());
         iter!=state.mUsedIds.end(); ++iter)
         if (store.find (*iter))
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 8a98b1d1d1..9ded47c07f 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -34,7 +34,8 @@ namespace MWMechanics
             std::set<std::string> mExpelled;
             std::map<std::string, int> mFactionReputation;
             int mLevelProgress; // 0-10
-            std::vector<int> mSkillIncreases; // number of skill increases for each attribute
+            std::vector<int> mSkillIncreases; // number of skill increases for each attribute (resets after leveling up)
+            std::vector<int> mSpecIncreases; // number of skill increases for each specialization (accumulates throughout the entire game)
             std::set<std::string> mUsedIds;
             // ---------------------------------------------------------------------------
 
@@ -86,6 +87,8 @@ namespace MWMechanics
 
             int getLevelupAttributeMultiplier(int attribute) const;
 
+            int getSkillIncreasesForSpecialization(int spec) const;
+
             void levelUp();
 
             void updateHealth();
diff --git a/components/esm/npcstats.cpp b/components/esm/npcstats.cpp
index 10c0b6f169..c7804fd44f 100644
--- a/components/esm/npcstats.cpp
+++ b/components/esm/npcstats.cpp
@@ -95,6 +95,8 @@ void ESM::NpcStats::load (ESMReader &esm)
 
     esm.getHNT (mSkillIncrease, "INCR");
 
+    esm.getHNOT (mSpecIncreases, "SPEC");
+
     while (esm.isNextSub ("USED"))
         mUsedIds.push_back (esm.getHString());
 
@@ -156,6 +158,8 @@ void ESM::NpcStats::save (ESMWriter &esm) const
 
     esm.writeHNT ("INCR", mSkillIncrease);
 
+    esm.writeHNT ("SPEC", mSpecIncreases);
+
     for (std::vector<std::string>::const_iterator iter (mUsedIds.begin()); iter!=mUsedIds.end();
         ++iter)
         esm.writeHNString ("USED", *iter);
@@ -178,6 +182,8 @@ void ESM::NpcStats::blank()
     mLevelProgress = 0;
     for (int i=0; i<8; ++i)
         mSkillIncrease[i] = 0;
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = 0;
     mTimeToStartDrowning = 20;
     mCrimeId = -1;
 }
diff --git a/components/esm/npcstats.hpp b/components/esm/npcstats.hpp
index 9b27f587c7..467a099cea 100644
--- a/components/esm/npcstats.hpp
+++ b/components/esm/npcstats.hpp
@@ -37,6 +37,7 @@ namespace ESM
         int mWerewolfKills;
         int mLevelProgress;
         int mSkillIncrease[8];
+        int mSpecIncreases[3];
         std::vector<std::string> mUsedIds; // lower case IDs
         float mTimeToStartDrowning;
         int mCrimeId;

From 0db3af1b894adf1f2188ccae5c6f17950b5e74d1 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sun, 26 Jun 2016 03:28:13 +0200
Subject: [PATCH 741/765] ESSImporter: load specialization increases

---
 apps/essimporter/convertplayer.cpp | 2 ++
 apps/essimporter/importplayer.hpp  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/essimporter/convertplayer.cpp b/apps/essimporter/convertplayer.cpp
index 00a2a10f51..55aaad1c56 100644
--- a/apps/essimporter/convertplayer.cpp
+++ b/apps/essimporter/convertplayer.cpp
@@ -17,6 +17,8 @@ namespace ESSImport
             faction.mReputation = it->mReputation;
             out.mObject.mNpcStats.mFactions[Misc::StringUtils::lowerCase(it->mFactionName.toString())] = faction;
         }
+        for (int i=0; i<3; ++i)
+            out.mObject.mNpcStats.mSpecIncreases[i] = pcdt.mPNAM.mSpecIncreases[i];
         for (int i=0; i<8; ++i)
             out.mObject.mNpcStats.mSkillIncrease[i] = pcdt.mPNAM.mSkillIncreases[i];
         for (int i=0; i<27; ++i)
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 3e537cc162..3baab1cd83 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -67,7 +67,9 @@ struct PCDT
         unsigned int mLevelProgress;
         float mSkillProgress[27]; // skill progress, non-uniform scaled
         unsigned char mSkillIncreases[8]; // number of skill increases for each attribute
-        unsigned char mUnknown3[88];
+        unsigned char mUnknown3[84];
+        unsigned char mSpecIncreases[3]; // number of skill increases for each specialization
+        unsigned char mUnknown4;
     };
 #pragma pack(pop)
 

From b99611a7305ae625a391da75de56bdb5ec56157e Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sun, 26 Jun 2016 15:16:32 +0200
Subject: [PATCH 742/765] Initialize mSpecIncreases in ESM::NpcStats::load

---
 components/esm/npcstats.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/esm/npcstats.cpp b/components/esm/npcstats.cpp
index c7804fd44f..4c1095b6e4 100644
--- a/components/esm/npcstats.cpp
+++ b/components/esm/npcstats.cpp
@@ -95,6 +95,8 @@ void ESM::NpcStats::load (ESMReader &esm)
 
     esm.getHNT (mSkillIncrease, "INCR");
 
+    for (int i=0; i<3; ++i)
+        mSpecIncreases[i] = 0;
     esm.getHNOT (mSpecIncreases, "SPEC");
 
     while (esm.isNextSub ("USED"))

From 7244809c4a0b95f4a4981fced4a5f58a2c9a57d1 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sun, 26 Jun 2016 15:17:52 +0200
Subject: [PATCH 743/765] Remove redundant part of condition

---
 apps/openmw/mwgui/levelupdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 6d36a9c429..e64eb510e4 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -340,7 +340,7 @@ namespace MWGui
                     ret = "pilgrim";
                 break;
             case 3:
-                if (magicFraction == 3 && stealthFraction == 3)
+                if (magicFraction == 3)
                     ret = "bard";
                 break;
             default:

From 19a20a68712dab10c15329548b486b06d14a3a64 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Mon, 27 Jun 2016 21:17:06 +0900
Subject: [PATCH 744/765] Fix update of fatigue display

---
 .../mwmechanics/mechanicsmanagerimp.cpp       | 27 +++++++++----------
 .../mwmechanics/mechanicsmanagerimp.hpp       | 11 +++++++-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index a7623d7cf2..95c2ce9cb0 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -310,7 +310,7 @@ namespace MWMechanics
     }
 
     MechanicsManager::MechanicsManager()
-    : mWatchedStatsEmpty (true), mUpdatePlayer (true), mClassSelected (false),
+    : mWatchedTimeToStartDrowning(0), mWatchedStatsEmpty (true), mUpdatePlayer (true), mClassSelected (false),
       mRaceSelected (false), mAI(true)
     {
         //buildPlayer no longer here, needs to be done explicitely after all subsystems are up and running
@@ -372,40 +372,40 @@ namespace MWMechanics
             const MWMechanics::NpcStats &stats = mWatched.getClass().getNpcStats(mWatched);
             for(int i = 0;i < ESM::Attribute::Length;++i)
             {
-                if(stats.getAttribute(i) != mWatchedStats.getAttribute(i) || mWatchedStatsEmpty)
+                if(stats.getAttribute(i) != mWatchedAttributes[i] || mWatchedStatsEmpty)
                 {
                     std::stringstream attrname;
                     attrname << "AttribVal"<<(i+1);
 
-                    mWatchedStats.setAttribute(i, stats.getAttribute(i));
+                    mWatchedAttributes[i] = stats.getAttribute(i);
                     winMgr->setValue(attrname.str(), stats.getAttribute(i));
                 }
             }
 
-            if(stats.getHealth() != mWatchedStats.getHealth() || mWatchedStatsEmpty)
+            if(stats.getHealth() != mWatchedHealth || mWatchedStatsEmpty)
             {
                 static const std::string hbar("HBar");
-                mWatchedStats.setHealth(stats.getHealth());
+                mWatchedHealth = stats.getHealth();
                 winMgr->setValue(hbar, stats.getHealth());
             }
-            if(stats.getMagicka() != mWatchedStats.getMagicka() || mWatchedStatsEmpty)
+            if(stats.getMagicka() != mWatchedMagicka || mWatchedStatsEmpty)
             {
                 static const std::string mbar("MBar");
-                mWatchedStats.setMagicka(stats.getMagicka());
+                mWatchedMagicka = stats.getMagicka();
                 winMgr->setValue(mbar, stats.getMagicka());
             }
-            if(stats.getFatigue() != mWatchedStats.getFatigue() || mWatchedStatsEmpty)
+            if(stats.getFatigue() != mWatchedFatigue || mWatchedStatsEmpty)
             {
                 static const std::string fbar("FBar");
-                mWatchedStats.setFatigue(stats.getFatigue());
+                mWatchedFatigue = stats.getFatigue();
                 winMgr->setValue(fbar, stats.getFatigue());
             }
 
-            if(stats.getTimeToStartDrowning() != mWatchedStats.getTimeToStartDrowning())
+            if(stats.getTimeToStartDrowning() != mWatchedTimeToStartDrowning)
             {
                 const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                         .find("fHoldBreathTime")->getFloat();
-                mWatchedStats.setTimeToStartDrowning(stats.getTimeToStartDrowning());
+                mWatchedTimeToStartDrowning = stats.getTimeToStartDrowning();
                 if(stats.getTimeToStartDrowning() >= fHoldBreathTime)
                     winMgr->setDrowningBarVisibility(false);
                 else
@@ -420,10 +420,10 @@ namespace MWMechanics
             //Loop over ESM::Skill::SkillEnum
             for(int i = 0; i < ESM::Skill::Length; ++i)
             {
-                if(stats.getSkill(i) != mWatchedStats.getSkill(i) || mWatchedStatsEmpty)
+                if(stats.getSkill(i) != mWatchedSkills[i] || mWatchedStatsEmpty)
                 {
                     update = true;
-                    mWatchedStats.getSkill(i) = stats.getSkill(i);
+                    mWatchedSkills[i] = stats.getSkill(i);
                     winMgr->setValue((ESM::Skill::SkillEnum)i, stats.getSkill(i));
                 }
             }
@@ -1576,7 +1576,6 @@ namespace MWMechanics
         if (stats.isDead())
         {
             MWMechanics::DynamicStat<float> stat (stats.getHealth());
-
             if (stat.getModified()<1)
             {
                 stat.setModified(1, 0);
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index 6a923072a6..b0a9380e54 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -20,7 +20,16 @@ namespace MWMechanics
     class MechanicsManager : public MWBase::MechanicsManager
     {
             MWWorld::Ptr mWatched;
-            NpcStats mWatchedStats;
+
+            AttributeValue mWatchedAttributes[8];
+            SkillValue mWatchedSkills[27];
+
+            DynamicStat<float> mWatchedHealth;
+            DynamicStat<float> mWatchedMagicka;
+            DynamicStat<float> mWatchedFatigue;
+
+            float mWatchedTimeToStartDrowning;
+
             bool mWatchedStatsEmpty;
             bool mUpdatePlayer;
             bool mClassSelected;

From 1602eb3de8904d95aa59bc05d5f44cbab3dc3375 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Mon, 27 Jun 2016 21:24:45 +0900
Subject: [PATCH 745/765] Fix so that keepPlayerAlive() will not run twice

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 95c2ce9cb0..8f920dd259 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1574,15 +1574,7 @@ namespace MWMechanics
         MWWorld::Ptr player = getPlayer();
         CreatureStats& stats = player.getClass().getCreatureStats(player);
         if (stats.isDead())
-        {
-            MWMechanics::DynamicStat<float> stat (stats.getHealth());
-            if (stat.getModified()<1)
-            {
-                stat.setModified(1, 0);
-                stats.setHealth(stat);
-            }
             stats.resurrect();
-        }
     }
 
     bool MechanicsManager::isReadyToBlock(const MWWorld::Ptr &ptr) const

From 965aaebbdbff7008968ac7bbf5c5ab417057a9d1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 27 Jun 2016 20:54:42 +0200
Subject: [PATCH 746/765] Analyze the loudness data as the stream is decoded
 for playback

Instead of getting the loudness data for the whole file in advance, we now get it piece by piece as the sound is streamed.

The benefit is that we need to decode the audio just once instead of twice.

We no longer need to rewind() the stream when the first decoding is done, this should hopefully fix bug #3453 .
---
 apps/openmw/mwsound/loudness.cpp        |  29 ++---
 apps/openmw/mwsound/loudness.hpp        |  39 +++++--
 apps/openmw/mwsound/openal_output.cpp   |  71 +++++-------
 apps/openmw/mwsound/openal_output.hpp   |   3 +-
 apps/openmw/mwsound/sound_output.hpp    |   7 +-
 apps/openmw/mwsound/soundmanagerimp.cpp | 142 ++++++------------------
 apps/openmw/mwsound/soundmanagerimp.hpp |  19 +---
 7 files changed, 107 insertions(+), 203 deletions(-)

diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index 326c59c079..19e5cd5863 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -8,15 +8,16 @@
 namespace MWSound
 {
 
-void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sampleRate, ChannelConfig chans, SampleType type, float valuesPerSecond)
+void Sound_Loudness::analyzeLoudness(const std::vector< char >& data)
 {
-    int samplesPerSegment = static_cast<int>(sampleRate / valuesPerSecond);
-    int numSamples = bytesToFrames(data.size(), chans, type);
-    int advance = framesToBytes(1, chans, type);
+    mQueue.insert( mQueue.end(), data.begin(), data.end() );
+    if (!mQueue.size())
+        return;
+
+    int samplesPerSegment = static_cast<int>(mSampleRate / mSamplesPerSec);
+    int numSamples = bytesToFrames(mQueue.size(), mChannelConfig, mSampleType);
+    int advance = framesToBytes(1, mChannelConfig, mSampleType);
 
-    mSamplesPerSec = valuesPerSecond;
-    mSamples.clear();
-    mSamples.reserve(numSamples/samplesPerSegment);
 
     int segment=0;
     int sample=0;
@@ -28,16 +29,16 @@ void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sample
         {
             // get sample on a scale from -1 to 1
             float value = 0;
-            if (type == SampleType_UInt8)
-                value = ((char)(data[sample*advance]^0x80))/128.f;
-            else if (type == SampleType_Int16)
+            if (mSampleType == SampleType_UInt8)
+                value = ((char)(mQueue[sample*advance]^0x80))/128.f;
+            else if (mSampleType == SampleType_Int16)
             {
-                value = *reinterpret_cast<const int16_t*>(&data[sample*advance]);
+                value = *reinterpret_cast<const int16_t*>(&mQueue[sample*advance]);
                 value /= float(std::numeric_limits<int16_t>::max());
             }
-            else if (type == SampleType_Float32)
+            else if (mSampleType == SampleType_Float32)
             {
-                value = *reinterpret_cast<const float*>(&data[sample*advance]);
+                value = *reinterpret_cast<const float*>(&mQueue[sample*advance]);
                 value = std::max(-1.f, std::min(1.f, value)); // Float samples *should* be scaled to [-1,1] already.
             }
 
@@ -53,7 +54,7 @@ void Sound_Loudness::analyzeLoudness(const std::vector< char >& data, int sample
         ++segment;
     }
 
-    mReady = true;
+    mQueue.erase(mQueue.begin(), mQueue.begin() + sample*advance);
 }
 
 
diff --git a/apps/openmw/mwsound/loudness.hpp b/apps/openmw/mwsound/loudness.hpp
index 366d29de51..939d83dee3 100644
--- a/apps/openmw/mwsound/loudness.hpp
+++ b/apps/openmw/mwsound/loudness.hpp
@@ -2,6 +2,7 @@
 #define GAME_SOUND_LOUDNESS_H
 
 #include <vector>
+#include <deque>
 
 #include "sound_decoder.hpp"
 
@@ -9,29 +10,45 @@ namespace MWSound
 {
 
 class Sound_Loudness {
-    // Loudness sample info
     float mSamplesPerSec;
+    int mSampleRate;
+    ChannelConfig mChannelConfig;
+    SampleType mSampleType;
+
+    // Loudness sample info
     std::vector<float> mSamples;
-    volatile bool mReady;
+
+    std::deque<char> mQueue;
 
 public:
-    Sound_Loudness() : mSamplesPerSec(0.0f), mReady(false) { }
+    /**
+     * @param samplesPerSecond How many loudness values per second of audio to compute.
+     * @param sampleRate the sample rate of the sound buffer
+     * @param chans channel layout of the buffer
+     * @param type sample type of the buffer
+    */
+    Sound_Loudness(float samplesPerSecond, int sampleRate, ChannelConfig chans, SampleType type)
+        : mSamplesPerSec(samplesPerSecond)
+        , mSampleRate(sampleRate)
+        , mChannelConfig(chans)
+        , mSampleType(type)
+    { }
 
     /**
      * Analyzes the energy (closely related to loudness) of a sound buffer.
      * The buffer will be divided into segments according to \a valuesPerSecond,
      * and for each segment a loudness value in the range of [0,1] will be computed.
+     * The computed values are then added to the mSamples vector. This method should be called continuously
+     * with chunks of audio until the whole audio file is processed.
+     * If the size of \a data does not exactly fit a number of loudness samples, the remainder
+     * will be kept in the mQueue and used in the next call to analyzeLoudness.
      * @param data the sound buffer to analyze, containing raw samples
-     * @param sampleRate the sample rate of the sound buffer
-     * @param chans channel layout of the buffer
-     * @param type sample type of the buffer
-     * @param valuesPerSecond How many loudness values per second of audio to compute.
      */
-    void analyzeLoudness(const std::vector<char>& data, int sampleRate,
-                         ChannelConfig chans, SampleType type,
-                         float valuesPerSecond);
+    void analyzeLoudness(const std::vector<char>& data);
 
-    bool isReady() { return mReady; }
+    /**
+     * Get loudness at a particular time. Before calling this, the stream has to be analyzed up to that point in time (see analyzeLoudness()).
+     */
     float getLoudnessAtTime(float sec) const;
 };
 
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index d440206329..fb3e676804 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -2,6 +2,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <vector>
+#include <osg/Timer>
 
 #include <stdint.h>
 
@@ -212,6 +213,8 @@ private:
 
     DecoderPtr mDecoder;
 
+    std::auto_ptr<Sound_Loudness> mLoudnessAnalyzer;
+
     volatile bool mIsFinished;
 
     void updateAll(bool local);
@@ -229,6 +232,8 @@ public:
     double getStreamDelay() const;
     double getStreamOffset() const;
 
+    float getCurrentLoudness() const;
+
     bool process();
     ALint refillQueue();
 };
@@ -242,9 +247,6 @@ struct OpenAL_Output::StreamThread {
     typedef std::vector<OpenAL_SoundStream*> StreamVec;
     StreamVec mStreams;
 
-    typedef std::vector<std::pair<DecoderPtr,Sound_Loudness*> > DecoderLoudnessVec;
-    DecoderLoudnessVec mDecoderLoudness;
-
     volatile bool mQuitNow;
     boost::mutex mMutex;
     boost::condition_variable mCondVar;
@@ -277,32 +279,6 @@ struct OpenAL_Output::StreamThread {
                     ++iter;
             }
 
-            // Only do one loudness decode at a time, in case it takes particularly long we don't
-            // want to block up anything.
-            DecoderLoudnessVec::iterator dliter = mDecoderLoudness.begin();
-            if(dliter != mDecoderLoudness.end())
-            {
-                DecoderPtr decoder = dliter->first;
-                Sound_Loudness *loudness = dliter->second;
-                mDecoderLoudness.erase(dliter);
-                lock.unlock();
-
-                std::vector<char> data;
-                ChannelConfig chans = ChannelConfig_Mono;
-                SampleType type = SampleType_Int16;
-                int srate = 48000;
-                try {
-                    decoder->getInfo(&srate, &chans, &type);
-                    decoder->readAll(data);
-                }
-                catch(std::exception &e) {
-                    std::cerr<< "Failed to decode audio: "<<e.what() <<std::endl;
-                }
-
-                loudness->analyzeLoudness(data, srate, chans, type, static_cast<float>(sLoudnessFPS));
-                lock.lock();
-                continue;
-            }
             mCondVar.timed_wait(lock, boost::posix_time::milliseconds(50));
         }
     }
@@ -329,15 +305,6 @@ struct OpenAL_Output::StreamThread {
     {
         boost::lock_guard<boost::mutex> lock(mMutex);
         mStreams.clear();
-        mDecoderLoudness.clear();
-    }
-
-    void add(DecoderPtr decoder, Sound_Loudness *loudness)
-    {
-        boost::unique_lock<boost::mutex> lock(mMutex);
-        mDecoderLoudness.push_back(std::make_pair(decoder, loudness));
-        lock.unlock();
-        mCondVar.notify_all();
     }
 
 private:
@@ -371,6 +338,8 @@ OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
         mFrameSize = framesToBytes(1, chans, type);
         mBufferSize = static_cast<ALuint>(sBufferLength*srate);
         mBufferSize *= mFrameSize;
+
+        mLoudnessAnalyzer.reset(new Sound_Loudness(sLoudnessFPS, mSampleRate, chans, type));
     }
     catch(std::exception&)
     {
@@ -446,6 +415,15 @@ double OpenAL_SoundStream::getStreamOffset() const
     return t;
 }
 
+float OpenAL_SoundStream::getCurrentLoudness() const
+{
+    if (!mLoudnessAnalyzer.get())
+        return 0.f;
+
+    float time = getStreamOffset();
+    return mLoudnessAnalyzer->getLoudnessAtTime(time);
+}
+
 bool OpenAL_SoundStream::process()
 {
     try {
@@ -493,6 +471,9 @@ ALint OpenAL_SoundStream::refillQueue()
             }
             if(got > 0)
             {
+                if (mLoudnessAnalyzer.get())
+                    mLoudnessAnalyzer->analyzeLoudness(data);
+
                 ALuint bufid = mBuffers[mCurrentBufIdx];
                 alBufferData(bufid, mFormat, &data[0], data.size(), mSampleRate);
                 alSourceQueueBuffers(mSource, 1, &bufid);
@@ -1045,6 +1026,14 @@ double OpenAL_Output::getStreamOffset(MWBase::SoundStreamPtr sound)
     return stream->getStreamOffset();
 }
 
+float OpenAL_Output::getStreamLoudness(MWBase::SoundStreamPtr sound)
+{
+    if(!sound->mHandle) return 0.0;
+    OpenAL_SoundStream *stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
+    boost::lock_guard<boost::mutex> lock(mStreamThread->mMutex);
+    return stream->getCurrentLoudness();
+}
+
 bool OpenAL_Output::isStreamPlaying(MWBase::SoundStreamPtr sound)
 {
     if(!sound->mHandle) return false;
@@ -1144,12 +1133,6 @@ void OpenAL_Output::resumeSounds(int types)
 }
 
 
-void OpenAL_Output::loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness)
-{
-    mStreamThread->add(decoder, loudness);
-}
-
-
 OpenAL_Output::OpenAL_Output(SoundManager &mgr)
   : Sound_Output(mgr), mDevice(0), mContext(0)
   , mListenerPos(0.0f, 0.0f, 0.0f), mListenerEnv(Env_Normal)
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index 4986cd3a03..ef21732cae 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -67,6 +67,7 @@ namespace MWSound
         virtual void finishStream(MWBase::SoundStreamPtr sound);
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound);
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound);
+        virtual float getStreamLoudness(MWBase::SoundStreamPtr sound);
         virtual bool isStreamPlaying(MWBase::SoundStreamPtr sound);
         virtual void updateStream(MWBase::SoundStreamPtr sound);
 
@@ -78,8 +79,6 @@ namespace MWSound
         virtual void pauseSounds(int types);
         virtual void resumeSounds(int types);
 
-        virtual void loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness);
-
         OpenAL_Output(SoundManager &mgr);
         virtual ~OpenAL_Output();
     };
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 98eba8466c..383dfed2a0 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -12,7 +12,6 @@ namespace MWSound
     class SoundManager;
     struct Sound_Decoder;
     class Sound;
-    class Sound_Loudness;
 
     // An opaque handle for the implementation's sound buffers.
     typedef void *Sound_Handle;
@@ -46,6 +45,7 @@ namespace MWSound
         virtual void finishStream(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound) = 0;
+        virtual float getStreamLoudness(MWBase::SoundStreamPtr sound) = 0;
         virtual bool isStreamPlaying(MWBase::SoundStreamPtr sound) = 0;
         virtual void updateStream(MWBase::SoundStreamPtr sound) = 0;
 
@@ -57,11 +57,6 @@ namespace MWSound
         virtual void pauseSounds(int types) = 0;
         virtual void resumeSounds(int types) = 0;
 
-        // HACK: The sound output implementation really shouldn't be handling
-        // asynchronous loudness data loading, but it's currently where we have
-        // a background processing thread.
-        virtual void loadLoudnessAsync(DecoderPtr decoder, Sound_Loudness *loudness) = 0;
-
         Sound_Output& operator=(const Sound_Output &rhs);
         Sound_Output(const Sound_Output &rhs);
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 4d1aa0b4db..2cf77d45f1 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -219,7 +219,7 @@ namespace MWSound
         return sfx;
     }
 
-    DecoderPtr SoundManager::loadVoice(const std::string &voicefile, Sound_Loudness **lipdata)
+    DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
     {
         DecoderPtr decoder = getDecoder();
         // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
@@ -234,21 +234,6 @@ namespace MWSound
             decoder->open(file);
         }
 
-        NameLoudnessRefMap::iterator lipiter = mVoiceLipNameMap.find(voicefile);
-        if(lipiter != mVoiceLipNameMap.end())
-        {
-            *lipdata = lipiter->second;
-            return decoder;
-        }
-
-        mVoiceLipBuffers.insert(mVoiceLipBuffers.end(), Sound_Loudness());
-        lipiter = mVoiceLipNameMap.insert(
-            std::make_pair(voicefile, &mVoiceLipBuffers.back())
-        ).first;
-
-        mOutput->loadLoudnessAsync(decoder, lipiter->second);
-
-        *lipdata = lipiter->second;
         return decoder;
     }
 
@@ -400,28 +385,22 @@ namespace MWSound
         {
             std::string voicefile = "Sound/"+filename;
 
-            Sound_Loudness *loudness;
             mVFS->normalizeFilename(voicefile);
-            DecoderPtr decoder = loadVoice(voicefile, &loudness);
+            DecoderPtr decoder = loadVoice(voicefile);
 
-            if(!loudness->isReady())
-                mPendingSaySounds[ptr] = std::make_pair(decoder, loudness);
-            else
+            MWBase::World *world = MWBase::Environment::get().getWorld();
+            const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
+
+            SaySoundMap::iterator oldIt = mActiveSaySounds.find(ptr);
+            if (oldIt != mActiveSaySounds.end())
             {
-                MWBase::World *world = MWBase::Environment::get().getWorld();
-                const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
-
-                SaySoundMap::iterator oldIt = mActiveSaySounds.find(ptr);
-                if (oldIt != mActiveSaySounds.end())
-                {
-                    mOutput->finishStream(oldIt->second.first);
-                    mActiveSaySounds.erase(oldIt);
-                }
-
-                MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
-
-                mActiveSaySounds.insert(std::make_pair(ptr, std::make_pair(sound, loudness)));
+                mOutput->finishStream(oldIt->second);
+                mActiveSaySounds.erase(oldIt);
             }
+
+            MWBase::SoundStreamPtr sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
+
+            mActiveSaySounds.insert(std::make_pair(ptr, sound));
         }
         catch(std::exception &e)
         {
@@ -434,10 +413,8 @@ namespace MWSound
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            MWBase::SoundStreamPtr sound = snditer->second.first;
-            Sound_Loudness *loudness = snditer->second.second;
-            float sec = mOutput->getStreamOffset(sound);
-            return loudness->getLoudnessAtTime(sec);
+            MWBase::SoundStreamPtr sound = snditer->second;
+            return mOutput->getStreamLoudness(sound);
         }
 
         return 0.0f;
@@ -451,24 +428,18 @@ namespace MWSound
         {
             std::string voicefile = "Sound/"+filename;
 
-            Sound_Loudness *loudness;
             mVFS->normalizeFilename(voicefile);
-            DecoderPtr decoder = loadVoice(voicefile, &loudness);
+            DecoderPtr decoder = loadVoice(voicefile);
 
-            if(!loudness->isReady())
-                mPendingSaySounds[MWWorld::ConstPtr()] = std::make_pair(decoder, loudness);
-            else
+            SaySoundMap::iterator oldIt = mActiveSaySounds.find(MWWorld::ConstPtr());
+            if (oldIt != mActiveSaySounds.end())
             {
-                SaySoundMap::iterator oldIt = mActiveSaySounds.find(MWWorld::ConstPtr());
-                if (oldIt != mActiveSaySounds.end())
-                {
-                    mOutput->finishStream(oldIt->second.first);
-                    mActiveSaySounds.erase(oldIt);
-                }
-
-                mActiveSaySounds.insert(std::make_pair(MWWorld::ConstPtr(),
-                                                       std::make_pair(playVoice(decoder, osg::Vec3f(), true), loudness)));
+                mOutput->finishStream(oldIt->second);
+                mActiveSaySounds.erase(oldIt);
             }
+
+            mActiveSaySounds.insert(std::make_pair(MWWorld::ConstPtr(),
+                                                   playVoice(decoder, osg::Vec3f(), true)));
         }
         catch(std::exception &e)
         {
@@ -481,11 +452,11 @@ namespace MWSound
         SaySoundMap::const_iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            if(mOutput->isStreamPlaying(snditer->second.first))
+            if(mOutput->isStreamPlaying(snditer->second))
                 return false;
             return true;
         }
-        return mPendingSaySounds.find(ptr) == mPendingSaySounds.end();
+        return true;
     }
 
     void SoundManager::stopSay(const MWWorld::ConstPtr &ptr)
@@ -493,10 +464,9 @@ namespace MWSound
         SaySoundMap::iterator snditer = mActiveSaySounds.find(ptr);
         if(snditer != mActiveSaySounds.end())
         {
-            mOutput->finishStream(snditer->second.first);
+            mOutput->finishStream(snditer->second);
             mActiveSaySounds.erase(snditer);
         }
-        mPendingSaySounds.erase(ptr);
     }
 
 
@@ -691,7 +661,7 @@ namespace MWSound
                sayiter->first != MWMechanics::getPlayer() &&
                sayiter->first.getCell() == cell)
             {
-                mOutput->finishStream(sayiter->second.first);
+                mOutput->finishStream(sayiter->second);
             }
             ++sayiter;
         }
@@ -901,51 +871,11 @@ namespace MWSound
                 ++snditer;
         }
 
-        SayDecoderMap::iterator penditer = mPendingSaySounds.begin();
-        while(penditer != mPendingSaySounds.end())
-        {
-            Sound_Loudness *loudness = penditer->second.second;
-            if(loudness->isReady())
-            {
-                try {
-                    DecoderPtr decoder = penditer->second.first;
-                    decoder->rewind();
-
-                    MWBase::SoundStreamPtr sound;
-                    MWWorld::ConstPtr ptr = penditer->first;
-
-                    SaySoundMap::iterator old = mActiveSaySounds.find(ptr);
-                    if (old != mActiveSaySounds.end())
-                    {
-                        mOutput->finishStream(old->second.first);
-                        mActiveSaySounds.erase(old);
-                    }
-
-                    if(ptr == MWWorld::ConstPtr())
-                        sound = playVoice(decoder, osg::Vec3f(), true);
-                    else
-                    {
-                        MWBase::World *world = MWBase::Environment::get().getWorld();
-                        const osg::Vec3f pos = world->getActorHeadTransform(ptr).getTrans();
-                        sound = playVoice(decoder, pos, (ptr == MWMechanics::getPlayer()));
-                    }
-                    mActiveSaySounds.insert(std::make_pair(ptr, std::make_pair(sound, loudness)));
-                }
-                catch(std::exception &e) {
-                    std::cerr<< "Sound Error: "<<e.what() <<std::endl;
-                }
-
-                mPendingSaySounds.erase(penditer++);
-            }
-            else
-                ++penditer;
-        }
-
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         while(sayiter != mActiveSaySounds.end())
         {
             MWWorld::ConstPtr ptr = sayiter->first;
-            MWBase::SoundStreamPtr sound = sayiter->second.first;
+            MWBase::SoundStreamPtr sound = sayiter->second;
             if(!ptr.isEmpty() && sound->getIs3D())
             {
                 MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -1040,7 +970,7 @@ namespace MWSound
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         for(;sayiter != mActiveSaySounds.end();++sayiter)
         {
-            MWBase::SoundStreamPtr sound = sayiter->second.first;
+            MWBase::SoundStreamPtr sound = sayiter->second;
             sound->setBaseVolume(volumeFromType(sound->getPlayType()));
             mOutput->updateStream(sound);
         }
@@ -1080,16 +1010,9 @@ namespace MWSound
         SaySoundMap::iterator sayiter = mActiveSaySounds.find(old);
         if(sayiter != mActiveSaySounds.end())
         {
-            SoundLoudnessPair sndlist = sayiter->second;
+            MWBase::SoundStreamPtr stream = sayiter->second;
             mActiveSaySounds.erase(sayiter);
-            mActiveSaySounds[updated] = sndlist;
-        }
-        SayDecoderMap::iterator penditer = mPendingSaySounds.find(old);
-        if(penditer != mPendingSaySounds.end())
-        {
-            DecoderLoudnessPair dl = penditer->second;
-            mPendingSaySounds.erase(penditer);
-            mPendingSaySounds[updated] = dl;
+            mActiveSaySounds[updated] = stream;
         }
     }
 
@@ -1175,13 +1098,12 @@ namespace MWSound
         mActiveSounds.clear();
         SaySoundMap::iterator sayiter = mActiveSaySounds.begin();
         for(;sayiter != mActiveSaySounds.end();++sayiter)
-            mOutput->finishStream(sayiter->second.first);
+            mOutput->finishStream(sayiter->second);
         mActiveSaySounds.clear();
         TrackList::iterator trkiter = mActiveTracks.begin();
         for(;trkiter != mActiveTracks.end();++trkiter)
             mOutput->finishStream(*trkiter);
         mActiveTracks.clear();
-        mPendingSaySounds.clear();
         mUnderwaterSound.reset();
         stopMusic();
     }
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 695ca92a2a..d499dce7d4 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -11,7 +11,6 @@
 
 #include <components/settings/settings.hpp>
 
-#include "loudness.hpp"
 #include "../mwbase/soundmanager.hpp"
 
 namespace VFS
@@ -69,12 +68,6 @@ namespace MWSound
         typedef std::map<std::string,Sound_Buffer*> NameBufferMap;
         NameBufferMap mBufferNameMap;
 
-        typedef std::deque<Sound_Loudness> LoudnessList;
-        LoudnessList mVoiceLipBuffers;
-
-        typedef std::map<std::string,Sound_Loudness*> NameLoudnessRefMap;
-        NameLoudnessRefMap mVoiceLipNameMap;
-
         // NOTE: unused buffers are stored in front-newest order.
         typedef std::deque<Sound_Buffer*> SoundList;
         SoundList mUnusedBuffers;
@@ -84,14 +77,9 @@ namespace MWSound
         typedef std::map<MWWorld::ConstPtr,SoundBufferRefPairList> SoundMap;
         SoundMap mActiveSounds;
 
-        typedef std::pair<MWBase::SoundStreamPtr,Sound_Loudness*> SoundLoudnessPair;
-        typedef std::map<MWWorld::ConstPtr,SoundLoudnessPair> SaySoundMap;
+        typedef std::map<MWWorld::ConstPtr,MWBase::SoundStreamPtr> SaySoundMap;
         SaySoundMap mActiveSaySounds;
 
-        typedef std::pair<DecoderPtr,Sound_Loudness*> DecoderLoudnessPair;
-        typedef std::map<MWWorld::ConstPtr,DecoderLoudnessPair> SayDecoderMap;
-        SayDecoderMap mPendingSaySounds;
-
         typedef std::vector<MWBase::SoundStreamPtr> TrackList;
         TrackList mActiveTracks;
 
@@ -112,9 +100,8 @@ namespace MWSound
         Sound_Buffer *lookupSound(const std::string &soundId) const;
         Sound_Buffer *loadSound(const std::string &soundId);
 
-        // Ensures the loudness/"lip" data gets loaded, and returns a decoder
-        // to start streaming
-        DecoderPtr loadVoice(const std::string &voicefile, Sound_Loudness **lipdata);
+        // returns a decoder to start streaming
+        DecoderPtr loadVoice(const std::string &voicefile);
 
         MWBase::SoundStreamPtr playVoice(DecoderPtr decoder, const osg::Vec3f &pos, bool playlocal);
 

From dc1b010cf0b90ad3c6e751231b770baa568eeb2c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 27 Jun 2016 21:37:02 +0200
Subject: [PATCH 747/765] Don't analyze the loudness for sounds that don't need
 it

---
 apps/openmw/mwsound/openal_output.cpp   | 11 ++++++-----
 apps/openmw/mwsound/openal_output.hpp   |  2 +-
 apps/openmw/mwsound/sound_output.hpp    |  2 +-
 apps/openmw/mwsound/soundmanagerimp.cpp |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index fb3e676804..061355d7ec 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -225,7 +225,7 @@ private:
     friend class OpenAL_Output;
 
 public:
-    OpenAL_SoundStream(ALuint src, DecoderPtr decoder);
+    OpenAL_SoundStream(ALuint src, DecoderPtr decoder, bool getLoudnessData=false);
     ~OpenAL_SoundStream();
 
     bool isPlaying();
@@ -313,7 +313,7 @@ private:
 };
 
 
-OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
+OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder, bool getLoudnessData)
   : mSource(src), mCurrentBufIdx(0), mFrameSize(0), mSilence(0), mDecoder(decoder), mIsFinished(false)
 {
     alGenBuffers(sNumBuffers, mBuffers);
@@ -339,7 +339,8 @@ OpenAL_SoundStream::OpenAL_SoundStream(ALuint src, DecoderPtr decoder)
         mBufferSize = static_cast<ALuint>(sBufferLength*srate);
         mBufferSize *= mFrameSize;
 
-        mLoudnessAnalyzer.reset(new Sound_Loudness(sLoudnessFPS, mSampleRate, chans, type));
+        if (getLoudnessData)
+            mLoudnessAnalyzer.reset(new Sound_Loudness(sLoudnessFPS, mSampleRate, chans, type));
     }
     catch(std::exception&)
     {
@@ -962,7 +963,7 @@ void OpenAL_Output::streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound
     sound->mHandle = stream;
 }
 
-void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound)
+void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData)
 {
     OpenAL_SoundStream *stream = 0;
     ALuint source;
@@ -979,7 +980,7 @@ void OpenAL_Output::streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sou
                      sound->getRealVolume(), sound->getPitch(), false, sound->getUseEnv());
         throwALerror();
 
-        stream = new OpenAL_SoundStream(source, decoder);
+        stream = new OpenAL_SoundStream(source, decoder, getLoudnessData);
         mStreamThread->add(stream);
         mActiveStreams.push_back(sound);
     }
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index ef21732cae..24c8609d69 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -63,7 +63,7 @@ namespace MWSound
         virtual void updateSound(MWBase::SoundPtr sound);
 
         virtual void streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound);
-        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound);
+        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData);
         virtual void finishStream(MWBase::SoundStreamPtr sound);
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound);
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound);
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 383dfed2a0..e34d888ee8 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -41,7 +41,7 @@ namespace MWSound
         virtual void updateSound(MWBase::SoundPtr sound) = 0;
 
         virtual void streamSound(DecoderPtr decoder, MWBase::SoundStreamPtr sound) = 0;
-        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound) = 0;
+        virtual void streamSound3D(DecoderPtr decoder, MWBase::SoundStreamPtr sound, bool getLoudnessData) = 0;
         virtual void finishStream(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamDelay(MWBase::SoundStreamPtr sound) = 0;
         virtual double getStreamOffset(MWBase::SoundStreamPtr sound) = 0;
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 2cf77d45f1..663f888524 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -258,7 +258,7 @@ namespace MWSound
         {
             sound.reset(new Stream(pos, 1.0f, basevol, 1.0f, minDistance, maxDistance,
                                    Play_Normal|Play_TypeVoice|Play_3D));
-            mOutput->streamSound3D(decoder, sound);
+            mOutput->streamSound3D(decoder, sound, true);
         }
         return sound;
     }

From 1739351b7a48c48951c9b31368b52bc512935d76 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 27 Jun 2016 21:38:04 +0200
Subject: [PATCH 748/765] Remove now unused Sound_Decoder::rewind()

---
 apps/openmw/mwsound/ffmpeg_decoder.cpp    | 10 ----------
 apps/openmw/mwsound/ffmpeg_decoder.hpp    |  1 -
 apps/openmw/mwsound/movieaudiofactory.cpp |  2 --
 apps/openmw/mwsound/sound_decoder.hpp     |  1 -
 4 files changed, 14 deletions(-)

diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 66b7e09e3a..651982344d 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -389,16 +389,6 @@ void FFmpeg_Decoder::readAll(std::vector<char> &output)
     }
 }
 
-void FFmpeg_Decoder::rewind()
-{
-    int stream_idx = mStream - mFormatCtx->streams;
-    if(av_seek_frame(mFormatCtx, stream_idx, 0, 0) < 0)
-        fail("Failed to seek in audio stream");
-    av_free_packet(&mPacket);
-    mFrameSize = mFramePos = 0;
-    mNextPts = 0.0;
-}
-
 size_t FFmpeg_Decoder::getSampleOffset()
 {
     int delay = (mFrameSize-mFramePos) / av_get_channel_layout_nb_channels(mOutputChannelLayout) /
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index b27e60c9f5..cc553b161c 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -74,7 +74,6 @@ namespace MWSound
 
         virtual size_t read(char *buffer, size_t bytes);
         virtual void readAll(std::vector<char> &output);
-        virtual void rewind();
         virtual size_t getSampleOffset();
 
         void fail(const std::string &msg);
diff --git a/apps/openmw/mwsound/movieaudiofactory.cpp b/apps/openmw/mwsound/movieaudiofactory.cpp
index 554b62d264..af9932f74e 100644
--- a/apps/openmw/mwsound/movieaudiofactory.cpp
+++ b/apps/openmw/mwsound/movieaudiofactory.cpp
@@ -27,7 +27,6 @@ namespace MWSound
 
         virtual void open(const std::string &fname);
         virtual void close();
-        virtual void rewind();
         virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
         virtual size_t read(char *buffer, size_t bytes);
@@ -102,7 +101,6 @@ namespace MWSound
         throw std::runtime_error("unimplemented");
     }
     void MWSoundDecoderBridge::close() {}
-    void MWSoundDecoderBridge::rewind() {}
 
     std::string MWSoundDecoderBridge::getName()
     {
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index 1be9dd3749..34bae87d74 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -42,7 +42,6 @@ namespace MWSound
 
         virtual size_t read(char *buffer, size_t bytes) = 0;
         virtual void readAll(std::vector<char> &output);
-        virtual void rewind() = 0;
         virtual size_t getSampleOffset() = 0;
 
         Sound_Decoder(const VFS::Manager* resourceMgr) : mResourceMgr(resourceMgr)

From 4699a8098b93215a3a4f71a099ffb1146e8674ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 27 Jun 2016 21:51:18 +0200
Subject: [PATCH 749/765] Include fix

---
 apps/openmw/mwsound/openal_output.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 061355d7ec..71459e18c3 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <vector>
-#include <osg/Timer>
+#include <memory>
 
 #include <stdint.h>
 

From 509e5dfe4d090acc0c1494cbd99e9ad7de45ce91 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 27 Jun 2016 22:10:30 +0200
Subject: [PATCH 750/765] Include cleanup

---
 apps/openmw/mwsound/sound_buffer.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/openmw/mwsound/sound_buffer.hpp b/apps/openmw/mwsound/sound_buffer.hpp
index 8f8e43da4b..5ca3a45da7 100644
--- a/apps/openmw/mwsound/sound_buffer.hpp
+++ b/apps/openmw/mwsound/sound_buffer.hpp
@@ -3,11 +3,7 @@
 
 #include <string>
 
-#include "soundmanagerimp.hpp"
 #include "sound_output.hpp"
-#include "loudness.hpp"
-
-#include "../mwworld/ptr.hpp"
 
 namespace MWSound
 {

From 2290346296aed8f280e0382c6f29c5f5d7eb3c42 Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Thu, 30 Jun 2016 02:20:27 +0900
Subject: [PATCH 751/765] Fix timing of some magicka calculations

---
 apps/openmw/mwmechanics/actors.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f28e2cc522..f27bb312af 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -532,6 +532,9 @@ namespace MWMechanics
             creatureStats.setAttribute(i, stat);
         }
 
+        if (creatureStats.needToRecalcDynamicStats())
+            calculateDynamicStats(ptr);
+
         {
             Spells & spells = creatureStats.getSpells();
             for (Spells::TIterator it = spells.begin(); it != spells.end(); ++it)

From 72d2daae90474fa79940440af84f9bbd5518ff13 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Wed, 29 Jun 2016 22:54:11 +0200
Subject: [PATCH 752/765] Fix InventoryStore::purgeEffect being reverted by the
 next recalculation of mMagicEffects

---
 apps/openmw/mwworld/inventorystore.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 08436b2386..e8a4d1c4d7 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -722,7 +722,11 @@ void MWWorld::InventoryStore::rechargeItems(float duration)
 
 void MWWorld::InventoryStore::purgeEffect(short effectId)
 {
-    mMagicEffects.remove(MWMechanics::EffectKey(effectId));
+    for (TSlots::const_iterator it = mSlots.begin(); it != mSlots.end(); ++it)
+    {
+        if (*it != end())
+            purgeEffect(effectId, (*it)->getCellRef().getRefId());
+    }
 }
 
 void MWWorld::InventoryStore::purgeEffect(short effectId, const std::string &sourceId)

From 252b27f0efe232bf16d35b2b14db694fb3811f7e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 1 Jul 2016 15:04:59 +0200
Subject: [PATCH 753/765] Remove getEyePos()

---
 apps/openmw/mwrender/renderingmanager.cpp | 7 -------
 apps/openmw/mwrender/renderingmanager.hpp | 2 --
 2 files changed, 9 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index ea3e7b7ee4..33384a5218 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -367,12 +367,6 @@ namespace MWRender
         mSky->setSunDirection(position);
     }
 
-    osg::Vec3f RenderingManager::getEyePos()
-    {
-        osg::Vec3d eye = mViewer->getCameraManipulator()->getMatrix().getTrans();
-        return eye;
-    }
-
     void RenderingManager::addCell(const MWWorld::CellStore *store)
     {
         mPathgrid->addCell(store);
@@ -382,7 +376,6 @@ namespace MWRender
         if (store->getCell()->isExterior())
             mTerrain->loadCell(store->getCell()->getGridX(), store->getCell()->getGridY());
     }
-
     void RenderingManager::removeCell(const MWWorld::CellStore *store)
     {
         mPathgrid->removeCell(store);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index ebe75d39b2..306ae96764 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -137,8 +137,6 @@ namespace MWRender
 
         SkyManager* getSkyManager();
 
-        osg::Vec3f getEyePos();
-
         void spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale = 1.f);
 
         /// Clear all savegame-specific data

From 54f52f7bae08e870713eb5dcb7c5e09be911f583 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Fri, 1 Jul 2016 18:50:28 +0200
Subject: [PATCH 754/765] Implement effect removal for abilities (Fixes #3455)

---
 apps/essimporter/converter.hpp     |  2 +-
 apps/openmw/mwmechanics/actors.cpp |  1 +
 apps/openmw/mwmechanics/spells.cpp | 62 +++++++++++++++++++++++++-----
 apps/openmw/mwmechanics/spells.hpp | 10 ++++-
 apps/openmw/mwworld/worldimp.cpp   |  1 +
 components/esm/spellstate.cpp      | 18 +++++++--
 components/esm/spellstate.hpp      |  7 +++-
 7 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 81b2bec14a..11f9664468 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -121,7 +121,7 @@ public:
         {
             mContext->mPlayer.mObject.mCreatureStats.mLevel = npc.mNpdt52.mLevel;
             mContext->mPlayerBase = npc;
-            std::map<int, float> empty;
+            ESM::SpellState::SpellParams empty;
             // FIXME: player start spells and birthsign spells aren't listed here,
             // need to fix openmw to account for this
             for (std::vector<std::string>::const_iterator it = npc.mSpells.mList.begin(); it != npc.mSpells.mList.end(); ++it)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index f27bb312af..9426bda4b7 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -513,6 +513,7 @@ namespace MWMechanics
                     CastSpell cast(ptr, ptr);
                     if (cast.applyInstantEffect(ptr, ptr, it->first, it->second.getMagnitude()))
                     {
+                        creatureStats.getSpells().purgeEffect(it->first.mId);
                         creatureStats.getActiveSpells().purgeEffect(it->first.mId);
                         if (ptr.getClass().hasInventoryStore(ptr))
                             ptr.getClass().getInventoryStore(ptr).purgeEffect(it->first.mId);
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 2f87d04463..b4bf7ca6f4 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -66,7 +66,9 @@ namespace MWMechanics
                 mCorprusSpells[spell] = corprus;
             }
 
-            mSpells.insert (std::make_pair (spell, random));
+            SpellParams params;
+            params.mEffectRands = random;
+            mSpells.insert (std::make_pair (spell, params));
         }
     }
 
@@ -124,9 +126,12 @@ namespace MWMechanics
                 int i=0;
                 for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
                 {
+                    if (iter->second.mPurgedEffects.find(i) != iter->second.mPurgedEffects.end())
+                        continue; // effect was purged
+
                     float random = 1.f;
-                    if (iter->second.find(i) != iter->second.end())
-                        random = iter->second.at(i);
+                    if (iter->second.mEffectRands.find(i) != iter->second.mEffectRands.end())
+                        random = iter->second.mEffectRands.at(i);
 
                     effects.add (*it, it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random);
                     ++i;
@@ -259,9 +264,12 @@ namespace MWMechanics
             for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = list.mList.begin();
                  effectIt != list.mList.end(); ++effectIt, ++i)
             {
+                if (it->second.mPurgedEffects.find(i) != it->second.mPurgedEffects.end())
+                    continue; // effect was purged
+
                 float random = 1.f;
-                if (it->second.find(i) != it->second.end())
-                    random = it->second.at(i);
+                if (it->second.mEffectRands.find(i) != it->second.mEffectRands.end())
+                    random = it->second.mEffectRands.at(i);
 
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
                 visitor.visit(MWMechanics::EffectKey(*effectIt), spell->mName, spell->mId, -1, magnitude);
@@ -283,8 +291,8 @@ namespace MWMechanics
             if ((effectIt->mEffectID != ESM::MagicEffect::Corprus) && (magicEffect->mData.mFlags & ESM::MagicEffect::UncappedDamage)) // APPLIED_ONCE
             {
                 float random = 1.f;
-                if (mSpells[spell].find(i) != mSpells[spell].end())
-                    random = mSpells[spell].at(i);
+                if (mSpells[spell].mEffectRands.find(i) != mSpells[spell].mEffectRands.end())
+                    random = mSpells[spell].mEffectRands.at(i);
 
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
                 magnitude *= std::max(1, mCorprusSpells[spell].mWorsenings);
@@ -310,6 +318,36 @@ namespace MWMechanics
         return mCorprusSpells;
     }
 
+    void Spells::purgeEffect(int effectId)
+    {
+        for (TContainer::iterator spellIt = mSpells.begin(); spellIt != mSpells.end(); ++spellIt)
+        {
+            int i = 0;
+            for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
+            {
+                if (effectIt->mEffectID == effectId)
+                    spellIt->second.mPurgedEffects.insert(i);
+                ++i;
+            }
+        }
+    }
+
+    void Spells::purgeEffect(int effectId, const std::string & sourceId)
+    {
+        const ESM::Spell * spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(sourceId);
+        TContainer::iterator spellIt = mSpells.find(spell);
+        if (spellIt == mSpells.end())
+            return;
+
+        int i = 0;
+        for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
+        {
+            if (effectIt->mEffectID == effectId)
+                spellIt->second.mPurgedEffects.insert(i);
+            ++i;
+        }
+    }
+
     bool Spells::canUsePower(const ESM::Spell* spell) const
     {
         std::map<SpellKey, MWWorld::TimeStamp>::const_iterator it = mUsedPowers.find(spell);
@@ -332,7 +370,8 @@ namespace MWMechanics
             const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(it->first);
             if (spell)
             {
-                mSpells[spell] = it->second;
+                mSpells[spell].mEffectRands = it->second.mEffectRands;
+                mSpells[spell].mPurgedEffects = it->second.mPurgedEffects;
 
                 if (it->first == state.mSelectedSpell)
                     mSelectedSpell = it->first;
@@ -375,7 +414,12 @@ namespace MWMechanics
     void Spells::writeState(ESM::SpellState &state) const
     {
         for (TContainer::const_iterator it = mSpells.begin(); it != mSpells.end(); ++it)
-            state.mSpells.insert(std::make_pair(it->first->mId, it->second));
+        {
+            ESM::SpellState::SpellParams params;
+            params.mEffectRands = it->second.mEffectRands;
+            params.mPurgedEffects = it->second.mPurgedEffects;
+            state.mSpells.insert(std::make_pair(it->first->mId, params));
+        }
 
         state.mSelectedSpell = mSelectedSpell;
 
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index a46988c4c5..0e72cd1310 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <string>
+#include <set>
 
 #include <components/misc/stringops.hpp>
 
@@ -32,8 +33,12 @@ namespace MWMechanics
         public:
 
             typedef const ESM::Spell* SpellKey;
+            struct SpellParams {
+                std::map<int, float> mEffectRands; // <effect index, normalised random magnitude>
+                std::set<int> mPurgedEffects; // indices of purged effects
+            };
 
-            typedef std::map<SpellKey, std::map<int, float> > TContainer; // ID, <effect index, normalised random magnitude>
+            typedef std::map<SpellKey, SpellParams> TContainer;
             typedef TContainer::const_iterator TIterator;
 
             struct CorprusStats
@@ -67,6 +72,9 @@ namespace MWMechanics
             static bool hasCorprusEffect(const ESM::Spell *spell);
             const std::map<SpellKey, CorprusStats> & getCorprusSpells() const;
 
+            void purgeEffect(int effectId);
+            void purgeEffect(int effectId, const std::string & sourceId);
+
             bool canUsePower (const ESM::Spell* spell) const;
             void usePower (const ESM::Spell* spell);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 313fe73b1e..cb31d6e0d6 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2687,6 +2687,7 @@ namespace MWWorld
 
     void World::breakInvisibility(const Ptr &actor)
     {
+        actor.getClass().getCreatureStats(actor).getSpells().purgeEffect(ESM::MagicEffect::Invisibility);
         actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Invisibility);
         if (actor.getClass().hasInventoryStore(actor))
             actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Invisibility);
diff --git a/components/esm/spellstate.cpp b/components/esm/spellstate.cpp
index 8845842e9f..a21078e105 100644
--- a/components/esm/spellstate.cpp
+++ b/components/esm/spellstate.cpp
@@ -12,7 +12,7 @@ namespace ESM
         {
             std::string id = esm.getHString();
 
-            std::map<int, float> random;
+            SpellParams state;
             while (esm.isNextSub("INDX"))
             {
                 int index;
@@ -21,10 +21,16 @@ namespace ESM
                 float magnitude;
                 esm.getHNT(magnitude, "RAND");
 
-                random[index] = magnitude;
+                state.mEffectRands[index] = magnitude;
             }
 
-            mSpells[id] = random;
+            while (esm.isNextSub("PURG")) {
+                int index;
+                esm.getHT(index);
+                state.mPurgedEffects.insert(index);
+            }
+
+            mSpells[id] = state;
         }
 
         while (esm.isNextSub("PERM"))
@@ -73,12 +79,16 @@ namespace ESM
         {
             esm.writeHNString("SPEL", it->first);
 
-            const std::map<int, float>& random = it->second;
+            const std::map<int, float>& random = it->second.mEffectRands;
             for (std::map<int, float>::const_iterator rIt = random.begin(); rIt != random.end(); ++rIt)
             {
                 esm.writeHNT("INDX", rIt->first);
                 esm.writeHNT("RAND", rIt->second);
             }
+
+            const std::set<int>& purges = it->second.mPurgedEffects;
+            for (std::set<int>::const_iterator pIt = purges.begin(); pIt != purges.end(); ++pIt)
+                esm.writeHNT("PURG", *pIt);
         }
 
         for (std::map<std::string, std::vector<PermanentSpellEffectInfo> >::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
diff --git a/components/esm/spellstate.hpp b/components/esm/spellstate.hpp
index 503c3aea9f..ec613afabe 100644
--- a/components/esm/spellstate.hpp
+++ b/components/esm/spellstate.hpp
@@ -4,6 +4,7 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <set>
 
 #include "defs.hpp"
 
@@ -28,7 +29,11 @@ namespace ESM
             float mMagnitude;
         };
 
-        typedef std::map<std::string, std::map<int, float> > TContainer;
+        struct SpellParams {
+            std::map<int, float> mEffectRands;
+            std::set<int> mPurgedEffects;
+        };
+        typedef std::map<std::string, SpellParams> TContainer;
         TContainer mSpells;
 
         std::map<std::string, std::vector<PermanentSpellEffectInfo> > mPermanentSpellEffects;

From 700dde116e0563ba5aa11f83654e05890496b1b8 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sat, 2 Jul 2016 05:17:24 +0200
Subject: [PATCH 755/765] Show remnant corprus effects in magic window

---
 apps/openmw/mwmechanics/spells.cpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index b4bf7ca6f4..118d3c5519 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -249,6 +249,10 @@ namespace MWMechanics
 
     void Spells::visitEffectSources(EffectSourceVisitor &visitor) const
     {
+        // needed to combine effects from mSpells and mPermanentSpellEffects,
+        // while still grouping them by their source spell
+        std::map<SpellKey, MagicEffects> combinedEffects;
+
         for (TIterator it = begin(); it != end(); ++it)
         {
             const ESM::Spell* spell = it->first;
@@ -272,7 +276,24 @@ namespace MWMechanics
                     random = it->second.mEffectRands.at(i);
 
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
-                visitor.visit(MWMechanics::EffectKey(*effectIt), spell->mName, spell->mId, -1, magnitude);
+                combinedEffects[spell].add(MWMechanics::EffectKey(*effectIt), magnitude);
+            }
+        }
+
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin();
+             it != mPermanentSpellEffects.end(); ++it)
+        {
+            combinedEffects[it->first] += it->second;
+        }
+
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = combinedEffects.begin();
+             it != combinedEffects.end(); ++it)
+        {
+            const ESM::Spell * spell = it->first;
+            for (MagicEffects::Collection::const_iterator effectIt = it->second.begin();
+                 effectIt != it->second.end(); ++effectIt)
+            {
+                visitor.visit(effectIt->first, spell->mName, spell->mId, -1, effectIt->second.getMagnitude());
             }
         }
     }

From c8b61cb2349b0c91d7b90a63626876c884f59a46 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Sat, 2 Jul 2016 12:50:00 +0200
Subject: [PATCH 756/765] Cache magic effects in MWMechanics::Spells

---
 apps/openmw/mwmechanics/spells.cpp | 147 +++++++++++++++--------------
 apps/openmw/mwmechanics/spells.hpp |   7 +-
 2 files changed, 84 insertions(+), 70 deletions(-)

diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 118d3c5519..ff397f69d8 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -15,6 +15,11 @@
 
 namespace MWMechanics
 {
+    Spells::Spells()
+        : mSpellsChanged(false)
+    {
+    }
+
     Spells::TIterator Spells::begin() const
     {
         return mSpells.begin();
@@ -30,6 +35,44 @@ namespace MWMechanics
         return MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(id);
     }
 
+    void Spells::rebuildEffects() const
+    {
+        mEffects = MagicEffects();
+        mSourcedEffects.clear();
+
+        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
+        {
+            const ESM::Spell *spell = iter->first;
+
+            if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
+                spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
+            {
+                int i=0;
+                for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
+                {
+                    if (iter->second.mPurgedEffects.find(i) != iter->second.mPurgedEffects.end())
+                        continue; // effect was purged
+
+                    float random = 1.f;
+                    if (iter->second.mEffectRands.find(i) != iter->second.mEffectRands.end())
+                        random = iter->second.mEffectRands.at(i);
+
+                    float magnitude = it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random;
+                    mEffects.add (*it, magnitude);
+                    mSourcedEffects[spell].add(MWMechanics::EffectKey(*it), magnitude);
+
+                    ++i;
+                }
+            }
+        }
+
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
+        {
+            mEffects += it->second;
+            mSourcedEffects[it->first] += it->second;
+        }
+    }
+
     bool Spells::hasSpell(const std::string &spell) const
     {
         return hasSpell(getSpell(spell));
@@ -69,6 +112,7 @@ namespace MWMechanics
             SpellParams params;
             params.mEffectRands = random;
             mSpells.insert (std::make_pair (spell, params));
+            mSpellsChanged = true;
         }
     }
 
@@ -104,7 +148,10 @@ namespace MWMechanics
         }
 
         if (iter!=mSpells.end())
+        {
             mSpells.erase (iter);
+            mSpellsChanged = true;
+        }
 
         if (spellId==mSelectedSpell)
             mSelectedSpell.clear();
@@ -112,44 +159,17 @@ namespace MWMechanics
 
     MagicEffects Spells::getMagicEffects() const
     {
-        // TODO: These are recalculated every frame, no need to do that
-
-        MagicEffects effects;
-
-        for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
-        {
-            const ESM::Spell *spell = iter->first;
-
-            if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
-                spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
-            {
-                int i=0;
-                for (std::vector<ESM::ENAMstruct>::const_iterator it = spell->mEffects.mList.begin(); it != spell->mEffects.mList.end(); ++it)
-                {
-                    if (iter->second.mPurgedEffects.find(i) != iter->second.mPurgedEffects.end())
-                        continue; // effect was purged
-
-                    float random = 1.f;
-                    if (iter->second.mEffectRands.find(i) != iter->second.mEffectRands.end())
-                        random = iter->second.mEffectRands.at(i);
-
-                    effects.add (*it, it->mMagnMin + (it->mMagnMax - it->mMagnMin) * random);
-                    ++i;
-                }
-            }
+        if (mSpellsChanged) {
+            rebuildEffects();
+            mSpellsChanged = false;
         }
-
-        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin(); it != mPermanentSpellEffects.end(); ++it)
-        {
-            effects += it->second;
-        }
-
-        return effects;
+        return mEffects;
     }
 
     void Spells::clear()
     {
         mSpells.clear();
+        mSpellsChanged = true;
     }
 
     void Spells::setSelectedSpell (const std::string& spellId)
@@ -205,7 +225,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Disease)
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -217,7 +240,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Blight && !hasCorprusEffect(spell))
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -229,7 +255,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (hasCorprusEffect(spell))
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -241,7 +270,10 @@ namespace MWMechanics
         {
             const ESM::Spell *spell = iter->first;
             if (spell->mData.mType == ESM::Spell::ST_Curse)
+            {
                 mSpells.erase(iter++);
+                mSpellsChanged = true;
+            }
             else
                 ++iter;
         }
@@ -249,45 +281,13 @@ namespace MWMechanics
 
     void Spells::visitEffectSources(EffectSourceVisitor &visitor) const
     {
-        // needed to combine effects from mSpells and mPermanentSpellEffects,
-        // while still grouping them by their source spell
-        std::map<SpellKey, MagicEffects> combinedEffects;
-
-        for (TIterator it = begin(); it != end(); ++it)
-        {
-            const ESM::Spell* spell = it->first;
-
-            // these are the spell types that are permanently in effect
-            if (!(spell->mData.mType == ESM::Spell::ST_Ability)
-                    && !(spell->mData.mType == ESM::Spell::ST_Disease)
-                    && !(spell->mData.mType == ESM::Spell::ST_Curse)
-                    && !(spell->mData.mType == ESM::Spell::ST_Blight))
-                continue;
-            const ESM::EffectList& list = spell->mEffects;
-            int i=0;
-            for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = list.mList.begin();
-                 effectIt != list.mList.end(); ++effectIt, ++i)
-            {
-                if (it->second.mPurgedEffects.find(i) != it->second.mPurgedEffects.end())
-                    continue; // effect was purged
-
-                float random = 1.f;
-                if (it->second.mEffectRands.find(i) != it->second.mEffectRands.end())
-                    random = it->second.mEffectRands.at(i);
-
-                float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
-                combinedEffects[spell].add(MWMechanics::EffectKey(*effectIt), magnitude);
-            }
+        if (mSpellsChanged) {
+            rebuildEffects();
+            mSpellsChanged = false;
         }
 
-        for (std::map<SpellKey, MagicEffects>::const_iterator it = mPermanentSpellEffects.begin();
-             it != mPermanentSpellEffects.end(); ++it)
-        {
-            combinedEffects[it->first] += it->second;
-        }
-
-        for (std::map<SpellKey, MagicEffects>::const_iterator it = combinedEffects.begin();
-             it != combinedEffects.end(); ++it)
+        for (std::map<SpellKey, MagicEffects>::const_iterator it = mSourcedEffects.begin();
+             it != mSourcedEffects.end(); ++it)
         {
             const ESM::Spell * spell = it->first;
             for (MagicEffects::Collection::const_iterator effectIt = it->second.begin();
@@ -318,6 +318,7 @@ namespace MWMechanics
                 float magnitude = effectIt->mMagnMin + (effectIt->mMagnMax - effectIt->mMagnMin) * random;
                 magnitude *= std::max(1, mCorprusSpells[spell].mWorsenings);
                 mPermanentSpellEffects[spell].add(MWMechanics::EffectKey(*effectIt), MWMechanics::EffectParam(magnitude));
+                mSpellsChanged = true;
             }
         }
     }
@@ -347,7 +348,10 @@ namespace MWMechanics
             for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
             {
                 if (effectIt->mEffectID == effectId)
+                {
                     spellIt->second.mPurgedEffects.insert(i);
+                    mSpellsChanged = true;
+                }
                 ++i;
             }
         }
@@ -364,7 +368,10 @@ namespace MWMechanics
         for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = spellIt->first->mEffects.mList.begin(); effectIt != spellIt->first->mEffects.mList.end(); ++effectIt)
         {
             if (effectIt->mEffectID == effectId)
+            {
                 spellIt->second.mPurgedEffects.insert(i);
+                mSpellsChanged = true;
+            }
             ++i;
         }
     }
@@ -430,6 +437,8 @@ namespace MWMechanics
             mCorprusSpells[spell].mWorsenings = state.mCorprusSpells.at(it->first).mWorsenings;
             mCorprusSpells[spell].mNextWorsening = MWWorld::TimeStamp(state.mCorprusSpells.at(it->first).mNextWorsening);
         }
+
+        mSpellsChanged = true;
     }
 
     void Spells::writeState(ESM::SpellState &state) const
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 0e72cd1310..c1705b38a1 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -50,7 +50,6 @@ namespace MWMechanics
             };
 
         private:
-
             TContainer mSpells;
 
             // spell-tied effects that will be applied even after removing the spell (currently used to keep positive effects when corprus is removed)
@@ -63,10 +62,16 @@ namespace MWMechanics
 
             std::map<SpellKey, CorprusStats> mCorprusSpells;
 
+            mutable bool mSpellsChanged;
+            mutable MagicEffects mEffects;
+            mutable std::map<SpellKey, MagicEffects> mSourcedEffects;
+            void rebuildEffects() const;
+
             /// Get spell from ID, throws exception if not found
             const ESM::Spell* getSpell(const std::string& id) const;
 
         public:
+            Spells();
 
             void worsenCorprus(const ESM::Spell* spell);
             static bool hasCorprusEffect(const ESM::Spell *spell);

From 6fa95e72c5a458008f59cd2e88e5e9e21f598690 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 19:26:11 +0200
Subject: [PATCH 757/765] Pass the traversal number instead of the node visitor

---
 components/sceneutil/riggeometry.cpp | 4 ++--
 components/sceneutil/skeleton.cpp    | 6 +++---
 components/sceneutil/skeleton.hpp    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index e0746801cd..2dea6781e5 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -241,7 +241,7 @@ void RigGeometry::update(osg::NodeVisitor* nv)
         return;
     mLastFrameNumber = nv->getTraversalNumber();
 
-    mSkeleton->updateBoneMatrices(nv);
+    mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
     // skinning
     osg::Vec3Array* positionSrc = static_cast<osg::Vec3Array*>(mSourceGeometry->getVertexArray());
@@ -301,7 +301,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
         return;
     mBoundsFirstFrame = false;
 
-    mSkeleton->updateBoneMatrices(nv);
+    mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
     updateGeomToSkelMatrix(nv);
 
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index f311de2469..08ac72e91e 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -108,12 +108,12 @@ Bone* Skeleton::getBone(const std::string &name)
     return bone;
 }
 
-void Skeleton::updateBoneMatrices(osg::NodeVisitor* nv)
+void Skeleton::updateBoneMatrices(unsigned int traversalNumber)
 {
-    if (nv->getTraversalNumber() != mLastFrameNumber)
+    if (traversalNumber != mLastFrameNumber)
         mNeedToUpdateBoneMatrices = true;
 
-    mLastFrameNumber = nv->getTraversalNumber();
+    mLastFrameNumber = traversalNumber;
 
     if (mLastFrameNumber % 2 == 0)
         mTraversedEvenFrame = true;
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 9ca1dd49da..835ab6617a 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -45,7 +45,7 @@ namespace SceneUtil
         Bone* getBone(const std::string& name);
 
         /// Request an update of bone matrices. May be a no-op if already updated in this frame.
-        void updateBoneMatrices(osg::NodeVisitor* nv);
+        void updateBoneMatrices(unsigned int traversalNumber);
 
         /// Set the skinning active flag. Inactive skeletons will not have their child rigs updated.
         /// You should set this flag to false if you know that bones are not currently moving.

From d5f497c47de5dc214649f38824a9e48b5723f256 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 19:27:19 +0200
Subject: [PATCH 758/765] Pass the node path instead of the node visitor

---
 components/sceneutil/riggeometry.cpp | 6 +++---
 components/sceneutil/riggeometry.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp
index 2dea6781e5..3af5176f4f 100644
--- a/components/sceneutil/riggeometry.cpp
+++ b/components/sceneutil/riggeometry.cpp
@@ -303,7 +303,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
 
     mSkeleton->updateBoneMatrices(nv->getTraversalNumber());
 
-    updateGeomToSkelMatrix(nv);
+    updateGeomToSkelMatrix(nv->getNodePath());
 
     osg::BoundingBox box;
     for (BoneSphereMap::const_iterator it = mBoneSphereMap.begin(); it != mBoneSphereMap.end(); ++it)
@@ -321,11 +321,11 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv)
         getParent(i)->dirtyBound();
 }
 
-void RigGeometry::updateGeomToSkelMatrix(osg::NodeVisitor *nv)
+void RigGeometry::updateGeomToSkelMatrix(const osg::NodePath& nodePath)
 {
     mSkelToGeomPath.clear();
     bool foundSkel = false;
-    for (osg::NodePath::const_iterator it = nv->getNodePath().begin(); it != nv->getNodePath().end(); ++it)
+    for (osg::NodePath::const_iterator it = nodePath.begin(); it != nodePath.end(); ++it)
     {
         if (!foundSkel)
         {
diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp
index fbd22427bd..250c86b0e4 100644
--- a/components/sceneutil/riggeometry.hpp
+++ b/components/sceneutil/riggeometry.hpp
@@ -80,7 +80,7 @@ namespace SceneUtil
 
         bool initFromParentSkeleton(osg::NodeVisitor* nv);
 
-        void updateGeomToSkelMatrix(osg::NodeVisitor* nv);
+        void updateGeomToSkelMatrix(const osg::NodePath& nodePath);
     };
 
 }

From 96757a3b7c8842865a9d2426947f56fb0d682b0a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 19:43:08 +0200
Subject: [PATCH 759/765] Fix non-predefined cells not being saved correctly

---
 apps/openmw/mwworld/cells.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 75d908db83..47b2af0533 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -105,6 +105,10 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
         {
             // Cell isn't predefined. Make one on the fly.
             ESM::Cell record;
+            record.mCellId.mWorldspace = "sys::default";
+            record.mCellId.mPaged = true;
+            record.mCellId.mIndex.mX = x;
+            record.mCellId.mIndex.mY = y;
 
             record.mData.mFlags = ESM::Cell::HasWater;
             record.mData.mX = x;

From b9b73d7b121567d5f8c59c2dd26e83f785c5749f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 19:48:11 +0200
Subject: [PATCH 760/765] Replace "sys::default" with
 ESM::CellId::sDefaultWorldspace

---
 apps/opencs/model/world/idtable.cpp     | 4 +++-
 apps/opencs/view/world/regionmap.cpp    | 2 +-
 apps/opencs/view/world/scenesubview.cpp | 4 ++--
 apps/openmw/mwgui/mapwindow.cpp         | 6 +++---
 apps/openmw/mwworld/cells.cpp           | 2 +-
 apps/openmw/mwworld/worldimp.cpp        | 2 +-
 components/esm/cellid.cpp               | 2 ++
 components/esm/cellid.hpp               | 2 ++
 components/esm/loadcell.cpp             | 2 +-
 9 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index cebd0ebdbf..9dbe389984 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -2,6 +2,8 @@
 
 #include <stdexcept>
 
+#include <components/esm/cellid.hpp>
+
 #include "collectionbase.hpp"
 #include "columnbase.hpp"
 
@@ -259,7 +261,7 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
         return std::make_pair (UniversalId::Type_None, "");
 
     if (id[0]=='#')
-        id = "sys::default";
+        id = ESM::CellId::sDefaultWorldspace;
 
     return std::make_pair (UniversalId (UniversalId::Type_Scene, id), hint);
 }
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 4de470dbc2..31e5d94ca8 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -303,7 +303,7 @@ void CSVWorld::RegionMap::view()
         hint << cellId;
     }
 
-    emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Scene, "sys::default"),
+    emit editRequest (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace),
         hint.str());
 }
 
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 6240293534..c84818b373 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -38,7 +38,7 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     CSVRender::WorldspaceWidget* worldspaceWidget = NULL;
     widgetType whatWidget;
 
-    if (id.getId()=="sys::default")
+    if (id.getId()==ESM::CellId::sDefaultWorldspace)
     {
         whatWidget = widget_Paged;
 
@@ -160,7 +160,7 @@ void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::UniversalId&
 
 void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection& selection)
 {
-    setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, "sys::default"));
+    setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, ESM::CellId::sDefaultWorldspace));
     int size = selection.getSize();
 
     std::ostringstream stream;
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 1b8d5ab43e..7c52f09cbc 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -322,7 +322,7 @@ namespace MWGui
             {
                 ESM::CellId cellId;
                 cellId.mPaged = !mInterior;
-                cellId.mWorldspace = (mInterior ? mPrefix : "sys::default");
+                cellId.mWorldspace = (mInterior ? mPrefix : ESM::CellId::sDefaultWorldspace);
                 cellId.mIndex.mX = mCurX+dX;
                 cellId.mIndex.mY = mCurY+dY;
 
@@ -738,7 +738,7 @@ namespace MWGui
             mEditingMarker.mCell.mWorldspace = LocalMapBase::mPrefix;
         else
         {
-            mEditingMarker.mCell.mWorldspace = "sys::default";
+            mEditingMarker.mCell.mWorldspace = ESM::CellId::sDefaultWorldspace;
             mEditingMarker.mCell.mIndex.mX = x;
             mEditingMarker.mCell.mIndex.mY = y;
         }
@@ -848,7 +848,7 @@ namespace MWGui
         ESM::CellId cellId;
         cellId.mIndex.mX = x;
         cellId.mIndex.mY = y;
-        cellId.mWorldspace = "sys::default";
+        cellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
         cellId.mPaged = true;
         CustomMarkerCollection::RangeType markers = mCustomMarkers.getMarkers(cellId);
         std::vector<std::string> destNotes;
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 47b2af0533..384d7e1242 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -105,7 +105,7 @@ MWWorld::CellStore *MWWorld::Cells::getExterior (int x, int y)
         {
             // Cell isn't predefined. Make one on the fly.
             ESM::Cell record;
-            record.mCellId.mWorldspace = "sys::default";
+            record.mCellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
             record.mCellId.mPaged = true;
             record.mCellId.mIndex.mX = x;
             record.mCellId.mIndex.mY = y;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index cb31d6e0d6..ec581c3e3b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -972,7 +972,7 @@ namespace MWWorld
     {
         mPhysics->clearQueuedMovement();
 
-        if (changeEvent && mCurrentWorldSpace != "sys::default") // FIXME
+        if (changeEvent && mCurrentWorldSpace != ESM::CellId::sDefaultWorldspace)
         {
             // changed worldspace
             mProjectileManager->clear();
diff --git a/components/esm/cellid.cpp b/components/esm/cellid.cpp
index f77e2eb551..ad91d30e04 100644
--- a/components/esm/cellid.cpp
+++ b/components/esm/cellid.cpp
@@ -3,6 +3,8 @@
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
+const std::string ESM::CellId::sDefaultWorldspace = "sys::default";
+
 void ESM::CellId::load (ESMReader &esm)
 {
     mWorldspace = esm.getHNString ("SPAC");
diff --git a/components/esm/cellid.hpp b/components/esm/cellid.hpp
index 56d5a674ea..a28b717945 100644
--- a/components/esm/cellid.hpp
+++ b/components/esm/cellid.hpp
@@ -20,6 +20,8 @@ namespace ESM
         CellIndex mIndex;
         bool mPaged;
 
+        static const std::string sDefaultWorldspace;
+
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
     };
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 3a8a11779e..7c4349d311 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -96,7 +96,7 @@ namespace ESM
 
         if (mCellId.mPaged)
         {
-            mCellId.mWorldspace = "sys::default";
+            mCellId.mWorldspace = ESM::CellId::sDefaultWorldspace;
             mCellId.mIndex.mX = mData.mX;
             mCellId.mIndex.mY = mData.mY;
         }

From 8f62ea2e807935939ea60aaee512b1b3f9ee8219 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 20:19:55 +0200
Subject: [PATCH 761/765] Fix for "RigGeometry rendering with no skeleton"
 errors

---
 apps/openmw/mwrender/creatureanimation.cpp | 3 +++
 apps/openmw/mwrender/npcanimation.cpp      | 3 +++
 components/sceneutil/skeleton.cpp          | 6 ++++++
 components/sceneutil/skeleton.hpp          | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index d4e48e1fd2..669d0d8a16 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -7,6 +7,7 @@
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/skeleton.hpp>
 
 #include "../mwbase/world.hpp"
 
@@ -109,6 +110,8 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
     osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename);
     mResourceSystem->getSceneManager()->notifyAttached(attached);
+    if (mSkeleton)
+        mSkeleton->markDirty();
 
     scene.reset(new PartHolder(attached));
 
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index e44e2fb302..b1f506e116 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -15,6 +15,7 @@
 #include <components/resource/scenemanager.hpp>
 #include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/visitor.hpp>
+#include <components/sceneutil/skeleton.hpp>
 
 #include <components/nifosg/nifloader.hpp> // TextKeyMapHolder
 
@@ -666,6 +667,8 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
 {
     osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
     osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename);
+    if (mSkeleton)
+        mSkeleton->markDirty();
     mResourceSystem->getSceneManager()->notifyAttached(attached);
     if (enchantedGlow)
         addGlow(attached, *glowColor);
diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp
index 08ac72e91e..390a8e8235 100644
--- a/components/sceneutil/skeleton.cpp
+++ b/components/sceneutil/skeleton.cpp
@@ -144,6 +144,12 @@ bool Skeleton::getActive() const
     return mActive;
 }
 
+void Skeleton::markDirty()
+{
+    mTraversedEvenFrame = false;
+    mTraversedOddFrame = false;
+}
+
 void Skeleton::traverse(osg::NodeVisitor& nv)
 {
     if (!getActive() && nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR
diff --git a/components/sceneutil/skeleton.hpp b/components/sceneutil/skeleton.hpp
index 835ab6617a..764b7f6459 100644
--- a/components/sceneutil/skeleton.hpp
+++ b/components/sceneutil/skeleton.hpp
@@ -53,6 +53,9 @@ namespace SceneUtil
 
         bool getActive() const;
 
+        /// If a new RigGeometry is added after the Skeleton has already been rendered, you must call markDirty().
+        void markDirty();
+
         void traverse(osg::NodeVisitor& nv);
 
     private:

From d96e49c04af7d17028ca3be2d309e16668642f8e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 2 Jul 2016 20:33:37 +0200
Subject: [PATCH 762/765] Do not set change flag when running forEach on an
 empty cell

---
 apps/openmw/mwworld/cellstore.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index d753c97457..36cc7f5eb8 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -258,6 +258,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 for (unsigned int i=0; i<mMergedRefs.size(); ++i)
@@ -305,6 +308,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 CellRefList<T>& list = get<T>();

From d4e29e3e0cb71db783c7878a2fec3d4db5547757 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Wed, 6 Jul 2016 00:11:58 +0200
Subject: [PATCH 763/765] Clear projectiles on non-incremental time advances

---
 apps/openmw/mwworld/worldimp.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ec581c3e3b..1706f7681a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -804,6 +804,9 @@ namespace MWWorld
 
         mWeatherManager->advanceTime (hours, incremental);
 
+        if (!incremental)
+            mProjectileManager->clear();
+
         hours += mGameHour->getFloat();
 
         setHour (hours);

From 41484432b485a608989ca9db931b06a1a5fe5ec4 Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Wed, 6 Jul 2016 00:15:25 +0200
Subject: [PATCH 764/765] Player's death now interrupts waiting/sleeping

---
 apps/openmw/mwgui/waitdialog.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index e8ac63bf6b..bb7d7460f5 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -191,6 +191,10 @@ namespace MWGui
         mProgressBar.setProgress(cur, total);
         MWBase::Environment::get().getWorld()->advanceTime(1);
         MWBase::Environment::get().getMechanicsManager()->rest(mSleeping);
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        if (player.getClass().getCreatureStats(player).isDead())
+            stopWaiting();
     }
 
     void WaitDialog::onWaitingInterrupted()

From 80f2ae0ca7258bef6742d468aae7fa0828195b2e Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Wed, 6 Jul 2016 00:20:23 +0200
Subject: [PATCH 765/765] Apply magic effects while waiting/sleeping

---
 apps/openmw/mwgui/jailscreen.cpp              |  2 +-
 apps/openmw/mwgui/trainingwindow.cpp          |  4 +-
 apps/openmw/mwgui/waitdialog.cpp              |  2 +-
 apps/openmw/mwmechanics/actors.cpp            | 56 ++++++++++++++++++-
 apps/openmw/mwmechanics/actors.hpp            |  4 +-
 .../mwmechanics/mechanicsmanagerimp.cpp       |  3 +-
 6 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwgui/jailscreen.cpp b/apps/openmw/mwgui/jailscreen.cpp
index 7eaf5eb303..211e0c5f91 100644
--- a/apps/openmw/mwgui/jailscreen.cpp
+++ b/apps/openmw/mwgui/jailscreen.cpp
@@ -79,9 +79,9 @@ namespace MWGui
 
         MWWorld::Ptr player = MWMechanics::getPlayer();
 
-        MWBase::Environment::get().getWorld()->advanceTime(mDays * 24);
         for (int i=0; i<mDays*24; ++i)
             MWBase::Environment::get().getMechanicsManager()->rest(true);
+        MWBase::Environment::get().getWorld()->advanceTime(mDays * 24);
 
         std::set<int> skills;
         for (int day=0; day<mDays; ++day)
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index 30ad27e46e..82218fef12 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -176,9 +176,9 @@ namespace MWGui
         MWBase::Environment::get().getDialogueManager()->goodbyeSelected();
 
         // advance time
+        MWBase::Environment::get().getMechanicsManager()->rest(false);
+        MWBase::Environment::get().getMechanicsManager()->rest(false);
         MWBase::Environment::get().getWorld ()->advanceTime (2);
-        MWBase::Environment::get().getMechanicsManager()->rest(false);
-        MWBase::Environment::get().getMechanicsManager()->rest(false);
 
         mProgressBar.setVisible(true);
         mProgressBar.setProgress(0, 2);
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index bb7d7460f5..8685475a4e 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -189,8 +189,8 @@ namespace MWGui
     void WaitDialog::onWaitingProgressChanged(int cur, int total)
     {
         mProgressBar.setProgress(cur, total);
-        MWBase::Environment::get().getWorld()->advanceTime(1);
         MWBase::Environment::get().getMechanicsManager()->rest(mSleeping);
+        MWBase::Environment::get().getWorld()->advanceTime(1);
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         if (player.getClass().getCreatureStats(player).isDead())
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 9426bda4b7..d12dde4244 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -493,6 +493,31 @@ namespace MWMechanics
         stats.setFatigue (fatigue);
     }
 
+    class ExpiryVisitor : public EffectSourceVisitor
+    {
+        private:
+            MWWorld::Ptr mActor;
+            float mDuration;
+
+        public:
+            ExpiryVisitor(const MWWorld::Ptr& actor, float duration)
+                : mActor(actor), mDuration(duration)
+            {
+            }
+
+            virtual void visit (MWMechanics::EffectKey key,
+                                const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
+                                float magnitude, float remainingTime = -1, float /*totalTime*/ = -1)
+            {
+                if (magnitude > 0 && remainingTime > 0 && remainingTime < mDuration)
+                {
+                    CreatureStats& creatureStats = mActor.getClass().getCreatureStats(mActor);
+                    effectTick(creatureStats, mActor, key, magnitude * remainingTime);
+                    creatureStats.getMagicEffects().add(key, -magnitude);
+                }
+            }
+    };
+
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
     {
         CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
@@ -502,6 +527,11 @@ namespace MWMechanics
 
         if (duration > 0)
         {
+            // apply correct magnitude for tickable effects that have just expired,
+            // in case duration > remaining time of effect
+            ExpiryVisitor visitor(ptr, duration);
+            creatureStats.getActiveSpells().visitEffectSources(visitor);
+
             for (MagicEffects::Collection::const_iterator it = effects.begin(); it != effects.end(); ++it)
             {
                 // tickable effects (i.e. effects having a lasting impact after expiry)
@@ -1298,10 +1328,32 @@ namespace MWMechanics
         }
     }
 
-    void Actors::restoreDynamicStats(bool sleep)
+    void Actors::rest(bool sleep)
     {
-        for(PtrActorMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+        float duration = 3600.f / MWBase::Environment::get().getWorld()->getTimeScaleFactor();
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+
+        for(PtrActorMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
+        {
+            if (iter->first.getClass().getCreatureStats(iter->first).isDead())
+                continue;
+
             restoreDynamicStats(iter->first, sleep);
+
+            if ((!iter->first.getRefData().getBaseNode()) ||
+                    (player.getRefData().getPosition().asVec3() - iter->first.getRefData().getPosition().asVec3()).length2() > sqrAiProcessingDistance)
+                continue;
+
+            adjustMagicEffects (iter->first);
+            if (iter->first.getClass().getCreatureStats(iter->first).needToRecalcDynamicStats())
+                calculateDynamicStats (iter->first);
+
+            calculateCreatureStatModifiers (iter->first, duration);
+            if (iter->first.getClass().isNpc())
+                calculateNpcStatModifiers(iter->first, duration);
+        }
+
+        fastForwardAi();
     }
 
     int Actors::getHoursToRest(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 1db676b2a6..0dc684c564 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -93,8 +93,8 @@ namespace MWMechanics
             void updateHeadTracking(const MWWorld::Ptr& actor, const MWWorld::Ptr& targetActor,
                                             MWWorld::Ptr& headTrackTarget, float& sqrHeadTrackDistance);
 
-            void restoreDynamicStats(bool sleep);
-            ///< If the player is sleeping, this should be called every hour.
+            void rest(bool sleep);
+            ///< Update actors while the player is waiting or sleeping. This should be called every hour.
 
             void restoreDynamicStats(const MWWorld::Ptr& actor, bool sleep);
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 8f920dd259..278a5749e2 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -499,8 +499,7 @@ namespace MWMechanics
 
     void MechanicsManager::rest(bool sleep)
     {
-        mActors.restoreDynamicStats (sleep);
-        mActors.fastForwardAi();
+        mActors.rest(sleep);
     }
 
     int MechanicsManager::getHoursToRest() const