diff options
author | Travis Howell | 2006-04-17 13:19:36 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-17 13:19:36 +0000 |
commit | d832f69f4ca73af8579c9c5aad63e2b2ec4bb218 (patch) | |
tree | e92986547cfff6421fb5d7d31cc685837a90cc18 /engines/simon/items.cpp | |
parent | 5bfe6fd6f4ac3289caa63050a4315749a6eee68a (diff) | |
download | scummvm-rg350-d832f69f4ca73af8579c9c5aad63e2b2ec4bb218.tar.gz scummvm-rg350-d832f69f4ca73af8579c9c5aad63e2b2ec4bb218.tar.bz2 scummvm-rg350-d832f69f4ca73af8579c9c5aad63e2b2ec4bb218.zip |
Adjust video playback code, due to false calls in prison of FF
svn-id: r21977
Diffstat (limited to 'engines/simon/items.cpp')
-rw-r--r-- | engines/simon/items.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 5f58523fd4..5c8193b3e7 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -332,8 +332,8 @@ void SimonEngine::setupOpcodes() { opcode_table[172] = &SimonEngine::o3_hyperLinkOff; opcode_table[173] = &SimonEngine::o3_checkPaths; opcode_table[181] = &SimonEngine::o3_mouseOff; - opcode_table[182] = &SimonEngine::o3_loadSmack; - opcode_table[183] = &SimonEngine::o3_playSmack; + opcode_table[182] = &SimonEngine::o3_loadVideo; + opcode_table[183] = &SimonEngine::o3_playVideo; opcode_table[187] = &SimonEngine::o3_centreScroll; opcode_table[188] = &SimonEngine::o2_isShortText; opcode_table[189] = &SimonEngine::o2_clearMarks; @@ -1923,16 +1923,19 @@ void SimonEngine::o3_mouseOff() { clearName(); } -void SimonEngine::o3_loadSmack() { +void SimonEngine::o3_loadVideo() { // 182: load video file - _videoName = getStringPtrByID(getNextStringID()); + const byte *filename = getStringPtrByID(getNextStringID()); + debug(0, "Load video %s", filename); + + if (_moviePlay->load((const char *)filename) == false) + warning("Failed to load video file %s", filename); } -void SimonEngine::o3_playSmack() { +void SimonEngine::o3_playVideo() { // 183: play video - debug(0, "Play video %s", _videoName); - - _moviePlay->open((const char *)_videoName); + debug(0, "Play video"); + _moviePlay->play(); } void SimonEngine::o3_centreScroll() { |