yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename cg_alerts to cg_alerts_show

Browse Source
This commit is contained in:
Pablo-Dallegri 2021-05-07 10:29:49 -03:00
parent 7f5c203222
commit b9001dfb55
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Scripts/Gui/Preferences.as
View File

@ -660,7 +660,7 @@ namespace spades {
layouter.AddHeading(_Tr("Preferences", "Feedbacks"));
layouter.AddVolumeSlider(_Tr("Preferences", "Chat Notify Sounds"), "cg_chatBeep");
layouter.AddToggleField(_Tr("Preferences", "Hit Indicator"), "cg_hitIndicator");
layouter.AddToggleField(_Tr("Preferences", "Show Alerts"), "cg_alerts");
layouter.AddToggleField(_Tr("Preferences", "Show Alerts"), "cg_alerts_show");
layouter.AddHeading(_Tr("Preferences", "AoS 0.75/0.76 Compatibility"));
layouter.AddToggleField(_Tr("Preferences", "Allow Unicode"), "cg_unicode");

8
Sources/Client/Client_Input.cpp
View File

@ -82,7 +82,7 @@ DEFINE_SPADES_SETTING(cg_keySaveMap, "8");
DEFINE_SPADES_SETTING(cg_switchToolByWheel, "1");
DEFINE_SPADES_SETTING(cg_debugCorpse, "0");
DEFINE_SPADES_SETTING(cg_alerts, "1");
DEFINE_SPADES_SETTING(cg_alerts_show, "1");
SPADES_SETTING(cg_manualFocus);
DEFINE_SPADES_SETTING(cg_keyAutoFocus, "MiddleMouseButton");
@ -481,7 +481,7 @@ namespace spades {
if (world->GetLocalPlayer()->IsToolSelectable(Player::ToolBlock)) {
SetSelectedTool(Player::ToolBlock);
} else {
if (cg_alerts)
if (cg_alerts_show)
ShowAlert(_Tr("Client", "Out of Blocks"), AlertType::Error);
else
PlayAlertSound();
@ -493,7 +493,7 @@ namespace spades {
if (world->GetLocalPlayer()->IsToolSelectable(Player::ToolWeapon)) {
SetSelectedTool(Player::ToolWeapon);
} else {
if (cg_alerts)
if (cg_alerts_show)
ShowAlert(_Tr("Client", "Out of Ammo"), AlertType::Error);
else
PlayAlertSound();
@ -505,7 +505,7 @@ namespace spades {
if (world->GetLocalPlayer()->IsToolSelectable(Player::ToolGrenade)) {
SetSelectedTool(Player::ToolGrenade);
} else {
if (cg_alerts)
if (cg_alerts_show)
ShowAlert(_Tr("Client", "Out of Grenades"), AlertType::Error);
else
PlayAlertSound();

4
Sources/Client/Client_Update.cpp
View File

@ -53,7 +53,7 @@ SPADES_SETTING(cg_blood);
DEFINE_SPADES_SETTING(cg_ejectBrass, "1");
DEFINE_SPADES_SETTING(cg_hitFeedbackSoundGain, "0.2");
SPADES_SETTING(cg_alerts);
SPADES_SETTING(cg_alerts_show);
SPADES_SETTING(cg_centerMessage);
SPADES_SETTING(cg_shake);
@ -1276,7 +1276,7 @@ namespace spades {
void Client::LocalPlayerBuildError(BuildFailureReason reason) {
SPADES_MARK_FUNCTION();
if (!cg_alerts) {
if (!cg_alerts_show) {
PlayAlertSound();
return;
}