incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More uses K_GetKartButtons

Browse source
This commit is contained in:
NepDisk 2025-03-07 12:12:52 -05:00
parent ec6a3d2716
commit bdbfeaf1ac
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_hud.c
View file

@ -3835,13 +3835,12 @@ static void K_drawInput(void)
INT32 offs, col;
const INT32 accent1 = splitflags | skincolors[stplyr->skincolor].ramp[5];
const INT32 accent2 = splitflags | skincolors[stplyr->skincolor].ramp[9];
ticcmd_t *cmd = &stplyr->cmd;
#define BUTTW 8
#define BUTTH 11
#define drawbutt(xoffs, butt, symb)\
if (!stplyr->exiting && (cmd->buttons & butt))\
if (!stplyr->exiting && (K_GetKartButtons(stplyr) & butt))\
{\
offs = 2*FRACUNIT;\
col = accent1;\

28
src/k_kart.c
View file

@ -2429,8 +2429,7 @@ static SINT8 K_GlanceAtPlayers(player_t *glancePlayer)
*/
static void K_RespawnChecker(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
UINT16 buttons = K_GetKartButtons(player);
if (player->spectator)
return;
@ -2490,7 +2489,7 @@ static void K_RespawnChecker(player_t *player)
// Sal: The old behavior was stupid and prone to accidental usage.
// Let's rip off Mania instead, and turn this into a Drop Dash!
if (cmd->buttons & BT_ACCELERATE)
if (buttons & BT_ACCELERATE)
player->dropdash++;
else
player->dropdash = 0;
@ -2506,7 +2505,7 @@ static void K_RespawnChecker(player_t *player)
}
else
{
if ((cmd->buttons & BT_ACCELERATE) && (player->dropdash >= TICRATE/4))
if ((buttons & BT_ACCELERATE) && (player->dropdash >= TICRATE/4))
{
S_StartSound(player->mo, sfx_s23c);
player->startboost = 50;
@ -8390,6 +8389,7 @@ static void K_KartDrift(player_t *player, boolean onground)
INT32 dstwo = dsone*2;
INT32 dsthree = cv_kartpurpledrift.value ? dsone*3 : dsone*4;
INT32 dsfour = dsone*4;
UINT16 buttons = K_GetKartButtons(player);
// Grown players taking yellow spring panels will go below minspeed for one tic,
// and will then wrongdrift or have their sparks removed because of this.
@ -8586,8 +8586,8 @@ static void K_KartDrift(player_t *player, boolean onground)
}
if (player->drift
&& ((player->cmd.buttons & BT_BRAKE)
|| !(player->cmd.buttons & BT_ACCELERATE))
&& ((buttons & BT_BRAKE)
|| !(buttons & BT_ACCELERATE))
&& P_IsObjectOnGround(player->mo))
{
if (!(player->pflags & PF_BRAKEDRIFT))
@ -9034,8 +9034,8 @@ void K_UnsetItemOut(player_t *player)
//
void K_MoveKartPlayer(player_t *player, boolean onground)
{
ticcmd_t *cmd = &player->cmd;
boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !(player->oldcmd.buttons & BT_ATTACK));
UINT16 buttons = K_GetKartButtons(player);
boolean ATTACK_IS_DOWN = ((buttons & BT_ATTACK) && !(player->oldcmd.buttons & BT_ATTACK));
boolean HOLDING_ITEM = (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT));
boolean NO_HYUDORO = (player->stealingtimer == 0 && player->stolentimer == 0);
@ -9057,7 +9057,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->positiondelay--;
// Prevent ring misfire
if (!(cmd->buttons & BT_ATTACK))
if (!(buttons & BT_ATTACK))
{
if (player->itemtype == KITEM_NONE
&& NO_HYUDORO && (K_RingsActive() == true) && !(HOLDING_ITEM
@ -9108,7 +9108,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
// Ring boosting
else if (player->itemflags & IF_USERINGS)
{
if ((cmd->buttons & BT_ATTACK) && !player->ringdelay && player->rings > 0)
if ((buttons & BT_ATTACK) && !player->ringdelay && player->rings > 0)
{
mobj_t *ring = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RING);
P_SetMobjState(ring, S_FASTRING1);
@ -9182,7 +9182,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->itemflags |= IF_HOLDREADY;
}
if ((cmd->buttons & BT_ATTACK) && (player->itemflags & IF_HOLDREADY) && onground)
if ((buttons & BT_ATTACK) && (player->itemflags & IF_HOLDREADY) && onground)
{
// TODO: gametyperules
const SINT8 incr = gametype == GT_BATTLE ? 3 : 2;
@ -9221,7 +9221,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
if (player->growcancel >= 0)
{
if (cmd->buttons & BT_ATTACK)
if (buttons & BT_ATTACK)
{
player->growcancel++;
if (player->growcancel > 26)
@ -9232,7 +9232,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
else
{
if ((cmd->buttons & BT_ATTACK) || (player->oldcmd.buttons & BT_ATTACK))
if ((buttons & BT_ATTACK) || (player->oldcmd.buttons & BT_ATTACK))
player->growcancel = -1;
else
player->growcancel = 0;
@ -9621,7 +9621,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (!HOLDING_ITEM && NO_HYUDORO)
{
if ((cmd->buttons & BT_ATTACK) && (player->itemflags & IF_HOLDREADY))
if ((buttons & BT_ATTACK) && (player->itemflags & IF_HOLDREADY))
{
if (player->bubbleblowup == 0)
S_StartSound(player->mo, sfx_s3k75);

3
src/p_user.c
View file

@ -1751,6 +1751,7 @@ static void P_3dMovement(player_t *player)
angle_t dangle; // replaces old quadrants bits
fixed_t oldMagnitude, newMagnitude;
vector3_t totalthrust;
UINT16 buttons = K_GetKartButtons(player);
totalthrust.x = totalthrust.y = 0; // I forget if this is needed
totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes
@ -1846,7 +1847,7 @@ static void P_3dMovement(player_t *player)
if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration...
movepushforward = FixedMul(movepushforward, player->mo->movefactor);
if (cmd->buttons & BT_BRAKE && (player->cmd.forwardmove == 0)) // SRB2kart - braking isn't instant
if (buttons & BT_BRAKE && (player->cmd.forwardmove == 0)) // SRB2kart - braking isn't instant
movepushforward /= 64;
if (player->cmd.forwardmove > 0)