diff options
author | Colin Snover | 2016-08-12 09:37:13 -0500 |
---|---|---|
committer | Colin Snover | 2016-08-12 09:37:13 -0500 |
commit | 956cbf047a580ae5907f437b89fc2ae04efe2860 (patch) | |
tree | 3d92fc478068bae148a593a5725bafdab07ad216 /engines/sci | |
parent | f3d007ea5b32eefe3ea6eb2dbe98e2ec2d0fd1da (diff) | |
download | scummvm-rg350-956cbf047a580ae5907f437b89fc2ae04efe2860.tar.gz scummvm-rg350-956cbf047a580ae5907f437b89fc2ae04efe2860.tar.bz2 scummvm-rg350-956cbf047a580ae5907f437b89fc2ae04efe2860.zip |
SCI32: Clean up Video32 includes
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/graphics/video32.cpp | 30 | ||||
-rw-r--r-- | engines/sci/graphics/video32.h | 9 |
2 files changed, 16 insertions, 23 deletions
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp index 94f8852633..757d793c44 100644 --- a/engines/sci/graphics/video32.cpp +++ b/engines/sci/graphics/video32.cpp @@ -20,37 +20,29 @@ * */ -#include "audio/mixer.h" -#include "common/config-manager.h" -#include "sci/console.h" -#include "sci/event.h" -#include "sci/graphics/cursor.h" -#include "sci/graphics/frameout.h" -#include "sci/graphics/palette32.h" -#include "sci/graphics/text32.h" -#include "sci/graphics/video32.h" -#include "audio/mixer.h" // for Audio::Mixer::kSFXSoundType #include "common/config-manager.h" // for ConfMan -#include "common/textconsole.h" // for error, warning -#include "common/system.h" +#include "common/textconsole.h" // for warning, error +#include "common/util.h" // for ARRAYSIZE +#include "common/system.h" // for g_system #include "engine.h" // for Engine, g_engine -#include "engines/util.h" -#include "graphics/scaler/scalebit.h" +#include "engines/util.h" // for initGraphics #include "sci/console.h" // for Console #include "sci/engine/state.h" // for EngineState #include "sci/engine/vm_types.h" // for reg_t #include "sci/event.h" // for SciEvent, EventManager, SCI_... -#include "sci/graphics/celobj32.h" // for CelInfo32 +#include "sci/graphics/celobj32.h" // for CelInfo32, ::kLowResX, ::kLo... #include "sci/graphics/cursor.h" // for GfxCursor +#include "sci/graphics/frameout.h" // for GfxFrameout #include "sci/graphics/helpers.h" // for Color, Palette #include "sci/graphics/palette32.h" // for GfxPalette32 #include "sci/graphics/plane32.h" // for Plane, PlanePictureCodes::kP... #include "sci/graphics/screen_item32.h" // for ScaleInfo, ScreenItem, Scale... -#include "sci/graphics/text32.h" // for BitmapResource -#include "sci/video/seq_decoder.h" #include "sci/sci.h" // for SciEngine, g_sci, getSciVersion -#include "video/avi_decoder.h" -#include "video/coktel_decoder.h" +#include "sci/graphics/video32.h" +#include "sci/video/seq_decoder.h" // for SEQDecoder +#include "video/avi_decoder.h" // for AVIDecoder +#include "video/coktel_decoder.h" // for AdvancedVMDDecoder +namespace Graphics { struct Surface; } namespace Sci { diff --git a/engines/sci/graphics/video32.h b/engines/sci/graphics/video32.h index 7320ede5dc..0496f61d5d 100644 --- a/engines/sci/graphics/video32.h +++ b/engines/sci/graphics/video32.h @@ -23,16 +23,17 @@ #ifndef SCI_GRAPHICS_VIDEO32_H #define SCI_GRAPHICS_VIDEO32_H -#include "common/rect.h" // for Rect -#include "common/scummsys.h" // for int16, uint8, int32 -#include "common/str.h" // for String -#include "sci/video/robot_decoder.h" // for RobotDecoder +#include "common/rect.h" // for Rect +#include "common/scummsys.h" // for int16, uint8, uint16, int32 +#include "common/str.h" // for String +#include "sci/engine/vm_types.h" // for reg_t namespace Video { class AdvancedVMDDecoder; class AVIDecoder; } namespace Sci { +class EventManager; class Plane; class ScreenItem; class SegManager; |