thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the SEQ decoder outside the gfx directory, as it is completely stand alone now and no longer uses any GUI-related code

Browse source 
svn-id: r45153
This commit is contained in:
Filippos Karapetis 2009-10-16 08:26:41 +00:00
parent 788af1b81e
commit 600d5199fc
6 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dists/msvc8/sci.vcproj
View file

@ -87,8 +87,6 @@
<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
<File RelativePath="..\..\engines\sci\gfx\res_view.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>
<Filter Name="gui"> <Filter Name="gui">
<File RelativePath="..\..\engines\sci\gui\gui.cpp" /> <File RelativePath="..\..\engines\sci\gui\gui.cpp" />
@ -160,6 +158,8 @@
<File RelativePath="..\..\engines\sci\resource.h" /> <File RelativePath="..\..\engines\sci\resource.h" />
<File RelativePath="..\..\engines\sci\sci.cpp" /> <File RelativePath="..\..\engines\sci\sci.cpp" />
<File RelativePath="..\..\engines\sci\sci.h" /> <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\engine\script.cpp" />
<File RelativePath="..\..\engines\sci\tools.cpp" /> <File RelativePath="..\..\engines\sci\tools.cpp" />
<File RelativePath="..\..\engines\sci\tools.h" /> <File RelativePath="..\..\engines\sci\tools.h" />

4
dists/msvc9/sci.vcproj
View file

@ -88,8 +88,6 @@
<File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pal.cpp" />
<File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" /> <File RelativePath="..\..\engines\sci\gfx\res_pic.cpp" />
<File RelativePath="..\..\engines\sci\gfx\res_view.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>
<Filter Name="gui"> <Filter Name="gui">
<File RelativePath="..\..\engines\sci\gui\gui.cpp" /> <File RelativePath="..\..\engines\sci\gui\gui.cpp" />
@ -161,6 +159,8 @@
<File RelativePath="..\..\engines\sci\resource.h" /> <File RelativePath="..\..\engines\sci\resource.h" />
<File RelativePath="..\..\engines\sci\sci.cpp" /> <File RelativePath="..\..\engines\sci\sci.cpp" />
<File RelativePath="..\..\engines\sci\sci.h" /> <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\engine\script.cpp" />
<File RelativePath="..\..\engines\sci\tools.cpp" /> <File RelativePath="..\..\engines\sci\tools.cpp" />
<File RelativePath="..\..\engines\sci\tools.h" /> <File RelativePath="..\..\engines\sci\tools.h" />

2
engines/sci/engine/kgraphics.cpp
View file

@ -30,12 +30,12 @@
#include "sci/sci.h" #include "sci/sci.h"
#include "sci/debug.h" // for g_debug_sleeptime_factor #include "sci/debug.h" // for g_debug_sleeptime_factor
#include "sci/resource.h" #include "sci/resource.h"
#include "sci/seq_decoder.h"
#include "sci/engine/state.h" #include "sci/engine/state.h"
#include "sci/engine/kernel.h" #include "sci/engine/kernel.h"
#include "sci/gfx/gfx_gui.h" #include "sci/gfx/gfx_gui.h"
#include "sci/gfx/gfx_widgets.h" #include "sci/gfx/gfx_widgets.h"
#include "sci/gfx/gfx_state_internal.h" // required for GfxContainer, GfxPort, GfxVisual #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.h"
#include "sci/gui/gui_cursor.h" #include "sci/gui/gui_cursor.h"
#include "sci/gui/gui_screen.h" #include "sci/gui/gui_screen.h"

2
engines/sci/module.mk
View file

@ -6,6 +6,7 @@ MODULE_OBJS = \
detection.o \ detection.o \
resource.o \ resource.o \
sci.o \ sci.o \
seq_decoder.o \
tools.o \ tools.o \
vocabulary.o \ vocabulary.o \
engine/game.o \ engine/game.o \
@ -52,7 +53,6 @@ MODULE_OBJS = \
gfx/res_pal.o \ gfx/res_pal.o \
gfx/res_pic.o \ gfx/res_pic.o \
gfx/res_view.o \ gfx/res_view.o \
gfx/seq_decoder.o \
gui/gui.o \ gui/gui.o \
gui/gui_animate.o \ gui/gui_animate.o \
gui/gui_cursor.o \ gui/gui_cursor.o \

2
engines/sci/gfx/seq_decoder.cpp → engines/sci/seq_decoder.cpp
View file

@ -31,7 +31,7 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "sci/gfx/seq_decoder.h" #include "sci/seq_decoder.h"
namespace Graphics { namespace Graphics {

1
engines/sci/gfx/seq_decoder.h → engines/sci/seq_decoder.h
View file

@ -41,7 +41,6 @@ public:
/** /**
* Load a SEQ encoded video file * Load a SEQ encoded video file
* @param filename the filename to load * @param filename the filename to load
* @param frameDelay the delay between frames, in ms
*/ */
bool loadFile(const char *fileName) { return loadFile(fileName, 10); } bool loadFile(const char *fileName) { return loadFile(fileName, 10); }