From 6532485a933626dd788da422f5d5efaa6d1de8fe Mon Sep 17 00:00:00 2001
From: Major Cooke <majorcooke22@gmail.com>
Date: Tue, 26 Nov 2019 09:36:35 -0600
Subject: [PATCH] Revert "Re-merged EdTheBat's submission now that the language
 file has been fixed."

This reverts commit b13c5553815e5b7ee55a98b74902a344037a1fe6.
---
 src/gamedata/a_weapons.cpp   | 10 +---------
 src/gamedata/keysections.cpp | 38 ++----------------------------------
 wadsrc/static/language.csv   |  3 +--
 wadsrc/static/menudef.txt    |  1 -
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/src/gamedata/a_weapons.cpp b/src/gamedata/a_weapons.cpp
index c2840ca28..fe5761222 100644
--- a/src/gamedata/a_weapons.cpp
+++ b/src/gamedata/a_weapons.cpp
@@ -544,9 +544,6 @@ 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)
@@ -592,12 +589,7 @@ CCMD (setslot)
 	}
 	else if (PlayingKeyConf != nullptr)
 	{
-		// 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);
-		}
+		PlayingKeyConf->ClearSlot(slot);
 		for (int i = 2; i < argv.argc(); ++i)
 		{
 			PlayingKeyConf->AddWeapon(slot, argv[i]);
diff --git a/src/gamedata/keysections.cpp b/src/gamedata/keysections.cpp
index 16d2a7920..7076ebbaa 100644
--- a/src/gamedata/keysections.cpp
+++ b/src/gamedata/keysections.cpp
@@ -223,45 +223,11 @@ void D_LoadWadSettings ()
 	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)
 {
 	if (ParsingKeyConf)
-	{	
-		// 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"));
-		}
+	{
+		PlayerClasses.Clear();
 	}
 }
 
