[Scummvm-cvs-logs] scummvm master -> 8188251c35d3c732c74775f2dae6442b9cefbdc0

[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:
8188251c35 SHERLOCK: RT: Fix crash clicking outside cards in card game


Commit: 8188251c35d3c732c74775f2dae6442b9cefbdc0
    https://github.com/scummvm/scummvm/commit/8188251c35d3c732c74775f2dae6442b9cefbdc0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-17T21:06:44-04:00

Commit Message:
SHERLOCK: RT: Fix crash clicking outside cards in card game

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index fe60189..46d91ce 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -874,8 +874,8 @@ Common::Point TattooPerson::getSourcePoint() const {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	int scaleVal = scene.getScaleVal(_position);
 
-	return Common::Point(_position.x / FIXED_INT_MULTIPLIER + _imageFrame->sDrawXSize(scaleVal) / 2,
-		_position.y / FIXED_INT_MULTIPLIER);
+	return Common::Point(_position.x / FIXED_INT_MULTIPLIER + 
+		(_imageFrame ? _imageFrame->sDrawXSize(scaleVal) / 2 : 0), _position.y / FIXED_INT_MULTIPLIER);
 }
 
 void TattooPerson::setObjTalkSequence(int seq) {