[Scummvm-git-logs] scummvm master -> 0f2bcaf6b67ad1d735d5e74828a2f43c29739c77
sev-
sev at scummvm.org
Wed Feb 5 14:17:49 UTC 2020
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c7a9fc2acf COMPOSER: Split out detection tables
70d454310c CRYO: Added override keywords
fe19789edd DIRECTOR: Added override keywords
6031ea426d DM: Added override keywords
f957dee10e DRACI: Added override keywords
2da484c128 DRASCULA: Added override keywords
8c26862614 DREAMWEB: Added override keywords
0f2bcaf6b6 FULLPIPE: Added override keywords
Commit: c7a9fc2acfc58476b007a623e2af5ead6556b02e
https://github.com/scummvm/scummvm/commit/c7a9fc2acfc58476b007a623e2af5ead6556b02e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:01:24+01:00
Commit Message:
COMPOSER: Split out detection tables
Changed paths:
A engines/composer/detection_tables.h
engines/composer/detection.cpp
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 61ba89f..8375213 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -83,624 +83,7 @@ static const PlainGameDescriptor composerGames[] = {
{0, 0}
};
-namespace Composer {
-
-static const ComposerGameDescription gameDescriptions[] = {
- // Magic Tales: Baba Yaga and the Magic Geese - from bug #3485018
- {
- {
- "babayaga",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "412b7f4b0ef07f442009d28e3a819974", 3852},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Baba Yaga and the Magic Geese Mac - from bug #3466402, #7025
- {
- {
- "babayaga",
- 0,
- {
- {"book.mac", GAME_CONFIGFILE, "d82143cbc4a36093250c7d6f80af1147", -1},
- {"Baba Yaga", GAME_EXECUTABLE, "ae3a4445f42fe10253da7ee4ea0d37d6", 44321},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Baba Yaga and the Magic Geese German- from bug #10171
- {
- {
- "babayaga",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "2a20e73d33ecd0f2fa8123d4f9862f90", 3814},
- AD_LISTEND
- },
- Common::DE_DEU,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Imo and the King - from bug #3485018
- {
- {
- "imoking",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "62b52a1763cce7d7d6ccde9f9d32fd4b", 3299},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Imo and the King Hebrew Windows
- {
- {
- "imoking",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "2b3eb997e8f55a03e81f67563c40adf4", 3337},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Imo and the King Hebrew Macintosh
- {
- {
- "imoking",
- 0,
- {
- {"book.mac", GAME_CONFIGFILE, "4896a22874bb660f5ba26a0af111f9c0", 1868},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Baba Yaga Demo from Imo and the King Hebrew CD
- {
- {
- "babayaga",
- "Magic Tales: Baba Yaga and the Magic Geese Demo",
- {
- {"by_demo.ini", GAME_CONFIGFILE, "4a87806683add232916298d6b62b9420", 224},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Little Samurai Demo from Imo and the King Hebrew CD
- {
- {
- "littlesamurai",
- "Magic Tales: The Little Samurai Demo",
- {
- {"ls_demo.ini", GAME_CONFIGFILE, "462cad83006721d2491dde7ef7a2d243", 223},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Baba Yaga Demo from Imo and the King Hebrew CD
- {
- {
- "babayaga",
- "Magic Tales: Baba Yaga and the Magic Geese Demo",
- {
- {"book.mac", GAME_CONFIGFILE, "ed4a902df3b26d58e9c013f814a30ee8", 134},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Little Samurai Demo from Imo and the King Hebrew CD
- {
- {
- "littlesamurai",
- "Magic Tales: The Little Samurai Demo",
- {
- {"book.mac", GAME_CONFIGFILE, "57a82d563800001ed88b2742c3650a2d", 136},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Imo and the King Mac - from bug #3466402
- {
- {
- "imoking",
- 0,
- {
- {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", -1},
- {"imo and the king", GAME_EXECUTABLE, "b0277885fec943b5f19409f35b33964c", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: Imo and the King German - from bug #10199
- {
- {
- "imoking",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "5925c6d4bf85d89b17208be4fcace5e8", 3274},
- AD_LISTEND
- },
- Common::DE_DEU,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: The Little Samurai - from bug #3485018
- {
- {
- "littlesamurai",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "7a851869d022a9041e0dd11e5bace09b", 3747},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: The Little Samurai Mac - from bug #3466402
- {
- {
- "littlesamurai",
- 0,
- {
- {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", -1},
- {"The Little Samurai", GAME_EXECUTABLE, "38121dd649c24e8676aa108cf35d44b5", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: The Little Samurai Hebrew Windows
- {
- {
- "littlesamurai",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "c5f2c84df04780e7e67c70ec85b780a8", 3789},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Magic Tales: The Little Samurai Hebrew Macintosh
- {
- {
- "littlesamurai",
- 0,
- {
- {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", 1874},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // from Liam Finds a Story CD
- {
- {
- "magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
- {
- {"book.ini", GAME_CONFIGFILE, "dbc98c566f4ac61b544443524585dccb", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Windows Demo from Little Samurai Hebrew CD
- {
- {
- "magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
- {
- {"demo.ini", GAME_CONFIGFILE, "ea784af960375834d655eb7281cd4500", -1},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformWindows,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- // Macintosh Demo from Little Samurai Hebrew CD
- {
- {
- "magictales",
- "Magic Tales Demo: Baby Yaga, Samurai, Imo",
- {
- {"demo.mac", GAME_CONFIGFILE, "6e775cda6539102d1ddee852bebf32c1", 488},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformMacintosh,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV1
- },
-
- {
- {
- "liam",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "fc9d9b9e72e7301d011b808606eaa15b", 834},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- // Liam Finds a Story Mac - from bug #3463201
- {
- {
- "liam",
- 0,
- {
- {"liam finds a story.ini", GAME_CONFIGFILE, "85a1ca6002ded8572920bbdb73d35b0a", -1},
- {"page99.rsc", GAME_SCRIPTFILE, "11b0a19c6b6d73c39e2bd289a457c1dc", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- // from Liam Finds a Story CD
- {
- {
- "magictales",
- "Magic Tales Demo: Sleeping Cub, Princess & Crab",
- {
- {"book.ini", GAME_CONFIGFILE, "3dede2522bb0886c95667b082987a87f", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_USEEXTRAASTITLE | ADGF_DEMO,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- {
- {
- "darby",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "7e3404c559d058521fff2aebe5c427a8", 2545},
- {"page99.rsc", GAME_SCRIPTFILE, "49cc6b16caa1c5ec7d94a3c47eed9a02", 1286480},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- {
- {
- "darby",
- 0,
- {
- {"Darby the Dragon.ini", GAME_CONFIGFILE, "d81f9214936fa70d42fc578908d4bb3d", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by msSeven - from bug Trac #10399
- {
- "darby",
- 0,
- {
- {"page99.rsc", GAME_SCRIPTFILE, "ca350397f0c009649afc0cb6145921f0", 1286480},
- AD_LISTEND
- },
- Common::FR_FRA,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by Strangerke, "CD-Rom 100% Malin" Pack
- {
- "darby",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "285308372f7dddff2ca5a25c9192cf5c", -1},
- AD_LISTEND
- },
- Common::FR_FRA,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825
- {
- "darby",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "285308372f7dddff2ca5a25c9192cf5c", 2545},
- {"page99.rsc", GAME_SCRIPTFILE, "40b4879e9ba6a34d6aa2a9d2e30c5ef7", 1286480},
- AD_LISTEND
- },
- Common::DE_DEU,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by Niv Baehr, Bugreport #6878
- {
- "darby",
- 0,
- {
- {"page99.rsc", GAME_SCRIPTFILE, "183463d18c050563dcdec2d9f9670515", -1},
- AD_LISTEND
- },
- Common::HE_ISR,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- {
- {
- "gregory",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "14a562dcf361773445255af9f3e94790", 2234},
- {"page99.rsc", GAME_SCRIPTFILE, "01f9381162467e052dfd4c704169ef3e", 388644},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- {
- {
- "gregory",
- 0,
- {
- {"Gregory.ini", GAME_CONFIGFILE, "fa82f14731f28c7379c5a106df07a0d6", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by Strangerke, "CD-Rom 100% Malin" Pack
- {
- "gregory",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "e54fc5c00de5f94e908a969e445af5d0", -1},
- AD_LISTEND
- },
- Common::FR_FRA,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825
- {
- "gregory",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "e54fc5c00de5f94e908a969e445af5d0", 2234},
- {"page99.rsc", GAME_SCRIPTFILE, "1ae6610de621a9901bf87b874fbf331f", 388644},
- AD_LISTEND
- },
- Common::DE_DEU,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by sev
- {
- "princess",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "fb32572577b9a41ba299825ef1e3181e", 966},
- {"page99.rsc", GAME_SCRIPTFILE, "fd5ebd3b5e36c4651c50241619525355", 45418},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- // The Princess and the Crab Mac - From Bug #3461984
- {
- {
- "princess",
- 0,
- {
- {"the princess and the crab.ini", GAME_CONFIGFILE, "f6b551a7304643004bd5e4df7ac1e76e", -1},
- {"page99.rsc", GAME_SCRIPTFILE, "fd5ebd3b5e36c4651c50241619525355", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { // Provided by sev
- {
- "sleepingcub",
- 0,
- {
- {"book.ini", GAME_CONFIGFILE, "0d329e592387009c6387a733a3ea2235", 964},
- {"page99.rsc", GAME_SCRIPTFILE, "219fbd9bd2ff87c7023814405d753145", 46916},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformWindows,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- // Sleeping Cub Mac - From Bug #3461369
- {
- {
- "sleepingcub",
- 0,
- {
- {"sleeping cub.ini", GAME_CONFIGFILE, "39642a4036cb51443f5e90052c3ad0b2", -1},
- {"page99.rsc", GAME_SCRIPTFILE, "219fbd9bd2ff87c7023814405d753145", -1},
- AD_LISTEND
- },
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
- },
- GType_ComposerV2
- },
-
- { AD_TABLE_END_MARKER, 0 }
-};
-
-} // End of namespace Composer
+#include "composer/detection_tables.h"
using namespace Composer;
diff --git a/engines/composer/detection_tables.h b/engines/composer/detection_tables.h
new file mode 100644
index 0000000..84d79b4
--- /dev/null
+++ b/engines/composer/detection_tables.h
@@ -0,0 +1,640 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+namespace Composer {
+
+static const ComposerGameDescription gameDescriptions[] = {
+ // Magic Tales: Baba Yaga and the Magic Geese - from bug #3485018
+ {
+ {
+ "babayaga",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "412b7f4b0ef07f442009d28e3a819974", 3852},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Baba Yaga and the Magic Geese Mac - from bug #3466402, #7025
+ {
+ {
+ "babayaga",
+ 0,
+ {
+ {"book.mac", GAME_CONFIGFILE, "d82143cbc4a36093250c7d6f80af1147", -1},
+ {"Baba Yaga", GAME_EXECUTABLE, "ae3a4445f42fe10253da7ee4ea0d37d6", 44321},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Baba Yaga and the Magic Geese German- from bug #10171
+ {
+ {
+ "babayaga",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "2a20e73d33ecd0f2fa8123d4f9862f90", 3814},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Imo and the King - from bug #3485018
+ {
+ {
+ "imoking",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "62b52a1763cce7d7d6ccde9f9d32fd4b", 3299},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Imo and the King Hebrew Windows
+ {
+ {
+ "imoking",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "2b3eb997e8f55a03e81f67563c40adf4", 3337},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Imo and the King Hebrew Macintosh
+ {
+ {
+ "imoking",
+ 0,
+ {
+ {"book.mac", GAME_CONFIGFILE, "4896a22874bb660f5ba26a0af111f9c0", 1868},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Baba Yaga Demo from Imo and the King Hebrew CD
+ {
+ {
+ "babayaga",
+ "Magic Tales: Baba Yaga and the Magic Geese Demo",
+ {
+ {"by_demo.ini", GAME_CONFIGFILE, "4a87806683add232916298d6b62b9420", 224},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Little Samurai Demo from Imo and the King Hebrew CD
+ {
+ {
+ "littlesamurai",
+ "Magic Tales: The Little Samurai Demo",
+ {
+ {"ls_demo.ini", GAME_CONFIGFILE, "462cad83006721d2491dde7ef7a2d243", 223},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Baba Yaga Demo from Imo and the King Hebrew CD
+ {
+ {
+ "babayaga",
+ "Magic Tales: Baba Yaga and the Magic Geese Demo",
+ {
+ {"book.mac", GAME_CONFIGFILE, "ed4a902df3b26d58e9c013f814a30ee8", 134},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Little Samurai Demo from Imo and the King Hebrew CD
+ {
+ {
+ "littlesamurai",
+ "Magic Tales: The Little Samurai Demo",
+ {
+ {"book.mac", GAME_CONFIGFILE, "57a82d563800001ed88b2742c3650a2d", 136},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Imo and the King Mac - from bug #3466402
+ {
+ {
+ "imoking",
+ 0,
+ {
+ {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", -1},
+ {"imo and the king", GAME_EXECUTABLE, "b0277885fec943b5f19409f35b33964c", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: Imo and the King German - from bug #10199
+ {
+ {
+ "imoking",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "5925c6d4bf85d89b17208be4fcace5e8", 3274},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: The Little Samurai - from bug #3485018
+ {
+ {
+ "littlesamurai",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "7a851869d022a9041e0dd11e5bace09b", 3747},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: The Little Samurai Mac - from bug #3466402
+ {
+ {
+ "littlesamurai",
+ 0,
+ {
+ {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", -1},
+ {"The Little Samurai", GAME_EXECUTABLE, "38121dd649c24e8676aa108cf35d44b5", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: The Little Samurai Hebrew Windows
+ {
+ {
+ "littlesamurai",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "c5f2c84df04780e7e67c70ec85b780a8", 3789},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Magic Tales: The Little Samurai Hebrew Macintosh
+ {
+ {
+ "littlesamurai",
+ 0,
+ {
+ {"book.mac", GAME_CONFIGFILE, "190158751630f69c2b6cf146aa2f1efc", 1874},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // from Liam Finds a Story CD
+ {
+ {
+ "magictales",
+ "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ {
+ {"book.ini", GAME_CONFIGFILE, "dbc98c566f4ac61b544443524585dccb", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Windows Demo from Little Samurai Hebrew CD
+ {
+ {
+ "magictales",
+ "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ {
+ {"demo.ini", GAME_CONFIGFILE, "ea784af960375834d655eb7281cd4500", -1},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformWindows,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ // Macintosh Demo from Little Samurai Hebrew CD
+ {
+ {
+ "magictales",
+ "Magic Tales Demo: Baby Yaga, Samurai, Imo",
+ {
+ {"demo.mac", GAME_CONFIGFILE, "6e775cda6539102d1ddee852bebf32c1", 488},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformMacintosh,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV1
+ },
+
+ {
+ {
+ "liam",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "fc9d9b9e72e7301d011b808606eaa15b", 834},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ // Liam Finds a Story Mac - from bug #3463201
+ {
+ {
+ "liam",
+ 0,
+ {
+ {"liam finds a story.ini", GAME_CONFIGFILE, "85a1ca6002ded8572920bbdb73d35b0a", -1},
+ {"page99.rsc", GAME_SCRIPTFILE, "11b0a19c6b6d73c39e2bd289a457c1dc", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ // from Liam Finds a Story CD
+ {
+ {
+ "magictales",
+ "Magic Tales Demo: Sleeping Cub, Princess & Crab",
+ {
+ {"book.ini", GAME_CONFIGFILE, "3dede2522bb0886c95667b082987a87f", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_USEEXTRAASTITLE | ADGF_DEMO,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ {
+ {
+ "darby",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "7e3404c559d058521fff2aebe5c427a8", 2545},
+ {"page99.rsc", GAME_SCRIPTFILE, "49cc6b16caa1c5ec7d94a3c47eed9a02", 1286480},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ {
+ {
+ "darby",
+ 0,
+ {
+ {"Darby the Dragon.ini", GAME_CONFIGFILE, "d81f9214936fa70d42fc578908d4bb3d", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by msSeven - from bug Trac #10399
+ {
+ "darby",
+ 0,
+ {
+ {"page99.rsc", GAME_SCRIPTFILE, "ca350397f0c009649afc0cb6145921f0", 1286480},
+ AD_LISTEND
+ },
+ Common::FR_FRA,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by Strangerke, "CD-Rom 100% Malin" Pack
+ {
+ "darby",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "285308372f7dddff2ca5a25c9192cf5c", -1},
+ AD_LISTEND
+ },
+ Common::FR_FRA,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825
+ {
+ "darby",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "285308372f7dddff2ca5a25c9192cf5c", 2545},
+ {"page99.rsc", GAME_SCRIPTFILE, "40b4879e9ba6a34d6aa2a9d2e30c5ef7", 1286480},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by Niv Baehr, Bugreport #6878
+ {
+ "darby",
+ 0,
+ {
+ {"page99.rsc", GAME_SCRIPTFILE, "183463d18c050563dcdec2d9f9670515", -1},
+ AD_LISTEND
+ },
+ Common::HE_ISR,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ {
+ {
+ "gregory",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "14a562dcf361773445255af9f3e94790", 2234},
+ {"page99.rsc", GAME_SCRIPTFILE, "01f9381162467e052dfd4c704169ef3e", 388644},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ {
+ {
+ "gregory",
+ 0,
+ {
+ {"Gregory.ini", GAME_CONFIGFILE, "fa82f14731f28c7379c5a106df07a0d6", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by Strangerke, "CD-Rom 100% Malin" Pack
+ {
+ "gregory",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "e54fc5c00de5f94e908a969e445af5d0", -1},
+ AD_LISTEND
+ },
+ Common::FR_FRA,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by WindlePoons, "100% Kids Darby & Gregor" Pack. Bugreport #6825
+ {
+ "gregory",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "e54fc5c00de5f94e908a969e445af5d0", 2234},
+ {"page99.rsc", GAME_SCRIPTFILE, "1ae6610de621a9901bf87b874fbf331f", 388644},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by sev
+ {
+ "princess",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "fb32572577b9a41ba299825ef1e3181e", 966},
+ {"page99.rsc", GAME_SCRIPTFILE, "fd5ebd3b5e36c4651c50241619525355", 45418},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ // The Princess and the Crab Mac - From Bug #3461984
+ {
+ {
+ "princess",
+ 0,
+ {
+ {"the princess and the crab.ini", GAME_CONFIGFILE, "f6b551a7304643004bd5e4df7ac1e76e", -1},
+ {"page99.rsc", GAME_SCRIPTFILE, "fd5ebd3b5e36c4651c50241619525355", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { // Provided by sev
+ {
+ "sleepingcub",
+ 0,
+ {
+ {"book.ini", GAME_CONFIGFILE, "0d329e592387009c6387a733a3ea2235", 964},
+ {"page99.rsc", GAME_SCRIPTFILE, "219fbd9bd2ff87c7023814405d753145", 46916},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ // Sleeping Cub Mac - From Bug #3461369
+ {
+ {
+ "sleepingcub",
+ 0,
+ {
+ {"sleeping cub.ini", GAME_CONFIGFILE, "39642a4036cb51443f5e90052c3ad0b2", -1},
+ {"page99.rsc", GAME_SCRIPTFILE, "219fbd9bd2ff87c7023814405d753145", -1},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOASPECT, GUIO_NOMIDI)
+ },
+ GType_ComposerV2
+ },
+
+ { AD_TABLE_END_MARKER, 0 }
+};
+
+} // End of namespace Composer
Commit: 70d454310c221edfa2952d38447a3bbd19bd1aa1
https://github.com/scummvm/scummvm/commit/70d454310c221edfa2952d38447a3bbd19bd1aa1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:02:07+01:00
Commit Message:
CRYO: Added override keywords
Changed paths:
engines/cryo/detection.cpp
diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp
index 4d4e2bd..fea9a20 100644
--- a/engines/cryo/detection.cpp
+++ b/engines/cryo/detection.cpp
@@ -135,20 +135,20 @@ public:
CryoMetaEngine() : AdvancedMetaEngine(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cryo";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Cryo";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Cryo Engine (C) Cryo Interactive";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool CryoMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: fe19789edd11a553ab74e27298bfd013d6260433
https://github.com/scummvm/scummvm/commit/fe19789edd11a553ab74e27298bfd013d6260433
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:03:47+01:00
Commit Message:
DIRECTOR: Added override keywords
Changed paths:
engines/director/director.h
diff --git a/engines/director/director.h b/engines/director/director.h
index 35f38c5..3695532 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -147,7 +147,7 @@ public:
Common::List<MovieReference> _movieStack;
protected:
- virtual Common::Error run();
+ virtual Common::Error run() override;
private:
const DirectorGameDescription *_gameDescription;
Commit: 6031ea426dc09fa46b27559f997c6e78ec5fe972
https://github.com/scummvm/scummvm/commit/6031ea426dc09fa46b27559f997c6e78ec5fe972
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:04:50+01:00
Commit Message:
DM: Added override keywords
Changed paths:
engines/dm/dm.h
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index e575020..eeb72a9 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -225,19 +225,19 @@ public:
~DMEngine();
virtual bool hasFeature(EngineFeature f) const override;
- virtual Common::Error loadGameState(int slot);
- virtual bool canLoadGameStateCurrently();
+ virtual Common::Error loadGameState(int slot) override;
+ virtual bool canLoadGameStateCurrently() override;
bool isDemo() const;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
void delay(uint16 verticalBlank); // @ F0022_MAIN_Delay
uint16 getScaledProduct(uint16 val, uint16 scale, uint16 vale2); // @ F0030_MAIN_GetScaledProduct
uint16 getRandomNumber(uint32 max) { return _rnd->getRandomNumber(max - 1); }
int16 ordinalToIndex(int16 val); // @ M01_ORDINAL_TO_INDEX
int16 indexToOrdinal(int16 val); // @ M00_INDEX_TO_ORDINAL
- virtual Common::Error run(); // @ main
+ virtual Common::Error run() override; // @ main
void saveGame(); // @ F0433_STARTEND_ProcessCommand140_SaveGame_CPSCDF
LoadgameResult loadgame(int16 slot); // @ F0435_STARTEND_LoadGame_CPSF
void endGame(bool doNotDrawCreditsOnly); // @ F0444_STARTEND_Endgame
Commit: f957dee10eee259858cbccbe35357c3d4d6dbe92
https://github.com/scummvm/scummvm/commit/f957dee10eee259858cbccbe35357c3d4d6dbe92
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:11:35+01:00
Commit Message:
DRACI: Added override keywords
Changed paths:
engines/draci/detection.cpp
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index 80ae4b5..bdd8e88 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -86,24 +86,24 @@ public:
DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "draci";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Draci Historie";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Draci Historie (C) 1995 NoSense";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual int getMaximumSaveSlot() const { return 99; }
- virtual SaveStateList listSaves(const char *target) const;
- virtual void removeSaveState(const char *target, int slot) const;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual int getMaximumSaveSlot() const override { return 99; }
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool DraciMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 2da484c1283233c9ef69cfb75a434139befd7c2f
https://github.com/scummvm/scummvm/commit/2da484c1283233c9ef69cfb75a434139befd7c2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:13:46+01:00
Commit Message:
DRASCULA: Added override keywords
Changed paths:
engines/drascula/detection.cpp
engines/drascula/drascula.h
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 86f6428..ffce17d 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -342,25 +342,25 @@ public:
_guiOptions = GUIO1(GUIO_NOMIDI);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "drascula";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Drascula: The Vampire Strikes Back";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Drascula: The Vampire Strikes Back (C) 2000 Alcachofa Soft, (C) 1996 Digital Dreams Multimedia, (C) 1994 Emilio de Paz";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool DrasculaMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index c6f7d78..0d5c4ed 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -319,19 +319,19 @@ struct RoomHandlers;
class DrasculaEngine : public Engine {
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
public:
DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gameDesc);
virtual ~DrasculaEngine();
virtual bool hasFeature(EngineFeature f) const override;
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
- virtual Common::Error loadGameState(int slot);
- virtual bool canLoadGameStateCurrently();
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual bool canSaveGameStateCurrently();
+ virtual Common::Error loadGameState(int slot) override;
+ virtual bool canLoadGameStateCurrently() override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
+ virtual bool canSaveGameStateCurrently() override;
Common::RandomSource *_rnd;
const DrasculaGameDescription *_gameDescription;
@@ -734,7 +734,7 @@ public:
void update_102();
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
private:
int _lang;
Commit: 8c26862614c636a33370daa8ad71c6d41585e523
https://github.com/scummvm/scummvm/commit/8c26862614c636a33370daa8ad71c6d41585e523
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:15:32+01:00
Commit Message:
DREAMWEB: Added override keywords
Changed paths:
engines/dreamweb/detection.cpp
engines/dreamweb/dreamweb.h
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 82f5619..6a035ad 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -74,24 +74,24 @@ public:
_guiOptions = GUIO1(GUIO_NOMIDI);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "dreamweb";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "DreamWeb";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "DreamWeb (C) Creative Reality";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual SaveStateList listSaves(const char *target) const;
- virtual int getMaximumSaveSlot() const;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool DreamWebMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 0af31bb..9b61efd 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -105,10 +105,10 @@ private:
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
public:
DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc);
@@ -116,11 +116,11 @@ public:
void waitForVSync();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
uint8 randomNumber() { return _rnd.getRandomNumber(255); }
Commit: 0f2bcaf6b67ad1d735d5e74828a2f43c29739c77
https://github.com/scummvm/scummvm/commit/0f2bcaf6b67ad1d735d5e74828a2f43c29739c77
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:17:15+01:00
Commit Message:
FULLPIPE: Added override keywords
Changed paths:
engines/fullpipe/detection.cpp
engines/fullpipe/fullpipe.h
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index 51de92a..9ee85ce 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -132,24 +132,24 @@ public:
FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "fullpipe";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Full Pipe";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Full Pipe (C) Pipe Studio";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual int getMaximumSaveSlot() const { return 99; }
- virtual SaveStateList listSaves(const char *target) const;
- virtual void removeSaveState(const char *target, int slot) const;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual int getMaximumSaveSlot() const override { return 99; }
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 8f1b809..1528678 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -104,14 +104,14 @@ void global_messageHandler_handleSound(ExCommand *cmd);
class FullpipeEngine : public ::Engine {
protected:
- Common::Error run();
+ Common::Error run() override;
public:
FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc);
virtual ~FullpipeEngine();
Console _console;
- GUI::Debugger *getDebugger() { return &_console; }
+ GUI::Debugger *getDebugger() override { return &_console; }
void initialize();
void restartGame();
@@ -360,11 +360,11 @@ public:
bool _isSaveAllowed;
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &description);
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &description) override;
- virtual bool canLoadGameStateCurrently() { return true; }
- virtual bool canSaveGameStateCurrently() { return _isSaveAllowed; }
+ virtual bool canLoadGameStateCurrently() override { return true; }
+ virtual bool canSaveGameStateCurrently() override { return _isSaveAllowed; }
virtual bool hasFeature(EngineFeature f) const override;
};
More information about the Scummvm-git-logs
mailing list