Merge remote-tracking branch 'scrawl/master'

apps/openmw/engine.cpp

@@ -341,8 +341,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     // This has to be added BEFORE MyGUI is initialized, as it needs
     // to find core.xml here.
 
-    //addResourcesDirectory(mResDir);
-
     addResourcesDirectory(mCfgMgr.getCachePath ().string());
 
     addResourcesDirectory(mResDir / "mygui");
@@ -369,7 +367,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     // Create input and UI first to set up a bootstrapping environment for
     // showing a loading screen and keeping the window responsive while doing so
 
-    std::string keybinderUser = (mCfgMgr.getUserConfigPath() / "input_v1.xml").string();
+    std::string keybinderUser = (mCfgMgr.getUserConfigPath() / "input_v2.xml").string();
     bool keybinderUserExists = boost::filesystem::exists(keybinderUser);
     MWInput::InputManager* input = new MWInput::InputManager (*mOgre, *this, keybinderUser, keybinderUserExists, mGrab);
     mEnvironment.setInputManager (input);

apps/openmw/mwclass/creature.cpp

@@ -329,7 +329,8 @@ namespace MWClass
     {
         // NOTE: 'object' and/or 'attacker' may be empty.
 
-        getCreatureStats(ptr).setAttacked(true);
+        if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
+            getCreatureStats(ptr).setAttacked(true);
 
         // Self defense
         if ((canWalk(ptr) || canFly(ptr) || canSwim(ptr)) // No retaliation for totally static creatures

apps/openmw/mwclass/npc.cpp

@@ -640,10 +640,12 @@ namespace MWClass
 
         bool wasDead = getCreatureStats(ptr).isDead();
 
-        getCreatureStats(ptr).setAttacked(true);
+        if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
+        {
+            getCreatureStats(ptr).setAttacked(true);
 
-        if (!attacker.isEmpty())
             MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
+        }
 
         if(!successful)
         {

apps/openmw/mwclass/weapon.cpp

@@ -378,6 +378,7 @@ namespace MWClass
         newItem.mName=newName;
         newItem.mData.mEnchant=enchCharge;
         newItem.mEnchant=enchId;
+        newItem.mData.mFlags |= ESM::Weapon::Magical;
         const ESM::Weapon *record = MWBase::Environment::get().getWorld()->createRecord (newItem);
         return record->mId;
     }

apps/openmw/mwdialogue/filter.cpp

@@ -249,7 +249,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
             float ratio = mActor.getClass().getCreatureStats (mActor).getHealth().getCurrent() /
                 mActor.getClass().getCreatureStats (mActor).getHealth().getModified();
 
-            return select.selectCompare (ratio);
+            return select.selectCompare (static_cast<int>(ratio*100));
         }
 
         default:

apps/openmw/mwgui/companionwindow.cpp

@@ -148,7 +148,7 @@ void CompanionWindow::onMessageBoxButtonClicked(int button)
     if (button == 0)
     {
         mPtr.getRefData().getLocals().setVarByInt(mPtr.getClass().getScript(mPtr),
-            "minimumProfit", mPtr.getClass().getNpcStats(mPtr).getProfit());
+            "minimumprofit", mPtr.getClass().getNpcStats(mPtr).getProfit());
 
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
         MWBase::Environment::get().getDialogueManager()->startDialogue (mPtr);

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -503,7 +503,7 @@ namespace MWInput
         // (which is somewhat reasonable, and hopefully true for all SDL platforms)
         OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(arg.keysym.sym);
         if (mInputBinder->getKeyBinding(mInputBinder->getControl(A_Console), ICS::Control::INCREASE)
-                == arg.keysym.sym
+                == arg.keysym.scancode
                 && MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_Console)
             SDL_StopTextInput();
 
@@ -554,9 +554,10 @@ namespace MWInput
         }
 
         setPlayerControlsEnabled(!guiMode);
-        mInputBinder->mousePressed (arg, id);
-
 
