fix: multiplayer fix and more

dhewm · Jun 13, 2020 · d6c7304 · d6c7304
1 parent 15f4e5e
commit d6c7304
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/neo/d3xp/Game_local.h b/neo/d3xp/Game_local.h
@@ -486,7 +486,7 @@ class idGameLocal : public idGame {
 	// added the following to assist licensees with merge issues
 	int						GetFrameNum() const { return framenum; };
 	int						GetTime() const { return time; };
-	float					GetMSec() const { return msec; };
+	int						GetMSec() const { return (int)idMath::Rint(msec); };
 
 	int						GetNextClientNum( int current ) const;
 	idPlayer *				GetClientByNum( int current ) const;

diff --git a/neo/game/Game_local.h b/neo/game/Game_local.h
@@ -422,7 +422,7 @@ class idGameLocal : public idGame {
 	// added the following to assist licensees with merge issues
 	int						GetFrameNum() const { return framenum; };
 	int						GetTime() const { return time; };
-	int						GetMSec() const { return msec; };
+	int						GetMSec() const { return (int)idMath::Rint(msec); };
 
 	int						GetNextClientNum( int current ) const;
 	idPlayer *				GetClientByNum( int current ) const;

diff --git a/neo/game/Game_network.cpp b/neo/game/Game_network.cpp
@@ -994,7 +994,7 @@ void idGameLocal::ClientReadSnapshot( int clientNum, int sequence, const int gam
 	// update the game time
 	framenum = gameFrame;
 	time = gameTime;
-	previousTime = time - msec;
+	previousTime = time - idMath::Rint(msec);
 
 	// so that StartSound/StopSound doesn't risk skipping
 	isNewFrame = true;
@@ -1492,7 +1492,7 @@ gameReturn_t idGameLocal::ClientPrediction( int clientNum, const usercmd_t *clie
 	// update the game time
 	framenum++;
 	previousTime = time;
-	time += msec;
+	time = FRAME_TO_MSEC(framenum);
 
 	// update the real client time and the new frame flag
 	if ( time > realClientTime ) {