summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-16 12:00:52 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-16 12:00:52 +0000
commit064d18536159e5f907f8ccfd1147281c8ec93bc4 (patch)
treeda3972a70e0bed2025422d06e62b1f5fe2490fdd /src
parent092eb69a53d679053b8daee895a7a290a71b2e62 (diff)
So many inclusion loops it makes your head spin - forward declaring tons of classes to fix
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2523 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/command_parse.cpp2
-rw-r--r--src/commands.cpp10
-rw-r--r--src/mode.cpp1
3 files changed, 7 insertions, 6 deletions
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 34124e74f..4f5add0d6 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -40,7 +40,6 @@ using namespace std;
#include <pthread.h>
#endif
#include "users.h"
-#include "ctables.h"
#include "globals.h"
#include "modules.h"
#include "dynamic.h"
@@ -59,6 +58,7 @@ using namespace std;
#include "dns.h"
#include "typedefs.h"
#include "command_parse.h"
+#include "ctables.h"
extern InspIRCd* ServerInstance;
diff --git a/src/commands.cpp b/src/commands.cpp
index 6fb096d5c..51b9ae3a3 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -103,7 +103,7 @@ void handle_join(char **parameters, int pcnt, userrec *user)
{
chanrec* Ptr;
- if (Parser->LoopCall(handle_join,parameters,pcnt,user,0,0,1))
+ if (ServerInstance->Parser->LoopCall(handle_join,parameters,pcnt,user,0,0,1))
return;
if (parameters[0][0] == '#')
{
@@ -116,13 +116,13 @@ void handle_part(char **parameters, int pcnt, userrec *user)
{
if (pcnt > 1)
{
- if (Parser->LoopCall(handle_part,parameters,pcnt,user,0,pcnt-2,0))
+ if (ServerInstance->Parser->LoopCall(handle_part,parameters,pcnt,user,0,pcnt-2,0))
return;
del_channel(user,parameters[0],parameters[1],false);
}
else
{
- if (Parser->LoopCall(handle_part,parameters,pcnt,user,0,pcnt-1,0))
+ if (ServerInstance->Parser->LoopCall(handle_part,parameters,pcnt,user,0,pcnt-1,0))
return;
del_channel(user,parameters[0],NULL,false);
}
@@ -130,9 +130,9 @@ void handle_part(char **parameters, int pcnt, userrec *user)
void handle_commands(char **parameters, int pcnt, userrec *user)
{
- for (unsigned int i = 0; i < Parser->cmdlist.size(); i++)
+ for (unsigned int i = 0; i < ServerInstance->Parser->cmdlist.size(); i++)
{
- WriteServ(user->fd,"902 %s :%s %s %d",user->nick,Parser->cmdlist[i].command,Parser->cmdlist[i].source,Parser->cmdlist[i].min_params);
+ WriteServ(user->fd,"902 %s :%s %s %d",user->nick,ServerInstance->Parser->cmdlist[i].command,ServerInstance->Parser->cmdlist[i].source,ServerInstance->Parser->cmdlist[i].min_params);
}
WriteServ(user->fd,"903 %s :End of COMMANDS list",user->nick);
}
diff --git a/src/mode.cpp b/src/mode.cpp
index 570ac5ad7..d1fc5b93a 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -49,6 +49,7 @@ using namespace std;
extern int MODCOUNT;
extern std::vector<Module*> modules;
extern std::vector<ircd_module*> factory;
+extern InspIRCd* ServerInstance;
extern ServerConfig* Config;
extern time_t TIME;