diff options
| author | yinsimei | 2017-06-05 19:10:47 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-13 18:27:45 +0200 |
| commit | a8ccd053157f18c5d125bb114cdb1e17ac17460a (patch) | |
| tree | fe4e626ccaf0a6ff4b32e904b019ff33c9840d01 /engines/sludge/movie.cpp | |
| parent | c44b4f3128931038215cce7c3d1fa23cfa67c75c (diff) | |
| download | scummvm-rg350-a8ccd053157f18c5d125bb114cdb1e17ac17460a.tar.gz scummvm-rg350-a8ccd053157f18c5d125bb114cdb1e17ac17460a.tar.bz2 scummvm-rg350-a8ccd053157f18c5d125bb114cdb1e17ac17460a.zip | |
SLUDGE: header formatting
Diffstat (limited to 'engines/sludge/movie.cpp')
| -rw-r--r-- | engines/sludge/movie.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/engines/sludge/movie.cpp b/engines/sludge/movie.cpp index 8aa2ece12c..dc49cc46f8 100644 --- a/engines/sludge/movie.cpp +++ b/engines/sludge/movie.cpp @@ -21,31 +21,10 @@ */ #if 0 #include <SDL/SDL.h> -#endif - -#include <math.h> - -#include "CommonCode/specialsettings.h" - -#include "libwebm/mkvreader.hpp" -#include "libwebm/mkvparser.hpp" - -#if 0 #define VPX_CODEC_DISABLE_COMPAT 1 #include "vpx/vpx_decoder.h" #include "vpx/vp8dx.h" #define interface (&vpx_codec_vp8_dx_algo) -#endif - -#include "newfatal.h" -#include "timing.h" -#include "graphics.h" -#include "movie.h" -#include "shaders.h" - -#include "sound.h" - -#if 0 #include "vorbis/codec.h" #define OV_EXCLUDE_STATIC_CALLBACKS #include "vorbis/vorbisfile.h" @@ -56,6 +35,17 @@ #include "AL/alure.h" #endif +#include "sludge/CommonCode/specialsettings.h" +#include "sludge/libwebm/mkvreader.hpp" +#include "sludge/libwebm/mkvparser.hpp" + +#include "sludge/newfatal.h" +#include "sludge/timing.h" +#include "sludge/graphics.h" +#include "sludge/movie.h" +#include "sludge/shaders.h" +#include "sludge/sound.h" + namespace Sludge { extern int specialSettings; |