zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-09 01:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged https://github.com/coelckers/gzdoom/pull/980

Browse source
This commit is contained in:
Major Cooke 2020-04-13 10:51:44 -05:00
parent e0573c8a17
commit a5776822ea
3 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gamedata/a_weapons.cpp
View file

@ -544,6 +544,9 @@ int FWeaponSlots::RestoreSlots(FConfigFile *config, const char *section)
// //
//=========================================================================== //===========================================================================
// Strict handling of SetSlot and ClearPlayerClasses in KEYCONF
CVAR(Bool,setslotstrict,true,CVAR_ARCHIVE);
void FWeaponSlots::PrintSettings() void FWeaponSlots::PrintSettings()
{ {
for (int i = 1; i <= NUM_WEAPON_SLOTS; ++i) for (int i = 1; i <= NUM_WEAPON_SLOTS; ++i)
@ -589,7 +592,12 @@ CCMD (setslot)
} }
else if (PlayingKeyConf != nullptr) else if (PlayingKeyConf != nullptr)
{ {
PlayingKeyConf->ClearSlot(slot); // Only clear the slot first if setslotstrict is true
// If not, we'll just add to the slot without clearing it
if(setslotstrict)
{
PlayingKeyConf->ClearSlot(slot);
}
for (int i = 2; i < argv.argc(); ++i) for (int i = 2; i < argv.argc(); ++i)
{ {
PlayingKeyConf->AddWeapon(slot, argv[i]); PlayingKeyConf->AddWeapon(slot, argv[i]);

38
src/gamedata/keysections.cpp
View file

@ -223,11 +223,45 @@ void D_LoadWadSettings ()
ParsingKeyConf = false; ParsingKeyConf = false;
} }
// Strict handling of SetSlot and ClearPlayerClasses in KEYCONF (see a_weapons.cpp)
EXTERN_CVAR (Bool, setslotstrict)
// Specifically hunt for and remove IWAD playerclasses
void ClearIWADPlayerClasses (PClassActor *ti)
{
for(unsigned i=0; i < PlayerClasses.Size(); i++)
{
if(PlayerClasses[i].Type==ti)
{
for(unsigned j = i; j < PlayerClasses.Size()-1; j++)
{
PlayerClasses[j] = PlayerClasses[j+1];
}
PlayerClasses.Pop();
}
}
}
CCMD(clearplayerclasses) CCMD(clearplayerclasses)
{ {
if (ParsingKeyConf) if (ParsingKeyConf)
{ {
PlayerClasses.Clear(); // Only clear the playerclasses first if setslotstrict is true
// If not, we'll only remove the IWAD playerclasses
if(setslotstrict)
PlayerClasses.Clear();
else
{
// I wish I had a better way to pick out IWAD playerclasses
// without having to explicitly name them here...
ClearIWADPlayerClasses(PClass::FindActor("DoomPlayer"));
ClearIWADPlayerClasses(PClass::FindActor("HereticPlayer"));
ClearIWADPlayerClasses(PClass::FindActor("StrifePlayer"));
ClearIWADPlayerClasses(PClass::FindActor("FighterPlayer"));
ClearIWADPlayerClasses(PClass::FindActor("ClericPlayer"));
ClearIWADPlayerClasses(PClass::FindActor("MagePlayer"));
ClearIWADPlayerClasses(PClass::FindActor("ChexPlayer"));
}
} }
} }

1
wadsrc/static/menudef.txt
View file

@ -1204,6 +1204,7 @@ OptionMenu "MiscOptions" protected
Option "$MISCMNU_QUICKSAVEROTATION", "quicksaverotation", "OnOff" Option "$MISCMNU_QUICKSAVEROTATION", "quicksaverotation", "OnOff"
Slider "$MISCMNU_QUICKSAVECOUNT", "quicksaverotationcount", 1, 20, 1, 0 Slider "$MISCMNU_QUICKSAVECOUNT", "quicksaverotationcount", 1, 20, 1, 0
Option "$MISCMNU_DEHLOAD", "dehload", "dehopt" Option "$MISCMNU_DEHLOAD", "dehload", "dehopt"
Option "$MISCMNU_SETSLOTSTRICT", "setslotstrict", "YesNo"
Option "$MISCMNU_ENABLESCRIPTSCREENSHOTS", "enablescriptscreenshot", "OnOff" Option "$MISCMNU_ENABLESCRIPTSCREENSHOTS", "enablescriptscreenshot", "OnOff"
Option "$MISCMNU_INTERSCROLL", "nointerscrollabort", "OffOn" Option "$MISCMNU_INTERSCROLL", "nointerscrollabort", "OffOn"
StaticText " " StaticText " "