aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMax Horn2005-05-10 22:56:25 +0000
committerMax Horn2005-05-10 22:56:25 +0000
commitb75c969e666b9f262a05e0d1e54d56f7d3e45441 (patch)
treee4868d14ac249a63e01f905472ec9be69f04a028 /graphics
parent55c37c18ceed916eb3744666d3d10783b0cf8783 (diff)
downloadscummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.gz
scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.tar.bz2
scummvm-rg350-b75c969e666b9f262a05e0d1e54d56f7d3e45441.zip
Moved class File and the MD5 stuff to namespace Common
svn-id: r18037
Diffstat (limited to 'graphics')
-rw-r--r--graphics/animation.cpp4
-rw-r--r--graphics/animation.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp
index 1401d642c9..77be43fdc5 100644
--- a/graphics/animation.cpp
+++ b/graphics/animation.cpp
@@ -71,7 +71,7 @@ bool BaseAnimationState::init(const char *name, void *audioArg) {
// Load lookup palettes
sprintf(tempFile, "%s.pal", name);
- File f;
+ Common::File f;
if (!f.open(tempFile)) {
warning("Cutscene: %s palette missing", tempFile);
@@ -120,7 +120,7 @@ bool BaseAnimationState::init(const char *name, void *audioArg) {
#endif
// Open MPEG2 stream
- _mpegFile = new File();
+ _mpegFile = new Common::File();
sprintf(tempFile, "%s.mp2", name);
if (!_mpegFile->open(tempFile)) {
warning("Cutscene: Could not open %s", tempFile);
diff --git a/graphics/animation.h b/graphics/animation.h
index a74c473b8a..087d9febc7 100644
--- a/graphics/animation.h
+++ b/graphics/animation.h
@@ -63,6 +63,10 @@ typedef sequence_t mpeg2_sequence_t;
#define BUFFER_SIZE 4096
+namespace Common {
+ class File;
+}
+
namespace Graphics {
class BaseAnimationState {
@@ -82,7 +86,7 @@ protected:
const mpeg2_info_t *_mpegInfo;
#endif
- File *_mpegFile;
+ Common::File *_mpegFile;
SoundHandle _bgSound;
AudioStream *_bgSoundStream;