[Scummvm-git-logs] scummvm master -> 79e59fd80a4b5c61af0d96783d0d5e60592f07a7

[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:
ea7f98999e TITANIC: Fix compiler warnings
79e59fd80a TITANIC: Renaming in CParrot class


Commit: ea7f98999e9ce3dd31cef73ae34a7cf8203cdedf
    https://github.com/scummvm/scummvm/commit/ea7f98999e9ce3dd31cef73ae34a7cf8203cdedf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-25T16:42:26-05:00

Commit Message:
TITANIC: Fix compiler warnings

Changed paths:
    engines/titanic/core/saveable_object.cpp
    engines/titanic/support/avi_surface.h


diff --git a/engines/titanic/core/saveable_object.cpp b/engines/titanic/core/saveable_object.cpp
index 5e8c138..f718ba7 100644
--- a/engines/titanic/core/saveable_object.cpp
+++ b/engines/titanic/core/saveable_object.cpp
@@ -424,9 +424,6 @@ CSaveableObject *ClassDef::create() {
 CSaveableObject::ClassListMap *CSaveableObject::_classList;
 CSaveableObject::ClassDefList *CSaveableObject::_classDefs;
 
-ClassDef **types[1000];
-static int tctr = 0;
-
 #define DEFFN(T) CSaveableObject *Function##T() { return new T(); } \
 	ClassDef *T::_type
 #define ADDFN(CHILD, PARENT) \
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index 216d4f8..4ee6cc6 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -179,11 +179,6 @@ public:
 	int getFrame() const { return _currentFrame; }
 
 	/**
-	 * Returns true if the surface is playing in reverse
-	 */
-	bool isReversed() const { return _isReversed; }
-
-	/**
 	 * Add a movie event
 	 */
 	bool addEvent(int frameNumber, CGameObject *obj);


Commit: 79e59fd80a4b5c61af0d96783d0d5e60592f07a7
    https://github.com/scummvm/scummvm/commit/79e59fd80a4b5c61af0d96783d0d5e60592f07a7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-25T16:42:44-05:00

Commit Message:
TITANIC: Renaming in CParrot class

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


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index ac33277..65c05e8 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -56,7 +56,7 @@ CParrot::CParrot() : CTrueTalkNPC() {
 	_string2 = "CarryParrot";
 	_field118 = 1;
 	_field11C = 25;
-	_field120 = 0;
+	_lastSpeakTime = 0;
 	_newXp = 73;
 	_newXc = 58;
 	_field12C = 0;
@@ -126,7 +126,7 @@ void CParrot::save(SimpleFile *file, int indent) {
 	file->writeQuotedLine(_string2, indent);
 	file->writeNumberLine(_field118, indent);
 	file->writeNumberLine(_field11C, indent);
-	file->writeNumberLine(_field120, indent);
+	file->writeNumberLine(_lastSpeakTime, indent);
 	file->writeNumberLine(_newXp, indent);
 	file->writeNumberLine(_newXc, indent);
 	file->writeNumberLine(_field12C, indent);
@@ -150,7 +150,7 @@ void CParrot::load(SimpleFile *file) {
 	_string2 = file->readString();
 	_field118 = file->readNumber();
 	_field11C = file->readNumber();
-	_field120 = file->readNumber();
+	_lastSpeakTime = file->readNumber();
 	_newXp = file->readNumber();
 	_newXc = file->readNumber();
 	_field12C = file->readNumber();
@@ -426,7 +426,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) {
 	}
 
 	// Don't have the parrot speak too often
-	if ((getTicksCount() - _field120) < 20000 || _speechCounter)
+	if ((getTicksCount() - _lastSpeakTime) < 20000 || _speechCounter)
 		return true;
 
 	playSound("z#475.wav", 50);
@@ -473,7 +473,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) {
 		}
 	}
 
-	_field120 = getTicksCount();
+	_lastSpeakTime = getTicksCount();
 	return true;
 }
 
diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h
index 54b16de..66a199e 100644
--- a/engines/titanic/npcs/parrot.h
+++ b/engines/titanic/npcs/parrot.h
@@ -57,7 +57,7 @@ private:
 	CString _string2;
 	int _field118;
 	int _field11C;
-	int _field120;
+	uint _lastSpeakTime;
 	int _newXp;
 	int _newXc;
 	int _field12C;