[Scummvm-git-logs] scummvm master -> 76a87e2e1b0deb360d7199d87f87ffd66917f1d5

[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:
76a87e2e1b ULTIMA8: Remove another use of 'and' keyword


Commit: 76a87e2e1b0deb360d7199d87f87ffd66917f1d5
    https://github.com/scummvm/scummvm/commit/76a87e2e1b0deb360d7199d87f87ffd66917f1d5
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-13T08:10:12+09:00

Commit Message:
ULTIMA8: Remove another use of 'and' keyword

Changed paths:
    engines/ultima/ultima8/gumps/credits_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 6f3d460cfb..3d8bf50bb6 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -102,7 +102,7 @@ void CreditsGump::Close(bool no_del) {
 
 void CreditsGump::extractLine(Std::string &text_,
                               char &modifier, Std::string &line) {
-	if (!text_.empty() and (text_[0] == '+' || text_[0] == '&' || text_[0] == '}' ||
+	if (!text_.empty() && (text_[0] == '+' || text_[0] == '&' || text_[0] == '}' ||
 							text_[0] == '~' || text_[0] == '@')) {
 		modifier = text_[0];
 		text_.erase(0, 1);