[Scummvm-git-logs] scummvm master -> b4ee0ec8236787c8894dd78d305006b54890bfb1

[dreammaster]

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:
67ae67d685 TITANIC: Fix another struct vs class warning
b4ee0ec823 TITANIC: Hide back view of MaitreD from close to the table


Commit: 67ae67d685676bd3fd52915c57c8751b36a8f0bf
    https://github.com/scummvm/scummvm/commit/67ae67d685676bd3fd52915c57c8751b36a8f0bf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T11:05:33-04:00

Commit Message:
TITANIC: Fix another struct vs class warning

Changed paths:
    engines/titanic/star_control/star_camera.h


diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h
index 572995f..7bfccd1 100644
--- a/engines/titanic/star_control/star_camera.h
+++ b/engines/titanic/star_control/star_camera.h
@@ -31,7 +31,7 @@ namespace Titanic {
 
 class CCameraMover;
 class CErrorCode;
-class CNavigationInfo;
+struct CNavigationInfo;
 class FPoint;
 class SimpleFile;
 


Commit: b4ee0ec8236787c8894dd78d305006b54890bfb1
    https://github.com/scummvm/scummvm/commit/b4ee0ec8236787c8894dd78d305006b54890bfb1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T11:08:25-04:00

Commit Message:
TITANIC: Hide back view of MaitreD from close to the table

The MaitreD was rendered using frame 0 from c386.avi, but with a
corrupted right and bottom edge. Ironically, the MaitreD object
isn't used at all, since hiding him revealed he's part of the
background as well. From the video, it seems like he was meant
to have an idle wiggle animation that didn't end up being used.

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


diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp
index e944af8..a45f485 100644
--- a/engines/titanic/npcs/maitre_d.cpp
+++ b/engines/titanic/npcs/maitre_d.cpp
@@ -78,6 +78,11 @@ void CMaitreD::load(SimpleFile *file) {
 	_timerId = file->readNumber();
 
 	CTrueTalkNPC::load(file);
+
+	// WORKAROUND: The back view of the MaitreD from close to the table is dodgy
+	// in the original. And unneeded anyway, since he's also part of the background
+	if (_name == "MaitreLoop03")
+		_visible = false;
 }
 
 bool CMaitreD::RestaurantMusicChanged(CRestaurantMusicChanged *msg) {