[Scummvm-git-logs] scummvm master -> 4a1a7f965f0b8fa62de6a0e9778e9b9afe4db4f0

[sev-]

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

Summary:
90aca034df WAGE: Properly set the character when player is not defined
4a1a7f965f GRAPHICS: MACGUI: Do not crash when nothing was drawn yet


Commit: 90aca034dfb9a32fa6a5341e15438808b85fed29
    https://github.com/scummvm/scummvm/commit/90aca034dfb9a32fa6a5341e15438808b85fed29
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-28T19:13:49+02:00

Commit Message:
WAGE: Properly set the character when player is not defined

Changed paths:
    engines/wage/world.cpp


diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index c0c802f..a1d3f6e 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -267,7 +267,7 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 		if (_chrs.empty()) {
 			error("loadWorld: and I have no characters");
 		}
-		_player = _chrs[0];
+		_player = _orderedChrs[0];
 	}
 
 


Commit: 4a1a7f965f0b8fa62de6a0e9778e9b9afe4db4f0
    https://github.com/scummvm/scummvm/commit/4a1a7f965f0b8fa62de6a0e9778e9b9afe4db4f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-28T19:17:45+02:00

Commit Message:
GRAPHICS: MACGUI: Do not crash when nothing was drawn yet

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 244988b..69e2dce 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -417,7 +417,8 @@ void MacText::clearText() {
 	_textLines.clear();
 	_str.clear();
 
-	_surface->clear(_bgcolor);
+	if (_surface)
+		_surface->clear(_bgcolor);
 
 	recalcDims();
 }