The next of a few "CBX OCDing over code style" commits, focusing on src/core/bs_* and src/core/cs_*.

1 files changed, 71 insertions, 52 deletions

diff --git a/src/core/bs_set.cpp b/src/core/bs_set.cpp
index a5fee9d4f..9d89c696c 100644
--- a/src/core/bs_set.cpp
+++ b/src/core/bs_set.cpp
@@ -7,9 +7,8 @@
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
- *
  */
+
 /*************************************************************************/
 
 #include "module.h"
@@ -56,90 +55,109 @@ class CommandBSSet : public Command
 				notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick.c_str());
 			}
 			else
-			{
 				syntax_error(Config.s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
-			}
 			return MOD_CONT;
-		} else if (!(ci = cs_findchan(chan)))
+		}
+		else if (!(ci = cs_findchan(chan)))
 			notice_lang(Config.s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 		else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
 			notice_lang(Config.s_BotServ, u, ACCESS_DENIED);
-		else {
-			if (option == "DONTKICKOPS") {
-				if (value == "ON") {
+		else
+		{
+			if (option == "DONTKICKOPS")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_DONTKICKOPS);
-					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON,
-								ci->name.c_str());
-				} else if (value == "OFF") {
+					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_DONTKICKOPS);
-					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF,
-								ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS",
-								 BOT_SET_DONTKICKOPS_SYNTAX);
+					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
 				}
-			} else if (option == "DONTKICKVOICES") {
-				if (value == "ON") {
+				else
+					syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
+			}
+			else if (option == "DONTKICKVOICES")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_DONTKICKVOICES);
-					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON,
-								ci->name.c_str());
-				} else if (value == "OFF") {
+					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
-					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF,
-								ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES",
-								 BOT_SET_DONTKICKVOICES_SYNTAX);
+					notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
 				}
-			} else if (option == "FANTASY") {
-				if (value == "ON") {
+				else
+					syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
+			}
+			else if (option == "FANTASY")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_FANTASY);
 					notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str());
-				} else if (value == "OFF") {
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_FANTASY);
 					notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET FANTASY",
-								 BOT_SET_FANTASY_SYNTAX);
 				}
-			} else if (option == "GREET") {
-				if (value == "ON") {
+				else
+					syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
+			}
+			else if (option == "GREET")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_GREET);
 					notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str());
-				} else if (value == "OFF") {
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_GREET);
 					notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET GREET",
-								 BOT_SET_GREET_SYNTAX);
 				}
-			} else if (u->Account()->HasCommand("botserv/set/nobot") && option == "NOBOT") {
-				if (value == "ON") {
+				else
+					syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX);
+			}
+			else if (u->Account()->HasCommand("botserv/set/nobot") && option == "NOBOT")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_NOBOT);
 					if (ci->bi)
 						ci->bi->UnAssign(u, ci);
 					notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str());
-				} else if (value == "OFF") {
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_NOBOT);
 					notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET NOBOT",
-								 BOT_SET_NOBOT_SYNTAX);
 				}
-			} else if (option == "SYMBIOSIS") {
-				if (value == "ON") {
+				else
+					syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
+			}
+			else if (option == "SYMBIOSIS")
+			{
+				if (value == "ON")
+				{
 					ci->botflags.SetFlag(BS_SYMBIOSIS);
 					notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
-				} else if (value == "OFF") {
+				}
+				else if (value == "OFF")
+				{
 					ci->botflags.UnsetFlag(BS_SYMBIOSIS);
 					notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
-				} else {
-					syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS",
-								 BOT_SET_SYMBIOSIS_SYNTAX);
 				}
-			} else {
-				notice_help(Config.s_BotServ, u, BOT_SET_UNKNOWN, option.c_str());
+				else
+					syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
 			}
+			else
+				notice_help(Config.s_BotServ, u, BOT_SET_UNKNOWN, option.c_str());
 		}
 		return MOD_CONT;
 	}
@@ -182,6 +200,7 @@ class CommandBSSet : public Command
 		notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SET);
 	}
 };
+
 class BSSet : public Module
 {
  public: