1 files changed, 6 insertions, 32 deletions

diff --git a/include/modules.h b/include/modules.h
index 8f441c66b..56d6aece1 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -160,52 +160,26 @@ class Command
 	 * @param max_params The maximum number of parameters the parser will create, after max_params, all will be combined into the last argument.
 	 * NOTE: If max_params is not set (default), there is no limit to the max number of params.
 	 */
-	Command(const std::string &sname, size_t min_params, size_t max_params = 0) : MaxParams(max_params), MinParams(min_params), name(sname)
-	{
-		this->has_priv = NULL;
-		this->help_param1 = NULL;
-		this->help_param2 = NULL;
-		this->help_param3 = NULL;
-		this->help_param4 = NULL;
-		this->core = 0;
-		this->next = NULL;
-		this->mod_name = NULL;
-		this->service = NULL;
-		this->all_help = NULL;
-		this->regular_help = NULL;
-		this->oper_help = NULL;
-		this->admin_help = NULL;
-		this->root_help = NULL;
-	}
-
-	virtual ~Command()
-	{
-		this->has_priv = NULL;
-		if (this->mod_name) {
-			delete [] this->mod_name;
-		}
-		if (this->service) {
-			delete [] this->service;
-		}
-		this->next = NULL;
-	}
+	Command(const std::string &sname, size_t min_params, size_t max_params = 0);
+
+	virtual ~Command();
 
 	/** Execute this command.
 	 * @param u The user executing the command.
 	 */
-	virtual CommandReturn Execute(User *u, std::vector<std::string> &) { return MOD_CONT; }
+	virtual CommandReturn Execute(User *u, std::vector<std::string> &);
 
 	/** Requested when the user is requesting help on this command. Help on this command should be sent to the user.
 	 * @param u The user requesting help
 	 * @param subcommand The subcommand the user is requesting help on, or an empty string. (e.g. /ns help set foo bar lol gives a subcommand of "FOO BAR LOL")
 	 * @return true if help was provided to the user, false otherwise.
 	 */
-	virtual bool OnHelp(User *u, const std::string &subcommand) { return false; }
+	virtual bool OnHelp(User *u, const std::string &subcommand);
 
 	/** Requested when the user provides bad syntax to this command (not enough params, etc).
 	 * @param u The user executing the command.
 	 */
-	virtual void OnSyntaxError(User *u) { }
+	virtual void OnSyntaxError(User *u);
 
 	int (*has_priv)(User *u);	/* Returns 1 if user may use command, else 0 */