Changeset 112 for trunk/src/game/World.h

Timestamp:

11/19/08 13:37:14 (17 years ago)

Author:

yumileroy

Message:

[svn] * Merge CLI Commands with regular commands and give them level4 access. sec_console. Source mangos - thanks to ogeraisi for the amalgamated patch.
* Redid/Fixed/Added some lang strings.
* As usual remember this is a trunk rev so stability only guaranteed on northern countries of Mars and western parts of Pluto. No warranties outside the solar system, sorry :( . Check with your local government or dictator on regulations regarding export.

Original author: KingPin?
Date: 2008-10-26 13:32:42-05:00

Files:

• trunk/src/game/World.h (modified) (6 diffs)

trunk/src/game/World.h

@@ -29 +29 @@
 #include "Timer.h"
 #include "Policies/Singleton.h"
+#include "SharedDefines.h"
 
 #include <map>
@@ -41 +42 @@
 struct ScriptAction;
 struct ScriptInfo;
-class CliCommandHolder;
 class SqlResultQueue;
 class QueryResult;
@@ -297 +297 @@
 };
 
-/// Ban function return codes
-enum BanReturn
-{
-    BAN_SUCCESS,
-    BAN_SYNTAX_ERROR,
-    BAN_NOTFOUND
-};
-
 // DB scripting commands
 #define SCRIPT_COMMAND_TALK                  0              // source = unit, target=any, datalong ( 0=say, 1=whisper, 2=yell, 3=emote text)
@@ -322 +314 @@
 #define SCRIPT_COMMAND_CAST_SPELL           15              // source (datalong2!=0) or target (datalong==0) unit, datalong = spell_id
 
-/// CLI related stuff, define here to prevent cyclic dependancies
-
-typedef int(* pPrintf)(const char*,...);
-typedef void(* pCliFunc)(char *,pPrintf);
-
-/// Command Template class
-struct CliCommand
-{
-    char const * cmd;
-    pCliFunc Func;
-    char const * description;
-};
-
 /// Storage class for commands issued for delayed execution
-class CliCommandHolder
-{
-    private:
-        const CliCommand *cmd;
-        char *args;
-        pPrintf m_zprintf;
-    public:
-        CliCommandHolder(const CliCommand *command, const char *arguments, pPrintf p_zprintf)
-            : cmd(command), m_zprintf(p_zprintf)
-        {
-            size_t len = strlen(arguments)+1;
-            args = new char[len];
-            memcpy(args, arguments, len);
-        }
-        ~CliCommandHolder() { delete[] args; }
-        void Execute() const { cmd->Func(args, m_zprintf); }
-        pPrintf GetOutputMethod() const {return (m_zprintf);}
+struct CliCommandHolder
+{
+        typedef void Print(const char*);
+
+        char *m_command;
+        Print* m_print;
+
+        CliCommandHolder(const char *command, Print* zprint)
+                : m_print(zprint)
+        {
+                size_t len = strlen(command)+1;
+                m_command = new char[len];
+                memcpy(m_command, command, len);
+        }
+
+        ~CliCommandHolder() { delete[] m_command; }
 };
 
@@ -475 +453 @@
         void KickAllLess(AccountTypes sec);
         void KickAllQueued();
-        uint8 BanAccount(std::string type, std::string nameOrIP, std::string duration, std::string reason, std::string author);
-        bool RemoveBanAccount(std::string type, std::string nameOrIP);
+        BanReturn BanAccount(BanMode mode, std::string nameOrIP, std::string duration, std::string reason, std::string author);
+                bool RemoveBanAccount(BanMode mode, std::string nameOrIP);
 
         void ScriptsStart(std::map<uint32, std::multimap<uint32, ScriptInfo> > const& scripts, uint32 id, Object* source, Object* target);
@@ -493 +471 @@
 
         void ProcessCliCommands();
-        void QueueCliCommand(CliCommandHolder* command) { cliCmdQueue.add(command); }
+        void QueueCliCommand( CliCommandHolder::Print* zprintf, char const* input ) { cliCmdQueue.add(new CliCommandHolder(input, zprintf)); }
 
         void UpdateResultQueue();