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

[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:
6c44b5762e TITANIC: Cleanup of CAutoAnimate class


Commit: 6c44b5762e6fa009c548f5dacdb422ccde958724
    https://github.com/scummvm/scummvm/commit/6c44b5762e6fa009c548f5dacdb422ccde958724
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-16T15:05:56-04:00

Commit Message:
TITANIC: Cleanup of CAutoAnimate class

Changed paths:
    engines/titanic/game/auto_animate.cpp
    engines/titanic/game/auto_animate.h


diff --git a/engines/titanic/game/auto_animate.cpp b/engines/titanic/game/auto_animate.cpp
index 16e6e56..1256ecb 100644
--- a/engines/titanic/game/auto_animate.cpp
+++ b/engines/titanic/game/auto_animate.cpp
@@ -32,7 +32,7 @@ END_MESSAGE_MAP()
 void CAutoAnimate::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_enabled, indent);
-	file->writeNumberLine(_fieldE4, indent);
+	file->writeNumberLine(_redo, indent);
 	file->writeNumberLine(_repeat, indent);
 	CBackground::save(file, indent);
 }
@@ -40,7 +40,7 @@ void CAutoAnimate::save(SimpleFile *file, int indent) {
 void CAutoAnimate::load(SimpleFile *file) {
 	file->readNumber();
 	_enabled = file->readNumber();
-	_fieldE4 = file->readNumber();
+	_redo = file->readNumber();
 	_repeat = file->readNumber();
 	CBackground::load(file);
 }
@@ -53,7 +53,7 @@ bool CAutoAnimate::EnterViewMsg(CEnterViewMsg *msg) {
 		else
 			playMovie(flags);
 
-		if (!_fieldE4)
+		if (!_redo)
 			_enabled = false;
 	}
 
diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h
index 735aba9..48764ad 100644
--- a/engines/titanic/game/auto_animate.h
+++ b/engines/titanic/game/auto_animate.h
@@ -34,11 +34,11 @@ class CAutoAnimate : public CBackground {
 	bool InitializeAnimMsg(CInitializeAnimMsg *msg);
 private:
 	bool _enabled;
-	int _fieldE4;
+	bool _redo;
 	bool _repeat;
 public:
 	CLASSDEF;
-	CAutoAnimate() : CBackground(), _enabled(true), _fieldE4(1), _repeat(false) {}
+	CAutoAnimate() : CBackground(), _enabled(true), _redo(true), _repeat(false) {}
 
 	/**
 	 * Save the data for the class to file