X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2FNexuizDemoRecorder%2Fmain%2Fsrc%2Fmain%2Fjava%2Fcom%2Fnexuiz%2Fdemorecorder%2Fapplication%2Fdemocutter%2FDemoCutter.java;h=397a03bb91c14c63f21ab220f1367cd5a64397fd;hp=a1174e66fee17d0ff6e099f7d8982fb2bc3cd767;hb=df3c06690c381222eca93566c3fab899c124d53d;hpb=740a38b25a4637627123304d6355a355376a1979

diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
index a1174e66..397a03bb 100644
--- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
+++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
@@ -63,7 +63,6 @@ public class DemoCutter {
 		boolean endIsReached = false;
 		boolean finalInjectionDone = false;
 		boolean disconnectIssued = false;
-		int svcLoops = 0;
 		float firstSvcTime = -1;
 		float lastSvcTime = -1;
 		
@@ -99,39 +98,32 @@ public class DemoCutter {
 					if (firstLoop) {
 						injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedFirstStage + "\n\000";
 						firstLoop = false;
-					}
-					if (demoStarted < 1 && svctime > (startTime - 50)) {
-						if (svcLoops == 0) {
-							//make sure that for short demos (duration less than 50 sec)
-							//the injectAtStart is still honored
-							injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedSecondStage + "\n\000";
-						} else {
+					} else {
+						if (demoStarted < 1 && svctime > (startTime - 50)) {
 							injectBuffer = "\011\nslowmo " + ffwSpeedSecondStage + "\n\000";
+							demoStarted = 1;
+						}
+						if (demoStarted < 2 && svctime > (startTime - 5)) {
+							injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000";
+							demoStarted = 2;
+						}
+						if (demoStarted < 3 && svctime > startTime) {
+							injectBuffer = "\011\ncl_capturevideo 1\n\000";
+							demoStarted = 3;
+						}
+						if (!endIsReached && svctime > endTime) {
+							injectBuffer = "\011\ncl_capturevideo 0\n\000";
+							endIsReached = true;
+						}
+						if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) {
+							injectBuffer = "\011\n" + injectAfterCap + "\n\000";
+							finalInjectionDone = true;
+						}
+						if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) {
+							injectBuffer = "\011\ndisconnect\n\000";
+							disconnectIssued = true;
 						}
-						
-						demoStarted = 1;
-					}
-					if (demoStarted < 2 && svctime > (startTime - 5)) {
-						injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000";
-						demoStarted = 2;
-					}
-					if (demoStarted < 3 && svctime > startTime) {
-						injectBuffer = "\011\ncl_capturevideo 1\n\000";
-						demoStarted = 3;
-					}
-					if (!endIsReached && svctime > endTime) {
-						injectBuffer = "\011\ncl_capturevideo 0\n\000";
-						endIsReached = true;
-					}
-					if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) {
-						injectBuffer = "\011\n" + injectAfterCap + "\n\000";
-						finalInjectionDone = true;
-					}
-					if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) {
-						injectBuffer = "\011\ndisconnect\n\000";
-						disconnectIssued = true;
 					}
-					svcLoops++;
 				}
 
 				byte[] injectBufferAsBytes = null;