From 21738cdd2c4b0b8a5184297fe0ec6648d0c783cf Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Thu, 22 Jan 2009 12:30:32 +0000
Subject: [PATCH] New condition to switch to Interpolated demo playback - the
 old one did NOT make ANY sense at all

---
 CHANGELOG.txt  | 4 ++++
 main/newdemo.c | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bdefb067b..19d693f30 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20090122
+--------
+main/newdemo.c: New condition to switch to Interpolated demo playback - the old one did NOT make ANY sense at all
+
 20090117
 --------
 arch/sdl/mouse.c, main/menu.c, main/playsave.c, main/playsave.h: Made MouseFilter selectable over Controls menu while defaulting to OFF - Saved in PLX
diff --git a/main/newdemo.c b/main/newdemo.c
index 8737b8629..5555070c8 100644
--- a/main/newdemo.c
+++ b/main/newdemo.c
@@ -2652,17 +2652,14 @@ void newdemo_playback_one_frame()
 			if (nd_playback_total > nd_recorded_total)
 				playback_style = SKIP_PLAYBACK;
 
-			if ((nd_playback_total * INTERPOL_FACTOR) < nd_recorded_total) {
+			//if ((nd_playback_total * INTERPOL_FACTOR) < nd_recorded_total) // no matter how we look at it: this does not make ANY sense!
+			if (nd_recorded_total > 0 && nd_recorded_time > 0)
+			{
 				playback_style = INTERPOLATE_PLAYBACK;
 				nd_playback_total = nd_recorded_total + FrameTime; // baseline playback time
 				base_interpol_time = nd_recorded_total;
 				d_recorded = nd_recorded_time; // baseline delta recorded
 			}
-			else
-			{
-				if (NewdemoFrameCount > 0 && NewdemoFrameCount < 10)
-					newdemo_back_frames(1);
-			}
 		}
 
 		if ((playback_style == INTERPOLATE_PLAYBACK) && Newdemo_do_interpolate) {