X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fctables.h;h=d6331647554b48587c8c3d3b11a9360d0708c92d;hb=dd98d56cabcd08a3d5207454e002b187af98d28a;hp=a1f05a3a8ab4ab26a98751b82967067943f6b54f;hpb=cd2406617f5c0c3c5e7f53519ea47b9178b7802a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/ctables.h b/include/ctables.h
index a1f05a3a8..d63316475 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,7 +20,7 @@
 #include "base.h"
 
 /* Forward declarations - required */
-class userrec;
+class User;
 class InspIRCd;
 
 /** Used to indicate command success codes
@@ -52,9 +52,9 @@ enum TranslateType
 
 
 /** A structure that defines a command. Every command available
- * in InspIRCd must be defined as derived from command_t.
+ * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport command_t : public Extensible
+class CoreExport Command : public Extensible
 {
  protected:
 	/** Owner/Creator object
@@ -72,10 +72,10 @@ class CoreExport command_t : public Extensible
 	int min_params;
 	/** used by /stats m
 	 */
-	long use_count;
+	long double use_count;
 	/** used by /stats m
  	 */
-	float total_bytes;
+	long double total_bytes;
 	/** used for resource tracking between modules
 	 */
 	std::string source;
@@ -92,6 +92,10 @@ class CoreExport command_t : public Extensible
 
 	std::vector<TranslateType> translation;
 
+	/** How many seconds worth of penalty does this command have?
+	 */
+	const int Penalty;
+
 	/** Create a new command.
 	 * @param Instance Pointer to creator class
 	 * @param cmd Command name. This must be UPPER CASE.
@@ -102,13 +106,13 @@ class CoreExport command_t : public Extensible
 	 * be allowed before the user is 'registered' (has sent USER,
 	 * NICK, optionally PASS, and been resolved).
 	 */
-	command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg)
+	Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
 	{
 		use_count = 0;
 		total_bytes = 0;
 		source = "<core>";
 		syntax = "";
-		translation.push_back(TR_END);
+		translation.clear();
 	}
 
 	/** Handle the command from a user.
@@ -119,7 +123,7 @@ class CoreExport command_t : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult Handle(const char** parameters, int pcnt, userrec* user) = 0;
+	virtual CmdResult Handle(const char** parameters, int pcnt, User* user) = 0;
 
 	/** Handle an internal request from another command, the core, or a module
 	 * @param Command ID
@@ -128,7 +132,7 @@ class CoreExport command_t : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult HandleInternal(const unsigned int id, const std::deque<classbase*> &params)
+	virtual CmdResult HandleInternal(const unsigned int /* id */, const std::deque<classbase*>& /* params */)
 	{
 		return CMD_INVALID;
 	}
@@ -142,7 +146,7 @@ class CoreExport command_t : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult HandleServer(const char** parameters, int pcnt, const std::string &servername)
+	virtual CmdResult HandleServer(const char** /* parameters */, int /* pcnt */, const std::string& /* servername */)
 	{
 		return CMD_INVALID;
 	}
@@ -173,12 +177,25 @@ class CoreExport command_t : public Extensible
 
 	/** Standard constructor gubbins
 	 */
-	virtual ~command_t() {}
+	virtual ~Command() {}
 };
 
 /** A hash of commands used by the core
  */
-typedef nspace::hash_map<std::string,command_t*> command_table;
+typedef nspace::hash_map<std::string,Command*> Commandable;
+
+#define TRANSLATE1(x1)	translation.push_back(x1);
+#define TRANSLATE2(x1,x2)  translation.push_back(x1);translation.push_back(x2);
+#define TRANSLATE3(x1,x2,x3)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);
+#define TRANSLATE4(x1,x2,x3,x4)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);
+#define TRANSLATE5(x1,x2,x3,x4,x5)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+	translation.push_back(x5);
+#define TRANSLATE6(x1,x2,x3,x4,x5,x6)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+	translation.push_back(x5);translation.push_back(x6);
+#define TRANSLATE7(x1,x2,x3,x4,x5,x6,x7)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+	translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);
+#define TRANSLATE8(x1,x2,x3,x4,x5,x6,x7,x8)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+	translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);translation.push_back(x8);
 
 #endif