[Scummvm-cvs-logs] scummvm master -> 4f813d2b9929bf75d64727596b759c6b5473d592

sev- sev at scummvm.org
Tue Mar 15 11:29:00 CET 2016


This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
89eeeddcb6 WAGE: Two more games added to detection
fd6241754e WAGE: More games to detection
ffeda30367 WAGE: More games to detection
2762e693ff WAGE: Better menu shortcut parsing. This fixes Jumble!
53806622fc WAGE: Added engine debugger stub
4f813d2b99 WAGE: Plug the debugger in


Commit: 89eeeddcb67fe7f6ebb6d06f44b9d482bc82b062
    https://github.com/scummvm/scummvm/commit/89eeeddcb67fe7f6ebb6d06f44b9d482bc82b062
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:48+01:00

Commit Message:
WAGE: Two more games added to detection

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 7e22b2f..b095a31 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -42,6 +42,8 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Deep Angst", "b130b3c811cd89024dd5fdd2b71f70b8", 329550),
 	// Polygons with ignored byte 1
 	FANGAME("Double Trouble", "1652e36857a04c01dc560234c4818619", 542371),
+	// Crash at start in GUI rendering
+	FANGAME("Dune Eternity", "94a9c4f8b3dabd1846d76215a49bd221", 290201),
 	FANGAMEN("Dungeon World II", "DungeonWorld2", "0154ea11d3cbb536c13b4ae9e6902d48", 230199),
 	FANGAME("Eidisi I", "595117cbed33e8de1ab3714b33880205", 172552),
 	// Problems(?) with text on the first screen
@@ -87,6 +89,7 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Wishing Well", "913812a1ac7a6b0e48dadd1afa1c7763", 103688),
 	FANGAME("Wizard's Warehouse", "913812a1ac7a6b0e48dadd1afa1c7763", 159748),
 	FANGAME("ZikTuria", "418e74ca71029a1e9db80d0eb30c0843", 52972),
+	FANGAME("Zoony", "539a64151426edc92da5eedadf39f23c", 154990),
 
 	AD_TABLE_END_MARKER
 };


Commit: fd6241754ee9596068c220a4d4926143674f2d70
    https://github.com/scummvm/scummvm/commit/fd6241754ee9596068c220a4d4926143674f2d70
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:48+01:00

