Cinematic: dissolve function

arx · Dec 28, 2017 · 05b531c · 05b531c
1 parent 85488cc
commit 05b531c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/cinematic/CinematicKeyframer.cpp b/src/cinematic/CinematicKeyframer.cpp
@@ -628,7 +628,7 @@ void GereTrack(Cinematic * c, PlatformDuration frameDuration, bool resized, bool
 	if(play) {
 
 	c->flTime = c->flTime + frameDuration;
-	CKTrack->currframe = toMs(c->flTime) / 1000.f * float(GetEndFrame()) / GetTimeKeyFramer();
+	CKTrack->currframe = toMs(c->flTime) / 1000.f * float(CKTrack->endframe) / GetTimeKeyFramer();
 
 	// TODO this assert fails if you pause the gametime before a cinematic starts and unpause after
 	arx_assert(CKTrack->currframe >= 0);
@@ -668,14 +668,6 @@ float GetTimeKeyFramer()
 	return t;
 }
 
-int GetEndFrame() {
-
-	if(!CKTrack)
-		return -1;
-
-	return CKTrack->endframe;
-}
-
 float GetTrackFPS() {
 
 	if(!CKTrack)

diff --git a/src/cinematic/CinematicKeyframer.h b/src/cinematic/CinematicKeyframer.h
@@ -89,7 +89,6 @@ void AddKeyLoad(const CinematicKeyframe & key);
 void GereTrack(Cinematic * c, PlatformDuration frameDuration, bool resized, bool play);
 
 void PlayTrack(Cinematic * c);
-int GetEndFrame();
 void SetCurrFrame(int frame);
 float GetTrackFPS();