diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5c7e872cc..84f514411 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1235,7 +1235,6 @@ enum { WP_KICKSTARTACCEL = 1<<0, WP_SHRINKME = 1<<1, WP_AUTOROULETTE = 1<<2, - WP_LITESTEER = 1<<3, }; void WeaponPref_Send(UINT8 ssplayer) @@ -1248,9 +1247,6 @@ void WeaponPref_Send(UINT8 ssplayer) if (cv_autoroulette[ssplayer].value) prefs |= WP_AUTOROULETTE; - if (cv_litesteer[ssplayer].value) - prefs |= WP_LITESTEER; - if (cv_shrinkme[ssplayer].value) prefs |= WP_SHRINKME; @@ -1269,9 +1265,6 @@ void WeaponPref_Save(UINT8 **cp, INT32 playernum) if (player->pflags & PF_AUTOROULETTE) prefs |= WP_AUTOROULETTE; - if (player->pflags & PF_LITESTEER) - prefs |= WP_LITESTEER; - if (player->pflags & PF_SHRINKME) prefs |= WP_SHRINKME; diff --git a/src/d_player.h b/src/d_player.h index 8411fd80f..261054ebd 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -103,9 +103,7 @@ typedef enum PF_RINGLOCK = 1<<13, // Prevent picking up rings while SPB is locked on - PF_LITESTEER = 1<<14, // Hold Down to shallow turn (digital only) - - //15-17 free, was previously itemflags stuff + //14-17 free, was previously itemflags stuff PF_DRIFTINPUT = 1<<18, // Drifting! PF_GETSPARKS = 1<<19, // Can get sparks diff --git a/src/deh_tables.c b/src/deh_tables.c index c39d4fb67..e627cec06 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -3994,7 +3994,7 @@ const char *const PLAYERFLAG_LIST[] = { "RINGLOCK", // Prevent picking up rings while SPB is locked on - "LITESTEER", // Shallow digital turn with DOWN + "\x01", // Free "\x01", // Free "\x01", // Free "\x01", // Free diff --git a/src/g_demo.c b/src/g_demo.c index 462482bdd..f3321cc90 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -125,7 +125,6 @@ demoghost *ghosts = NULL; #define DEMO_SHRINKME 0x04 #define DEMO_BOT 0x08 #define DEMO_AUTOROULETTE 0x10 -#define DEMO_LITESTEER 0x20 // For demos #define ZT_FWD 0x0001 @@ -2218,8 +2217,6 @@ void G_BeginRecording(void) i |= DEMO_KICKSTART; if (player->pflags & PF_AUTOROULETTE) i |= DEMO_AUTOROULETTE; - if (player->pflags & PF_LITESTEER) - i |= DEMO_LITESTEER; if (player->pflags & PF_SHRINKME) i |= DEMO_SHRINKME; if (player->bot == true) @@ -3172,11 +3169,6 @@ void G_DoPlayDemo(const char *defdemoname) else players[p].pflags &= ~PF_AUTOROULETTE; - if (flags & DEMO_LITESTEER) - players[p].pflags |= PF_LITESTEER; - else - players[p].pflags &= ~PF_LITESTEER; - if (flags & DEMO_SHRINKME) players[p].pflags |= PF_SHRINKME; else diff --git a/src/g_game.c b/src/g_game.c index 4cd1a7f8d..a3f436cc2 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2189,7 +2189,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) totalring = players[player].totalring; xtralife = players[player].xtralife; - pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE|PF_AUTOROULETTE|PF_LITESTEER)); + pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE|PF_AUTOROULETTE)); // SRB2kart memcpy(&itemRoulette, &players[player].itemRoulette, sizeof (itemRoulette));