- removed dead weaponswitch variable

This commit is contained in:
Christoph Oelckers 2020-07-26 17:55:22 +02:00
parent f67d3270d8
commit 07a7cade70
5 changed files with 4 additions and 7 deletions

View file

@ -115,7 +115,7 @@ static void genspriteremaps(void)
for (int k = 0; k < 768; k++) // Build uses 6 bit VGA palettes.
paldata[k] = (paldata[k] << 2) | (paldata[k] >> 6);
paletteSetColorTable(j, paldata, j == DREALMSPAL || j == ENDINGPAL, j < DREALMSPAL);
paletteSetColorTable(j, paldata, j == DREALMSPAL || j == ENDINGPAL, j > SLIMEPAL);
}
for (int i = 0; i < 256; i++)
@ -403,7 +403,6 @@ static void Startup(void)
for (int j = numplayers; j < ud.multimode; j++)
{
mysnprintf(ud.user_name[j], sizeof(ud.user_name[j]), "%s %d", GStrings("PLAYER"), j + 1);
ps[j].weaponswitch = 3;
ps[j].auto_aim = 0;
}

View file

@ -79,7 +79,6 @@ void setlocalplayerinput(player_struct* pp)
{
pp->aim_mode = in_mousemode;
pp->auto_aim = cl_autoaim;
pp->weaponswitch = cl_weaponswitch;
}
//---------------------------------------------------------------------------

View file

@ -149,7 +149,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w,
("crack_time", w.crack_time)
("aim.mode", w.aim_mode)
("auto_aim", w.auto_aim)
("weaponswitch", w.weaponswitch)
("angvel", w.angvel)
("cursectnum", w.cursectnum)
("last_extra", w.last_extra)

View file

@ -69,7 +69,7 @@ struct user_defs
int folfvel, folavel, folx, foly, fola;
int reccnt;
int runkey_mode, weaponswitch;
int runkey_mode;
int entered_name, shadows, executions, auto_run;
int coords, tickrate, levelstats, m_coop, coop;
@ -124,7 +124,7 @@ struct player_struct
int bobcounter, weapon_sway;
int pals_time, randomflamex, crack_time;
int aim_mode, auto_aim, weaponswitch;
int aim_mode, auto_aim;
short angvel, cursectnum, last_extra, subweapon;
short ammo_amount[MAX_WEAPONS], wackedbyactor, frag, fraggedself;

View file

@ -927,7 +927,7 @@ OptionMenu GameplayOptions //protected
{
Option "$PLRMNU_EQUIP", "cl_weaponswitch", "OnOff" // does not have the 'preferred' option.
}
else
ifgame(Blood)
{
Option "$PLRMNU_EQUIP", "cl_weaponswitch", "WeapSwitch"
}