diff options
| author | Arnaud Boutonné | 2009-08-24 21:53:15 +0000 | 
|---|---|---|
| committer | Arnaud Boutonné | 2009-08-24 21:53:15 +0000 | 
| commit | 00857eabe1446518e55bd1fa29b4ad9c0c9c107c (patch) | |
| tree | 5191595fea2c7940ff9ed638c7f2b07b76ca9ca9 | |
| parent | 833ff0ccb74ae5d673e1a1de44d90b0d91da6e49 (diff) | |
| download | scummvm-rg350-00857eabe1446518e55bd1fa29b4ad9c0c9c107c.tar.gz scummvm-rg350-00857eabe1446518e55bd1fa29b4ad9c0c9c107c.tar.bz2 scummvm-rg350-00857eabe1446518e55bd1fa29b4ad9c0c9c107c.zip | |
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
| -rw-r--r-- | engines/gob/inter_v6.cpp | 23 | 
1 files changed, 18 insertions, 5 deletions
| 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;  	} | 
