Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alchemy crouch toggle code sync.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-07-25 13:09:10 -04:00
parent fd5dae59ae
commit 31867a8bbf
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagent.cpp
View File

@@ -650,7 +650,8 @@ void LLAgent::moveUp(S32 direction)
setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP);
}
if (!mCrouch) camera_reset_on_motion();
if (!mCrouch)
camera_reset_on_motion();
}
//-----------------------------------------------------------------------------
@@ -694,7 +695,7 @@ void LLAgent::movePitch(F32 mag)
bool LLAgent::isCrouching() const
{
return mCrouch && !getFlying(); // Never crouch when flying
return mCrouch && !getFlying();
}

2
indra/newview/llappviewer.cpp
View File

@@ -1255,9 +1255,7 @@ bool LLAppViewer::mainLoop()
joystick->scanJoystick();
gKeyboard->scanKeyboard();
if (gAgent.isCrouching())
{
gAgent.moveUp(-1);
}
}

10
indra/newview/llviewerkeyboard.cpp
View File

@@ -70,13 +70,14 @@ LLViewerKeyboard gViewerKeyboard;
void agent_jump( EKeystate s )
{
if( KEYSTATE_UP == s ) return;
static LLCachedControl<bool> sAutomaticFly(gSavedSettings, "AutomaticFly");
F32 time = gKeyboard->getCurKeyElapsedTime();
S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount());
if( time < FLY_TIME
|| frame_count <= FLY_FRAMES
|| gAgent.upGrabbed()
|| !gSavedSettings.getBOOL("AutomaticFly"))
|| !sAutomaticFly())
{
gAgent.moveUp(1);
}
@@ -91,7 +92,10 @@ void agent_toggle_down( EKeystate s )
{
if (KEYSTATE_UP == s) return;
if (KEYSTATE_DOWN == s && !gAgent.getFlying() && gSavedSettings.getBOOL("SGShiftCrouchToggle"))
static LLCachedControl<bool> sCrouchToggle(gSavedSettings, "SGShiftCrouchToggle");
if (KEYSTATE_DOWN == s
&& !gAgent.getFlying()
&& sCrouchToggle())
{
gAgent.toggleCrouch();
}
@@ -101,7 +105,7 @@ void agent_toggle_down( EKeystate s )
void agent_push_down( EKeystate s )
{
if( KEYSTATE_UP == s ) return;
if( KEYSTATE_UP == s ) return;
gAgent.moveUp(-1);
}