+        // Don't trigger any mouse bindings while in settings menu, otherwise rebinding controls becomes impossible
+        if (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_Settings)
+            mInputBinder->mousePressed (arg, id);
     }
 
     void InputManager::mouseReleased( const SDL_MouseButtonEvent &arg, Uint8 id )
@@ -869,41 +870,41 @@ namespace MWInput
     {
         // using hardcoded key defaults is inevitable, if we want the configuration files to stay valid
         // across different versions of OpenMW (in the case where another input action is added)
-        std::map<int, int> defaultKeyBindings;
+        std::map<int, SDL_Scancode> defaultKeyBindings;
 
         //Gets the Keyvalue from the Scancode; gives the button in the same place reguardless of keyboard format
-        defaultKeyBindings[A_Activate] = SDL_GetKeyFromScancode(SDL_SCANCODE_SPACE);
+        defaultKeyBindings[A_Activate] = SDL_SCANCODE_SPACE;
-        defaultKeyBindings[A_MoveBackward] = SDL_GetKeyFromScancode(SDL_SCANCODE_S);
+        defaultKeyBindings[A_MoveBackward] = SDL_SCANCODE_S;
-        defaultKeyBindings[A_MoveForward] = SDL_GetKeyFromScancode(SDL_SCANCODE_W);
+        defaultKeyBindings[A_MoveForward] = SDL_SCANCODE_W;
-        defaultKeyBindings[A_MoveLeft] = SDL_GetKeyFromScancode(SDL_SCANCODE_A);
+        defaultKeyBindings[A_MoveLeft] = SDL_SCANCODE_A;
-        defaultKeyBindings[A_MoveRight] = SDL_GetKeyFromScancode(SDL_SCANCODE_D);
+        defaultKeyBindings[A_MoveRight] = SDL_SCANCODE_D;
-        defaultKeyBindings[A_ToggleWeapon] = SDL_GetKeyFromScancode(SDL_SCANCODE_F);
+        defaultKeyBindings[A_ToggleWeapon] = SDL_SCANCODE_F;
-        defaultKeyBindings[A_ToggleSpell] = SDL_GetKeyFromScancode(SDL_SCANCODE_R);
+        defaultKeyBindings[A_ToggleSpell] = SDL_SCANCODE_R;
-        defaultKeyBindings[A_QuickKeysMenu] = SDL_GetKeyFromScancode(SDL_SCANCODE_F1);
+        defaultKeyBindings[A_QuickKeysMenu] = SDL_SCANCODE_F1;
-        defaultKeyBindings[A_Console] = SDL_GetKeyFromScancode(SDL_SCANCODE_GRAVE);
+        defaultKeyBindings[A_Console] = SDL_SCANCODE_GRAVE;
-        defaultKeyBindings[A_Run] = SDL_GetKeyFromScancode(SDL_SCANCODE_LSHIFT);
+        defaultKeyBindings[A_Run] = SDL_SCANCODE_LSHIFT;
-        defaultKeyBindings[A_Sneak] = SDL_GetKeyFromScancode(SDL_SCANCODE_LCTRL);
+        defaultKeyBindings[A_Sneak] = SDL_SCANCODE_LCTRL;
-        defaultKeyBindings[A_AutoMove] = SDL_GetKeyFromScancode(SDL_SCANCODE_Q);
+        defaultKeyBindings[A_AutoMove] = SDL_SCANCODE_Q;
-        defaultKeyBindings[A_Jump] = SDL_GetKeyFromScancode(SDL_SCANCODE_E);
+        defaultKeyBindings[A_Jump] = SDL_SCANCODE_E;
-        defaultKeyBindings[A_Journal] = SDL_GetKeyFromScancode(SDL_SCANCODE_J);
+        defaultKeyBindings[A_Journal] = SDL_SCANCODE_J;
-        defaultKeyBindings[A_Rest] = SDL_GetKeyFromScancode(SDL_SCANCODE_T);
+        defaultKeyBindings[A_Rest] = SDL_SCANCODE_T;
-        defaultKeyBindings[A_GameMenu] = SDL_GetKeyFromScancode(SDL_SCANCODE_ESCAPE);
+        defaultKeyBindings[A_GameMenu] = SDL_SCANCODE_ESCAPE;
-        defaultKeyBindings[A_TogglePOV] = SDL_GetKeyFromScancode(SDL_SCANCODE_TAB);
+        defaultKeyBindings[A_TogglePOV] = SDL_SCANCODE_TAB;
-        defaultKeyBindings[A_QuickKey1] = SDL_GetKeyFromScancode(SDL_SCANCODE_1);
+        defaultKeyBindings[A_QuickKey1] = SDL_SCANCODE_1;
-        defaultKeyBindings[A_QuickKey2] = SDL_GetKeyFromScancode(SDL_SCANCODE_2);
+        defaultKeyBindings[A_QuickKey2] = SDL_SCANCODE_2;
-        defaultKeyBindings[A_QuickKey3] = SDL_GetKeyFromScancode(SDL_SCANCODE_3);
+        defaultKeyBindings[A_QuickKey3] = SDL_SCANCODE_3;
-        defaultKeyBindings[A_QuickKey4] = SDL_GetKeyFromScancode(SDL_SCANCODE_4);
+        defaultKeyBindings[A_QuickKey4] = SDL_SCANCODE_4;
-        defaultKeyBindings[A_QuickKey5] = SDL_GetKeyFromScancode(SDL_SCANCODE_5);
+        defaultKeyBindings[A_QuickKey5] = SDL_SCANCODE_5;
-        defaultKeyBindings[A_QuickKey6] = SDL_GetKeyFromScancode(SDL_SCANCODE_6);
+        defaultKeyBindings[A_QuickKey6] = SDL_SCANCODE_6;
-        defaultKeyBindings[A_QuickKey7] = SDL_GetKeyFromScancode(SDL_SCANCODE_7);
+        defaultKeyBindings[A_QuickKey7] = SDL_SCANCODE_7;
-        defaultKeyBindings[A_QuickKey8] = SDL_GetKeyFromScancode(SDL_SCANCODE_8);
+        defaultKeyBindings[A_QuickKey8] = SDL_SCANCODE_8;
-        defaultKeyBindings[A_QuickKey9] = SDL_GetKeyFromScancode(SDL_SCANCODE_9);
+        defaultKeyBindings[A_QuickKey9] = SDL_SCANCODE_9;
-        defaultKeyBindings[A_QuickKey10] = SDL_GetKeyFromScancode(SDL_SCANCODE_0);
+        defaultKeyBindings[A_QuickKey10] = SDL_SCANCODE_0;
-        defaultKeyBindings[A_Screenshot] = SDL_GetKeyFromScancode(SDL_SCANCODE_F12);
+        defaultKeyBindings[A_Screenshot] = SDL_SCANCODE_F12;
-        defaultKeyBindings[A_ToggleHUD] = SDL_GetKeyFromScancode(SDL_SCANCODE_F11);
+        defaultKeyBindings[A_ToggleHUD] = SDL_SCANCODE_F11;
-        defaultKeyBindings[A_AlwaysRun] = SDL_GetKeyFromScancode(SDL_SCANCODE_CAPSLOCK);
+        defaultKeyBindings[A_AlwaysRun] = SDL_SCANCODE_CAPSLOCK;
-        defaultKeyBindings[A_QuickSave] = SDL_GetKeyFromScancode(SDL_SCANCODE_F5);
+        defaultKeyBindings[A_QuickSave] = SDL_SCANCODE_F5;
-        defaultKeyBindings[A_QuickLoad] = SDL_GetKeyFromScancode(SDL_SCANCODE_F9);
+        defaultKeyBindings[A_QuickLoad] = SDL_SCANCODE_F9;
 
         std::map<int, int> defaultMouseButtonBindings;
         defaultMouseButtonBindings[A_Inventory] = SDL_BUTTON_RIGHT;
@@ -925,14 +926,14 @@ namespace MWInput
             }
 
             if (!controlExists || force ||
-                    ( mInputBinder->getKeyBinding (control, ICS::Control::INCREASE) == SDLK_UNKNOWN
+                    ( mInputBinder->getKeyBinding (control, ICS::Control::INCREASE) == SDL_SCANCODE_UNKNOWN
                       && mInputBinder->getMouseButtonBinding (control, ICS::Control::INCREASE) == ICS_MAX_DEVICE_BUTTONS
                       ))
             {
                 clearAllBindings (control);
 
                 if (defaultKeyBindings.find(i) != defaultKeyBindings.end())
-                    mInputBinder->addKeyBinding(control, static_cast<SDL_Keycode>(defaultKeyBindings[i]), ICS::Control::INCREASE);
+                    mInputBinder->addKeyBinding(control, defaultKeyBindings[i], ICS::Control::INCREASE);
                 else if (defaultMouseButtonBindings.find(i) != defaultMouseButtonBindings.end())
                     mInputBinder->addMouseButtonBinding (control, defaultMouseButtonBindings[i], ICS::Control::INCREASE);
             }
@@ -991,8 +992,8 @@ namespace MWInput
 
         ICS::Control* c = mInputBinder->getChannel (action)->getAttachedControls ().front().control;
 
-        if (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE) != SDLK_UNKNOWN)
+        if (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE) != SDL_SCANCODE_UNKNOWN)
-            return mInputBinder->keyCodeToString (mInputBinder->getKeyBinding (c, ICS::Control::INCREASE));
+            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));
         else
