diff --git a/src/shared/player.qc b/src/shared/player.qc
index 292277e..84e66b8 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -183,29 +183,6 @@ void
 player::ReceiveEntity(float new)
 {
 	float fl;
-	if (new == FALSE) {
-		/* Go through all the physics code between the last received frame
-		 * and the newest frame and keep the changes this time around instead
-		 * of rolling back, because we'll apply the new server-verified values
-		 * right after anyway. */
-		/* FIXME: splitscreen */
-		if (entnum == player_localentnum) {
-			/* FIXME: splitscreen */
-			pSeat = &g_seats[0];
-
-			for (int i = sequence+1; i <= servercommandframe; i++) {
-				/* ...maybe the input state is too old? */
-				if (!getinputstate(i)) {
-					break;
-				}
-				input_sequence = i;
-				PMove_Run();
-			}
-
-			/* any differences in things that are read below are now
-			 * officially from prediction misses. */
-		}
-	}
 
 	/* seed for our prediction table */
 	sequence = servercommandframe;
diff --git a/src/shared/w_flame.qc b/src/shared/w_flame.qc
index 78b5d23..42c47ba 100644
--- a/src/shared/w_flame.qc
+++ b/src/shared/w_flame.qc
@@ -174,7 +174,7 @@ w_flame_crosshair(void)
 	drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
 	HUD_DrawAmmo2();
 	vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
-	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
+	drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, pSeatLocal->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
 #endif
 }
 
diff --git a/src/shared/w_medkit.qc b/src/shared/w_medkit.qc
index f640ddf..869ee24 100644
--- a/src/shared/w_medkit.qc
+++ b/src/shared/w_medkit.qc
@@ -172,7 +172,7 @@ w_medkit_crosshair(void)
 		[24/256,96/128],
 		[24/256, 24/128],
 		g_hud_color,
-		pSeat->m_flAmmo2Alpha,
+		pSeatLocal->m_flAmmo2Alpha,
 		DRAWFLAG_ADDITIVE
 	);
 #endif
diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc
index 48ce2ac..6a846b4 100644
--- a/src/shared/w_rpg.qc
+++ b/src/shared/w_rpg.qc
@@ -327,7 +327,7 @@ void w_rpg_hud(void)
 		[120/256,72/128],
 		[24/256, 24/128],
 		g_hud_color,
-		pSeat->m_flAmmo2Alpha,
+		pSeatLocal->m_flAmmo2Alpha,
 		DRAWFLAG_ADDITIVE
 	);
 #endif
diff --git a/src/shared/w_sniper.qc b/src/shared/w_sniper.qc
index e2c09f5..c0907f0 100644
--- a/src/shared/w_sniper.qc
+++ b/src/shared/w_sniper.qc
@@ -272,7 +272,7 @@ w_sniper_crosshair(void)
 		[24/256,72/128],
 		[24/256, 24/128],
 		g_hud_color,
-		pSeat->m_flAmmo2Alpha,
+		pSeatLocal->m_flAmmo2Alpha,
 		DRAWFLAG_ADDITIVE
 	);
 #endif
diff --git a/src/shared/w_tnt.qc b/src/shared/w_tnt.qc
index bf41ed0..53511da 100644
--- a/src/shared/w_tnt.qc
+++ b/src/shared/w_tnt.qc
@@ -142,7 +142,7 @@ void w_tnt_hud(void)
 #ifdef CLIENT
 	HUD_DrawAmmo2();
 	vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
-	drawsubpic(aicon_pos, [16,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
+	drawsubpic(aicon_pos, [16,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeatLocal->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
 #endif
 }