diff options
Diffstat (limited to 'src/core/gameserver.cc')
| -rw-r--r-- | src/core/gameserver.cc | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc index 096d8bf..e170a4d 100644 --- a/src/core/gameserver.cc +++ b/src/core/gameserver.cc @@ -39,15 +39,15 @@ void func_time(std::string const &args) using namespace std; int minutes = (int) floorf(server()->time() / 60.0f); - int seconds = (int) floorf(server()->time() - (float) minutes* 60.0f); + int seconds = (int) floorf(server()->time() - (float) minutes * 60.0f); int syshours = sys::time() / 3600; int sysminutes = (sys::time() - syshours * 3600) / 60; int sysseconds = sys::time() % 60; - con_print << - "Uptime " << minutes << ":" << setfill('0') << setw(2) << seconds << - " Local time " << setfill(' ') << setw(2) << syshours << ":" << setfill('0') << setw(2) << sysminutes << ":" << setw(2) << sysseconds << setfill(' ') << std::endl; + con_print << + "Uptime " << minutes << ":" << setfill('0') << setw(2) << seconds << + " Local time " << setfill(' ') << setw(2) << syshours << ":" << setfill('0') << setw(2) << sysminutes << ":" << setw(2) << sysseconds << setfill(' ') << std::endl; } void func_mute(std::string const &args) @@ -78,7 +78,7 @@ void func_unmute(std::string const &args) } targetplayer->player_mute = false; - server()->broadcast("^B" +targetplayer->name() + "^B has been unmuted", targetplayer); + server()->broadcast("^B" + targetplayer->name() + "^B has been unmuted", targetplayer); targetplayer->send("^WYou have been unmuted"); } @@ -92,8 +92,8 @@ void func_kick(std::string const &args) if (!(targetplayer = console_find_player(name))) return; std::string reason; - if (args.size() > name.size()+1) - reason.assign(args.substr(name.size()+1)); + if (args.size() > name.size() + 1) + reason.assign(args.substr(name.size() + 1)); else reason.assign("forcefully removed."); @@ -105,7 +105,8 @@ void func_grant_rcon(std::string const &args) { Player *targetplayer = 0; if (!(targetplayer = console_find_player(args))) - return;} + return; +} void func_revoke_rcon(std::string const &args) { @@ -141,7 +142,7 @@ GameServer::GameServer() : GameInterface() if (server_module->interactive()) { //FIXME interferes with command line because of cmd.exec - load_config(); + load_config(); } // set the name of the game @@ -217,9 +218,9 @@ GameServer::~GameServer() Func::remove("mute"); Func::remove("unmute"); -/* Func::remove("grant_rcon"); - Func::remove("revoke_rcon"); -*/ + /* Func::remove("grant_rcon"); + Func::remove("revoke_rcon"); + */ Func::remove("time"); Func::remove("who"); @@ -233,7 +234,7 @@ unsigned long GameServer::timestamp() const float GameServer::time() const { - return ((float)(server_timestamp) / 1000.0f); + return ((float)(server_timestamp) / 1000.0f); } Info *GameServer::info(const std::string &label) @@ -250,7 +251,7 @@ bool GameServer::interactive() const { if (!server_module) { return false; - } else { + } else { return server_module->interactive(); } } @@ -320,14 +321,14 @@ void GameServer::kick(Player *player, std::string const &reason) } // broadcast an "info" message to all players -void GameServer::broadcast(const std::string text, Player *ignore_player) +void GameServer::broadcast(const std::string text, Player *ignore_player) { broadcast(Message::Info, text, ignore_player); } // broadcast a message on a specified channel to all players -void GameServer::broadcast(const Message::Channel channel, const std::string text, Player *ignore_player) +void GameServer::broadcast(const Message::Channel channel, const std::string text, Player *ignore_player) { if (!text.size()) return; @@ -370,10 +371,10 @@ void GameServer::exec(Player *player, std::string const & cmdline) cmdstream >> command; Func *function = Func::find(command); - if (function ) { + if (function) { std::string args; - if (cmdline.size() > command.size() +1 ) - args.assign(cmdline.substr(command.size()+1)); + if (cmdline.size() > command.size() + 1) + args.assign(cmdline.substr(command.size() + 1)); if ((function ->flags() & Func::Game) == Func::Game) { if ((function ->flags() & Func::Target) == Func::Target) { @@ -382,18 +383,18 @@ void GameServer::exec(Player *player, std::string const & cmdline) Entity *entity = Entity::find(id); if (entity) function->exec(player, entity); - } + } } else { function->exec(player, args); } } else if ((function->flags() & Func::Shared) == Func::Shared) { - + // enable rcon buffering console()->set_rcon(true); function->exec(args); - while(console()->rconbuf().size()) { + while (console()->rconbuf().size()) { player->message(Message::RCon, (*console()->rconbuf().begin())); console()->rconbuf().pop_front(); } @@ -444,12 +445,12 @@ void GameServer::player_disconnect(Player *player) server_module->player_disconnect(player); // manage player list - std::list<Player *>:: iterator it = game_players.begin(); + std::list<Player *>:: iterator it = game_players.begin(); while (((*it)->id() != player->id()) && (it != game_players.end())) { it++; } if (it != game_players.end()) { - game_players.erase(it); + game_players.erase(it); } } @@ -469,14 +470,14 @@ void GameServer::frame(unsigned long timestamp) } if (localplayer()->dirty()) - localplayer()->update_info(); + localplayer()->update_info(); /*if (!Cvar::sv_dedicated->value()) { update_clientstate(); }*/ if ((Cvar::sv_dedicated->value() || Cvar::sv_private->value())) { - if (core::Cvar::sv_framerate->value()) { + if (core::Cvar::sv_framerate->value()) { float f = 1000.0f / core::Cvar::sv_framerate->value(); if (server_startup + server_timestamp + f > timestamp) { return; @@ -486,15 +487,15 @@ void GameServer::frame(unsigned long timestamp) server_previoustime = server_timestamp; server_timestamp = timestamp - server_startup; - float elapsed = (float) (server_timestamp - server_previoustime) / 1000.0f; - + float elapsed = (float)(server_timestamp - server_previoustime) / 1000.0f; + // copy the previous entity state to the client state /*if (!Cvar::sv_dedicated->value()) { reset_clientstate(); }*/ // run a time frame on each entity - for (Entity::Registry::iterator it=Entity::registry().begin(); it != Entity::registry().end(); it++) { + for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) { Entity *entity = (*it).second; if ((entity->type() == Entity::Controlable) || (entity->type() == Entity::Dynamic)) { @@ -512,14 +513,14 @@ void GameServer::frame(unsigned long timestamp) return; } } - + if (server_network) { // send network updates server_network->frame(server_timestamp); } // mark all entities as updated - for (Entity::Registry::iterator it=Entity::registry().begin(); it != Entity::registry().end(); ) { + for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end();) { Entity *entity = (*it).second; if (entity->entity_destroyed) { @@ -531,7 +532,7 @@ void GameServer::frame(unsigned long timestamp) ++it; } } - + if (localplayer()->zonechange()) { application()->notify_zonechange(); localplayer()->set_zonechange(false); @@ -560,7 +561,7 @@ void GameServer::save_config() ofs << std::endl; for (Cvar::Registry::iterator it = Cvar::registry().begin(); it != Cvar::registry().end(); it++) { - if ((((*it).second->flags() & Cvar::Archive) == Cvar::Archive) && (((*it).second->flags() & Cvar::Game) == Cvar::Game)){ + if ((((*it).second->flags() & Cvar::Archive) == Cvar::Archive) && (((*it).second->flags() & Cvar::Game) == Cvar::Game)) { ofs << "# " << (*it).first << " " << (*it).second->info() << std::endl; ofs << "set " << (*it).first << " " << (*it).second->str() << std::endl; ofs << std::endl; @@ -583,11 +584,11 @@ void GameServer::load_config() con_print << " reading configuration from " << filename << std::endl; char line[MAXCMDSIZE]; - while (ifs.getline(line, MAXCMDSIZE-1)) { + while (ifs.getline(line, MAXCMDSIZE - 1)) { if (line[0] && line[0] != '#' && line[0] != ';') cmd() << line << '\n'; } - + // execute commands in the buffer CommandBuffer::exec(); } |