[Scummvm-git-logs] scummvm master -> 0e472905adc49264ed7cb1fb32ab7ff6722dbcd6

digitall noreply at scummvm.org
Sun Jun 25 02:47:57 UTC 2023


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:
0e472905ad GRAPHICS: MACGUI: Fix Set But Unused Variable GCC Compiler Warning


Commit: 0e472905adc49264ed7cb1fb32ab7ff6722dbcd6
    https://github.com/scummvm/scummvm/commit/0e472905adc49264ed7cb1fb32ab7ff6722dbcd6
Author: D G Turner (digitall at scummvm.org)
Date: 2023-06-25T03:44:59+01:00

Commit Message:
GRAPHICS: MACGUI: Fix Set But Unused Variable GCC Compiler Warning

These were left over from "Fix alignment issues for multiline text"
recent commit.

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index f5d1b377287..4aa1c3fe386 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -1012,8 +1012,6 @@ int MacText::getLineWidth(int line, bool enforce, int col) {
 	int height = 0;
 	int charwidth = 0;
 
-	bool hastext = false;
-
 	for (uint i = 0; i < _textLines[line].chunks.size(); i++) {
 		if (enforce && _macFontMode)
 			_textLines[line].chunks[i].font = nullptr;
@@ -1033,7 +1031,6 @@ int MacText::getLineWidth(int line, bool enforce, int col) {
 		if (!_textLines[line].chunks[i].text.empty()) {
 			width += getStringWidth(_textLines[line].chunks[i], _textLines[line].chunks[i].text);
 			charwidth += _textLines[line].chunks[i].text.size();
-			hastext = true;
 		}
 
 		height = MAX(height, _textLines[line].chunks[i].getFont()->getFontHeight());




More information about the Scummvm-git-logs mailing list