Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 0 insertions, 140 deletions

diff --git a/graphics/decoders/pict.h b/graphics/decoders/pict.h
deleted file mode 100644
index 6f0d86c7a1..0000000000
--- a/graphics/decoders/pict.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/**
- * @file
- * Image decoder used in engines:
- *  - mohawk
- *  - pegasus
- *  - sci
- */
-
-#ifndef GRAPHICS_PICT_H
-#define GRAPHICS_PICT_H
-
-#include "common/array.h"
-#include "common/rect.h"
-#include "common/scummsys.h"
-
-#include "graphics/decoders/image_decoder.h"
-#include "graphics/pixelformat.h"
-
-namespace Common {
-class SeekableReadStream;
-}
-
-namespace Graphics {
-
-struct Surface;
-
-#define DECLARE_OPCODE(x) void x(Common::SeekableReadStream &stream)
-
-class PICTDecoder : public ImageDecoder {
-public:
-	PICTDecoder();
-	~PICTDecoder();
-
-	// ImageDecoder API
-	bool loadStream(Common::SeekableReadStream &stream);
-	void destroy();
-	const Surface *getSurface() const { return _outputSurface; }
-	const byte *getPalette() const { return _palette; }
-	uint16 getPaletteColorCount() const { return _paletteColorCount; }
-
-	struct PixMap {
-		uint32 baseAddr;
-		uint16 rowBytes;
-		Common::Rect bounds;
-		uint16 pmVersion;
-		uint16 packType;
-		uint32 packSize;
-		uint32 hRes;
-		uint32 vRes;
-		uint16 pixelType;
-		uint16 pixelSize;
-		uint16 cmpCount;
-		uint16 cmpSize;
-		uint32 planeBytes;
-		uint32 pmTable;
-		uint32 pmReserved;
-	};
-
-	static PixMap readPixMap(Common::SeekableReadStream &stream, bool hasBaseAddr = true);
-
-private:
-	Common::Rect _imageRect;
-	byte _palette[256 * 3];
-	uint16 _paletteColorCount;
-	Graphics::Surface *_outputSurface;
-	bool _continueParsing;
-
-	// Utility Functions
-	void unpackBitsRect(Common::SeekableReadStream &stream, bool withPalette);
-	void unpackBitsLine(byte *out, uint32 length, Common::SeekableReadStream *stream, byte bitsPerPixel, byte bytesPerPixel);
-	void skipBitsRect(Common::SeekableReadStream &stream, bool withPalette);
-	void decodeCompressedQuickTime(Common::SeekableReadStream &stream);
-	void outputPixelBuffer(byte *&out, byte value, byte bitsPerPixel);
-
-	// Opcodes
-	typedef void (PICTDecoder::*OpcodeProcPICT)(Common::SeekableReadStream &stream);
-	struct PICTOpcode {
-		PICTOpcode() { op = 0; proc = 0; desc = 0; }
-		PICTOpcode(uint16 o, OpcodeProcPICT p, const char *d) { op = o; proc = p; desc = d; }
-		uint16 op;
-		OpcodeProcPICT proc;
-		const char *desc;
-	};
-	Common::Array<PICTOpcode> _opcodes;
-
-	// Common Opcodes
-	void setupOpcodesCommon();
-	DECLARE_OPCODE(o_nop);
-	DECLARE_OPCODE(o_clip);
-	DECLARE_OPCODE(o_txFont);
-	DECLARE_OPCODE(o_txFace);
-	DECLARE_OPCODE(o_pnSize);
-	DECLARE_OPCODE(o_txSize);
-	DECLARE_OPCODE(o_txRatio);
-	DECLARE_OPCODE(o_versionOp);
-	DECLARE_OPCODE(o_longText);
-	DECLARE_OPCODE(o_longComment);
-	DECLARE_OPCODE(o_opEndPic);
-	DECLARE_OPCODE(o_headerOp);
-
-	// Regular-mode Opcodes
-	void setupOpcodesNormal();
-	DECLARE_OPCODE(on_packBitsRect);
-	DECLARE_OPCODE(on_directBitsRect);
-	DECLARE_OPCODE(on_compressedQuickTime);
-
-	// QuickTime-mode Opcodes
-	void setupOpcodesQuickTime();
-	DECLARE_OPCODE(oq_packBitsRect);
-	DECLARE_OPCODE(oq_directBitsRect);
-	DECLARE_OPCODE(oq_compressedQuickTime);
-};
-
-#undef DECLARE_OPCODE
-
-} // End of namespace Graphics
-
-#endif