Remove useless setting

data/languages/arabic.txt

@@ -21,7 +21,7 @@
 == ﺖﻀﻣ ﻦﻧﺍﻮﺛ %i
 
 %s wins!
-== !ﺯﺎﻓ %s 
+== !ﺯﺎﻓ %s
 
 -Page %d-
 == -ﺔﺤﻔﺻ &d-
@@ -765,9 +765,6 @@ AntiPing: predict weapons
 Highlighted message
 == ﻪﻴﺒﻨﺘﻟﺍ ﻞﺋﺎﺳﺭ
 
-Reset wanted weapon on death
-== ﺕﻮﻤﻟﺍ ﺪﻨﻋ ﺏﻮﻠﻄﻣ ﺡﻼﺳ ﻦﻴﻴﻌﺗ ﺓﺩﺎﻋﺇ
-
 Switch weapon when out of ammo
 == ﺓﺮﻴﺧﺬﻟﺍ ﺫﺎﻔﻧ ﺪﻨﻋ ﺡﻼﺴﻟﺍ ﺮﻴﻴﻐﺗ
 
@@ -802,7 +799,7 @@ Reset
 == ﻦﻴﻴﻌﺗ ﺓﺩﺎﻋﺇ
 
 Automatically create statboard csv
-== statboard ﻞﻤﻋ ﻲﺋﺎﻘﻠﺗ 
+== statboard ﻞﻤﻋ ﻲﺋﺎﻘﻠﺗ
 
 Show tiles layers from BG map
 == ﺔﻴﻔﻠﺨﻟﺍ ﺏﺎﻤﻠﻟ ﺐﻧﺎﺠﺘﻟﺍ ﺕﺎﻘﺒﻃ ﺭﺎﻬﻇﺇ

data/languages/belarusian.txt

@@ -859,9 +859,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show only chat messages from friends
 == 
 

data/languages/bosnian.txt

@@ -775,9 +775,6 @@ Save
 Switch weapon when out of ammo
 == Promijeni oružje kada nestane municije
 
-Reset wanted weapon on death
-== Resetuj željeno oružije prilikom smrti
-
 Show only chat messages from friends
 == Prikaži čat poruke samo od prijatelja
 

data/languages/brazilian_portuguese.txt

@@ -860,9 +860,6 @@ Highlighted message
 Alpha
 == Alfa
 
-Reset wanted weapon on death
-== Redefinir arma desejada ao morrer
-
 Length:
 == Duração:
 

data/languages/bulgarian.txt

@@ -856,9 +856,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show only chat messages from friends
 == 
 

data/languages/catalan.txt

@@ -738,9 +738,6 @@ Threaded sound loading
 Check now
 == Comprova ara
 
-Reset wanted weapon on death
-== Reiniciar l'arma desitjada al morir
-
 Frags
 == Morts causades
 
@@ -1084,7 +1081,7 @@ The width of texture %s is not divisible by %d, or the height is not divisible b
 == La mida de la textura %s no es divisible per %d, o l'altura no es divisible per %d, el qual pot resultar en errors visuals.
 
 Warning
-== Advertència 
+== Advertència
 
 Debug mode enabled. Press Ctrl+Shift+D to disable debug mode.
 == Mode de depuració activat. Utilitza Ctrl+Shift+D per desactivar-lo.
@@ -1219,7 +1216,7 @@ Client message
 == Missatge del client
 
 Preview
-== Vista prèvia 
+== Vista prèvia
 
 Show local player's key presses
 == Mostrar les tecles premudes del jugador local
@@ -1277,7 +1274,7 @@ Editor
 
 [Start menu]
 Play
-== Jugar 
+== Jugar
 
 AFR
 == AFR

data/languages/chuvash.txt

@@ -859,9 +859,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show only chat messages from friends
 == 
 

data/languages/czech.txt

@@ -691,7 +691,7 @@ Countries
 == Země
 
 Types