Commit Message:
WAGE: More games to detection

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index b095a31..ef672e8 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -43,7 +43,7 @@ static const ADGameDescription gameDescriptions[] = {
 	// Polygons with ignored byte 1
 	FANGAME("Double Trouble", "1652e36857a04c01dc560234c4818619", 542371),
 	// Crash at start in GUI rendering
-	FANGAME("Dune Eternity", "94a9c4f8b3dabd1846d76215a49bd221", 290201),
+	FANGAME("Dune Eternity", "94a9c4f8b3dabd1846d76215a49bd221", 290201), // Original file name is "***DUNE ETERNITY*** "
 	FANGAMEN("Dungeon World II", "DungeonWorld2", "0154ea11d3cbb536c13b4ae9e6902d48", 230199),
 	FANGAME("Eidisi I", "595117cbed33e8de1ab3714b33880205", 172552),
 	// Problems(?) with text on the first screen
@@ -75,6 +75,7 @@ static const ADGameDescription gameDescriptions[] = {
 	BIGGAME("scepters", "", "Scepters", "3311deef8bf82f0b4b1cfa15a3b3289d", 346595),
 	// ??? problems with dog bitmap?
 	FANGAMEN("Space Adventure", "SpaceAdventure", "f9f3f1c419f56955f7966355b34ea5c8", 155356),
+	FANGAMEN("Spear of Destiny", "SpearOfDestiny", "913812a1ac7a6b0e48dadd1afa1c7763", 333665), // Original file name "SpearOfDestiny†"
 	FANGAME("Star Trek", "44aaef4806578700429de5aaf95c266e", 53320),
 	FANGAME("Strange Disappearance", "d81f2d03a1e863f04fb1e3a5495b720e", 772282),
 	FANGAME("Time Bomb", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 64564),
@@ -85,6 +86,7 @@ static const ADGameDescription gameDescriptions[] = {
 	// Admission for on 3rd screen is messed up
 	FANGAME("The Tower", "435f420b9dff895ae1ddf1338040c51d", 556539),
 	// Doesn't go past first scene
+	FANGAME("The Village", "913812a1ac7a6b0e48dadd1afa1c7763", 314828),
 	BIGGAME("twisted", "", "Twisted! 1.6", "26207bdf0bb539464f136f0669af885f", 960954),
 	FANGAME("Wishing Well", "913812a1ac7a6b0e48dadd1afa1c7763", 103688),
 	FANGAME("Wizard's Warehouse", "913812a1ac7a6b0e48dadd1afa1c7763", 159748),


Commit: ffeda30367d46931c70627e2f91313bf04f8386e
    https://github.com/scummvm/scummvm/commit/ffeda30367d46931c70627e2f91313bf04f8386e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:48+01:00

Commit Message:
WAGE: More games to detection

Changed paths:
    engines/wage/detection_tables.h



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index ef672e8..7ee19d3 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -53,6 +53,8 @@ static const ADGameDescription gameDescriptions[] = {
 	// Crash in console rendering on the first scene
 	FANGAME("Fantasy Quest", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 762754),
 	FANGAME("Find the Heart", "595117cbed33e8de1ab3714b33880205", 106235), // From Joshua's Worlds 1.0
+	// Unexpected shortcut in menu
+	FANGAMEN("Jumble", "LSJUMBLE", "e12ec4d76d48bdc86567c5e63750547e", 647339), // Original file name is "LSJUMBLE† "
 	FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96711),
 	FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96960), // Alternative version
 	FANGAME("Karth of the Jungle II", "c106835ab4436de054e03aec3ce904ce", 201053),
@@ -78,6 +80,7 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAMEN("Spear of Destiny", "SpearOfDestiny", "913812a1ac7a6b0e48dadd1afa1c7763", 333665), // Original file name "SpearOfDestiny†"
 	FANGAME("Star Trek", "44aaef4806578700429de5aaf95c266e", 53320),
 	FANGAME("Strange Disappearance", "d81f2d03a1e863f04fb1e3a5495b720e", 772282),
+	FANGAME("Sweetspace Now!", "e12ec4d76d48bdc86567c5e63750547e", 123813), // Comes with Jumble
 	FANGAME("Time Bomb", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 64564),
 	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "595117cbed33e8de1ab3714b33880205", 231969),
 	// Invalid rect in scene "Access Tube 1"
@@ -85,13 +88,14 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("The Sultan's Palace", "358799d446ee4fc12f793febd6c94b95", 456855),
 	// Admission for on 3rd screen is messed up
 	FANGAME("The Tower", "435f420b9dff895ae1ddf1338040c51d", 556539),
-	// Doesn't go past first scene
+	// Polygons with ignored byte 1 and 2 on second scene
 	FANGAME("The Village", "913812a1ac7a6b0e48dadd1afa1c7763", 314828),
+	// Doesn't go past first scene
 	BIGGAME("twisted", "", "Twisted! 1.6", "26207bdf0bb539464f136f0669af885f", 960954),
 	FANGAME("Wishing Well", "913812a1ac7a6b0e48dadd1afa1c7763", 103688),
 	FANGAME("Wizard's Warehouse", "913812a1ac7a6b0e48dadd1afa1c7763", 159748),
 	FANGAME("ZikTuria", "418e74ca71029a1e9db80d0eb30c0843", 52972),
-	FANGAME("Zoony", "539a64151426edc92da5eedadf39f23c", 154990),
+	FANGAME("Zoony", "539a64151426edc92da5eedadf39f23c", 154990), // original filename "Zoony™"
 
 	AD_TABLE_END_MARKER
 };


Commit: 2762e693ff5d415030e39c8e72caed1131a56da4
    https://github.com/scummvm/scummvm/commit/2762e693ff5d415030e39c8e72caed1131a56da4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:48+01:00

Commit Message:
WAGE: Better menu shortcut parsing. This fixes Jumble!

Changed paths:
    engines/wage/detection_tables.h
    engines/wage/menu.cpp



diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 7ee19d3..6533b3b 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -53,7 +53,7 @@ static const ADGameDescription gameDescriptions[] = {
 	// Crash in console rendering on the first scene
 	FANGAME("Fantasy Quest", "4b0e1a1fbaaa4930accd0f9f0e1519c7", 762754),
 	FANGAME("Find the Heart", "595117cbed33e8de1ab3714b33880205", 106235), // From Joshua's Worlds 1.0
-	// Unexpected shortcut in menu
+	// Problems with window overlay
 	FANGAMEN("Jumble", "LSJUMBLE", "e12ec4d76d48bdc86567c5e63750547e", 647339), // Original file name is "LSJUMBLE† "
 	FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96711),
 	FANGAME("Karth of the Jungle", "595117cbed33e8de1ab3714b33880205", 96960), // Alternative version
diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp
index 48f1642..12ef8c2 100644
--- a/engines/wage/menu.cpp
+++ b/engines/wage/menu.cpp
@@ -206,10 +206,10 @@ void Menu::createCommandsMenu(MenuItem *menu) {
 			char shortcut = 0;
 			const char *shortPtr = strrchr(item.c_str(), '/');
 			if (shortPtr != NULL) {
-				if (strlen(shortPtr) == 2) {
+				if (strlen(shortPtr) >= 2) {
 					shortcut = shortPtr[1];
-					item.deleteLastChar();
-					item.deleteLastChar();
+					item.deleteChar(shortPtr - item.c_str());
+					item.deleteChar(shortPtr - item.c_str());
 				} else {
 					error("Unexpected shortcut: '%s', item '%s' in menu '%s'", shortPtr, item.c_str(), string.c_str());
 				}


Commit: 53806622fc5a0aecdc0c950b73f07e962f082432
    https://github.com/scummvm/scummvm/commit/53806622fc5a0aecdc0c950b73f07e962f082432
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:49+01:00

Commit Message:
WAGE: Added engine debugger stub

Changed paths:
  A engines/wage/debugger.cpp
  A engines/wage/debugger.h
    engines/wage/module.mk



diff --git a/engines/wage/debugger.cpp b/engines/wage/debugger.cpp
new file mode 100644
index 0000000..f4444f8
--- /dev/null
+++ b/engines/wage/debugger.cpp
@@ -0,0 +1,47 @@
+/* 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.
+ *
+ */
+
+#include "common/file.h"
+#include "wage/wage.h"
+#include "wage/debugger.h"
+#include "wage/entities.h"
+#include "wage/world.h"
+
+namespace Wage {
+
+Debugger::Debugger(WageEngine *vm) : GUI::Debugger(), _vm(vm) {
+	registerCmd("continue", WRAP_METHOD(Debugger, cmdExit));
+	registerCmd("scenes", WRAP_METHOD(Debugger, Cmd_ListScenes));
+}
+
+Debugger::~Debugger() {
+}
+
+bool Debugger::Cmd_ListScenes(int argc, const char **argv) {
+	for (uint i = 0; i < _vm->_world->_orderedScenes.size(); i++) {
+		debugPrintf("%d: %s\n", i, _vm->_world->_orderedScenes[i]->_name.c_str());
+	}
+
+	return true;
+}
+
+} // End of namespace Wage
diff --git a/engines/wage/debugger.h b/engines/wage/debugger.h
new file mode 100644
index 0000000..e1d3b1c
--- /dev/null
+++ b/engines/wage/debugger.h
@@ -0,0 +1,46 @@
+/* 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.
+ *
+ */
+
+#ifndef WAGE_DEBUGGER_H
+#define WAGE_DEBUGGER_H
+
+#include "common/scummsys.h"
+#include "gui/debugger.h"
+
+namespace Wage {
+
+class WageEngine;
+
+class Debugger : public GUI::Debugger {
+protected:
+	WageEngine *_vm;
+
+	bool Cmd_ListScenes(int argc, const char **argv);
+
+public:
+	Debugger(WageEngine *vm);
+	virtual ~Debugger();
+};
+
+} // End of namespace Wage
+
+#endif
diff --git a/engines/wage/module.mk b/engines/wage/module.mk
index 548e440..21316bb 100644
--- a/engines/wage/module.mk
+++ b/engines/wage/module.mk
@@ -2,6 +2,7 @@ MODULE := engines/wage
 
 MODULE_OBJS := \
 	combat.o \
+	debugger.o \
 	design.o \
 	detection.o \
 	dialog.o \


Commit: 4f813d2b9929bf75d64727596b759c6b5473d592
    https://github.com/scummvm/scummvm/commit/4f813d2b9929bf75d64727596b759c6b5473d592
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-15T11:27:49+01:00

Commit Message:
WAGE: Plug the debugger in

Changed paths:
    engines/wage/wage.cpp
    engines/wage/wage.h



diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index b708cff..3e3ddaa 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -102,12 +102,14 @@ WageEngine::~WageEngine() {
 }
 
 Common::Error WageEngine::run() {
+	debug("WageEngine::init");
+
 	initGraphics(512, 342, true);
 
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 
-	debug("WageEngine::init");
+	_debugger = new Debugger(this);
 
 	// Your main event loop should be (invoked from) here.
 	_resManager = new Common::MacResManager();
diff --git a/engines/wage/wage.h b/engines/wage/wage.h
index 6905fdc..8ca306a 100644
--- a/engines/wage/wage.h
+++ b/engines/wage/wage.h
@@ -50,12 +50,13 @@
 
 #include "engines/engine.h"
 #include "common/debug.h"
-#include "gui/debugger.h"
 #include "common/endian.h"
 #include "common/rect.h"
 #include "common/macresman.h"
 #include "common/random.h"
 
+#include "wage/debugger.h"
+
 struct ADGameDescription;
 
 namespace Wage {
@@ -181,6 +182,8 @@ public:
 public:
 	Common::RandomSource *_rnd;
 
+	Debugger *_debugger;
+
 	Gui *_gui;
 	World *_world;
 
@@ -212,6 +215,8 @@ public:
 	void redrawScene();
 	void saveGame();
 
+	virtual GUI::Debugger *getDebugger() { return _debugger; }
+
 private:
 	Console *_console;
 






More information about the Scummvm-git-logs mailing list