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

[tramboi]

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:
e73e300e41 DREAMWEB: A bit of cleaning in 'madman'


Commit: e73e300e412818d3eb48c2c8c5c3c5c176306af2
    https://github.com/scummvm/scummvm/commit/e73e300e412818d3eb48c2c8c5c3c5c176306af2
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-01T01:34:14-08:00

Commit Message:
DREAMWEB: A bit of cleaning in 'madman'

Changed paths:
    engines/dreamweb/sprite.cpp



diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 7224837..01defc5 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -679,24 +679,18 @@ void DreamGenContext::madmantext() {
 }
 
 void DreamGenContext::madman() {
+	ReelRoutine *routine = (ReelRoutine *)es.ptr(bx, 0);
 	data.word(kWatchingtime) = 2;
 	checkspeed();
 	if (flags.z()) {
-		ax = es.word(bx+3);
+		ax = routine->reelPointer();
 		if (ax >= 364) {
 			data.byte(kMandead) = 2;
-			showgamereel();
+			showgamereel(routine);
 			return;
 		}
 		if (ax == 10) {
-			push(es);
-			push(bx);
-			push(ax);
-			dx = kIntrotextname;
-			loadtemptext();
-			ax = pop();
-			bx = pop();
-			es = pop();
+			loadtemptext("DREAMWEB.T82");
 			data.byte(kCombatcount) = (uint8)-1;
 			data.byte(kSpeechcount) = 0;
 		}
@@ -733,10 +727,10 @@ void DreamGenContext::madman() {
 				}
 			}
 		}
-		es.word(bx+3) = ax;
+		routine->setReelPointer(ax);
 	}
-	showgamereel();
-	es.byte(bx+1) = data.byte(kMapx);
+	showgamereel(routine);
+	routine->mapX = data.byte(kMapx);
 	madmode();
 }