[Scummvm-cvs-logs] SF.net SVN: scummvm:[46943] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jan 3 21:18:36 CET 2010


Revision: 46943
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46943&view=rev
Author:   thebluegr
Date:     2010-01-03 20:18:36 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
Made the "version" command more verbose, listing all the automatically detected game features, along with the detected SCI version

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-01-03 20:15:44 UTC (rev 46942)
+++ scummvm/trunk/engines/sci/console.cpp	2010-01-03 20:18:36 UTC (rev 46943)
@@ -433,7 +433,26 @@
 }
 
 bool Console::cmdGetVersion(int argc, const char **argv) {
+	const char *viewTypeDesc[] = { "Unknown", "EGA", "VGA", "VGA SCI1.1", "Amiga" };
+
+	EngineState *s = _vm->getEngineState();
+	bool hasVocab997 = s->resMan->testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS)) ? true : false;
+
+	DebugPrintf("Game ID: %s\n", s->_gameId.c_str());
 	DebugPrintf("Emulated interpreter version: %s\n", getSciVersionDesc(getSciVersion()).c_str());
+	DebugPrintf("\n");
+	DebugPrintf("Detected features:\n");
+	DebugPrintf("------------------\n");
+	DebugPrintf("Sound type: %s\n", getSciVersionDesc(s->detectDoSoundType()).c_str());
+	DebugPrintf("Graphics functions type: %s\n", getSciVersionDesc(s->detectGfxFunctionsType()).c_str());
+	DebugPrintf("Lofs type: %s\n", getSciVersionDesc(s->detectLofsType()).c_str());
+	DebugPrintf("Move count type: %s\n", (s->detectMoveCountType() == kIncrementMoveCount) ? "increment" : "ignore");
+	DebugPrintf("SetCursor type: %s\n", getSciVersionDesc(s->detectSetCursorType()).c_str());
+	DebugPrintf("View type: %s\n", viewTypeDesc[s->resMan->getViewType()]);
+	DebugPrintf("Resource volume version: %s\n", s->resMan->getVolVersionDesc());
+	DebugPrintf("Resource map version: %s\n", s->resMan->getMapVersionDesc());
+	DebugPrintf("Contains selector vocabulary (vocab.997): %s\n", hasVocab997 ? "yes" : "no");
+	DebugPrintf("\n");
 
 	return true;
 }

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-01-03 20:15:44 UTC (rev 46942)
+++ scummvm/trunk/engines/sci/resource.h	2010-01-03 20:18:36 UTC (rev 46943)
@@ -224,10 +224,6 @@
 		kResVersionSci32
 	};
 
-	bool isVGA() const { return (_viewType == kViewVga) || (_viewType == kViewVga11); }
-
-	ViewType getViewType() const { return _viewType; }
-
 	/**
 	 * Creates a new SCI resource manager.
 	 */
@@ -271,6 +267,10 @@
 	Common::List<ResourceId> *listResources(ResourceType type, int mapNumber = -1);
 
 	void setAudioLanguage(int language);
+	bool isVGA() const { return (_viewType == kViewVga) || (_viewType == kViewVga11); }
+	ViewType getViewType() const { return _viewType; }
+	const char *getMapVersionDesc() const { return versionDescription(_mapVersion); }
+	const char *getVolVersionDesc() const { return versionDescription(_volVersion); }
 
 protected:
 	// Maximum number of bytes to allow being allocated for resources


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list