@@ -1053,10 +1054,10 @@ namespace MWInput
     }
 
     void InputManager::keyBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-        , SDL_Keycode key, ICS::Control::ControlChangingDirection direction)
+        , SDL_Scancode key, ICS::Control::ControlChangingDirection direction)
     {
         //Disallow binding escape key
-        if(key==SDLK_ESCAPE)
+        if(key==SDL_SCANCODE_ESCAPE)
             return;
 
         clearAllBindings(control);
@@ -1107,7 +1108,7 @@ namespace MWInput
     void InputManager::clearAllBindings (ICS::Control* control)
     {
         // right now we don't really need multiple bindings for the same action, so remove all others first
-        if (mInputBinder->getKeyBinding (control, ICS::Control::INCREASE) != SDLK_UNKNOWN)
+        if (mInputBinder->getKeyBinding (control, ICS::Control::INCREASE) != SDL_SCANCODE_UNKNOWN)
             mInputBinder->removeKeyBinding (mInputBinder->getKeyBinding (control, ICS::Control::INCREASE));
         if (mInputBinder->getMouseButtonBinding (control, ICS::Control::INCREASE) != ICS_MAX_DEVICE_BUTTONS)
             mInputBinder->removeMouseButtonBinding (mInputBinder->getMouseButtonBinding (control, ICS::Control::INCREASE));

apps/openmw/mwinput/inputmanagerimp.hpp

@@ -108,7 +108,7 @@ namespace MWInput
             , ICS::InputControlSystem::NamedAxis axis, ICS::Control::ControlChangingDirection direction);
 
         virtual void keyBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
-            , SDL_Keycode key, ICS::Control::ControlChangingDirection direction);
+            , SDL_Scancode key, ICS::Control::ControlChangingDirection direction);
 
         virtual void mouseButtonBindingDetected(ICS::InputControlSystem* ICS, ICS::Control* control
             , unsigned int button, ICS::Control::ControlChangingDirection direction);