-== Typy 
+== Typy
 
 DDNet %s is out!
 == DDNet %s je venku!
@@ -765,9 +765,6 @@ Save
 Switch weapon when out of ammo
 == Změnit zbraň když vám dojdou náboje
 
-Reset wanted weapon on death
-== Resetujte hledanou zbraň po smrti
-
 Show only chat messages from friends
 == Zobrazit pouze zprávy od přátel
 

data/languages/danish.txt

@@ -609,7 +609,7 @@ Type:
 == Type:
 
 Successfully saved the replay!
-== Afspilning blev gemt! 
+== Afspilning blev gemt!
 
 Saving ddnet-settings.cfg failed
 == Gemning af ddnet-settings.cfg mislykkedes
@@ -809,9 +809,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == Skift våben, når du er ude af ammunition
 
-Reset wanted weapon on death
-== Nulstil ønsket våben ved døden
-
 Show only chat messages from friends
 == Vis kun chatbeskeder fra venner
 
@@ -1131,7 +1128,7 @@ Run server
 == Kør server
 
 Server executable not found, can't run server
-== Server eksekverbar blev ikke fundet, kan ikke køre server 
+== Server eksekverbar blev ikke fundet, kan ikke køre server
 
 Editor
 == Redaktør

data/languages/dutch.txt

@@ -787,9 +787,6 @@ Save
 Switch weapon when out of ammo
 == Verander wapen wanneer de munitie op is
 
-Reset wanted weapon on death
-== Reset gewild wapen bij het doodgaan
-
 Show only chat messages from friends
 == Laat alleen berichten van vrienden zien
 

data/languages/finnish.txt

@@ -841,9 +841,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == Vaihda asetta ammusten loppuessa
 
-Reset wanted weapon on death
-== Palauta haluttu ase kuollessa
-
 Show only chat messages from friends
 == Näytä chattiviestit vain ystäviltä
 

data/languages/french.txt

@@ -625,18 +625,6 @@ Name plates size
 Type:
 == Type :
 
-
-##### generated by copy_fix.py, please translate this #####
-
-
-##### generated by copy_fix.py, please translate this #####
-
-
-##### generated by copy_fix.py, please translate this #####
-
-
-##### generated by copy_fix.py, please translate this #####
-
 Enable game sounds
 == Activer les sons du jeu
 
@@ -646,9 +634,6 @@ DDNet Client needs to be restarted to complete update!
 Toggle dummy
 == Basculer vers le dummy
 
-Reset wanted weapon on death
-== Réinitialiser l'arme choisie après être mort
-
 No updates available
 == Pas de mise à jour disponible
 

data/languages/german.txt

@@ -790,9 +790,6 @@ AntiPing: predict weapons
 Highlighted message
 == Hervorgehobene Nachricht
 
-Reset wanted weapon on death
-== Waffe beim Tod zurücksetzen
-
 Switch weapon when out of ammo
 == Waffe wechseln wenn Munition leer ist
 

data/languages/greek.txt

@@ -862,9 +862,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show clan above name plates
 == 
 

data/languages/hungarian.txt

@@ -727,9 +727,6 @@ Remove chat
 Check now
 == Nézd meg
 
-Reset wanted weapon on death
-== Újraéledéskor váltson az akart fegyverre
-
 Frags
 == Zászlók
 

data/languages/italian.txt

@@ -841,9 +841,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == Cambia arma quando senza munizioni
 
-Reset wanted weapon on death
-== Resetta l'arma voluta quando muori
-
 Show only chat messages from friends
 == Mostra solo messaggi da parte di amici
 
@@ -923,10 +920,10 @@ Toggle ghost
 == Attiva/disattiva ghost
 
 Dummy copy
-== Dummy copy 
+== Dummy copy
 
 Hammerfly dummy
-== Hammerfly dummy 
+== Hammerfly dummy
 
 Laser
 == Laser/cecchino

data/languages/japanese.txt

