diff --git a/source/games/blood/src/choke.cpp b/source/games/blood/src/choke.cpp
index 870b39645..326412e44 100644
--- a/source/games/blood/src/choke.cpp
+++ b/source/games/blood/src/choke.cpp
@@ -56,11 +56,11 @@ void CChoke::init(int a1, void(*a2)(PLAYER*))
 //
 //---------------------------------------------------------------------------
 
-void CChoke::animateChoke(int x, int y, int smoothratio)
+void CChoke::animateChoke(int x, int y, double interpfrac)
 {
 	if (!qav)
 		return;
-	int myclock = PlayClock + MulScale(4, smoothratio, 16);
+	int myclock = PlayClock + int(4 * interpfrac);
 	qav->x = x;
 	qav->y = y;
 	int vd = myclock - time;
diff --git a/source/games/blood/src/choke.h b/source/games/blood/src/choke.h
index c782d1609..d2b9a82e1 100644
--- a/source/games/blood/src/choke.h
+++ b/source/games/blood/src/choke.h
@@ -41,7 +41,7 @@ public:
 		y = 0;
 	};
 	void init(int a1, void(*a2)(PLAYER*));
-	void animateChoke(int x, int y, int smoothratio);
+	void animateChoke(int x, int y, double interpfrac);
 	void reset() { time = 0; }
 	QAV* qav;
 	int duration;
diff --git a/source/games/blood/src/hudsprites.cpp b/source/games/blood/src/hudsprites.cpp
index dd1d0fb75..a32d9f53d 100644
--- a/source/games/blood/src/hudsprites.cpp
+++ b/source/games/blood/src/hudsprites.cpp
@@ -104,13 +104,13 @@ static void viewBurnTime(int gScale)
 //
 //---------------------------------------------------------------------------
 
-void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, double zDelta, int basepal, double smoothratio)
+void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, double zDelta, int basepal, double interpfrac)
 {
-	double look_anghalf = gView->angle.look_anghalf(smoothratio);
+	double look_anghalf = gView->angle.look_anghalf(interpfrac);
 
 	if (gViewPos == 0)
 	{
-		double looking_arc = gView->angle.looking_arc(smoothratio);
+		double looking_arc = gView->angle.looking_arc(interpfrac);
 
 		double cX = 160 - look_anghalf;
 		double cY = 220 + looking_arc;
@@ -177,7 +177,7 @@ void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, doubl
 	PLAYER* pPSprite = &gPlayer[gMe->actor->spr.type - kDudePlayer1];
 	if (gMe->actor->IsPlayerActor() && pPSprite->hand == 1)
 	{
-		gChoke.animateChoke(160, zn, (int)gInterpolate);
+		gChoke.animateChoke(160, zn, interpfrac);
 	}
 }
 
diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp
index 36ef2cabc..87e860917 100644
--- a/source/games/blood/src/view.cpp
+++ b/source/games/blood/src/view.cpp
@@ -51,8 +51,6 @@ VIEW gPrevView[kMaxPlayers];
 VIEWPOS gViewPos;
 int gViewIndex;
 
-double gInterpolate;
-
 //---------------------------------------------------------------------------
 //
 // 
@@ -463,7 +461,7 @@ int32_t g_frameRate;
 //
 //---------------------------------------------------------------------------
 
-static void DrawMap(DBloodActor* view)
+static void DrawMap(DBloodActor* view, const double smoothratio)
 {
 	int tm = 0;
 	if (viewport3d.Left() > 0)
@@ -472,9 +470,9 @@ static void DrawMap(DBloodActor* view)
 		tm = 1;
 	}
 	VIEW* pView = &gPrevView[gViewIndex];
-	auto xy = DVector2(interpolatedvalue(pView->x, view->int_pos().X, gInterpolate * (1. / MaxSmoothRatio)), interpolatedvalue(pView->y, view->int_pos().Y, gInterpolate * (1. / MaxSmoothRatio))) * inttoworld;
-	auto ang = !SyncInput() ? gView->angle.sum() : gView->angle.interpolatedsum(gInterpolate * (1. / MaxSmoothRatio));
-	DrawOverheadMap(xy, ang, gInterpolate * (1. / MaxSmoothRatio));
+	auto xy = DVector2(interpolatedvalue(pView->x, view->int_pos().X, smoothratio * (1. / MaxSmoothRatio)), interpolatedvalue(pView->y, view->int_pos().Y, smoothratio * (1. / MaxSmoothRatio))) * inttoworld;
+	auto ang = !SyncInput() ? gView->angle.sum() : gView->angle.interpolatedsum(smoothratio * (1. / MaxSmoothRatio));
+	DrawOverheadMap(xy, ang, smoothratio * (1. / MaxSmoothRatio));
 	if (tm)
 		setViewport(hud_size);
 }
@@ -485,7 +483,7 @@ static void DrawMap(DBloodActor* view)
 //
 //---------------------------------------------------------------------------
 
