[Scummvm-cvs-logs] SF.net SVN: scummvm: [26812] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26812
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26812&view=rev
Author:   peres001
Date:     2007-05-12 12:29:20 -0700 (Sat, 12 May 2007)

Log Message:
-----------
New debug strings and levels.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/animation.cpp
    scummvm/trunk/engines/parallaction/archive.cpp
    scummvm/trunk/engines/parallaction/debug.cpp
    scummvm/trunk/engines/parallaction/disk.cpp

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-05-12 18:22:20 UTC (rev 26811)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-05-12 19:29:20 UTC (rev 26812)
@@ -175,7 +175,7 @@
 			else
 				_si = _vm->_gfx->queryMask(v18->_top + v18->height());
 
-//			printf("jobDisplayAnimations %s, x: %i, y: %i, w: %i, h: %i\n", v18->_name, v18->_left, v18->_top, v14._width, v14._height);
+			debugC(9, kDebugLocation, "jobDisplayAnimations(%s, x:%i, y:%i, z:%i, w:%i, h:%i, %p)", v18->_label._text, v18->_left, v18->_top, _si, v14._width, v14._height, v14._data0);
 			_vm->_gfx->blitCnv(&v14, v18->_left, v18->_top, _si, Gfx::kBitBack);
 
 		}

Modified: scummvm/trunk/engines/parallaction/archive.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/archive.cpp	2007-05-12 18:22:20 UTC (rev 26811)
+++ scummvm/trunk/engines/parallaction/archive.cpp	2007-05-12 19:29:20 UTC (rev 26812)
@@ -51,7 +51,7 @@
 }
 
 void Archive::open(const char *file) {
-	debugC(1, kDebugDisk, "open archive '%s'", file);
+	debugC(3, kDebugDisk, "Archive::open(%s)", file);
 
 	if (_archive.isOpen())
 		close();
@@ -83,8 +83,6 @@
 
 
 void Archive::close() {
-	debugC(1, kDebugDisk, "close current archive");
-
 	if (!_archive.isOpen()) return;
 
 	resetArchivedFile();
@@ -96,6 +94,8 @@
 bool Archive::openArchivedFile(const char *filename) {
 	resetArchivedFile();
 
+	debugC(3, kDebugDisk, "Archive::openArchivedFile(%s)", filename);
+
 	if (!_archive.isOpen())
 		error("Archive::openArchivedFile: the archive is not open");
 
@@ -105,7 +105,7 @@
 	}
 	if (i == _numFiles) return false;
 
-	debugC(1, kDebugDisk, "file '%s' found in slot %i", filename, i);
+	debugC(9, kDebugDisk, "Archive::openArchivedFile: '%s' found in slot %i", filename, i);
 
 	_file = true;
 

Modified: scummvm/trunk/engines/parallaction/debug.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/debug.cpp	2007-05-12 18:22:20 UTC (rev 26811)
+++ scummvm/trunk/engines/parallaction/debug.cpp	2007-05-12 19:29:20 UTC (rev 26812)
@@ -61,8 +61,8 @@
 	_vm = vm;
 
 	DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit));
-	DCmd_Register("location",    WRAP_METHOD(Debugger, Cmd_Location));
-	DCmd_Register("give",    WRAP_METHOD(Debugger, Cmd_Give));
+	DCmd_Register("location", WRAP_METHOD(Debugger, Cmd_Location));
+	DCmd_Register("give",     WRAP_METHOD(Debugger, Cmd_Give));
 }
 
 
@@ -81,11 +81,15 @@
 	switch (argc) {
 	case 3:
 		character = const_cast<char*>(argv[2]);
-		// fallthru is intentional here
+		location = const_cast<char*>(argv[1]);
+		sprintf(_vm->_location._name, "%s.%s", location, character);
+		// TODO: check if location exists
+		_engineFlags |= kEngineChangeLocation;
+		break;
 
 	case 2:
 		location = const_cast<char*>(argv[1]);
-		sprintf(_vm->_location._name, "%s.%s", location, character);
+		sprintf(_vm->_location._name, "%s", location);
 		// TODO: check if location exists
 		_engineFlags |= kEngineChangeLocation;
 		break;

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-05-12 18:22:20 UTC (rev 26811)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-05-12 19:29:20 UTC (rev 26812)
@@ -246,16 +246,22 @@
 	if (IS_MINI_CHARACTER(_vm->_characterName)) {
 		sprintf(archivefile, "%s%s", _vm->_characterName+4, _languageDir);
 	} else {
-		if (IS_DUMMY_CHARACTER(_vm->_characterName)) strcpy(archivefile, _languageDir);
-		else {
+		if (IS_DUMMY_CHARACTER(_vm->_characterName)) {
+			strcpy(archivefile, _languageDir);
+		} else {
 			sprintf(archivefile, "%s%s", _vm->_characterName, _languageDir);
 		}
 	}
+
 	strcat(archivefile, name);
 	strcat(archivefile, ".loc");
 
+	debugC(3, kDebugDisk, "DosDisk::loadLocation(%s): trying '%s'", name, archivefile);
+
 	if (!_locArchive.openArchivedFile(archivefile)) {
 		sprintf(archivefile, "%s%s.loc", _languageDir, name);
+		debugC(3, kDebugDisk, "DosDisk::loadLocation(%s): trying '%s'", name, archivefile);
+
 		if (!_locArchive.openArchivedFile(archivefile))
 			errorFileNotFound(name);
 	}


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