@@ -817,9 +817,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 弾薬切れの時に武器を切り替え
 
-Reset wanted weapon on death
-== 死亡時に武器をデフォルトにリセット
-
 Show only chat messages from friends
 == 友たちからのメッセージのみを表示
 

data/languages/korean.txt

@@ -831,9 +831,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 탄약 고갈 시 무기 교체
 
-Reset wanted weapon on death
-== 사망 시 기본 무기로 전환
-
 Show clan above name plates
 == 이름 위에 클랜 표시
 
@@ -1319,13 +1316,13 @@ AUS
 == 호주
 
 EUR
-== 유럽 
+== 유럽
 
 NA
-== 북미 
+== 북미
 
 SA
-== 남미 
+== 남미
 
 CHN
 == 중국
@@ -1367,7 +1364,7 @@ Allows maps to render with more detail
 == 맵의 세부사항을 렌더링합니다.
 
 When you cross the start line, show a ghost tee replicating the movements of your best time
-== 출발선을 넘으면 당신의 최고 기록을 재현하는 고스트 Tee가 표시됩니다. 
+== 출발선을 넘으면 당신의 최고 기록을 재현하는 고스트 Tee가 표시됩니다.
 
 Opacity
 == 불투명도

data/languages/kyrgyz.txt

@@ -853,9 +853,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show clan above name plates
 == 
 

data/languages/norwegian.txt

@@ -777,9 +777,6 @@ Save
 Switch weapon when out of ammo
 == Bytt våpen ved tom ammo
 
-Reset wanted weapon on death
-== Tilbakestill våpen ved død
-
 Show only chat messages from friends
 == Vis kun meldinger fra venner
 

data/languages/persian.txt

@@ -556,9 +556,6 @@ Switch weapon on pickup
 Switch weapon when out of ammo
 == ﺕﺎﻤﻬﻣ ﻥﺪﺷ ﻡﺎﻤﺗ ﻡﺎﮕﻨﻫ ﻪﺤﻠﺳﺍ ﺮﯿﯿﻐﺗ
 
-Reset wanted weapon on death
-== گﺮﻣ ﺯﺍ ﺪﻌﺑ ﻪﺤﻠﺳﺍ ﯽﻧﺎﺸﻧﺯﺎﺑ
-
 Show only chat messages from friends
 == ﻩﺪﺑ ﻥﺎﺸﻧ ﺍﺭ ﻥﺎﺘﺳﻭﺩ ﺖﭼ ﻂﻘﻓ
 

data/languages/polish.txt

@@ -679,9 +679,6 @@ Select a name
 Switch weapon when out of ammo
 == Zmień broń, gdy skończy się amunicja
 
-Reset wanted weapon on death
-== Zresetuj broń, którą chcesz podnieść po śmierci
-
 Dummy settings
 == Ustawienia dummy
 

data/languages/portuguese.txt

@@ -1097,9 +1097,6 @@ Pause
 Smooth Dynamic Camera
 == 
 
-Reset wanted weapon on death
-== 
-
 Skip the main menu
 == 
 

data/languages/romanian.txt

@@ -868,9 +868,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show clan above name plates
 == 
 

data/languages/russian.txt

@@ -450,9 +450,6 @@ Switch weapon on pickup
 Switch weapon when out of ammo
 == Переключать оружие без патронов
 
-Reset wanted weapon on death
-== Сбрасывать выбор оружия при смерти
-
 Show only chat messages from friends
 == Показывать сообщения только от друзей
 
@@ -616,7 +613,7 @@ Join game
 == Играть
 
 FSAA samples
-== FSAA сэмплов 
+== FSAA сэмплов
 
 Sound volume
 == Громкость звука

data/languages/serbian.txt

@@ -863,9 +863,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show only chat messages from friends
 == 
 

data/languages/serbian_cyrillic.txt

@@ -131,7 +131,7 @@ Disconnected
 == Прекинута веза
 
 Downloading map
