mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-25 07:56:37 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/alwaysrun' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2013-03-14 22:11:12 +01:00
commit ef72894b81
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/npc.hpp
View file

@ -81,7 +81,7 @@ namespace MWClass
virtual bool getStance (const MWWorld::Ptr& ptr, Stance stance, bool ignoreForce = false)
const;
////< Check if a stance is active or not.
///< Check if a stance is active or not.
virtual float getSpeed (const MWWorld::Ptr& ptr) const;
///< Return movement speed.

14
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -55,6 +55,7 @@ namespace MWInput
, mPreviewPOVDelay(0.f)
, mTimeIdle(0.f)
, mOverencumberedMessageDelay(0.f)
, mAlwaysRunActive(false)
{
Ogre::RenderWindow* window = mOgre.getWindow ();
size_t windowHnd;
@ -193,7 +194,7 @@ namespace MWInput
case A_AutoMove:
toggleAutoMove ();
break;
case A_ToggleWalk:
case A_AlwaysRun:
toggleWalking ();
break;
case A_ToggleWeapon:
@ -315,10 +316,10 @@ namespace MWInput
else
mPlayer.setUpDown (0);
if(actionIsActive(A_Run))
mPlayer.setRunState(true);
if (mAlwaysRunActive)
mPlayer.setRunState(!actionIsActive(A_Run));
else
mPlayer.setRunState(false);
mPlayer.setRunState(actionIsActive(A_Run));
// if player tried to start moving, but can't (due to being overencumbered), display a notification.
if (triedToMove)
@ -699,7 +700,7 @@ namespace MWInput
void InputManager::toggleWalking()
{
if (mWindows.isGuiMode()) return;
mPlayer.toggleRunning();
mAlwaysRunActive = !mAlwaysRunActive;
}
// Exit program now button (which is disabled in GUI mode)
@ -768,6 +769,7 @@ namespace MWInput
defaultKeyBindings[A_QuickKey10] = OIS::KC_0;
defaultKeyBindings[A_Screenshot] = OIS::KC_SYSRQ;
defaultKeyBindings[A_ToggleHUD] = OIS::KC_F12;
defaultKeyBindings[A_AlwaysRun] = OIS::KC_Y;
std::map<int, int> defaultMouseButtonBindings;
defaultMouseButtonBindings[A_Inventory] = OIS::MB_Right;
@ -834,6 +836,7 @@ namespace MWInput
descriptions[A_QuickKey8] = "sQuick8Cmd";
descriptions[A_QuickKey9] = "sQuick9Cmd";
descriptions[A_QuickKey10] = "sQuick10Cmd";
descriptions[A_AlwaysRun] = "sAlways_Run";
if (descriptions[action] == "")
return ""; // not configurable
@ -865,6 +868,7 @@ namespace MWInput
ret.push_back(A_MoveRight);
ret.push_back(A_TogglePOV);
ret.push_back(A_Run);
ret.push_back(A_AlwaysRun);
ret.push_back(A_Sneak);
ret.push_back(A_Activate);
ret.push_back(A_ToggleWeapon);

3
apps/openmw/mwinput/inputmanagerimp.hpp
View file

@ -152,6 +152,7 @@ namespace MWInput
int mMouseWheel;
bool mDebug;
bool mUserFileExists;
bool mAlwaysRunActive;
std::map<std::string, bool> mControlSwitch;
@ -217,7 +218,7 @@ namespace MWInput
A_CycleWeaponLeft,//Cycling through weapons
A_CycleWeaponRight,
A_ToggleSneak, //Toggles Sneak
A_ToggleWalk, //Toggle Walking/Running
A_AlwaysRun, //Toggle Walking/Running
A_Sneak,
A_QuickSave,

9
apps/openmw/mwworld/player.cpp
View file

@ -77,15 +77,6 @@ namespace MWWorld
MWWorld::Class::get(ptr).setStance(ptr, MWWorld::Class::Run, run);
}
void Player::toggleRunning()
{
MWWorld::Ptr ptr = getPlayer();
bool running = MWWorld::Class::get (ptr).getStance (ptr, MWWorld::Class::Run, true);
MWWorld::Class::get (ptr).setStance (ptr, MWWorld::Class::Run, !running);
}
void Player::setSneak(bool sneak)
{
MWWorld::Ptr ptr = getPlayer();

1
apps/openmw/mwworld/player.hpp
View file

@ -66,7 +66,6 @@ namespace MWWorld
void setUpDown(int value);
void setRunState(bool run);
void toggleRunning();
void setSneak(bool sneak);
};
}