[Scummvm-git-logs] scummvm master -> 0444d62e1d45dded7b5a8cd21f1983cc522db487

[sev-]

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:
7db17ac189 DIRECTOR: Fix warning and add clarifying comment
0444d62e1d DIRECTOR: Remove redundant variable


Commit: 7db17ac1890d394309d0deada14e188663121dbf
    https://github.com/scummvm/scummvm/commit/7db17ac1890d394309d0deada14e188663121dbf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-21T01:13:55+02:00

Commit Message:
DIRECTOR: Fix warning and add clarifying comment

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index cb4c43c18c0..7a6813f05a6 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -222,9 +222,9 @@ bool Cast::loadConfig() {
 	if (!g_director->_fixStageSize) {
 		_movieRect = Movie::readRect(*stream);
 	} else {
-		//Let the compiler unroll this loop
+		// Skipping rectangle and substituting it with the global one
 		for (int i = 0; i < 4; i++)
-			stream->readSint16();
+			(void)stream->readSint16();
 		_movieRect = g_director->_fixStageRect;
 	}
 	if (!_isShared)


Commit: 0444d62e1d45dded7b5a8cd21f1983cc522db487
    https://github.com/scummvm/scummvm/commit/0444d62e1d45dded7b5a8cd21f1983cc522db487
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-21T01:15:16+02:00

Commit Message:
DIRECTOR: Remove redundant variable

Changed paths:
    engines/director/lingo/lingo-the.cpp


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 6127d856851..609bede43d7 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -388,11 +388,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d = getTheCast(id, field);
 		break;
 	case kTheCastMembers:
-		{
-			d.type = INT;
-			Movie *movie = g_director->getCurrentMovie();
-			d.u.i = movie->getCast()->_loadedCast->size() + movie->_sharedCast->_loadedCast->size();
-		}
+		d.type = INT;
+		d.u.i = movie->getCast()->_loadedCast->size() + movie->_sharedCast->_loadedCast->size();
 		break;
 	case kTheCenterStage:
 		d.type = INT;