[Scummvm-git-logs] scummvm master -> f02068a8f3a9784215276779f9eefaf5b7a23346
bluegr
bluegr at gmail.com
Sun Nov 29 12:36:35 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bd7e708fc3 SCI: Move resource related functionality into a separate folder
f02068a8f3 SCI: Add a flag to distinguish SCI16 from SCI32 games during detection
Commit: bd7e708fc35541a28cc895231fb8405de7e6e2a6
https://github.com/scummvm/scummvm/commit/bd7e708fc35541a28cc895231fb8405de7e6e2a6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-11-29T14:34:55+02:00
Commit Message:
SCI: Move resource related functionality into a separate folder
Changed paths:
A engines/sci/resource/decompressor.cpp
A engines/sci/resource/decompressor.h
A engines/sci/resource/resource.cpp
A engines/sci/resource/resource.h
A engines/sci/resource/resource_audio.cpp
A engines/sci/resource/resource_intern.h
A engines/sci/resource/resource_patcher.cpp
A engines/sci/resource/resource_patcher.h
R engines/sci/decompressor.cpp
R engines/sci/decompressor.h
R engines/sci/resource.cpp
R engines/sci/resource.h
R engines/sci/resource_audio.cpp
R engines/sci/resource_intern.h
R engines/sci/resource_patcher.cpp
R engines/sci/resource_patcher.h
engines/sci/console.cpp
engines/sci/engine/features.h
engines/sci/engine/kernel.cpp
engines/sci/engine/kfile.cpp
engines/sci/engine/kgraphics.cpp
engines/sci/engine/kgraphics32.cpp
engines/sci/engine/kmenu.cpp
engines/sci/engine/kmovement.cpp
engines/sci/engine/kparse.cpp
engines/sci/engine/kscripts.cpp
engines/sci/engine/kstring.cpp
engines/sci/engine/message.h
engines/sci/engine/script.cpp
engines/sci/engine/vm.h
engines/sci/graphics/celobj32.cpp
engines/sci/graphics/celobj32.h
engines/sci/graphics/palette32.cpp
engines/sci/graphics/screen_item32.cpp
engines/sci/graphics/video32.cpp
engines/sci/module.mk
engines/sci/parser/vocabulary.cpp
engines/sci/sound/audio.cpp
engines/sci/sound/audio32.cpp
engines/sci/sound/audio32.h
engines/sci/sound/decoders/sol.cpp
engines/sci/sound/drivers/adlib.cpp
engines/sci/sound/drivers/amigamac0.cpp
engines/sci/sound/drivers/amigamac1.cpp
engines/sci/sound/drivers/cms.cpp
engines/sci/sound/drivers/fb01.cpp
engines/sci/sound/drivers/fmtowns.cpp
engines/sci/sound/drivers/midi.cpp
engines/sci/sound/drivers/pc9801.cpp
engines/sci/sound/midiparser_sci.h
engines/sci/sound/music.cpp
engines/sci/sound/music.h
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 30902be791..ee7c84164d 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -27,7 +27,7 @@
#include "sci/console.h"
#include "sci/debug.h"
#include "sci/event.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/engine/selector.h"
diff --git a/engines/sci/engine/features.h b/engines/sci/engine/features.h
index 4dda92ae0d..ef6196bc68 100644
--- a/engines/sci/engine/features.h
+++ b/engines/sci/engine/features.h
@@ -23,7 +23,7 @@
#ifndef SCI_INCLUDE_FEATURES_H
#define SCI_INCLUDE_FEATURES_H
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/seg_manager.h"
namespace Sci {
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 9c7cc8dac4..0fed966653 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -23,7 +23,7 @@
#include "sci/sci.h"
#include "sci/engine/kernel.h"
#include "sci/event.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/kernel_tables.h"
#include "sci/engine/state.h"
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 7d3c2a9883..07e0c124ef 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -46,7 +46,7 @@
#include "sci/engine/guest_additions.h"
#endif
#include "sci/engine/message.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
namespace Sci {
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index df44a1cd47..d7ed5bf356 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -31,7 +31,7 @@
#include "sci/sci.h"
#include "sci/event.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/guest_additions.h"
#include "sci/engine/savegame.h"
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index c5a958494b..64ed1b6789 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -29,7 +29,7 @@
#include "sci/sci.h"
#include "sci/event.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 8dca7f74df..5fcac0d31d 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -21,7 +21,7 @@
*/
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/graphics/cursor.h"
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 2bcecd1db7..18ef336155 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -21,7 +21,7 @@
*/
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
diff --git a/engines/sci/engine/kparse.cpp b/engines/sci/engine/kparse.cpp
index 08992cab46..3485657edb 100644
--- a/engines/sci/engine/kparse.cpp
+++ b/engines/sci/engine/kparse.cpp
@@ -22,7 +22,7 @@
/* String and parser handling */
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
#include "sci/engine/message.h"
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 61b0f16cae..5c3369e2d4 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -21,7 +21,7 @@
*/
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/seg_manager.h"
#include "sci/engine/script.h"
#include "sci/engine/state.h"
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 4cf12360a1..a0631ca965 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -22,7 +22,7 @@
/* String and parser handling */
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/state.h"
#include "sci/engine/message.h"
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index 2777cd5897..8f740f1820 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -23,7 +23,7 @@
#ifndef SCI_ENGINE_MESSAGE_H
#define SCI_ENGINE_MESSAGE_H
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/vm_types.h"
#include "common/stack.h"
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 72ae3316e2..989840e9d1 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -22,7 +22,7 @@
#include "sci/console.h"
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/util.h"
#include "sci/engine/features.h"
#include "sci/engine/state.h"
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index 5fe98fe326..50c90baaa6 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -26,7 +26,7 @@
/* VM and kernel declarations */
#include "sci/engine/vm_types.h" // for reg_t
-#include "sci/resource.h" // for SciVersion
+#include "sci/resource/resource.h" // for SciVersion
#include "common/util.h"
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index 30187c4565..b222c12209 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/seg_manager.h"
#include "sci/engine/state.h"
diff --git a/engines/sci/graphics/celobj32.h b/engines/sci/graphics/celobj32.h
index df08bc38e3..f445a1043e 100644
--- a/engines/sci/graphics/celobj32.h
+++ b/engines/sci/graphics/celobj32.h
@@ -25,7 +25,7 @@
#include "common/rational.h"
#include "common/rect.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/vm_types.h"
#include "sci/util.h"
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index c3f28c3909..e66f979105 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -26,7 +26,7 @@
#include "sci/sci.h"
#include "sci/event.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/util.h"
#include "sci/engine/features.h"
#include "sci/graphics/palette32.h"
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp
index c7888fa872..ac52d65f4f 100644
--- a/engines/sci/graphics/screen_item32.cpp
+++ b/engines/sci/graphics/screen_item32.cpp
@@ -21,7 +21,7 @@
*/
#include "sci/console.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/kernel.h"
#include "sci/engine/selector.h"
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 48cf14484a..00055bf4fd 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -42,7 +42,7 @@
#include "sci/graphics/palette32.h" // for GfxPalette32
#include "sci/graphics/plane32.h" // for Plane, PlanePictureCodes::kP...
#include "sci/graphics/screen_item32.h" // for ScaleInfo, ScreenItem, Scale...
-#include "sci/resource.h" // for ResourceManager, ResourceId,...
+#include "sci/resource/resource.h" // for ResourceManager, ResourceId,...
#include "sci/sci.h" // for SciEngine, g_sci, getSciVersion
#include "sci/sound/audio32.h" // for Audio32
#include "sci/video/seq_decoder.h" // for SEQDecoder
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 93074b1c98..3fcce5c561 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -2,12 +2,8 @@ MODULE := engines/sci
MODULE_OBJS := \
console.o \
- decompressor.o \
event.o \
metaengine.o \
- resource.o \
- resource_audio.o \
- resource_patcher.o \
sci.o \
util.o \
engine/features.o \
@@ -69,6 +65,10 @@ MODULE_OBJS := \
parser/grammar.o \
parser/said.o \
parser/vocabulary.o \
+ resource/decompressor.o \
+ resource/resource.o \
+ resource/resource_audio.o \
+ resource/resource_patcher.o \
sound/audio.o \
sound/midiparser_sci.o \
sound/music.o \
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 4b667b1bb7..12a86eb72f 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -23,7 +23,7 @@
// Main vocabulary support functions and word lookup
#include "sci/parser/vocabulary.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/state.h"
#include "sci/engine/kernel.h"
#include "sci/console.h"
diff --git a/engines/sci/decompressor.cpp b/engines/sci/resource/decompressor.cpp
similarity index 99%
rename from engines/sci/decompressor.cpp
rename to engines/sci/resource/decompressor.cpp
index d29a7dcf95..fa7dea605e 100644
--- a/engines/sci/decompressor.cpp
+++ b/engines/sci/resource/decompressor.cpp
@@ -28,9 +28,9 @@
#include "common/stream.h"
#include "common/textconsole.h"
-#include "sci/decompressor.h"
+#include "sci/resource/decompressor.h"
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
namespace Sci {
int Decompressor::unpack(Common::ReadStream *src, byte *dest, uint32 nPacked, uint32 nUnpacked) {
diff --git a/engines/sci/decompressor.h b/engines/sci/resource/decompressor.h
similarity index 97%
rename from engines/sci/decompressor.h
rename to engines/sci/resource/decompressor.h
index 05991cbfde..1019ae2acf 100644
--- a/engines/sci/decompressor.h
+++ b/engines/sci/resource/decompressor.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef SCI_DECOMPRESSOR_H
-#define SCI_DECOMPRESSOR_H
+#ifndef SCI_RESOURCE_DECOMPRESSOR_H
+#define SCI_RESOURCE_DECOMPRESSOR_H
#include "common/scummsys.h"
@@ -196,4 +196,4 @@ protected:
} // End of namespace Sci
-#endif // SCI_SCICORE_DECOMPRESSOR_H
+#endif // SCI_RESOURCE_DECOMPRESSOR_H
diff --git a/engines/sci/resource.cpp b/engines/sci/resource/resource.cpp
similarity index 99%
rename from engines/sci/resource.cpp
rename to engines/sci/resource/resource.cpp
index 8957a01a5f..2ab900d1bc 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -33,9 +33,9 @@
#include "sci/engine/workarounds.h"
#include "sci/parser/vocabulary.h"
-#include "sci/resource.h"
-#include "sci/resource_intern.h"
-#include "sci/resource_patcher.h"
+#include "sci/resource/resource.h"
+#include "sci/resource/resource_intern.h"
+#include "sci/resource/resource_patcher.h"
#include "sci/util.h"
namespace Sci {
diff --git a/engines/sci/resource.h b/engines/sci/resource/resource.h
similarity index 99%
rename from engines/sci/resource.h
rename to engines/sci/resource/resource.h
index b4bee9fc9a..5add772d99 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource/resource.h
@@ -20,15 +20,15 @@
*
*/
-#ifndef SCI_RESOURCE_H
-#define SCI_RESOURCE_H
+#ifndef SCI_RESOURCE_RESOURCE_H
+#define SCI_RESOURCE_RESOURCE_H
#include "common/str.h"
#include "common/list.h"
#include "common/hashmap.h"
#include "sci/graphics/helpers.h" // for ViewType
-#include "sci/decompressor.h"
+#include "sci/resource/decompressor.h"
#include "sci/sci.h"
#include "sci/util.h"
@@ -715,4 +715,4 @@ ResourceId convertPatchNameBase36(ResourceType type, const Common::String &filen
} // End of namespace Sci
-#endif // SCI_RESOURCE_H
+#endif // SCI_RESOURCE_RESOURCE_H
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource/resource_audio.cpp
similarity index 99%
rename from engines/sci/resource_audio.cpp
rename to engines/sci/resource/resource_audio.cpp
index 0cf57d19ac..7adbfa4d20 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource/resource_audio.cpp
@@ -26,8 +26,8 @@
#include "common/file.h"
#include "common/textconsole.h"
#include "common/memstream.h"
-#include "sci/resource.h"
-#include "sci/resource_intern.h"
+#include "sci/resource/resource.h"
+#include "sci/resource/resource_intern.h"
#include "sci/util.h"
namespace Sci {
diff --git a/engines/sci/resource_intern.h b/engines/sci/resource/resource_intern.h
similarity index 97%
rename from engines/sci/resource_intern.h
rename to engines/sci/resource/resource_intern.h
index 4604383b96..523b27c3dd 100644
--- a/engines/sci/resource_intern.h
+++ b/engines/sci/resource/resource_intern.h
@@ -20,10 +20,10 @@
*
*/
-#ifndef SCI_RESOURCE_INTERN_H
-#define SCI_RESOURCE_INTERN_H
+#ifndef SCI_RESOURCE_RESOURCE_INTERN_H
+#define SCI_RESOURCE_RESOURCE_INTERN_H
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
namespace Common {
class MacResManager;
@@ -240,4 +240,4 @@ protected:
} // End of namespace Sci
-#endif // SCI_RESOURCE_INTERN_H
+#endif // SCI_RESOURCE_RESOURCE_INTERN_H
diff --git a/engines/sci/resource_patcher.cpp b/engines/sci/resource/resource_patcher.cpp
similarity index 99%
rename from engines/sci/resource_patcher.cpp
rename to engines/sci/resource/resource_patcher.cpp
index 3c5be30104..ee4bab5081 100644
--- a/engines/sci/resource_patcher.cpp
+++ b/engines/sci/resource/resource_patcher.cpp
@@ -23,8 +23,8 @@
#include "common/scummsys.h"
#include "common/textconsole.h"
#include "sci/sci.h"
-#include "sci/resource.h"
-#include "sci/resource_patcher.h"
+#include "sci/resource/resource.h"
+#include "sci/resource/resource_patcher.h"
namespace Sci {
diff --git a/engines/sci/resource_patcher.h b/engines/sci/resource/resource_patcher.h
similarity index 94%
rename from engines/sci/resource_patcher.h
rename to engines/sci/resource/resource_patcher.h
index 5fe2e86e76..029f693fbb 100644
--- a/engines/sci/resource_patcher.h
+++ b/engines/sci/resource/resource_patcher.h
@@ -20,13 +20,13 @@
*
*/
-#ifndef SCI_RESOURCE_PATCHER_H
-#define SCI_RESOURCE_PATCHER_H
+#ifndef SCI_RESOURCE_RESOURCE_PATCHER_H
+#define SCI_RESOURCE_RESOURCE_PATCHER_H
#include "common/language.h"
#include "sci/sci.h"
-#include "sci/resource.h"
-#include "sci/resource_intern.h"
+#include "sci/resource/resource.h"
+#include "sci/resource/resource_intern.h"
namespace Sci {
@@ -148,4 +148,4 @@ private:
};
} // End of namespace Sci
-#endif
+#endif // SCI_RESOURCE_RESOURCE_PATCHER_H
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index c1b64c1021..a5dfa16879 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/kernel.h"
#include "sci/engine/seg_manager.h"
#include "sci/sound/audio.h"
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index def8302df8..71dbec7a39 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -41,7 +41,7 @@
#include "sci/engine/features.h" // for GameFeatures
#include "sci/engine/guest_additions.h" // for GuestAdditions
#include "sci/engine/vm_types.h" // for reg_t, make_reg, NULL_REG
-#include "sci/resource.h" // for ResourceId, ResourceType::kResour...
+#include "sci/resource/resource.h" // for ResourceId, ResourceType::kResour...
#include "sci/sci.h" // for SciEngine, g_sci, getSciVersion
#include "sci/sound/decoders/sol.h" // for makeSOLStream
diff --git a/engines/sci/sound/audio32.h b/engines/sci/sound/audio32.h
index 6e23dd8891..b64b0379f6 100644
--- a/engines/sci/sound/audio32.h
+++ b/engines/sci/sound/audio32.h
@@ -28,7 +28,7 @@
#include "common/array.h" // for Array
#include "common/mutex.h" // for StackLock, Mutex
#include "common/scummsys.h" // for int16, uint8, uint32, uint16
-#include "sci/resource.h" // for ResourceId
+#include "sci/resource/resource.h" // for ResourceId
#include "sci/engine/state.h" // for EngineState
#include "sci/engine/vm_types.h" // for reg_t, NULL_REG
#include "sci/video/robot_decoder.h" // for RobotAudioStream
diff --git a/engines/sci/sound/decoders/sol.cpp b/engines/sci/sound/decoders/sol.cpp
index b468e5ecf6..4d5c4dfa5b 100644
--- a/engines/sci/sound/decoders/sol.cpp
+++ b/engines/sci/sound/decoders/sol.cpp
@@ -27,7 +27,7 @@
#include "common/util.h"
#include "sci/sci.h"
#include "sci/sound/decoders/sol.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
namespace Sci {
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 47f59cabbf..59e4fa0050 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -29,7 +29,7 @@
#include "audio/fmopl.h"
#include "audio/mididrv.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/drivers/mididriver.h"
#include "sci/util.h"
diff --git a/engines/sci/sound/drivers/amigamac0.cpp b/engines/sci/sound/drivers/amigamac0.cpp
index 92a8f14234..0339ed1b3a 100644
--- a/engines/sci/sound/drivers/amigamac0.cpp
+++ b/engines/sci/sound/drivers/amigamac0.cpp
@@ -33,7 +33,7 @@
#include "sci/sound/drivers/mididriver.h"
#include "sci/sound/drivers/macmixer.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "common/file.h"
#include "common/memstream.h"
diff --git a/engines/sci/sound/drivers/amigamac1.cpp b/engines/sci/sound/drivers/amigamac1.cpp
index 8739afea34..9de0d21a6a 100644
--- a/engines/sci/sound/drivers/amigamac1.cpp
+++ b/engines/sci/sound/drivers/amigamac1.cpp
@@ -22,7 +22,7 @@
#include "sci/sound/drivers/mididriver.h"
#include "sci/sound/drivers/macmixer.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "audio/mixer.h"
#include "audio/mods/paula.h"
diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp
index 9bb632ea46..7ab058145b 100644
--- a/engines/sci/sound/drivers/cms.cpp
+++ b/engines/sci/sound/drivers/cms.cpp
@@ -28,7 +28,7 @@
#include "common/system.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/util.h"
#define SCI0_CMS_ORIGINAL_BUG 1
diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp
index 4062d6ba78..b994c1d6bf 100644
--- a/engines/sci/sound/drivers/fb01.cpp
+++ b/engines/sci/sound/drivers/fb01.cpp
@@ -22,7 +22,7 @@
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/drivers/mididriver.h"
#include "sci/util.h"
diff --git a/engines/sci/sound/drivers/fmtowns.cpp b/engines/sci/sound/drivers/fmtowns.cpp
index 5ba67100cd..850f520860 100644
--- a/engines/sci/sound/drivers/fmtowns.cpp
+++ b/engines/sci/sound/drivers/fmtowns.cpp
@@ -28,7 +28,7 @@
#include "audio/softsynth/fmtowns_pc98/towns_audio.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/drivers/mididriver.h"
namespace Sci {
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 955d671aa7..4cb1fed8ea 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -30,7 +30,7 @@
#include "audio/mididrv.h"
#include "audio/mt32gm.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/sound/drivers/gm_names.h"
#include "sci/sound/drivers/mididriver.h"
diff --git a/engines/sci/sound/drivers/pc9801.cpp b/engines/sci/sound/drivers/pc9801.cpp
index 64d0af7d2f..be936589ba 100644
--- a/engines/sci/sound/drivers/pc9801.cpp
+++ b/engines/sci/sound/drivers/pc9801.cpp
@@ -28,7 +28,7 @@
#include "audio/softsynth/fmtowns_pc98/pc98_audio.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/drivers/mididriver.h"
/* PC-98 sound driver for:
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index f8a1a01265..e4e49c5c9d 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -23,7 +23,7 @@
#ifndef SCI_MIDIPARSER_H
#define SCI_MIDIPARSER_H
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/music.h"
#include "audio/midiparser.h"
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 49d9da316d..4dcec0913c 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -28,7 +28,7 @@
#include "sci/sci.h"
#include "sci/console.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/engine/features.h"
#include "sci/engine/kernel.h"
#include "sci/engine/state.h"
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 52fda388ba..38fee46601 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -29,7 +29,7 @@
#include "audio/mixer.h"
#include "sci/sci.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/drivers/mididriver.h"
#ifdef ENABLE_SCI32
#include "sci/sound/audio32.h"
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 1ab9658c8b..7073d99252 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -23,7 +23,7 @@
#include "common/config-manager.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
-#include "sci/resource.h"
+#include "sci/resource/resource.h"
#include "sci/sound/audio.h"
#include "sci/sound/music.h"
#include "sci/sound/soundcmd.h"
Commit: f02068a8f3a9784215276779f9eefaf5b7a23346
https://github.com/scummvm/scummvm/commit/f02068a8f3a9784215276779f9eefaf5b7a23346
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-11-29T14:36:18+02:00
Commit Message:
SCI: Add a flag to distinguish SCI16 from SCI32 games during detection
Changed paths:
engines/sci/metaengine.cpp
diff --git a/engines/sci/metaengine.cpp b/engines/sci/metaengine.cpp
index 73f0a9d625..1b7bdfcf33 100644
--- a/engines/sci/metaengine.cpp
+++ b/engines/sci/metaengine.cpp
@@ -43,89 +43,90 @@ namespace Sci {
struct GameIdStrToEnum {
const char *gameidStr;
SciGameId gameidEnum;
+ bool isSci32;
};
static const GameIdStrToEnum s_gameIdStrToEnum[] = {
- { "astrochicken", GID_ASTROCHICKEN },
- { "camelot", GID_CAMELOT },
- { "castlebrain", GID_CASTLEBRAIN },
- { "chest", GID_CHEST },
- { "christmas1988", GID_CHRISTMAS1988 },
- { "christmas1990", GID_CHRISTMAS1990 },
- { "christmas1992", GID_CHRISTMAS1992 },
- { "cnick-kq", GID_CNICK_KQ },
- { "cnick-laurabow", GID_CNICK_LAURABOW },
- { "cnick-longbow", GID_CNICK_LONGBOW },
- { "cnick-lsl", GID_CNICK_LSL },
- { "cnick-sq", GID_CNICK_SQ },
- { "ecoquest", GID_ECOQUEST },
- { "ecoquest2", GID_ECOQUEST2 },
- { "fairytales", GID_FAIRYTALES },
- { "freddypharkas", GID_FREDDYPHARKAS },
- { "funseeker", GID_FUNSEEKER },
- { "gk1demo", GID_GK1DEMO },
- { "gk1", GID_GK1 },
- { "gk2", GID_GK2 },
- { "hoyle1", GID_HOYLE1 },
- { "hoyle2", GID_HOYLE2 },
- { "hoyle3", GID_HOYLE3 },
- { "hoyle4", GID_HOYLE4 },
- { "hoyle5", GID_HOYLE5 },
- { "hoyle5bridge", GID_HOYLE5 },
- { "hoyle5children", GID_HOYLE5 },
- { "hoyle5solitaire", GID_HOYLE5 },
- { "iceman", GID_ICEMAN },
- { "inndemo", GID_INNDEMO },
- { "islandbrain", GID_ISLANDBRAIN },
- { "jones", GID_JONES },
- { "kq1sci", GID_KQ1 },
- { "kq4sci", GID_KQ4 },
- { "kq5", GID_KQ5 },
- { "kq6", GID_KQ6 },
- { "kq7", GID_KQ7 },
- { "kquestions", GID_KQUESTIONS },
- { "laurabow", GID_LAURABOW },
- { "laurabow2", GID_LAURABOW2 },
- { "lighthouse", GID_LIGHTHOUSE },
- { "longbow", GID_LONGBOW },
- { "lsl1sci", GID_LSL1 },
- { "lsl2", GID_LSL2 },
- { "lsl3", GID_LSL3 },
- { "lsl5", GID_LSL5 },
- { "lsl6", GID_LSL6 },
- { "lsl6hires", GID_LSL6HIRES },
- { "lsl7", GID_LSL7 },
- { "mothergoose", GID_MOTHERGOOSE },
- { "mothergoose256", GID_MOTHERGOOSE256 },
- { "mothergoosehires",GID_MOTHERGOOSEHIRES },
- { "msastrochicken", GID_MSASTROCHICKEN },
- { "pepper", GID_PEPPER },
- { "phantasmagoria", GID_PHANTASMAGORIA },
- { "phantasmagoria2", GID_PHANTASMAGORIA2 },
- { "pq1sci", GID_PQ1 },
- { "pq2", GID_PQ2 },
- { "pq3", GID_PQ3 },
- { "pq4", GID_PQ4 },
- { "pq4demo", GID_PQ4DEMO },
- { "pqswat", GID_PQSWAT },
- { "qfg1", GID_QFG1 },
- { "qfg1vga", GID_QFG1VGA },
- { "qfg2", GID_QFG2 },
- { "qfg3", GID_QFG3 },
- { "qfg4", GID_QFG4 },
- { "qfg4demo", GID_QFG4DEMO },
- { "rama", GID_RAMA },
- { "sci-fanmade", GID_FANMADE },
- { "shivers", GID_SHIVERS },
- //{ "shivers2", GID_SHIVERS2 }, // Not SCI
- { "slater", GID_SLATER },
- { "sq1sci", GID_SQ1 },
- { "sq3", GID_SQ3 },
- { "sq4", GID_SQ4 },
- { "sq5", GID_SQ5 },
- { "sq6", GID_SQ6 },
- { "torin", GID_TORIN },
- { NULL, (SciGameId)-1 }
+ { "astrochicken", GID_ASTROCHICKEN, false },
+ { "camelot", GID_CAMELOT, false },
+ { "castlebrain", GID_CASTLEBRAIN, false },
+ { "chest", GID_CHEST, true },
+ { "christmas1988", GID_CHRISTMAS1988, false },
+ { "christmas1990", GID_CHRISTMAS1990, false },
+ { "christmas1992", GID_CHRISTMAS1992, false },
+ { "cnick-kq", GID_CNICK_KQ, false },
+ { "cnick-laurabow", GID_CNICK_LAURABOW, false },
+ { "cnick-longbow", GID_CNICK_LONGBOW, false },
+ { "cnick-lsl", GID_CNICK_LSL, false },
+ { "cnick-sq", GID_CNICK_SQ, false },
+ { "ecoquest", GID_ECOQUEST, false },
+ { "ecoquest2", GID_ECOQUEST2, false },
+ { "fairytales", GID_FAIRYTALES, false },
+ { "freddypharkas", GID_FREDDYPHARKAS, false },
+ { "funseeker", GID_FUNSEEKER, false },
+ { "gk1demo", GID_GK1DEMO, false },
+ { "gk1", GID_GK1, true },
+ { "gk2", GID_GK2, true },
+ { "hoyle1", GID_HOYLE1, false },
+ { "hoyle2", GID_HOYLE2, false },
+ { "hoyle3", GID_HOYLE3, false },
+ { "hoyle4", GID_HOYLE4, false },
+ { "hoyle5", GID_HOYLE5, true },
+ { "hoyle5bridge", GID_HOYLE5, true },
+ { "hoyle5children", GID_HOYLE5, true },
+ { "hoyle5solitaire", GID_HOYLE5, true },
+ { "iceman", GID_ICEMAN, false },
+ { "inndemo", GID_INNDEMO, false },
+ { "islandbrain", GID_ISLANDBRAIN, false },
+ { "jones", GID_JONES, false },
+ { "kq1sci", GID_KQ1, false },
+ { "kq4sci", GID_KQ4, false },
+ { "kq5", GID_KQ5, false },
+ { "kq6", GID_KQ6, false },
+ { "kq7", GID_KQ7, true },
+ { "kquestions", GID_KQUESTIONS, true },
+ { "laurabow", GID_LAURABOW, false },
+ { "laurabow2", GID_LAURABOW2, false },
+ { "lighthouse", GID_LIGHTHOUSE, true },
+ { "longbow", GID_LONGBOW, false },
+ { "lsl1sci", GID_LSL1, false },
+ { "lsl2", GID_LSL2, false },
+ { "lsl3", GID_LSL3, false },
+ { "lsl5", GID_LSL5, false },
+ { "lsl6", GID_LSL6, false },
+ { "lsl6hires", GID_LSL6HIRES, true },
+ { "lsl7", GID_LSL7, true },
+ { "mothergoose", GID_MOTHERGOOSE, false },
+ { "mothergoose256", GID_MOTHERGOOSE256, false },
+ { "mothergoosehires",GID_MOTHERGOOSEHIRES, true },
+ { "msastrochicken", GID_MSASTROCHICKEN, false },
+ { "pepper", GID_PEPPER, false },
+ { "phantasmagoria", GID_PHANTASMAGORIA, true },
+ { "phantasmagoria2", GID_PHANTASMAGORIA2, true },
+ { "pq1sci", GID_PQ1, false },
+ { "pq2", GID_PQ2, false },
+ { "pq3", GID_PQ3, false },
+ { "pq4", GID_PQ4, true },
+ { "pq4demo", GID_PQ4DEMO, false },
+ { "pqswat", GID_PQSWAT, true },
+ { "qfg1", GID_QFG1, false },
+ { "qfg1vga", GID_QFG1VGA, false },
+ { "qfg2", GID_QFG2, false },
+ { "qfg3", GID_QFG3, false },
+ { "qfg4", GID_QFG4, true },
+ { "qfg4demo", GID_QFG4DEMO, false },
+ { "rama", GID_RAMA, true },
+ { "sci-fanmade", GID_FANMADE, false },
+ { "shivers", GID_SHIVERS, true },
+ //{ "shivers2", GID_SHIVERS2, true }, // Not SCI
+ { "slater", GID_SLATER, false },
+ { "sq1sci", GID_SQ1, false },
+ { "sq3", GID_SQ3, false },
+ { "sq4", GID_SQ4, false },
+ { "sq5", GID_SQ5, false },
+ { "sq6", GID_SQ6, true },
+ { "torin", GID_TORIN, true },
+ { NULL, (SciGameId)-1, false }
};
struct OldNewIdTableEntry {
More information about the Scummvm-git-logs
mailing list