Made time(), timestamp() and related methods non-virtual, corrects a crash when

the dedicated server quits.

1 files changed, 30 insertions, 5 deletions

diff --git a/src/core/gameinterface.cc b/src/core/gameinterface.cc
index 1d3e6fb..3505e2c 100644
--- a/src/core/gameinterface.cc
+++ b/src/core/gameinterface.cc
@@ -81,6 +81,10 @@ GameInterface::GameInterface()
 	game_vertexarray = new model::VertexArray(mb);
 	
 	model::Material::init();
+	
+	game_timestamp = 0;
+	game_running = false;
+	game_interactive = false;
 }
 
 GameInterface::~GameInterface()
@@ -145,8 +149,34 @@ void GameInterface::clear()
 			++it;
 		}
 	}
+	
+	game_running = false;
+	game_interactive = true;
+}
+
+void GameInterface::set_running(const bool running)
+{
+	game_running = running;
+}
+
+void GameInterface::set_interactive(const bool interactive)
+{
+	game_interactive = interactive;
+}
+
+void GameInterface::set_timestamp(const unsigned long timestamp)
+{
+	game_timestamp = timestamp;
 }
 
+void GameInterface::set_playerlist_timestamp(const unsigned long timestamp)
+{
+	game_playerlist_timestamp = ( timestamp > 0 ? timestamp : 1);
+}
+
+void GameInterface::abort() {
+	game_running = false;
+}
 
 Player *GameInterface::find_player(const std::string &search)
 {
@@ -196,9 +226,4 @@ void GameInterface::list_players()
 	con_print << count << " connected " << aux::plural("player", count) << std::endl;
 }
 
-void GameInterface::set_playerlist_timestamp(const unsigned long timestamp)
-{
-	game_playerlist_timestamp = ( timestamp > 0 ? timestamp : 1);
-}
-
 }