[Scummvm-cvs-logs] scummvm master -> 62e58fd6b8faaa8391a9244ab9f4e54f8a5418f0

[Strangerke]

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

Summary:
62e58fd6b8 VOYEUR: Rename some computer fields


Commit: 62e58fd6b8faaa8391a9244ab9f4e54f8a5418f0
    https://github.com/scummvm/scummvm/commit/62e58fd6b8faaa8391a9244ab9f4e54f8a5418f0
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-06T23:04:33-08:00

Commit Message:
VOYEUR: Rename some computer fields

Changed paths:
    engines/voyeur/data.h
    engines/voyeur/files_threads.cpp
    engines/voyeur/staticres.cpp
    engines/voyeur/staticres.h



diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h
index 60876ec..98c884d 100644
--- a/engines/voyeur/data.h
+++ b/engines/voyeur/data.h
@@ -148,7 +148,7 @@ public:
 	HotspotTimes<3> _evidenceHotspotTimes;
 	HotspotTimes<8> _videoHotspotTimes;
 
-	Common::Rect _computerButtonRect;
+	Common::Rect _computerScreenRect;
 	RectResource *_viewBounds;
 	PictureResource *_evPicPtrs[6];
 	CMapResource *_evCmPtrs[6];
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 8ea8c0c..d2ac182 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -626,10 +626,10 @@ void ThreadResource::parsePlayCommands() {
 				_vm->_voy->_computerTimeMin = READ_LE_UINT16(dataP + 4);
 				_vm->_voy->_computerTimeMax = READ_LE_UINT16(dataP + 6);
 
-				_vm->_voy->_computerButtonRect.left = COMPUTER_BUTTON_TABLE[_vm->_voy->_computerTextId * 4];
-				_vm->_voy->_computerButtonRect.top = COMPUTER_BUTTON_TABLE[_vm->_voy->_computerTextId * 4 + 1];
-				_vm->_voy->_computerButtonRect.right = COMPUTER_BUTTON_TABLE[_vm->_voy->_computerTextId * 4 + 2];
-				_vm->_voy->_computerButtonRect.bottom = COMPUTER_BUTTON_TABLE[_vm->_voy->_computerTextId * 4 + 3];
+				_vm->_voy->_computerScreenRect.left = COMPUTER_SCREEN_TABLE[_vm->_voy->_computerTextId * 4];
+				_vm->_voy->_computerScreenRect.top = COMPUTER_SCREEN_TABLE[_vm->_voy->_computerTextId * 4 + 1];
+				_vm->_voy->_computerScreenRect.right = COMPUTER_SCREEN_TABLE[_vm->_voy->_computerTextId * 4 + 2];
+				_vm->_voy->_computerScreenRect.bottom = COMPUTER_SCREEN_TABLE[_vm->_voy->_computerTextId * 4 + 3];
 			}
 
 			dataP += 8;
@@ -1152,7 +1152,8 @@ void ThreadResource::doRoom() {
 			pt += Common::Point(30, 15);
 
 			hotspotId = -1;
-			if (voy._computerTextId != -1 && voy._computerButtonRect.contains(pt))
+
+			if (voy._computerTextId != -1 && voy._computerScreenRect.contains(pt))
 				hotspotId = 999;
 
 			for (uint idx = 0; idx < hotspots.size(); ++idx) {
diff --git a/engines/voyeur/staticres.cpp b/engines/voyeur/staticres.cpp
index 6fa61e0..7016793 100644
--- a/engines/voyeur/staticres.cpp
+++ b/engines/voyeur/staticres.cpp
@@ -57,7 +57,7 @@ const int BLIND_TABLE[] = {
 	5, 12, 6, 6, 13, 14, 13
 };
 
-const int COMPUTER_BUTTON_TABLE[] = {
+const int COMPUTER_SCREEN_TABLE[] = {
 	269, 128, 307, 163, 
 	269, 128, 307, 163, 
 	68, 79, 98, 102, 
diff --git a/engines/voyeur/staticres.h b/engines/voyeur/staticres.h
index 56a05b4..ea3a800 100644
--- a/engines/voyeur/staticres.h
+++ b/engines/voyeur/staticres.h
@@ -37,7 +37,7 @@ extern const int LEVEL_M[];
 
 extern const int BLIND_TABLE[];
 
-extern const int COMPUTER_BUTTON_TABLE[];
+extern const int COMPUTER_SCREEN_TABLE[];
 
 extern const char *const SZ_FILENAMES[];