diff --git a/src/Makefile b/src/Makefile index 02bd6e0..91f53ba 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ USESTDOUT=0 BASE_LIBS=-lgcrypt BASE_CFLAGS=-c -g -O_FILES=build/oastat.o build/oastatstruct.o build/kill2db.o build/init2db.o build/shutdown2db.o build/userinfo2db.o build/disconnect2db.o build/award2db.o build/ctf2db.o build/point2db.o build/ctf1f2db.o +O_FILES=build/oastat.o build/oastatstruct.o build/kill2db.o build/init2db.o build/shutdown2db.o build/userinfo2db.o build/disconnect2db.o build/award2db.o build/ctf2db.o build/point2db.o build/ctf1f2db.o build/elimination2db.o ifeq ($(USESTDOUT),1) O_FILES+= build/db2stdout.o @@ -73,6 +73,9 @@ build/ctf2db.o: oss2db/Ctf2Db.cpp build/ctf1f2db.o: oss2db/Ctf1f2Db.cpp g++ $(BASE_CFLAGS) oss2db/Ctf1f2Db.cpp -o build/ctf1f2db.o +build/elimination2db.o: oss2db/Elimination2Db.cpp + g++ $(BASE_CFLAGS) oss2db/Elimination2Db.cpp -o build/elimination2db.o + build/point2db.o: oss2db/Point2Db.cpp oss2db/Point2Db.hpp g++ $(BASE_CFLAGS) oss2db/Point2Db.cpp -o build/point2db.o diff --git a/src/oastat.cpp b/src/oastat.cpp index d2daee7..8805094 100644 --- a/src/oastat.cpp +++ b/src/oastat.cpp @@ -52,6 +52,7 @@ using namespace std; #include "oss2db/Ctf2Db.hpp" #include "oss2db/Ctf1f2Db.hpp" #include "oss2db/Point2Db.hpp" +#include "oss2db/Elimination2Db.hpp" string clientIdMap[MAX_ID]; @@ -77,6 +78,7 @@ void addCommands() commands.push_back(new Ctf2Db()); commands.push_back(new Point2Db()); commands.push_back(new Ctf1f2Db()); + commands.push_back(new Elimination2Db()); //Add more commands just above here for(int i=0;i -Init2Db::Init2Db() { -} - -Init2Db::Init2Db(const Init2Db& orig) { -} - -Init2Db::~Init2Db() { -} string Init2Db::getCommand() { return "InitGame"; diff --git a/src/oss2db/init2db.h b/src/oss2db/init2db.h index 921e21a..cb46bf4 100644 --- a/src/oss2db/init2db.h +++ b/src/oss2db/init2db.h @@ -27,9 +27,6 @@ Copyright (C) 2010 Poul Sander (oastat@poulsander.com) class Init2Db : public Struct2Db { public: - Init2Db(); - Init2Db(const Init2Db& orig); - virtual ~Init2Db(); string getCommand(); bool canProcess(OaStatStruct oss); diff --git a/src/oss2db/shutdown2db.cpp b/src/oss2db/shutdown2db.cpp index 14ba7ea..bd54194 100644 --- a/src/oss2db/shutdown2db.cpp +++ b/src/oss2db/shutdown2db.cpp @@ -22,14 +22,6 @@ Copyright (C) 2010 Poul Sander (oastat@poulsander.com) #include "shutdown2db.h" -Shutdown2Db::Shutdown2Db() { -} - -Shutdown2Db::Shutdown2Db(const Shutdown2Db& orig) { -} - -Shutdown2Db::~Shutdown2Db() { -} string Shutdown2Db::getCommand() { return "ShutdownGame"; diff --git a/src/oss2db/shutdown2db.h b/src/oss2db/shutdown2db.h index 5b03e2d..fff518b 100644 --- a/src/oss2db/shutdown2db.h +++ b/src/oss2db/shutdown2db.h @@ -27,9 +27,6 @@ Copyright (C) 2010 Poul Sander (oastat@poulsander.com) class Shutdown2Db : public Struct2Db{ public: - Shutdown2Db(); - Shutdown2Db(const Shutdown2Db& orig); - virtual ~Shutdown2Db(); string getCommand(); bool canProcess(OaStatStruct oss); diff --git a/src/oss2db/userinfo2db.cpp b/src/oss2db/userinfo2db.cpp index f1dca63..a865451 100644 --- a/src/oss2db/userinfo2db.cpp +++ b/src/oss2db/userinfo2db.cpp @@ -22,14 +22,6 @@ Copyright (C) 2010 Poul Sander (oastat@poulsander.com) #include "userinfo2db.h" #include -Userinfo2Db::Userinfo2Db() { -} - -Userinfo2Db::Userinfo2Db(const Userinfo2Db& orig) { -} - -Userinfo2Db::~Userinfo2Db() { -} string Userinfo2Db::getCommand() { return "ClientUserinfoChanged"; diff --git a/src/oss2db/userinfo2db.h b/src/oss2db/userinfo2db.h index 91f1d97..65ecd11 100644 --- a/src/oss2db/userinfo2db.h +++ b/src/oss2db/userinfo2db.h @@ -27,9 +27,6 @@ Copyright (C) 2010 Poul Sander (oastat@poulsander.com) class Userinfo2Db : public Struct2Db{ public: - Userinfo2Db(); - Userinfo2Db(const Userinfo2Db& orig); - virtual ~Userinfo2Db(); string getCommand();