← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to engines/sci/graphics/portrait.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-05-25 19:02:23 UTC
  • mto: (21.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110525190223-fiqm0oaec714xk31
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/sci/graphics/portrait.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-1-2-1/engines/sci/graphics/portrait.cpp $
22
 
 * $Id: portrait.cpp 52431 2010-08-29 00:39:33Z thebluegr $
 
21
 * $URL$
 
22
 * $Id$
23
23
 *
24
24
 */
25
25
 
26
26
#include "common/archive.h"
27
 
#include "common/util.h"
28
 
#include "common/stack.h"
29
 
#include "graphics/primitives.h"
 
27
#include "common/system.h"
30
28
 
31
29
#include "sci/sci.h"
32
30
#include "sci/event.h"
203
201
                }
204
202
        }
205
203
 
206
 
        if (userAbort)
 
204
        if (userAbort) {
 
205
                // Reset the portrait bitmap to "closed mouth" state, when skipping dialogs
 
206
                drawBitmap(0);
 
207
                bitsShow();
207
208
                _audio->stopAudio();
 
209
        }
208
210
 
209
211
        _resMan->unlockResource(syncResource);
210
212
}