aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/sword1/animation.h2
-rw-r--r--engines/sword2/animation.h2
-rw-r--r--graphics/module.mk2
-rw-r--r--graphics/mpeg_player.cpp (renamed from graphics/animation.cpp)3
-rw-r--r--graphics/mpeg_player.h (renamed from graphics/animation.h)0
5 files changed, 4 insertions, 5 deletions
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 07aa5241f0..589a625780 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -23,8 +23,8 @@
#ifndef ANIMATION_H
#define ANIMATION_H
-#include "graphics/animation.h"
#include "graphics/dxa_player.h"
+#include "graphics/mpeg_player.h"
#include "sword1/screen.h"
#include "sword1/sound.h"
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 99c4231585..d667b248fa 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -22,8 +22,8 @@
#ifndef SWORD2_ANIMATION_H
#define SWORD2_ANIMATION_H
-#include "graphics/animation.h"
#include "graphics/dxa_player.h"
+#include "graphics/mpeg_player.h"
#include "sound/mixer.h"
namespace Sword2 {
diff --git a/graphics/module.mk b/graphics/module.mk
index 104d4ea4da..d14ca763f2 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -1,7 +1,6 @@
MODULE := graphics
MODULE_OBJS := \
- animation.o \
cursorman.o \
dxa_player.o \
font.o \
@@ -13,6 +12,7 @@ MODULE_OBJS := \
ilbm.o \
imagedec.o \
imageman.o \
+ mpeg_player.o \
paletteman.o \
primitives.o \
scaler.o \
diff --git a/graphics/animation.cpp b/graphics/mpeg_player.cpp
index 7951e7f2d6..4ecf5cb6a6 100644
--- a/graphics/animation.cpp
+++ b/graphics/mpeg_player.cpp
@@ -21,8 +21,7 @@
*/
#include "common/stdafx.h"
-#include "graphics/animation.h"
-#include "common/config-manager.h"
+#include "graphics/mpeg_player.h"
#include "common/file.h"
#include "common/system.h"
#include "common/util.h"
diff --git a/graphics/animation.h b/graphics/mpeg_player.h
index aff644d2d3..aff644d2d3 100644
--- a/graphics/animation.h
+++ b/graphics/mpeg_player.h