diff options
| author | Filippos Karapetis | 2009-10-16 08:26:41 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-16 08:26:41 +0000 |
| commit | 600d5199fcc9728e70972d2b27d60a8b591b100c (patch) | |
| tree | 82e4d8cab3fb5aea073a3e7ac6e55989ddcfe9b0 /engines | |
| parent | 788af1b81e92387db02bb666762f1820f19dfb06 (diff) | |
| download | scummvm-rg350-600d5199fcc9728e70972d2b27d60a8b591b100c.tar.gz scummvm-rg350-600d5199fcc9728e70972d2b27d60a8b591b100c.tar.bz2 scummvm-rg350-600d5199fcc9728e70972d2b27d60a8b591b100c.zip | |
Moved the SEQ decoder outside the gfx directory, as it is completely stand alone now and no longer uses any GUI-related code
svn-id: r45153
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/module.mk | 2 | ||||
| -rw-r--r-- | engines/sci/seq_decoder.cpp (renamed from engines/sci/gfx/seq_decoder.cpp) | 2 | ||||
| -rw-r--r-- | engines/sci/seq_decoder.h (renamed from engines/sci/gfx/seq_decoder.h) | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index e899c22466..fb84a34140 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -30,12 +30,12 @@ #include "sci/sci.h" #include "sci/debug.h" // for g_debug_sleeptime_factor #include "sci/resource.h" +#include "sci/seq_decoder.h" #include "sci/engine/state.h" #include "sci/engine/kernel.h" #include "sci/gfx/gfx_gui.h" #include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual -#include "sci/gfx/seq_decoder.h" #include "sci/gui/gui.h" #include "sci/gui/gui_cursor.h" #include "sci/gui/gui_screen.h" diff --git a/engines/sci/module.mk b/engines/sci/module.mk index 6cd2cc0db7..26962db9c2 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -6,6 +6,7 @@ MODULE_OBJS = \ detection.o \ resource.o \ sci.o \ + seq_decoder.o \ tools.o \ vocabulary.o \ engine/game.o \ @@ -52,7 +53,6 @@ MODULE_OBJS = \ gfx/res_pal.o \ gfx/res_pic.o \ gfx/res_view.o \ - gfx/seq_decoder.o \ gui/gui.o \ gui/gui_animate.o \ gui/gui_cursor.o \ diff --git a/engines/sci/gfx/seq_decoder.cpp b/engines/sci/seq_decoder.cpp index c5978c39bf..3999abc0b5 100644 --- a/engines/sci/gfx/seq_decoder.cpp +++ b/engines/sci/seq_decoder.cpp @@ -31,7 +31,7 @@ #include "graphics/surface.h" -#include "sci/gfx/seq_decoder.h" +#include "sci/seq_decoder.h" namespace Graphics { diff --git a/engines/sci/gfx/seq_decoder.h b/engines/sci/seq_decoder.h index d4b9840d76..a734b52fb2 100644 --- a/engines/sci/gfx/seq_decoder.h +++ b/engines/sci/seq_decoder.h @@ -41,7 +41,6 @@ public: /** * Load a SEQ encoded video file * @param filename the filename to load - * @param frameDelay the delay between frames, in ms */ bool loadFile(const char *fileName) { return loadFile(fileName, 10); } |