dedicated server, entity transfer

1 files changed, 12 insertions, 6 deletions

diff --git a/src/server/server.cc b/src/server/server.cc
index 4c087b8..c07be52 100644
--- a/src/server/server.cc
+++ b/src/server/server.cc
@@ -64,18 +64,24 @@ void Server::init()
 
 void Server::run()
 {
-	const float server_framerate =  1.0f / 20.0f;
-	server::Timer timer;
+	float server_framerate =  1.0f / 20.0f;
+	if (core::Cvar::sv_framerate->value())
+		server_framerate = 1.0f / core::Cvar::sv_framerate->value();
 
-	timer.mark();
+	server::Timer timer;
 
 	while(true) {
+		timer.mark();
+		frame(server_framerate);
 		float elapsed = timer.elapsed();
 
-		frame(elapsed);
+		float sleeptime = server_framerate - elapsed;
+		if (sleeptime <0)
+			sleeptime = 0;
 
-		sys::sleep(server_framerate - elapsed);
-		timer.mark();
+		sys::sleep(sleeptime);
+		
+		
 	}
 	
 }