code cleanup 4

zone/bot_commands/appearance.cpp

@@ -2,19 +2,19 @@
 
 void bot_command_appearance(Client *c, const Seperator *sep)
 {
-
-	std::list<const char*> subcommand_list;
-	subcommand_list.push_back("botbeardcolor");
-	subcommand_list.push_back("botbeardstyle");
-	subcommand_list.push_back("botdetails");
-	subcommand_list.push_back("botdyearmor");
-	subcommand_list.push_back("boteyes");
-	subcommand_list.push_back("botface");
-	subcommand_list.push_back("bothaircolor");
-	subcommand_list.push_back("bothairstyle");
-	subcommand_list.push_back("botheritage");
-	subcommand_list.push_back("bottattoo");
-	subcommand_list.push_back("botwoad");
+	std::vector<const char*> subcommand_list = {
+		"botbeardcolor",
+		"botbeardstyle",
+		"botdetails",
+		"botdyearmor",
+		"boteyes",
+		"botface",
+		"bothaircolor",
+		"bothairstyle",
+		"botheritage",
+		"bottattoo",
+		"botwoad"
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_appearance", sep->arg[0], "botappearance"))
 		return;

zone/bot_commands/bot.cpp

@@ -2,25 +2,25 @@
 
 void bot_command_bot(Client *c, const Seperator *sep)
 {
-
-	std::list<const char*> subcommand_list;
-	subcommand_list.push_back("botappearance");
-	subcommand_list.push_back("botcamp");
-	subcommand_list.push_back("botclone");
-	subcommand_list.push_back("botcreate");
-	subcommand_list.push_back("botdelete");
-	subcommand_list.push_back("botfollowdistance");
-	subcommand_list.push_back("botinspectmessage");
-	subcommand_list.push_back("botlist");
-	subcommand_list.push_back("botoutofcombat");
-	subcommand_list.push_back("botreport");
-	subcommand_list.push_back("botspawn");
-	subcommand_list.push_back("botstance");
-	subcommand_list.push_back("botstopmeleelevel");
-	subcommand_list.push_back("botsummon");
-	subcommand_list.push_back("bottoggleranged");
-	subcommand_list.push_back("bottogglehelm");
-	subcommand_list.push_back("botupdate");
+	std::vector<const char*> subcommand_list = {
+		"botappearance",
+		"botcamp",
+		"botclone",
+		"botcreate",
+		"botdelete",
+		"botfollowdistance",
+		"botinspectmessage",
+		"botlist",
+		"botoutofcombat",
+		"botreport",
+		"botspawn",
+		"botstance",
+		"botstopmeleelevel",
+		"botsummon",
+		"bottoggleranged",
+		"bottogglehelm",
+		"botupdate"
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_bot", sep->arg[0], "bot"))
 		return;

zone/bot_commands/default_settings.cpp

@@ -374,7 +374,7 @@ void bot_command_default_settings(Client* c, const Seperator* sep)
 		}
 		else if (!strcasecmp(sep->arg[1], "spelltypesettings")) {
 			if (spell_type != UINT16_MAX) {
-				my_bot->SetSpellHold(spell_type, my_bot->GetDefaultSpellHold(SpellType, bot_stance));
+				my_bot->SetSpellHold(spell_type, my_bot->GetDefaultSpellHold(spell_type, bot_stance));
 				my_bot->SetSpellDelay(spell_type, my_bot->GetDefaultSpellDelay(spell_type, bot_stance));
 				my_bot->SetSpellMinThreshold(spell_type, my_bot->GetDefaultSpellMinThreshold(spell_type, bot_stance));
 				my_bot->SetSpellMaxThreshold(spell_type, my_bot->GetDefaultSpellMaxThreshold(spell_type, bot_stance));

zone/bot_commands/heal_rotation.cpp

@@ -2,28 +2,28 @@
 
 void bot_command_heal_rotation(Client *c, const Seperator *sep)
 {
-
-	std::list<const char*> subcommand_list;
-	subcommand_list.push_back("healrotationadaptivetargeting");
-	subcommand_list.push_back("healrotationaddmember");
-	subcommand_list.push_back("healrotationaddtarget");
-	subcommand_list.push_back("healrotationadjustcritical");
-	subcommand_list.push_back("healrotationadjustsafe");
-	subcommand_list.push_back("healrotationcastoverride");
-	subcommand_list.push_back("healrotationchangeinterval");
-	subcommand_list.push_back("healrotationclearhot");
-	subcommand_list.push_back("healrotationcleartargets");
-	subcommand_list.push_back("healrotationcreate");
-	subcommand_list.push_back("healrotationdelete");
-	subcommand_list.push_back("healrotationfastheals");
-	subcommand_list.push_back("healrotationlist");
-	subcommand_list.push_back("healrotationremovemember");
-	subcommand_list.push_back("healrotationremovetarget");
-	subcommand_list.push_back("healrotationresetlimits");
-	subcommand_list.push_back("healrotationsave");
-	subcommand_list.push_back("healrotationsethot");
-	subcommand_list.push_back("healrotationstart");
-	subcommand_list.push_back("healrotationstop");
+	std::vector<const char*> subcommand_list = {
+		"healrotationadaptivetargeting",
+		"healrotationaddmember",
+		"healrotationaddtarget",
+		"healrotationadjustcritical",
+		"healrotationadjustsafe",
+		"healrotationcastoverride",
+		"healrotationchangeinterval",
+		"healrotationclearhot",
+		"healrotationcleartargets",
+		"healrotationcreate",
+		"healrotationdelete",
+		"healrotationfastheals",
+		"healrotationlist",
+		"healrotationremovemember",
+		"healrotationremovetarget",
+		"healrotationresetlimits",
+		"healrotationsave",
+		"healrotationsethot",
+		"healrotationstart",
+		"healrotationstop"
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_heal_rotation", sep->arg[0], "healrotation"))
 		return;

zone/bot_commands/inventory.cpp

@@ -2,12 +2,12 @@
 
 void bot_command_inventory(Client *c, const Seperator *sep)
 {
-
-	std::list<const char*> subcommand_list;
-	subcommand_list.push_back("inventorygive");
-	subcommand_list.push_back("inventorylist");
-	subcommand_list.push_back("inventoryremove");
-	subcommand_list.push_back("inventorywindow");
+	std::vector<const char*> subcommand_list = {
+		"inventorygive",
+		"inventorylist",
+		"inventoryremove",
+		"inventorywindow"
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_inventory", sep->arg[0], "inventory"))
 		return;

zone/bot_commands/pet.cpp

@@ -3,11 +3,11 @@
 
 void bot_command_pet(Client *c, const Seperator *sep)
 {
-
-	std::list<const char*> subcommand_list;
-	subcommand_list.push_back("petgetlost");
-	subcommand_list.push_back("petremove");
-	subcommand_list.push_back("petsettype");
+	std::vector<const char*> subcommand_list = {
+		"petgetlost",
+		"petremove",
+		"petsettype"
+	};
 
 	if (helper_command_alias_fail(c, "bot_command_pet", sep->arg[0], "pet"))
 		return;

zone/bot_commands/sit_mana_percent.cpp

@@ -167,7 +167,7 @@ void bot_command_sit_mana_percent(Client* c, const Seperator* sep)
 				fmt::format(
 					"{} of your bots will now sit in combat whem at or below [{}%%] mana.'",
 					success_count,
-					TypeValue
+					type_value
 				).c_str()
 			);
 		}