sv_framerate and cl_framerate

1 files changed, 9 insertions, 10 deletions

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