[Scummvm-cvs-logs] scummvm master -> f8119dea7cc72b6a4de2b603d916b56801f2e2ba
sev-
sev at scummvm.org
Mon Feb 15 21:07:28 CET 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b007821d36 WAGE: Move detection tables to separate file
f06263a1d0 WAGE: Added Magic Rings detection
2753571155 WAGE: Fix input string after script execution
f8119dea7c WAGE: Added Midnight Snack and Time Bomb detection
Commit: b007821d36d73b2b86c3f5aba075eb577a49d92e
https://github.com/scummvm/scummvm/commit/b007821d36d73b2b86c3f5aba075eb577a49d92e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-15T21:06:46+01:00
Commit Message:
WAGE: Move detection tables to separate file
Changed paths:
A engines/wage/detection_tables.h
engines/wage/detection.cpp
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index e03c447..c4c1d35 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -46,98 +46,7 @@ static const PlainGameDescriptor wageGames[] = {
{0, 0}
};
-namespace Wage {
-
-#define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM)
-#define ADGF_GENERIC (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_USEEXTRAASTITLE)
-
-static const ADGameDescription gameDescriptions[] = {
- {
- "afm",
- "v1.8",
- AD_ENTRY1s("Another Fine Mess 1.8", "8e5aa915f3253efb2aab52435647b25e", 1456000),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_DEFAULT,
- GUIO0()
- },
- {
- "amot",
- "v1.8",
- AD_ENTRY1s("A Mess O' Trouble 1.8", "b3ef53afed282671b704e45df829350c", 1895552),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_DEFAULT,
- GUIO0()
- },
- {
- "cantitoe",
- "",
- AD_ENTRY1s("Camp Cantitoe", "098aa5c11c58e1ef274a30a9e01b4755", 621440),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_DEFAULT,
- GUIO0()
- },
- {
- "wage",
- "Deep Angst",
- AD_ENTRY1s("Deep Angst", "635f62bbc569e72b03cab9107927d03d", 335232),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_GENERIC,
- GUIO0()
- },
- {
- "wage",
- "Escape from School!",
- AD_ENTRY1s("Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_GENERIC,
- GUIO0()
- },
- {
- "wage",
- "Queen Quest",
- AD_ENTRY1s("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_GENERIC,
- GUIO0()
- },
- {
- "scepters",
- "",
- AD_ENTRY1s("Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_DEFAULT,
- GUIO0()
- },
- {
- "wage",
- "ZikTuria",
- AD_ENTRY1s("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_GENERIC,
- GUIO0()
- },
- {
- "wage",
- "Zoony",
- AD_ENTRY1s("Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
- Common::EN_ANY,
- Common::kPlatformMacintosh,
- ADGF_GENERIC,
- GUIO0()
- },
-
- AD_TABLE_END_MARKER
-};
-
-} // End of namespace Wage
+#include "wage/detection_tables.h"
class WageMetaEngine : public AdvancedMetaEngine {
public:
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
new file mode 100644
index 0000000..79fa39e
--- /dev/null
+++ b/engines/wage/detection_tables.h
@@ -0,0 +1,114 @@
+/* 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 Wage {
+
+#define ADGF_DEFAULT (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM)
+#define ADGF_GENERIC (ADGF_DROPLANGUAGE|ADGF_DROPPLATFORM|ADGF_USEEXTRAASTITLE)
+
+static const ADGameDescription gameDescriptions[] = {
+ {
+ "afm",
+ "v1.8",
+ AD_ENTRY1s("Another Fine Mess 1.8", "8e5aa915f3253efb2aab52435647b25e", 1456000),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_DEFAULT,
+ GUIO0()
+ },
+ {
+ "amot",
+ "v1.8",
+ AD_ENTRY1s("A Mess O' Trouble 1.8", "b3ef53afed282671b704e45df829350c", 1895552),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_DEFAULT,
+ GUIO0()
+ },
+ {
+ "cantitoe",
+ "",
+ AD_ENTRY1s("Camp Cantitoe", "098aa5c11c58e1ef274a30a9e01b4755", 621440),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_DEFAULT,
+ GUIO0()
+ },
+ {
+ "wage",
+ "Deep Angst",
+ AD_ENTRY1s("Deep Angst", "635f62bbc569e72b03cab9107927d03d", 335232),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
+ "Escape from School!",
+ AD_ENTRY1s("Escape from School!", "a854be48d4af20126d18a9cad93a969b", 51840),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
+ "Queen Quest",
+ AD_ENTRY1s("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "scepters",
+ "",
+ AD_ENTRY1s("Scepters", "b80bff315897776dda7689cdf829fab4", 360832),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_DEFAULT,
+ GUIO0()
+ },
+ {
+ "wage",
+ "ZikTuria",
+ AD_ENTRY1s("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
+ "Zoony",
+ AD_ENTRY1s("Zoony", "e6cc8a914a4215dafbcce6315dd12cf5", 160256),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+
+ AD_TABLE_END_MARKER
+};
+
+} // End of namespace Wage
Commit: f06263a1d0835e2f890478577b268132691fe4f7
https://github.com/scummvm/scummvm/commit/f06263a1d0835e2f890478577b268132691fe4f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-15T21:06:46+01:00
Commit Message:
WAGE: Added Magic Rings detection
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 79fa39e..f5c3559 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -73,6 +73,15 @@ static const ADGameDescription gameDescriptions[] = {
},
{
"wage",
+ "Magic Rings",
+ AD_ENTRY1s("Magic Rings", "6e0d1dd561d3dad8f9a7a20ed1f09b16", 112000),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
"Queen Quest",
AD_ENTRY1s("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
Common::EN_ANY,
Commit: 2753571155b06f142a2182265619891b1425931f
https://github.com/scummvm/scummvm/commit/2753571155b06f142a2182265619891b1425931f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-15T21:06:46+01:00
Commit Message:
WAGE: Fix input string after script execution
Changed paths:
engines/wage/wage.cpp
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index fba340e..ffdd8a2 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -171,8 +171,6 @@ void WageEngine::processEvents() {
break;
processTurn(&_inputText, NULL);
- _inputText.clear();
- _gui->appendText("");
_gui->disableUndo();
break;
@@ -498,6 +496,9 @@ void WageEngine::processTurn(Common::String *textInput, Designed *clickInput) {
if (!_commandWasQuick && getMonster() != NULL) {
performCombatAction(getMonster(), _world->_player);
}
+
+ _inputText.clear();
+ _gui->appendText("");
}
Commit: f8119dea7cc72b6a4de2b603d916b56801f2e2ba
https://github.com/scummvm/scummvm/commit/f8119dea7cc72b6a4de2b603d916b56801f2e2ba
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-15T21:06:47+01:00
Commit Message:
WAGE: Added Midnight Snack and Time Bomb detection
Changed paths:
engines/wage/detection_tables.h
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index f5c3559..790186f 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -82,6 +82,15 @@ static const ADGameDescription gameDescriptions[] = {
},
{
"wage",
+ "Midnight Snack",
+ AD_ENTRY1s("Midnight Snack", "346982a32fc701f53bb19771d72063d0", 69504),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
"Queen Quest",
AD_ENTRY1s("Queen Quest", "730605d312efedb5e3ff108522fcac18", 59776),
Common::EN_ANY,
@@ -100,6 +109,15 @@ static const ADGameDescription gameDescriptions[] = {
},
{
"wage",
+ "Time Bomb",
+ AD_ENTRY1s("Time Bomb", "2df84b636237686b624e736a698a16c4", 66432),
+ Common::EN_ANY,
+ Common::kPlatformMacintosh,
+ ADGF_GENERIC,
+ GUIO0()
+ },
+ {
+ "wage",
"ZikTuria",
AD_ENTRY1s("ZikTuria", "e793155bed1a70fa2074a3fcd696b751", 54784),
Common::EN_ANY,
More information about the Scummvm-git-logs
mailing list