apps/openmw/mwmechanics/actors.cpp

@@ -1044,9 +1044,6 @@ namespace MWMechanics
 
     void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
     {
-        // erase previous death events since we are currently only tracking them while in an active cell
-        ptr.getClass().getCreatureStats(ptr).clearHasDied();
-
         removeActor(ptr);
 
         MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr);

apps/openmw/mwmechanics/aiactivate.cpp

@@ -28,7 +28,10 @@ bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor,float duration)
 
     actor.getClass().getCreatureStats(actor).setDrawState(DrawState_Nothing);
 
-    if(target == MWWorld::Ptr())
+    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

apps/openmw/mwmechanics/aicombat.cpp

@@ -180,7 +180,9 @@ namespace MWMechanics
         if (target.isEmpty())
             return false;
 
-        if(target.getClass().getCreatureStats(target).isDead())
+        if(!target.getRefData().getCount() || !target.getRefData().isEnabled()  // Really we should be checking whether the target is currently registered
+                                                                                // with the MechanicsManager
+                || target.getClass().getCreatureStats(target).isDead())
             return true;
 
         const MWWorld::Class& actorClass = actor.getClass();

apps/openmw/mwmechanics/aifollow.cpp

@@ -45,7 +45,9 @@ bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
 {
     MWWorld::Ptr target = getTarget();
 
-    if (target.isEmpty())
+    if (target.isEmpty() || !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
 
     // Only the player can be actively followed. AiFollow packages with targets other than the player

apps/openmw/mwmechanics/aipursue.cpp

@@ -38,7 +38,9 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, float duration)
     ESM::Position pos = actor.getRefData().getPosition(); //position of the actor
     const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId); //The target to follow
 
