diff options
| -rw-r--r-- | dists/msvc8/sci.vcproj | 4 | ||||
| -rw-r--r-- | dists/msvc9/sci.vcproj | 4 | ||||
| -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 |
6 files changed, 7 insertions, 8 deletions
diff --git a/dists/msvc8/sci.vcproj b/dists/msvc8/sci.vcproj index 20f09824e0..9065c2ce7b 100644 --- a/dists/msvc8/sci.vcproj +++ b/dists/msvc8/sci.vcproj @@ -87,8 +87,6 @@ <File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_view.cpp" /> - <File RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp" /> - <File RelativePath="..\..\engines\sci\gfx\seq_decoder.h" /> </Filter> <Filter Name="gui"> <File RelativePath="..\..\engines\sci\gui\gui.cpp" /> @@ -160,6 +158,8 @@ <File RelativePath="..\..\engines\sci\resource.h" /> <File RelativePath="..\..\engines\sci\sci.cpp" /> <File RelativePath="..\..\engines\sci\sci.h" /> + <File RelativePath="..\..\engines\sci\seq_decoder.cpp" /> + <File RelativePath="..\..\engines\sci\seq_decoder.h" /> <File RelativePath="..\..\engines\sci\engine\script.cpp" /> <File RelativePath="..\..\engines\sci\tools.cpp" /> <File RelativePath="..\..\engines\sci\tools.h" /> diff --git a/dists/msvc9/sci.vcproj b/dists/msvc9/sci.vcproj index cdb743fd6e..9ecffa953c 100644 --- a/dists/msvc9/sci.vcproj +++ b/dists/msvc9/sci.vcproj @@ -88,8 +88,6 @@ <File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_view.cpp" /> - <File RelativePath="..\..\engines\sci\gfx\seq_decoder.cpp" /> - <File RelativePath="..\..\engines\sci\gfx\seq_decoder.h" /> </Filter> <Filter Name="gui"> <File RelativePath="..\..\engines\sci\gui\gui.cpp" /> @@ -161,6 +159,8 @@ <File RelativePath="..\..\engines\sci\resource.h" /> <File RelativePath="..\..\engines\sci\sci.cpp" /> <File RelativePath="..\..\engines\sci\sci.h" /> + <File RelativePath="..\..\engines\sci\seq_decoder.cpp" /> + <File RelativePath="..\..\engines\sci\seq_decoder.h" /> <File RelativePath="..\..\engines\sci\engine\script.cpp" /> <File RelativePath="..\..\engines\sci\tools.cpp" /> <File RelativePath="..\..\engines\sci\tools.h" /> 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); } |