Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/console.cc7
-rw-r--r--src/filesystem/filesystem.cc7
-rw-r--r--src/server/console.cc7
-rw-r--r--src/sys/consoleinterface.h3
4 files changed, 21 insertions, 3 deletions
diff --git a/src/client/console.cc b/src/client/console.cc
index 28d80f0..9e2a782 100644
--- a/src/client/console.cc
+++ b/src/client/console.cc
@@ -37,6 +37,9 @@ public:
/// stream to send debug messages too
virtual std::ostream & debugstream();
+ /// flush buffered messages
+ virtual void flush();
+
/// console text buffer
std::stringstream buffer;
};
@@ -356,6 +359,10 @@ void load_history()
}
//--- private -----------------------------------------------------
+void Console::flush()
+{
+ console::flush();
+}
std::ostream & Console::messagestream()
{
return (buffer << ". ");
diff --git a/src/filesystem/filesystem.cc b/src/filesystem/filesystem.cc
index 130aeb7..e0b45a9 100644
--- a/src/filesystem/filesystem.cc
+++ b/src/filesystem/filesystem.cc
@@ -24,18 +24,19 @@ void init()
{
con_print << "Initializing filesystem..." << std::endl;
- // FIXME datadir should by set by ./configure and read from config.h
-
// initialize game data locations
+ // FIXME datadir should by set by ./configure and read from config.h
datadir = "./data/";
+
+ // FIXME a local or remote game module must be able to set these
basedir = "base/";
moddir = "";
- // FIXME win32
#ifndef _WIN32
homedir = getenv("HOME");
homedir = homedir + "/.osirion/";
#else
+ // FIXME win32
homedir = "./home/";
#endif
diff --git a/src/server/console.cc b/src/server/console.cc
index 77b5d28..b5d0aaf 100644
--- a/src/server/console.cc
+++ b/src/server/console.cc
@@ -30,6 +30,9 @@ public:
/// stream to send debug messages too
virtual std::ostream & debugstream();
+ /// flush does nothing in this implementation
+ virtual void flush();
+
unsigned long ping;
};
@@ -65,6 +68,10 @@ void shutdown()
//--- private -----------------------------------------------------
+void Console::flush()
+{
+}
+
std::ostream & Console::messagestream()
{
return std::cout;
diff --git a/src/sys/consoleinterface.h b/src/sys/consoleinterface.h
index 0215d55..33dc5b5 100644
--- a/src/sys/consoleinterface.h
+++ b/src/sys/consoleinterface.h
@@ -52,6 +52,9 @@ public:
/// stream to send debug messages too
virtual std::ostream & debugstream() = 0;
+ /// flush buffered messages
+ virtual void flush() = 0;
+
/// a pointer to the current console instance
static ConsoleInterface *instance();