-== Преузимам мапу 
+== Преузимам мапу
 
 Draw!
 == Нерешено!
@@ -808,9 +808,6 @@ Activate
 Switch weapon when out of ammo
 == Замени оружје кад нема муниције
 
-Reset wanted weapon on death
-== Ресетуј тражено оружје на смрт
-
 Show clan above name plates
 == Прикажи клан изнад плочице са именима
 
@@ -890,7 +887,7 @@ Dummy copy
 == Зајед. крет. копије
 
 Hammerfly dummy
-== Лет. чекићем коп. 
+== Лет. чекићем коп.
 
 Converse
 == Сви дописивање

data/languages/simplified_chinese.txt

@@ -499,9 +499,6 @@ Show clan above name plates
 Clan plates size
 == 战队名称大小
 
-Reset wanted weapon on death
-== 死亡后自动切换回默认武器
-
 Team
 == 队伍
 
@@ -1055,7 +1052,7 @@ Toggle dyncam
 == 动态视野开关
 
 DDraceNetwork is a cooperative online game where the goal is for you and your group of tees to reach the finish line of the map. As a newcomer you should start on Novice servers, which host the easiest maps. Consider the ping to choose a server close to you.
-== DDraceNetwork 是一款在线合作游戏，你和你团体里的 Tee 的目标是抵达地图的终点。作为新手你应该从有着最简单的地图的简单（Novice） 服务器入门。根据延迟来选择离你相近的服务器。 
+== DDraceNetwork 是一款在线合作游戏，你和你团体里的 Tee 的目标是抵达地图的终点。作为新手你应该从有着最简单的地图的简单（Novice） 服务器入门。根据延迟来选择离你相近的服务器。
 
 It's recommended that you check the settings to adjust them to your liking before joining a server.
 == 建议你在进入服务器前检查一下设置并根据你的喜好进行调整。

data/languages/slovak.txt

@@ -859,9 +859,6 @@ Smooth Dynamic Camera
 Switch weapon when out of ammo
 == 
 
-Reset wanted weapon on death
-== 
-
 Show only chat messages from friends
 == 
 

data/languages/spanish.txt

@@ -790,9 +790,6 @@ Save
 Switch weapon when out of ammo
 == Cambiar de arma cuando se acabe la munición
 
-Reset wanted weapon on death
-== Restablecer el arma deseada al morir
-
 Show clan above name plates
 == Mostrar el clan por encima de los nombres
 
@@ -1356,7 +1353,7 @@ Graphics cards
 == Tarjetas de video
 
 auto
-== auto. 
+== auto.
 
 Tutorial
 == Tutorial

data/languages/swedish.txt

@@ -631,7 +631,7 @@ Default zoom
 == Standard zoom
 
 Dummy copy
-== Dummy kopiering 
+== Dummy kopiering
 
 Show tiles layers from BG map
 == Visa tiles lager från BG bana
@@ -804,9 +804,6 @@ Update failed! Check log...
 Check now
 == Kolla nu
 
-Reset wanted weapon on death
-== Återställ önskade vapen vid död
-
 Search
 == Sök
 

data/languages/traditional_chinese.txt

@@ -489,9 +489,6 @@ Show clan above name plates
 Clan plates size
 == 戰隊名稱大小
 
-Reset wanted weapon on death
-== 死亡後自動切換回預設武器
-
 Team
 == 隊伍
 

data/languages/turkish.txt

@@ -783,9 +783,6 @@ Save
 Switch weapon when out of ammo
 == Mermi kalmadığında silahı değiştir
 
-Reset wanted weapon on death
-== Ölünce varsayılan silahı kullan
-
 Show only chat messages from friends
 == Sadece arkadaşlardan gelen mesajları göster
 

data/languages/ukrainian.txt

@@ -736,14 +736,11 @@ Save
 Switch weapon when out of ammo
 == Змінювати зброю коли закінчились боєприпаси
 
