[Scummvm-cvs-logs] scummvm master -> 56cf25f9d641f80241619d9fb030d1a5154c903f

dreammaster dreammaster at scummvm.org
Sun Oct 27 01:48:59 CEST 2013


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:
56cf25f9d6 TSAGE: Fix for duty officer speaker in R2R intro sequence


Commit: 56cf25f9d641f80241619d9fb030d1a5154c903f
    https://github.com/scummvm/scummvm/commit/56cf25f9d641f80241619d9fb030d1a5154c903f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-26T16:48:27-07:00

Commit Message:
TSAGE: Fix for duty officer speaker in R2R intro sequence

Changed paths:
    engines/tsage/ringworld2/ringworld2_speakers.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 61d564f..fee97f2 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -3217,7 +3217,7 @@ void SpeakerDutyOfficer180::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 		break;
 	case 1:
-		_action = NULL;
+		_action->_action = NULL;
 		_object1.setup(76, 2, 1);
 		_object1.animate(ANIM_MODE_5, this);
 		break;






More information about the Scummvm-git-logs mailing list