-    if(target == MWWorld::Ptr())
+    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
 
     if(target.getClass().getCreatureStats(target).isDead())

apps/openmw/mwmechanics/creaturestats.cpp

@@ -270,11 +270,7 @@ namespace MWMechanics
     {
         if (mDead)
         {
-            if (mDynamic[0].getCurrent()<1)
+            mDynamic[0].setCurrent(mDynamic[0].getModified());
-            {
-                mDynamic[0].setModified(mDynamic[0].getModified(), 1);
-                mDynamic[0].setCurrent(1);
-            }
             if (mDynamic[0].getCurrent()>=1)
                 mDead = false;
         }

apps/openmw/mwscript/locals.hpp

@@ -24,8 +24,11 @@ namespace MWScript
             bool isEmpty() const;
 
             void configure (const ESM::Script& script);
+            /// @note var needs to be in lowercase
             bool setVarByInt(const std::string& script, const std::string& var, int val);
-            int getIntVar (const std::string& script, const std::string& var); ///< if var does not exist, returns 0
+            int getIntVar (const std::string& script, const std::string& var);
+            ///< if var does not exist, returns 0
+            /// @note var needs to be in lowercase
 
             void write (ESM::Locals& locals, const std::string& script) const;
 

apps/openmw/mwworld/physicssystem.cpp

@@ -719,7 +719,10 @@ namespace MWWorld
         }
 
         if (OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle))
-            act->setScale(node->getScale().x);
+        {
+            // NOTE: Ignoring Npc::adjustScale (race height) on purpose. This is a bug in MW and must be replicated for compatibility reasons
+            act->setScale(ptr.getCellRef().getScale());
+        }
     }
 
     bool PhysicsSystem::toggleCollisionMode()

apps/openmw/mwworld/weather.cpp

@@ -702,9 +702,13 @@ void WeatherManager::changeWeather(const std::string& region, const unsigned int
 
     mRegionOverrides[Misc::StringUtils::lowerCase(region)] = weather;
 
-    std::string playerRegion = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell()->mRegion;
+    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-    if (Misc::StringUtils::ciEqual(region, playerRegion))
+    if (player.isInCell())
-        setWeather(weather);
+    {
+        std::string playerRegion = player.getCell()->getCell()->mRegion;
+        if (Misc::StringUtils::ciEqual(region, playerRegion))
+            setWeather(weather);
+    }
 }
 
 void WeatherManager::modRegion(const std::string &regionid, const std::vector<char> &chances)

extern/oics/ICSInputControlSystem.cpp

@@ -424,7 +424,7 @@ namespace ICS
 				control.SetAttribute( "axisBindable", "false" );
 			}
 
-			if(getKeyBinding(*o, Control/*::ControlChangingDirection*/::INCREASE) != SDLK_UNKNOWN)
+            if(getKeyBinding(*o, Control/*::ControlChangingDirection*/::INCREASE) != SDL_SCANCODE_UNKNOWN)
 			{
 				TiXmlElement keyBinder( "KeyBinder" );
 
@@ -434,7 +434,7 @@ namespace ICS
 				control.InsertEndChild(keyBinder);
 			}
 
