From d198b7b8d9ff713d891f35ab173d1f428f610e7d Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 16 Feb 2008 14:31:02 +0000 Subject: code cleanup --- src/core/application.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/core/application.cc') diff --git a/src/core/application.cc b/src/core/application.cc index 55f8fc2..ce7460f 100644 --- a/src/core/application.cc +++ b/src/core/application.cc @@ -30,6 +30,12 @@ Cvar sv_private; Cvar net_host; Cvar net_port; +// return the global application object +Application *application() +{ + return Application::instance(); +} + // --------------- engine functions ------------------------------ void func_print(std::stringstream &args) { @@ -92,7 +98,7 @@ void func_say(std::stringstream &args) if (application()->netserver) { std::ostringstream osstream; osstream << "msg public " << localplayer.name << " " << args.str() << "\n"; - application()->netserver->broadcast(osstream); + application()->netserver->broadcast(osstream.str()); con_print << localplayer.name << ": " << args.str() << std::endl; } else if (application()->netconnection.connected()) { std::ostringstream osstream; @@ -122,8 +128,8 @@ void func_name(std::stringstream &args) { if (application()->netserver) { std::ostringstream osstream; osstream << "msg info " << localplayer.name << " renamed to " << name << "\n"; - application()->netserver->broadcast(osstream); - con_print << "name " << name << std::endl; + application()->netserver->broadcast(osstream.str()); + con_print << "msg info " << localplayer.name << " renamed to " << name << std::endl; } else if (application()->netconnection.connected()) { std::ostringstream osstream; osstream << args.str() << std::endl; @@ -211,7 +217,7 @@ void Application::init() gameinterface_preload = core::GameInterface::gameinterface_instance; core::GameInterface::gameinterface_instance = 0; if (gameinterface_preload) { - con_print << " preloaded game found: " << gameinterface_preload->name << std::endl; + con_print << " preloaded game found: " << gameinterface_preload->name() << std::endl; } game_time = 0; -- cgit v1.2.3