-void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype*& pSector, double& zDelta, double& shakeX, double& shakeY, DAngle& rotscrnang)
+static void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype*& pSector, double& zDelta, double& shakeX, double& shakeY, DAngle& rotscrnang, const double smoothratio)
 {
 	int bobWidth, bobHeight;
 
@@ -494,14 +492,14 @@ void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype
 	if (numplayers > 1 && gView == gMe && gPrediction && gMe->actor->xspr.health > 0)
 	{
 		nSectnum = predict.sectnum;
-		cX = interpolatedvalue(predictOld.x, predict.x, gInterpolate * (1. / MaxSmoothRatio));
-		cY = interpolatedvalue(predictOld.y, predict.y, gInterpolate * (1. / MaxSmoothRatio));
-		cZ = interpolatedvalue(predictOld.viewz, predict.viewz, gInterpolate * (1. / MaxSmoothRatio));
-		zDelta = interpolatedvalue(predictOld.weaponZ, predict.weaponZ, gInterpolate * (1. / MaxSmoothRatio));
-		bobWidth = interpolatedvalue(predictOld.bobWidth, predict.bobWidth, gInterpolate * (1. / MaxSmoothRatio));
-		bobHeight = interpolatedvalue(predictOld.bobHeight, predict.bobHeight, gInterpolate * (1. / MaxSmoothRatio));
-		shakeX = interpolatedvalue(predictOld.shakeBobX, predict.shakeBobX, gInterpolate * (1. / MaxSmoothRatio));
-		shakeY = interpolatedvalue(predictOld.shakeBobY, predict.shakeBobY, gInterpolate * (1. / MaxSmoothRatio));
+		cX = interpolatedvalue(predictOld.x, predict.x, smoothratio * (1. / MaxSmoothRatio));
+		cY = interpolatedvalue(predictOld.y, predict.y, smoothratio * (1. / MaxSmoothRatio));
+		cZ = interpolatedvalue(predictOld.viewz, predict.viewz, smoothratio * (1. / MaxSmoothRatio));
+		zDelta = interpolatedvalue(predictOld.weaponZ, predict.weaponZ, smoothratio * (1. / MaxSmoothRatio));
+		bobWidth = interpolatedvalue(predictOld.bobWidth, predict.bobWidth, smoothratio * (1. / MaxSmoothRatio));
+		bobHeight = interpolatedvalue(predictOld.bobHeight, predict.bobHeight, smoothratio * (1. / MaxSmoothRatio));
+		shakeX = interpolatedvalue(predictOld.shakeBobX, predict.shakeBobX, smoothratio * (1. / MaxSmoothRatio));
+		shakeY = interpolatedvalue(predictOld.shakeBobY, predict.shakeBobY, smoothratio * (1. / MaxSmoothRatio));
 
 		if (!SyncInput())
 		{
@@ -511,23 +509,23 @@ void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype
 		}
 		else
 		{
-			cA = interpolatedvalue(predictOld.angle + predictOld.look_ang, predict.angle + predict.look_ang, gInterpolate * (1. / MaxSmoothRatio));
-			cH = interpolatedvalue(predictOld.horiz + predictOld.horizoff, predict.horiz + predict.horizoff, gInterpolate);
-			rotscrnang = interpolatedvalue(predictOld.rotscrnang, predict.rotscrnang, gInterpolate * (1. / MaxSmoothRatio));
+			cA = interpolatedvalue(predictOld.angle + predictOld.look_ang, predict.angle + predict.look_ang, smoothratio * (1. / MaxSmoothRatio));
+			cH = interpolatedvalue(predictOld.horiz + predictOld.horizoff, predict.horiz + predict.horizoff, smoothratio);
+			rotscrnang = interpolatedvalue(predictOld.rotscrnang, predict.rotscrnang, smoothratio * (1. / MaxSmoothRatio));
 		}
 	}
 	else
 #endif
 	{
 		VIEW* pView = &gPrevView[gViewIndex];
-		cX = interpolatedvalue(pView->x, gView->actor->int_pos().X, gInterpolate * (1. / MaxSmoothRatio));
-		cY = interpolatedvalue(pView->y, gView->actor->int_pos().Y, gInterpolate * (1. / MaxSmoothRatio));
-		cZ = interpolatedvalue(pView->viewz, gView->zView, gInterpolate * (1. / MaxSmoothRatio));
-		zDelta = interpolatedvalue<double>(pView->weaponZ, gView->zWeapon - gView->zView - (12 << 8), gInterpolate * (1. / MaxSmoothRatio));
-		bobWidth = interpolatedvalue(pView->bobWidth, gView->bobWidth, gInterpolate * (1. / MaxSmoothRatio));
-		bobHeight = interpolatedvalue(pView->bobHeight, gView->bobHeight, gInterpolate * (1. / MaxSmoothRatio));
-		shakeX = interpolatedvalue<double>(pView->shakeBobX, gView->swayWidth, gInterpolate * (1. / MaxSmoothRatio));
-		shakeY = interpolatedvalue<double>(pView->shakeBobY, gView->swayHeight, gInterpolate * (1. / MaxSmoothRatio));
+		cX = interpolatedvalue(pView->x, gView->actor->int_pos().X, smoothratio * (1. / MaxSmoothRatio));
+		cY = interpolatedvalue(pView->y, gView->actor->int_pos().Y, smoothratio * (1. / MaxSmoothRatio));
+		cZ = interpolatedvalue(pView->viewz, gView->zView, smoothratio * (1. / MaxSmoothRatio));
+		zDelta = interpolatedvalue<double>(pView->weaponZ, gView->zWeapon - gView->zView - (12 << 8), smoothratio * (1. / MaxSmoothRatio));
+		bobWidth = interpolatedvalue(pView->bobWidth, gView->bobWidth, smoothratio * (1. / MaxSmoothRatio));
+		bobHeight = interpolatedvalue(pView->bobHeight, gView->bobHeight, smoothratio * (1. / MaxSmoothRatio));
+		shakeX = interpolatedvalue<double>(pView->shakeBobX, gView->swayWidth, smoothratio * (1. / MaxSmoothRatio));
+		shakeY = interpolatedvalue<double>(pView->shakeBobY, gView->swayHeight, smoothratio * (1. / MaxSmoothRatio));
 
 		if (!SyncInput())
 		{
@@ -537,9 +535,9 @@ void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype
 		}
 		else
 		{
-			cA = gView->angle.interpolatedsum(gInterpolate * (1. / MaxSmoothRatio));
-			cH = gView->horizon.interpolatedsum(gInterpolate * (1. / MaxSmoothRatio));
-			rotscrnang = gView->angle.interpolatedrotscrn(gInterpolate * (1. / MaxSmoothRatio));
+			cA = gView->angle.interpolatedsum(smoothratio * (1. / MaxSmoothRatio));
+			cH = gView->horizon.interpolatedsum(smoothratio * (1. / MaxSmoothRatio));
+			rotscrnang = gView->angle.interpolatedrotscrn(smoothratio * (1. / MaxSmoothRatio));
 		}
 	}
 
@@ -560,7 +558,7 @@ void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype
 	}
 	else
 	{
-		calcChaseCamPos((int*)&cX, (int*)&cY, (int*)&cZ, gView->actor, &pSector, cA, cH, gInterpolate);
+		calcChaseCamPos((int*)&cX, (int*)&cY, (int*)&cZ, gView->actor, &pSector, cA, cH, smoothratio);
 	}
 	if (pSector != nullptr)
 		CheckLink((int*)&cX, (int*)&cY, (int*)&cZ, &pSector);
