[Scummvm-git-logs] scummvm master -> fb7095f5a4eee3c7b984b07f05ed25a4ec70e30f
sev-
noreply at scummvm.org
Thu Dec 1 10:53:37 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fb7095f5a4 COMMON: Move all compression-related files to a separate directory
Commit: fb7095f5a4eee3c7b984b07f05ed25a4ec70e30f
https://github.com/scummvm/scummvm/commit/fb7095f5a4eee3c7b984b07f05ed25a4ec70e30f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-12-01T11:53:02+01:00
Commit Message:
COMMON: Move all compression-related files to a separate directory
Changed paths:
A common/compression/clickteam.cpp
A common/compression/clickteam.h
A common/compression/dcl.cpp
A common/compression/dcl.h
A common/compression/gzio.cpp
A common/compression/gzio.h
A common/compression/huffman.h
A common/compression/installshield_cab.cpp
A common/compression/installshield_cab.h
A common/compression/installshieldv3_archive.cpp
A common/compression/installshieldv3_archive.h
A common/compression/rnc_deco.cpp
A common/compression/rnc_deco.h
A common/compression/stuffit.cpp
A common/compression/stuffit.h
A common/compression/unarj.cpp
A common/compression/unarj.h
A common/compression/unzip.cpp
A common/compression/unzip.h
A common/compression/vise.cpp
A common/compression/vise.h
A common/compression/zlib.cpp
A common/compression/zlib.h
R common/clickteam.cpp
R common/clickteam.h
R common/dcl.cpp
R common/dcl.h
R common/gzio.cpp
R common/gzio.h
R common/huffman.h
R common/installshield_cab.cpp
R common/installshield_cab.h
R common/installshieldv3_archive.cpp
R common/installshieldv3_archive.h
R common/rnc_deco.cpp
R common/rnc_deco.h
R common/stuffit.cpp
R common/stuffit.h
R common/unarj.cpp
R common/unarj.h
R common/unzip.cpp
R common/unzip.h
R common/vise.cpp
R common/vise.h
R common/zlib.cpp
R common/zlib.h
audio/decoders/wma.cpp
backends/networking/sdl_net/handlerutils.cpp
backends/platform/dc/vmsave.cpp
backends/platform/n64/framfs_save_manager.h
backends/platform/n64/pakfs_save_manager.h
backends/platform/psp/pspkeyboard.cpp
backends/saves/default/default-saves.cpp
backends/vkeybd/virtual-keyboard.cpp
common/achievements.cpp
common/module.mk
common/quicktime.cpp
engines/agos/detection.cpp
engines/agos/metaengine.cpp
engines/agos/midi.cpp
engines/agos/res.cpp
engines/ags/ags.cpp
engines/bladerunner/bladerunner.cpp
engines/buried/graphics.cpp
engines/composer/saveload.cpp
engines/director/tests.cpp
engines/director/util.cpp
engines/draci/sound.cpp
engines/drascula/resource.cpp
engines/dreamweb/rnca_archive.cpp
engines/freescape/freescape.cpp
engines/glk/adrift/sctaffil.cpp
engines/glk/screen.cpp
engines/glk/zcode/glk_interface.cpp
engines/glk/zcode/sound_folder.cpp
engines/gnap/datarchive.cpp
engines/grim/grim.cpp
engines/grim/patchr.cpp
engines/grim/resource.cpp
engines/grim/update/mscab.cpp
engines/groovie/groovie.cpp
engines/hadesch/hadesch.cpp
engines/hdb/file-manager.cpp
engines/hypno/hypno.h
engines/kyra/resource/resource_intern.cpp
engines/kyra/sound/sound_mac_lok.cpp
engines/macventure/datafiles.cpp
engines/macventure/macventure.h
engines/mads/mps_installer.cpp
engines/mohawk/installer_archive.cpp
engines/mtropolis/boot.cpp
engines/mtropolis/mtropolis.cpp
engines/nancy/nancy.cpp
engines/neverhood/blbarchive.cpp
engines/pink/pink.cpp
engines/private/private.h
engines/saga/saga.cpp
engines/sci/resource/decompressor.cpp
engines/sci/resource/resource.cpp
engines/scumm/saveload.cpp
engines/scumm/smush/smush_player.cpp
engines/sky/disk.h
engines/stark/resources/textureset.cpp
engines/sword25/kernel/persistenceservice.cpp
engines/sword25/package/packagemanager.cpp
engines/teenagent/resources.cpp
engines/titanic/support/files_manager.cpp
engines/titanic/support/simple_file.h
engines/tony/tony.cpp
engines/toon/hotspot.cpp
engines/toon/picture.cpp
engines/ultima/nuvie/nuvie.cpp
engines/ultima/shared/engine/data_archive.cpp
engines/wintermute/base/base_file_manager.cpp
engines/wintermute/base/file/base_disk_file.cpp
engines/wintermute/base/file/base_file_entry.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/base/gfx/xfile_loader.cpp
engines/wintermute/base/gfx/xmodel.cpp
engines/zvision/text/truetype_font.cpp
graphics/fonts/ttf.cpp
graphics/macgui/datafiles.cpp
graphics/macgui/macfontmanager.cpp
gui/ThemeEngine.cpp
gui/gui-manager.cpp
image/codecs/svq1.cpp
test/common/huffman.h
video/bink_decoder.cpp
video/dxa_decoder.cpp
video/psx_decoder.cpp
diff --git a/audio/decoders/wma.cpp b/audio/decoders/wma.cpp
index 2eead20b598..74dbf1c4786 100644
--- a/audio/decoders/wma.cpp
+++ b/audio/decoders/wma.cpp
@@ -26,7 +26,7 @@
#include "common/math.h"
#include "common/error.h"
#include "common/memstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "math/mdct.h"
#include "math/sinewindows.h"
diff --git a/backends/networking/sdl_net/handlerutils.cpp b/backends/networking/sdl_net/handlerutils.cpp
index 6a651202ab8..a4f8a3e2481 100644
--- a/backends/networking/sdl_net/handlerutils.cpp
+++ b/backends/networking/sdl_net/handlerutils.cpp
@@ -26,7 +26,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Networking {
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 361cc70b4aa..89183b0852b 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -28,7 +28,7 @@
#include <common/savefile.h>
#include <gui/gui-manager.h>
#include <gui/message.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
// Savegame can not be bigger than this
diff --git a/backends/platform/n64/framfs_save_manager.h b/backends/platform/n64/framfs_save_manager.h
index 37c097338fc..2d50d7d5fed 100644
--- a/backends/platform/n64/framfs_save_manager.h
+++ b/backends/platform/n64/framfs_save_manager.h
@@ -23,7 +23,7 @@
#define __FRAMFS_SAVE_MANAGER__
#include <common/savefile.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
#include <framfs.h> // N64 FramFS library
diff --git a/backends/platform/n64/pakfs_save_manager.h b/backends/platform/n64/pakfs_save_manager.h
index fd71f6591b1..d3ca3600cd9 100644
--- a/backends/platform/n64/pakfs_save_manager.h
+++ b/backends/platform/n64/pakfs_save_manager.h
@@ -23,7 +23,7 @@
#define __PAKFS_SAVE_MANAGER__
#include <common/savefile.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
#include <pakfs.h> // N64 PakFS library
diff --git a/backends/platform/psp/pspkeyboard.cpp b/backends/platform/psp/pspkeyboard.cpp
index 967143d180d..c197b4ddf7a 100644
--- a/backends/platform/psp/pspkeyboard.cpp
+++ b/backends/platform/psp/pspkeyboard.cpp
@@ -38,7 +38,7 @@
#include "backends/platform/psp/input.h"
#include "common/keyboard.h"
#include "common/fs.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
//#define __PSP_DEBUG_FUNCS__ /* For debugging the stack */
//#define __PSP_DEBUG_PRINT__
diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp
index de4145c85f5..4b15fe230d6 100644
--- a/backends/saves/default/default-saves.cpp
+++ b/backends/saves/default/default-saves.cpp
@@ -36,7 +36,7 @@
#include "common/fs.h"
#include "common/archive.h"
#include "common/config-manager.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include <errno.h> // for removeSavefile()
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 7f245d0cea8..4e9ccf190e6 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -33,7 +33,7 @@
#include "backends/vkeybd/keycode-descriptions.h"
#include "common/config-manager.h"
#include "common/textconsole.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#define KEY_START_CHAR ('[')
#define KEY_END_CHAR (']')
diff --git a/common/achievements.cpp b/common/achievements.cpp
index 44762e73e0b..987a7d34b25 100644
--- a/common/achievements.cpp
+++ b/common/achievements.cpp
@@ -25,7 +25,7 @@
#include "common/stream.h"
#include "common/system.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Common {
@@ -125,7 +125,7 @@ bool AchievementsManager::loadAchievementsData(const char *platform, const char
warning("%s is not found in achievements.dat. Achievements messages are unavailable", cfgFileName.c_str());
return false;
}
-
+
INIFile cfgFile;
if (!cfgFile.loadFromStream(*stream)) {
delete stream;
@@ -158,7 +158,7 @@ bool AchievementsManager::loadAchievementsData(const char *platform, const char
_achievements[lang].push_back(desc);
}
}
- }
+ }
_stats.clear();
for (int i = 0; i < 256; i++) {
diff --git a/common/clickteam.cpp b/common/compression/clickteam.cpp
similarity index 99%
rename from common/clickteam.cpp
rename to common/compression/clickteam.cpp
index d6334cc97d3..c06f3b4f883 100644
--- a/common/clickteam.cpp
+++ b/common/compression/clickteam.cpp
@@ -20,8 +20,8 @@
*/
#include "common/array.h"
-#include "common/clickteam.h"
-#include "common/gzio.h"
+#include "common/compression/clickteam.h"
+#include "common/compression/gzio.h"
#include "common/debug.h"
#include "common/ptr.h"
#include "common/substream.h"
diff --git a/common/clickteam.h b/common/compression/clickteam.h
similarity index 100%
rename from common/clickteam.h
rename to common/compression/clickteam.h
diff --git a/common/dcl.cpp b/common/compression/dcl.cpp
similarity index 99%
rename from common/dcl.cpp
rename to common/compression/dcl.cpp
index 67d491c6140..b450e27f3af 100644
--- a/common/dcl.cpp
+++ b/common/compression/dcl.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/debug.h"
#include "common/memstream.h"
#include "common/stream.h"
diff --git a/common/dcl.h b/common/compression/dcl.h
similarity index 100%
rename from common/dcl.h
rename to common/compression/dcl.h
diff --git a/common/gzio.cpp b/common/compression/gzio.cpp
similarity index 99%
rename from common/gzio.cpp
rename to common/compression/gzio.cpp
index 0279e2c8ead..495ccd3ad54 100644
--- a/common/gzio.cpp
+++ b/common/compression/gzio.cpp
@@ -38,7 +38,7 @@
#include "common/stream.h"
#include "common/ptr.h"
#include "common/memstream.h"
-#include "gzio.h"
+#include "common/compression/gzio.h"
/* Compression methods (see algorithm.doc) */
@@ -1025,7 +1025,7 @@ bool
GzioReadStream::test_zlib_header ()
{
uint8 cmf, flg;
-
+
cmf = parentGetByte ();
flg = parentGetByte ();
diff --git a/common/gzio.h b/common/compression/gzio.h
similarity index 100%
rename from common/gzio.h
rename to common/compression/gzio.h
diff --git a/common/huffman.h b/common/compression/huffman.h
similarity index 100%
rename from common/huffman.h
rename to common/compression/huffman.h
diff --git a/common/installshield_cab.cpp b/common/compression/installshield_cab.cpp
similarity index 99%
rename from common/installshield_cab.cpp
rename to common/compression/installshield_cab.cpp
index 6523fd68c30..f23f1da7da9 100644
--- a/common/installshield_cab.cpp
+++ b/common/compression/installshield_cab.cpp
@@ -45,11 +45,11 @@
#include "common/archive.h"
#include "common/debug.h"
#include "common/hash-str.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "common/memstream.h"
#include "common/substream.h"
#include "common/ptr.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace Common {
diff --git a/common/installshield_cab.h b/common/compression/installshield_cab.h
similarity index 100%
rename from common/installshield_cab.h
rename to common/compression/installshield_cab.h
diff --git a/common/installshieldv3_archive.cpp b/common/compression/installshieldv3_archive.cpp
similarity index 98%
rename from common/installshieldv3_archive.cpp
rename to common/compression/installshieldv3_archive.cpp
index 9382699c045..92cf3c7c416 100644
--- a/common/installshieldv3_archive.cpp
+++ b/common/compression/installshieldv3_archive.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/debug.h"
namespace Common {
diff --git a/common/installshieldv3_archive.h b/common/compression/installshieldv3_archive.h
similarity index 100%
rename from common/installshieldv3_archive.h
rename to common/compression/installshieldv3_archive.h
diff --git a/common/rnc_deco.cpp b/common/compression/rnc_deco.cpp
similarity index 99%
rename from common/rnc_deco.cpp
rename to common/compression/rnc_deco.cpp
index d4cdadcda9a..9f3151f92c5 100644
--- a/common/rnc_deco.cpp
+++ b/common/compression/rnc_deco.cpp
@@ -21,7 +21,7 @@
#include "common/endian.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
namespace Common {
diff --git a/common/rnc_deco.h b/common/compression/rnc_deco.h
similarity index 100%
rename from common/rnc_deco.h
rename to common/compression/rnc_deco.h
diff --git a/common/stuffit.cpp b/common/compression/stuffit.cpp
similarity index 99%
rename from common/stuffit.cpp
rename to common/compression/stuffit.cpp
index 6a4311564d3..e2d6e436444 100644
--- a/common/stuffit.cpp
+++ b/common/compression/stuffit.cpp
@@ -22,7 +22,7 @@
// StuffIt parsing based on https://github.com/mietek/theunarchiver/wiki/StuffItFormat
// Compression 14 based on libxad (http://sourceforge.net/projects/libxad/)
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
#include "common/archive.h"
#include "common/bitstream.h"
diff --git a/common/stuffit.h b/common/compression/stuffit.h
similarity index 100%
rename from common/stuffit.h
rename to common/compression/stuffit.h
diff --git a/common/unarj.cpp b/common/compression/unarj.cpp
similarity index 99%
rename from common/unarj.cpp
rename to common/compression/unarj.cpp
index f580124d123..01fd039d047 100644
--- a/common/unarj.cpp
+++ b/common/compression/unarj.cpp
@@ -26,7 +26,7 @@
#include "common/scummsys.h"
#include "common/archive.h"
#include "common/debug.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
#include "common/file.h"
#include "common/hash-str.h"
#include "common/memstream.h"
@@ -754,7 +754,7 @@ ArjArchive::ArjArchive(const Array<String> &filenames) : _arjFilenames(filenames
arjFile.seek(header->compSize, SEEK_CUR);
}
}
-
+
debug(0, "ArjArchive::ArjArchive(%d volume(s) starting with %s): Located %d files", filenames.size(), filenames.empty() ? "" : filenames[0].c_str(), _headers.size());
}
diff --git a/common/unarj.h b/common/compression/unarj.h
similarity index 100%
rename from common/unarj.h
rename to common/compression/unarj.h
diff --git a/common/unzip.cpp b/common/compression/unzip.cpp
similarity index 99%
rename from common/unzip.cpp
rename to common/compression/unzip.cpp
index f22fe3c4df3..efce67ba448 100644
--- a/common/unzip.cpp
+++ b/common/compression/unzip.cpp
@@ -84,8 +84,8 @@ typedef Byte Bytef;
#include "common/crc.h"
#include "common/fs.h"
-#include "common/gzio.h"
-#include "common/unzip.h"
+#include "common/compression/gzio.h"
+#include "common/compression/unzip.h"
#include "common/memstream.h"
#include "common/hashmap.h"
diff --git a/common/unzip.h b/common/compression/unzip.h
similarity index 100%
rename from common/unzip.h
rename to common/compression/unzip.h
diff --git a/common/vise.cpp b/common/compression/vise.cpp
similarity index 99%
rename from common/vise.cpp
rename to common/compression/vise.cpp
index f41c00ac81b..83bfbe25d3d 100644
--- a/common/vise.cpp
+++ b/common/compression/vise.cpp
@@ -19,11 +19,11 @@
*
*/
-#include "common/vise.h"
+#include "common/compression/vise.h"
#include "common/macresman.h"
#include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
// Installer VISE archive loader.
//
diff --git a/common/vise.h b/common/compression/vise.h
similarity index 100%
rename from common/vise.h
rename to common/compression/vise.h
diff --git a/common/zlib.cpp b/common/compression/zlib.cpp
similarity index 99%
rename from common/zlib.cpp
rename to common/compression/zlib.cpp
index 1eb224d3c71..b280ec12cd8 100644
--- a/common/zlib.cpp
+++ b/common/compression/zlib.cpp
@@ -22,7 +22,7 @@
// Disable symbol overrides so that we can use zlib.h
#define FORBIDDEN_SYMBOL_ALLOW_ALL
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/ptr.h"
#include "common/util.h"
#include "common/stream.h"
diff --git a/common/zlib.h b/common/compression/zlib.h
similarity index 100%
rename from common/zlib.h
rename to common/compression/zlib.h
diff --git a/common/module.mk b/common/module.mk
index 15b38e12083..cbc5fafc283 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -4,23 +4,18 @@ MODULE_OBJS := \
achievements.o \
archive.o \
base-str.o \
- clickteam.o \
concatstream.o \
config-manager.o \
coroutines.o \
- dcl.o \
debug.o \
error.o \
events.o \
file.o \
fs.o \
gui_options.o \
- gzio.o \
hashmap.o \
iff_container.o \
ini-file.o \
- installshield_cab.o \
- installshieldv3_archive.o \
json.o \
language.o \
localization.o \
@@ -36,30 +31,35 @@ MODULE_OBJS := \
random.o \
rational.o \
rendermode.o \
- rnc_deco.o \
str.o \
stream.o \
streamdebug.o \
str-enc.o \
encodings/singlebyte.o \
- stuffit.o \
system.o \
textconsole.o \
text-to-speech.o \
tokenizer.o \
translation.o \
- unarj.o \
unicode-bidi.o \
- unzip.o \
ustr.o \
util.o \
- vise.o \
winexe.o \
winexe_ne.o \
winexe_pe.o \
xmlparser.o \
xpfloat.o \
- zlib.o
+ compression/clickteam.o \
+ compression/dcl.o \
+ compression/gzio.o \
+ compression/installshield_cab.o \
+ compression/installshieldv3_archive.o \
+ compression/rnc_deco.o \
+ compression/stuffit.o \
+ compression/unarj.o \
+ compression/unzip.o \
+ compression/vise.o \
+ compression/zlib.o
ifdef ENABLE_EVENTRECORDER
MODULE_OBJS += \
diff --git a/common/quicktime.cpp b/common/quicktime.cpp
index 55f1ddd7ca5..0fc713d331e 100644
--- a/common/quicktime.cpp
+++ b/common/quicktime.cpp
@@ -34,7 +34,7 @@
#include "common/quicktime.h"
#include "common/textconsole.h"
#include "common/util.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace Common {
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index c9b167f3a88..ee57f1315b6 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -27,7 +27,7 @@
#include "common/config-manager.h"
#include "common/system.h"
#include "common/textconsole.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "agos/detection.h"
#include "agos/intern_detection.h"
diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index c918c87fa64..7071c89d9c3 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -22,7 +22,7 @@
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/system.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "common/translation.h"
#include "engines/advancedDetector.h"
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 46c8775efac..2ba7ea5119b 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -40,7 +40,7 @@
#include "audio/midiparser.h"
// PKWARE data compression library decompressor required for Simon 2
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/translation.h"
#include "gui/message.h"
@@ -57,13 +57,13 @@ extern MidiParser *MidiParser_createS1D(uint8 source = 0, bool monophonicChords
// instruments correspond to MT-32 instruments in other tracks (f.e. track 10-3
// is similar to track 11).
const byte MidiPlayer::SIMON2_TRACK10_GM_MT32_INSTRUMENT_REMAPPING[] {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x1D, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x56, 0x53, 0x4B, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x1D, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x56, 0x53, 0x4B, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
@@ -682,7 +682,7 @@ void MidiPlayer::play(int track, bool sfx, bool sfxUsesRhythm, bool queued) {
_parserSfxAccolade->play(track);
return;
}
-
+
MidiParser *parser = sfx ? _parserSfx : _parserMusic;
if (!parser)
return;
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 35719d46100..61b410ee85b 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -31,7 +31,7 @@
#include "agos/agos.h"
#include "agos/intern.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace AGOS {
diff --git a/engines/ags/ags.cpp b/engines/ags/ags.cpp
index 4bfa3e23a86..eb5b2125437 100644
--- a/engines/ags/ags.cpp
+++ b/engines/ags/ags.cpp
@@ -27,7 +27,7 @@
#include "ags/console.h"
#include "common/scummsys.h"
#include "common/config-manager.h"
-#include "common/clickteam.h"
+#include "common/compression/clickteam.h"
#include "common/debug-channels.h"
#include "common/events.h"
#include "common/file.h"
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 23157671a34..d965f2ec3e2 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -87,7 +87,7 @@
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "gui/message.h"
diff --git a/engines/buried/graphics.cpp b/engines/buried/graphics.cpp
index dec5587414b..1ad1b4318b5 100644
--- a/engines/buried/graphics.cpp
+++ b/engines/buried/graphics.cpp
@@ -26,7 +26,7 @@
#include "common/fs.h"
#include "common/str-array.h"
#include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/palette.h"
diff --git a/engines/composer/saveload.cpp b/engines/composer/saveload.cpp
index 8bcea0ca140..b7a83ede48f 100644
--- a/engines/composer/saveload.cpp
+++ b/engines/composer/saveload.cpp
@@ -26,7 +26,7 @@
#include "common/savefile.h"
#include "common/serializer.h"
#include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "graphics/palette.h"
#include "composer/composer.h"
diff --git a/engines/director/tests.cpp b/engines/director/tests.cpp
index 36dfbc1552a..d9c98f39b1c 100644
--- a/engines/director/tests.cpp
+++ b/engines/director/tests.cpp
@@ -21,7 +21,7 @@
#include "common/config-manager.h"
#include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/memstream.h"
#include "common/macresman.h"
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 24db71adee7..51aee5f9798 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -26,7 +26,7 @@
#include "common/memstream.h"
#include "common/punycode.h"
#include "common/tokenizer.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "director/types.h"
#include "graphics/macgui/macwindowmanager.h"
diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp
index 943081eb95d..fba0ca3f893 100644
--- a/engines/draci/sound.cpp
+++ b/engines/draci/sound.cpp
@@ -27,7 +27,7 @@
#include "common/substream.h"
#include "common/textconsole.h"
#include "common/memstream.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "draci/sound.h"
#include "draci/draci.h"
diff --git a/engines/drascula/resource.cpp b/engines/drascula/resource.cpp
index 65119c5e887..60f2a95d4f5 100644
--- a/engines/drascula/resource.cpp
+++ b/engines/drascula/resource.cpp
@@ -20,7 +20,7 @@
*/
#include "drascula/drascula.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
namespace Drascula {
diff --git a/engines/dreamweb/rnca_archive.cpp b/engines/dreamweb/rnca_archive.cpp
index 7b29851b366..30a737d121a 100644
--- a/engines/dreamweb/rnca_archive.cpp
+++ b/engines/dreamweb/rnca_archive.cpp
@@ -20,12 +20,12 @@
*/
#include "common/array.h"
-#include "common/gzio.h"
+#include "common/compression/gzio.h"
#include "common/debug.h"
#include "common/ptr.h"
#include "common/substream.h"
#include "common/memstream.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
#include "common/file.h"
#include "dreamweb/rnca_archive.h"
@@ -118,7 +118,7 @@ Common::SharedArchiveContents RNCAArchive::readContentsForPath(const Common::Str
byte *uncompressedBuffer = new byte[unpackLen];
Common::RncDecoder rnc;
-
+
if (rnc.unpackM1(compressedBuffer, packLen, uncompressedBuffer) != (int32) unpackLen) {
debug("Unpacking error for %s", desc._fileName.c_str());
return Common::SharedArchiveContents();
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index 55af4ebc7a5..960d2e44e22 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -22,7 +22,7 @@
#include "common/config-manager.h"
#include "common/events.h"
#include "common/math.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "common/random.h"
#include "common/timer.h"
#include "graphics/cursorman.h"
diff --git a/engines/glk/adrift/sctaffil.cpp b/engines/glk/adrift/sctaffil.cpp
index ed26d0ddacc..f21f50c4cba 100644
--- a/engines/glk/adrift/sctaffil.cpp
+++ b/engines/glk/adrift/sctaffil.cpp
@@ -23,7 +23,7 @@
#include "glk/adrift/scprotos.h"
#include "glk/adrift/detection.h"
#include "common/algorithm.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/memstream.h"
namespace Glk {
diff --git a/engines/glk/screen.cpp b/engines/glk/screen.cpp
index d4580372e7d..e7378191af7 100644
--- a/engines/glk/screen.cpp
+++ b/engines/glk/screen.cpp
@@ -21,7 +21,7 @@
#include "glk/screen.h"
#include "glk/conf.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "image/bmp.h"
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
diff --git a/engines/glk/zcode/glk_interface.cpp b/engines/glk/zcode/glk_interface.cpp
index 66620331179..6e23f8dbcfb 100644
--- a/engines/glk/zcode/glk_interface.cpp
+++ b/engines/glk/zcode/glk_interface.cpp
@@ -25,7 +25,7 @@
#include "glk/conf.h"
#include "glk/screen.h"
#include "common/config-manager.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Glk {
namespace ZCode {
diff --git a/engines/glk/zcode/sound_folder.cpp b/engines/glk/zcode/sound_folder.cpp
index fae14d23ddf..0a27ced8791 100644
--- a/engines/glk/zcode/sound_folder.cpp
+++ b/engines/glk/zcode/sound_folder.cpp
@@ -21,7 +21,7 @@
#include "glk/zcode/sound_folder.h"
#include "common/file.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Glk {
namespace ZCode {
diff --git a/engines/gnap/datarchive.cpp b/engines/gnap/datarchive.cpp
index 11c073e65e5..ac4794d0a6d 100644
--- a/engines/gnap/datarchive.cpp
+++ b/engines/gnap/datarchive.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/file.h"
#include "common/stream.h"
#include "common/substream.h"
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 3c863869738..d59aa07ee9d 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -31,7 +31,7 @@
#include "common/foreach.h"
#include "common/fs.h"
#include "common/config-manager.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
#include "common/translation.h"
#include "backends/keymapper/action.h"
diff --git a/engines/grim/patchr.cpp b/engines/grim/patchr.cpp
index 927fc19124a..e0a61168196 100644
--- a/engines/grim/patchr.cpp
+++ b/engines/grim/patchr.cpp
@@ -22,7 +22,7 @@
#include "common/substream.h"
#include "common/md5.h"
#include "common/file.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/bufferedstream.h"
#include "engines/grim/patchr.h"
diff --git a/engines/grim/resource.cpp b/engines/grim/resource.cpp
index b6a170458ca..29cdf4f963f 100644
--- a/engines/grim/resource.cpp
+++ b/engines/grim/resource.cpp
@@ -46,7 +46,7 @@
#include "engines/grim/update/update.h"
#include "common/algorithm.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/memstream.h"
#include "common/file.h"
#include "common/config-manager.h"
diff --git a/engines/grim/update/mscab.cpp b/engines/grim/update/mscab.cpp
index 9731776e271..032283a2b43 100644
--- a/engines/grim/update/mscab.cpp
+++ b/engines/grim/update/mscab.cpp
@@ -24,7 +24,7 @@
#include "common/file.h"
#include "common/archive.h"
#include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/str.h"
namespace Grim {
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 00634ee769e..c818e412a3f 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -37,7 +37,7 @@
#include "common/events.h"
#include "common/file.h"
#include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
#include "common/textconsole.h"
#include "backends/audiocd/audiocd.h"
diff --git a/engines/hadesch/hadesch.cpp b/engines/hadesch/hadesch.cpp
index d19202e9c84..d9a5452e0e6 100644
--- a/engines/hadesch/hadesch.cpp
+++ b/engines/hadesch/hadesch.cpp
@@ -31,7 +31,7 @@
#include "common/keyboard.h"
#include "common/macresman.h"
#include "common/util.h"
-#include "common/gzio.h"
+#include "common/compression/gzio.h"
#include "common/config-manager.h"
#include "engines/advancedDetector.h"
diff --git a/engines/hdb/file-manager.cpp b/engines/hdb/file-manager.cpp
index c39811a3d14..a692c1882ca 100644
--- a/engines/hdb/file-manager.cpp
+++ b/engines/hdb/file-manager.cpp
@@ -21,7 +21,7 @@
#include "common/debug.h"
#include "common/file.h"
#include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "hdb/hdb.h"
#include "hdb/file-manager.h"
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 10a9f32065b..02f827eba92 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -23,7 +23,7 @@
#define HYPNO_H
#include "common/array.h"
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
#include "common/random.h"
#include "common/serializer.h"
#include "common/str-array.h"
@@ -651,4 +651,3 @@ public:
} // End of namespace Hypno
#endif
-
diff --git a/engines/kyra/resource/resource_intern.cpp b/engines/kyra/resource/resource_intern.cpp
index 87bce77694a..2c520527666 100644
--- a/engines/kyra/resource/resource_intern.cpp
+++ b/engines/kyra/resource/resource_intern.cpp
@@ -26,7 +26,7 @@
#include "common/memstream.h"
#include "common/substream.h"
#include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
namespace Kyra {
diff --git a/engines/kyra/sound/sound_mac_lok.cpp b/engines/kyra/sound/sound_mac_lok.cpp
index 8d50538c981..abf5985a7c3 100644
--- a/engines/kyra/sound/sound_mac_lok.cpp
+++ b/engines/kyra/sound/sound_mac_lok.cpp
@@ -27,7 +27,7 @@
#include "common/config-manager.h"
#include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
#include "audio/mixer.h"
diff --git a/engines/macventure/datafiles.cpp b/engines/macventure/datafiles.cpp
index 94f7622cff8..87d5afe8d7c 100644
--- a/engines/macventure/datafiles.cpp
+++ b/engines/macventure/datafiles.cpp
@@ -33,7 +33,7 @@
#include "macventure/macventure.h"
#include "macventure/windows.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace MacVenture {
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index 663a25c6f62..078e3e28d5a 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -36,7 +36,7 @@
#include "common/debug.h"
#include "common/random.h"
#include "common/macresman.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "common/savefile.h"
#include "gui/debugger.h"
diff --git a/engines/mads/mps_installer.cpp b/engines/mads/mps_installer.cpp
index 6d6e07a94cf..d6c59ad7a66 100644
--- a/engines/mads/mps_installer.cpp
+++ b/engines/mads/mps_installer.cpp
@@ -25,8 +25,8 @@
#include "common/file.h"
#include "common/util.h"
#include "common/memstream.h"
-#include "common/dcl.h"
-#include "mps_installer.h"
+#include "common/compression/dcl.h"
+#include "mads/mps_installer.h"
namespace MADS {
diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp
index 76cfefb1081..4920e53f028 100644
--- a/engines/mohawk/installer_archive.cpp
+++ b/engines/mohawk/installer_archive.cpp
@@ -21,7 +21,7 @@
#include "mohawk/installer_archive.h"
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/debug.h"
namespace Mohawk {
diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index c13792c973f..fb0758604f7 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -23,10 +23,10 @@
#include "common/file.h"
#include "common/macresman.h"
#include "common/memstream.h"
-#include "common/stuffit.h"
-#include "common/vise.h"
+#include "common/compression/stuffit.h"
+#include "common/compression/vise.h"
#include "common/winexe.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "graphics/maccursor.h"
#include "graphics/wincursor.h"
diff --git a/engines/mtropolis/mtropolis.cpp b/engines/mtropolis/mtropolis.cpp
index a75765cb191..5e7168645dc 100644
--- a/engines/mtropolis/mtropolis.cpp
+++ b/engines/mtropolis/mtropolis.cpp
@@ -25,7 +25,7 @@
#include "common/file.h"
#include "common/macresman.h"
#include "common/ptr.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
#include "common/system.h"
#include "common/winexe.h"
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index a1c88218b97..66524deb26a 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -24,7 +24,7 @@
#include "common/debug-channels.h"
#include "common/config-manager.h"
#include "common/memstream.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "common/serializer.h"
#include "engines/nancy/nancy.h"
@@ -460,7 +460,7 @@ void NancyEngine::readBootSummary(const IFF &boot) {
if (ser.getVersion() == kGameTypeNancy3) {
readChunkList(boot, ser, "PLG"); // partner logos
}
-
+
readChunkList(boot, ser, "OB"); // objects
ser.skip(0x28, kGameTypeVampire, kGameTypeVampire);
diff --git a/engines/neverhood/blbarchive.cpp b/engines/neverhood/blbarchive.cpp
index 1f9aaf88fe2..4b5a8ac589e 100644
--- a/engines/neverhood/blbarchive.cpp
+++ b/engines/neverhood/blbarchive.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "neverhood/blbarchive.h"
namespace Neverhood {
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index b50c9d53760..2f16e26ff90 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -22,7 +22,7 @@
#include "common/debug-channels.h"
#include "common/winexe_pe.h"
#include "common/config-manager.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "engines/advancedDetector.h"
#include "engines/util.h"
diff --git a/engines/private/private.h b/engines/private/private.h
index 092a6473af1..7e997faae8b 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -22,7 +22,7 @@
#ifndef PRIVATE_H
#define PRIVATE_H
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
#include "common/random.h"
#include "common/serializer.h"
#include "engines/engine.h"
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 40797ae16e7..0f487d4a3d0 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/events.h"
#include "common/translation.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
#include "audio/mixer.h"
diff --git a/engines/sci/resource/decompressor.cpp b/engines/sci/resource/decompressor.cpp
index 467bee8b201..d7691483a35 100644
--- a/engines/sci/resource/decompressor.cpp
+++ b/engines/sci/resource/decompressor.cpp
@@ -21,7 +21,7 @@
// Resource library
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
#include "common/util.h"
#include "common/endian.h"
#include "common/stream.h"
diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index 1eac58640b5..04ddea1f9e4 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -28,7 +28,7 @@
#include "common/textconsole.h"
#include "common/translation.h"
#ifdef ENABLE_SCI32
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "common/memstream.h"
#endif
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 9a927822256..ff8180fa5e8 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -24,7 +24,7 @@
#include "common/savefile.h"
#include "common/serializer.h"
#include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "scumm/actor.h"
#include "scumm/charset.h"
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index d6c18592de6..49f2595c82f 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -48,7 +48,7 @@
#include "audio/decoders/raw.h"
#include "audio/decoders/vorbis.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace Scumm {
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index f58cef5f94c..af721d875e4 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -24,7 +24,7 @@
#include "common/scummsys.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
#define MAX_FILES_IN_LIST 60
diff --git a/engines/stark/resources/textureset.cpp b/engines/stark/resources/textureset.cpp
index 7f0557d4c89..30cb0b69cd6 100644
--- a/engines/stark/resources/textureset.cpp
+++ b/engines/stark/resources/textureset.cpp
@@ -35,7 +35,7 @@
#include "engines/stark/services/settings.h"
#include "common/file.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "image/png.h"
namespace Stark {
diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index 2b898b2d2a7..d0af8f2c136 100644
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -30,7 +30,7 @@
#include "common/fs.h"
#include "common/savefile.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "sword25/kernel/kernel.h"
#include "sword25/kernel/persistenceservice.h"
#include "sword25/kernel/inputpersistenceblock.h"
diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index 57721e2a96b..ff7eb7ba9c5 100644
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -33,7 +33,7 @@
#include "common/savefile.h"
#include "common/str-array.h"
#include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "sword25/sword25.h" // for kDebugScript
#include "sword25/kernel/filesystemutil.h"
#include "sword25/package/packagemanager.h"
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index 3feb9471b31..afce3d44a32 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -24,7 +24,7 @@
#include "common/debug.h"
#include "common/textconsole.h"
#include "common/translation.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace TeenAgent {
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index 389bfcbc006..04006d5cfa7 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -21,7 +21,7 @@
#include "common/file.h"
#include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "titanic/support/files_manager.h"
#include "titanic/game_manager.h"
#include "titanic/titanic.h"
diff --git a/engines/titanic/support/simple_file.h b/engines/titanic/support/simple_file.h
index bde7293984e..93a14d0fe22 100644
--- a/engines/titanic/support/simple_file.h
+++ b/engines/titanic/support/simple_file.h
@@ -26,7 +26,7 @@
#include "titanic/support/rect.h"
#include "common/savefile.h"
#include "common/stream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "titanic/support/string.h"
namespace Titanic {
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 4c51b31a758..652355148d5 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -25,7 +25,7 @@
#include "common/debug-channels.h"
#include "common/events.h"
#include "common/file.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
#include "common/translation.h"
#include "tony/tony.h"
#include "tony/custom.h"
diff --git a/engines/toon/hotspot.cpp b/engines/toon/hotspot.cpp
index aeedbd4dd20..32a9b9b9c79 100644
--- a/engines/toon/hotspot.cpp
+++ b/engines/toon/hotspot.cpp
@@ -20,7 +20,7 @@
*/
#include "common/debug.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
#include "toon/hotspot.h"
diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp
index 96bab7dc395..6638aaf4454 100644
--- a/engines/toon/picture.cpp
+++ b/engines/toon/picture.cpp
@@ -24,7 +24,7 @@
#include "common/debug.h"
#include "common/rect.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
#include "common/stack.h"
namespace Toon {
diff --git a/engines/ultima/nuvie/nuvie.cpp b/engines/ultima/nuvie/nuvie.cpp
index 0d7df0e1ea4..7966a1f6f2c 100644
--- a/engines/ultima/nuvie/nuvie.cpp
+++ b/engines/ultima/nuvie/nuvie.cpp
@@ -39,7 +39,7 @@
#include "ultima/nuvie/gui/widgets/msg_scroll.h"
#include "common/config-manager.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Ultima {
namespace Nuvie {
diff --git a/engines/ultima/shared/engine/data_archive.cpp b/engines/ultima/shared/engine/data_archive.cpp
index c1b524cfba9..58f809daa19 100644
--- a/engines/ultima/shared/engine/data_archive.cpp
+++ b/engines/ultima/shared/engine/data_archive.cpp
@@ -23,7 +23,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Ultima {
namespace Shared {
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 08ea782f8d5..693d8fdf34b 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -45,7 +45,7 @@
#include "common/file.h"
#include "common/savefile.h"
#include "common/fs.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index c9a2e2917ee..8c89d722861 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -32,7 +32,7 @@
#include "common/stream.h"
#include "common/memstream.h"
#include "common/file.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "common/archive.h"
#include "common/tokenizer.h"
#include "common/config-manager.h"
diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index 778e7776c3a..ec242edf01d 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/base/file/base_package.h"
#include "common/stream.h"
#include "common/substream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 0cddcef2916..42ca219293b 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -38,7 +38,7 @@
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
#include "common/unicode-bidi.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/xfile_loader.cpp b/engines/wintermute/base/gfx/xfile_loader.cpp
index 861ed184115..12c212fe456 100644
--- a/engines/wintermute/base/gfx/xfile_loader.cpp
+++ b/engines/wintermute/base/gfx/xfile_loader.cpp
@@ -27,7 +27,7 @@
#include "common/endian.h"
#include "common/str.h"
#include "common/util.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "wintermute/base/gfx/xfile_loader.h"
diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index 4e3cb6cd52a..9e972e44337 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -25,7 +25,7 @@
* Copyright (c) 2003-2013 Jan Nedoma and contributors
*/
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/base/base_game.h"
diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index 196a79670f1..107a24927e8 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -24,7 +24,7 @@
#include "common/debug.h"
#include "common/file.h"
#include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "common/ustr.h"
#include "graphics/font.h"
#include "graphics/fonts/ttf.h"
diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index 00e59080939..115acd741b3 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -39,7 +39,7 @@
#include "common/memstream.h"
#include "common/hashmap.h"
#include "common/ptr.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include <ft2build.h>
#include FT_FREETYPE_H
diff --git a/graphics/macgui/datafiles.cpp b/graphics/macgui/datafiles.cpp
index 517901bdb37..1432075e16e 100644
--- a/graphics/macgui/datafiles.cpp
+++ b/graphics/macgui/datafiles.cpp
@@ -30,7 +30,7 @@
#include "graphics/macgui/macwindowmanager.h"
#include "common/archive.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
namespace Graphics {
diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 324fa1caf6a..4b444d87c9c 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -20,7 +20,7 @@
#include "common/archive.h"
#include "common/stream.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "common/macresman.h"
#include "graphics/fonts/bdf.h"
#include "graphics/fonts/macfont.h"
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 6a926d19080..32720db22fd 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -23,7 +23,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/fs.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "common/tokenizer.h"
#include "common/translation.h"
#include "common/unicode-bidi.h"
@@ -1057,7 +1057,7 @@ void ThemeEngine::drawLineSeparator(const Common::Rect &r) {
drawDD(kDDSeparator, r);
}
-void ThemeEngine::drawCheckbox(const Common::Rect &r, int spacing, const Common::U32String &str, bool checked,
+void ThemeEngine::drawCheckbox(const Common::Rect &r, int spacing, const Common::U32String &str, bool checked,
WidgetStateInfo state, bool overrideText, bool rtl) {
if (!ready())
return;
@@ -1088,7 +1088,7 @@ void ThemeEngine::drawCheckbox(const Common::Rect &r, int spacing, const Common:
}
if (r2.right > r2.left) {
- TextColor color = overrideText ? GUI::TextColor::kTextColorOverride : getTextColor(dd);
+ TextColor color = overrideText ? GUI::TextColor::kTextColorOverride : getTextColor(dd);
drawDDText(getTextData(dd), color, r2, str, true, false, convertTextAlignH(_widgets[dd]->_textAlignH, rtl),
_widgets[dd]->_textAlignV);
}
@@ -1359,7 +1359,7 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::U32String &str,
case kFontColorNormal:
if (inverted) {
colorId = kTextColorNormalInverted;
- break;
+ break;
}
switch (state) {
@@ -1383,7 +1383,7 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::U32String &str,
case kFontColorAlternate:
if (inverted) {
colorId = kTextColorAlternativeInverted;
- break;
+ break;
}
switch (state) {
@@ -1404,12 +1404,12 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::U32String &str,
}
break;
- case kFontColorOverride:
+ case kFontColorOverride:
if (inverted) {
- colorId = kTextColorOverrideInverted;
- break;
+ colorId = kTextColorOverrideInverted;
+ break;
}
-
+
switch (state) {
case kStateDisabled:
colorId = kTextColorAlternativeDisabled;
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 174b625ca4e..c802feec40e 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -28,7 +28,7 @@
#include "common/rect.h"
#include "common/textconsole.h"
#include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
#include "gui/EventRecorder.h"
#include "backends/keymapper/action.h"
diff --git a/image/codecs/svq1.cpp b/image/codecs/svq1.cpp
index c02c5f22e09..e0aee0b5deb 100644
--- a/image/codecs/svq1.cpp
+++ b/image/codecs/svq1.cpp
@@ -32,7 +32,7 @@
#include "common/system.h"
#include "common/debug.h"
#include "common/textconsole.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "graphics/yuv_to_rgb.h"
diff --git a/test/common/huffman.h b/test/common/huffman.h
index 3e3956a3213..1ebaa1f44fd 100644
--- a/test/common/huffman.h
+++ b/test/common/huffman.h
@@ -1,10 +1,10 @@
#include <cxxtest/TestSuite.h>
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "common/bitstream.h"
#include "common/memstream.h"
/**
-* A test suite for the Huffman decoder in common/huffman.h
+* A test suite for the Huffman decoder in common/compression/huffman.h
* The encoding used comes from the example on the Wikipedia page
* for Huffman.
* TODO: It could be improved by generating one at runtime.
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 30de3d478dc..fec8ae88cab 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -34,7 +34,7 @@
#include "common/file.h"
#include "common/str.h"
#include "common/bitstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "common/system.h"
#include "graphics/yuv_to_rgb.h"
diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index 0ae59b53f61..6ec37429590 100644
--- a/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
@@ -29,7 +29,7 @@
#include "video/dxa_decoder.h"
-#include "common/gzio.h"
+#include "common/compression/gzio.h"
namespace Video {
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 4658f0821d8..6c911f1ecdf 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -25,7 +25,7 @@
#include "audio/audiostream.h"
#include "audio/decoders/adpcm.h"
#include "common/bitstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
#include "common/stream.h"
#include "common/system.h"
#include "common/textconsole.h"
More information about the Scummvm-git-logs
mailing list