[Scummvm-cvs-logs] scummvm master -> a7f506967d8bac1d4e8b83895e77b5c59f136259

[Strangerke]

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

Summary:
2bdad6250d VOYEUR: Fix default value of _computerTextId
a7f506967d VOYEUR: Add Computer Hotspot in debugger


Commit: 2bdad6250d250215390887f9140476d3f7188884
    https://github.com/scummvm/scummvm/commit/2bdad6250d250215390887f9140476d3f7188884
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-12T07:46:43+01:00

Commit Message:
VOYEUR: Fix default value of _computerTextId

Changed paths:
    engines/voyeur/data.cpp



diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 3ab5716..ec5170c 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -49,7 +49,7 @@ SVoy::SVoy(VoyeurEngine *vm):_vm(vm) {
 	_audioVisualStartTime = 0;
 	_audioVisualDuration = 0;
 	_boltGroupId2 = 0;
-	_computerTextId = 0;
+	_computerTextId = -1;
 	_computerTimeMin = _computerTimeMax = 0;
 	_eventCount = 0;
 	_fadingStep1 = 0;


Commit: a7f506967d8bac1d4e8b83895e77b5c59f136259
    https://github.com/scummvm/scummvm/commit/a7f506967d8bac1d4e8b83895e77b5c59f136259
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-12T07:46:44+01:00

Commit Message:
VOYEUR: Add Computer Hotspot in debugger

Changed paths:
    engines/voyeur/debugger.cpp



diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp
index fdd0825..234300b 100644
--- a/engines/voyeur/debugger.cpp
+++ b/engines/voyeur/debugger.cpp
@@ -92,10 +92,37 @@ bool Debugger::Cmd_Time(int argc, const char **argv) {
 }
 
 bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
+	if (_vm->_voy->_computerTextId >= 0) {
+		DebugPrintf("Hotspot Computer Screen %d - %d,%d->%d,%d\n",
+			_vm->_voy->_computerTextId,
+			_vm->_voy->_computerScreenRect.left,
+			_vm->_voy->_computerScreenRect.top,
+			_vm->_voy->_computerScreenRect.right,
+			_vm->_voy->_computerScreenRect.bottom);
+	}
+
+#if 0
+	// Room hotspots
+	BoltEntry &boltEntry = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 4);
+	if (boltEntry._rectResource) {
+		Common::Array<RectEntry> &hotspots = boltEntry._rectResource->_entries;
+		for (uint hotspotIdx = 0; hotspotIdx < hotspots.size(); ++hotspotIdx) {
+			Common::String pos = Common::String::format("(%d,%d->%d,%d)",
+				hotspots[hotspotIdx].left, hotspots[hotspotIdx].top,
+				hotspots[hotspotIdx].right, hotspots[hotspotIdx].bottom);
+			int arrIndex = hotspots[hotspotIdx]._arrIndex;
+			if (_vm->_voy->_roomHotspotsEnabled[arrIndex - 1]) {
+				DebugPrintf("Hotspot Room %d - %s - Enabled\n", arrIndex, pos);
+			} else {
+				DebugPrintf("Hotspot Room - %s - Disabled\n", pos);
+			}
+		}
+	}
+#endif
+
+	// Outside view hotspots
 	BoltEntry &boltEntry = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 1);
-	if (!boltEntry._rectResource) {
-		DebugPrintf("No hotspots available\n");
-	} else {
+	if (boltEntry._rectResource) {
 		Common::Array<RectEntry> &hotspots = boltEntry._rectResource->_entries;
 
 		for (uint hotspotIdx = 0; hotspotIdx < hotspots.size(); ++hotspotIdx) {
@@ -130,7 +157,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
 		}
 	}
 
-	DebugPrintf("\n");
+	DebugPrintf("\nEnd of list\n");
 	return true;
 }