-			if(getKeyBinding(*o, Control/*::ControlChangingDirection*/::DECREASE) != SDLK_UNKNOWN)
+            if(getKeyBinding(*o, Control/*::ControlChangingDirection*/::DECREASE) != SDL_SCANCODE_UNKNOWN)
 			{
 				TiXmlElement keyBinder( "KeyBinder" );
 
@@ -801,14 +801,13 @@ namespace ICS
 		mDetectingBindingControl = NULL;
 	}
 
-	std::string InputControlSystem::keyCodeToString(SDL_Keycode key)
+    std::string InputControlSystem::scancodeToString(SDL_Scancode key)
 	{
-        return std::string(SDL_GetKeyName(key));
+        SDL_Keycode code = SDL_GetKeyFromScancode(key);
-	}
+        if (code == SDLK_UNKNOWN)
-
+            return std::string(SDL_GetScancodeName(key));
-	SDL_Keycode InputControlSystem::stringToKeyCode(std::string key)
+        else
-	{
+            return std::string(SDL_GetKeyName(code));
-        return SDL_GetKeyFromName(key.c_str());
 	}
 
     void InputControlSystem::adjustMouseRegion(Uint16 width, Uint16 height)

extern/oics/ICSInputControlSystem.h

@@ -118,14 +118,14 @@ namespace ICS
 		//TODO: does this have an SDL equivalent?
         //bool sliderMoved(const OIS::JoyStickEvent &evt, int index);
 
-		void addKeyBinding(Control* control, SDL_Keycode key, Control::ControlChangingDirection direction);
+        void addKeyBinding(Control* control, SDL_Scancode key, Control::ControlChangingDirection direction);
 		void addMouseAxisBinding(Control* control, NamedAxis axis, Control::ControlChangingDirection direction);
 		void addMouseButtonBinding(Control* control, unsigned int button, Control::ControlChangingDirection direction);
 		void addJoystickAxisBinding(Control* control, int deviceId, int axis, Control::ControlChangingDirection direction);
 		void addJoystickButtonBinding(Control* control, int deviceId, unsigned int button, Control::ControlChangingDirection direction);
 		void addJoystickPOVBinding(Control* control, int deviceId, int index, POVAxis axis, Control::ControlChangingDirection direction);
 		void addJoystickSliderBinding(Control* control, int deviceId, int index, Control::ControlChangingDirection direction);
-		void removeKeyBinding(SDL_Keycode key);
+        void removeKeyBinding(SDL_Scancode key);
 		void removeMouseAxisBinding(NamedAxis axis);
 		void removeMouseButtonBinding(unsigned int button);
 		void removeJoystickAxisBinding(int deviceId, int axis);
@@ -133,7 +133,7 @@ namespace ICS
 		void removeJoystickPOVBinding(int deviceId, int index, POVAxis axis);
 		void removeJoystickSliderBinding(int deviceId, int index);
 
-		SDL_Keycode getKeyBinding(Control* control, ICS::Control::ControlChangingDirection direction);
+        SDL_Scancode getKeyBinding(Control* control, ICS::Control::ControlChangingDirection direction);
 		NamedAxis getMouseAxisBinding(Control* control, ICS::Control::ControlChangingDirection direction);
 		unsigned int getMouseButtonBinding(Control* control, ICS::Control::ControlChangingDirection direction);
 		int getJoystickAxisBinding(Control* control, int deviceId, ICS::Control::ControlChangingDirection direction);
@@ -141,8 +141,7 @@ namespace ICS
 		POVBindingPair getJoystickPOVBinding(Control* control, int deviceId, ICS::Control::ControlChangingDirection direction);
 		int getJoystickSliderBinding(Control* control, int deviceId, ICS::Control::ControlChangingDirection direction);
 
-		std::string keyCodeToString(SDL_Keycode key);
+        std::string scancodeToString(SDL_Scancode key);
-		SDL_Keycode stringToKeyCode(std::string key);
 
 		void enableDetectingBindingState(Control* control, Control::ControlChangingDirection direction);
 		void cancelDetectingBindingState();
