Play animations from bundled VVF files

Playback from the old ANIMS.DAT is no longer needed.
mdoucha · Jun 15, 2020 · f80df5b · f80df5b
1 parent f673435
commit f80df5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/signus/src/anims.cpp b/signus/src/anims.cpp
@@ -21,6 +21,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <climits>
 #include <cmath>
 #include <SDL_timer.h>
 #include "global.h"
@@ -897,23 +898,15 @@ void VVFStream::reset(void) {
 }
 
 int open_anim_file(File &file, const char *name) {
-	int num;
+	char fullname[PATH_MAX];
 
-	if (!AnimsDF) {
-		return 0;
-	}
-
-	num = AnimsDF->lookfor(name, 0, AnimsDF->getcount() - 1);
-
-	if (num < 0) {
-		return 0;
-	}
+	snprintf(fullname, PATH_MAX, "anims/%s.vvf", name);
+	multipath_fopen(file, fullname, File::READ);
 
-	if (!file.open(AnimsDF->filename(), File::READ)) {
+	if (!file.isOpen()) {
 		return 0;
 	}
 
-	file.seek(AnimsDF->getinfo(num)->offset, SEEK_SET);
 	return 1;
 }
 

diff --git a/signus/src/global.cpp b/signus/src/global.cpp
@@ -289,7 +289,7 @@ void ApplyINI()
 
 
 
-TDataFile *GraphicsDF, *GraphicsI18nDF, *TextsDF, *AnimsDF;
+TDataFile *GraphicsDF, *GraphicsI18nDF, *TextsDF;
 
 TFont *NormalFont;
 TFont *HugeFont;
@@ -395,12 +395,6 @@ int InitGlobal() {
 	GraphicsDF = new TDataFile("graphics-common.dat", dfOpenRead, NULL);
 	GraphicsI18nDF = new TDataFile("graphics.dat", dfOpenRead, NULL);
 
-	if (test_file_exists("anims.dat")) {
-		AnimsDF = new TDataFile("anims.dat", dfOpenRead);
-	} else if (test_file_exists("ANIMS.DAT")) {
-		AnimsDF = new TDataFile("ANIMS.DAT", dfOpenRead);
-	}
-
 	char fontfile[PATH_MAX];
 	char fontfileTiny[PATH_MAX];
 	snprintf(fontfile, PATH_MAX, "%s/nolang/FreeSans.ttf",

diff --git a/signus/src/global.h b/signus/src/global.h
@@ -148,9 +148,6 @@ extern TDataFile *GraphicsDF, *GraphicsI18nDF;
 // Datovy soubor s texty:
 extern TDataFile *TextsDF;
 
-// Cutscene data file
-extern TDataFile *AnimsDF;
-
 // Oba textove fonty:
 extern TFont *NormalFont;
 extern TFont *HugeFont;