diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h index d388a6d00..e17224e25 100644 --- a/src/d_ticcmd.h +++ b/src/d_ticcmd.h @@ -34,9 +34,11 @@ typedef enum BT_DRIFT = 1<<2, // Drift (direction is cmd->turning) BT_BRAKE = 1<<3, // Brake BT_ATTACK = 1<<4, // Use Item - BT_LOOKBACK = 1<<5, // Look Backward + BT_FORWARD = 1<<5, // Aim Item Forward + BT_BACKWARD = 1<<6, // Aim Item Backward + BT_LOOKBACK = 1<<7, // Look Backward - // free: 1<<6 to 1<<12 + // free: 1<<8 to 1<<12 // Lua garbage BT_CUSTOM1 = 1<<13, diff --git a/src/deh_tables.c b/src/deh_tables.c index 147426203..7d4516bbe 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -11,6 +11,7 @@ /// \brief Define DeHackEd tables. #include "d_player.h" +#include "d_ticcmd.h" #include "doomdef.h" // Constants #include "s_sound.h" // Sound constants #include "info.h" // Mobj, state, sprite, etc constants @@ -6960,6 +6961,9 @@ struct int_const_s const INT_CONST[] = { {"BT_DRIFT",BT_DRIFT}, {"BT_BRAKE",BT_BRAKE}, {"BT_ATTACK",BT_ATTACK}, + {"BT_FORWARD",BT_FORWARD}, + {"BT_BACKWARD",BT_BACKWARD}, + {"BT_LOOKBACK",BT_LOOKBACK}, {"BT_CUSTOM1",BT_CUSTOM1}, // Lua customizable {"BT_CUSTOM2",BT_CUSTOM2}, // Lua customizable {"BT_CUSTOM3",BT_CUSTOM3}, // Lua customizable diff --git a/src/g_game.c b/src/g_game.c index a9be27b3e..f4d75918e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1089,9 +1089,15 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // But forward/backward IS used for aiming. if (PlayerInputDown(ssplayer, gc_aimforward)) + { + cmd->buttons |= BT_FORWARD; cmd->throwdir += KART_FULLTURN; + } if (PlayerInputDown(ssplayer, gc_aimbackward)) + { + cmd->buttons |= BT_BACKWARD; cmd->throwdir -= KART_FULLTURN; + } if (analogjoystickmove && joystickvector.yaxis != 0) {