@@ -186,7 +185,7 @@ namespace ICS
 
 		std::string mFileName;
 
-		typedef std::map<SDL_Keycode, ControlKeyBinderItem> ControlsKeyBinderMapType;	// <KeyCode, [direction, control]>
+        typedef std::map<SDL_Scancode, ControlKeyBinderItem> ControlsKeyBinderMapType;	// <Scancode, [direction, control]>
 		typedef std::map<int, ControlAxisBinderItem> ControlsAxisBinderMapType;			// <axis, [direction, control]>
 		typedef std::map<int, ControlButtonBinderItem> ControlsButtonBinderMapType;		// <button, [direction, control]>
 		typedef std::map<int, ControlPOVBinderItem> ControlsPOVBinderMapType;			// <index, [direction, control]>
@@ -233,7 +232,7 @@ namespace ICS
 	{
 	public:
 		virtual void keyBindingDetected(InputControlSystem* ICS, Control* control
-			, SDL_Keycode key, Control::ControlChangingDirection direction);
+            , SDL_Scancode key, Control::ControlChangingDirection direction);
 
 		virtual void mouseAxisBindingDetected(InputControlSystem* ICS, Control* control
 			, InputControlSystem::NamedAxis axis, Control::ControlChangingDirection direction);

extern/oics/ICSInputControlSystem_keyboard.cpp

@@ -43,16 +43,16 @@ namespace ICS
 				dir = Control::DECREASE;
 			}
 
-            addKeyBinding(mControls.back(), FromString<int>(xmlKeyBinder->Attribute("key")), dir);
+            addKeyBinding(mControls.back(), SDL_Scancode(FromString<int>(xmlKeyBinder->Attribute("key"))), dir);
 
 			xmlKeyBinder = xmlKeyBinder->NextSiblingElement("KeyBinder");
 		}
 	}
 
-	void InputControlSystem::addKeyBinding(Control* control, SDL_Keycode key, Control::ControlChangingDirection direction)
+    void InputControlSystem::addKeyBinding(Control* control, SDL_Scancode key, Control::ControlChangingDirection direction)
 	{
 		ICS_LOG("\tAdding KeyBinder [key="
-			+ keyCodeToString(key) + ", direction="
+            + scancodeToString(key) + ", direction="
 			+ ToString<int>(direction) + "]");
 
 		ControlKeyBinderItem controlKeyBinderItem;        
@@ -61,7 +61,7 @@ namespace ICS
 		mControlsKeyBinderMap[ key ] = controlKeyBinderItem;
 	}
 
-	void InputControlSystem::removeKeyBinding(SDL_Keycode key)
+    void InputControlSystem::removeKeyBinding(SDL_Scancode key)
 	{
 		ControlsKeyBinderMapType::iterator it = mControlsKeyBinderMap.find(key);
 		if(it != mControlsKeyBinderMap.end())
@@ -70,7 +70,7 @@ namespace ICS
 		}
 	}
 
