From eca87a63e9215ee6f37f62d5c9bb2389362512ee Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 4 Feb 2014 22:38:35 -0500
Subject: VOYEUR: Renamings for the fields of the new StateResource class

---
 engines/voyeur/data.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'engines/voyeur/data.cpp')

diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 9f528c1a76..f0521d28d2 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -237,35 +237,34 @@ void SVoy::reviewComputerEvent(int eventIndex) {
 }
 
 bool SVoy::checkForKey() {
-	_vm->_controlPtr->_state->_v2 = 0;
+	_vm->_controlPtr->_state->_victimEvidenceIndex = 0;
 	if (_vm->_voy._victimMurdered)
 		return false;
 
 	for (int eventIdx = 0; eventIdx < _eventCount; ++eventIdx) {
 		VoyeurEvent &e = _events[eventIdx];
-		int v1;
 
 		switch (e._type) {
 		case EVTYPE_VIDEO:
-			switch (_vm->_controlPtr->_state->_v1) {
+			switch (_vm->_controlPtr->_state->_victimIndex) {
 			case 1:
 				if (e._audioVideoId == 33 && e._computerOn < 2 && e._computerOff >= 38)
-					_vm->_controlPtr->_state->_v2 = 1;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 1;
 				break;
 
 			case 2:
 				if (e._audioVideoId == 47 && e._computerOn < 2 && e._computerOff >= 9)
-					_vm->_controlPtr->_state->_v2 = 2;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 2;
 				break;
 
 			case 3:
 				if (e._audioVideoId == 46 && e._computerOn < 2 && e._computerOff > 2)
-					_vm->_controlPtr->_state->_v2 = 3;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 3;
 				break;
 
 			case 4:
 				if (e._audioVideoId == 40 && e._computerOn < 2 && e._computerOff > 6)
-					_vm->_controlPtr->_state->_v2 = 4;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 4;
 				break;
 			
 			default:
@@ -274,17 +273,17 @@ bool SVoy::checkForKey() {
 			break;
 
 		case EVTYPE_AUDIO:
-			switch (_vm->_controlPtr->_state->_v1) {
+			switch (_vm->_controlPtr->_state->_victimIndex) {
 			case 1:
 				if (e._audioVideoId == 8 && e._computerOn < 2 && e._computerOff > 26)
-					_vm->_controlPtr->_state->_v2 = 1;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 1;
 				break;
 	
 			case 3:
 				if (e._audioVideoId == 20 && e._computerOn < 2 && e._computerOff > 28)
-					_vm->_controlPtr->_state->_v2 = 3;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 3;
 				if (e._audioVideoId == 35 && e._computerOn < 2 && e._computerOff > 18)
-					_vm->_controlPtr->_state->_v2 = 3;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 3;
 				break;
 
 			default:
@@ -293,10 +292,10 @@ bool SVoy::checkForKey() {
 			break;
 
 		case EVTYPE_EVID:
-			switch (_vm->_controlPtr->_state->_v1) {
+			switch (_vm->_controlPtr->_state->_victimIndex) {
 			case 4:
 				if (e._audioVideoId == 0x2400 && e._computerOn == 0x4f00 && e._computerOff == 17)
-					_vm->_controlPtr->_state->_v2 = 4;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 4;
 
 			default:
 				break;
@@ -304,10 +303,10 @@ bool SVoy::checkForKey() {
 			break;
 
 		case EVTYPE_COMPUTER:
-			switch (_vm->_controlPtr->_state->_v1) {
+			switch (_vm->_controlPtr->_state->_victimIndex) {
 			case 2:
 				if (e._computerOn == 13 && e._computerOff > 76)
-					_vm->_controlPtr->_state->_v2 = 2;
+					_vm->_controlPtr->_state->_victimEvidenceIndex = 2;
 				break;
 
 			default:
@@ -316,7 +315,7 @@ bool SVoy::checkForKey() {
 			break;
 		}
 
-		if (_vm->_controlPtr->_state->_v2 == _vm->_controlPtr->_state->_v1)
+		if (_vm->_controlPtr->_state->_victimEvidenceIndex == _vm->_controlPtr->_state->_victimIndex)
 			return true;
 	}
 
-- 
cgit v1.2.3