[Scummvm-git-logs] scummvm master -> e068b1c65bab0447c8962c70b5413fe00f0dfe56

[athrxx]

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:
e068b1c65b KYRA: remove excess semicolons


Commit: e068b1c65bab0447c8962c70b5413fe00f0dfe56
    https://github.com/scummvm/scummvm/commit/e068b1c65bab0447c8962c70b5413fe00f0dfe56
Author: athrxx (athrxx at scummvm.org)
Date: 2022-06-09T01:20:37+02:00

Commit Message:
KYRA: remove excess semicolons

Changed paths:
    engines/kyra/engine/kyra_lok.cpp
    engines/kyra/text/text.cpp
    engines/kyra/text/text_lok.cpp


diff --git a/engines/kyra/engine/kyra_lok.cpp b/engines/kyra/engine/kyra_lok.cpp
index 834a836a62d..677d9b67869 100644
--- a/engines/kyra/engine/kyra_lok.cpp
+++ b/engines/kyra/engine/kyra_lok.cpp
@@ -451,7 +451,7 @@ void KyraEngine_LoK::startup() {
 			saveGameStateIntern(0, "New game", nullptr);
 		}
 	} else {
-		_screen->setFont(_defaultFont);;
+		_screen->setFont(_defaultFont);
 		_screen->_lineSpacing = _defaultLineSpacing;
 		loadGameStateCheck(_gameToLoad);
 		_gameToLoad = -1;
diff --git a/engines/kyra/text/text.cpp b/engines/kyra/text/text.cpp
index 86cc253eee5..18e9ac41e80 100644
--- a/engines/kyra/text/text.cpp
+++ b/engines/kyra/text/text.cpp
@@ -203,12 +203,12 @@ void TextDisplayer::printTalkTextMessage(const char *text, int x, int y, uint8 c
 		w = MIN<int>(w, 302);
 	}
 
-	int top = y - lineCount * (_screen->getFontHeight() + _screen->_lineSpacing) - _langExtraSpacing;;
+	int top = y - lineCount * (_screen->getFontHeight() + _screen->_lineSpacing) - _langExtraSpacing;
 	if (top < marginTop)
 		top = marginTop;
 
 	_talkMessageY = top;
-	_talkMessageH = lineCount * (_screen->getFontHeight() + _screen->_lineSpacing) + _langExtraSpacing;;
+	_talkMessageH = lineCount * (_screen->getFontHeight() + _screen->_lineSpacing) + _langExtraSpacing;
 	
 	int x1 = 12;
 	int x2 = Screen::SCREEN_W - 12;
diff --git a/engines/kyra/text/text_lok.cpp b/engines/kyra/text/text_lok.cpp
index 3cc9421aae0..9b23e2c45c9 100644
--- a/engines/kyra/text/text_lok.cpp
+++ b/engines/kyra/text/text_lok.cpp
@@ -285,7 +285,7 @@ void KyraEngine_LoK::characterSays(int vocFile, const char *chatStr, int16 charN
 	yPos -= lineNum * (_screen->getFontHeight() + _screen->_lineSpacing);
 
 	_text->_talkMessageY = (_flags.lang == Common::ZH_TWN) ? CLIP<int>(yPos, 10, 80) : CLIP<int>(yPos, 11, 100);
-	_text->_talkMessageH = lineNum * (_screen->getFontHeight() + _screen->_lineSpacing) + _text->_langExtraSpacing;;
+	_text->_talkMessageH = lineNum * (_screen->getFontHeight() + _screen->_lineSpacing) + _text->_langExtraSpacing;
 
 	const bool printText = textEnabled();