Merge remote-tracking branch 'scrawl/alarm'

apps/openmw/mwmechanics/actors.cpp

@@ -763,6 +763,7 @@ namespace MWMechanics
                     // TODO: Not a complete list, disposition changes?
                     creatureStats.setHostile(false);
                     creatureStats.setAttacked(false);
+                    creatureStats.setAlarmed(false);
                     
                     // Update witness crime id
                     npcStats.setCrimeId(-1);

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -866,6 +866,9 @@ namespace MWMechanics
                         {
                             it1->getClass().getNpcStats(*it1).setCrimeId(id);
                         }
+
+                        // Mark as Alarmed for dialogue
+                        it1->getClass().getCreatureStats(*it1).setAlarmed(true);
                     }
                     break; // Someone saw the crime and everyone has been told
                 }

extern/sdl4ogre/sdlinputwrapper.cpp

@@ -443,5 +443,10 @@ namespace SFO
         mKeyMap.insert( KeyMap::value_type(SDLK_PAGEDOWN, OIS::KC_PGDOWN) );
         mKeyMap.insert( KeyMap::value_type(SDLK_INSERT, OIS::KC_INSERT) );
         mKeyMap.insert( KeyMap::value_type(SDLK_DELETE, OIS::KC_DELETE) );
+        mKeyMap.insert( KeyMap::value_type(SDLK_KP_ENTER, OIS::KC_NUMPADENTER) );
+        mKeyMap.insert( KeyMap::value_type(SDLK_RCTRL, OIS::KC_RCONTROL) );
+        mKeyMap.insert( KeyMap::value_type(SDLK_LGUI, OIS::KC_LWIN) );
+        mKeyMap.insert( KeyMap::value_type(SDLK_RGUI, OIS::KC_RWIN) );
+        mKeyMap.insert( KeyMap::value_type(SDLK_APPLICATION, OIS::KC_APPS) );
     }
 }