aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/iff_container.h228
-rw-r--r--common/module.mk1
-rw-r--r--dists/codeblocks/parallaction.depend409
-rw-r--r--dists/codeblocks/parallaction.layout131
-rw-r--r--dists/codeblocks/scummvm.cbp7
-rw-r--r--dists/codeblocks/scummvm.depend2023
-rw-r--r--dists/codeblocks/scummvm.layout197
-rw-r--r--dists/codeblocks/scummvm.workspace4
-rw-r--r--engines/parallaction/callables.cpp5
-rw-r--r--engines/parallaction/disk.cpp166
-rw-r--r--engines/parallaction/disk.h7
-rw-r--r--engines/parallaction/location.cpp11
-rw-r--r--engines/parallaction/music.cpp49
-rw-r--r--engines/parallaction/music.h20
-rw-r--r--engines/parallaction/zone.cpp7
-rw-r--r--engines/parallaction/zone.h4
-rw-r--r--engines/saga/scene.cpp10
-rw-r--r--graphics/iff.cpp313
-rw-r--r--graphics/iff.h139
-rw-r--r--graphics/ilbm.cpp482
-rw-r--r--graphics/ilbm.h165
-rw-r--r--graphics/module.mk1
-rw-r--r--sound/iff.cpp80
-rw-r--r--sound/iff.h73
-rw-r--r--sound/module.mk1
25 files changed, 1550 insertions, 2983 deletions
diff --git a/common/iff_container.h b/common/iff_container.h
new file mode 100644
index 0000000000..730163254f
--- /dev/null
+++ b/common/iff_container.h
@@ -0,0 +1,228 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef COMMON_IFF_CONTAINER_H
+#define COMMON_IFF_CONTAINER_H
+
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/endian.h"
+#include "common/stream.h"
+#include "common/util.h"
+
+namespace Common {
+
+typedef uint32 IFF_ID;
+
+#define ID_FORM MKID_BE('FORM')
+/* EA IFF 85 group identifier */
+#define ID_CAT MKID_BE('CAT ')
+/* EA IFF 85 group identifier */
+#define ID_LIST MKID_BE('LIST')
+/* EA IFF 85 group identifier */
+#define ID_PROP MKID_BE('PROP')
+/* EA IFF 85 group identifier */
+#define ID_END MKID_BE('END ')
+/* unofficial END-of-FORM identifier (see Amiga RKM Devices Ed.3
+page 376) */
+#define ID_ILBM MKID_BE('ILBM')
+/* EA IFF 85 raster bitmap form */
+#define ID_DEEP MKID_BE('DEEP')
+/* Chunky pixel image files (Used in TV Paint) */
+#define ID_RGB8 MKID_BE('RGB8')
+/* RGB image forms, Turbo Silver (Impulse) */
+#define ID_RGBN MKID_BE('RGBN')
+/* RGB image forms, Turbo Silver (Impulse) */
+#define ID_PBM MKID_BE('PBM ')
+/* 256-color chunky format (DPaint 2 ?) */
+#define ID_ACBM MKID_BE('ACBM')
+/* Amiga Contiguous Bitmap (AmigaBasic) */
+#define ID_8SVX MKID_BE('8SVX')
+/* Amiga 8 bits voice */
+
+/* generic */
+
+#define ID_FVER MKID_BE('FVER')
+/* AmigaOS version string */
+#define ID_JUNK MKID_BE('JUNK')
+/* always ignore this chunk */
+#define ID_ANNO MKID_BE('ANNO')
+/* EA IFF 85 Generic Annotation chunk */
+#define ID_AUTH MKID_BE('AUTH')
+/* EA IFF 85 Generic Author chunk */
+#define ID_CHRS MKID_BE('CHRS')
+/* EA IFF 85 Generic character string chunk */
+#define ID_NAME MKID_BE('NAME')
+/* EA IFF 85 Generic Name of art, music, etc. chunk */
+#define ID_TEXT MKID_BE('TEXT')
+/* EA IFF 85 Generic unformatted ASCII text chunk */
+#define ID_copy MKID_BE('(c) ')
+/* EA IFF 85 Generic Copyright text chunk */
+
+/* ILBM chunks */
+
+#define ID_BMHD MKID_BE('BMHD')
+/* ILBM BitmapHeader */
+#define ID_CMAP MKID_BE('CMAP')
+/* ILBM 8bit RGB colormap */
+#define ID_GRAB MKID_BE('GRAB')
+/* ILBM "hotspot" coordiantes */
+#define ID_DEST MKID_BE('DEST')
+/* ILBM destination image info */
+#define ID_SPRT MKID_BE('SPRT')
+/* ILBM sprite identifier */
+#define ID_CAMG MKID_BE('CAMG')
+/* Amiga viewportmodes */
+#define ID_BODY MKID_BE('BODY')
+/* ILBM image data */
+#define ID_CRNG MKID_BE('CRNG')
+/* color cycling */
+#define ID_CCRT MKID_BE('CCRT')
+/* color cycling */
+#define ID_CLUT MKID_BE('CLUT')
+/* Color Lookup Table chunk */
+#define ID_DPI MKID_BE('DPI ')
+/* Dots per inch chunk */
+#define ID_DPPV MKID_BE('DPPV')
+/* DPaint perspective chunk (EA) */
+#define ID_DRNG MKID_BE('DRNG')
+/* DPaint IV enhanced color cycle chunk (EA) */
+#define ID_EPSF MKID_BE('EPSF')
+/* Encapsulated Postscript chunk */
+#define ID_CMYK MKID_BE('CMYK')
+/* Cyan, Magenta, Yellow, & Black color map (Soft-Logik) */
+#define ID_CNAM MKID_BE('CNAM')
+/* Color naming chunk (Soft-Logik) */
+#define ID_PCHG MKID_BE('PCHG')
+/* Line by line palette control information (Sebastiano Vigna) */
+#define ID_PRVW MKID_BE('PRVW')
+/* A mini duplicate ILBM used for preview (Gary Bonham) */
+#define ID_XBMI MKID_BE('XBMI')
+/* eXtended BitMap Information (Soft-Logik) */
+#define ID_CTBL MKID_BE('CTBL')
+/* Newtek Dynamic Ham color chunk */
+#define ID_DYCP MKID_BE('DYCP')
+/* Newtek Dynamic Ham chunk */
+#define ID_SHAM MKID_BE('SHAM')
+/* Sliced HAM color chunk */
+#define ID_ABIT MKID_BE('ABIT')
+/* ACBM body chunk */
+#define ID_DCOL MKID_BE('DCOL')
+/* unofficial direct color */
+#define ID_DPPS MKID_BE('DPPS')
+/* ? */
+#define ID_TINY MKID_BE('TINY')
+/* ? */
+#define ID_DPPV MKID_BE('DPPV')
+/* ? */
+
+/* 8SVX chunks */
+
+#define ID_VHDR MKID_BE('VHDR')
+/* 8SVX Voice8Header */
+
+
+char * ID2string(Common::IFF_ID id);
+
+
+class IFFChunk : public Common::ReadStream {
+
+protected:
+ Common::ReadStream *_input;
+ uint32 bytesRead;
+
+public:
+ IFF_ID id;
+ uint32 size;
+
+ IFFChunk(Common::ReadStream *input): _input(input) {
+ size = bytesRead = 0;
+ }
+
+ void incBytesRead(uint32 inc) {
+ bytesRead += inc;
+ if (bytesRead > size) {
+ error("Chunk overead");
+ }
+ }
+
+ void readHeader() {
+ id = _input->readUint32BE();
+ size = _input->readUint32BE();
+ bytesRead = 0;
+ }
+
+ void feed() {
+ if (size % 2) {
+ size++;
+ }
+ while (!_input->eos() && !eos()) {
+ readByte();
+ }
+ }
+
+ // Common::ReadStream implementation
+ bool eos() const {
+ return (size - bytesRead) == 0;
+ }
+
+ uint32 read(void *dataPtr, uint32 dataSize) {
+ incBytesRead(dataSize);
+ return _input->read(dataPtr, dataSize);
+ }
+
+};
+
+class IFFParser {
+public:
+ IFFParser(Common::ReadStream &input) : _formChunk(&input), _chunk(&input) {
+ _formChunk.readHeader();
+ if (_formChunk.id != ID_FORM) {
+ error("IFFDecoder input is not a FORM type IFF file");
+ }
+ _typeId = _formChunk.readUint32BE();
+ }
+
+ virtual ~IFFParser() {}
+
+ IFFChunk *nextChunk() {
+ _chunk.feed();
+ _formChunk.incBytesRead(_chunk.size);
+
+ if (_formChunk.eos())
+ return 0;
+
+ _formChunk.incBytesRead(8);
+ _chunk.readHeader();
+
+ return &_chunk;
+ }
+
+ IFF_ID _typeId;
+
+protected:
+ IFFChunk _formChunk;
+ IFFChunk _chunk;
+};
+
+} // namespace Common
+
+#endif
diff --git a/common/module.mk b/common/module.mk
index e388eace74..f149c1d152 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -7,6 +7,7 @@ MODULE_OBJS := \
file.o \
fs.o \
hashmap.o \
+ iff_container.o \
md5.o \
mutex.o \
str.o \
diff --git a/dists/codeblocks/parallaction.depend b/dists/codeblocks/parallaction.depend
index 5fddf3f7c2..c4ac3106ea 100644
--- a/dists/codeblocks/parallaction.depend
+++ b/dists/codeblocks/parallaction.depend
@@ -1,410 +1 @@
# depslib dependency file v1.0
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\animation.cpp
- "parallaction/disk.h"
- "parallaction/parallaction.h"
- "parallaction/graphics.h"
- "parallaction/music.h"
- "parallaction/parser.h"
- "parallaction/zone.h"
-
-1173995808 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\disk.h
- "parallaction/defs.h"
- "common/file.h"
-
-1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\defs.h
- "common/stdafx.h"
- "common/system.h"
-
-1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
- <portdefs.h>
- <strings.h>
- <stdio.h>
- <stdlib.h>
- <string.h>
- <stdarg.h>
- <assert.h>
- <ctype.h>
- <time.h>
- <math.h>
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
- "common/scummsys.h"
- "common/mutex.h"
- "common/noncopyable.h"
- "common/rect.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
- "config.h"
- <SDL_byteorder.h>
- "palmversion.h"
- "globals.h"
- "extend.h"
- "nds/jtypes.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
- "common/scummsys.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\noncopyable.h
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\rect.h
- "common/scummsys.h"
- "common/util.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
- "common/scummsys.h"
- "common/str.h"
- "common/array.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
- "common/scummsys.h"
- "common/array.h"
-
-1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
- "common/scummsys.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/str.h"
- "common/stream.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.h
- "common/stdafx.h"
- "common/scummsys.h"
-
-1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parallaction.h
- "engines/engine.h"
- "parallaction/defs.h"
- "parallaction/inventory.h"
- "parallaction/parser.h"
- "parallaction/disk.h"
- "parallaction/zone.h"
- "common/str.h"
- "gui/dialog.h"
- "gui/widget.h"
-
-1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/str.h"
-
-1173731024 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\inventory.h
-
-1173398860 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parser.h
- "parallaction/defs.h"
- "common/stream.h"
-
-1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\zone.h
- "parallaction/defs.h"
-
-1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
- "common/scummsys.h"
- "common/str.h"
- "gui/object.h"
- "gui/widget.h"
-
-1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
-
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.h
- "common/scummsys.h"
- "common/str.h"
- "graphics/font.h"
- "graphics/surface.h"
- "gui/object.h"
-
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.h
- "common/str.h"
- "graphics/surface.h"
-
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.h
- "common/scummsys.h"
- "common/rect.h"
-
-1174077965 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\graphics.h
- "parallaction/defs.h"
- "common/stream.h"
- "common/pack-start.h"
- "common/pack-end.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-start.h
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-end.h
-
-1173398860 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\music.h
- "common/util.h"
- "common/mutex.h"
- "sound/mididrv.h"
-
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.h
- "common/scummsys.h"
- "common/timer.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
- "common/scummsys.h"
- "common/noncopyable.h"
-
-1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\archive.cpp
- "common/file.h"
- "parallaction/disk.h"
-
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\callables.cpp
- "parallaction/disk.h"
- "parallaction/parallaction.h"
- "parallaction/graphics.h"
- "parallaction/inventory.h"
- "parallaction/menu.h"
- "parallaction/music.h"
- "parallaction/zone.h"
- "common/file.h"
-
-1173626357 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\menu.h
- "parallaction/defs.h"
-
-1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\debug.cpp
- "common/stdafx.h"
- "common/system.h"
- "parallaction/parallaction.h"
- "parallaction/graphics.h"
-
-1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\detection.cpp
- "common/stdafx.h"
- "base/plugins.h"
- "common/advancedDetector.h"
- "parallaction/parallaction.h"
-
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.h
- "common/stdafx.h"
- "common/array.h"
- "common/list.h"
- "common/singleton.h"
- "common/util.h"
- "base/game.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
- "common/scummsys.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
- "common/noncopyable.h"
-
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
- "common/stdafx.h"
- "common/str.h"
- "common/array.h"
- "common/hash-str.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hash-str.h
- "common/hashmap.h"
- "common/str.h"
-
-1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
- "common/stdafx.h"
- "common/func.h"
- "common/str.h"
- "common/util.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\func.h
- "common/scummsys.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.h
- "common/fs.h"
- "base/game.h"
- "base/plugins.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
- "common/array.h"
- "common/str.h"
-
-1174136052 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\dialogue.cpp
- "parallaction/commands.h"
- "parallaction/parallaction.h"
- "parallaction/graphics.h"
- "parallaction/disk.h"
- "parallaction/inventory.h"
- "parallaction/parser.h"
- "parallaction/zone.h"
- "common/events.h"
-
-1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\commands.h
- "parallaction/defs.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\events.h
- "common/rect.h"
- "common/system.h"
- "common/noncopyable.h"
-
-1173995808 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\disk.cpp
- "parallaction/defs.h"
- "parallaction/graphics.h"
- "parallaction/parallaction.h"
- "parallaction/disk.h"
- "parallaction/walk.h"
-
-1173740074 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\walk.h
- "parallaction/defs.h"
-
-1174136052 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\graphics.cpp
- "common/file.h"
- "parallaction/graphics.h"
- "parallaction/parser.h"
- "parallaction/parallaction.h"
- "parallaction/disk.h"
- "parallaction/zone.h"
-
-1173909457 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\intro.cpp
- "parallaction/parallaction.h"
- "parallaction/menu.h"
- "parallaction/music.h"
- "parallaction/graphics.h"
- "parallaction/zone.h"
-
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\inventory.cpp
- "parallaction/parallaction.h"
- "parallaction/disk.h"
- "parallaction/zone.h"
- "parallaction/graphics.h"
- "parallaction/inventory.h"
-
-1173995808 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\menu.cpp
- "parallaction/menu.h"
- "parallaction/disk.h"
- "parallaction/music.h"
- "parallaction/graphics.h"
- "parallaction/parallaction.h"
-
-1173647915 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\music.cpp
- "common/stdafx.h"
- "common/file.h"
- "parallaction/parallaction.h"
- "common/stream.h"
- "sound/midiparser.h"
- "parallaction/music.h"
-
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.h
- "common/scummsys.h"
- "common/endian.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\endian.h
- "common/scummsys.h"
-
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parallaction.cpp
- "common/stdafx.h"
- "common/config-manager.h"
- "common/events.h"
- "common/file.h"
- "common/util.h"
- "sound/mididrv.h"
- "sound/mixer.h"
- "parallaction/parallaction.h"
- "parallaction/menu.h"
- "parallaction/parser.h"
- "parallaction/disk.h"
- "parallaction/music.h"
- "parallaction/inventory.h"
- "parallaction/graphics.h"
- "parallaction/walk.h"
- "parallaction/zone.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.h
- "common/array.h"
- "common/hashmap.h"
- "common/singleton.h"
- "common/str.h"
- "common/hash-str.h"
-
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/mutex.h"
-
-1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parser.cpp
- "parallaction/defs.h"
- "parallaction/parser.h"
- "parallaction/parallaction.h"
- "parallaction/disk.h"
-
-1174118148 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\saveload.cpp
- "parallaction/parallaction.h"
- "parallaction/disk.h"
- "parallaction/graphics.h"
- "parallaction/zone.h"
- "common/savefile.h"
- "gui/widget.h"
- "gui/ListWidget.h"
- "gui/message.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
- "common/stdafx.h"
- "common/noncopyable.h"
- "common/scummsys.h"
- "common/stream.h"
-
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.h
- "gui/editable.h"
- "common/str.h"
-
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.h
- "common/str.h"
- "common/rect.h"
- "gui/widget.h"
- "gui/newgui.h"
-
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.h
- "common/scummsys.h"
- "common/singleton.h"
- "common/stack.h"
- "common/str.h"
- "graphics/fontman.h"
- "gui/theme.h"
- "gui/widget.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
- "common/scummsys.h"
- "common/array.h"
-
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/singleton.h"
- "common/str.h"
- "common/hashmap.h"
- "common/hash-str.h"
- "graphics/font.h"
-
-1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
- "common/stdafx.h"
- "common/system.h"
- "common/rect.h"
- "common/str.h"
- "common/file.h"
- "common/config-file.h"
- "graphics/surface.h"
- "graphics/fontman.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.h
- "common/config-manager.h"
- "common/list.h"
- "common/str.h"
- "common/stream.h"
-
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.h
- "gui/dialog.h"
- "common/str.h"
-
-1173732116 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\staticres.cpp
- "parallaction/graphics.h"
-
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\walk.cpp
- "parallaction/defs.h"
- "parallaction/parallaction.h"
- "parallaction/commands.h"
- "parallaction/graphics.h"
- "parallaction/walk.h"
- "parallaction/zone.h"
-
-1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\zone.cpp
- "parallaction/parser.h"
- "parallaction/parallaction.h"
- "parallaction/graphics.h"
- "parallaction/inventory.h"
- "parallaction/zone.h"
-
diff --git a/dists/codeblocks/parallaction.layout b/dists/codeblocks/parallaction.layout
index 835e249700..4f11f206db 100644
--- a/dists/codeblocks/parallaction.layout
+++ b/dists/codeblocks/parallaction.layout
@@ -1,100 +1,103 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="default" />
- <File name="..\..\engines\parallaction\animation.cpp" open="1" top="0" tabpos="2">
- <Cursor position="7368" topLine="252" />
+ <File name="..\..\engines\parallaction\animation.cpp" open="0" top="0" tabpos="4">
+ <Cursor position="2198" topLine="48" />
</File>
- <File name="..\..\engines\parallaction\archive.cpp" open="0" top="0" tabpos="14">
- <Cursor position="1310" topLine="26" />
+ <File name="..\..\engines\parallaction\archive.cpp" open="0" top="0" tabpos="12">
+ <Cursor position="3311" topLine="71" />
</File>
- <File name="..\..\engines\parallaction\callables.cpp" open="1" top="0" tabpos="15">
- <Cursor position="9374" topLine="303" />
+ <File name="..\..\engines\parallaction\callables.cpp" open="0" top="0" tabpos="2">
+ <Cursor position="11738" topLine="405" />
</File>
- <File name="..\..\engines\parallaction\commands.cpp" open="1" top="0" tabpos="16">
- <Cursor position="5835" topLine="166" />
+ <File name="..\..\engines\parallaction\commands.cpp" open="0" top="0" tabpos="4">
+ <Cursor position="8339" topLine="280" />
</File>
- <File name="..\..\engines\parallaction\commands.h" open="1" top="0" tabpos="13">
- <Cursor position="1490" topLine="35" />
+ <File name="..\..\engines\parallaction\commands.h" open="0" top="0" tabpos="10">
+ <Cursor position="1669" topLine="24" />
</File>
- <File name="..\..\engines\parallaction\debug.cpp" open="0" top="0" tabpos="11">
- <Cursor position="1671" topLine="19" />
+ <File name="..\..\engines\parallaction\debug.cpp" open="0" top="0" tabpos="7">
+ <Cursor position="1523" topLine="18" />
</File>
- <File name="..\..\engines\parallaction\defs.h" open="1" top="0" tabpos="4">
- <Cursor position="1241" topLine="29" />
+ <File name="..\..\engines\parallaction\defs.h" open="0" top="0" tabpos="9">
+ <Cursor position="1167" topLine="15" />
</File>
- <File name="..\..\engines\parallaction\detection.cpp" open="0" top="0" tabpos="12">
- <Cursor position="1049" topLine="7" />
+ <File name="..\..\engines\parallaction\detection.cpp" open="0" top="0" tabpos="13">
+ <Cursor position="3283" topLine="50" />
</File>
- <File name="..\..\engines\parallaction\dialogue.cpp" open="1" top="0" tabpos="3">
- <Cursor position="6759" topLine="211" />
+ <File name="..\..\engines\parallaction\dialogue.cpp" open="0" top="0" tabpos="12">
+ <Cursor position="9886" topLine="331" />
</File>
- <File name="..\..\engines\parallaction\disk.cpp" open="1" top="0" tabpos="10">
- <Cursor position="2449" topLine="96" />
+ <File name="..\..\engines\parallaction\disk.cpp" open="1" top="1" tabpos="1">
+ <Cursor position="12394" topLine="590" />
</File>
- <File name="..\..\engines\parallaction\disk.h" open="0" top="0" tabpos="12">
- <Cursor position="3242" topLine="73" />
+ <File name="..\..\engines\parallaction\disk.h" open="0" top="0" tabpos="10">
+ <Cursor position="2566" topLine="85" />
</File>
- <File name="..\..\engines\parallaction\graphics.cpp" open="1" top="0" tabpos="5">
- <Cursor position="19121" topLine="767" />
+ <File name="..\..\engines\parallaction\font.cpp" open="0" top="0" tabpos="12">
+ <Cursor position="2879" topLine="102" />
</File>
- <File name="..\..\engines\parallaction\graphics.h" open="1" top="0" tabpos="12">
- <Cursor position="4260" topLine="125" />
+ <File name="..\..\engines\parallaction\graphics.cpp" open="0" top="0" tabpos="4">
+ <Cursor position="9121" topLine="275" />
</File>
- <File name="..\..\engines\parallaction\intro.cpp" open="0" top="0" tabpos="4">
- <Cursor position="8671" topLine="158" />
+ <File name="..\..\engines\parallaction\graphics.h" open="0" top="0" tabpos="2">
+ <Cursor position="4971" topLine="148" />
</File>
- <File name="..\..\engines\parallaction\inventory.cpp" open="1" top="0" tabpos="6">
- <Cursor position="3395" topLine="89" />
+ <File name="..\..\engines\parallaction\intro.cpp" open="0" top="0" tabpos="3">
+ <Cursor position="7371" topLine="0" />
</File>
- <File name="..\..\engines\parallaction\inventory.h" open="0" top="0" tabpos="9">
- <Cursor position="1418" topLine="10" />
+ <File name="..\..\engines\parallaction\inventory.cpp" open="0" top="0" tabpos="7">
+ <Cursor position="2257" topLine="42" />
</File>
- <File name="..\..\engines\parallaction\location.cpp" open="1" top="0" tabpos="11">
- <Cursor position="0" topLine="0" />
+ <File name="..\..\engines\parallaction\inventory.h" open="0" top="0" tabpos="14">
+ <Cursor position="1402" topLine="10" />
</File>
- <File name="..\..\engines\parallaction\menu.cpp" open="0" top="0" tabpos="11">
- <Cursor position="8465" topLine="57" />
+ <File name="..\..\engines\parallaction\location.cpp" open="0" top="0" tabpos="15">
+ <Cursor position="5172" topLine="133" />
</File>
- <File name="..\..\engines\parallaction\menu.h" open="0" top="0" tabpos="2">
- <Cursor position="1282" topLine="7" />
+ <File name="..\..\engines\parallaction\menu.cpp" open="0" top="0" tabpos="8">
+ <Cursor position="6240" topLine="250" />
</File>
- <File name="..\..\engines\parallaction\module.mk" open="0" top="0" tabpos="12">
- <Cursor position="165" topLine="0" />
+ <File name="..\..\engines\parallaction\menu.h" open="0" top="0" tabpos="17">
+ <Cursor position="1131" topLine="7" />
</File>
- <File name="..\..\engines\parallaction\music.cpp" open="0" top="0" tabpos="15">
- <Cursor position="2102" topLine="49" />
+ <File name="..\..\engines\parallaction\module.mk" open="0" top="0" tabpos="8">
+ <Cursor position="373" topLine="0" />
</File>
- <File name="..\..\engines\parallaction\music.h" open="0" top="0" tabpos="21">
- <Cursor position="1311" topLine="0" />
+ <File name="..\..\engines\parallaction\music.cpp" open="0" top="0" tabpos="1">
+ <Cursor position="7456" topLine="265" />
</File>
- <File name="..\..\engines\parallaction\parallaction.cpp" open="1" top="0" tabpos="7">
- <Cursor position="22155" topLine="929" />
+ <File name="..\..\engines\parallaction\music.h" open="0" top="0" tabpos="6">
+ <Cursor position="2468" topLine="45" />
</File>
- <File name="..\..\engines\parallaction\parallaction.h" open="1" top="0" tabpos="14">
- <Cursor position="2196" topLine="78" />
+ <File name="..\..\engines\parallaction\parallaction.cpp" open="0" top="0" tabpos="8">
+ <Cursor position="6534" topLine="267" />
</File>
- <File name="..\..\engines\parallaction\parser.cpp" open="0" top="0" tabpos="19">
- <Cursor position="1734" topLine="21" />
+ <File name="..\..\engines\parallaction\parallaction.h" open="0" top="0" tabpos="11">
+ <Cursor position="1559" topLine="78" />
</File>
- <File name="..\..\engines\parallaction\parser.h" open="0" top="0" tabpos="12">
- <Cursor position="1200" topLine="9" />
+ <File name="..\..\engines\parallaction\parser.cpp" open="0" top="0" tabpos="1">
+ <Cursor position="3952" topLine="52" />
</File>
- <File name="..\..\engines\parallaction\saveload.cpp" open="0" top="0" tabpos="10">
- <Cursor position="4740" topLine="129" />
+ <File name="..\..\engines\parallaction\parser.h" open="0" top="0" tabpos="6">
+ <Cursor position="1430" topLine="4" />
</File>
- <File name="..\..\engines\parallaction\staticres.cpp" open="0" top="0" tabpos="1">
- <Cursor position="1069" topLine="0" />
+ <File name="..\..\engines\parallaction\saveload.cpp" open="0" top="0" tabpos="16">
+ <Cursor position="9837" topLine="365" />
</File>
- <File name="..\..\engines\parallaction\walk.cpp" open="1" top="0" tabpos="8">
- <Cursor position="4566" topLine="154" />
+ <File name="..\..\engines\parallaction\staticres.cpp" open="0" top="0" tabpos="15">
+ <Cursor position="2760" topLine="59" />
</File>
- <File name="..\..\engines\parallaction\walk.h" open="0" top="0" tabpos="12">
- <Cursor position="1105" topLine="0" />
+ <File name="..\..\engines\parallaction\walk.cpp" open="0" top="0" tabpos="5">
+ <Cursor position="4484" topLine="128" />
</File>
- <File name="..\..\engines\parallaction\zone.cpp" open="1" top="0" tabpos="9">
- <Cursor position="12421" topLine="420" />
+ <File name="..\..\engines\parallaction\walk.h" open="0" top="0" tabpos="2">
+ <Cursor position="1668" topLine="23" />
</File>
- <File name="..\..\engines\parallaction\zone.h" open="1" top="1" tabpos="1">
- <Cursor position="5008" topLine="133" />
+ <File name="..\..\engines\parallaction\zone.cpp" open="0" top="0" tabpos="13">
+ <Cursor position="7574" topLine="239" />
+ </File>
+ <File name="..\..\engines\parallaction\zone.h" open="0" top="0" tabpos="14">
+ <Cursor position="2831" topLine="28" />
</File>
</CodeBlocks_layout_file>
diff --git a/dists/codeblocks/scummvm.cbp b/dists/codeblocks/scummvm.cbp
index d679b84e4f..2f111d5111 100644
--- a/dists/codeblocks/scummvm.cbp
+++ b/dists/codeblocks/scummvm.cbp
@@ -14,7 +14,7 @@
<Option external_deps="scummvm\engines\parallaction\libparallaction.a;scummvm\engines\agi\libagi.a;scummvm\engines\agos\libagos.a;scummvm\engines\saga\libsaga.a;scummvm\engines\lure\liblure.a;scummvm\engines\kyra\libkyra.a;" />
<Option type="1" />
<Option compiler="gcc" />
- <Option parameters="-d 9 --debugflags=disk" />
+ <Option parameters="-d 9 --debugflags=location,disk" />
<Option projectIncludeDirsRelation="2" />
<ResourceCompiler>
<Add directory="..\..\dists" />
@@ -38,6 +38,7 @@
<Add option="-DDISABLE_SWORD1" />
<Add option="-DDISABLE_SWORD2" />
<Add option="-DDISABLE_SAGA" />
+ <Add option="-DDISABLE_CRUISE" />
<Add directory="..\.." />
<Add directory="..\..\engines" />
<Add directory="..\..\common" />
@@ -383,11 +384,11 @@
<Option compilerVar="CPP" />
<Option target="default" />
</Unit>
- <Unit filename="..\..\graphics\ilbm.cpp">
+ <Unit filename="..\..\graphics\iff.cpp">
<Option compilerVar="CPP" />
<Option target="default" />
</Unit>
- <Unit filename="..\..\graphics\ilbm.h">
+ <Unit filename="..\..\graphics\iff.h">
<Option compilerVar="CPP" />
<Option compile="0" />
<Option link="0" />
diff --git a/dists/codeblocks/scummvm.depend b/dists/codeblocks/scummvm.depend
index 287915b1d3..f99e51aafa 100644
--- a/dists/codeblocks/scummvm.depend
+++ b/dists/codeblocks/scummvm.depend
@@ -1,31 +1,13 @@
# depslib dependency file v1.0
-1164571478 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\fs\windows\windows-fs.cpp
- <windows.h>
+1174164454 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.cpp
"common/stdafx.h"
- "backends/fs/abstract-fs.h"
- <stdio.h>
- <stdlib.h>
- <windows.h>
- <tchar.h>
+ "common/system.h"
+ "backends/events/default/default-events.h"
-1173387063 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\stdafx.h
+1173566330 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
<portdefs.h>
- <stdio.h>
- <stdlib.h>
- <string.h>
- <stdarg.h>
- <assert.h>
- <ctype.h>
- <time.h>
- <math.h>
- <devices/timer.h>
- <sys/types.h>
- <sys/uio.h>
- <sys/param.h>
- <unistd.h>
<strings.h>
<stdio.h>
- <fcntl.h>
<stdlib.h>
<string.h>
<stdarg.h>
@@ -34,1367 +16,50 @@
<time.h>
<math.h>
-1170576449 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\fs\abstract-fs.h
- "common/array.h"
- "common/str.h"
- "common/fs.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\array.h
+1177614536 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
"common/scummsys.h"
- <assert.h>
+ "common/mutex.h"
+ "common/noncopyable.h"
+ "common/rect.h"
-1173384058 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\scummsys.h
- <stdlib.h>
- <stdio.h>
+1178025620 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
"config.h"
<SDL_byteorder.h>
- "palmversion.h"
"globals.h"
- "extend.h"
+ <extras_string.h>
"nds/jtypes.h"
- <stdarg.h>
- <ctype.h>
- <string.h>
- <math.h>
- <time.h>
-
-1164571450 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\ps2\fileio.h
- "common/scummsys.h"
-
-1171400932 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\str.h
- "common/scummsys.h"
- "common/array.h"
- <assert.h>
- <string.h>
-
-1173384058 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\fs.h
- "common/array.h"
- "common/str.h"
-
-1173387305 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\midi\windows.cpp
- <windows.h>
- <mmsystem.h>
- "common/stdafx.h"
- "sound/mpu401.h"
- "common/util.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mpu401.h
- "common/stdafx.h"
- "sound/mididrv.h"
-
-1171653923 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mididrv.h
- "common/scummsys.h"
- "common/timer.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\timer.h
- "common/scummsys.h"
-
-1172929597 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\util.h
- "common/scummsys.h"
- "common/str.h"
- "common/array.h"
-
-1165164464 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\sdl\events.cpp
- "backends/platform/sdl/sdl-common.h"
- "common/util.h"
-
-1171110864 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\sdl\sdl-common.h
- <SDL.h>
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "graphics/scaler.h"
- "backends/intern.h"
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\system.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
"common/scummsys.h"
- "common/mutex.h"
- "common/rect.h"
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\mutex.h
- "common/scummsys.h"
+1174136164 c:\documents and settings\usoquotidiano\desktop\scummvm\common\noncopyable.h
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\rect.h
+1177701567 c:\documents and settings\usoquotidiano\desktop\scummvm\common\rect.h
"common/scummsys.h"
"common/util.h"
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler.h
- "common/stdafx.h"
- "common/scummsys.h"
- "graphics/surface.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\surface.h
+1177505823 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
"common/scummsys.h"
- "common/rect.h"
-
-1164571479 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\intern.h
- "common/system.h"
-
-1164571444 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\sdl\graphics.cpp
- "backends/platform/sdl/sdl-common.h"
- "common/util.h"
- "graphics/font.h"
- "graphics/fontman.h"
- "graphics/scaler.h"
- "graphics/surface.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\font.h
- "common/str.h"
- "graphics/surface.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fontman.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/singleton.h"
- "common/str.h"
- "common/hashmap.h"
- "common/hash-str.h"
- "graphics/font.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\singleton.h
-
-1173025754 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\hashmap.h
- "common/stdafx.h"
- "common/func.h"
- "common/str.h"
- "common/util.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\func.h
- "common/scummsys.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\hash-str.h
- "common/hashmap.h"
- "common/str.h"
-
-1173387330 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\sdl\sdl.cpp
- "backends/platform/sdl/sdl-common.h"
- "backends/plugins/sdl/sdl-provider.h"
- "common/config-manager.h"
- "common/util.h"
- "base/main.h"
- "backends/saves/default/default-saves.h"
- "backends/timer/default/default-timer.h"
- "sound/mixer.h"
- "icons/scummvm.xpm"
- "SymbianOs.h"
- <windows.h>
-
-1164571437 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\plugins\sdl\sdl-provider.h
- "common/stdafx.h"
- "base/plugins.h"
-
-1169328812 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\plugins.h
- "common/stdafx.h"
- "common/array.h"
- "common/list.h"
- "common/singleton.h"
- "common/util.h"
- "base/game.h"
-
-1172690841 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\list.h
- "common/scummsys.h"
- <assert.h>
-
-1170187002 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\game.h
- "common/stdafx.h"
"common/str.h"
"common/array.h"
- "common/hash-str.h"
-
-1173384058 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\config-manager.h
- "common/array.h"
- "common/hashmap.h"
- "common/singleton.h"
- "common/str.h"
- "common/hash-str.h"
-
-1164571436 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\main.h
- "common/scummsys.h"
-
-1164571437 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\saves\default\default-saves.h
- "common/stdafx.h"
- "common/savefile.h"
-
-1171788214 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\savefile.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/stream.h"
-
-1173025754 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\stream.h
- "common/stdafx.h"
- "common/scummsys.h"
-
-1164571436 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\timer\default\default-timer.h
- "common/timer.h"
- "common/mutex.h"
-
-1172866046 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mixer.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/mutex.h"
-
-1164571480 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\icons\scummvm.xpm
-
-1171877633 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\saves\compressed\compressed-saves.cpp
- "common/stdafx.h"
- "common/savefile.h"
- "common/util.h"
- "backends/saves/compressed/compressed-saves.h"
- <zlib.h>
-
-1171788215 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\saves\compressed\compressed-saves.h
- "common/stdafx.h"
- "common/savefile.h"
-
-1171788215 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\saves\default\default-saves.cpp
- "common/stdafx.h"
- "common/savefile.h"
- "common/util.h"
- "backends/saves/default/default-saves.h"
- "backends/saves/compressed/compressed-saves.h"
- <stdio.h>
- <string.h>
- <errno.h>
- <sys/stat.h>
-
-1164571437 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\saves\savefile.cpp
- "common/stdafx.h"
- "common/util.h"
- "common/config-manager.h"
- "common/savefile.h"
- <stdio.h>
- <string.h>
-
-1169844668 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\timer\default\default-timer.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "backends/timer/default/default-timer.h"
- "common/util.h"
- "common/system.h"
-
-1172929597 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\commandline.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "base/commandLine.h"
- "base/plugins.h"
- "base/version.h"
- "common/config-manager.h"
- "common/system.h"
- "sound/mididrv.h"
- "sound/mixer.h"
- "common/fs.h"
-
-1164571397 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\engine.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/str.h"
-
-1164571436 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\commandline.h
- "common/str.h"
- "common/config-manager.h"
-
-1164571436 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\version.h
-
-1170792000 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\game.cpp
- "base/game.h"
- "base/plugins.h"
-
-1172866046 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\main.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "base/commandLine.h"
- "base/plugins.h"
- "base/version.h"
- "common/config-manager.h"
- "common/file.h"
- "common/fs.h"
- "common/system.h"
- "gui/newgui.h"
- "gui/message.h"
- "backends/platform/wince/CELauncherDialog.h"
- "backends/platform/dc/DCLauncherDialog.h"
- "gui/launcher.h"
- "args.h"
-
-1173384058 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\file.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/str.h"
- "common/stream.h"
-1171110863 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\newgui.h
+1176747595 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
"common/scummsys.h"
- "common/singleton.h"
- "common/stack.h"
- "common/str.h"
- "graphics/fontman.h"
- "gui/theme.h"
- "gui/widget.h"
-
-1171826383 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\stack.h
- "common/scummsys.h"
- <assert.h>
"common/array.h"
-1171405441 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\theme.h
- "common/stdafx.h"
- "common/system.h"
- "common/rect.h"
- "common/str.h"
- "common/file.h"
- "common/config-file.h"
- "graphics/surface.h"
- "graphics/fontman.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\config-file.h
- "common/config-manager.h"
- "common/list.h"
- "common/str.h"
- "common/stream.h"
-
-1170576438 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\widget.h
- "common/scummsys.h"
- "common/str.h"
- "graphics/font.h"
- "graphics/surface.h"
- "gui/object.h"
-
-1171309680 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\object.h
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\message.h
- "gui/dialog.h"
- "common/str.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\dialog.h
+1173788771 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
"common/scummsys.h"
- "common/str.h"
- "gui/object.h"
- "gui/widget.h"
-
-1170576449 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\celauncherdialog.h
- "base/plugins.h"
- "common/fs.h"
- "gui/launcher.h"
-1171826383 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\launcher.h
- "gui/dialog.h"
- "common/str.h"
-
-1164571454 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\dc\dclauncherdialog.h
-
-1170922364 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\plugins.cpp
- "base/plugins.h"
- "common/util.h"
-
-1164571436 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\version.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "base/internal_version.h"
- "base/version.h"
- "backends/platform/symbian/src/main_features.inl"
-
-1164571436 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\base\internal_version.h
-
-1167415214 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\symbian\src\main_features.inl
-
-1171826383 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\advanceddetector.cpp
+1174164454 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.h
"common/stdafx.h"
- "base/plugins.h"
- "common/util.h"
- "common/hash-str.h"
- "common/file.h"
- "common/md5.h"
- "common/advancedDetector.h"
- "common/config-manager.h"
-
-1171527697 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\md5.h
- "common/scummsys.h"
- "common/fs.h"
- "common/stream.h"
-
-1171527697 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\advanceddetector.h
- "common/fs.h"
- "base/game.h"
- "base/plugins.h"
-
-1171400932 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\config-file.cpp
- "common/stdafx.h"
- "common/config-file.h"
- "common/file.h"
- "common/savefile.h"
- "common/system.h"
- "common/util.h"
-
-1173387285 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\config-manager.cpp
- "common/stdafx.h"
- "common/config-manager.h"
- "common/file.h"
- "common/util.h"
- <windows.h>
- "backends/platform/ps2/systemps2.h"
-
-1164571450 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\ps2\systemps2.h
- "common/stdafx.h"
- "common/system.h"
-
-1173384058 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\file.cpp
- "common/file.h"
- "common/fs.h"
- "common/hashmap.h"
- "common/util.h"
- "common/hash-str.h"
- "CoreFoundation/CoreFoundation.h"
- "backends/platform/ps2/fileio.h"
-
-1170576446 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\fs.cpp
- "common/stdafx.h"
- "backends/fs/abstract-fs.h"
- "common/util.h"
-
-1164571400 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\hashmap.cpp
- "common/hashmap.h"
- <ctype.h>
-
-1171527697 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\md5.cpp
- <string.h>
- "common/file.h"
- "common/md5.h"
- "common/util.h"
- "common/endian.h"
- <stdlib.h>
- <stdio.h>
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\endian.h
- "common/scummsys.h"
-
-1164571400 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\mutex.cpp
- "common/stdafx.h"
- "common/mutex.h"
- "common/system.h"
-
-1171400932 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\str.cpp
- "common/stdafx.h"
- "common/str.h"
- "common/hash-str.h"
- "common/util.h"
- <ctype.h>
-
-1172012045 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\stream.cpp
- "common/stdafx.h"
- "common/stream.h"
- "common/str.h"
- "common/util.h"
-
-1164571400 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\system.cpp
- "common/stdafx.h"
- "backends/intern.h"
- "gui/message.h"
- "common/config-manager.h"
- "common/system.h"
- "common/timer.h"
- "common/util.h"
- "sound/mixer.h"
-
-1171826383 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\unzip.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- <stdio.h>
- <stdlib.h>
- <string.h>
- <zlib.h>
- "common/unzip.h"
- "common/file.h"
- <stddef.h>
- <string.h>
- <stdlib.h>
- <errno.h>
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\unzip.h
- "common/stdafx.h"
- "common/scummsys.h"
- <zlib.h>
-
-1173384058 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\util.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "common/util.h"
- "common/system.h"
- "gui/debugger.h"
- "backends/platform/ps2/fileio.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\debugger.h
-
-1172012044 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\engine.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "common/config-manager.h"
- "common/file.h"
- "common/timer.h"
- "common/savefile.h"
- "common/system.h"
- "gui/message.h"
- "sound/mixer.h"
-
-1171307211 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\cursorman.cpp
- "graphics/cursorman.h"
- "common/system.h"
- "common/stack.h"
-
-1171307211 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\cursorman.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/stack.h"
- "common/singleton.h"
-
-1170576447 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\dxa_player.cpp
- "common/stdafx.h"
- "common/endian.h"
- "graphics/dxa_player.h"
- "common/util.h"
- <zlib.h>
-
-1167415212 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\dxa_player.h
- "common/scummsys.h"
- "common/file.h"
-
-1173384058 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\font.cpp
- "common/stdafx.h"
- "common/stream.h"
- "common/file.h"
- "common/endian.h"
- "graphics/font.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fontman.cpp
- "graphics/fontman.h"
-
-1164571409 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fonts\consolefont.cpp
- "common/stdafx.h"
- "graphics/font.h"
-
-1164571409 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fonts\newfont.cpp
- "common/stdafx.h"
- "graphics/font.h"
-
-1164571409 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fonts\newfont_big.cpp
- "common/stdafx.h"
- "graphics/font.h"
-
-1164571409 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\fonts\scummfont.cpp
- "common/stdafx.h"
- "graphics/font.h"
- "scumm_globals.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\ilbm.cpp
- "common/stdafx.h"
- "common/endian.h"
- "common/stream.h"
- "graphics/surface.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\imagedec.cpp
- "graphics/imagedec.h"
- "common/system.h"
- "common/file.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\imagedec.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/str.h"
- "common/stream.h"
- "graphics/surface.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\imageman.cpp
- "graphics/imagedec.h"
- "graphics/imageman.h"
- "graphics/surface.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\imageman.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/singleton.h"
- "common/str.h"
- "common/list.h"
- "common/unzip.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\primitives.cpp
- "common/stdafx.h"
- "common/util.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler.cpp
- "graphics/scaler/intern.h"
- "graphics/scaler/scalebit.h"
- "common/util.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\intern.h
- "common/stdafx.h"
- "common/scummsys.h"
- "graphics/colormasks.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\colormasks.h
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scalebit.h
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\2xsai.cpp
- "graphics/scaler/intern.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\aspect.cpp
- "graphics/scaler/intern.h"
- "graphics/scaler.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\hq2x.cpp
- "graphics/scaler/intern.h"
- "graphics/scaler/hq2x.h"
- "graphics/scaler/hq2x.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\hq2x.h
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\hq3x.cpp
- "graphics/scaler/intern.h"
- "graphics/scaler/hq3x.h"
- "graphics/scaler/hq3x.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\hq3x.h
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scale2x.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "graphics/scaler/intern.h"
- "graphics/scaler/scale2x.h"
- <assert.h>
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scale2x.h
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scale3x.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "graphics/scaler/intern.h"
- "graphics/scaler/scale3x.h"
- <assert.h>
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scale3x.h
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\scalebit.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "graphics/scaler/intern.h"
- "graphics/scaler/scale2x.h"
- "graphics/scaler/scale3x.h"
- <alloca.h>
- <assert.h>
- <stdlib.h>
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\scaler\thumbnail.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "graphics/scaler.h"
- "graphics/scaler/intern.h"
-
-1164571411 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\surface.cpp
- "common/stdafx.h"
- "common/util.h"
- "graphics/primitives.h"
- "graphics/surface.h"
-
-1164571411 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\graphics\primitives.h
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\actions.cpp
- "common/stdafx.h"
- "gui/Actions.h"
- "gui/message.h"
- "scumm/scumm.h"
- "common/config-manager.h"
- "backends/platform/wince/CEActionsPocket.h"
- "backends/platform/wince/CEActionsSmartphone.h"
- "backends/platform/symbian/src/SymbianActions.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\actions.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "gui/Key.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\key.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
-
-1172345868 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\scumm\scumm.h
- "engines/engine.h"
- "common/endian.h"
- "common/file.h"
- "common/rect.h"
- "common/str.h"
- "graphics/surface.h"
- "scumm/gfx.h"
- "scumm/plugin.h"
- "scumm/script.h"
- "sound/mididrv.h"
-
-1171911145 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\scumm\gfx.h
- "graphics/surface.h"
-
-1171527695 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\scumm\plugin.h
- "common/util.h"
-
-1171911145 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\engines\scumm\script.h
- "engines/engine.h"
-
-1164571453 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\ceactionspocket.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "wince-sdl.h"
- "gui/Key.h"
- "gui/Actions.h"
-
-1171307212 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\wince-sdl.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "graphics/scaler.h"
- "backends/intern.h"
- "backends/platform/sdl/sdl-common.h"
- "CEGUI.h"
- "CEKeys.h"
- "CEDevice.h"
- "CEScaler.h"
- <SDL.h>
-
-1164571453 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\cedevice.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "common/str.h"
-
-1164571453 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\cescaler.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "graphics/scaler.h"
- "graphics/scaler/intern.h"
-
-1164571453 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\wince\ceactionssmartphone.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "wince-sdl.h"
- "gui/Key.h"
- "gui/Actions.h"
-
-1164571445 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\backends\platform\symbian\src\symbianactions.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/system.h"
- "gui/Key.h"
- "gui/Actions.h"
-
-1169400236 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\edittextwidget.cpp
- "common/stdafx.h"
- "gui/EditTextWidget.h"
- "gui/dialog.h"
- "gui/eval.h"
- "gui/newgui.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\edittextwidget.h
- "gui/editable.h"
- "common/str.h"
+ "common/events.h"
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\editable.h
- "common/str.h"
+1174164453 c:\documents and settings\usoquotidiano\desktop\scummvm\common\events.h
"common/rect.h"
- "gui/widget.h"
- "gui/newgui.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\eval.h
- "common/stdafx.h"
- "common/str.h"
- "common/hashmap.h"
- "common/hash-str.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\key.cpp
- "common/stdafx.h"
- "gui/Key.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\listwidget.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/ListWidget.h"
- "gui/ScrollBarWidget.h"
- "gui/dialog.h"
- "gui/eval.h"
- "gui/newgui.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\listwidget.h
- "gui/editable.h"
- "common/str.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\scrollbarwidget.h
- "gui/widget.h"
-
-1172567053 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\popupwidget.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/dialog.h"
- "gui/eval.h"
- "gui/newgui.h"
- "gui/PopUpWidget.h"
- "engines/engine.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\popupwidget.h
- "gui/widget.h"
- "common/str.h"
- "common/array.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\scrollbarwidget.cpp
- "common/stdafx.h"
- "ScrollBarWidget.h"
- "gui/dialog.h"
- "gui/newgui.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\tabwidget.cpp
- "common/stdafx.h"
- "common/util.h"
- "gui/TabWidget.h"
- "gui/dialog.h"
- "gui/newgui.h"
- "gui/eval.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\tabwidget.h
- "widget.h"
- "common/str.h"
- "common/array.h"
-
-1171110863 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\themeclassic.cpp
- "gui/ThemeClassic.h"
- "gui/eval.h"
-
-1171110863 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\themeclassic.h
- "gui/theme.h"
-
-1172605215 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\thememodern.cpp
- "gui/ThemeModern.h"
- "gui/eval.h"
- "graphics/imageman.h"
- "graphics/imagedec.h"
- "graphics/colormasks.h"
- "graphics/cursorman.h"
- "common/config-manager.h"
- "common/file.h"
-
-1171110863 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\thememodern.h
- "gui/theme.h"
-
-1171110863 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\about.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "base/plugins.h"
- "base/version.h"
- "common/system.h"
- "common/util.h"
- "gui/about.h"
- "gui/eval.h"
- "gui/newgui.h"
- "gui/widget.h"
- "gui/credits.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\about.h
- "gui/dialog.h"
- "common/str.h"
- "graphics/surface.h"
-
-1171653915 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\credits.h
-
-1168167088 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\browser.cpp
- "common/stdafx.h"
- "gui/browser.h"
- "gui/newgui.h"
- "gui/ListWidget.h"
- "common/config-manager.h"
- "common/fs.h"
- "common/system.h"
- "common/func.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\browser.h
- "gui/dialog.h"
- "common/str.h"
- "common/fs.h"
- <Carbon/Carbon.h>
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\chooser.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/chooser.h"
- "gui/newgui.h"
- "gui/ListWidget.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\chooser.h
- "common/str.h"
- "gui/dialog.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\console.cpp
- "common/stdafx.h"
- "gui/console.h"
- "gui/ScrollBarWidget.h"
- "gui/eval.h"
- "engines/engine.h"
- "base/version.h"
- "common/system.h"
- "graphics/font.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\console.h
- "gui/dialog.h"
- "gui/newgui.h"
- <stdarg.h>
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\debugger.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/debugger.h"
- "gui/console.h"
-
-1167415200 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\dialog.cpp
- "common/stdafx.h"
- "gui/newgui.h"
- "gui/dialog.h"
- "gui/widget.h"
- "gui/PopUpWidget.h"
- "common/system.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\editable.cpp
- "common/stdafx.h"
- "gui/editable.h"
- "gui/newgui.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\eval.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/eval.h"
- "gui/widget.h"
- "gui/newgui.h"
- "graphics/scaler.h"
-
-1171826383 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\launcher.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "base/game.h"
- "base/plugins.h"
- "base/version.h"
- "common/config-manager.h"
- "common/fs.h"
- "common/util.h"
- "common/system.h"
- "gui/about.h"
- "gui/browser.h"
- "gui/chooser.h"
- "gui/eval.h"
- "gui/launcher.h"
- "gui/massadd.h"
- "gui/message.h"
- "gui/newgui.h"
- "gui/options.h"
- "gui/EditTextWidget.h"
- "gui/ListWidget.h"
- "gui/TabWidget.h"
- "gui/PopUpWidget.h"
- "sound/mididrv.h"
-
-1171826383 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\massadd.h
- "gui/dialog.h"
- "common/fs.h"
- "common/stack.h"
-
-1171400932 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\options.h
- "gui/dialog.h"
- "common/str.h"
- "gui/KeysDialog.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\keysdialog.h
- "gui/newgui.h"
- "gui/dialog.h"
- "gui/ListWidget.h"
- "common/str.h"
-
-1171826383 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\massadd.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "base/game.h"
- "base/plugins.h"
- "gui/launcher.h"
- "gui/massadd.h"
- "gui/newgui.h"
- "gui/widget.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\message.cpp
- "common/stdafx.h"
- "common/str.h"
- "common/system.h"
- "gui/message.h"
- "gui/newgui.h"
- "gui/widget.h"
-
-1171307210 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\newgui.cpp
- "common/stdafx.h"
- "common/system.h"
- "common/util.h"
- "graphics/cursorman.h"
- "gui/newgui.h"
- "gui/dialog.h"
- "gui/eval.h"
- "gui/ThemeModern.h"
- "gui/ThemeClassic.h"
- "common/config-manager.h"
-
-1173384058 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\options.cpp
- "common/stdafx.h"
- "gui/browser.h"
- "gui/themebrowser.h"
- "gui/chooser.h"
- "gui/eval.h"
- "gui/newgui.h"
- "gui/options.h"
- "gui/PopUpWidget.h"
- "gui/TabWidget.h"
- "common/fs.h"
- "common/config-manager.h"
"common/system.h"
- "graphics/scaler.h"
- "sound/mididrv.h"
- "sound/mixer.h"
-
-1164571274 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\themebrowser.h
- "gui/dialog.h"
- "common/str.h"
- "common/fs.h"
- "common/array.h"
-
-1171400932 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\theme-config.cpp
- "gui/theme.h"
- "gui/eval.h"
-
-1170576438 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\theme.cpp
- "gui/theme.h"
- "gui/eval.h"
- "common/unzip.h"
-
-1164571274 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\themebrowser.cpp
- "common/stdafx.h"
- "gui/themebrowser.h"
- "gui/ListWidget.h"
- "gui/widget.h"
- "gui/theme.h"
- "common/fs.h"
- "CoreFoundation/CoreFoundation.h"
-
-1170576438 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\gui\widget.cpp
- "common/stdafx.h"
- "common/util.h"
- "graphics/fontman.h"
- "gui/widget.h"
- "gui/dialog.h"
- "gui/eval.h"
- "gui/newgui.h"
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\adpcm.cpp
- "common/stdafx.h"
- "common/endian.h"
- "sound/adpcm.h"
- "sound/audiostream.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\adpcm.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/stream.h"
-
-1172866046 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\audiostream.h
- "common/stdafx.h"
- "common/util.h"
- "common/scummsys.h"
-
-1172389580 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\audiocd.cpp
- "common/stdafx.h"
- "sound/audiocd.h"
- "sound/mp3.h"
- "sound/vorbis.h"
- "sound/flac.h"
- "engines/engine.h"
- "common/file.h"
- "common/util.h"
- "common/system.h"
-
-1172389580 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\audiocd.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/singleton.h"
- "sound/mixer.h"
-
-1172012046 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mp3.h
- "common/stdafx.h"
- "common/scummsys.h"
-
-1172305644 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\vorbis.h
- "common/stdafx.h"
- "common/scummsys.h"
-
-1172305644 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\flac.h
- "common/stdafx.h"
- "common/scummsys.h"
-
-1172866046 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\audiostream.cpp
- "common/stdafx.h"
- "common/endian.h"
- "common/file.h"
- "common/list.h"
- "common/util.h"
- "sound/audiostream.h"
- "sound/mixer.h"
- "sound/mp3.h"
- "sound/vorbis.h"
- "sound/flac.h"
-
-1173025754 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\flac.cpp
- "sound/flac.h"
- "common/file.h"
- "common/util.h"
- "sound/audiostream.h"
- "sound/audiocd.h"
- <FLAC/export.h>
- <FLAC/seekable_stream_decoder.h>
- <FLAC/stream_decoder.h>
-
-1165164464 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\fmopl.cpp
- "common/stdafx.h"
- <stdio.h>
- <stdlib.h>
- <string.h>
- <stdarg.h>
- <math.h>
- "sound/fmopl.h"
- "common/util.h"
- "common/config-manager.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\fmopl.h
- "common/scummsys.h"
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mididrv.cpp
- "common/stdafx.h"
- "engines/engine.h"
- "common/config-manager.h"
- "common/str.h"
- "common/system.h"
- "common/util.h"
- "sound/mididrv.h"
-
-1171653923 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\midiparser.cpp
- "common/stdafx.h"
- "sound/midiparser.h"
- "sound/mididrv.h"
- "common/util.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\midiparser.h
- "common/scummsys.h"
- "common/endian.h"
-
-1171826383 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\midiparser_smf.cpp
- "common/stdafx.h"
- "sound/midiparser.h"
- "sound/mididrv.h"
- "common/util.h"
-
-1171653923 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\midiparser_xmidi.cpp
- "common/stdafx.h"
- "sound/midiparser.h"
- "sound/mididrv.h"
- "common/util.h"
-
-1172866046 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mixer.cpp
- "common/stdafx.h"
- "common/file.h"
- "common/util.h"
- "common/system.h"
- "sound/mixer.h"
- "sound/rate.h"
- "sound/audiostream.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\rate.h
- "common/scummsys.h"
- "engines/engine.h"
-
-1172389580 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mp3.cpp
- "sound/mp3.h"
- "common/file.h"
- "common/util.h"
- "sound/audiocd.h"
- "sound/audiostream.h"
- <mad.h>
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\mpu401.cpp
- "common/stdafx.h"
- "sound/mpu401.h"
- "common/system.h"
- "common/timer.h"
- "common/util.h"
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\null.cpp
- "common/stdafx.h"
- "sound/mpu401.h"
-
-1172174660 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\rate.cpp
- "common/stdafx.h"
- "sound/audiostream.h"
- "sound/rate.h"
- "sound/mixer.h"
- "common/util.h"
-
-1172012045 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\adlib.cpp
- "sound/softsynth/emumidi.h"
- "common/util.h"
- "sound/fmopl.h"
-
-1172012045 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\emumidi.h
- "common/stdafx.h"
- "sound/audiostream.h"
- "sound/mididrv.h"
- "sound/mixer.h"
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\fluidsynth.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "common/stdafx.h"
- "common/config-manager.h"
- "sound/mpu401.h"
- "sound/softsynth/emumidi.h"
- <fluidsynth.h>
-
-1164571405 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32.cpp
- "common/stdafx.h"
- "common/scummsys.h"
- "sound/softsynth/mt32/mt32emu.h"
- "sound/softsynth/emumidi.h"
- "sound/mpu401.h"
- "common/util.h"
- "common/file.h"
- "common/config-manager.h"
- "common/system.h"
- "graphics/fontman.h"
- "graphics/surface.h"
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\mt32emu.h
- "freeverb.h"
- "structures.h"
- "i386.h"
- "mt32_file.h"
- "tables.h"
- "partial.h"
- "partialManager.h"
- "part.h"
- "synth.h"
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\freeverb.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\structures.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\i386.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\mt32_file.h
- <stdio.h>
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\tables.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\partial.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\partialmanager.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\part.h
-
-1164571404 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\synth.h
- <stdarg.h>
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\freeverb.cpp
- "common/stdafx.h"
- "sound/softsynth/mt32/freeverb.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\i386.cpp
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\mt32_file.cpp
- <stdio.h>
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\part.cpp
- <string.h>
- <math.h>
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\partial.cpp
- <stdlib.h>
- <math.h>
- <string.h>
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\partialmanager.cpp
- <string.h>
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\synth.cpp
- <math.h>
- <string.h>
- <stdlib.h>
- "mt32emu.h"
-
-1164571404 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\mt32\tables.cpp
- <stdlib.h>
- <string.h>
- <math.h>
- "mt32emu.h"
-
-1172012045 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\softsynth\ym2612.cpp
- "sound/softsynth/emumidi.h"
- <math.h>
- "common/util.h"
-
-1172866046 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\voc.cpp
- "common/stdafx.h"
- "common/endian.h"
- "common/util.h"
- "common/stream.h"
- "sound/audiostream.h"
- "sound/mixer.h"
- "sound/voc.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\voc.h
- "common/stdafx.h"
- "common/scummsys.h"
- "common/pack-start.h"
- "common/pack-end.h"
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\pack-start.h
-
-1164571400 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\common\pack-end.h
-
-1172389580 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\vorbis.cpp
- "sound/vorbis.h"
- "common/file.h"
- "common/util.h"
- "sound/audiostream.h"
- "sound/audiocd.h"
- <ivorbisfile.h>
- <tremor/ivorbisfile.h>
- <vorbis/vorbisfile.h>
-
-1172866046 source:c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\wave.cpp
- "common/stdafx.h"
- "common/util.h"
- "common/stream.h"
- "sound/audiostream.h"
- "sound/mixer.h"
- "sound/wave.h"
- "sound/adpcm.h"
-
-1164571405 c:\documents and settings\usoquotidiano\documenti\soft\scummvm\scummvm\sound\wave.h
- "common/stdafx.h"
- "common/scummsys.h"
+ "common/noncopyable.h"
-1173398975 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\fs\windows\windows-fs.cpp
+1173402575 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\fs\windows\windows-fs.cpp
<windows.h>
"common/stdafx.h"
"backends/fs/abstract-fs.h"
@@ -1403,71 +68,40 @@
<windows.h>
<tchar.h>
-1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
- <portdefs.h>
- <strings.h>
- <stdio.h>
- <stdlib.h>
- <string.h>
- <stdarg.h>
- <assert.h>
- <ctype.h>
- <time.h>
- <math.h>
-
-1173398976 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\fs\abstract-fs.h
+1173402576 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\fs\abstract-fs.h
"common/array.h"
"common/str.h"
"common/fs.h"
-1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
- "common/scummsys.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
- "config.h"
- <SDL_byteorder.h>
- "palmversion.h"
- "globals.h"
- "extend.h"
- "nds/jtypes.h"
-
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
- "common/scummsys.h"
- "common/array.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
"common/array.h"
"common/str.h"
-1173399217 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\midi\windows.cpp
+1173402817 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\midi\windows.cpp
<windows.h>
<mmsystem.h>
"common/stdafx.h"
"sound/mpu401.h"
"common/util.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mpu401.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mpu401.h
"common/stdafx.h"
"sound/mididrv.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.h
"common/scummsys.h"
"common/timer.h"
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
+1174136164 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
"common/scummsys.h"
"common/noncopyable.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
- "common/scummsys.h"
- "common/str.h"
- "common/array.h"
-
-1173398934 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\events.cpp
+1175021323 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\events.cpp
"backends/platform/sdl/sdl-common.h"
"common/util.h"
+ "common/events.h"
-1173398934 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\sdl-common.h
+1177614537 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\sdl-common.h
<SDL.h>
"common/stdafx.h"
"common/scummsys.h"
@@ -1475,32 +109,19 @@
"graphics/scaler.h"
"backends/intern.h"
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
- "common/scummsys.h"
- "common/mutex.h"
- "common/noncopyable.h"
- "common/rect.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
- "common/scummsys.h"
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\rect.h
- "common/scummsys.h"
- "common/util.h"
-
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler.h
"common/stdafx.h"
"common/scummsys.h"
"graphics/surface.h"
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.h
"common/scummsys.h"
"common/rect.h"
-1173398976 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\intern.h
+1173402576 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\intern.h
"common/system.h"
-1173398934 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\graphics.cpp
+1174164455 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\graphics.cpp
"backends/platform/sdl/sdl-common.h"
"common/util.h"
"graphics/font.h"
@@ -1508,11 +129,11 @@
"graphics/scaler.h"
"graphics/surface.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.h
+1177614536 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.h
"common/str.h"
"graphics/surface.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.h
"common/stdafx.h"
"common/scummsys.h"
"common/singleton.h"
@@ -1521,23 +142,24 @@
"common/hash-str.h"
"graphics/font.h"
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
+1174136164 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
"common/noncopyable.h"
-1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
+1173788771 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
"common/stdafx.h"
"common/func.h"
"common/str.h"
"common/util.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\func.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\func.h
"common/scummsys.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hash-str.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hash-str.h
"common/hashmap.h"
"common/str.h"
-1173399217 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\sdl.cpp
+1174157119 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\sdl\sdl.cpp
+ <windows.h>
"backends/platform/sdl/sdl-common.h"
"backends/plugins/sdl/sdl-provider.h"
"common/config-manager.h"
@@ -1547,14 +169,13 @@
"backends/timer/default/default-timer.h"
"sound/mixer.h"
"icons/scummvm.xpm"
- <windows.h>
"SymbianOs.h"
-1173398926 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\plugins\sdl\sdl-provider.h
+1173402526 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\plugins\sdl\sdl-provider.h
"common/stdafx.h"
"base/plugins.h"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.h
"common/stdafx.h"
"common/array.h"
"common/list.h"
@@ -1562,62 +183,62 @@
"common/util.h"
"base/game.h"
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
+1173537096 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
"common/scummsys.h"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
"common/stdafx.h"
"common/str.h"
"common/array.h"
"common/hash-str.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.h
"common/array.h"
"common/hashmap.h"
"common/singleton.h"
"common/str.h"
"common/hash-str.h"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\main.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\main.h
"common/scummsys.h"
-1174117753 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.h
+1174121353 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.h
"common/stdafx.h"
"common/savefile.h"
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
+1174136164 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
"common/stdafx.h"
"common/noncopyable.h"
"common/scummsys.h"
"common/stream.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.h
"common/stdafx.h"
"common/scummsys.h"
-1173398926 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\timer\default\default-timer.h
+1173402526 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\timer\default\default-timer.h
"common/timer.h"
"common/mutex.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.h
+1177614536 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.h
"common/stdafx.h"
"common/scummsys.h"
"common/mutex.h"
-1173398977 c:\documents and settings\usoquotidiano\desktop\scummvm\icons\scummvm.xpm
+1173402577 c:\documents and settings\usoquotidiano\desktop\scummvm\icons\scummvm.xpm
-1173641251 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.cpp
+1173644851 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.cpp
"common/stdafx.h"
"common/savefile.h"
"common/util.h"
"backends/saves/compressed/compressed-saves.h"
<zlib.h>
-1173398926 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.h
+1173402526 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.h
"common/stdafx.h"
"common/savefile.h"
-1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.cpp
+1174121353 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.cpp
"common/stdafx.h"
"common/savefile.h"
"common/util.h"
@@ -1628,7 +249,7 @@
<errno.h>
<sys/stat.h>
-1173398926 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\savefile.cpp
+1173402526 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\savefile.cpp
"common/stdafx.h"
"common/util.h"
"common/config-manager.h"
@@ -1636,14 +257,14 @@
<stdio.h>
<string.h>
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\timer\default\default-timer.cpp
+1173402525 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\timer\default\default-timer.cpp
"common/stdafx.h"
"common/scummsys.h"
"backends/timer/default/default-timer.h"
"common/util.h"
"common/system.h"
-1173567046 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.cpp
+1173570646 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.cpp
"common/stdafx.h"
"engines/engine.h"
"base/commandLine.h"
@@ -1655,22 +276,22 @@
"sound/mixer.h"
"common/fs.h"
-1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.h
+1175450743 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.h
"common/stdafx.h"
"common/scummsys.h"
"common/str.h"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.h
"common/str.h"
"common/config-manager.h"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\version.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\version.h
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.cpp
+1173402525 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.cpp
"base/game.h"
"base/plugins.h"
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\main.cpp
+1177095928 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\main.cpp
"common/stdafx.h"
"engines/engine.h"
"base/commandLine.h"
@@ -1687,13 +308,13 @@
"gui/launcher.h"
"args.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.h
"common/stdafx.h"
"common/scummsys.h"
"common/str.h"
"common/stream.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.h
+1174157116 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.h
"common/scummsys.h"
"common/singleton.h"
"common/stack.h"
@@ -1702,11 +323,11 @@
"gui/theme.h"
"gui/widget.h"
-1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
+1173537096 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
"common/scummsys.h"
"common/array.h"
-1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
+1177614532 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
"common/stdafx.h"
"common/system.h"
"common/rect.h"
@@ -1716,58 +337,58 @@
"graphics/surface.h"
"graphics/fontman.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.h
"common/config-manager.h"
"common/list.h"
"common/str.h"
"common/stream.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.h
"common/scummsys.h"
"common/str.h"
"graphics/font.h"
"graphics/surface.h"
"gui/object.h"
-1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
+1174121351 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.h
"gui/dialog.h"
"common/str.h"
-1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
+1176747594 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
"common/scummsys.h"
"common/str.h"
"gui/object.h"
"gui/widget.h"
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\celauncherdialog.h
+1173402547 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\celauncherdialog.h
"base/plugins.h"
"common/fs.h"
"gui/launcher.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.h
+1174157116 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.h
"gui/dialog.h"
"common/str.h"
-1173398948 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\dc\dclauncherdialog.h
+1173402548 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\dc\dclauncherdialog.h
-1173906517 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.cpp
+1177701568 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.cpp
"base/plugins.h"
"common/util.h"
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\version.cpp
+1173402525 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\version.cpp
"common/stdafx.h"
"common/scummsys.h"
"base/internal_version.h"
"base/version.h"
"backends/platform/symbian/src/main_features.inl"
-1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\internal_version.h
+1173402525 c:\documents and settings\usoquotidiano\desktop\scummvm\base\internal_version.h
-1173398935 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\main_features.inl
+1173402535 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\main_features.inl
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.cpp
+1177701567 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.cpp
"common/stdafx.h"
"base/plugins.h"
"common/util.h"
@@ -1777,17 +398,17 @@
"common/advancedDetector.h"
"common/config-manager.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.h
"common/scummsys.h"
"common/fs.h"
"common/stream.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.h
"common/fs.h"
"base/game.h"
"base/plugins.h"
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.cpp
+1173402482 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.cpp
"common/stdafx.h"
"common/config-file.h"
"common/file.h"
@@ -1795,19 +416,19 @@
"common/system.h"
"common/util.h"
-1173399217 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.cpp
+1174157118 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.cpp
+ <windows.h>
"common/stdafx.h"
"common/config-manager.h"
"common/file.h"
"common/util.h"
- <windows.h>
"backends/platform/ps2/systemps2.h"
-1173398943 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\ps2\systemps2.h
+1174164456 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\ps2\systemps2.h
"common/stdafx.h"
"common/system.h"
-1173641249 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.cpp
+1175936376 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.cpp
"common/file.h"
"common/fs.h"
"common/hashmap.h"
@@ -1816,18 +437,18 @@
"CoreFoundation/CoreFoundation.h"
"backends/platform/ps2/fileio.h"
-1173398943 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\ps2\fileio.h
+1173402543 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\ps2\fileio.h
"common/scummsys.h"
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.cpp
+1173402482 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.cpp
"common/stdafx.h"
"backends/fs/abstract-fs.h"
"common/util.h"
-1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.cpp
+1173537096 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.cpp
"common/hashmap.h"
-1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.cpp
+1173537096 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.cpp
"common/file.h"
"common/md5.h"
"common/util.h"
@@ -1835,27 +456,27 @@
<stdlib.h>
<stdio.h>
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\endian.h
+1177854384 c:\documents and settings\usoquotidiano\desktop\scummvm\common\endian.h
"common/scummsys.h"
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.cpp
+1173402482 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.cpp
"common/stdafx.h"
"common/mutex.h"
"common/system.h"
-1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.cpp
+1176747595 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.cpp
"common/stdafx.h"
"common/str.h"
"common/hash-str.h"
"common/util.h"
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.cpp
+1173402482 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.cpp
"common/stdafx.h"
"common/stream.h"
"common/str.h"
"common/util.h"
-1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.cpp
+1174121353 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.cpp
"common/stdafx.h"
"backends/intern.h"
"backends/events/default/default-events.h"
@@ -1866,7 +487,7 @@
"common/util.h"
"sound/mixer.h"
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\unzip.cpp
+1173402482 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\unzip.cpp
"common/stdafx.h"
"common/scummsys.h"
<stdio.h>
@@ -1880,12 +501,12 @@
<stdlib.h>
<errno.h>
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\unzip.h
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\unzip.h
"common/stdafx.h"
"common/scummsys.h"
<zlib.h>
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.cpp
+1178025620 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.cpp
"common/stdafx.h"
"engines/engine.h"
"common/util.h"
@@ -1893,9 +514,11 @@
"gui/debugger.h"
"backends/platform/ps2/fileio.h"
-1173900476 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.h
+1173904076 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.h
-1173399217 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.cpp
+1175450743 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.cpp
+ <windows.h>
+ <direct.h>
"common/stdafx.h"
"engines/engine.h"
"common/config-manager.h"
@@ -1905,82 +528,83 @@
"common/system.h"
"gui/message.h"
"sound/mixer.h"
- <windows.h>
- <direct.h>
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\cursorman.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\cursorman.cpp
"graphics/cursorman.h"
"common/system.h"
"common/stack.h"
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\cursorman.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\cursorman.h
"common/stdafx.h"
"common/scummsys.h"
"common/stack.h"
"common/singleton.h"
-1173398896 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\dxa_player.cpp
+1173402496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\dxa_player.cpp
"common/stdafx.h"
"common/endian.h"
"graphics/dxa_player.h"
"common/util.h"
<zlib.h>
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\dxa_player.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\dxa_player.h
"common/scummsys.h"
"common/file.h"
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.cpp
"common/stdafx.h"
"common/stream.h"
"common/file.h"
"common/endian.h"
"graphics/font.h"
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.cpp
"graphics/fontman.h"
-1173398893 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\consolefont.cpp
+1173402493 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\consolefont.cpp
"common/stdafx.h"
"graphics/font.h"
-1173398893 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\newfont.cpp
+1173402493 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\newfont.cpp
"common/stdafx.h"
"graphics/font.h"
-1173398893 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\newfont_big.cpp
+1173402493 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\newfont_big.cpp
"common/stdafx.h"
"graphics/font.h"
-1173398893 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\scummfont.cpp
+1173402493 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fonts\scummfont.cpp
"common/stdafx.h"
"graphics/font.h"
"scumm_globals.h"
-1173398896 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\ilbm.cpp
+1177969963 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\ilbm.cpp
"common/stdafx.h"
"common/endian.h"
"common/stream.h"
"graphics/surface.h"
+ "graphics/ilbm.h"
+
+1177969881 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\ilbm.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imagedec.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imagedec.cpp
"graphics/imagedec.h"
"common/system.h"
"common/file.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imagedec.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imagedec.h
"common/stdafx.h"
"common/scummsys.h"
"common/str.h"
"common/stream.h"
"graphics/surface.h"
-1173398896 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imageman.cpp
+1173402496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imageman.cpp
"graphics/imagedec.h"
"graphics/imageman.h"
"graphics/surface.h"
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imageman.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\imageman.h
"common/stdafx.h"
"common/scummsys.h"
"common/singleton.h"
@@ -1988,64 +612,64 @@
"common/list.h"
"common/unzip.h"
-1173398896 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\primitives.cpp
+1173402496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\primitives.cpp
"common/stdafx.h"
"common/util.h"
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler.cpp
"graphics/scaler/intern.h"
"graphics/scaler/scalebit.h"
"common/util.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\intern.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\intern.h
"common/stdafx.h"
"common/scummsys.h"
"graphics/colormasks.h"
-1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\colormasks.h
+1173402496 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\colormasks.h
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scalebit.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scalebit.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\2xsai.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\2xsai.cpp
"graphics/scaler/intern.h"
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\aspect.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\aspect.cpp
"graphics/scaler/intern.h"
"graphics/scaler.h"
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq2x.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq2x.cpp
"graphics/scaler/intern.h"
"graphics/scaler/hq2x.h"
"graphics/scaler/hq2x.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq2x.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq2x.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq3x.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq3x.cpp
"graphics/scaler/intern.h"
"graphics/scaler/hq3x.h"
"graphics/scaler/hq3x.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq3x.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\hq3x.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale2x.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale2x.cpp
"common/stdafx.h"
"common/scummsys.h"
"graphics/scaler/intern.h"
"graphics/scaler/scale2x.h"
<assert.h>
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale2x.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale2x.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale3x.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale3x.cpp
"common/stdafx.h"
"common/scummsys.h"
"graphics/scaler/intern.h"
"graphics/scaler/scale3x.h"
<assert.h>
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale3x.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scale3x.h
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scalebit.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\scalebit.cpp
"common/stdafx.h"
"common/scummsys.h"
"graphics/scaler/intern.h"
@@ -2055,22 +679,22 @@
<assert.h>
<stdlib.h>
-1173398895 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\thumbnail.cpp
+1173402495 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\scaler\thumbnail.cpp
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
"graphics/scaler.h"
"graphics/scaler/intern.h"
-1173398896 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.cpp
+1173402496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.cpp
"common/stdafx.h"
"common/util.h"
"graphics/primitives.h"
"graphics/surface.h"
-1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\primitives.h
+1173402495 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\primitives.h
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\actions.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\actions.cpp
"common/stdafx.h"
"gui/Actions.h"
"gui/message.h"
@@ -2080,18 +704,18 @@
"backends/platform/wince/CEActionsSmartphone.h"
"backends/platform/symbian/src/SymbianActions.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\actions.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\actions.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
"gui/Key.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\key.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\key.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
-1173641246 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\scumm.h
+1177854379 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\scumm.h
"engines/engine.h"
"common/endian.h"
"common/file.h"
@@ -2099,20 +723,20 @@
"common/str.h"
"graphics/surface.h"
"scumm/gfx.h"
- "scumm/plugin.h"
+ "scumm/detection.h"
"scumm/script.h"
"sound/mididrv.h"
-1173533494 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\gfx.h
+1173537094 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\gfx.h
"graphics/surface.h"
-1173398810 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\plugin.h
+1173402410 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\plugin.h
"common/util.h"
-1173398809 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\script.h
+1173402409 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\script.h
"engines/engine.h"
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\ceactionspocket.h
+1177854385 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\ceactionspocket.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
@@ -2120,7 +744,7 @@
"gui/Key.h"
"gui/Actions.h"
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\wince-sdl.h
+1177854385 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\wince-sdl.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
@@ -2133,20 +757,20 @@
"CEScaler.h"
<SDL.h>
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\cedevice.h
+1177854385 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\cedevice.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
"common/str.h"
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\cescaler.h
+1173402547 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\cescaler.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
"graphics/scaler.h"
"graphics/scaler/intern.h"
-1173398947 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\ceactionssmartphone.h
+1177854385 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\wince\ceactionssmartphone.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
@@ -2154,41 +778,41 @@
"gui/Key.h"
"gui/Actions.h"
-1173900478 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\symbianactions.h
+1173904078 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\symbianactions.h
"common/stdafx.h"
"common/scummsys.h"
"common/system.h"
"gui/Key.h"
"gui/Actions.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\edittextwidget.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\edittextwidget.cpp
"common/stdafx.h"
"gui/EditTextWidget.h"
"gui/dialog.h"
"gui/eval.h"
"gui/newgui.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\edittextwidget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\edittextwidget.h
"gui/editable.h"
"common/str.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.h
"common/str.h"
"common/rect.h"
"gui/widget.h"
"gui/newgui.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\eval.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\eval.h
"common/stdafx.h"
"common/str.h"
"common/hashmap.h"
"common/hash-str.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\key.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\key.cpp
"common/stdafx.h"
"gui/Key.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.cpp
"common/stdafx.h"
"common/system.h"
"gui/ListWidget.h"
@@ -2197,14 +821,14 @@
"gui/eval.h"
"gui/newgui.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.h
"gui/editable.h"
"common/str.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\scrollbarwidget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\scrollbarwidget.h
"gui/widget.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\popupwidget.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\popupwidget.cpp
"common/stdafx.h"
"common/system.h"
"gui/dialog.h"
@@ -2213,18 +837,18 @@
"gui/PopUpWidget.h"
"engines/engine.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\popupwidget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\popupwidget.h
"gui/widget.h"
"common/str.h"
"common/array.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\scrollbarwidget.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\scrollbarwidget.cpp
"common/stdafx.h"
"ScrollBarWidget.h"
"gui/dialog.h"
"gui/newgui.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\tabwidget.cpp
+1176747594 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\tabwidget.cpp
"common/stdafx.h"
"common/util.h"
"gui/TabWidget.h"
@@ -2232,19 +856,19 @@
"gui/newgui.h"
"gui/eval.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\tabwidget.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\tabwidget.h
"widget.h"
"common/str.h"
"common/array.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themeclassic.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themeclassic.cpp
"gui/ThemeClassic.h"
"gui/eval.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themeclassic.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themeclassic.h
"gui/theme.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\thememodern.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\thememodern.cpp
"gui/ThemeModern.h"
"gui/eval.h"
"graphics/imageman.h"
@@ -2254,14 +878,15 @@
"common/config-manager.h"
"common/file.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\thememodern.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\thememodern.h
"gui/theme.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\about.cpp
+1174164453 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\about.cpp
"common/stdafx.h"
"engines/engine.h"
"base/plugins.h"
"base/version.h"
+ "common/events.h"
"common/system.h"
"common/util.h"
"gui/about.h"
@@ -2270,14 +895,14 @@
"gui/widget.h"
"gui/credits.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\about.h
+1174157116 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\about.h
"gui/dialog.h"
"common/str.h"
"graphics/surface.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\credits.h
+1177614532 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\credits.h
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\browser.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\browser.cpp
"common/stdafx.h"
"gui/browser.h"
"gui/newgui.h"
@@ -2287,44 +912,45 @@
"common/system.h"
"common/func.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\browser.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\browser.h
"gui/dialog.h"
"common/str.h"
"common/fs.h"
<Carbon/Carbon.h>
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\chooser.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\chooser.cpp
"common/stdafx.h"
"common/system.h"
"gui/chooser.h"
"gui/newgui.h"
"gui/ListWidget.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\chooser.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\chooser.h
"common/str.h"
"gui/dialog.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.cpp
+1174164453 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.cpp
"common/stdafx.h"
"gui/console.h"
"gui/ScrollBarWidget.h"
"gui/eval.h"
"engines/engine.h"
"base/version.h"
+ "common/events.h"
"common/system.h"
"graphics/font.h"
-1173533495 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.h
+1173537095 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.h
"gui/dialog.h"
"gui/newgui.h"
-1173900476 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.cpp
+1173904076 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.cpp
"common/stdafx.h"
"common/system.h"
"gui/debugger.h"
"gui/console.h"
-1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.cpp
+1176747594 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.cpp
"common/stdafx.h"
"gui/newgui.h"
"gui/dialog.h"
@@ -2332,12 +958,12 @@
"gui/PopUpWidget.h"
"common/system.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.cpp
"common/stdafx.h"
"gui/editable.h"
"gui/newgui.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\eval.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\eval.cpp
"common/stdafx.h"
"common/system.h"
"gui/eval.h"
@@ -2345,13 +971,14 @@
"gui/newgui.h"
"graphics/scaler.h"
-1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.cpp
+1174164453 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.cpp
"common/stdafx.h"
"engines/engine.h"
"base/game.h"
"base/plugins.h"
"base/version.h"
"common/config-manager.h"
+ "common/events.h"
"common/fs.h"
"common/util.h"
"common/system.h"
@@ -2370,23 +997,23 @@
"gui/PopUpWidget.h"
"sound/mididrv.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.h
"gui/dialog.h"
"common/fs.h"
"common/stack.h"
-1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.h
+1173566330 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.h
"gui/dialog.h"
"common/str.h"
"gui/KeysDialog.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\keysdialog.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\keysdialog.h
"gui/newgui.h"
"gui/dialog.h"
"gui/ListWidget.h"
"common/str.h"
-1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.cpp
+1173566330 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.cpp
"common/stdafx.h"
"engines/engine.h"
"base/game.h"
@@ -2396,7 +1023,7 @@
"gui/newgui.h"
"gui/widget.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.cpp
"common/stdafx.h"
"common/str.h"
"common/system.h"
@@ -2404,7 +1031,7 @@
"gui/newgui.h"
"gui/widget.h"
-1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.cpp
+1177854375 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.cpp
"common/stdafx.h"
"common/events.h"
"common/system.h"
@@ -2417,7 +1044,13 @@
"gui/ThemeClassic.h"
"common/config-manager.h"
-1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.cpp
+1176747594 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.cpp
+ "common/stdafx.h"
+ "common/system.h"
+ "gui/object.h"
+ "gui/widget.h"
+
+1173566330 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.cpp
"common/stdafx.h"
"gui/browser.h"
"gui/themebrowser.h"
@@ -2434,22 +1067,22 @@
"sound/mididrv.h"
"sound/mixer.h"
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themebrowser.h
+1173402364 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themebrowser.h
"gui/dialog.h"
"common/str.h"
"common/fs.h"
"common/array.h"
-1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme-config.cpp
+1177347977 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme-config.cpp
"gui/theme.h"
"gui/eval.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.cpp
+1177854375 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.cpp
"gui/theme.h"
"gui/eval.h"
"common/unzip.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themebrowser.cpp
+1173402364 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\themebrowser.cpp
"common/stdafx.h"
"gui/themebrowser.h"
"gui/ListWidget.h"
@@ -2458,7 +1091,7 @@
"common/fs.h"
"CoreFoundation/CoreFoundation.h"
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.cpp
+1176747594 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.cpp
"common/stdafx.h"
"common/util.h"
"graphics/fontman.h"
@@ -2467,25 +1100,26 @@
"gui/eval.h"
"gui/newgui.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\adpcm.cpp
+1177614536 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\adpcm.cpp
"common/stdafx.h"
"common/endian.h"
"sound/adpcm.h"
"sound/audiostream.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\adpcm.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\adpcm.h
"common/stdafx.h"
"common/scummsys.h"
"common/stream.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiostream.h
+1176623932 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiostream.h
"common/stdafx.h"
"common/util.h"
"common/scummsys.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiocd.cpp
+1176623932 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiocd.cpp
"common/stdafx.h"
"sound/audiocd.h"
+ "sound/audiostream.h"
"sound/mp3.h"
"sound/vorbis.h"
"sound/flac.h"
@@ -2494,25 +1128,25 @@
"common/util.h"
"common/system.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiocd.h
+1176623932 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiocd.h
"common/stdafx.h"
"common/scummsys.h"
"common/singleton.h"
"sound/mixer.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mp3.h
+1176623932 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mp3.h
"common/stdafx.h"
"common/scummsys.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\vorbis.h
+1176623932 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\vorbis.h
"common/stdafx.h"
"common/scummsys.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\flac.h
+1176623932 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\flac.h
"common/stdafx.h"
"common/scummsys.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiostream.cpp
+1176623932 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiostream.cpp
"common/stdafx.h"
"common/endian.h"
"common/file.h"
@@ -2524,7 +1158,7 @@
"sound/vorbis.h"
"sound/flac.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\flac.cpp
+1176623932 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\flac.cpp
"sound/flac.h"
"common/file.h"
"common/util.h"
@@ -2534,7 +1168,7 @@
<FLAC/seekable_stream_decoder.h>
<FLAC/stream_decoder.h>
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\fmopl.cpp
+1175936376 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\fmopl.cpp
"common/stdafx.h"
<stdio.h>
<stdlib.h>
@@ -2544,11 +1178,12 @@
"sound/fmopl.h"
"common/util.h"
"common/config-manager.h"
+ "dsmain.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\fmopl.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\fmopl.h
"common/scummsys.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.cpp
"common/stdafx.h"
"engines/engine.h"
"common/config-manager.h"
@@ -2557,29 +1192,29 @@
"common/util.h"
"sound/mididrv.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.cpp
"common/stdafx.h"
"sound/midiparser.h"
"sound/mididrv.h"
"common/util.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.h
"common/scummsys.h"
"common/endian.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser_smf.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser_smf.cpp
"common/stdafx.h"
"sound/midiparser.h"
"sound/mididrv.h"
"common/util.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser_xmidi.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser_xmidi.cpp
"common/stdafx.h"
"sound/midiparser.h"
"sound/mididrv.h"
"common/util.h"
-1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.cpp
+1173566330 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.cpp
"common/stdafx.h"
"common/file.h"
"common/util.h"
@@ -2588,11 +1223,62 @@
"sound/rate.h"
"sound/audiostream.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\rate.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\rate.h
"common/scummsys.h"
"engines/engine.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mp3.cpp
+1173402485 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\infogrames.cpp
+ "sound/mods/infogrames.h"
+ "common/endian.h"
+
+1173402484 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\infogrames.h
+ "sound/mods/paula.h"
+ "common/stream.h"
+ "common/file.h"
+
+1177701568 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\paula.h
+ "sound/audiostream.h"
+ "common/mutex.h"
+
+1173402485 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\module.cpp
+ "common/stdafx.h"
+ "sound/mods/module.h"
+ "common/util.h"
+
+1173402485 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\module.h
+ "common/stream.h"
+ "common/pack-start.h"
+ "common/pack-end.h"
+
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-start.h
+
+1173402482 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-end.h
+
+1173402485 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\paula.cpp
+ "sound/mods/paula.h"
+
+1173402485 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\protracker.cpp
+ "common/stdafx.h"
+ "sound/mods/protracker.h"
+ "sound/mods/paula.h"
+ "sound/mods/module.h"
+ "sound/audiostream.h"
+
+1177705233 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\protracker.h
+ "common/stdafx.h"
+ "common/stream.h"
+
+1173402485 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\rjp1.cpp
+ "common/stdafx.h"
+ "common/endian.h"
+ "sound/mods/paula.h"
+ "sound/mods/rjp1.h"
+ "sound/audiostream.h"
+
+1173402485 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\rjp1.h
+ "common/stream.h"
+
+1176623932 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mp3.cpp
"sound/mp3.h"
"common/file.h"
"common/util.h"
@@ -2600,36 +1286,36 @@
"sound/audiostream.h"
<mad.h>
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mpu401.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mpu401.cpp
"common/stdafx.h"
"sound/mpu401.h"
"common/system.h"
"common/timer.h"
"common/util.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\null.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\null.cpp
"common/stdafx.h"
"sound/mpu401.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\rate.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\rate.cpp
"common/stdafx.h"
"sound/audiostream.h"
"sound/rate.h"
"sound/mixer.h"
"common/util.h"
-1173398889 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\adlib.cpp
+1173402489 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\adlib.cpp
"sound/softsynth/emumidi.h"
"common/util.h"
"sound/fmopl.h"
-1173398889 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\emumidi.h
+1173402489 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\emumidi.h
"common/stdafx.h"
"sound/audiostream.h"
"sound/mididrv.h"
"sound/mixer.h"
-1173398889 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\fluidsynth.cpp
+1173402489 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\fluidsynth.cpp
"common/stdafx.h"
"common/scummsys.h"
"common/stdafx.h"
@@ -2638,7 +1324,7 @@
"sound/softsynth/emumidi.h"
<fluidsynth.h>
-1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32.cpp
+1174164454 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32.cpp
"common/stdafx.h"
"common/scummsys.h"
"sound/softsynth/mt32/mt32emu.h"
@@ -2652,7 +1338,7 @@
"graphics/fontman.h"
"graphics/surface.h"
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32emu.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32emu.h
"freeverb.h"
"structures.h"
"i386.h"
@@ -2663,70 +1349,75 @@
"part.h"
"synth.h"
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\freeverb.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\freeverb.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\structures.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\structures.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\i386.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\i386.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32_file.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32_file.h
<stdio.h>
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\tables.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\tables.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partial.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partial.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partialmanager.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partialmanager.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\part.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\part.h
-1173398888 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\synth.h
+1173402488 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\synth.h
<stdarg.h>
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\freeverb.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\freeverb.cpp
"common/stdafx.h"
"sound/softsynth/mt32/freeverb.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\i386.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\i386.cpp
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32_file.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\mt32_file.cpp
<stdio.h>
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\part.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\part.cpp
<string.h>
<math.h>
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partial.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partial.cpp
<stdlib.h>
<math.h>
<string.h>
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partialmanager.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\partialmanager.cpp
<string.h>
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\synth.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\synth.cpp
<math.h>
<string.h>
<stdlib.h>
"mt32emu.h"
-1173398888 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\tables.cpp
+1173402488 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32\tables.cpp
<stdlib.h>
<string.h>
<math.h>
"mt32emu.h"
-1173398889 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\ym2612.cpp
- "sound/softsynth/emumidi.h"
+1177095927 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\ym2612.cpp
<math.h>
+ "sound/softsynth/ym2612.h"
"common/util.h"
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\voc.cpp
+1174743688 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\ym2612.h
+ "common/stdafx.h"
+ "common/scummsys.h"
+ "sound/softsynth/emumidi.h"
+
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\voc.cpp
"common/stdafx.h"
"common/endian.h"
"common/util.h"
@@ -2735,17 +1426,13 @@
"sound/mixer.h"
"sound/voc.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\voc.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\voc.h
"common/stdafx.h"
"common/scummsys.h"
"common/pack-start.h"
"common/pack-end.h"
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-start.h
-
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-end.h
-
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\vorbis.cpp
+1176623932 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\vorbis.cpp
"sound/vorbis.h"
"common/file.h"
"common/util.h"
@@ -2755,7 +1442,7 @@
<tremor/ivorbisfile.h>
<vorbis/vorbisfile.h>
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\wave.cpp
+1173402491 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\wave.cpp
"common/stdafx.h"
"common/util.h"
"common/stream.h"
@@ -2764,76 +1451,34 @@
"sound/wave.h"
"sound/adpcm.h"
-1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\wave.h
+1173402491 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\wave.h
"common/stdafx.h"
"common/scummsys.h"
-1173398885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\infogrames.cpp
- "sound/mods/infogrames.h"
- "common/endian.h"
-
-1173398884 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\infogrames.h
- "sound/mods/paula.h"
- "common/stream.h"
- "common/file.h"
-
-1173398885 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\paula.h
- "sound/audiostream.h"
- "common/mutex.h"
-
-1173398885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\module.cpp
- "common/stdafx.h"
- "sound/mods/module.h"
+1177854379 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\detection.h
"common/util.h"
-1173398885 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\module.h
- "common/stream.h"
- "common/pack-start.h"
- "common/pack-end.h"
+1178031885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\iff.cpp
+ "graphics/iff.h"
+ "graphics/surface.h"
-1173398885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\paula.cpp
- "sound/mods/paula.h"
+1178031629 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\iff.h
+ "common/iff_container.h"
-1173398885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\protracker.cpp
- "common/stdafx.h"
- "sound/mods/protracker.h"
- "sound/mods/paula.h"
- "sound/mods/module.h"
+1178027446 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\iff.cpp
+ "sound/iff.h"
"sound/audiostream.h"
+ "sound/mixer.h"
-1173398885 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\protracker.h
- "common/stdafx.h"
- "common/stream.h"
+1178032147 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\iff.h
+ "common/iff_container.h"
-1173398885 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\rjp1.cpp
+1178026710 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\iff_container.cpp
+
+1178030342 c:\documents and settings\usoquotidiano\desktop\scummvm\common\iff_container.h
"common/stdafx.h"
+ "common/scummsys.h"
"common/endian.h"
- "sound/mods/paula.h"
- "sound/mods/rjp1.h"
- "sound/audiostream.h"
-
-1173398885 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\rjp1.h
"common/stream.h"
-
-1174117754 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.h
- "common/stdafx.h"
- "common/events.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\events.h
- "common/rect.h"
- "common/system.h"
- "common/noncopyable.h"
-
-1174117754 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.cpp
- "common/stdafx.h"
- "common/system.h"
- "backends/events/default/default-events.h"
-
-1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.cpp
- "common/stdafx.h"
- "common/system.h"
- "gui/object.h"
- "gui/widget.h"
-
-1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\noncopyable.h
+ "common/util.h"
diff --git a/dists/codeblocks/scummvm.layout b/dists/codeblocks/scummvm.layout
index 4bdc9a3e21..7b88105b61 100644
--- a/dists/codeblocks/scummvm.layout
+++ b/dists/codeblocks/scummvm.layout
@@ -2,22 +2,22 @@
<CodeBlocks_layout_file>
<ActiveTarget name="default" />
<File name="..\..\backends\events\default\default-events.cpp" open="0" top="0" tabpos="0">
- <Cursor position="0" topLine="39" />
+ <Cursor position="1060" topLine="8" />
</File>
<File name="..\..\backends\events\default\default-events.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="13" />
</File>
<File name="..\..\backends\fs\windows\windows-fs.cpp" open="0" top="0" tabpos="3">
- <Cursor position="6675" topLine="207" />
+ <Cursor position="1326" topLine="28" />
</File>
<File name="..\..\backends\midi\windows.cpp" open="0" top="0" tabpos="4">
- <Cursor position="2922" topLine="80" />
+ <Cursor position="1606" topLine="24" />
</File>
- <File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="0">
- <Cursor position="5928" topLine="213" />
+ <File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="1">
+ <Cursor position="5716" topLine="196" />
</File>
- <File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="5">
- <Cursor position="47256" topLine="1698" />
+ <File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="1">
+ <Cursor position="27863" topLine="1022" />
</File>
<File name="..\..\backends\platform\sdl\sdl-common.h" open="0" top="0" tabpos="0">
<Cursor position="7253" topLine="206" />
@@ -34,29 +34,29 @@
<File name="..\..\backends\timer\default\default-timer.cpp" open="0" top="0" tabpos="7">
<Cursor position="3304" topLine="82" />
</File>
- <File name="..\..\base\commandLine.cpp" open="0" top="0" tabpos="1">
- <Cursor position="13025" topLine="298" />
- </File>
- <File name="..\..\base\game.cpp" open="0" top="0" tabpos="0">
- <Cursor position="1060" topLine="27" />
+ <File name="..\..\base\commandLine.cpp" open="0" top="0" tabpos="14">
+ <Cursor position="13025" topLine="322" />
</File>
<File name="..\..\base\main.cpp" open="0" top="0" tabpos="0">
<Cursor position="10180" topLine="267" />
</File>
- <File name="..\..\base\plugins.cpp" open="0" top="0" tabpos="8">
- <Cursor position="1245" topLine="19" />
+ <File name="..\..\base\main.h" open="0" top="0" tabpos="0">
+ <Cursor position="1074" topLine="0" />
</File>
- <File name="..\..\base\plugins.h" open="0" top="0" tabpos="0">
- <Cursor position="7833" topLine="188" />
+ <File name="..\..\base\plugins.cpp" open="1" top="0" tabpos="5">
+ <Cursor position="3400" topLine="86" />
+ </File>
+ <File name="..\..\base\plugins.h" open="0" top="0" tabpos="3">
+ <Cursor position="5991" topLine="151" />
</File>
<File name="..\..\base\version.cpp" open="0" top="0" tabpos="0">
- <Cursor position="2" topLine="0" />
+ <Cursor position="1734" topLine="13" />
</File>
- <File name="..\..\common\advancedDetector.cpp" open="0" top="0" tabpos="0">
- <Cursor position="8666" topLine="282" />
+ <File name="..\..\common\advancedDetector.cpp" open="0" top="0" tabpos="16">
+ <Cursor position="4607" topLine="144" />
</File>
- <File name="..\..\common\array.h" open="0" top="0" tabpos="0">
- <Cursor position="1099" topLine="46" />
+ <File name="..\..\common\array.h" open="0" top="0" tabpos="2">
+ <Cursor position="1882" topLine="45" />
</File>
<File name="..\..\common\config-file.cpp" open="0" top="0" tabpos="0">
<Cursor position="4515" topLine="122" />
@@ -68,85 +68,139 @@
<Cursor position="1658" topLine="12" />
</File>
<File name="..\..\common\endian.h" open="0" top="0" tabpos="0">
- <Cursor position="5094" topLine="126" />
+ <Cursor position="4129" topLine="122" />
</File>
<File name="..\..\common\file.cpp" open="0" top="0" tabpos="0">
- <Cursor position="8437" topLine="235" />
+ <Cursor position="15663" topLine="480" />
</File>
<File name="..\..\common\file.h" open="0" top="0" tabpos="13">
- <Cursor position="1172" topLine="12" />
+ <Cursor position="1181" topLine="61" />
+ </File>
+ <File name="..\..\common\fs.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="1071" topLine="8" />
+ </File>
+ <File name="..\..\common\func.h" open="0" top="0" tabpos="2">
+ <Cursor position="2306" topLine="40" />
+ </File>
+ <File name="..\..\common\hashmap.h" open="0" top="0" tabpos="0">
+ <Cursor position="30" topLine="120" />
+ </File>
+ <File name="..\..\common\list.h" open="0" top="0" tabpos="1">
+ <Cursor position="3592" topLine="128" />
+ </File>
+ <File name="..\..\common\md5.cpp" open="0" top="0" tabpos="20">
+ <Cursor position="1020" topLine="364" />
</File>
- <File name="..\..\common\list.h" open="1" top="0" tabpos="17">
- <Cursor position="1602" topLine="26" />
+ <File name="..\..\common\md5.h" open="0" top="0" tabpos="19">
+ <Cursor position="0" topLine="0" />
</File>
- <File name="..\..\common\mutex.cpp" open="0" top="0" tabpos="0">
+ <File name="..\..\common\mutex.cpp" open="0" top="0" tabpos="18">
<Cursor position="1316" topLine="24" />
</File>
+ <File name="..\..\common\mutex.h" open="0" top="0" tabpos="1">
+ <Cursor position="1704" topLine="21" />
+ </File>
<File name="..\..\common\rect.h" open="0" top="0" tabpos="0">
- <Cursor position="5584" topLine="130" />
+ <Cursor position="3493" topLine="23" />
</File>
<File name="..\..\common\savefile.h" open="0" top="0" tabpos="1">
<Cursor position="1342" topLine="55" />
</File>
- <File name="..\..\common\scummsys.h" open="0" top="0" tabpos="0">
- <Cursor position="9547" topLine="341" />
+ <File name="..\..\common\scummsys.h" open="0" top="0" tabpos="1">
+ <Cursor position="9437" topLine="352" />
</File>
<File name="..\..\common\singleton.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="39" />
</File>
+ <File name="..\..\common\stack.h" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="60" />
+ </File>
<File name="..\..\common\stdafx.h" open="0" top="0" tabpos="1">
- <Cursor position="3750" topLine="55" />
+ <Cursor position="27" topLine="0" />
</File>
<File name="..\..\common\str.cpp" open="0" top="0" tabpos="0">
- <Cursor position="10347" topLine="401" />
+ <Cursor position="3740" topLine="78" />
</File>
<File name="..\..\common\str.h" open="0" top="0" tabpos="0">
- <Cursor position="6138" topLine="163" />
+ <Cursor position="6115" topLine="165" />
</File>
<File name="..\..\common\stream.cpp" open="0" top="0" tabpos="0">
<Cursor position="1828" topLine="46" />
</File>
<File name="..\..\common\stream.h" open="0" top="0" tabpos="3">
- <Cursor position="11237" topLine="339" />
+ <Cursor position="3529" topLine="125" />
</File>
<File name="..\..\common\system.cpp" open="0" top="0" tabpos="0">
<Cursor position="1888" topLine="29" />
</File>
<File name="..\..\common\system.h" open="0" top="0" tabpos="2">
- <Cursor position="29061" topLine="781" />
+ <Cursor position="27043" topLine="748" />
</File>
<File name="..\..\common\timer.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="10" />
</File>
<File name="..\..\common\unzip.cpp" open="0" top="0" tabpos="0">
- <Cursor position="9067" topLine="298" />
+ <Cursor position="35606" topLine="1176" />
</File>
<File name="..\..\common\util.cpp" open="0" top="0" tabpos="3">
<Cursor position="11348" topLine="425" />
</File>
<File name="..\..\common\util.h" open="0" top="0" tabpos="2">
- <Cursor position="5919" topLine="185" />
+ <Cursor position="3" topLine="126" />
</File>
<File name="..\..\engines\engine.cpp" open="0" top="0" tabpos="6">
<Cursor position="1299" topLine="6" />
</File>
- <File name="..\..\graphics\dxa_player.cpp" open="0" top="0" tabpos="0">
+ <File name="..\..\graphics\dxa_player.cpp" open="0" top="0" tabpos="5">
<Cursor position="2699" topLine="98" />
</File>
+ <File name="..\..\graphics\font.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="1610" topLine="46" />
+ </File>
<File name="..\..\graphics\font.h" open="0" top="0" tabpos="0">
- <Cursor position="1274" topLine="37" />
+ <Cursor position="1274" topLine="20" />
+ </File>
+ <File name="..\..\graphics\fontman.h" open="0" top="0" tabpos="0">
+ <Cursor position="2503" topLine="36" />
+ </File>
+ <File name="..\..\graphics\ilbm.cpp" open="1" top="0" tabpos="3">
+ <Cursor position="9338" topLine="284" />
+ </File>
+ <File name="..\..\graphics\ilbm.h" open="1" top="0" tabpos="2">
+ <Cursor position="1674" topLine="36" />
+ </File>
+ <File name="..\..\graphics\imagedec.cpp" open="1" top="0" tabpos="1">
+ <Cursor position="3897" topLine="4" />
+ </File>
+ <File name="..\..\graphics\imagedec.h" open="0" top="0" tabpos="0">
+ <Cursor position="1720" topLine="11" />
</File>
- <File name="..\..\graphics\ilbm.cpp" open="0" top="0" tabpos="1">
- <Cursor position="8845" topLine="271" />
+ <File name="..\..\graphics\imageman.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="1217" topLine="0" />
</File>
- <File name="..\..\graphics\ilbm.h" open="0" top="0" tabpos="2">
- <Cursor position="1053" topLine="0" />
+ <File name="..\..\graphics\imageman.h" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="21" />
</File>
- <File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="0">
- <Cursor position="2432" topLine="171" />
+ <File name="..\..\graphics\primitives.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="1071" topLine="17" />
</File>
- <File name="..\..\graphics\surface.h" open="0" top="0" tabpos="10">
- <Cursor position="1817" topLine="25" />
+ <File name="..\..\graphics\primitives.h" open="0" top="0" tabpos="0">
+ <Cursor position="1194" topLine="0" />
+ </File>
+ <File name="..\..\graphics\scaler.h" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="33" />
+ </File>
+ <File name="..\..\graphics\scaler\scale2x.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="17" />
+ </File>
+ <File name="..\..\graphics\scaler\scale2x.h" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="16" />
+ </File>
+ <File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="4">
+ <Cursor position="2096" topLine="9" />
+ </File>
+ <File name="..\..\graphics\surface.h" open="0" top="0" tabpos="3">
+ <Cursor position="2124" topLine="19" />
</File>
<File name="..\..\gui\ListWidget.h" open="0" top="0" tabpos="0">
<Cursor position="1693" topLine="25" />
@@ -164,7 +218,7 @@
<Cursor position="2732" topLine="48" />
</File>
<File name="..\..\gui\dialog.h" open="0" top="0" tabpos="0">
- <Cursor position="1255" topLine="16" />
+ <Cursor position="1177" topLine="12" />
</File>
<File name="..\..\gui\massadd.cpp" open="0" top="0" tabpos="0">
<Cursor position="5313" topLine="146" />
@@ -187,6 +241,9 @@
<File name="..\..\gui\theme.h" open="0" top="0" tabpos="0">
<Cursor position="8342" topLine="197" />
</File>
+ <File name="..\..\gui\themebrowser.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="4920" topLine="152" />
+ </File>
<File name="..\..\gui\widget.h" open="0" top="0" tabpos="0">
<Cursor position="5090" topLine="21" />
</File>
@@ -194,13 +251,13 @@
<Cursor position="0" topLine="44" />
</File>
<File name="..\..\sound\audiostream.h" open="0" top="0" tabpos="0">
- <Cursor position="0" topLine="90" />
+ <Cursor position="4511" topLine="87" />
</File>
<File name="..\..\sound\flac.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="4" />
</File>
<File name="..\..\sound\fmopl.h" open="0" top="0" tabpos="0">
- <Cursor position="0" topLine="110" />
+ <Cursor position="0" topLine="117" />
</File>
<File name="..\..\sound\mididrv.cpp" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="164" />
@@ -209,19 +266,46 @@
<Cursor position="4230" topLine="136" />
</File>
<File name="..\..\sound\midiparser.cpp" open="0" top="0" tabpos="3">
- <Cursor position="0" topLine="198" />
+ <Cursor position="4149" topLine="130" />
</File>
<File name="..\..\sound\midiparser.h" open="0" top="0" tabpos="2">
<Cursor position="0" topLine="325" />
</File>
+ <File name="..\..\sound\midiparser_xmidi.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="4826" topLine="133" />
+ </File>
+ <File name="..\..\sound\mixer.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="1483" topLine="50" />
+ </File>
<File name="..\..\sound\mixer.h" open="0" top="0" tabpos="0">
- <Cursor position="1127" topLine="161" />
+ <Cursor position="3013" topLine="69" />
+ </File>
+ <File name="..\..\sound\mods\infogrames.h" open="0" top="0" tabpos="0">
+ <Cursor position="1484" topLine="52" />
+ </File>
+ <File name="..\..\sound\mods\module.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="114" />
+ </File>
+ <File name="..\..\sound\mods\module.h" open="0" top="0" tabpos="0">
+ <Cursor position="0" topLine="29" />
</File>
<File name="..\..\sound\mods\paula.cpp" open="0" top="0" tabpos="9">
- <Cursor position="1084" topLine="4" />
+ <Cursor position="3086" topLine="115" />
</File>
<File name="..\..\sound\mods\paula.h" open="0" top="0" tabpos="8">
- <Cursor position="2346" topLine="39" />
+ <Cursor position="1360" topLine="37" />
+ </File>
+ <File name="..\..\sound\mods\protracker.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="11471" topLine="410" />
+ </File>
+ <File name="..\..\sound\mods\protracker.h" open="0" top="0" tabpos="0">
+ <Cursor position="1136" topLine="0" />
+ </File>
+ <File name="..\..\sound\mods\rjp1.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="6647" topLine="201" />
+ </File>
+ <File name="..\..\sound\mp3.cpp" open="0" top="0" tabpos="0">
+ <Cursor position="3255" topLine="69" />
</File>
<File name="..\..\sound\mp3.h" open="0" top="0" tabpos="0">
<Cursor position="0" topLine="4" />
@@ -232,6 +316,9 @@
<File name="..\..\sound\rate.cpp" open="0" top="0" tabpos="0">
<Cursor position="5797" topLine="175" />
</File>
+ <File name="..\..\sound\softsynth\mt32\freeverb.h" open="0" top="0" tabpos="0">
+ <Cursor position="4321" topLine="133" />
+ </File>
<File name="..\..\sound\softsynth\mt32\mt32_file.cpp" open="0" top="0" tabpos="0">
<Cursor position="1218" topLine="15" />
</File>
@@ -245,7 +332,7 @@
<Cursor position="0" topLine="4" />
</File>
<File name="..\..\sound\wave.cpp" open="0" top="0" tabpos="0">
- <Cursor position="1130" topLine="0" />
+ <Cursor position="4722" topLine="86" />
</File>
<File name="..\..\sound\wave.h" open="0" top="0" tabpos="0">
<Cursor position="1159" topLine="6" />
diff --git a/dists/codeblocks/scummvm.workspace b/dists/codeblocks/scummvm.workspace
index 755f22dd30..1e42c9f4c9 100644
--- a/dists/codeblocks/scummvm.workspace
+++ b/dists/codeblocks/scummvm.workspace
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="ScummVM">
- <Project filename="scummvm.cbp">
+ <Project filename="scummvm.cbp" active="1">
<Depends filename="parallaction.cbp" />
</Project>
- <Project filename="parallaction.cbp" active="1" />
+ <Project filename="parallaction.cbp" />
</Workspace>
</CodeBlocks_workspace_file>
diff --git a/engines/parallaction/callables.cpp b/engines/parallaction/callables.cpp
index 1946737488..1c81534ed6 100644
--- a/engines/parallaction/callables.cpp
+++ b/engines/parallaction/callables.cpp
@@ -449,7 +449,10 @@ void _c_testResult(void *parm) {
}
void _c_offSound(void*) {
- // TODO: to be implemented
+ _vm->_soundMan->stopSfx(0);
+ _vm->_soundMan->stopSfx(1);
+ _vm->_soundMan->stopSfx(2);
+ _vm->_soundMan->stopSfx(3);
}
void _c_startMusic(void*) {
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index cbedb17e85..d1f237773a 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -22,101 +22,19 @@
#include "common/stdafx.h"
+#include "graphics/iff.h"
+
#include "parallaction/defs.h"
#include "parallaction/graphics.h"
#include "parallaction/parallaction.h"
#include "parallaction/disk.h"
#include "parallaction/walk.h"
-#include "graphics/ilbm.h"
-
-namespace Parallaction {
-
-class RLEStream : public Common::ReadStream {
-
- Common::ReadStream *_input;
-
- byte _rembuf[257];
- int32 _wpos;
- int32 _rpos;
-
- int32 _toBeRead;
- byte* _dst;
- int32 _read;
-
- void store(byte b) {
- if (_toBeRead > 0) {
- *_dst++ = b;
- _read++;
- _wpos = 0;
- _rpos = 0;
- } else {
- assert(_wpos < 257);
- _rembuf[_wpos++] = b;
- _rpos = 0;
- }
-
- _toBeRead--;
- }
-
- void feed() {
- int32 len = MIN(_wpos - _rpos, _toBeRead);
- if (len == 0) return;
-
- memcpy(_dst, _rembuf + _rpos, len);
-
- _rpos += len;
- _read += len;
- _toBeRead -= len;
- }
-
- void unpack() {
- byte byteRun;
- byte idx;
-
- uint32 i, j;
-
- while (_toBeRead > 0 && !_input->eos()) {
- byteRun = _input->readByte();
- if (byteRun <= 127) {
- i = byteRun + 1;
- for (j = 0; j < i; j++) {
- idx = _input->readByte();
- store(idx);
- }
- } else if (byteRun != 128) {
- i = (256 - byteRun) + 1;
- idx = _input->readByte();
- for (j = 0; j < i; j++) {
- store(idx);
- }
- }
- }
-
- }
-
-public:
- RLEStream(Common::ReadStream *input) : _input(input), _wpos(0), _rpos(0) {
- }
-
- ~RLEStream() {
- }
-
- bool eos() const {
- return _input->eos() & (_rpos == _wpos);
- }
-
- uint32 read(void *dataPtr, uint32 dataSize) {
- _toBeRead = (int32)dataSize;
- _dst = (byte*)dataPtr;
- _read = 0;
- feed();
- unpack();
- return _read;
- }
-
-};
+namespace Audio {
+ AudioStream *make8SVXStream(Common::ReadStream &input);
+}
+namespace Parallaction {
/*
This stream class is just a wrapper around Archive, so
@@ -290,7 +208,7 @@ Cnv* DosDisk::loadCnv(const char *filename) {
uint32 decsize = numFrames * width * height;
byte *data = (byte*)malloc(decsize);
- RLEStream decoder(&_resArchive);
+ Graphics::PackBitsReadStream decoder(_resArchive);
decoder.read(data, decsize);
return new Cnv(numFrames, width, height, data);
@@ -416,7 +334,7 @@ StaticCnv* DosDisk::loadStatic(const char* name) {
uint16 size = cnv->_width*cnv->_height;
cnv->_data0 = (byte*)malloc(size);
- RLEStream decoder(&_resArchive);
+ Graphics::PackBitsReadStream decoder(_resArchive);
decoder.read(cnv->_data0, size);
return cnv;
@@ -489,7 +407,7 @@ void DosDisk::loadBackground(const char *filename) {
byte *path = (byte*)calloc(1, SCREENPATH_WIDTH*SCREEN_HEIGHT);
- RLEStream stream(&_resArchive);
+ Graphics::PackBitsReadStream stream(_resArchive);
unpackBackground(&stream, bg, mask, path);
_vm->_gfx->setBackground(bg);
@@ -580,6 +498,16 @@ Common::ReadStream* DosDisk::loadMusic(const char* name) {
return stream;
}
+
+Common::ReadStream* DosDisk::loadSound(const char* name) {
+ return NULL;
+}
+
+
+
+
+
+
#pragma mark -
@@ -746,7 +674,6 @@ public:
-
AmigaDisk::AmigaDisk(Parallaction *vm) : Disk(vm) {
}
@@ -1020,18 +947,42 @@ class BackgroundDecoder : public Graphics::ILBMDecoder {
uint32 _i;
protected:
- void readCRNG() {
- _range[_i]._timer = _chunk.readUint16();
- _range[_i]._step = _chunk.readUint16();
- _range[_i]._flags = _chunk.readUint16();
- _range[_i]._first = _chunk.readByte();
- _range[_i]._last = _chunk.readByte();
+ void readCRNG(Common::IFFChunk &chunk) {
+ _range[_i]._timer = chunk.readUint16BE();
+ _range[_i]._step = chunk.readUint16BE();
+ _range[_i]._flags = chunk.readUint16BE();
+ _range[_i]._first = chunk.readByte();
+ _range[_i]._last = chunk.readByte();
_i++;
}
public:
- BackgroundDecoder(Common::ReadStream &input, PaletteFxRange *range) : ILBMDecoder(input), _range(range), _i(0) {
+ BackgroundDecoder(Common::ReadStream &input, Graphics::Surface &surface, byte *&colors, PaletteFxRange *range) :
+ Graphics::ILBMDecoder(input, surface, colors), _range(range), _i(0) {
+ }
+
+ void decode() {
+ Common::IFFChunk *chunk;
+ while ((chunk = nextChunk()) != 0) {
+ switch (chunk->id) {
+ case ID_BMHD:
+ readBMHD(*chunk);
+ break;
+
+ case ID_CMAP:
+ readCMAP(*chunk);
+ break;
+
+ case ID_BODY:
+ readBODY(*chunk);
+ break;
+
+ case ID_CRNG:
+ readCRNG(*chunk);
+ break;
+ }
+ }
}
uint32 getNumRanges() {
@@ -1043,12 +994,12 @@ public:
void AmigaDisk::loadBackground(const char *name) {
Common::SeekableReadStream *s = openArchivedFile(name, true);
- BackgroundDecoder decoder(*s, _vm->_gfx->_palettefx);
Graphics::Surface surf;
byte *pal;
+ BackgroundDecoder decoder(*s, surf, pal, _vm->_gfx->_palettefx);
+ decoder.decode();
- decoder.decode(surf, pal);
for (uint32 i = 0; i < BASE_PALETTE_COLORS * 3; i++)
_vm->_gfx->_palette[i] = pal[i] >> 2;
free(pal);
@@ -1082,7 +1033,7 @@ void AmigaDisk::loadMask(const char *name) {
s->seek(0x126, SEEK_SET); // HACK: skipping IFF/ILBM header should be done by analysis, not magic
- RLEStream stream(s);
+ Graphics::PackBitsReadStream stream(*s);
byte *buf = (byte*)malloc(SCREENMASK_WIDTH*SCREEN_HEIGHT);
stream.read(buf, SCREENMASK_WIDTH*SCREEN_HEIGHT);
@@ -1106,7 +1057,7 @@ void AmigaDisk::loadPath(const char *name) {
s->seek(0x120, SEEK_SET); // HACK: skipping IFF/ILBM header should be done by analysis, not magic
- RLEStream stream(s);
+ Graphics::PackBitsReadStream stream(*s);
byte *buf = (byte*)malloc(SCREENPATH_WIDTH*SCREEN_HEIGHT);
stream.read(buf, SCREENPATH_WIDTH*SCREEN_HEIGHT);
setPath(buf);
@@ -1171,5 +1122,14 @@ Common::ReadStream* AmigaDisk::loadMusic(const char* name) {
return openArchivedFile(name);
}
+Common::ReadStream* AmigaDisk::loadSound(const char* name) {
+ char path[PATH_LEN];
+ sprintf(path, "%s.snd", name);
+
+ openArchivedFile(path);
+
+ return new DummyArchiveStream(_resArchive);
+}
+
} // namespace Parallaction
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index ea3ad6523f..14c671b02b 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -26,6 +26,10 @@
#include "parallaction/defs.h"
#include "common/file.h"
+namespace Audio {
+ class AudioStream;
+}
+
namespace Parallaction {
//------------------------------------------------------
@@ -112,6 +116,7 @@ public:
virtual void loadScenery(const char* background, const char* mask) = 0;
virtual Table* loadTable(const char* name) = 0;
virtual Common::ReadStream* loadMusic(const char* name) = 0;
+ virtual Common::ReadStream* loadSound(const char* name) = 0;
};
class DosDisk : public Disk {
@@ -147,6 +152,7 @@ public:
void loadScenery(const char* background, const char* mask);
Table* loadTable(const char* name);
Common::ReadStream* loadMusic(const char* name);
+ Common::ReadStream* loadSound(const char* name);
};
class AmigaDisk : public Disk {
@@ -178,6 +184,7 @@ public:
void loadScenery(const char* background, const char* mask);
Table* loadTable(const char* name);
Common::ReadStream* loadMusic(const char* name);
+ Common::ReadStream* loadSound(const char* name);
};
} // namespace Parallaction
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index c0c2d8cad5..3c76021097 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -154,6 +154,10 @@ void Parallaction::parseLocation(const char *filename) {
if (getPlatform() == Common::kPlatformAmiga)
_soundMan->setMusicFile(_tokens[1]);
}
+ if (!scumm_stricmp(_tokens[0], "SOUND")) {
+// if (getPlatform() == Common::kPlatformAmiga)
+// _soundMan->loadSfx(_tokens[1], atoi(_tokens[2]));
+ }
fillBuffers(*_locationScript, true);
}
@@ -181,6 +185,11 @@ void Parallaction::resolveLocationForwards() {
void Parallaction::freeLocation() {
debugC(7, kDebugLocation, "freeLocation");
+ _soundMan->stopSfx(0);
+ _soundMan->stopSfx(1);
+ _soundMan->stopSfx(2);
+ _soundMan->stopSfx(3);
+
if (_localFlagNames)
delete _localFlagNames;
_localFlagNames = new Table(120);
@@ -413,6 +422,8 @@ void Parallaction::changeLocation(char *location) {
debugC(1, kDebugLocation, "changeLocation: location acommands run");
}
+// _soundMan->playSfx(0);
+
debugC(1, kDebugLocation, "changeLocation completed");
return;
diff --git a/engines/parallaction/music.cpp b/engines/parallaction/music.cpp
index e637e84569..8398bd7729 100644
--- a/engines/parallaction/music.cpp
+++ b/engines/parallaction/music.cpp
@@ -307,6 +307,53 @@ AmigaSoundMan::~AmigaSoundMan() {
stopMusic();
}
+void AmigaSoundMan::playSfx(const char *filename, uint channel, bool looping, int volume, int rate) {
+ if (channel < 0 || channel >= NUM_AMIGA_CHANNELS) {
+ warning("unknown sfx channel");
+ return;
+ }
+
+ Channel *ch = &_channels[channel];
+ Common::ReadStream *stream = _vm->_disk->loadSound(filename);
+ Audio::A8SVXDecoder decoder(*stream, ch->header, ch->data, ch->dataSize);
+ decoder.decode();
+ delete stream;
+
+ uint32 loopStart, loopEnd, flags;
+ if (looping) {
+ // the standard way to loop 8SVX audio implies use of the oneShotHiSamples and
+ // repeatHiSamples fields, but Nippon Safes handles loops according to flags
+ // set in its location scripts and always operates on the whole data.
+ loopStart = 0;
+ loopEnd = ch->header.oneShotHiSamples + ch->header.repeatHiSamples;
+ flags = Audio::Mixer::FLAG_LOOP;
+ } else {
+ loopStart = loopEnd = 0;
+ flags = 0;
+ }
+
+ if (volume == -1) {
+ volume = ch->header.volume;
+ }
+
+ if (rate == -1) {
+ rate = ch->header.samplesPerSec;
+ }
+
+ _mixer->playRaw(Audio::Mixer::kSFXSoundType, &ch->handle, ch->data, ch->dataSize, rate, flags, -1, volume, 0, loopStart, loopEnd);
+}
+
+void AmigaSoundMan::stopSfx(uint channel) {
+ if (channel < 0 || channel >= NUM_AMIGA_CHANNELS) {
+ warning("unknown sfx channel");
+ return;
+ }
+
+ _mixer->stopHandle(_channels[channel].handle);
+ free(_channels[channel].data);
+ _channels[channel].data = 0;
+}
+
void AmigaSoundMan::playMusic() {
stopMusic();
@@ -314,7 +361,7 @@ void AmigaSoundMan::playMusic() {
_musicStream = Audio::makeProtrackerStream(stream);
delete stream;
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, 255, 0, false, true);
+ _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _musicStream, -1, 255, 0, false, false);
}
void AmigaSoundMan::stopMusic() {
diff --git a/engines/parallaction/music.h b/engines/parallaction/music.h
index bfb74fa38f..ae2f9c8716 100644
--- a/engines/parallaction/music.h
+++ b/engines/parallaction/music.h
@@ -27,6 +27,7 @@
#include "common/mutex.h"
#include "sound/audiostream.h"
+#include "sound/iff.h"
#include "sound/mixer.h"
#include "sound/mididrv.h"
@@ -50,14 +51,14 @@ public:
SoundMan(Parallaction *vm);
virtual ~SoundMan() {}
- void setMusicFile(const char *filename);
+ virtual void playSfx(const char *filename, uint channel, bool looping, int volume = -1, int rate = -1) { }
+ virtual void stopSfx(uint channel) { }
+ void setMusicFile(const char *filename);
virtual void playMusic() = 0;
virtual void stopMusic() = 0;
-
virtual void playCharacterMusic(const char *character) = 0;
virtual void playLocationMusic(const char *location) = 0;
-
void setMusicVolume(int value);
};
@@ -76,17 +77,30 @@ public:
void playLocationMusic(const char *location);
};
+#define NUM_AMIGA_CHANNELS 4
+
class AmigaSoundMan : public SoundMan {
Audio::AudioStream *_musicStream;
Audio::SoundHandle _musicHandle;
+ struct Channel {
+ Audio::Voice8Header header;
+ byte *data;
+ uint32 dataSize;
+ Audio::SoundHandle handle;
+ uint32 flags;
+ } _channels[NUM_AMIGA_CHANNELS];
+
public:
AmigaSoundMan(Parallaction *vm);
~AmigaSoundMan();
void playMusic();
void stopMusic();
+ void playSfx(const char *filename, uint channel, bool looping, int volume, int rate);
+ void stopSfx(uint channel);
+
void playCharacterMusic(const char *character);
void playLocationMusic(const char *location);
};
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp
index f3cb12f7ca..03ac70fe7d 100644
--- a/engines/parallaction/zone.cpp
+++ b/engines/parallaction/zone.cpp
@@ -26,6 +26,7 @@
#include "parallaction/graphics.h"
#include "parallaction/inventory.h"
#include "parallaction/zone.h"
+#include "parallaction/music.h"
namespace Parallaction {
@@ -271,6 +272,10 @@ void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
case kZoneHear: // hear Zone init
if (!scumm_stricmp(_tokens[0], "sound")) {
strcpy(u->hear->_name, _tokens[1]);
+ z->u.hear->_channel = atoi(_tokens[2]);
+ }
+ if (!scumm_stricmp(_tokens[0], "freq")) {
+ z->u.hear->_freq = atoi(_tokens[1]);
}
break;
@@ -400,7 +405,7 @@ uint16 Parallaction::runZone(Zone *z) {
break;
case kZoneHear:
- strcpy(_soundFile, z->u.hear->_name);
+ _soundMan->playSfx(z->u.hear->_name, z->u.hear->_channel, (z->_flags & kFlagsLooping) == kFlagsLooping, 60);
break;
case kZoneSpeak:
diff --git a/engines/parallaction/zone.h b/engines/parallaction/zone.h
index 559eedb0fe..707f24f7f2 100644
--- a/engines/parallaction/zone.h
+++ b/engines/parallaction/zone.h
@@ -147,8 +147,12 @@ struct DoorData { // size = 28
};
struct HearData { // size = 20
char _name[20];
+ int _channel;
+ int _freq;
HearData() {
+ _channel = -1;
+ _freq = -1;
_name[0] = '\0';
}
};
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index 8311308018..bbe6b92c2b 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -45,7 +45,7 @@
#include "saga/rscfile.h"
#include "saga/sagaresnames.h"
-#include "graphics/ilbm.h"
+#include "graphics/iff.h"
#include "common/util.h"
namespace Saga {
@@ -594,7 +594,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
Event event;
Event *q_event;
static PalEntry current_pal[PAL_ENTRIES];
-
+
if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) {
if (loadSceneParams->loadFlag != kLoadBySceneNumber) {
error("loadScene wrong usage");
@@ -680,7 +680,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
_vm->_resource->loadResource(_sceneContext, _resourceList[i].resourceId,
_resourceList[i].buffer, _resourceList[i].size);
-
+
if (_resourceList[i].size >= 6) {
if (!memcmp(_resourceList[i].buffer, "DUMMY!", 6)) {
_resourceList[i].invalid = true;
@@ -897,7 +897,7 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
void Scene::loadSceneDescriptor(uint32 resourceId) {
byte *sceneDescriptorData;
size_t sceneDescriptorDataLength;
-
+
memset(&_sceneDescription, 0, sizeof(_sceneDescription));
if (resourceId == 0) {
@@ -970,7 +970,7 @@ void Scene::processSceneResources() {
SAGAResourceTypes resType;
getResourceTypes(types, typesCount);
-
+
// Process the scene resource list
for (i = 0; i < _resourceListCount; i++) {
if (_resourceList[i].invalid) {
diff --git a/graphics/iff.cpp b/graphics/iff.cpp
new file mode 100644
index 0000000000..d4595a724c
--- /dev/null
+++ b/graphics/iff.cpp
@@ -0,0 +1,313 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ */
+
+
+#include "graphics/iff.h"
+#include "graphics/surface.h"
+
+
+namespace Common {
+
+// this really belongs to iff_container.cpp, but we don't want
+// to put only this in a source file
+char *ID2string(Common::IFF_ID id) {
+ static char str[] = "abcd";
+
+ str[0] = (char)(id >> 24 & 0xff);
+ str[1] = (char)(id >> 16 & 0xff);
+ str[2] = (char)(id >> 8 & 0xff);
+ str[3] = (char)(id >> 0 & 0xff);
+
+ return str;
+}
+
+}
+
+
+namespace Graphics {
+
+
+void fillBMHD(BMHD &bitmapHeader, Common::ReadStream &stream) {
+
+ bitmapHeader.width = stream.readUint16BE();
+ bitmapHeader.height = stream.readUint16BE();
+ bitmapHeader.x = stream.readUint16BE();
+ bitmapHeader.y = stream.readUint16BE();
+ bitmapHeader.depth = stream.readByte();
+ bitmapHeader.masking = stream.readByte();
+ bitmapHeader.pack = stream.readByte();
+ bitmapHeader.flags = stream.readByte();
+ bitmapHeader.transparentColor = stream.readUint16BE();
+ bitmapHeader.xAspect = stream.readByte();
+ bitmapHeader.yAspect = stream.readByte();
+ bitmapHeader.pageWidth = stream.readUint16BE();
+ bitmapHeader.pageHeight = stream.readUint16BE();
+
+}
+
+
+ILBMDecoder::ILBMDecoder(Common::ReadStream &input, Surface &surface, byte *&colors) : IFFParser(input), _surface(&surface), _colors(&colors) {
+ if (_typeId != ID_ILBM)
+ error("unsupported IFF subtype '%s'", Common::ID2string(_typeId));
+}
+
+void ILBMDecoder::decode() {
+
+ Common::IFFChunk *chunk;
+ while ((chunk = nextChunk()) != 0) {
+ switch (chunk->id) {
+ case ID_BMHD:
+ readBMHD(*chunk);
+ break;
+
+ case ID_CMAP:
+ readCMAP(*chunk);
+ break;
+
+ case ID_BODY:
+ readBODY(*chunk);
+ break;
+ }
+ }
+
+ return;
+}
+
+void ILBMDecoder::readBMHD(Common::IFFChunk &chunk) {
+
+ fillBMHD(_bitmapHeader, chunk);
+
+ _colorCount = 1 << _bitmapHeader.depth;
+ *_colors = (byte*)malloc(sizeof(**_colors) * _colorCount * 3);
+ _surface->create(_bitmapHeader.width, _bitmapHeader.height, 1);
+
+}
+
+void ILBMDecoder::readCMAP(Common::IFFChunk &chunk) {
+ if (*_colors == NULL) {
+ error("wrong input chunk sequence");
+ }
+ for (uint32 i = 0; i < _colorCount; i++) {
+ (*_colors)[i * 3 + 0] = chunk.readByte();
+ (*_colors)[i * 3 + 1] = chunk.readByte();
+ (*_colors)[i * 3 + 2] = chunk.readByte();
+ }
+}
+
+void ILBMDecoder::readBODY(Common::IFFChunk& chunk) {
+
+ switch (_bitmapHeader.pack) {
+ case 0:
+ error("unpacked ILBM files are not supported");
+ break;
+
+ case 1: {
+ uint32 scanWidth = _bitmapHeader.width >> 3;
+ byte *scan = (byte*)malloc(scanWidth);
+ byte *out = (byte*)_surface->pixels;
+
+ PackBitsReadStream stream(chunk);
+
+ for (uint32 i = 0; i < _bitmapHeader.height; i++) {
+
+ for (uint32 j = 0; j < _bitmapHeader.depth; j++) {
+ stream.read(scan, scanWidth);
+ fillPlane(out, scan, scanWidth, j);
+ }
+
+ out += _bitmapHeader.width;
+ }
+ break;
+ }
+
+ }
+}
+
+void ILBMDecoder::fillPlane(byte *out, byte* buf, uint32 width, uint32 plane) {
+
+ byte src, idx, set;
+ byte mask = 1 << plane;
+
+ for (uint32 j = 0; j < _bitmapHeader.width; j++) {
+ src = buf[j >> 3];
+ idx = 7 - (j & 7);
+ set = src & (1 << idx);
+
+ if (set)
+ out[j] |= mask;
+ }
+
+}
+
+
+
+
+PBMDecoder::PBMDecoder(Common::ReadStream &input, Surface &surface, byte *&colors) : IFFParser(input), _surface(&surface), _colors(&colors) {
+ if (_typeId != ID_PBM)
+ error("unsupported IFF subtype '%s'", Common::ID2string(_typeId));
+}
+
+void PBMDecoder::decode() {
+
+ Common::IFFChunk *chunk;
+ while ((chunk = nextChunk()) != 0) {
+ switch (chunk->id) {
+ case ID_BMHD:
+ readBMHD(*chunk);
+ break;
+
+ case ID_CMAP:
+ readCMAP(*chunk);
+ break;
+
+ case ID_BODY:
+ readBODY(*chunk);
+ break;
+ }
+ }
+
+ return;
+}
+
+void PBMDecoder::readBMHD(Common::IFFChunk &chunk) {
+
+ fillBMHD(_bitmapHeader, chunk);
+
+ _colorCount = 1 << _bitmapHeader.depth;
+ *_colors = (byte*)malloc(sizeof(**_colors) * _colorCount * 3);
+ _surface->create(_bitmapHeader.width, _bitmapHeader.height, 1);
+
+}
+
+void PBMDecoder::readCMAP(Common::IFFChunk &chunk) {
+ if (*_colors == NULL) {
+ error("wrong input chunk sequence");
+ }
+ for (uint32 i = 0; i < _colorCount; i++) {
+ (*_colors)[i * 3 + 0] = chunk.readByte();
+ (*_colors)[i * 3 + 1] = chunk.readByte();
+ (*_colors)[i * 3 + 2] = chunk.readByte();
+ }
+}
+
+void PBMDecoder::readBODY(Common::IFFChunk& chunk) {
+
+ uint si = 0;
+
+ switch (_bitmapHeader.pack) {
+ case 0:
+ while (!chunk.eos()) {
+ ((byte*)_surface->pixels)[si++] = chunk.readByte();
+ }
+ break;
+
+ case 1: {
+ PackBitsReadStream stream(chunk);
+ stream.read((byte*)_surface->pixels, _surface->w * _surface->h);
+ break;
+ }
+
+ }
+}
+
+
+
+
+
+
+PackBitsReadStream::PackBitsReadStream(Common::ReadStream &input) : _input(&input), _wStoragePos(_storage), _rStoragePos(_storage) {
+}
+
+PackBitsReadStream::~PackBitsReadStream() {
+}
+
+bool PackBitsReadStream::eos() const {
+ return _input->eos() & (_rStoragePos == _wStoragePos);
+}
+
+uint32 PackBitsReadStream::read(void *dataPtr, uint32 dataSize) {
+ _outSize = (int32)dataSize;
+ _out = (byte*)dataPtr;
+
+ feed();
+ unpack();
+ return _fed + _unpacked;
+}
+
+void PackBitsReadStream::store(byte b) {
+ if (_outSize > 0) {
+ *_out++ = b;
+ _unpacked++;
+ _wStoragePos = _storage;
+ } else {
+ assert(_wStoragePos < _storage + 257);
+ *_wStoragePos++ = b;
+ }
+
+ _rStoragePos = _storage;
+ _outSize--;
+}
+
+void PackBitsReadStream::feed() {
+ _fed = 0;
+
+ int len = MIN(_wStoragePos - _rStoragePos, _outSize);
+ if (len == 0) return;
+
+ for (int i = 0; i < len; i++)
+ *_out++ = *_rStoragePos++;
+
+ _fed = len;
+ _outSize -= len;
+}
+
+void PackBitsReadStream::unpack() {
+ byte byteRun;
+ byte idx;
+
+ uint32 i, j;
+ _unpacked = 0;
+
+ while (_outSize > 0 && !_input->eos()) {
+ byteRun = _input->readByte();
+ if (byteRun <= 127) {
+ i = byteRun + 1;
+ for (j = 0; j < i; j++) {
+ idx = _input->readByte();
+ store(idx);
+ }
+ } else if (byteRun != 128) {
+ i = (256 - byteRun) + 1;
+ idx = _input->readByte();
+ for (j = 0; j < i; j++) {
+ store(idx);
+ }
+ }
+ }
+}
+
+
+void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
+ PBMDecoder decoder(input, surface, colors);
+ decoder.decode();
+}
+
+}
diff --git a/graphics/iff.h b/graphics/iff.h
new file mode 100644
index 0000000000..d716418f8f
--- /dev/null
+++ b/graphics/iff.h
@@ -0,0 +1,139 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ */
+
+
+#ifndef GRAPHICS_IFF_H
+#define GRAPHICS_IFF_H
+
+#include "common/iff_container.h"
+
+namespace Graphics {
+
+class Surface;
+
+
+struct BMHD {
+ uint16 width, height;
+ uint16 x, y;
+ byte depth;
+ byte masking;
+ byte pack;
+ byte flags;
+ uint16 transparentColor;
+ byte xAspect, yAspect;
+ uint16 pageWidth, pageHeight;
+
+ BMHD() {
+ memset(this, 0, sizeof(*this));
+ }
+};
+
+
+// handles ILBM subtype of IFF FORM files
+//
+class ILBMDecoder : public Common::IFFParser {
+
+protected:
+ void readBMHD(Common::IFFChunk &chunk);
+ void readCMAP(Common::IFFChunk &chunk);
+ void readBODY(Common::IFFChunk &chunk);
+
+ BMHD _bitmapHeader;
+ uint32 _colorCount;
+
+ Surface *_surface;
+ byte **_colors;
+
+ void fillPlane(byte *out, byte* buf, uint32 width, uint32 plane);
+
+public:
+ ILBMDecoder(Common::ReadStream &input, Surface &surface, byte *&colors);
+ virtual ~ILBMDecoder() { }
+ void decode();
+};
+
+
+// handles PBM subtype of IFF FORM files
+//
+class PBMDecoder : public Common::IFFParser {
+
+protected:
+ void readBMHD(Common::IFFChunk &chunk);
+ void readCMAP(Common::IFFChunk &chunk);
+ void readBODY(Common::IFFChunk &chunk);
+
+ BMHD _bitmapHeader;
+ uint32 _colorCount;
+
+ Surface *_surface;
+ byte **_colors;
+
+public:
+ PBMDecoder(Common::ReadStream &input, Surface &surface, byte *&colors);
+ virtual ~PBMDecoder() { }
+ void decode();
+};
+
+/*
+ TODO: rename this routine to decodePBM, and update the SAGA code that's
+ using it. The routine has already been implemented using the above PBMDecoder.
+*/
+void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors);
+
+
+/*
+ PackBits is a RLE compression algorithm introduced
+ by Apple. It is also used to encode ILBM and PBM
+ subtypes of IFF files, and some flavours of TIFF.
+
+ The following implementation uses a static storage
+ and is buffered, that means you can't destroy the
+ input stream before you are done with it.
+*/
+class PackBitsReadStream : public Common::ReadStream {
+
+protected:
+ Common::ReadStream *_input;
+
+ byte _storage[257];
+ byte *_wStoragePos;
+ byte *_rStoragePos;
+
+ int32 _outSize;
+ byte* _out;
+ int32 _fed;
+ int32 _unpacked;
+
+ void store(byte b);
+ void feed();
+ void unpack();
+
+public:
+ PackBitsReadStream(Common::ReadStream &input);
+ ~PackBitsReadStream();
+
+ virtual bool eos() const;
+ uint32 read(void *dataPtr, uint32 dataSize);
+};
+
+}
+
+#endif
diff --git a/graphics/ilbm.cpp b/graphics/ilbm.cpp
deleted file mode 100644
index c237dd0f92..0000000000
--- a/graphics/ilbm.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2005-2006 The ScummVM project
- *
- * 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.
- *
- * $URL$
- * $Id$
- */
-
-#include "common/stdafx.h"
-#include "common/endian.h"
-#include "common/stream.h"
-#include "graphics/surface.h"
-#include "graphics/ilbm.h"
-
-namespace Graphics {
-
-static char * ID2string(IFF_ID id) {
- static char str[] = "abcd";
-
- str[0] = (char)(id >> 24 & 0xff);
- str[1] = (char)(id >> 16 & 0xff);
- str[2] = (char)(id >> 8 & 0xff);
- str[3] = (char)(id >> 0 & 0xff);
-
- return str;
-}
-
-#define ID_FORM MKID_BE('FORM')
-/* EA IFF 85 group identifier */
-#define ID_CAT MKID_BE('CAT ')
-/* EA IFF 85 group identifier */
-#define ID_LIST MKID_BE('LIST')
-/* EA IFF 85 group identifier */
-#define ID_PROP MKID_BE('PROP')
-/* EA IFF 85 group identifier */
-#define ID_END MKID_BE('END ')
-/* unofficial END-of-FORM identifier (see Amiga RKM Devices Ed.3
-page 376) */
-#define ID_ILBM MKID_BE('ILBM')
-/* EA IFF 85 raster bitmap form */
-#define ID_DEEP MKID_BE('DEEP')
-/* Chunky pixel image files (Used in TV Paint) */
-#define ID_RGB8 MKID_BE('RGB8')
-/* RGB image forms, Turbo Silver (Impulse) */
-#define ID_RGBN MKID_BE('RGBN')
-/* RGB image forms, Turbo Silver (Impulse) */
-#define ID_PBM MKID_BE('PBM ')
-/* 256-color chunky format (DPaint 2 ?) */
-#define ID_ACBM MKID_BE('ACBM')
-/* Amiga Contiguous Bitmap (AmigaBasic) */
-
-/* generic */
-
-#define ID_FVER MKID_BE('FVER')
-/* AmigaOS version string */
-#define ID_JUNK MKID_BE('JUNK')
-/* always ignore this chunk */
-#define ID_ANNO MKID_BE('ANNO')
-/* EA IFF 85 Generic Annotation chunk */
-#define ID_AUTH MKID_BE('AUTH')
-/* EA IFF 85 Generic Author chunk */
-#define ID_CHRS MKID_BE('CHRS')
-/* EA IFF 85 Generic character string chunk */
-#define ID_NAME MKID_BE('NAME')
-/* EA IFF 85 Generic Name of art, music, etc. chunk */
-#define ID_TEXT MKID_BE('TEXT')
-/* EA IFF 85 Generic unformatted ASCII text chunk */
-#define ID_copy MKID_BE('(c) ')
-/* EA IFF 85 Generic Copyright text chunk */
-
-/* ILBM chunks */
-
-#define ID_BMHD MKID_BE('BMHD')
-/* ILBM BitmapHeader */
-#define ID_CMAP MKID_BE('CMAP')
-/* ILBM 8bit RGB colormap */
-#define ID_GRAB MKID_BE('GRAB')
-/* ILBM "hotspot" coordiantes */
-#define ID_DEST MKID_BE('DEST')
-/* ILBM destination image info */
-#define ID_SPRT MKID_BE('SPRT')
-/* ILBM sprite identifier */
-#define ID_CAMG MKID_BE('CAMG')
-/* Amiga viewportmodes */
-#define ID_BODY MKID_BE('BODY')
-/* ILBM image data */
-#define ID_CRNG MKID_BE('CRNG')
-/* color cycling */
-#define ID_CCRT MKID_BE('CCRT')
-/* color cycling */
-#define ID_CLUT MKID_BE('CLUT')
-/* Color Lookup Table chunk */
-#define ID_DPI MKID_BE('DPI ')
-/* Dots per inch chunk */
-#define ID_DPPV MKID_BE('DPPV')
-/* DPaint perspective chunk (EA) */
-#define ID_DRNG MKID_BE('DRNG')
-/* DPaint IV enhanced color cycle chunk (EA) */
-#define ID_EPSF MKID_BE('EPSF')
-/* Encapsulated Postscript chunk */
-#define ID_CMYK MKID_BE('CMYK')
-/* Cyan, Magenta, Yellow, & Black color map (Soft-Logik) */
-#define ID_CNAM MKID_BE('CNAM')
-/* Color naming chunk (Soft-Logik) */
-#define ID_PCHG MKID_BE('PCHG')
-/* Line by line palette control information (Sebastiano Vigna) */
-#define ID_PRVW MKID_BE('PRVW')
-/* A mini duplicate ILBM used for preview (Gary Bonham) */
-#define ID_XBMI MKID_BE('XBMI')
-/* eXtended BitMap Information (Soft-Logik) */
-#define ID_CTBL MKID_BE('CTBL')
-/* Newtek Dynamic Ham color chunk */
-#define ID_DYCP MKID_BE('DYCP')
-/* Newtek Dynamic Ham chunk */
-#define ID_SHAM MKID_BE('SHAM')
-/* Sliced HAM color chunk */
-#define ID_ABIT MKID_BE('ABIT')
-/* ACBM body chunk */
-#define ID_DCOL MKID_BE('DCOL')
-/* unofficial direct color */
-#define ID_DPPS MKID_BE('DPPS')
-/* ? */
-#define ID_TINY MKID_BE('TINY')
-/* ? */
-#define ID_DPPV MKID_BE('DPPV')
-/* ? */
-
-void IFFDecoder::readBMHD() {
-
- _bitmapHeader.width = _chunk.readUint16();
- _bitmapHeader.height = _chunk.readUint16();
- _bitmapHeader.x = _chunk.readUint16();
- _bitmapHeader.y = _chunk.readUint16();
-
- _bitmapHeader.depth = _chunk.readByte();
- _bitmapHeader.masking = _chunk.readByte();
- _bitmapHeader.pack = _chunk.readByte();
- _bitmapHeader.flags = _chunk.readByte();
- _bitmapHeader.transparentColor = _chunk.readUint16();
- _bitmapHeader.xAspect = _chunk.readByte();
- _bitmapHeader.yAspect = _chunk.readByte();
- _bitmapHeader.pageWidth = _chunk.readUint16();
- _bitmapHeader.pageHeight = _chunk.readUint16();
-
-
- _colorCount = 1 << _bitmapHeader.depth;
- *_colors = (byte*)malloc(sizeof(**_colors) * _colorCount * 3);
- _surface->create(_bitmapHeader.width, _bitmapHeader.height, 1);
-
-}
-
-void IFFDecoder::readCRNG() {
-}
-
-void IFFDecoder::readCMAP() {
- if (*_colors == NULL) {
- error("wrong input chunk sequence");
- }
- for (uint32 i = 0; i < _colorCount; i++) {
- (*_colors)[i * 3 + 0] = _chunk.readByte();
- (*_colors)[i * 3 + 1] = _chunk.readByte();
- (*_colors)[i * 3 + 2] = _chunk.readByte();
- }
-}
-
-IFFDecoder::IFFDecoder(Common::ReadStream &input) : _formChunk(&input), _chunk(&input), _colorCount(0) {
- _formChunk.readHeader();
- if (_formChunk.id != ID_FORM) {
- error("IFFDecoder input is not a FORM type IFF file");
- }
-}
-
-void IFFDecoder::decode(Surface &surface, byte *&colors) {
- _surface = &surface;
- _colors = &colors;
- *_colors = 0;
-
- if (!isTypeSupported(_formChunk.readUint32())) {
- error( "IFFDecoder input is not a valid subtype");
- }
-
- while (!_formChunk.eos()) {
- _formChunk.incBytesRead(8);
- _chunk.readHeader();
-
- switch (_chunk.id) {
- case ID_BMHD:
- readBMHD();
- break;
-
- case ID_CMAP:
- readCMAP();
- break;
-
- case ID_BODY:
- readBODY();
- break;
-
- case ID_CRNG:
- readCRNG();
- break;
-
- case ID_GRAB: case ID_TINY: case ID_DPPS: case ID_DPPV: case ID_CAMG:
- break;
-
- default:
- error("unknown chunk : %s\n", ID2string(_chunk.id));
- }
-
- _chunk.feed();
- _formChunk.incBytesRead(_chunk.size);
- }
-}
-
-bool PBMDecoder::isTypeSupported(IFF_ID type) {
- return type == ID_PBM;
-}
-
-void PBMDecoder::readBODY() {
- byte byteRun;
- byte idx;
- uint32 si = 0, i, j;
-
- if (_bitmapHeader.depth > 8) {
- error("PBMDecoder depth > 8");
- }
-
- if ((_bitmapHeader.pack != 0) && (_bitmapHeader.pack != 1)) {
- error("PBMDecoder unsupported pack");
- }
-
- switch (_bitmapHeader.pack) {
- case 0:
- while (!_chunk.eos()) {
- idx = _chunk.readByte();
- ((byte*)_surface->pixels)[si++] = idx;
- }
- break;
- case 1:
- while (!_chunk.eos()) {
- byteRun = _chunk.readByte();
- if (byteRun <= 127) {
- i = byteRun + 1;
- for (j = 0; j < i; j++){
- idx = _chunk.readByte();
- ((byte*)_surface->pixels)[si++] = idx;
- }
- } else if (byteRun != 128) {
- i = (256 - byteRun) + 1;
- idx = _chunk.readByte();
- for (j = 0; j < i; j++) {
- ((byte*)_surface->pixels)[si++] = idx;
- }
- }
- }
- break;
- }
-
-}
-
-
-bool ILBMDecoder::isTypeSupported(IFF_ID type) {
- return type == ID_ILBM;
-}
-
-void ILBMDecoder::expandLine(byte *buf, uint32 width) {
-
- byte byteRun;
- byte idx;
-
- uint32 si = 0, i, j;
-
- while (si != width) {
- byteRun = _chunk.readByte();
- if (byteRun <= 127) {
- i = byteRun + 1;
- for (j = 0; j < i; j++){
- idx = _chunk.readByte();
- buf[si++] = idx;
- }
- } else if (byteRun != 128) {
- i = (256 - byteRun) + 1;
- idx = _chunk.readByte();
- for (j = 0; j < i; j++) {
- buf[si++] = idx;
- }
- }
- }
-
-}
-
-void ILBMDecoder::fillPlane(byte *out, byte* buf, uint32 width, uint32 plane) {
-
- byte src, idx, set;
- byte mask = 1 << plane;
-
- for (uint32 j = 0; j < _bitmapHeader.width; j++) {
- src = buf[j >> 3];
- idx = 7 - (j & 7);
- set = src & (1 << idx);
-
- if (set)
- out[j] |= mask;
- }
-
-}
-
-void ILBMDecoder::readBODY() {
-
- if (_bitmapHeader.depth > 8) {
- error("ILBMDecoder depth > 8");
- }
-
- if (_bitmapHeader.pack != 1) {
- error("ILBMDecoder unsupported pack");
- }
-
- if (_bitmapHeader.masking == 1) {
- error("ILBMDecoder mask not supported");
- }
-
- uint32 scanWidth = _bitmapHeader.width >> 3;
- byte *scan = (byte*)malloc(scanWidth);
- byte *out = (byte*)_surface->pixels;
-
- switch (_bitmapHeader.pack) {
-// case 0:
-// while (!_chunk.eos()) {
-// idx = _chunk.readByte();
-// ((byte*)_surface->pixels)[si++] = idx;
-// }
-// break;
- case 1:
- for (uint32 line = 0; line < _bitmapHeader.height; line++) {
-
- for (uint32 plane = 0; plane < _bitmapHeader.depth; plane++) {
- expandLine(scan, scanWidth);
- fillPlane(out, scan, scanWidth, plane);
- }
-
- out += _bitmapHeader.width;
- }
- break;
- }
-
- free(scan);
-
-}
-
-void ILBMDecoder::readCRNG() {
- // TODO: implement this. May require changing decode(), too, or adding
- // another parameter to ILBMDecoder constructor
-}
-
-ILBMDecoder::ILBMDecoder(Common::ReadStream &input) : IFFDecoder(input) {
-
-}
-
-ILBMDecoder::~ILBMDecoder() {
-
-}
-
-
-
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
- IFF_ID typeId;
- BMHD bitmapHeader;
- Chunk formChunk(&input);
- Chunk chunk(&input);
- uint32 colorCount = 0, i, j, si;
- byte byteRun;
- byte idx;
- colors = 0;
- si = 0;
-
- formChunk.readHeader();
- if (formChunk.id != ID_FORM) {
- error("decodeILBM() input is not a FORM type IFF file");
- }
-
- typeId = formChunk.readUint32();
- if (typeId != ID_PBM) {
- error( "decodeILBM() input is not an PBM ");
- }
-
- while (!formChunk.eos()) {
- formChunk.incBytesRead(8);
- chunk.readHeader();
-
- switch (chunk.id) {
- case ID_BMHD:
- bitmapHeader.width = chunk.readUint16();
- bitmapHeader.height = chunk.readUint16();
- bitmapHeader.x = chunk.readUint16();
- bitmapHeader.y = chunk.readUint16();
-
- bitmapHeader.depth = chunk.readByte();
- if (bitmapHeader.depth > 8) {
- error("decodeILBM() depth > 8");
- }
- bitmapHeader.masking = chunk.readByte();
- bitmapHeader.pack = chunk.readByte();
- if ((bitmapHeader.pack != 0) && (bitmapHeader.pack != 1)) {
- error("decodeILBM() unsupported pack");
- }
- bitmapHeader.flags = chunk.readByte();
- bitmapHeader.transparentColor = chunk.readUint16();
- bitmapHeader.xAspect = chunk.readByte();
- bitmapHeader.yAspect = chunk.readByte();
- bitmapHeader.pageWidth = chunk.readUint16();
- bitmapHeader.pageHeight = chunk.readUint16();
-
-
- colorCount = 1 << bitmapHeader.depth;
- colors = (byte*)malloc(sizeof(*colors) * colorCount * 3);
- surface.create(bitmapHeader.width, bitmapHeader.height, 1);
- break;
- case ID_CMAP:
- if (colors == NULL) {
- error("wrong input chunk sequence");
- }
- for (i = 0; i < colorCount; i++) {
- colors[i * 3 + 0] = chunk.readByte();
- colors[i * 3 + 1] = chunk.readByte();
- colors[i * 3 + 2] = chunk.readByte();
- }
- break;
-
- case ID_BODY:
- switch (bitmapHeader.pack) {
- case 0:
- while (!chunk.eos()) {
- idx = chunk.readByte();
- ((byte*)surface.pixels)[si++] = idx;
- }
- break;
- case 1:
- while (!chunk.eos()) {
- byteRun = chunk.readByte();
- if (byteRun <= 127) {
- i = byteRun + 1;
- for (j = 0; j < i; j++){
- idx = chunk.readByte();
- ((byte*)surface.pixels)[si++] = idx;
- }
- } else if (byteRun != 128) {
- i = (256 - byteRun) + 1;
- idx = chunk.readByte();
- for (j = 0; j < i; j++) {
- ((byte*)surface.pixels)[si++] = idx;
- }
- }
- }
- break;
- }
- break;
- case ID_GRAB: case ID_CRNG: case ID_TINY: case ID_DPPS:
- break;
- default:
- error("unknown chunk : %s\n", ID2string(chunk.id));
- }
-
- chunk.feed();
- formChunk.incBytesRead(chunk.size);
- }
-}
-
-} // End of namespace Graphics
-
diff --git a/graphics/ilbm.h b/graphics/ilbm.h
deleted file mode 100644
index 8c50d9fe5e..0000000000
--- a/graphics/ilbm.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002-2006 The ScummVM project
- *
- * 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.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef GRAPHICS_ILBM_H
-#define GRAPHICS_ILBM_H
-
-namespace Graphics {
-
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors);
-
-typedef uint32 IFF_ID;
-
-struct Chunk {
- IFF_ID id;
- uint32 size;
- uint32 bytesRead;
- Common::ReadStream *_input;
-
- Chunk(Common::ReadStream *input): _input(input) {
- size = bytesRead = 0;
- }
-
- void incBytesRead(uint32 inc) {
- bytesRead += inc;
- if (bytesRead > size) {
- error("Chunk overead");
- }
- }
-
- void readHeader() {
- id = _input->readUint32BE();
- size = _input->readUint32BE();
- bytesRead = 0;
- }
-
- bool eos() {
- return (size - bytesRead) == 0;
- }
-
- void feed() {
- if (size % 2) {
- size++;
- }
- while (!_input->eos() && !eos()) {
- readByte();
- }
- }
-
- byte readByte() {
- incBytesRead(1);
- return _input->readByte();
- }
-
- int8 readSByte() {
- incBytesRead(1);
- return _input->readSByte();
- }
-
- uint16 readUint16() {
- incBytesRead(2);
- return _input->readUint16BE();
- }
-
- uint32 readUint32() {
- incBytesRead(4);
- return _input->readUint32BE();
- }
-
- int16 readSint16() {
- return (int16)readUint16();
- }
-
- int32 readSint32() {
- return (int32)readUint32();
- }
-};
-
-struct BMHD {
- uint16 width, height;
- uint16 x, y;
- byte depth;
- byte masking;
- byte pack;
- byte flags;
- uint16 transparentColor;
- byte xAspect, yAspect;
- uint16 pageWidth, pageHeight;
-
- BMHD() {
- memset(this, 0, sizeof(*this));
- }
-};
-
-class IFFDecoder {
-public:
- IFFDecoder(Common::ReadStream &input);
- virtual ~IFFDecoder() {}
-
- virtual void decode(Surface &surface, byte *&colors);
-
-protected:
- Chunk _formChunk;
- Chunk _chunk;
-
- IFF_ID _typeId;
- BMHD _bitmapHeader;
- uint32 _colorCount;
-
- Surface *_surface;
- byte **_colors;
-
- virtual bool isTypeSupported(IFF_ID type) = 0;
- virtual void readBODY() = 0;
-
- virtual void readBMHD();
- virtual void readCMAP();
- virtual void readCRNG();
-};
-
-class PBMDecoder : public IFFDecoder {
-public:
- PBMDecoder(Common::ReadStream &input) : IFFDecoder(input) {}
-protected:
- bool isTypeSupported(IFF_ID type);
- void readBODY();
-};
-
-
-
-class ILBMDecoder : public IFFDecoder {
-
-protected:
- bool isTypeSupported(IFF_ID type);
- void readBODY();
- void readCRNG();
- void expandLine(byte *buf, uint32 width);
- void fillPlane(byte *out, byte* buf, uint32 width, uint32 plane);
-
-public:
- ILBMDecoder(Common::ReadStream &input);
- ~ILBMDecoder();
-};
-
-} // End of namespace Graphics
-
-#endif
-
diff --git a/graphics/module.mk b/graphics/module.mk
index 44c118668f..84b76154b4 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -9,6 +9,7 @@ MODULE_OBJS := \
fonts/newfont_big.o \
fonts/newfont.o \
fonts/scummfont.o \
+ iff.o \
ilbm.o \
imagedec.o \
imageman.o \
diff --git a/sound/iff.cpp b/sound/iff.cpp
new file mode 100644
index 0000000000..2fd6378b13
--- /dev/null
+++ b/sound/iff.cpp
@@ -0,0 +1,80 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "sound/iff.h"
+#include "sound/audiostream.h"
+#include "sound/mixer.h"
+
+namespace Audio {
+
+
+void A8SVXDecoder::readVHDR(Common::IFFChunk &chunk) {
+ _header.oneShotHiSamples = chunk.readUint32BE();
+ _header.repeatHiSamples = chunk.readUint32BE();
+ _header.samplesPerHiCycle = chunk.readUint32BE();
+ _header.samplesPerSec = chunk.readUint16BE();
+ _header.octaves = chunk.readByte();
+ _header.compression = chunk.readByte();
+ _header.volume = chunk.readUint32BE();
+}
+
+void A8SVXDecoder::readBODY(Common::IFFChunk &chunk) {
+
+ switch (_header.compression) {
+ case 0:
+ _dataSize = chunk.size;
+ _data = (byte*)malloc(_dataSize);
+ chunk.read(_data, _dataSize);
+ break;
+
+ case 1:
+ warning("compressed IFF audio is not supported");
+ break;
+ }
+
+}
+
+
+A8SVXDecoder::A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, byte *&data, uint32 &dataSize) :
+ IFFParser(input), _header(header), _data(data), _dataSize(dataSize) {
+ if (_typeId != ID_8SVX)
+ error("unknown audio format");
+}
+
+void A8SVXDecoder::decode() {
+
+ Common::IFFChunk *chunk;
+
+ while ((chunk = nextChunk()) != 0) {
+ switch (chunk->id) {
+ case ID_VHDR:
+ readVHDR(*chunk);
+ break;
+
+ case ID_BODY:
+ readBODY(*chunk);
+ break;
+ }
+ }
+}
+
+}
diff --git a/sound/iff.h b/sound/iff.h
new file mode 100644
index 0000000000..592cf9c2f0
--- /dev/null
+++ b/sound/iff.h
@@ -0,0 +1,73 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef SOUND_IFF_H
+#define SOUND_IFF_H
+
+#include "common/iff_container.h"
+
+namespace Audio {
+
+struct Voice8Header {
+ uint32 oneShotHiSamples;
+ uint32 repeatHiSamples;
+ uint32 samplesPerHiCycle;
+ uint16 samplesPerSec;
+ byte octaves;
+ byte compression;
+ uint32 volume;
+
+ Voice8Header() {
+ memset(this, 0, sizeof(Voice8Header));
+ }
+};
+
+
+/*
+ A8SVX decoder reads 8SVX subtype of IFF files.
+
+ TODO: make a factory function for this kind of stream?
+ */
+class A8SVXDecoder : public Common::IFFParser {
+
+protected:
+ Voice8Header &_header;
+ byte* &_data;
+ uint32 &_dataSize;
+
+protected:
+ void readVHDR(Common::IFFChunk &chunk);
+ void readBODY(Common::IFFChunk &chunk);
+
+public:
+ A8SVXDecoder(Common::ReadStream &input, Voice8Header &header, byte *&data, uint32 &dataSize);
+ void decode();
+};
+
+
+/*
+ TODO: Implement a parser for AIFF subtype.
+ */
+
+}
+
+#endif
diff --git a/sound/module.mk b/sound/module.mk
index dce7ace08e..becc4b4d1e 100644
--- a/sound/module.mk
+++ b/sound/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
aiff.o \
audiocd.o \
audiostream.o \
+ iff.o \
flac.o \
fmopl.o \
mididrv.o \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 05:04:32 +0000