[Scummvm-cvs-logs] scummvm master -> ddf38aa288db1538b8ff126190029ce6e0fffc94

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ddf38aa288 MADS: Fix resetting KernelMessages _talkFont after teleporter scene


Commit: ddf38aa288db1538b8ff126190029ce6e0fffc94
    https://github.com/scummvm/scummvm/commit/ddf38aa288db1538b8ff126190029ce6e0fffc94
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-05-29T22:14:02-04:00

Commit Message:
MADS: Fix resetting KernelMessages _talkFont after teleporter scene

Changed paths:
    engines/mads/messages.cpp



diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index 0d74727..9b2d6f3 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -64,6 +64,7 @@ void KernelMessages::clear() {
 	for (uint i = 0; i < _entries.size(); ++i)
 		_entries[i]._flags = 0;
 
+	_talkFont = _vm->_font->getFont(FONT_CONVERSATION);
 	scene._textSpacing = -1;
 }
 
@@ -154,7 +155,6 @@ void KernelMessages::reset() {
 	for (uint i = 0; i < _entries.size(); ++i)
 		remove(i);
 
-	_talkFont = _vm->_font->getFont(FONT_CONVERSATION);
 	_randomMessages.clear();
 }