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

[sluicebox]

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:
aaebd2aa85 SCI: Fix some comments


Commit: aaebd2aa855b1716accf4a6a8ad4cde1a27a8d31
    https://github.com/scummvm/scummvm/commit/aaebd2aa855b1716accf4a6a8ad4cde1a27a8d31
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2022-11-12T19:33:37-08:00

Commit Message:
SCI: Fix some comments

Changed paths:
    engines/sci/engine/workarounds.cpp
    engines/sci/graphics/text16.cpp


diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index e3a06806846..6103375956e 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -1327,7 +1327,7 @@ static const SciMessageWorkaroundEntry messageWorkarounds[] = {
 	{ GID_LAURABOW2,     SCI_MEDIA_FLOPPY, K_LANG_NONE,     -1,  550,   5,  39,   6,  1, { MSG_WORKAROUND_REMAP,    550,  45,  39,   6,  1,  0,   0,   0, nullptr } },
 	// Looking at coal in room 720, message is prepended with carriage return and newline
 	{ GID_LAURABOW2,     SCI_MEDIA_CD,     K_LANG_ENGLISH,  -1,  720,  12,   1,   0,  1, { MSG_WORKAROUND_EXTRACT,  720,  12,   1,   0,  1, 99,   2, 255, nullptr } },
-	// Asking Olympia about Pippin Carter during Act 2 in German version - bug #5170
+	// Asking Olympia about Pippin Carter during Act 2 in German version - bug #5710
 	//  This message contains over seventy trailing newlines, causing the graphics code to
 	//  draw a window larger than the screen and crash. We trim the trailing newlines.
 	{ GID_LAURABOW2,     SCI_MEDIA_FLOPPY, K_LANG_GERMAN,   -1, 1892,   1,   6,   3,  1, { MSG_WORKAROUND_EXTRACT, 1892,   1,   6,   3,  1, 25,   0, 249, nullptr } },
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 345bfd473f6..676be5f8ec4 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -192,8 +192,8 @@ static const uint16 text16_shiftJIS_punctuation_SCI01[] = {
 //  Laura Bow 2 - Credits in the game menu - all the text lines start with spaces (bug #5159)
 //                Act 6 Coroner questionnaire - the text of all control buttons has trailing spaces
 //                                              "Detective Ryan Hanrahan O'Riley" contains even more spaces (bug #5334)
-//  Conquests of Camelot - talking with Cobb - one text box of the dialogue contains a longer word,
-//                                              that will be broken into 2 lines (bug #5159)
+//  Conquests of the Longbow - talking with Lobb - one text box of the dialogue contains a longer word,
+//                                                 that will be broken into 2 lines (bug #5159)
 int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId orgFontId) {
 	uint16 curChar = 0;
 	const char *textStartPtr = textPtr;
@@ -549,7 +549,6 @@ void GfxText16::Draw(const char *text, int16 from, int16 len, GuiResourceId orgF
 	}
 }
 
-// returns maximum font height used
 void GfxText16::Show(const char *text, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor) {
 	Common::Rect rect;