From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/dedicated/dedicated.cc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/dedicated/dedicated.cc') diff --git a/src/dedicated/dedicated.cc b/src/dedicated/dedicated.cc index 43c636e..6812d63 100644 --- a/src/dedicated/dedicated.cc +++ b/src/dedicated/dedicated.cc @@ -1,7 +1,7 @@ /* dedicated/dedicated.cc - This file is part of the Osirion project and is distributed under - the terms and conditions of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms and conditions of the GNU General Public License version 2 */ #include @@ -14,13 +14,14 @@ #include "dedicated/console.h" #include "dedicated/dedicated.h" -namespace dedicated { +namespace dedicated +{ void run(int count, char **arguments) { std::cout << core::name() << " " << core::version() << std::endl; - for (int i =0; i < count; i++) + for (int i = 0; i < count; i++) std::cout << arguments[i] << " "; std::cout << std::endl; @@ -38,7 +39,7 @@ void Dedicated::init(int count, char **arguments) core::Cvar::set("sv_dedicated", "1", core::Cvar::ReadOnly); - core::Application::init(count, arguments); + core::Application::init(count, arguments); Console::init(); @@ -59,7 +60,7 @@ void Dedicated::run() core::Timer timer; timer.mark(); - while(connected()) { + while (connected()) { frame(timer.timestamp()); #ifdef HAVE_CURSES console()->frame(); @@ -67,28 +68,28 @@ void Dedicated::run() } } -void Dedicated::shutdown() +void Dedicated::shutdown() { con_print << "^BShutting down dedicated server..." << std::endl; float ratio = 0; if (core::Stats::network_uncompressed_bytes_sent > 0) ratio = 100.0f - floorf((float)core::Stats::network_bytes_sent / - (float) core::Stats::network_uncompressed_bytes_sent * 100.0f); + (float) core::Stats::network_uncompressed_bytes_sent * 100.0f); int minutes = (int) floorf(time() / 60.0f); - int seconds = (int) floorf(time() - (float) minutes* 60.0f); - + int seconds = (int) floorf(time() - (float) minutes * 60.0f); + con_debug << "Statistics:" << std::endl; con_debug << " uptime " << std::setfill(' ') << std::setw(3) << minutes << ":" << std::setfill('0') << std::setw(2) << seconds << std::endl; con_debug << " bytes sent " << std::setfill(' ') << std::setw(6) << core::Stats::network_bytes_sent / 1024 << " Kb" << std::endl; con_debug << " bytes received " << std::setw(6) << core::Stats::network_bytes_received / 1024 << " Kb" << std::endl; con_debug << " compression " << std::setw(6) << ratio << " %" << std::endl; - + core::Application::shutdown(); Console::shutdown(); - + quit(0); } -- cgit v1.2.3