OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'refs/pull/980/head' of https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	wadsrc/static/menudef.txt
This commit is contained in:
Rachael Alexanderson 2020-08-25 11:32:10 -04:00
commit 5f9377ae2a
3 changed files with 46 additions and 4 deletions
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()
{
for (int i = 1; i <= NUM_WEAPON_SLOTS; ++i)
@ -589,7 +592,12 @@ CCMD (setslot)
}
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)
{
PlayingKeyConf->AddWeapon(slot, argv[i]);