@@ -645,6 +643,8 @@ void viewDrawScreen(bool sceneonly)
 		FireProcess();
 	}
 
+	double gInterpolate;
+
 	if (!paused && (!M_Active() || gGameOptions.nGameType != 0))
 	{
 		gInterpolate = !cl_interpolate || cl_capfps ? MaxSmoothRatio : I_GetTimeFrac() * MaxSmoothRatio;
@@ -682,7 +682,7 @@ void viewDrawScreen(bool sceneonly)
 		sectortype* pSector;
 		double zDelta;
 		double shakeX, shakeY;
-		SetupView(cX, cY, cZ, cA, cH, pSector, zDelta, shakeX, shakeY, rotscrnang);
+		SetupView(cX, cY, cZ, cA, cH, pSector, zDelta, shakeX, shakeY, rotscrnang, gInterpolate);
 
 		DAngle tilt = interpolatedvalue(gScreenTiltO, gScreenTilt, gInterpolate * (1. / MaxSmoothRatio));
 		bool bDelirium = powerupCheck(gView, kPwUpDeliriumShroom) > 0;
@@ -814,7 +814,7 @@ void viewDrawScreen(bool sceneonly)
 
 	if (automapMode != am_off)
 	{
-		DrawMap(gView->actor);
+		DrawMap(gView->actor, gInterpolate);
 	}
 	UpdateStatusBar();
 
diff --git a/source/games/blood/src/view.h b/source/games/blood/src/view.h
index 650635c64..6e8aacdc9 100644
--- a/source/games/blood/src/view.h
+++ b/source/games/blood/src/view.h
@@ -137,9 +137,8 @@ extern DAngle deliriumTurnO, deliriumTurn;
 extern DAngle gScreenTiltO, gScreenTilt;
 extern int gShowFrameRate;
 extern int gLastPal;
-extern double gInterpolate;
 
-void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, double zDelta, int basepal, double smoothratio);
+void hudDraw(PLAYER* gView, sectortype* pSector, double bobx, double boby, double zDelta, int basepal, double interpfrac);
 void viewInitializePrediction(void);
 void viewUpdatePrediction(InputPacket* pInput);
 void viewCorrectPrediction(void);