From ab6f8ca480bdfc4009947e9ac81a5aae44fbe49e Mon Sep 17 00:00:00 2001 From: Olaf Rempel Date: Sun, 16 Apr 2006 21:02:41 +0200 Subject: [PATCH] fix includes --- gameentry.cpp | 2 +- gameentry.h | 1 - gamelist.cpp | 2 +- gameparser.cpp | 2 +- gameparser.h | 1 - gamescanner.cpp | 3 --- hlswserver.cpp | 3 +-- hlswserver.h | 1 + mod_d3engine.cpp | 3 +-- mod_d3engine.h | 3 +++ mod_gamespy1.cpp | 4 ++-- mod_gamespy1.h | 6 +++++- mod_gamespy2.cpp | 4 ++-- mod_gamespy2.h | 3 +++ mod_halflife.cpp | 2 +- mod_halflife.h | 3 +++ mod_q3engine.cpp | 2 +- mod_q3engine.h | 3 +++ mod_quake2.cpp | 3 +-- mod_quake2.h | 3 +++ mod_ut.cpp | 9 ++++----- mod_ut.h | 3 +++ modulelist.cpp | 2 +- modulelist.h | 1 + multisock.cpp | 2 +- netpkt.cpp | 3 +-- socket.cpp | 2 +- 27 files changed, 45 insertions(+), 31 deletions(-) diff --git a/gameentry.cpp b/gameentry.cpp index d807f5f..7f59c51 100644 --- a/gameentry.cpp +++ b/gameentry.cpp @@ -1,6 +1,6 @@ +#include "gameentry.h" #include #include -#include #include #include "gameentry.h" diff --git a/gameentry.h b/gameentry.h index 22be4cc..aca553a 100644 --- a/gameentry.h +++ b/gameentry.h @@ -1,7 +1,6 @@ #ifndef _GAMEENTRY_H_ #define _GAMEENTRY_H_ -#include #include #include "netpkt.h" diff --git a/gamelist.cpp b/gamelist.cpp index 20ed270..17bf658 100644 --- a/gamelist.cpp +++ b/gamelist.cpp @@ -1,5 +1,5 @@ -#include "logging.h" #include "gamelist.h" +#include "logging.h" #define DEFAULT_TIMEOUT 180 diff --git a/gameparser.cpp b/gameparser.cpp index a7bfde1..f623704 100644 --- a/gameparser.cpp +++ b/gameparser.cpp @@ -1,6 +1,6 @@ +#include "gameparser.h" #include "logging.h" #include "netpkt.h" -#include "gameparser.h" GameParser::GameParser(GameScanner& scanner, ModuleList& modList, GameList& gameList) : scanner(scanner), modList(modList), gameList(gameList) diff --git a/gameparser.h b/gameparser.h index 31e0958..7061f3c 100644 --- a/gameparser.h +++ b/gameparser.h @@ -2,7 +2,6 @@ #define _GAMEPARSER_H_ #include "thread.h" -#include "config.h" #include "gamescanner.h" #include "modulelist.h" #include "gamelist.h" diff --git a/gamescanner.cpp b/gamescanner.cpp index 64e7aac..dd3d4b7 100644 --- a/gamescanner.cpp +++ b/gamescanner.cpp @@ -1,6 +1,3 @@ -#include "logging.h" -#include "netpkt.h" - #include "gamescanner.h" #define DEFAULT_SCAN_INTERVAL 30 diff --git a/hlswserver.cpp b/hlswserver.cpp index 24a98f0..40bb44c 100644 --- a/hlswserver.cpp +++ b/hlswserver.cpp @@ -5,9 +5,8 @@ #include #include -#include "config.h" -#include "logging.h" #include "hlswserver.h" +#include "logging.h" static const char hlsw_header[] = "\xFF\xFF\xFF\xFFHLSWLANSEARCH"; diff --git a/hlswserver.h b/hlswserver.h index ef2d9b0..c67b08c 100644 --- a/hlswserver.h +++ b/hlswserver.h @@ -6,6 +6,7 @@ #include "thread.h" #include "config.h" #include "gamelist.h" +#include "timerservice.h" #include "netpkt.h" #include "socket.h" #include "mutex.h" diff --git a/mod_d3engine.cpp b/mod_d3engine.cpp index 7138af7..7bce419 100644 --- a/mod_d3engine.cpp +++ b/mod_d3engine.cpp @@ -1,7 +1,6 @@ #include -#include "netpkt.h" -#include "modhelper.h" #include "mod_d3engine.h" +#include "modhelper.h" static struct game_ports port_arr[] = { { 27666, 27673, ID_D3 }, // Doom 3 diff --git a/mod_d3engine.h b/mod_d3engine.h index 25cea26..15223d7 100644 --- a/mod_d3engine.h +++ b/mod_d3engine.h @@ -2,6 +2,9 @@ #define _MODD3ENGINE_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModD3Engine : public Module { public: diff --git a/mod_gamespy1.cpp b/mod_gamespy1.cpp index b0aff0f..5db11cb 100644 --- a/mod_gamespy1.cpp +++ b/mod_gamespy1.cpp @@ -1,7 +1,7 @@ #include -#include "logging.h" -#include "modhelper.h" #include "mod_gamespy1.h" +#include "modhelper.h" +#include "logging.h" #define MODGS1_GC_TIMEOUT 5 diff --git a/mod_gamespy1.h b/mod_gamespy1.h index fd2873b..a3644a4 100644 --- a/mod_gamespy1.h +++ b/mod_gamespy1.h @@ -1,8 +1,12 @@ #ifndef _MODGAMESPY1_H_ #define _MODGAMESPY1_H_ -#include "list.h" #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" +#include "list.h" +#include "timerservice.h" class ModGameSpy1 : public Module { public: diff --git a/mod_gamespy2.cpp b/mod_gamespy2.cpp index 9f57eac..a840e0a 100644 --- a/mod_gamespy2.cpp +++ b/mod_gamespy2.cpp @@ -1,7 +1,7 @@ #include -#include "logging.h" -#include "modhelper.h" #include "mod_gamespy2.h" +#include "modhelper.h" +#include "logging.h" static struct game_ports port_arr[] = { { 2302, 2302, ID_HALO }, diff --git a/mod_gamespy2.h b/mod_gamespy2.h index ccba1f7..8b3fbf2 100644 --- a/mod_gamespy2.h +++ b/mod_gamespy2.h @@ -2,6 +2,9 @@ #define _MODGAMESPY2_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModGameSpy2 : public Module { public: diff --git a/mod_halflife.cpp b/mod_halflife.cpp index 7bb23ed..cf1cff3 100644 --- a/mod_halflife.cpp +++ b/mod_halflife.cpp @@ -1,6 +1,6 @@ #include -#include "modhelper.h" #include "mod_halflife.h" +#include "modhelper.h" static struct game_ports port_arr[] = { { 27015, 27024, ID_HL }, diff --git a/mod_halflife.h b/mod_halflife.h index 1eb8d30..3422856 100644 --- a/mod_halflife.h +++ b/mod_halflife.h @@ -2,6 +2,9 @@ #define _MODHALFLIFE_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModHalfLife : public Module { public: diff --git a/mod_q3engine.cpp b/mod_q3engine.cpp index 0d1ca1d..1f8ef13 100644 --- a/mod_q3engine.cpp +++ b/mod_q3engine.cpp @@ -1,6 +1,6 @@ #include -#include "modhelper.h" #include "mod_q3engine.h" +#include "modhelper.h" static struct game_ports port_arr[] = { { 27960, 27969, ID_Q3A }, // q3(6), ef(7), et25), rtcw(8) diff --git a/mod_q3engine.h b/mod_q3engine.h index e62a6cb..e7ada1f 100644 --- a/mod_q3engine.h +++ b/mod_q3engine.h @@ -2,6 +2,9 @@ #define _MODQ3ENGINE_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModQ3Engine : public Module { public: diff --git a/mod_quake2.cpp b/mod_quake2.cpp index 410302f..5bdc173 100644 --- a/mod_quake2.cpp +++ b/mod_quake2.cpp @@ -1,7 +1,6 @@ #include -#include "netpkt.h" -#include "modhelper.h" #include "mod_quake2.h" +#include "modhelper.h" #define QUAKE2_PORT 27910 diff --git a/mod_quake2.h b/mod_quake2.h index fa81dfb..5f168ab 100644 --- a/mod_quake2.h +++ b/mod_quake2.h @@ -2,6 +2,9 @@ #define _MODQUAKE2_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModQuake2 : public Module { public: diff --git a/mod_ut.cpp b/mod_ut.cpp index 4f608ce..9dddedc 100644 --- a/mod_ut.cpp +++ b/mod_ut.cpp @@ -1,10 +1,9 @@ #include -#include "netpkt.h" -#include "modhelper.h" #include "mod_ut.h" +#include "modhelper.h" static struct game_ports port_arr[] = { - { 7777, 7788, 0 }, + { 7777, 7788, 0 }, { 10777, 10777, 0 }, { 0,0,0 } }; @@ -20,7 +19,7 @@ void ModUT::scan(MultiSock* msock) int ModUT::parse(NetPkt* pkt, GameList* glist) { -/* +/* int gameid; gameid = ModHelper::checkPorts(pkt, port_arr); if (!gameid) @@ -30,7 +29,7 @@ int ModUT::parse(NetPkt* pkt, GameList* glist) glist->addGame(ID_UT2K3, pkt); return PARSE_ACCEPT; } - + if (pkt->compare(0, scanmsg_ut2k4, sizeof(scanmsg_ut2k4))) { glist->addGame(ID_UT2K4, pkt); return PARSE_ACCEPT; diff --git a/mod_ut.h b/mod_ut.h index 1956343..a1b410d 100644 --- a/mod_ut.h +++ b/mod_ut.h @@ -2,6 +2,9 @@ #define _MODUT_H_ #include "module.h" +#include "multisock.h" +#include "netpkt.h" +#include "gamelist.h" class ModUT : public Module { public: diff --git a/modulelist.cpp b/modulelist.cpp index 7c91ca6..e3c39e6 100644 --- a/modulelist.cpp +++ b/modulelist.cpp @@ -1,5 +1,5 @@ -#include "logging.h" #include "modulelist.h" +#include "logging.h" ModuleList::ModuleList(Config& conf) : conf(conf) diff --git a/modulelist.h b/modulelist.h index 32c6466..b73ae1b 100644 --- a/modulelist.h +++ b/modulelist.h @@ -6,6 +6,7 @@ #include "netpkt.h" #include "gamelist.h" #include "module.h" +#include "list.h" class ModuleList { public: diff --git a/multisock.cpp b/multisock.cpp index 2f3f029..b134071 100644 --- a/multisock.cpp +++ b/multisock.cpp @@ -9,8 +9,8 @@ #include #include -#include "logging.h" #include "multisock.h" +#include "logging.h" #define DEFAULT_PORT 7130 diff --git a/netpkt.cpp b/netpkt.cpp index 452354c..631d869 100644 --- a/netpkt.cpp +++ b/netpkt.cpp @@ -16,9 +16,8 @@ #include #include -#include "logging.h" -#include "module.h" #include "netpkt.h" +#include "logging.h" NetPkt::NetPkt(const char* data, int size) : data(data), size(size), alloc(0) diff --git a/socket.cpp b/socket.cpp index 72ca4e7..23c7fef 100644 --- a/socket.cpp +++ b/socket.cpp @@ -9,8 +9,8 @@ #include #include -#include "logging.h" #include "socket.h" +#include "logging.h" Socket::Socket() {