From 465ad1a7bc2f8ca255c1a4f432eeae3bc75181ba Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 04:36:34 -0500 Subject: [PATCH 01/10] Replace all occurances of BT_USE with BT_SPIN (2.3?) I'd use `next-major` but it doesn't exist lol --- src/b_bot.c | 4 ++-- src/d_ticcmd.h | 2 +- src/dehacked.c | 2 +- src/f_finale.c | 6 +++--- src/g_game.c | 2 +- src/m_cheat.c | 6 +++--- src/p_map.c | 2 +- src/p_spec.c | 2 +- src/p_user.c | 40 ++++++++++++++++++++-------------------- src/st_stuff.c | 2 +- src/y_inter.c | 4 ++-- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/b_bot.c b/src/b_bot.c index 4397938c1..d3635f32c 100644 --- a/src/b_bot.c +++ b/src/b_bot.c @@ -193,7 +193,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) { cmd->forwardmove = pcmd->forwardmove; cmd->sidemove = pcmd->sidemove; - if (pcmd->buttons & BT_USE) + if (pcmd->buttons & BT_SPIN) { spin = true; jump = false; @@ -441,7 +441,7 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward if (jump) cmd->buttons |= BT_JUMP; if (spin) - cmd->buttons |= BT_USE; + cmd->buttons |= BT_SPIN; } void B_MoveBlocked(player_t *player) diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index 0a8012bb1..74a92a823 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -31,7 +31,7 @@ typedef enum BT_WEAPONPREV = 1<<5, BT_ATTACK = 1<<6, // shoot rings - BT_USE = 1<<7, // spin + BT_SPIN = 1<<7, // spin BT_CAMLEFT = 1<<8, // turn camera left BT_CAMRIGHT = 1<<9, // turn camera right BT_TOSSFLAG = 1<<10, diff --git a/src/dehacked.c b/src/dehacked.c index 99d4883f6..f1e977f35 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -9938,7 +9938,7 @@ struct { {"BT_WEAPONNEXT",BT_WEAPONNEXT}, {"BT_WEAPONPREV",BT_WEAPONPREV}, {"BT_ATTACK",BT_ATTACK}, // shoot rings - {"BT_USE",BT_USE}, // spin + {"BT_SPIN",BT_SPIN}, // spin {"BT_CAMLEFT",BT_CAMLEFT}, // turn camera left {"BT_CAMRIGHT",BT_CAMRIGHT}, // turn camera right {"BT_TOSSFLAG",BT_TOSSFLAG}, diff --git a/src/f_finale.c b/src/f_finale.c index f47c6c1a7..11f4ac475 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -4097,7 +4097,7 @@ void F_CutsceneTicker(void) if (netgame && i != serverplayer && !IsPlayerAdmin(i)) continue; - if (players[i].cmd.buttons & BT_USE) + if (players[i].cmd.buttons & BT_SPIN) { keypressed = false; cutscene_boostspeed = 1; @@ -4698,7 +4698,7 @@ void F_TextPromptTicker(void) else continue; - if ((players[i].cmd.buttons & BT_USE) || (players[i].cmd.buttons & BT_JUMP)) + if ((players[i].cmd.buttons & BT_SPIN) || (players[i].cmd.buttons & BT_JUMP)) { if (timetonext > 1) timetonext--; @@ -4721,7 +4721,7 @@ void F_TextPromptTicker(void) } keypressed = true; // prevent repeat events } - else if (!(players[i].cmd.buttons & BT_USE) && !(players[i].cmd.buttons & BT_JUMP)) + else if (!(players[i].cmd.buttons & BT_SPIN) && !(players[i].cmd.buttons & BT_JUMP)) keypressed = false; if (!splitscreen) diff --git a/src/g_game.c b/src/g_game.c index 69aac5065..ab0bdd265 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1341,7 +1341,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // use with any button/key axis = PlayerJoyAxis(ssplayer, AXISSPIN); if (PLAYERINPUTDOWN(ssplayer, gc_use) || (usejoystick && axis > 0)) - cmd->buttons |= BT_USE; + cmd->buttons |= BT_SPIN; // Centerview can be a toggle in simple mode! { diff --git a/src/m_cheat.c b/src/m_cheat.c index c42763afd..ab1454503 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -1144,7 +1144,7 @@ void OP_NightsObjectplace(player_t *player) if (player->pflags & PF_ATTACKDOWN) { // Are ANY objectplace buttons pressed? If no, remove flag. - if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG|BT_USE|BT_WEAPONNEXT|BT_WEAPONPREV))) + if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG|BT_SPIN|BT_WEAPONNEXT|BT_WEAPONPREV))) player->pflags &= ~PF_ATTACKDOWN; // Do nothing. @@ -1251,7 +1251,7 @@ void OP_NightsObjectplace(player_t *player) } // This places a custom object as defined in the console cv_mapthingnum. - if (cmd->buttons & BT_USE) + if (cmd->buttons & BT_SPIN) { UINT16 angle; @@ -1306,7 +1306,7 @@ void OP_ObjectplaceMovement(player_t *player) if (cmd->buttons & BT_JUMP) player->mo->z += FRACUNIT*cv_speed.value; - else if (cmd->buttons & BT_USE) + else if (cmd->buttons & BT_SPIN) player->mo->z -= FRACUNIT*cv_speed.value; if (cmd->forwardmove != 0) diff --git a/src/p_map.c b/src/p_map.c index f7db52f6a..74c2790f7 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -380,7 +380,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if ((spring->info->painchance == 3)) { if (!(pflags = (object->player->pflags & PF_SPINNING)) && - (((object->player->charability2 == CA2_SPINDASH) && (object->player->cmd.buttons & BT_USE)) + (((object->player->charability2 == CA2_SPINDASH) && (object->player->cmd.buttons & BT_SPIN)) || (spring->flags2 & MF2_AMBUSH))) { pflags = PF_SPINNING; diff --git a/src/p_spec.c b/src/p_spec.c index b7fdedfd0..eb745a4e2 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -5000,7 +5000,7 @@ DoneSection2: if (player->mo->momz > 0) break; - if (player->cmd.buttons & BT_USE) + if (player->cmd.buttons & BT_SPIN) break; if (!(player->pflags & PF_SLIDING) && player->mo->state == &states[player->mo->info->painstate]) diff --git a/src/p_user.c b/src/p_user.c index d426277ff..a4aff1499 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -2303,7 +2303,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff) if (dorollstuff) { if ((player->charability2 == CA2_SPINDASH) && !((player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_THOKKED) && !(player->charability == CA_THOK && player->secondjump) - && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale))) + && (player->cmd.buttons & BT_SPIN) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale))) player->pflags = (player->pflags|PF_SPINNING) & ~PF_THOKKED; else if (!(player->pflags & PF_STARTDASH)) player->pflags &= ~PF_SPINNING; @@ -2368,7 +2368,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff) } } else if (player->charability2 == CA2_MELEE - && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY && player->cmd.buttons & (BT_JUMP|BT_USE)))) + && ((player->panim == PA_ABILITY2) || (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY && player->cmd.buttons & (BT_JUMP|BT_SPIN)))) { if (player->mo->state-states != S_PLAY_MELEE_LANDING) { @@ -3576,7 +3576,7 @@ static void P_DoClimbing(player_t *player) else if ((!(player->mo->momx || player->mo->momy || player->mo->momz) || !climb) && player->mo->state-states != S_PLAY_CLING) P_SetPlayerMobjState(player->mo, S_PLAY_CLING); - if (cmd->buttons & BT_USE && !(player->pflags & PF_JUMPSTASIS)) + if (cmd->buttons & BT_SPIN && !(player->pflags & PF_JUMPSTASIS)) { player->climbing = 0; player->pflags |= P_GetJumpFlags(player); @@ -4574,7 +4574,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) && (player->pflags & PF_JUMPSTASIS || player->mo->state-states != S_PLAY_GLIDE_LANDING)) return; - if (cmd->buttons & BT_USE) + if (cmd->buttons & BT_SPIN) { if (LUAh_SpinSpecial(player)) return; @@ -4591,7 +4591,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) { case CA2_SPINDASH: // Spinning and Spindashing // Start revving - if ((cmd->buttons & BT_USE) && (player->speed < FixedMul(5<mo->scale) || player->mo->state - states == S_PLAY_GLIDE_LANDING) + if ((cmd->buttons & BT_SPIN) && (player->speed < FixedMul(5<mo->scale) || player->mo->state - states == S_PLAY_GLIDE_LANDING) && !player->mo->momz && onground && !(player->pflags & (PF_USEDOWN|PF_SPINNING)) && canstand) { @@ -4604,7 +4604,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) S_StartSound(player->mo, sfx_spndsh); // Make the rev sound! } // Revving - else if ((cmd->buttons & BT_USE) && (player->pflags & PF_STARTDASH)) + else if ((cmd->buttons & BT_SPIN) && (player->pflags & PF_STARTDASH)) { if (player->speed > 5*player->mo->scale) { @@ -4637,7 +4637,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) // If not moving up or down, and travelling faster than a speed of five while not holding // down the spin button and not spinning. // AKA Just go into a spin on the ground, you idiot. ;) - else if ((cmd->buttons & BT_USE || ((twodlevel || (player->mo->flags2 & MF2_TWOD)) && cmd->forwardmove < -20)) + else if ((cmd->buttons & BT_SPIN || ((twodlevel || (player->mo->flags2 & MF2_TWOD)) && cmd->forwardmove < -20)) && !player->climbing && !player->mo->momz && onground && (player->speed > FixedMul(5<mo->scale) || !canstand) && !(player->pflags & (PF_USEDOWN|PF_SPINNING))) { @@ -4690,7 +4690,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) P_SetTarget(&visual->target, lockon); } } - if ((cmd->buttons & BT_USE) && !(player->pflags & PF_USEDOWN)) + if ((cmd->buttons & BT_SPIN) && !(player->pflags & PF_USEDOWN)) { mobj_t *bullet; @@ -4726,7 +4726,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) } break; case CA2_MELEE: // Melee attack - if (player->panim != PA_ABILITY2 && (cmd->buttons & BT_USE) + if (player->panim != PA_ABILITY2 && (cmd->buttons & BT_SPIN) && !player->mo->momz && onground && !(player->pflags & PF_USEDOWN) && canstand) { @@ -5066,7 +5066,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } } } - if (cmd->buttons & BT_USE && !LUAh_ShieldSpecial(player)) // Spin button effects + if (cmd->buttons & BT_SPIN && !LUAh_ShieldSpecial(player)) // Spin button effects { // Force stop if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE) @@ -5140,7 +5140,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } } } - else if ((cmd->buttons & BT_USE)) + else if ((cmd->buttons & BT_SPIN)) { if (!(player->pflags & PF_USEDOWN) && P_SuperReady(player)) { @@ -5193,7 +5193,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) { if (player->pflags & PF_JUMPED) { - if (cmd->buttons & BT_USE && player->secondjump < 42) // speed up falling down + if (cmd->buttons & BT_SPIN && player->secondjump < 42) // speed up falling down player->secondjump++; if (player->flyangle > 0 && player->pflags & PF_THOKKED) @@ -6188,7 +6188,7 @@ static void P_SpectatorMovement(player_t *player) if (cmd->buttons & BT_JUMP) player->mo->z += FRACUNIT*16; - else if (cmd->buttons & BT_USE) + else if (cmd->buttons & BT_SPIN) player->mo->z -= FRACUNIT*16; if (player->mo->z > player->mo->ceilingz - player->mo->height) @@ -7410,7 +7410,7 @@ static void P_NiGHTSMovement(player_t *player) // No more bumper braking if (!player->bumpertime && ((cmd->buttons & (BT_CAMLEFT|BT_CAMRIGHT)) == (BT_CAMLEFT|BT_CAMRIGHT) - || (cmd->buttons & BT_USE))) + || (cmd->buttons & BT_SPIN))) { if (!(player->pflags & PF_STARTDASH)) S_StartSound(player->mo, sfx_ngskid); @@ -8464,7 +8464,7 @@ static void P_MovePlayer(player_t *player) S_StartSound(player->mo, sfx_putput); // Descend - if (cmd->buttons & BT_USE && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER)) + if (cmd->buttons & BT_SPIN && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER)) if (P_MobjFlip(player->mo)*player->mo->momz > -FixedMul(5*actionspd, player->mo->scale)) { if (player->fly1 > 2) @@ -8828,7 +8828,7 @@ static void P_DoRopeHang(player_t *player) player->mo->momy = FixedMul(FixedDiv(player->mo->tracer->y - player->mo->y, dist), (speed)); player->mo->momz = FixedMul(FixedDiv(player->mo->tracer->z - playerz, dist), (speed)); - if (player->cmd.buttons & BT_USE && !(player->pflags & PF_STASIS)) // Drop off of the rope + if (player->cmd.buttons & BT_SPIN && !(player->pflags & PF_STASIS)) // Drop off of the rope { player->pflags |= (P_GetJumpFlags(player)|PF_USEDOWN); P_SetPlayerMobjState(player->mo, S_PLAY_JUMP); @@ -9483,7 +9483,7 @@ static void P_DeathThink(player_t *player) // continue logic if (!(netgame || multiplayer) && player->lives <= 0) { - if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_USE || cmd->buttons & BT_JUMP) && (!continuesInSession || player->continues > 0)) + if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_SPIN || cmd->buttons & BT_JUMP) && (!continuesInSession || player->continues > 0)) G_UseContinue(); else if (player->deadtimer >= gameovertics) G_UseContinue(); // Even if we don't have one this handles ending the game @@ -11017,7 +11017,7 @@ static void P_MinecartThink(player_t *player) else if (detright && player->cmd.sidemove > 0) sidelock = detright; - //if (player->cmd.buttons & BT_USE && currentSpeed > 4*FRACUNIT) + //if (player->cmd.buttons & BT_SPIN && currentSpeed > 4*FRACUNIT) // currentSpeed -= FRACUNIT/8; // Jumping @@ -11694,7 +11694,7 @@ void P_PlayerThink(player_t *player) if ((gametyperules & GTR_RACE) && leveltime < 4*TICRATE) { - cmd->buttons &= BT_USE; // Remove all buttons except BT_USE + cmd->buttons &= BT_SPIN; // Remove all buttons except BT_SPIN cmd->forwardmove = 0; cmd->sidemove = 0; } @@ -12064,7 +12064,7 @@ void P_PlayerThink(player_t *player) // check for use if (player->powers[pw_carry] != CR_NIGHTSMODE) { - if (cmd->buttons & BT_USE) + if (cmd->buttons & BT_SPIN) player->pflags |= PF_USEDOWN; else player->pflags &= ~PF_USEDOWN; diff --git a/src/st_stuff.c b/src/st_stuff.c index 53d988913..947d2311f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1126,7 +1126,7 @@ static void ST_drawInput(void) V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|symb, false) drawbutt( 4,-3, BT_JUMP, 'J'); - drawbutt(15,-3, BT_USE, 'S'); + drawbutt(15,-3, BT_SPIN, 'S'); V_DrawFill(x+16+4, y+8, 21, 10, hudinfo[HUD_LIVES].f|20); // sundial backing if (stplyr->mo) diff --git a/src/y_inter.c b/src/y_inter.c index 58e0c4a88..914dc7691 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1017,7 +1017,7 @@ void Y_Ticker(void) return; for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && (players[i].cmd.buttons & BT_USE)) + if (playeringame[i] && (players[i].cmd.buttons & BT_SPIN)) skip = true; // bonuses count down by 222 each tic @@ -1094,7 +1094,7 @@ void Y_Ticker(void) for (i = 0; i < MAXPLAYERS; i++) if (playeringame[i]) { - if (players[i].cmd.buttons & BT_USE) + if (players[i].cmd.buttons & BT_SPIN) skip = true; if (players[i].charflags & SF_SUPER) super = true; From 457714e48081f7add4945ae30551190cf1184d8f Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 04:46:22 -0500 Subject: [PATCH 02/10] Remove 2 characters of whitespace This is what I get for using find+replace I guess lol --- src/d_ticcmd.h | 2 +- src/st_stuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index 74a92a823..c0e520a82 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -31,7 +31,7 @@ typedef enum BT_WEAPONPREV = 1<<5, BT_ATTACK = 1<<6, // shoot rings - BT_SPIN = 1<<7, // spin + BT_SPIN = 1<<7, // spin BT_CAMLEFT = 1<<8, // turn camera left BT_CAMRIGHT = 1<<9, // turn camera right BT_TOSSFLAG = 1<<10, diff --git a/src/st_stuff.c b/src/st_stuff.c index 947d2311f..13a89bd26 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1126,7 +1126,7 @@ static void ST_drawInput(void) V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|symb, false) drawbutt( 4,-3, BT_JUMP, 'J'); - drawbutt(15,-3, BT_SPIN, 'S'); + drawbutt(15,-3, BT_SPIN, 'S'); V_DrawFill(x+16+4, y+8, 21, 10, hudinfo[HUD_LIVES].f|20); // sundial backing if (stplyr->mo) From 7b4dee87e68a9e7de6db7a78843125558ddb18d0 Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 05:32:21 -0500 Subject: [PATCH 03/10] Remove unneeded comment --- src/d_ticcmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index c0e520a82..2a5ef0981 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -31,7 +31,7 @@ typedef enum BT_WEAPONPREV = 1<<5, BT_ATTACK = 1<<6, // shoot rings - BT_SPIN = 1<<7, // spin + BT_SPIN = 1<<7, BT_CAMLEFT = 1<<8, // turn camera left BT_CAMRIGHT = 1<<9, // turn camera right BT_TOSSFLAG = 1<<10, From 8616823d7da691a8252c16de4ff3867884f71ddd Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 05:34:39 -0500 Subject: [PATCH 04/10] Remove another unneeded comment --- src/dehacked.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dehacked.c b/src/dehacked.c index f1e977f35..a174418c0 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -9938,7 +9938,7 @@ struct { {"BT_WEAPONNEXT",BT_WEAPONNEXT}, {"BT_WEAPONPREV",BT_WEAPONPREV}, {"BT_ATTACK",BT_ATTACK}, // shoot rings - {"BT_SPIN",BT_SPIN}, // spin + {"BT_SPIN",BT_SPIN}, {"BT_CAMLEFT",BT_CAMLEFT}, // turn camera left {"BT_CAMRIGHT",BT_CAMRIGHT}, // turn camera right {"BT_TOSSFLAG",BT_TOSSFLAG}, From 8b140b1831a3d1fcfe5057910a4c0501c1ab3d0f Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 05:52:29 -0500 Subject: [PATCH 05/10] Replace 'use' with 'spin' in game control constants --- src/f_finale.c | 4 ++-- src/g_input.c | 20 ++++++++++---------- src/g_input.h | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 11f4ac475..21f355e99 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -4437,11 +4437,11 @@ static boolean F_GetTextPromptTutorialTag(char *tag, INT32 length) else if (!strncmp(tag, "TAJ", 3)) // Jump gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump); else if (!strncmp(tag, "TAS", 3)) // Spin - gcs = G_GetControlScheme(gamecontrol, gcl_use, num_gcl_use); + gcs = G_GetControlScheme(gamecontrol, gcl_spin, num_gcl_spin); else if (!strncmp(tag, "TAA", 3)) // Char ability gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump); else if (!strncmp(tag, "TAW", 3)) // Shield ability - gcs = G_GetControlScheme(gamecontrol, gcl_jump_use, num_gcl_jump_use); + gcs = G_GetControlScheme(gamecontrol, gcl_jump_spin, num_gcl_jump_spin); else gcs = G_GetControlScheme(gamecontrol, gcl_tutorial_used, num_gcl_tutorial_used); diff --git a/src/g_input.c b/src/g_input.c index ecce4d83c..441aa8dda 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -57,13 +57,13 @@ const INT32 gcl_tutorial_check[num_gcl_tutorial_check] = { const INT32 gcl_tutorial_used[num_gcl_tutorial_used] = { gc_forward, gc_backward, gc_strafeleft, gc_straferight, gc_turnleft, gc_turnright, - gc_jump, gc_use + gc_jump, gc_spin }; const INT32 gcl_tutorial_full[num_gcl_tutorial_full] = { gc_forward, gc_backward, gc_strafeleft, gc_straferight, gc_lookup, gc_lookdown, gc_turnleft, gc_turnright, gc_centerview, - gc_jump, gc_use, + gc_jump, gc_spin, gc_fire, gc_firenormal }; @@ -82,10 +82,10 @@ const INT32 gcl_movement_camera[num_gcl_movement_camera] = { const INT32 gcl_jump[num_gcl_jump] = { gc_jump }; -const INT32 gcl_use[num_gcl_use] = { gc_use }; +const INT32 gcl_spin[num_gcl_spin] = { gc_spin }; -const INT32 gcl_jump_use[num_gcl_jump_use] = { - gc_jump, gc_use +const INT32 gcl_jump_spin[num_gcl_jump_spin] = { + gc_jump, gc_spin }; typedef struct @@ -692,7 +692,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[gcs_fps][gc_turnright ][0] = KEY_RIGHTARROW; gamecontroldefault[gcs_fps][gc_centerview ][0] = KEY_END; gamecontroldefault[gcs_fps][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_fps][gc_use ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_fps][gc_spin ][0] = KEY_LSHIFT; gamecontroldefault[gcs_fps][gc_fire ][0] = KEY_RCTRL; gamecontroldefault[gcs_fps][gc_fire ][1] = KEY_MOUSE1+0; gamecontroldefault[gcs_fps][gc_firenormal ][0] = 'c'; @@ -708,7 +708,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW; gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END; gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE; - gamecontroldefault[gcs_platform][gc_use ][0] = KEY_LSHIFT; + gamecontroldefault[gcs_platform][gc_spin ][0] = KEY_LSHIFT; gamecontroldefault[gcs_platform][gc_fire ][0] = 's'; gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0; gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w'; @@ -743,7 +743,7 @@ void G_DefineDefaultControls(void) gamecontroldefault[i][gc_weaponnext ][1] = KEY_JOY1+1; // B gamecontroldefault[i][gc_weaponprev ][1] = KEY_JOY1+2; // X gamecontroldefault[i][gc_tossflag ][1] = KEY_JOY1+0; // A - gamecontroldefault[i][gc_use ][1] = KEY_JOY1+4; // LB + gamecontroldefault[i][gc_spin ][1] = KEY_JOY1+4; // LB gamecontroldefault[i][gc_camtoggle ][1] = KEY_HAT1+0; // D-Pad Up gamecontroldefault[i][gc_camreset ][1] = KEY_JOY1+3; // Y gamecontroldefault[i][gc_centerview ][1] = KEY_JOY1+9; // Right Stick @@ -758,7 +758,7 @@ void G_DefineDefaultControls(void) gamecontrolbisdefault[i][gc_weaponnext][0] = KEY_2JOY1+1; // B gamecontrolbisdefault[i][gc_weaponprev][0] = KEY_2JOY1+2; // X gamecontrolbisdefault[i][gc_tossflag ][0] = KEY_2JOY1+0; // A - gamecontrolbisdefault[i][gc_use ][0] = KEY_2JOY1+4; // LB + gamecontrolbisdefault[i][gc_spin ][0] = KEY_2JOY1+4; // LB gamecontrolbisdefault[i][gc_camreset ][0] = KEY_2JOY1+3; // Y gamecontrolbisdefault[i][gc_centerview][0] = KEY_2JOY1+9; // Right Stick gamecontrolbisdefault[i][gc_jump ][0] = KEY_2JOY1+5; // RB @@ -890,7 +890,7 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT if (GETMAJOREXECVERSION(cv_execversion.value) < 27 && ( // v2.1.22 numctrl == gc_weaponnext || numctrl == gc_weaponprev || numctrl == gc_tossflag || - numctrl == gc_use || numctrl == gc_camreset || numctrl == gc_jump || + numctrl == gc_spin || numctrl == gc_camreset || numctrl == gc_jump || numctrl == gc_pause || numctrl == gc_systemmenu || numctrl == gc_camtoggle || numctrl == gc_screenshot || numctrl == gc_talkkey || numctrl == gc_scores || numctrl == gc_centerview diff --git a/src/g_input.h b/src/g_input.h index a7484c7ad..ce38f6ba9 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -80,7 +80,7 @@ typedef enum gc_fire, gc_firenormal, gc_tossflag, - gc_use, + gc_spin, gc_camtoggle, gc_camreset, gc_lookup, @@ -141,8 +141,8 @@ extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2]; #define num_gcl_camera 2 #define num_gcl_movement_camera 6 #define num_gcl_jump 1 -#define num_gcl_use 1 -#define num_gcl_jump_use 2 +#define num_gcl_spin 1 +#define num_gcl_jump_spin 2 extern const INT32 gcl_tutorial_check[num_gcl_tutorial_check]; extern const INT32 gcl_tutorial_used[num_gcl_tutorial_used]; @@ -151,8 +151,8 @@ extern const INT32 gcl_movement[num_gcl_movement]; extern const INT32 gcl_camera[num_gcl_camera]; extern const INT32 gcl_movement_camera[num_gcl_movement_camera]; extern const INT32 gcl_jump[num_gcl_jump]; -extern const INT32 gcl_use[num_gcl_use]; -extern const INT32 gcl_jump_use[num_gcl_jump_use]; +extern const INT32 gcl_spin[num_gcl_spin]; +extern const INT32 gcl_jump_spin[num_gcl_jump_spin]; // peace to my little coder fingers! // check a gamecontrol being active or not From 999d8018ca35f6fa7e9b3049abf067383082c03c Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 05:57:32 -0500 Subject: [PATCH 06/10] Oops! Missed a couple... --- src/g_game.c | 2 +- src/m_menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index ab0bdd265..c2649d60f 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1340,7 +1340,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // use with any button/key axis = PlayerJoyAxis(ssplayer, AXISSPIN); - if (PLAYERINPUTDOWN(ssplayer, gc_use) || (usejoystick && axis > 0)) + if (PLAYERINPUTDOWN(ssplayer, gc_spin) || (usejoystick && axis > 0)) cmd->buttons |= BT_SPIN; // Centerview can be a toggle in simple mode! diff --git a/src/m_menu.c b/src/m_menu.c index 131f72c76..70de842b2 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1116,7 +1116,7 @@ static menuitem_t OP_ChangeControlsMenu[] = {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, gc_strafeleft }, {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, gc_straferight }, {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, gc_jump }, - {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, gc_use }, + {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, gc_spin }, {IT_HEADER, NULL, "Camera", NULL, 0}, {IT_SPACE, NULL, NULL, NULL, 0}, // padding {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, gc_lookup }, From 1f1589384a3d4b407469d88aa5e39e1492c620af Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 06:16:28 -0500 Subject: [PATCH 07/10] Replace PF_USEDOWN with PF_SPINDOWN --- src/d_player.h | 2 +- src/dehacked.c | 2 +- src/g_game.c | 2 +- src/p_user.c | 36 ++++++++++++++++++------------------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 26086a331..bd33ebae5 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -115,7 +115,7 @@ typedef enum // True if button down last tic. PF_ATTACKDOWN = 1<<7, - PF_USEDOWN = 1<<8, + PF_SPINDOWN = 1<<8, PF_JUMPDOWN = 1<<9, PF_WPNDOWN = 1<<10, diff --git a/src/dehacked.c b/src/dehacked.c index a174418c0..31ba91bd5 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -9049,7 +9049,7 @@ static const char *const PLAYERFLAG_LIST[] = { // True if button down last tic. "ATTACKDOWN", - "USEDOWN", + "SPINDOWN", "JUMPDOWN", "WPNDOWN", diff --git a/src/g_game.c b/src/g_game.c index c2649d60f..cd2b2fad0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2570,7 +2570,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) p->spheres = spheres; // Don't do anything immediately - p->pflags |= PF_USEDOWN; + p->pflags |= PF_SPINDOWN; p->pflags |= PF_ATTACKDOWN; p->pflags |= PF_JUMPDOWN; diff --git a/src/p_user.c b/src/p_user.c index a4aff1499..18313f283 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -665,7 +665,7 @@ static void P_DeNightserizePlayer(player_t *player) player->powers[pw_carry] = CR_NIGHTSFALL; player->powers[pw_underwater] = 0; - player->pflags &= ~(PF_USEDOWN|PF_JUMPDOWN|PF_ATTACKDOWN|PF_STARTDASH|PF_GLIDING|PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED|PF_SPINNING|PF_DRILLING|PF_TRANSFERTOCLOSEST); + player->pflags &= ~(PF_SPINDOWN|PF_JUMPDOWN|PF_ATTACKDOWN|PF_STARTDASH|PF_GLIDING|PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED|PF_SPINNING|PF_DRILLING|PF_TRANSFERTOCLOSEST); player->secondjump = 0; player->homing = 0; player->climbing = 0; @@ -795,7 +795,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime) } } - player->pflags &= ~(PF_USEDOWN|PF_JUMPDOWN|PF_ATTACKDOWN|PF_STARTDASH|PF_GLIDING|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED|PF_SHIELDABILITY|PF_SPINNING|PF_DRILLING); + player->pflags &= ~(PF_SPINDOWN|PF_JUMPDOWN|PF_ATTACKDOWN|PF_STARTDASH|PF_GLIDING|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED|PF_SHIELDABILITY|PF_SPINNING|PF_DRILLING); player->homing = 0; player->mo->fuse = 0; player->speed = 0; @@ -4592,12 +4592,12 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) case CA2_SPINDASH: // Spinning and Spindashing // Start revving if ((cmd->buttons & BT_SPIN) && (player->speed < FixedMul(5<mo->scale) || player->mo->state - states == S_PLAY_GLIDE_LANDING) - && !player->mo->momz && onground && !(player->pflags & (PF_USEDOWN|PF_SPINNING)) + && !player->mo->momz && onground && !(player->pflags & (PF_SPINDOWN|PF_SPINNING)) && canstand) { player->mo->momx = player->cmomx; player->mo->momy = player->cmomy; - player->pflags |= (PF_USEDOWN|PF_STARTDASH|PF_SPINNING); + player->pflags |= (PF_SPINDOWN|PF_STARTDASH|PF_SPINNING); player->dashspeed = player->mindash; P_SetPlayerMobjState(player->mo, S_PLAY_SPINDASH); if (!player->spectator) @@ -4639,16 +4639,16 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) // AKA Just go into a spin on the ground, you idiot. ;) else if ((cmd->buttons & BT_SPIN || ((twodlevel || (player->mo->flags2 & MF2_TWOD)) && cmd->forwardmove < -20)) && !player->climbing && !player->mo->momz && onground && (player->speed > FixedMul(5<mo->scale) - || !canstand) && !(player->pflags & (PF_USEDOWN|PF_SPINNING))) + || !canstand) && !(player->pflags & (PF_SPINDOWN|PF_SPINNING))) { - player->pflags |= (PF_USEDOWN|PF_SPINNING); + player->pflags |= (PF_SPINDOWN|PF_SPINNING); P_SetPlayerMobjState(player->mo, S_PLAY_ROLL); if (!player->spectator) S_StartSound(player->mo, sfx_spin); } else // Catapult the player from a spindash rev! - if (onground && !(player->pflags & PF_USEDOWN) && (player->pflags & PF_STARTDASH) && (player->pflags & PF_SPINNING)) + if (onground && !(player->pflags & PF_SPINDOWN) && (player->pflags & PF_STARTDASH) && (player->pflags & PF_SPINNING)) { player->pflags &= ~PF_STARTDASH; if (player->powers[pw_carry] == CR_BRAKGOOP) @@ -4690,7 +4690,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) P_SetTarget(&visual->target, lockon); } } - if ((cmd->buttons & BT_SPIN) && !(player->pflags & PF_USEDOWN)) + if ((cmd->buttons & BT_SPIN) && !(player->pflags & PF_SPINDOWN)) { mobj_t *bullet; @@ -4719,7 +4719,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) player->mo->momx >>= 1; player->mo->momy >>= 1; - player->pflags |= PF_USEDOWN; + player->pflags |= PF_SPINDOWN; P_SetWeaponDelay(player, TICRATE/2); } } @@ -4727,7 +4727,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) break; case CA2_MELEE: // Melee attack if (player->panim != PA_ABILITY2 && (cmd->buttons & BT_SPIN) - && !player->mo->momz && onground && !(player->pflags & PF_USEDOWN) + && !player->mo->momz && onground && !(player->pflags & PF_SPINDOWN) && canstand) { P_ResetPlayer(player); @@ -4767,7 +4767,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd) P_SetPlayerMobjState(player->mo, S_PLAY_MELEE); S_StartSound(player->mo, sfx_s3k42); } - player->pflags |= PF_USEDOWN; + player->pflags |= PF_SPINDOWN; } break; } @@ -5040,7 +5040,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) ; else if (player->pflags & (PF_GLIDING|PF_SLIDING|PF_SHIELDABILITY)) // If the player has used an ability previously ; - else if ((player->powers[pw_shield] & SH_NOSTACK) && !player->powers[pw_super] && !(player->pflags & PF_USEDOWN) + else if ((player->powers[pw_shield] & SH_NOSTACK) && !player->powers[pw_super] && !(player->pflags & PF_SPINDOWN) && ((!(player->pflags & PF_THOKKED) || ((player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP && player->secondjump == UINT8_MAX)))) // thokked is optional if you're bubblewrapped { if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT) @@ -5142,7 +5142,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } else if ((cmd->buttons & BT_SPIN)) { - if (!(player->pflags & PF_USEDOWN) && P_SuperReady(player)) + if (!(player->pflags & PF_SPINDOWN) && P_SuperReady(player)) { // If you can turn super and aren't already, // and you don't have a shield, do it! @@ -5172,7 +5172,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } break; case CA_TELEKINESIS: - if (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || (player->charflags & SF_MULTIABILITY)) + if (!(player->pflags & (PF_THOKKED|PF_SPINDOWN)) || (player->charflags & SF_MULTIABILITY)) { P_Telekinesis(player, -FixedMul(player->actionspd, player->mo->scale), // -ve thrust (pulling towards player) @@ -5180,7 +5180,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd) } break; case CA_TWINSPIN: - if ((player->charability2 == CA2_MELEE) && (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || player->charflags & SF_MULTIABILITY)) + if ((player->charability2 == CA2_MELEE) && (!(player->pflags & (PF_THOKKED|PF_SPINDOWN)) || player->charflags & SF_MULTIABILITY)) P_DoTwinSpin(player); break; default: @@ -8830,7 +8830,7 @@ static void P_DoRopeHang(player_t *player) if (player->cmd.buttons & BT_SPIN && !(player->pflags & PF_STASIS)) // Drop off of the rope { - player->pflags |= (P_GetJumpFlags(player)|PF_USEDOWN); + player->pflags |= (P_GetJumpFlags(player)|PF_SPINDOWN); P_SetPlayerMobjState(player->mo, S_PLAY_JUMP); P_SetTarget(&player->mo->tracer, NULL); @@ -12065,9 +12065,9 @@ void P_PlayerThink(player_t *player) if (player->powers[pw_carry] != CR_NIGHTSMODE) { if (cmd->buttons & BT_SPIN) - player->pflags |= PF_USEDOWN; + player->pflags |= PF_SPINDOWN; else - player->pflags &= ~PF_USEDOWN; + player->pflags &= ~PF_SPINDOWN; } // IF PLAYER NOT HERE THEN FLASH END IF From a2635b2b863e8cc7fba204c3cfc8c8379a52bcfd Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 07:30:32 -0500 Subject: [PATCH 08/10] The only "use" that I had to change to "spin" after a manual half hour search --- src/g_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_input.c b/src/g_input.c index 441aa8dda..55d91a8f5 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -583,7 +583,7 @@ static const char *gamecontrolname[num_gamecontrols] = "fire", "firenormal", "tossflag", - "use", + "spin", "camtoggle", "camreset", "lookup", From da3ab1a14c04b98ebf913fae05a408c4d87953e6 Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 07:50:58 -0500 Subject: [PATCH 09/10] Ok fiiineee, I'll support 2.2 --- src/dehacked.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/dehacked.c b/src/dehacked.c index 31ba91bd5..200be071c 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -10810,6 +10810,12 @@ static inline int lib_getenum(lua_State *L) lua_pushinteger(L, (lua_Integer)PF_FULLSTASIS); return 1; } + else if (fastcmp(p, "USEDOWN")) // Remove case when 2.3 nears release... + { + LUA_Deprecated(L, "PF_USEDOWN", "PF_SPINDOWN"); + lua_pushinteger(L, (lua_Integer)PF_SPINDOWN); + return 1; + } if (mathlib) return luaL_error(L, "playerflag '%s' could not be found.\n", word); return 0; } @@ -11076,6 +11082,13 @@ static inline int lib_getenum(lua_State *L) return 0; } + if (fastcmp(word, "BT_USE")) // Remove case when 2.3 nears release... + { + LUA_Deprecated(L, "BT_USE", "BT_SPIN"); + lua_pushinteger(L, (lua_Integer)BT_SPIN); + return 1; + } + for (i = 0; INT_CONST[i].n; i++) if (fastcmp(word,INT_CONST[i].n)) { lua_pushinteger(L, INT_CONST[i].v); From 572bafa0f917379af7e1c98216f32f010df29210 Mon Sep 17 00:00:00 2001 From: GoldenTails Date: Sat, 6 Jun 2020 12:21:52 -0500 Subject: [PATCH 10/10] Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility --- src/g_input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/g_input.c b/src/g_input.c index 55d91a8f5..1cf6990c9 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -996,7 +996,9 @@ static void setcontrol(INT32 (*gc)[2]) INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0); boolean nestedoverride = false; - namectrl = COM_Argv(1); + // Update me for 2.3 + namectrl = (stricmp(COM_Argv(1), "use")) ? COM_Argv(1) : "spin"; + for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]); numctrl++) ;