[Scummvm-cvs-logs] SF.net SVN: scummvm:[49038] scummvm/branches/branch-1-1-0

[eriktorbjorn at users.sourceforge.net]

Revision: 49038
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49038&view=rev
Author:   eriktorbjorn
Date:     2010-05-15 08:56:27 +0000 (Sat, 15 May 2010)

Log Message:
-----------
Bakported fix for missing cutscene speech, in case we ever release 1.1.2.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/NEWS
    scummvm/branches/branch-1-1-0/engines/sword2/animation.cpp

Modified: scummvm/branches/branch-1-1-0/NEWS
===================================================================
--- scummvm/branches/branch-1-1-0/NEWS	2010-05-15 08:54:58 UTC (rev 49037)
+++ scummvm/branches/branch-1-1-0/NEWS	2010-05-15 08:56:27 UTC (rev 49038)
@@ -1,6 +1,10 @@
 For a more comprehensive changelog for the latest experimental SVN code, see:
         http://scummvm.svn.sourceforge.net/viewvc/scummvm/?view=log
 
+1.1.2 (????-??-??)
+  Broken Sword 2
+   - Fixed missing speech in some cutscenes.
+
 1.1.1 (2010-05-02)
  New Ports:
    - Added Nintendo 64 Port. (Actually added in 1.1.0, but forgot to mention it. oops)

Modified: scummvm/branches/branch-1-1-0/engines/sword2/animation.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/sword2/animation.cpp	2010-05-15 08:54:58 UTC (rev 49037)
+++ scummvm/branches/branch-1-1-0/engines/sword2/animation.cpp	2010-05-15 08:56:27 UTC (rev 49038)
@@ -259,7 +259,7 @@
 			text->_played = true;
 			_vm->_sound->playCompSpeech(text->_speechId, 16, 0);
 		}
-		if (frame <= text->_endFrame) {
+		if (frame < text->_endFrame) {
 			drawTextObject(_currentMovieText, screen);
 		} else {
 			closeTextObject(_currentMovieText, screen);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.