From 008042ac2538bebfce013cb0ec4efa4a5600e4bb Mon Sep 17 00:00:00 2001 From: Nicola Mettifogo Date: Tue, 1 May 2007 15:39:40 +0000 Subject: Implemented a IFF (Interchange File Format) parser and added subclasses to parse graphics (ILBM, PBM) and audio (8SVX), thus replacing old decoding routines. SAGA and Parallaction have been adjusted to work with the new code. svn-id: r26719 --- common/iff_container.h | 228 ++++ common/module.mk | 1 + dists/codeblocks/parallaction.depend | 409 ------- dists/codeblocks/parallaction.layout | 131 +-- dists/codeblocks/scummvm.cbp | 7 +- dists/codeblocks/scummvm.depend | 2065 ++++++---------------------------- dists/codeblocks/scummvm.layout | 197 +++- dists/codeblocks/scummvm.workspace | 4 +- engines/parallaction/callables.cpp | 5 +- engines/parallaction/disk.cpp | 166 ++- engines/parallaction/disk.h | 7 + engines/parallaction/location.cpp | 11 + engines/parallaction/music.cpp | 49 +- engines/parallaction/music.h | 20 +- engines/parallaction/zone.cpp | 7 +- engines/parallaction/zone.h | 4 + engines/saga/scene.cpp | 10 +- graphics/iff.cpp | 313 ++++++ graphics/iff.h | 139 +++ graphics/ilbm.cpp | 482 -------- graphics/ilbm.h | 165 --- graphics/module.mk | 1 + sound/iff.cpp | 80 ++ sound/iff.h | 73 ++ sound/module.mk | 1 + 25 files changed, 1571 insertions(+), 3004 deletions(-) create mode 100644 common/iff_container.h create mode 100644 graphics/iff.cpp create mode 100644 graphics/iff.h delete mode 100644 graphics/ilbm.cpp delete mode 100644 graphics/ilbm.h create mode 100644 sound/iff.cpp create mode 100644 sound/iff.h 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 - - - - - - - - - - - -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" - - "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 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + 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 @@