diff --git a/wadsrc/static/language.csv b/wadsrc/static/language.csv
index 4b903872d..5e24123db 100644
--- a/wadsrc/static/language.csv
+++ b/wadsrc/static/language.csv
@@ -2770,7 +2770,6 @@ Save/Load confirmation,MISCMNU_SAVELOADCONFIRMATION,,,,Potvrzení o uložení/na
 Enable making screenshots by scripts,MISCMNU_ENABLESCRIPTSCREENSHOTS,,,,Povolit skriptům pořizovat snímky obrazovky,"Erlaube Skripts, Screenshots zu machen",,Aktivigi faranto ekrankopiojn per skriptoj,Habilitar captura de pantalla por scripts,,Salli komentosarjoin otetut kuvakaappaukset,Autoriser les Scripts à prendre des captures,,Abilita la cattura dello schermo tramite scripts,スクリプトからのスクショ作成を有効化,저장/불러오기 확인,Screenshots maken met behulp van scripts,Pozwól na robienie zrzutów ekranu przez skrypty,Habilitar capturas de tela por scripts,Permitir capturas de ecrã por scripts,,Возможность делать скриншоты через скрипты,Омогући прављење скриншотова по скрипти
 Load *.deh/*.bex lumps,MISCMNU_DEHLOAD,,,,Načítat *.deh/*.bex soubory,Lade *.deh/*.bex Daten,,Ŝarĝi *.deh/*.bex lumpoj,Cargar archivos *.deh/*.bex,,Lataa *.deh/*.bex-lump-tiedostot,Charger fichiers *.deh/*.bex,,Carica i lump *.deh/*.bex,.deh/.bexファイルを読み込む,*.deh/*.bex 럼프 파일 불러오기,*.deh/*.bex laden,Załaduj dane *.deh/*.bex,Carregar lumps *.deh/*.bex,,,Загружать файлы *.deh/*.bex,Учитај *.deh/*.bex фајлове
 Cache nodes,MISCMNU_CACHENODES,,,,Cachovat nodes,Nodes zwischenspeichern,,Kaŝmemoraj nodoj,Caché de nodos,,Tallenna solmut välimuistiin,Mise en cache des nodes,,Cache dei nodi,ノードキャッシュ,캐시 노드,Cache nodes,Węzły pamięci podręcznej,Cachê de nodes,Cache de nodes,,Кэширование нодов,Кеширани чворови
-Strict KEYCONF Weapons/Players,MISCMNU_SETSLOTSTRICT,,,,,,,,,,,,,,,,,,,,,,
 Time threshold for node caching,MISCMNU_CACHETIME,,,,Časový práh pro cachování nodes,Zeitschwelle für das Zwischenspeichern von Nodes,,Templimo pro kaŝmemornodi,Umbral de tiempo para caché de nodos,,Kynnysaika solmujen välimuistitallennukseen,Limite cache des nodes,,Soglia di tempo per il caching dei nodi,ノードキャッシュ時間の閾値,노드 캐싱을 위한 시간 임계값 계산,Tijdsdrempel voor het cachen van nodes,Próg czasowy buforowania węzłów,Limite de tempo para cachê de nodes,Limite de tempo para cache de nodes,,Временной порог для кэширования нодов,Временски праг за кеширање чвора
 Clear node cache,MISCMNU_CLEARNODECACHE,,,,Vyčistit node cache,Nodespeicher löschen,,Klari kaŝmemorajn nodojn,Limpiar Caché de nodos,,Tyhjennä solmuvälimuisti,Vider le cache des nodes,,Pulisci la cache dei nodi,ノードのキャッシュをクリア,노드 캐시를 삭제,Duidelijke node cache,Wyczyść pamięć podręczną,Limpar cachê de nodes,Limpar cache de nodes,,Очистить кэш нодов,"Избриши кеширане чворове
 "
@@ -3604,4 +3603,4 @@ Standard,OPTVAL_YES_STANDARD,copied from elsewhere,,,Standardní,,,Norma,Estánd
 Enhanced,OPTVAL_YES_ENHANCED,,,,Vylepšené,Verbessert,,Bonigita,Mejorado,,Paranneltu,Amélioré,,Migliorata,強化,고급,Verbeterd,Ulepszone,Melhorado,,,Улучшенный,Побољшани
 ,USE_GENERIC_FONT,This is not a text to be translated but an engine switch for complex languages.,,,,,,,,,,,,,1,1,,,,,,,
 ,REQUIRED_CHARACTERS,This should list all uppercase characters that are REQUIRED for proper language display. If it is acceptable that accents get omitted a character should NOT be listed here!,,,ÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ,ÄÖÜẞ,ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩς,ĈĜĤĴŜŬ,ÁÉÍÓÚÑÜ,,ÄÖ,ÀÂÇÉÈÊËÎÏÔŒÙÛŸ,ÁÉÍÓÖÚÜŐŰ,ÀÈÉÌÒÙ,,,"ÉËÖ
-",ĄĆĘŁŃÓŚŹŻ,ÁÉÍÓÚÀÃÕÂÊÔÇ,,,АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ,АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШ
+",ĄĆĘŁŃÓŚŹŻ,ÁÉÍÓÚÀÃÕÂÊÔÇ,,,АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ,АБВГДЂЕЖЗИЈКЛЉМНЊОПРСТЋУФХЦЧЏШ
\ No newline at end of file
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index f9dc6759d..fa46b7307 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1195,7 +1195,6 @@ OptionMenu "MiscOptions" protected
 	Option "$MISCMNU_QUICKSAVEROTATION",			"quicksaverotation", "OnOff"
 	Slider "$MISCMNU_QUICKSAVECOUNT",			"quicksaverotationcount", 1, 20, 1, 0
 	Option "$MISCMNU_DEHLOAD",					"dehload", "dehopt"
-	Option "$MISCMNU_SETSLOTSTRICT",			"setslotstrict", "YesNo"
 	Option "$MISCMNU_ENABLESCRIPTSCREENSHOTS",		"enablescriptscreenshot", "OnOff"
 	Option "$MISCMNU_INTERSCROLL",				"nointerscrollabort", "OffOn"
 	StaticText " "