-	SDL_Keycode InputControlSystem::getKeyBinding(Control* control
+    SDL_Scancode InputControlSystem::getKeyBinding(Control* control
 		, ICS::Control::ControlChangingDirection direction)
 	{
 		ControlsKeyBinderMapType::iterator it = mControlsKeyBinderMap.begin();
@@ -83,7 +83,7 @@ namespace ICS
 			it++;
 		}
 
-		return SDLK_UNKNOWN;
+        return SDL_SCANCODE_UNKNOWN;
 	}
     void InputControlSystem::keyPressed(const SDL_KeyboardEvent &evt)
 	{
@@ -91,7 +91,7 @@ namespace ICS
 		{
 			if(!mDetectingBindingControl)
 			{
-				ControlsKeyBinderMapType::const_iterator it = mControlsKeyBinderMap.find(evt.keysym.sym);
+                ControlsKeyBinderMapType::const_iterator it = mControlsKeyBinderMap.find(evt.keysym.scancode);
 				if(it != mControlsKeyBinderMap.end())
 				{
 					it->second.control->setIgnoreAutoReverse(false);
@@ -115,7 +115,7 @@ namespace ICS
 			else if(mDetectingBindingListener)
 			{
 				mDetectingBindingListener->keyBindingDetected(this,
-					mDetectingBindingControl, evt.keysym.sym, mDetectingBindingDirection);
+                    mDetectingBindingControl, evt.keysym.scancode, mDetectingBindingDirection);
 			}
 		}
     }
@@ -124,7 +124,7 @@ namespace ICS
 	{
 		if(mActive)
 		{
-			ControlsKeyBinderMapType::const_iterator it = mControlsKeyBinderMap.find(evt.keysym.sym);
+            ControlsKeyBinderMapType::const_iterator it = mControlsKeyBinderMap.find(evt.keysym.scancode);
 			if(it != mControlsKeyBinderMap.end())
 			{
 				it->second.control->setChangingDirection(Control::STOP);
@@ -133,14 +133,14 @@ namespace ICS
 	}
 
 	void DetectingBindingListener::keyBindingDetected(InputControlSystem* ICS, Control* control
-		, SDL_Keycode key, Control::ControlChangingDirection direction)
+        , SDL_Scancode key, Control::ControlChangingDirection direction)
 	{
 		// if the key is used by another control, remove it
 		ICS->removeKeyBinding(key);
 
 		// if the control has a key assigned, remove it
-		SDL_Keycode oldKey = ICS->getKeyBinding(control, direction);
+        SDL_Scancode oldKey = ICS->getKeyBinding(control, direction);
-		if(oldKey != SDLK_UNKNOWN)
+        if(oldKey != SDL_SCANCODE_UNKNOWN)
 		{
 			ICS->removeKeyBinding(oldKey);
 		}

files/mygui/openmw_list.skin.xml

@@ -5,7 +5,7 @@
     <!-- Horizontal Scrollbar -->
 
     <Skin name="MW_HScroll" size="90 14">
-        <Property key="TrackRangeMargins" value="14 14"/>
+        <Property key="TrackRangeMargins" value="20 19"/>
         <Property key="MinTrackSize" value="14"/>
         <Property key="VerticalAlignment" value="false"/>
         <Property key="MoveToClick" value="true"/>
@@ -35,7 +35,7 @@
     </Skin>
 
     <Skin name="MW_ScrollTrackH" size="16 16" texture="textures\tx_menubook_bookmark.dds">
-        <BasisSkin type="TileRect" offset="6 0 3 16" align="Stretch">
+        <BasisSkin type="TileRect" offset="0 0 16 16" align="Stretch">
             <State name="normal" offset="70 22 16 16">
                 <Property key="TileSize" value="16 16"/>
                 <Property key="TileH" value="true"/>
@@ -47,7 +47,7 @@
     <!-- Vertical Scrollbar -->
 
     <Skin name="MW_VScroll" size="14 90">
-        <Property key="TrackRangeMargins" value="14 14"/>
+        <Property key="TrackRangeMargins" value="20 19"/>
         <Property key="MinTrackSize" value="14"/>
         <Property key="MoveToClick" value="true"/>
 
@@ -79,7 +79,8 @@
     </Skin>
 
     <Skin name="MW_ScrollTrackV" size="16 16" texture="textures\tx_menubook_bookmark.dds">
-        <BasisSkin type="TileRect" offset="0 7 16 3" align="Stretch">
+        <Property key="MinTrackSize" value="14"/>
+        <BasisSkin type="TileRect" offset="0 0 16 16" align="Stretch">
             <State name="normal" offset="68 19 16 16">
                 <Property key="TileSize" value="16 16"/>
                 <Property key="TileH" value="true"/>

files/mygui/openmw_windows.skin.xml

@@ -836,10 +836,6 @@
     </Skin>
 
     <Skin name="MW_Dialog" size="256 54">
-        <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center"/>
-        <Property key="TextColour" value="0.8 0.8 0.8"/>
-
         <Child type="Widget" skin="BlackBG" offset="4 4 248 46" align="Stretch" name="Client"/>
 
         <!-- Outer borders -->