Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/client.cc10
-rw-r--r--src/client/console.cc6
2 files changed, 9 insertions, 7 deletions
diff --git a/src/client/client.cc b/src/client/client.cc
index 14e6bb5..f146a8f 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -17,11 +17,16 @@
namespace client {
+// public instances
Camera camera;
View view;
Video video;
Input input;
+// private instance of the client console object
+Console clientconsole;
+
+
void quit(int status)
{
SDL_Quit();
@@ -30,12 +35,9 @@ void quit(int status)
void init()
{
- // initialize console
- Console clientconsole;
+ // set clientconsole as the common console object
common::Console::instance = &clientconsole;
- conmesg << "Project::OSiRiON " << OSIRION_VERSION << std::endl;
-
// Initialize the video subsystem
video.init();
if (!video.initialized) {
diff --git a/src/client/console.cc b/src/client/console.cc
index 21dde67..f270108 100644
--- a/src/client/console.cc
+++ b/src/client/console.cc
@@ -11,17 +11,17 @@ namespace client {
std::ostream & Console::message()
{
- return std::cout;
+ return (std::cout << ". ");
}
std::ostream & Console::warning()
{
- return std::cerr;
+ return (std::cout << "! ");
}
std::ostream & Console::debug()
{
- return std::cout;
+ return (std::cout << "? ");
}
} // namespace client