BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Use aux1 to move fast when flying

Browse Source
This commit is contained in:
PilzAdam 2012-12-27 18:33:24 +01:00
parent 578ece8dd0
commit 45029117f5
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/localplayer.cpp
View File

@ -399,13 +399,13 @@ void LocalPlayer::applyControl(float dtime)
// Whether superspeed mode is used or not // Whether superspeed mode is used or not
bool superspeed = false; bool superspeed = false;
// Old descend control
if(g_settings->getBool("aux1_descends"))
{
// If free movement and fast movement, always move fast // If free movement and fast movement, always move fast
if(free_move && fast_move) if(free_move && fast_move)
superspeed = true; superspeed = true;
// Old descend control
if(g_settings->getBool("aux1_descends"))
{
// Auxiliary button 1 (E) // Auxiliary button 1 (E)
if(control.aux1) if(control.aux1)
{ {
@ -440,10 +440,9 @@ void LocalPlayer::applyControl(float dtime)
// Auxiliary button 1 (E) // Auxiliary button 1 (E)
if(control.aux1) if(control.aux1)
{ {
if(!free_move && !is_climbing) if(!is_climbing)
{ {
// If not free movement but fast is allowed, aux1 is // aux1 is "Turbo button"
// "Turbo button"
if(fast_move) if(fast_move)
superspeed = true; superspeed = true;
} }
@ -455,7 +454,7 @@ void LocalPlayer::applyControl(float dtime)
{ {
// In free movement mode, sneak descends // In free movement mode, sneak descends
v3f speed = getSpeed(); v3f speed = getSpeed();
if(fast_move) if(fast_move && control.aux1)
speed.Y = -20*BS; speed.Y = -20*BS;
else else
speed.Y = -walkspeed_max; speed.Y = -walkspeed_max;
@ -497,10 +496,20 @@ void LocalPlayer::applyControl(float dtime)
if(free_move) if(free_move)
{ {
v3f speed = getSpeed(); v3f speed = getSpeed();
if(g_settings->getBool("aux1_descends"))
{
if(fast_move) if(fast_move)
speed.Y = 20*BS; speed.Y = 20*BS;
else else
speed.Y = walkspeed_max; speed.Y = walkspeed_max;
} else {
if(fast_move && control.aux1)
speed.Y = 20*BS;
else
speed.Y = walkspeed_max;
}
setSpeed(speed); setSpeed(speed);
} }
else if(m_can_jump) else if(m_can_jump)
@ -548,7 +557,7 @@ void LocalPlayer::applyControl(float dtime)
f32 inc = walk_acceleration * BS * dtime; f32 inc = walk_acceleration * BS * dtime;
// Faster acceleration if fast and free movement // Faster acceleration if fast and free movement
if(free_move && fast_move) if(free_move && fast_move && superspeed)
inc = walk_acceleration * BS * dtime * 10; inc = walk_acceleration * BS * dtime * 10;
// Accelerate to target speed with maximum increment // Accelerate to target speed with maximum increment