zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 21:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.

Browse source
This commit is contained in:
Mitchell Richters 2020-11-05 10:19:15 +11:00
parent ad10ea4cb5
commit c223a50b29
3 changed files with 33 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -586,7 +586,7 @@ int getticssincelastupdate()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static double motoApplyTurn(player_struct* p, int turnl, int turnr, int bike_turn, bool goback, double factor) static double motoApplyTurn(player_struct* p, bool turnl, bool turnr, int bike_turn, bool goback, double factor)
{ {
int turnvel = 0; int turnvel = 0;
p->oTiltStatus = p->TiltStatus; p->oTiltStatus = p->TiltStatus;
@ -673,7 +673,7 @@ static double motoApplyTurn(player_struct* p, int turnl, int turnr, int bike_tur
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static double boatApplyTurn(player_struct *p, int turnl, int turnr, int boat_turn, double factor) static double boatApplyTurn(player_struct *p, bool turnl, bool turnr, int boat_turn, double factor)
{ {
int turnvel = 0; int turnvel = 0;
int tics = getticssincelastupdate(); int tics = getticssincelastupdate();
@ -761,15 +761,15 @@ static double boatApplyTurn(player_struct *p, int turnl, int turnr, int boat_tur
static void processVehicleInput(player_struct *p, ControlInfo* const hidInput, InputPacket& input, double scaleAdjust) static void processVehicleInput(player_struct *p, ControlInfo* const hidInput, InputPacket& input, double scaleAdjust)
{ {
auto turnspeed = hidInput->mouseturnx + scaleAdjust * hidInput->dyaw * (1. / 32); // originally this was 64, not 32. Why the change? auto turnspeed = hidInput->mouseturnx + scaleAdjust * hidInput->dyaw * (1. / 32); // originally this was 64, not 32. Why the change?
int turnl = buttonMap.ButtonDown(gamefunc_Turn_Left) || buttonMap.ButtonDown(gamefunc_Strafe_Left); bool turnl = buttonMap.ButtonDown(gamefunc_Turn_Left) || buttonMap.ButtonDown(gamefunc_Strafe_Left);
int turnr = buttonMap.ButtonDown(gamefunc_Turn_Right) || buttonMap.ButtonDown(gamefunc_Strafe_Right); bool turnr = buttonMap.ButtonDown(gamefunc_Turn_Right) || buttonMap.ButtonDown(gamefunc_Strafe_Right);
// Cancel out micro-movement // Cancel out micro-movement
const double turn_threshold = 1 / 65536.; const double turn_threshold = 1 / 65536.;
if (turnspeed < -turn_threshold) if (turnspeed < -turn_threshold)
turnl = 1; turnl = true;
else if (turnspeed > turn_threshold) else if (turnspeed > turn_threshold)
turnr = 1; turnr = true;
else else
turnspeed = 0; turnspeed = 0;
@ -782,8 +782,8 @@ static void processVehicleInput(player_struct *p, ControlInfo* const hidInput, I
loc.actions |= SB_CROUCH; loc.actions |= SB_CROUCH;
} }
if (turnl) p->vehicle_turnl = true; p->vehTurnLeft = turnl;
if (turnr) p->vehicle_turnr = true; p->vehTurnRight = turnr;
double turnvel; double turnvel;

74
source/games/duke/src/player_r.cpp
View file

@ -1573,7 +1573,7 @@ static void onMotorcycle(int snum, ESyncBits &actions)
auto pact = p->GetActor(); auto pact = p->GetActor();
auto s = &pact->s; auto s = &pact->s;
int braking, turnLeft, turnRight; int braking;
short rng; short rng;
if (p->MotoSpeed < 0) if (p->MotoSpeed < 0)
p->MotoSpeed = 0; p->MotoSpeed = 0;
@ -1627,24 +1627,6 @@ static void onMotorcycle(int snum, ESyncBits &actions)
if (!S_CheckActorSoundPlaying(pact, 189) && !S_CheckActorSoundPlaying(pact, 187)) if (!S_CheckActorSoundPlaying(pact, 189) && !S_CheckActorSoundPlaying(pact, 187))
S_PlayActorSound(187, pact); S_PlayActorSound(187, pact);
} }
if (p->vehicle_turnl)
{
turnLeft = 1;
p->vehicle_turnl = false;
}
else
{
turnLeft = 0;
}
if (p->vehicle_turnr)
{
turnRight = 1;
p->vehicle_turnr = false;
}
else
{
turnRight = 0;
}
if (p->drink_amt > 88 && p->moto_drink == 0) if (p->drink_amt > 88 && p->moto_drink == 0)
{ {
rng = krand() & 63; rng = krand() & 63;
@ -1698,12 +1680,12 @@ static void onMotorcycle(int snum, ESyncBits &actions)
} }
if (p->vehReverseScale != 0 && p->MotoSpeed <= 0 && !braking) if (p->vehReverseScale != 0 && p->MotoSpeed <= 0 && !braking)
{ {
int temp; bool temp;
p->MotoSpeed = -15 * p->vehReverseScale; p->MotoSpeed = -15 * p->vehReverseScale;
p->vehReverseScale = 0; p->vehReverseScale = 0;
temp = turnRight; temp = p->vehTurnRight;
turnRight = turnLeft; p->vehTurnRight = p->vehTurnLeft;
turnLeft = temp; p->vehTurnLeft = temp;
} }
} }
if (p->MotoSpeed != 0 && p->on_ground == 1) if (p->MotoSpeed != 0 && p->on_ground == 1)
@ -1711,12 +1693,12 @@ static void onMotorcycle(int snum, ESyncBits &actions)
if (!p->VBumpNow) if (!p->VBumpNow)
if ((krand() & 3) == 2) if ((krand() & 3) == 2)
p->VBumpTarget = (p->MotoSpeed / 16.) * ((krand() & 7) - 4); p->VBumpTarget = (p->MotoSpeed / 16.) * ((krand() & 7) - 4);
if (turnLeft || p->moto_drink < 0) if (p->vehTurnLeft || p->moto_drink < 0)
{ {
if (p->moto_drink < 0) if (p->moto_drink < 0)
p->moto_drink++; p->moto_drink++;
} }
else if (turnRight || p->moto_drink > 0) else if (p->vehTurnRight || p->moto_drink > 0)
{ {
if (p->moto_drink > 0) if (p->moto_drink > 0)
p->moto_drink--; p->moto_drink--;
@ -1772,9 +1754,9 @@ static void onMotorcycle(int snum, ESyncBits &actions)
double currSpeed = p->MotoSpeed; double currSpeed = p->MotoSpeed;
short currAngle = p->angle.ang.asbuild(), velAdjustment, angAdjustment; short currAngle = p->angle.ang.asbuild(), velAdjustment, angAdjustment;
if (p->MotoSpeed >= 20 && p->on_ground == 1 && (turnLeft || turnRight)) if (p->MotoSpeed >= 20 && p->on_ground == 1 && (p->vehTurnLeft || p->vehTurnRight))
{ {
if (turnLeft) if (p->vehTurnLeft)
velAdjustment = -10; velAdjustment = -10;
else else
velAdjustment = 10; velAdjustment = 10;
@ -1844,6 +1826,8 @@ static void onMotorcycle(int snum, ESyncBits &actions)
} }
p->moto_on_mud = 0; p->moto_on_mud = 0;
p->moto_on_oil = 0; p->moto_on_oil = 0;
p->vehTurnLeft = false;
p->vehTurnRight = false;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1858,7 +1842,7 @@ static void onBoat(int snum, ESyncBits &actions)
auto pact = p->GetActor(); auto pact = p->GetActor();
auto s = &pact->s; auto s = &pact->s;
int heeltoe, braking, turnLeft, turnRight; int heeltoe, braking;
short rng; short rng;
if (p->NotOnWater) if (p->NotOnWater)
{ {
@ -1922,28 +1906,16 @@ static void onBoat(int snum, ESyncBits &actions)
} }
else else
braking = 0; braking = 0;
if (p->vehicle_turnl) if (p->vehTurnLeft)
{ {
turnLeft = 1;
p->vehicle_turnl = false;
if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater) if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)
S_PlayActorSound(91, pact); S_PlayActorSound(91, pact);
} }
else if (p->vehTurnRight)
{ {
turnLeft = 0;
}
if (p->vehicle_turnr)
{
turnRight = 1;
p->vehicle_turnr = false;
if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater) if (!S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)
S_PlayActorSound(91, pact); S_PlayActorSound(91, pact);
} }
else
{
turnRight = 0;
}
if (!p->NotOnWater) if (!p->NotOnWater)
{ {
if (p->drink_amt > 88 && p->moto_drink == 0) if (p->drink_amt > 88 && p->moto_drink == 0)
@ -2012,12 +1984,12 @@ static void onBoat(int snum, ESyncBits &actions)
} }
if (p->vehReverseScale != 0 && p->MotoSpeed == 0 && !braking) if (p->vehReverseScale != 0 && p->MotoSpeed == 0 && !braking)
{ {
int temp; bool temp;
p->MotoSpeed = -(!p->NotOnWater ? 25 : 20) * p->vehReverseScale; p->MotoSpeed = -(!p->NotOnWater ? 25 : 20) * p->vehReverseScale;
p->vehReverseScale = 0; p->vehReverseScale = 0;
temp = turnRight; temp = p->vehTurnRight;
turnRight = turnLeft; p->vehTurnRight = p->vehTurnLeft;
turnLeft = temp; p->vehTurnLeft = temp;
} }
} }
if (p->MotoSpeed != 0 && p->on_ground == 1) if (p->MotoSpeed != 0 && p->on_ground == 1)
@ -2025,12 +1997,12 @@ static void onBoat(int snum, ESyncBits &actions)
if (!p->VBumpNow) if (!p->VBumpNow)
if ((krand() & 15) == 14) if ((krand() & 15) == 14)
p->VBumpTarget = (p->MotoSpeed / 16.) * ((krand() & 3) - 2); p->VBumpTarget = (p->MotoSpeed / 16.) * ((krand() & 3) - 2);
if (turnLeft || p->moto_drink < 0) if (p->vehTurnLeft || p->moto_drink < 0)
{ {
if (p->moto_drink < 0) if (p->moto_drink < 0)
p->moto_drink++; p->moto_drink++;
} }
else if (turnRight || p->moto_drink > 0) else if (p->vehTurnRight || p->moto_drink > 0)
{ {
if (p->moto_drink > 0) if (p->moto_drink > 0)
p->moto_drink--; p->moto_drink--;
@ -2084,11 +2056,11 @@ static void onBoat(int snum, ESyncBits &actions)
p->horizon.addadjustment(horiz - FixedToFloat(p->horizon.horiz.asq16())); p->horizon.addadjustment(horiz - FixedToFloat(p->horizon.horiz.asq16()));
} }
if (p->MotoSpeed > 0 && p->on_ground == 1 && (turnLeft || turnRight)) if (p->MotoSpeed > 0 && p->on_ground == 1 && (p->vehTurnLeft || p->vehTurnRight))
{ {
double currSpeed = p->MotoSpeed; double currSpeed = p->MotoSpeed;
short currAngle = p->angle.ang.asbuild(), velAdjustment, angAdjustment; short currAngle = p->angle.ang.asbuild(), velAdjustment, angAdjustment;
if (turnLeft) if (p->vehTurnLeft)
velAdjustment = -10; velAdjustment = -10;
else else
velAdjustment = 10; velAdjustment = 10;
@ -2118,6 +2090,8 @@ static void onBoat(int snum, ESyncBits &actions)
if (p->MotoSpeed > 50) if (p->MotoSpeed > 50)
p->MotoSpeed -= (p->MotoSpeed / 2.); p->MotoSpeed -= (p->MotoSpeed / 2.);
p->vehTurnLeft = false;
p->vehTurnRight = false;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
source/games/duke/src/types.h
View file

@ -276,7 +276,7 @@ struct player_struct
uint8_t OnMotorcycle, OnBoat, moto_underwater, NotOnWater, MotoOnGround; uint8_t OnMotorcycle, OnBoat, moto_underwater, NotOnWater, MotoOnGround;
uint8_t moto_do_bump, moto_bump_fast, moto_on_oil, moto_on_mud; uint8_t moto_do_bump, moto_bump_fast, moto_on_oil, moto_on_mud;
double vehForwardScale, vehReverseScale, MotoSpeed; double vehForwardScale, vehReverseScale, MotoSpeed;
bool vehicle_turnl, vehicle_turnr; bool vehTurnLeft, vehTurnRight;
int8_t crouch_toggle; int8_t crouch_toggle;