aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2019-11-17 11:05:18 -0800
committerPaul Gilbert2019-11-17 14:06:14 -0800
commit7341fedb1387e9ec4ef08a22bbf7e7ba0632b173 (patch)
tree258e2d57c53318a3bbc0390e4b0b76bb483a0ebd
parent8b7f1a0bcb78dcc547f94337504f9078e2cf5ca8 (diff)
downloadscummvm-rg350-7341fedb1387e9ec4ef08a22bbf7e7ba0632b173.tar.gz
scummvm-rg350-7341fedb1387e9ec4ef08a22bbf7e7ba0632b173.tar.bz2
scummvm-rg350-7341fedb1387e9ec4ef08a22bbf7e7ba0632b173.zip
GLK: ADRIFT: Cleanup
-rw-r--r--engines/glk/adrift/adrift.h13
-rw-r--r--engines/glk/adrift/detection.cpp2
-rw-r--r--engines/glk/adrift/detection_tables.h13
3 files changed, 4 insertions, 24 deletions
diff --git a/engines/glk/adrift/adrift.h b/engines/glk/adrift/adrift.h
index 006293a829..ac082cb67f 100644
--- a/engines/glk/adrift/adrift.h
+++ b/engines/glk/adrift/adrift.h
@@ -20,6 +20,8 @@
*
*/
+/* Based on Scare interpreter 1.3.10 */
+
#ifndef GLK_ADRIFT_ADRIFT
#define GLK_ADRIFT_ADRIFT
@@ -37,16 +39,6 @@ namespace Adrift {
*/
class Adrift : public GlkAPI {
private:
- /**
- * Initialization
- */
- bool initialize();
-
- /**
- * Deinitialization
- */
- void deinitialize();
-
static void if_write_saved_game(void *opaque, const sc_byte *buffer, sc_int length);
static sc_int if_read_saved_game(void *opaque, sc_byte *buffer, sc_int length);
public:
@@ -77,7 +69,6 @@ public:
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
-
};
extern Adrift *g_vm;
diff --git a/engines/glk/adrift/detection.cpp b/engines/glk/adrift/detection.cpp
index 7623fdf19a..0ee01fdde0 100644
--- a/engines/glk/adrift/detection.cpp
+++ b/engines/glk/adrift/detection.cpp
@@ -72,7 +72,7 @@ bool AdriftMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &
continue;
// Check for known games
- const AdriftGameDescription *p = ADRIFT_GAMES;
+ const GlkDetectionEntry *p = ADRIFT_GAMES;
while (p->_gameId && (md5 != p->_md5 || filesize != p->_filesize))
++p;
diff --git a/engines/glk/adrift/detection_tables.h b/engines/glk/adrift/detection_tables.h
index 3f0bbdebcc..ac7abba44c 100644
--- a/engines/glk/adrift/detection_tables.h
+++ b/engines/glk/adrift/detection_tables.h
@@ -27,17 +27,6 @@
namespace Glk {
namespace Adrift {
-/**
- * Game description
- */
-struct AdriftGameDescription {
- const char *const _gameId;
- const char *const _extra;
- const char *const _md5;
- size_t _filesize;
- Common::Language _language;
-};
-
const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
{ "Adrift", "Adrift IF Game" },
@@ -259,7 +248,7 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
{ nullptr, nullptr }
};
-const AdriftGameDescription ADRIFT_GAMES[] = {
+const GlkDetectionEntry ADRIFT_GAMES[] = {
// English Games
DT_ENTRY0("3monkeys", "dec34c282511b1eadfe231dbbb49f625", 79286),
DT_ENTRY0("akron", "2461ceeef3ef1eac15a2051a549b4402", 22258),