From 303b35a7558d3eb22ce1cecdfca96f2f9dd64d4e Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Wed, 12 Oct 2022 21:13:25 -0400
Subject: [PATCH] [Commands] Cleanup #setlanguage Command. (#2464)

* [Commands] Cleanup #setlanguage Command.

Cleanup #setlanguage command and remove unnecessary variables.

* Tabs not spaces.

* newline
---
 zone/command.cpp                 |  2 +-
 zone/gm_commands/setlanguage.cpp | 30 +++++++++++++-----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/zone/command.cpp b/zone/command.cpp
index 6b16f0021..e4f69faa3 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -286,7 +286,7 @@ int command_init(void)
 		command_add("setendurance", "[Endurance] - Set your or your target's Endurance", AccountStatus::GMAdmin, command_setendurance) ||
 		command_add("setfaction", "[Faction ID] - Sets targeted NPC's faction in the database", AccountStatus::GMAreas, command_setfaction) ||
 		command_add("sethp", "[Health] - Set your or your target's Health", AccountStatus::GMAdmin, command_sethp) ||
-		command_add("setlanguage", "[language ID] [value] - Set your target's language skillnum to value", AccountStatus::Guide, command_setlanguage) ||
+		command_add("setlanguage", "[Language ID] [Value] - Set your or your target's Language by ID to Value", AccountStatus::Guide, command_setlanguage) ||
 		command_add("setlsinfo", "[Email] [Password] - Set loginserver email address and password (if supported by loginserver)", AccountStatus::Steward, command_setlsinfo) ||
 		command_add("setmana", "[Mana] - Set your or your target's Mana", AccountStatus::GMAdmin, command_setmana) ||
 		command_add("setpass", "[Account Name] [Password] - Set local password by account name", AccountStatus::GMLeadAdmin, command_setpass) ||
diff --git a/zone/gm_commands/setlanguage.cpp b/zone/gm_commands/setlanguage.cpp
index f3242c1e9..5b8073b8d 100755
--- a/zone/gm_commands/setlanguage.cpp
+++ b/zone/gm_commands/setlanguage.cpp
@@ -1,39 +1,36 @@
 #include "../client.h"
 #include "../../common/languages.h"
+#include "../../common/data_verification.h"
 
 void command_setlanguage(Client *c, const Seperator *sep)
 {
-	Client *target = c;
+	auto target = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient()) {
 		target = c->GetTarget()->CastToClient();
 	}
 
-	auto language_id    = sep->IsNumber(1) ? std::stoi(sep->arg[1]) : -1;
+	auto language_id = sep->IsNumber(1) ? std::stoi(sep->arg[1]) : -1;
 	auto language_value = sep->IsNumber(2) ? std::stoi(sep->arg[2]) : -1;
 	if (!strcasecmp(sep->arg[1], "list")) {
-		for (int language = LANG_COMMON_TONGUE; language <= LANG_UNKNOWN; language++) {
+		for (const auto& language : EQ::constants::GetLanguageMap()) {
 			c->Message(
 				Chat::White,
 				fmt::format(
 					"Language {}: {}",
-					language,
-					EQ::constants::GetLanguageName(language)
+					language.first,
+					language.second
 				).c_str()
 			);
 		}
-	}
-	else if (
-		language_id < LANG_COMMON_TONGUE ||
-		language_id > LANG_UNKNOWN ||
-		language_value < 0 ||
-		language_value > 100
-		) {
+	} else if (
+		!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN) ||
+		!EQ::ValueWithin(language_value, 0, 100)
+	) {
 		c->Message(Chat::White, "Usage: #setlanguage [Language ID] [Language Value]");
 		c->Message(Chat::White, "Usage: #setlanguage [List]");
-		c->Message(Chat::White, "Language ID = 0 to 27", LANG_UNKNOWN);
-		c->Message(Chat::White, "Language Value = 0 to 100", HIGHEST_CAN_SET_SKILL);
-	}
-	else {
+		c->Message(Chat::White, "Language ID = 0 to 27");
+		c->Message(Chat::White, "Language Value = 0 to 100");
+	} else {
 		LogInfo(
 			"Set language request from [{}], Target: [{}] Language ID: [{}] Language Value: [{}]",
 			c->GetCleanName(),
@@ -58,4 +55,3 @@ void command_setlanguage(Client *c, const Seperator *sep)
 		}
 	}
 }
-