Do not include C4Network2IRC.h from C4Application.h

Günther Brammer 2011-03-11 03:41:05 +01:00
parent 81d64df737
commit ee355a7bc9
4 changed files with 6 additions and 3 deletions

View File

@ -45,13 +45,17 @@
#include <C4GameLobby.h>
#include <C4Fonts.h>
#include <C4Network2.h>
#include <C4Network2IRC.h>
#include <StdRegistry.h> // For DDraw emulation warning
#include <getopt.h>
static C4Network2IRCClient ApplicationIRCClient;
C4Application::C4Application():
isEditor(false),
IRCClient(ApplicationIRCClient),
UseStartupDialog(true),
CheckForUpdates(false),
NoSplash(false),

View File

@ -28,7 +28,6 @@
#include <C4SoundSystem.h>
#include <C4Components.h>
#include <C4InteractiveThread.h>
#include <C4Network2IRC.h>
#include <StdWindow.h>
class CStdDDraw;
@ -52,7 +51,7 @@ public:
// Thread for interactive processes (automatically starts as needed)
C4InteractiveThread InteractiveThread;
// IRC client for global chat
C4Network2IRCClient IRCClient;
C4Network2IRCClient &IRCClient;
void Clear();
void ClearCommandLine();
// Tick timing

View File

@ -74,6 +74,7 @@ class C4NameList;
class C4Network;
class C4NetworkClient;
class C4NetworkClientList;
class C4Network2IRCClient;
class C4Object;
class C4ObjectInfo;
class C4ObjectInfoCore;

View File

@ -26,7 +26,6 @@
#include <C4Def.h>
#include <C4DefList.h>
#include <C4Application.h>
#include <C4GraphicsResource.h>
C4IDListChunk::C4IDListChunk()