From f6f7699ef180c416672092a223ee344ddc57c4d5 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Tue, 24 Aug 2010 14:46:44 +0200 Subject: [PATCH] btd Fixed compiling Signed-off-by: GreYFoXGTi --- datasrc/network.py | 22 +++++- src/game/server/score.cpp | 156 -------------------------------------- 2 files changed, 21 insertions(+), 157 deletions(-) delete mode 100644 src/game/server/score.cpp diff --git a/datasrc/network.py b/datasrc/network.py index e01dba63a..d69a9879c 100644 --- a/datasrc/network.py +++ b/datasrc/network.py @@ -252,7 +252,7 @@ Messages = [ NetIntRange("m_Pass", 0, 'MAX_CLIENTS'), NetIntRange("m_Total", 0, 'MAX_CLIENTS'), ]), - + ### Client messages NetMessage("Cl_Say", [ NetBool("m_Team"), @@ -293,4 +293,24 @@ Messages = [ NetStringStrict("m_Type"), NetStringStrict("m_Value"), ]), + + NetMessage("Cl_IsRace", []), + + NetMessage("Cl_RaceShowOthers", [ + NetBool("m_Active"), + ]), + + NetMessage("Sv_RaceTime", [ + NetIntAny("m_Time"), + NetIntAny("m_Check"), + ]), + + NetMessage("Sv_Record", [ + NetIntAny("m_Time"), + ]), + + NetMessage("Sv_PlayerTime", [ + NetIntAny("m_Time"), + NetIntRange("m_Cid", 0, 'MAX_CLIENTS-1'), + ]), ] diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp deleted file mode 100644 index 617c22668..000000000 --- a/src/game/server/score.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* copyright (c) 2008 rajh and gregwar. Score stuff */ - -#include "score.h" -#include "gamecontext.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -CPlayerScore::CPlayerScore(const char *name, float score) -{ - str_copy(this->name, name, sizeof(this->name)); - this->m_Score = score; -} - -std::list top; - -CScore::CScore(class CGameContext *pGameServer) -{ - m_pGameServer = pGameServer; - Load(); -} - -CScore::CScore() -{ -Load(); -} - -std::string CScore::SaveFile() -{ - std::ostringstream oss; - if(!g_Config.m_SvExternalRecords) { - oss << g_Config.m_SvMap << "_record.dtb"; - } else { - char buf[512]; - CServer* server = static_cast(m_pGameServer->Server()); - oss << server->Storage()->ApplicationSavePath() << "/records/" << g_Config.m_SvMap << "_record.dtb"; - } - return oss.str(); -} - -void CScore::Save() -{ - - std::fstream f; - f.open(SaveFile().c_str(), std::ios::out); - if(!f.fail()) { - for(std::list::iterator i=top.begin(); i!=top.end(); i++) - { - f << i->name << std::endl << i->m_Score << std::endl; - } - } - f.close(); -} - -void CScore::Load() -{ - std::fstream f; - f.open(SaveFile().c_str(), std::ios::in); - top.clear(); - while (!f.eof() && !f.fail()) - { - std::string tmpname, tmpscore; - std::getline(f, tmpname); - if(!f.eof() && tmpname != "") - { - std::getline(f, tmpscore); - top.push_back(*new CPlayerScore(tmpname.c_str(), atof(tmpscore.c_str()))); - } - } - f.close(); -} - -CPlayerScore *CScore::SearchName(const char *name, int &pos) -{ - pos=0; - for (std::list::iterator i = top.begin(); i!=top.end(); i++) - { - pos++; - if (!strcmp(i->name, name)) - { - return & (*i); - } - } - pos=-1; - return 0; -} - -CPlayerScore *CScore::SearchName(const char *name) -{ - for (std::list::iterator i = top.begin(); i!=top.end(); i++) - { - if (!strcmp(i->name, name)) - { - return & (*i); - } - } - return 0; -} - - -void CScore::ParsePlayer(const char *name, float score) -{ - Load(); - CPlayerScore *player = SearchName(name); - if (player) - { - if (player->m_Score > score) - { - player->m_Score = score; - top.sort(); - Save(); - } - } - else - { - top.push_back(*new CPlayerScore(name, score)); - top.sort(); - Save(); - } -} - -std::list CScore::Top5Draw(int id, int debut) //Thanks nevi -{ - std::list res; - int pos = 1; - //char buf[512]; - - res.push_back("----------- Top 5 -----------"); - for (std::list::iterator i = top.begin(); i != top.end() && pos <= ((debut)?4:5)+debut; i++) - { - if(i->m_Score < 0) - continue; - - if(pos >= debut) - { - std::ostringstream oss; - oss << pos << ". " << i->name << " Time: "; - - if ((int)(i->m_Score)/60 != 0) - oss << (int)(i->m_Score)/60 << ":"; - if (i->m_Score-((int)i->m_Score/60)*60 != 0) - oss << i->m_Score-((int)i->m_Score/60)*60 <<" "; - - res.push_back(oss.str()); - } - pos++; - } - res.push_back("-----------------------------"); - return res; -}