mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 06:26:39 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/alarm'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-04-18 16:19:28 +02:00
commit 7eb6a2e52d
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/actors.cpp
View file

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

3
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -866,6 +866,9 @@ namespace MWMechanics
{ {
it1->getClass().getNpcStats(*it1).setCrimeId(id); 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 break; // Someone saw the crime and everyone has been told
} }

5
extern/sdl4ogre/sdlinputwrapper.cpp vendored
View file

@ -443,5 +443,10 @@ namespace SFO
mKeyMap.insert( KeyMap::value_type(SDLK_PAGEDOWN, OIS::KC_PGDOWN) ); 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_INSERT, OIS::KC_INSERT) );
mKeyMap.insert( KeyMap::value_type(SDLK_DELETE, OIS::KC_DELETE) ); 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) );
} }
} }