[Scummvm-cvs-logs] scummvm master -> 9042f85ef3da49893f0c595476abf4602c794fdf

[bluegr]

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:
9042f85ef3 DREAMWEB: Fix regression in bartender() and receptionist()


Commit: 9042f85ef3da49893f0c595476abf4602c794fdf
    https://github.com/scummvm/scummvm/commit/9042f85ef3da49893f0c595476abf4602c794fdf
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-13T13:04:26-08:00

Commit Message:
DREAMWEB: Fix regression in bartender() and receptionist()

Changed paths:
    engines/dreamweb/people.cpp



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index caaea26..99e382f 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -783,28 +783,28 @@ void DreamGenContext::receptionist(ReelRoutine &routine) {
 			// Set card
 			data.byte(kCardpassflag)++;
 			routine.b7 = 1;
-			routine.b3 = 64;
+			routine.setReelPointer(64);
 		}
 
-		if (routine.b3 != 58) {
+		if (routine.reelPointer() != 58) {
 			// notdes1
-			if (routine.b3 != 60) {
+			if (routine.reelPointer() != 60) {
 				// notdes2
-				if (routine.b3 != 88)
-					routine.b3++;	// not end card
+				if (routine.reelPointer() != 88)
+					routine.incReelPointer();	// not end card
 				else
-					routine.b3 = 53;
+					routine.setReelPointer(53);
 			} else if (engine->randomNumber() >= 240) {
-				routine.b3 = 53;
+				routine.setReelPointer(53);
 			}
 		} else if (engine->randomNumber() >= 30) {
-			routine.b3 = 55;
+			routine.setReelPointer(55);
 		} else {
 			// notdes2
-			if (routine.b3 != 88)
-				routine.b3++;	// not end card
+			if (routine.reelPointer() != 88)
+				routine.incReelPointer();	// not end card
 			else
-				routine.b3 = 53;
+				routine.setReelPointer(53);
 		}
 	}
 
@@ -816,15 +816,15 @@ void DreamGenContext::receptionist(ReelRoutine &routine) {
 
 void DreamGenContext::bartender(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
-		if (routine.b3 == 86) {
+		if (routine.reelPointer() == 86) {
 			if (engine->randomNumber() >= 18)
-				routine.b3 = 81;
+				routine.setReelPointer(81);
 			else
-				routine.b3++;	// notsmoket2
-		} else if (routine.b3 == 103) {
-			routine.b3 = 81;	// notsmoket1
+				routine.incReelPointer();	// notsmoket2
+		} else if (routine.reelPointer() == 103) {
+			routine.setReelPointer(81);	// notsmoket1
 		} else {
-			routine.b3++;	// notsmoket2
+			routine.incReelPointer();	// notsmoket2
 		}
 	}