[Scummvm-git-logs] scummvm master -> 8105d91802ba860f2a68c5909ef10863a19c0e14

[mduggan]

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:
8105d91802 TINSEL: Replace initializer list with constructor


Commit: 8105d91802ba860f2a68c5909ef10863a19c0e14
    https://github.com/scummvm/scummvm/commit/8105d91802ba860f2a68c5909ef10863a19c0e14
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-26T13:32:08+09:00

Commit Message:
TINSEL: Replace initializer list with constructor

Some compilers don't like extended initializer lists.

Changed paths:
    engines/tinsel/anim.h
    engines/tinsel/cursor.cpp
    engines/tinsel/cursor.h


diff --git a/engines/tinsel/anim.h b/engines/tinsel/anim.h
index 0c0d5e18ae..2261f6edf2 100644
--- a/engines/tinsel/anim.h
+++ b/engines/tinsel/anim.h
@@ -32,6 +32,9 @@ struct OBJECT;
 
 /** animation structure */
 struct ANIM {
+	ANIM() : aniRate(0), aniDelta(0), pObject(nullptr),
+		hScript(0), scriptIndex(0) {};
+
 	int aniRate;		///< animation speed
 	int aniDelta;		///< animation speed delta counter
 	OBJECT *pObject;	///< object to animate (assumed to be multi-part)
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index 32b177e960..e1af8be948 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -55,9 +55,6 @@ Cursor::Cursor() {
 	_mainCursor = nullptr;
 	_auxCursor = nullptr;
 
-	_mainCursorAnim = {0, 0, 0, 0, 0};
-	_auxCursorAnim = {0, 0, 0, 0, 0};
-
 	_hiddenCursor = false;
 	_hiddenTrails = false;
 	_tempHiddenCursor = false;
diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h
index 750058dfc5..465a7c16ea 100644
--- a/engines/tinsel/cursor.h
+++ b/engines/tinsel/cursor.h
@@ -110,9 +110,9 @@ private:
 	int _numTrails;
 	int _nextTrail;
 
-    // Auxillary cursor image's animation offsets
+	// Auxillary cursor image's animation offsets
 	short _auxCursorOffsetX;
-    short _auxCursorOffsetY;
+	short _auxCursorOffsetY;
 
 	struct {
 		ANIM trailAnim;   // Animation structure