thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r43709
This commit is contained in:
Arnaud Boutonné 2009-08-24 21:53:15 +00:00
parent 833ff0ccb7
commit 00857eabe1
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/gob/inter_v6.cpp
View file

@ -133,23 +133,36 @@ void Inter_v6::o6_playVmdOrMusic() {
if (lastFrame == -1) { if (lastFrame == -1) {
close = true; close = true;
} else if (lastFrame == -5) { } else if (lastFrame == -5) {
// warning("Urban/Playtoons Stub: Stop without delay");
_vm->_sound->bgStop(); _vm->_sound->bgStop();
return; 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, '.')) if (!strchr(fileName, '.'))
strcat(fileName, ".WA8"); strcat(fileName, ".WA8");
probe16bitMusic(fileName); probe16bitMusic(fileName);
warning("Urban/Playtoons Stub: Video/Music command %d (NOT IMPLEMENTED delayed stop + start), %s", lastFrame, fileName);
_vm->_sound->bgStop(); _vm->_sound->bgStop();
_vm->_sound->bgPlay(fileName, SOUND_WAV); _vm->_sound->bgPlay(fileName, SOUND_WAV);
return; return;
} else if (lastFrame == -10) { } else if (lastFrame <= -10) {
_vm->_vidPlayer->primaryClose(); _vm->_vidPlayer->primaryClose();
warning("Urban Stub: Video/Music command -10 (close video?)"); warning("Urban/Playtoons Stub: Video/Music command %d (close video?), %s", lastFrame, fileName);
return; if (lastFrame <= -100)
lastFrame += 100;
palEnd=(-lastFrame)%10;
if (palEnd==3 && lastFrame<=-20)
_vm->_sound->bgPlay(fileName, SOUND_WAV);
} else if (lastFrame < 0) { } 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; return;
} }