From 00857eabe1446518e55bd1fa29b4ad9c0c9c107c Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Mon, 24 Aug 2009 21:53:15 +0000
Subject: Some modifications in o6_playVmdOrMusic: Less warnings in console
 Windows, and first animations on interface icons. still problematic : cursor
 should not disappear during animation, and animation should loop

svn-id: r43709
---
 engines/gob/inter_v6.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 4e2ec69cf2..a0c6a0ad1d 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -133,23 +133,36 @@ void Inter_v6::o6_playVmdOrMusic() {
 	if (lastFrame == -1) {
 		close = true;
 	} else if (lastFrame == -5) {
+//		warning("Urban/Playtoons Stub: Stop without delay");
 		_vm->_sound->bgStop();
 		return;
-	} else if (lastFrame == -9) {
+	} else if (lastFrame == -6) {
+//		warning("Urban/Playtoons Stub: Video/Music command -6 (cache video)");
+		return;
+	} else if (lastFrame == -7) {
+//		warning("Urban/Playtoons Stub: Video/Music command -6 (flush cache)");
+		return;
+	} else if ((lastFrame == -8) || (lastFrame == -9)) {
 		if (!strchr(fileName, '.'))
 			strcat(fileName, ".WA8");
 
 		probe16bitMusic(fileName);
 
+		warning("Urban/Playtoons Stub: Video/Music command %d (NOT IMPLEMENTED delayed stop + start), %s", lastFrame, fileName);
 		_vm->_sound->bgStop();
 		_vm->_sound->bgPlay(fileName, SOUND_WAV);
 		return;
-	} else if (lastFrame == -10) {
+	} else if (lastFrame <= -10) {
 		_vm->_vidPlayer->primaryClose();
-		warning("Urban Stub: Video/Music command -10 (close video?)");
-		return;
+		warning("Urban/Playtoons Stub: Video/Music command %d (close video?), %s", lastFrame, fileName);
+		if (lastFrame <= -100)
+			lastFrame += 100;
+
+		palEnd=(-lastFrame)%10;
+		if (palEnd==3 && lastFrame<=-20)
+			_vm->_sound->bgPlay(fileName, SOUND_WAV);
 	} else if (lastFrame < 0) {
-		warning("Unknown Video/Music command: %d, %s", lastFrame, fileName);
+		warning("Urban/Playtoons Stub: Unknown Video/Music command: %d, %s", lastFrame, fileName);
 		return;
 	}
 
-- 
cgit v1.2.3