[Scummvm-git-logs] scummvm master -> 6c1e8127dfbb957739f13e7b83b074615df01ac8

[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:
6c1e8127df TITANIC: Fix ship crashing multiple times


Commit: 6c1e8127dfbb957739f13e7b83b074615df01ac8
    https://github.com/scummvm/scummvm/commit/6c1e8127dfbb957739f13e7b83b074615df01ac8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-01T21:53:29-04:00

Commit Message:
TITANIC: Fix ship crashing multiple times

Changed paths:
    engines/titanic/core/game_object.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 53ad5de..7848734 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -898,7 +898,12 @@ CString CGameObject::getViewFullName() const {
 }
 
 void CGameObject::sleep(uint milli) {
-	g_vm->_events->sleep(milli);
+	// Use an empty event target so that standard scene drawing won't happen
+	Events &events = *g_vm->_events;
+	CEventTarget nullTarget;
+	events.addTarget(&nullTarget);
+	events.sleep(milli);
+	events.removeTarget();
 }
 
 Point CGameObject::getMousePos() const {