zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 12:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted key input changes from yesterday.

Browse source 
At least the SW version did not work right so let's take no chances here.
This commit is contained in:
Christoph Oelckers 2020-09-15 21:54:10 +02:00
parent d74d65bece
commit 867b8f006f
2 changed files with 75 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
source/games/duke/src/input.cpp
View file

@ -586,7 +586,7 @@ int getticssincelastupdate()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void processMovement(player_struct *p, InputPacket &input, ControlInfo* const hidInput, double scaleFactor, bool allowkeys) static void processMovement(player_struct *p, InputPacket &input, ControlInfo* const hidInput, double scaleFactor)
{ {
bool mouseaim = !(loc.actions & SB_AIMMODE); bool mouseaim = !(loc.actions & SB_AIMMODE);
@ -608,10 +608,21 @@ static void processMovement(player_struct *p, InputPacket &input, ControlInfo* c
if (!in_mouseflip) input.q16horz = -input.q16horz; if (!in_mouseflip) input.q16horz = -input.q16horz;
input.q16horz -= FloatToFixed(scaleFactor * (hidInput->dpitch)); input.q16horz -= FloatToFixed(scaleFactor * (hidInput->dpitch));
input.svel -= xs_CRoundToInt(scaleFactor * hidInput->dx * keymove); input.svel -= scaleFactor * (hidInput->dx * keymove);
input.fvel -= xs_CRoundToInt(scaleFactor * hidInput->dz * keymove); input.fvel -= scaleFactor * (hidInput->dz * keymove);
if (!buttonMap.ButtonDown(gamefunc_Strafe)) if (buttonMap.ButtonDown(gamefunc_Strafe))
{
if (!loc.svel)
{
if (buttonMap.ButtonDown(gamefunc_Turn_Left))
input.svel = keymove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right))
input.svel = -keymove;
}
}
else
{ {
int tics = getticssincelastupdate(); int tics = getticssincelastupdate();
@ -633,59 +644,44 @@ static void processMovement(player_struct *p, InputPacket &input, ControlInfo* c
} }
if (allowkeys) if (abs(loc.svel) < keymove)
{ {
if (buttonMap.ButtonDown(gamefunc_Strafe)) if (buttonMap.ButtonDown(gamefunc_Strafe_Left))
{ input.svel += keymove;
if (abs(loc.svel) < keymove)
{
if (buttonMap.ButtonDown(gamefunc_Turn_Left))
input.svel = keymove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right)) if (buttonMap.ButtonDown(gamefunc_Strafe_Right))
input.svel = -keymove; input.svel += -keymove;
}
if (abs(loc.fvel) < keymove)
{
if (isRR() && p->drink_amt >= 66 && p->drink_amt <= 87)
{
if (buttonMap.ButtonDown(gamefunc_Move_Forward))
{
input.fvel += keymove;
if (p->drink_amt & 1)
input.svel += keymove;
else
input.svel -= keymove;
}
if (buttonMap.ButtonDown(gamefunc_Move_Backward))
{
input.fvel += -keymove;
if (p->drink_amt & 1)
input.svel -= keymove;
else
input.svel += keymove;
} }
} }
else
if (abs(loc.svel) < keymove)
{ {
if (buttonMap.ButtonDown(gamefunc_Strafe_Left)) if (buttonMap.ButtonDown(gamefunc_Move_Forward))
input.svel = keymove; input.fvel += keymove;
if (buttonMap.ButtonDown(gamefunc_Strafe_Right)) if (buttonMap.ButtonDown(gamefunc_Move_Backward))
input.svel = -keymove; input.fvel += -keymove;
}
if (abs(loc.fvel) < keymove)
{
if (isRR() && p->drink_amt >= 66 && p->drink_amt <= 87)
{
if (buttonMap.ButtonDown(gamefunc_Move_Forward))
{
input.fvel += keymove;
if (p->drink_amt & 1)
input.svel += keymove;
else
input.svel -= keymove;
}
if (buttonMap.ButtonDown(gamefunc_Move_Backward))
{
input.fvel += -keymove;
if (p->drink_amt & 1)
input.svel -= keymove;
else
input.svel += keymove;
}
}
else
{
if (buttonMap.ButtonDown(gamefunc_Move_Forward))
input.fvel += keymove;
if (buttonMap.ButtonDown(gamefunc_Move_Backward))
input.fvel -= keymove;
}
} }
} }
} }
@ -986,7 +982,7 @@ static void FinalizeInput(int playerNum, InputPacket& input, bool vehicle)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void GetInputInternal(InputPacket &locInput, ControlInfo* const hidInput, bool allowkeys) static void GetInputInternal(InputPacket &locInput, ControlInfo* const hidInput)
{ {
auto const p = &ps[myconnectindex]; auto const p = &ps[myconnectindex];
@ -996,7 +992,6 @@ static void GetInputInternal(InputPacket &locInput, ControlInfo* const hidInput,
return; return;
} }
// Todo: Handle this through SERVERINFO CVARs.
if (numplayers == 1) if (numplayers == 1)
{ {
setlocalplayerinput(p); setlocalplayerinput(p);
@ -1020,7 +1015,7 @@ static void GetInputInternal(InputPacket &locInput, ControlInfo* const hidInput,
else else
{ {
processInputBits(p, hidInput); processInputBits(p, hidInput);
processMovement(p, input, hidInput, scaleAdjust, allowkeys); processMovement(p, input, hidInput, scaleAdjust);
checkCrouchToggle(p); checkCrouchToggle(p);
FinalizeInput(myconnectindex, input, false); FinalizeInput(myconnectindex, input, false);
} }
@ -1042,7 +1037,7 @@ static void GetInputInternal(InputPacket &locInput, ControlInfo* const hidInput,
void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput) void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)
{ {
GetInputInternal(loc, hidInput, packet != nullptr); GetInputInternal(loc, hidInput);
if (packet) if (packet)
{ {
auto const pPlayer = &ps[myconnectindex]; auto const pPlayer = &ps[myconnectindex];

58
source/sw/src/input.cpp
View file

@ -199,7 +199,7 @@ static void processWeapon(PLAYERp const pp)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool const mouseaim, bool allowkeys) static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool const mouseaim)
{ {
double const scaleAdjust = InputScale(); double const scaleAdjust = InputScale();
bool const strafeKey = buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop; bool const strafeKey = buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop;
@ -239,7 +239,17 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
svel -= xs_CRoundToInt(scaleAdjust * (hidInput->dx * keymove)); svel -= xs_CRoundToInt(scaleAdjust * (hidInput->dx * keymove));
fvel -= xs_CRoundToInt(scaleAdjust * (hidInput->dz * keymove)); fvel -= xs_CRoundToInt(scaleAdjust * (hidInput->dz * keymove));
if (strafeKey || pp->sop) if (strafeKey)
{
if (abs(svel) < keymove)
{
if (buttonMap.ButtonDown(gamefunc_Turn_Left))
svel += keymove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right))
svel -= keymove;
}
}
else
{ {
if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop)) if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop))
{ {
@ -257,39 +267,21 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
} }
} }
if (allowkeys) if (abs(loc.svel) < keymove)
{ {
if (!pp->sop) if (buttonMap.ButtonDown(gamefunc_Strafe_Left) && !pp->sop)
{ svel += keymove;
if (strafeKey)
{
if (abs(svel) < keymove)
{
if (buttonMap.ButtonDown(gamefunc_Turn_Left))
svel += keymove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right))
svel -= keymove;
}
}
if (abs(loc.svel) < keymove) if (buttonMap.ButtonDown(gamefunc_Strafe_Right) && !pp->sop)
{ svel -= keymove;
if (buttonMap.ButtonDown(gamefunc_Strafe_Left)) }
svel += keymove; if (abs(loc.fvel) < keymove)
{
if (buttonMap.ButtonDown(gamefunc_Move_Forward))
fvel += keymove;
if (buttonMap.ButtonDown(gamefunc_Strafe_Right)) if (buttonMap.ButtonDown(gamefunc_Move_Backward))
svel -= keymove; fvel -= keymove;
}
}
if (abs(loc.fvel) < keymove)
{
if (buttonMap.ButtonDown(gamefunc_Move_Forward))
fvel += keymove;
if (buttonMap.ButtonDown(gamefunc_Move_Backward))
fvel -= keymove;
}
} }
if (!cl_syncinput) if (!cl_syncinput)
@ -366,7 +358,7 @@ void GameInterface::GetInput(InputPacket *packet, ControlInfo* const hidInput)
bool mouseaim; bool mouseaim;
processInputBits(pp, hidInput, &mouseaim); processInputBits(pp, hidInput, &mouseaim);
processMovement(pp, hidInput, mouseaim, packet != nullptr); processMovement(pp, hidInput, mouseaim);
processWeapon(pp); processWeapon(pp);
if (packet) if (packet)