[Scummvm-git-logs] scummvm master -> 2d1b0969d13e739ed6e61dc7b58eefcfbdf37558

[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:
2d1b0969d1 TITANIC: Remove accidentally committed debug code


Commit: 2d1b0969d13e739ed6e61dc7b58eefcfbdf37558
    https://github.com/scummvm/scummvm/commit/2d1b0969d13e739ed6e61dc7b58eefcfbdf37558
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-17T22:51:38-05:00

Commit Message:
TITANIC: Remove accidentally committed debug code

Changed paths:
    engines/titanic/npcs/parrot.cpp


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index becd13b..d4ed629 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -644,7 +644,6 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
 
 		if (action != 280266) {
 			if (pt.x < 75) {
-				warning("***********************");
 				_npcFlags |= NPCFLAG_1000000;
 				playClip("Walk Left Intro", MOVIE_STOP_PREVIOUS);
 				playClip("Walk Left Loop", MOVIE_NOTIFY_OBJECT);
@@ -685,7 +684,7 @@ bool CParrot::MovieFrameMsg(CMovieFrameMsg *msg) {
 
 		_npcFlags &= ~NPCFLAG_800000;
 	}
-	warning("%d", msg->_frameNumber);//***DEBUG***
+
 	switch (msg->_frameNumber) {
 	case 244:
 		setPosition(Point(_bounds.left + 45, _bounds.top));