Browse Source

fix includes

master
Olaf Rempel 16 years ago
parent
commit
ab6f8ca480
  1. 2
      gameentry.cpp
  2. 1
      gameentry.h
  3. 2
      gamelist.cpp
  4. 2
      gameparser.cpp
  5. 1
      gameparser.h
  6. 3
      gamescanner.cpp
  7. 3
      hlswserver.cpp
  8. 1
      hlswserver.h
  9. 3
      mod_d3engine.cpp
  10. 3
      mod_d3engine.h
  11. 4
      mod_gamespy1.cpp
  12. 6
      mod_gamespy1.h
  13. 4
      mod_gamespy2.cpp
  14. 3
      mod_gamespy2.h
  15. 2
      mod_halflife.cpp
  16. 3
      mod_halflife.h
  17. 2
      mod_q3engine.cpp
  18. 3
      mod_q3engine.h
  19. 3
      mod_quake2.cpp
  20. 3
      mod_quake2.h
  21. 9
      mod_ut.cpp
  22. 3
      mod_ut.h
  23. 2
      modulelist.cpp
  24. 1
      modulelist.h
  25. 2
      multisock.cpp
  26. 3
      netpkt.cpp
  27. 2
      socket.cpp

2
gameentry.cpp

@ -1,6 +1,6 @@
#include "gameentry.h"
#include <stdio.h>
#include <string.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include "gameentry.h"

1
gameentry.h

@ -1,7 +1,6 @@
#ifndef _GAMEENTRY_H_
#define _GAMEENTRY_H_
#include <net/if.h>
#include <netinet/in.h>
#include "netpkt.h"

2
gamelist.cpp

@ -1,5 +1,5 @@
#include "logging.h"
#include "gamelist.h"
#include "logging.h"
#define DEFAULT_TIMEOUT 180

2
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)

1
gameparser.h

@ -2,7 +2,6 @@
#define _GAMEPARSER_H_
#include "thread.h"
#include "config.h"
#include "gamescanner.h"
#include "modulelist.h"
#include "gamelist.h"

3
gamescanner.cpp

@ -1,6 +1,3 @@
#include "logging.h"
#include "netpkt.h"
#include "gamescanner.h"
#define DEFAULT_SCAN_INTERVAL 30

3
hlswserver.cpp

@ -5,9 +5,8 @@
#include <netinet/ip.h>
#include <arpa/inet.h>
#include "config.h"
#include "logging.h"
#include "hlswserver.h"
#include "logging.h"
static const char hlsw_header[] = "\xFF\xFF\xFF\xFFHLSWLANSEARCH";

1
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"

3
mod_d3engine.cpp

@ -1,7 +1,6 @@
#include <string.h>
#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

3
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:

4
mod_gamespy1.cpp

@ -1,7 +1,7 @@
#include <string.h>
#include "logging.h"
#include "modhelper.h"
#include "mod_gamespy1.h"
#include "modhelper.h"
#include "logging.h"
#define MODGS1_GC_TIMEOUT 5

6
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:

4
mod_gamespy2.cpp

@ -1,7 +1,7 @@
#include <string.h>
#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 },

3
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:

2
mod_halflife.cpp

@ -1,6 +1,6 @@
#include <string.h>
#include "modhelper.h"
#include "mod_halflife.h"
#include "modhelper.h"
static struct game_ports port_arr[] = {
{ 27015, 27024, ID_HL },

3
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:

2
mod_q3engine.cpp

@ -1,6 +1,6 @@
#include <string.h>
#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)

3
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:

3
mod_quake2.cpp

@ -1,7 +1,6 @@
#include <string.h>
#include "netpkt.h"
#include "modhelper.h"
#include "mod_quake2.h"
#include "modhelper.h"
#define QUAKE2_PORT 27910

3
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:

9
mod_ut.cpp

@ -1,10 +1,9 @@
#include <string.h>
#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;

3
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:

2
modulelist.cpp

@ -1,5 +1,5 @@
#include "logging.h"
#include "modulelist.h"
#include "logging.h"
ModuleList::ModuleList(Config& conf)
: conf(conf)

1
modulelist.h

@ -6,6 +6,7 @@
#include "netpkt.h"
#include "gamelist.h"
#include "module.h"
#include "list.h"
class ModuleList {
public:

2
multisock.cpp

@ -9,8 +9,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include "logging.h"
#include "multisock.h"
#include "logging.h"
#define DEFAULT_PORT 7130

3
netpkt.cpp

@ -16,9 +16,8 @@
#include <arpa/inet.h>
#include <ctype.h>
#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)

2
socket.cpp

@ -9,8 +9,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include "logging.h"
#include "socket.h"
#include "logging.h"
Socket::Socket()
{

Loading…
Cancel
Save