-Reset wanted weapon on death
-== Скидати вибір зброї при смерті
-
 Show only chat messages from friends
 == Показувати повідомлення тільки від друзів
 
 Name plates size
-== Розмір ніків 
+== Розмір ніків
 
 Use team colors for name plates
 == Розфарбовувати ім'я гравця кольором команди
@@ -929,7 +926,7 @@ Show votes window after voting
 == Показувати голосування після вашого голосу
 
 Messages
-== Повідомлення 
+== Повідомлення
 
 System message
 == Системне повідомлення
@@ -1085,7 +1082,7 @@ Replay
 == Повтор
 
 Saving ddnet-settings.cfg failed
-== Збереження налаштувань невдалося 
+== Збереження налаштувань невдалося
 
 The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs.
 == Ширина або висота текстури %s не поділяється на %d, що може викликати візуальні помилки
@@ -1208,7 +1205,7 @@ Chat sound volume
 == Гучність звуку чату
 
 Background music volume
-== Гучність музики заднього фону 
+== Гучність музики заднього фону
 
 Assets
 == Текстури

src/engine/shared/config_variables.h

@@ -31,7 +31,6 @@ MACRO_CONFIG_INT(ClAutoScreenshot, cl_auto_screenshot, 0, 0, 1, CFGFLAG_SAVE | C
 MACRO_CONFIG_INT(ClAutoScreenshotMax, cl_auto_screenshot_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically created screenshots (0 = no limit)")
 MACRO_CONFIG_INT(ClAutoCSV, cl_auto_csv, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Automatically create game over csv")
 MACRO_CONFIG_INT(ClAutoCSVMax, cl_auto_csv_max, 10, 0, 1000, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Maximum number of automatically created csvs (0 = no limit)")
-MACRO_CONFIG_INT(ClResetWantedWeaponOnDeath, cl_reset_wanted_weapon_on_death, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Reset wanted weapon on death")
 MACRO_CONFIG_INT(ClShowBroadcasts, cl_show_broadcasts, 1, 0, 1, CFGFLAG_CLIENT, "Show broadcasts ingame")
 MACRO_CONFIG_INT(ClPrintBroadcasts, cl_print_broadcasts, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Print broadcasts to console")
 MACRO_CONFIG_INT(ClPrintMotd, cl_print_motd, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Print motd to console")

src/game/client/components/controls.cpp

@@ -101,8 +101,6 @@ void CControls::OnRelease()
 
 void CControls::OnPlayerDeath()
 {
-	if(g_Config.m_ClResetWantedWeaponOnDeath)
-		m_LastData[g_Config.m_ClDummy].m_WantedWeapon = m_InputData[g_Config.m_ClDummy].m_WantedWeapon = 0;
 	for(int &AmmoCount : m_AmmoCount)
 		AmmoCount = 0;
 	m_JoystickTapTime = 0; // Do not launch hook on first tap

src/game/client/components/menus_settings.cpp

@@ -136,12 +136,6 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
 		if(DoButton_CheckBox(&g_Config.m_ClAutoswitchWeaponsOutOfAmmo, Localize("Switch weapon when out of ammo"), g_Config.m_ClAutoswitchWeaponsOutOfAmmo, &Button))
 			g_Config.m_ClAutoswitchWeaponsOutOfAmmo ^= 1;
 
-		// weapon reset on death
-		Left.HSplitTop(5.0f, 0, &Left);
-		Left.HSplitTop(20.0f, &Button, &Left);
-		if(DoButton_CheckBox(&g_Config.m_ClResetWantedWeaponOnDeath, Localize("Reset wanted weapon on death"), g_Config.m_ClResetWantedWeaponOnDeath, &Button))
-			g_Config.m_ClResetWantedWeaponOnDeath ^= 1;
-
 		// chat messages
 		Right.HSplitTop(5.0f, 0, &Right);
 		Right.HSplitTop(20.0f, &Button, &Right);