[Scummvm-cvs-logs] scummvm master -> 0362f41024880a92ce6e49d492eb0ff0a55d6a6d

Strangerke Strangerke at scummvm.org
Thu Mar 6 07:48:07 CET 2014


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:
0362f41024 VOYEUR: Some renaming related to the computer buttons


Commit: 0362f41024880a92ce6e49d492eb0ff0a55d6a6d
    https://github.com/scummvm/scummvm/commit/0362f41024880a92ce6e49d492eb0ff0a55d6a6d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-05T22:46:20-08:00

Commit Message:
VOYEUR: Some renaming related to the computer buttons

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 b3380df..60876ec 100644
--- a/engines/voyeur/data.h
+++ b/engines/voyeur/data.h
@@ -148,7 +148,7 @@ public:
 	HotspotTimes<3> _evidenceHotspotTimes;
 	HotspotTimes<8> _videoHotspotTimes;
 
-	Common::Rect _rect4E4;
+	Common::Rect _computerButtonRect;
 	RectResource *_viewBounds;
 	PictureResource *_evPicPtrs[6];
 	CMapResource *_evCmPtrs[6];
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 1ce8c37..76063c8 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->_rect4E4.left = COMP_BUT_TABLE[_vm->_voy->_computerTextId * 4];
-				_vm->_voy->_rect4E4.top = COMP_BUT_TABLE[_vm->_voy->_computerTextId * 4 + 1];
-				_vm->_voy->_rect4E4.right = COMP_BUT_TABLE[_vm->_voy->_computerTextId * 4 + 2];
-				_vm->_voy->_rect4E4.bottom = COMP_BUT_TABLE[_vm->_voy->_computerTextId * 4 + 3];
+				_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];
 			}
 
 			dataP += 8;
@@ -1152,7 +1152,7 @@ void ThreadResource::doRoom() {
 			pt += Common::Point(30, 15);
 
 			hotspotId = -1;
-			if (voy._computerTextId != -1 && voy._rect4E4.contains(pt))
+			if (voy._computerTextId != -1 && voy._computerButtonRect.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 27ed5db..6fa61e0 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 COMP_BUT_TABLE[] = {
+const int COMPUTER_BUTTON_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 da292e1..56a05b4 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 COMP_BUT_TABLE[];
+extern const int COMPUTER_BUTTON_TABLE[];
 
 extern const char *const SZ_FILENAMES[];
 






More information about the Scummvm-git-logs mailing list