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

[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:
4d07d1b2ad SCUMM: MOONBASE: Remove unused variable
0a034af1b2 COMMON: Get rid of global constructor


Commit: 4d07d1b2ad2116e04215d581dab7dcef536ce008
    https://github.com/scummvm/scummvm/commit/4d07d1b2ad2116e04215d581dab7dcef536ce008
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-18T13:57:18+02:00

Commit Message:
SCUMM: MOONBASE: Remove unused variable

Changed paths:
    engines/scumm/he/moonbase/dialog-mapgenerator.h


diff --git a/engines/scumm/he/moonbase/dialog-mapgenerator.h b/engines/scumm/he/moonbase/dialog-mapgenerator.h
index 559724a6995..e49bbf1e1dd 100644
--- a/engines/scumm/he/moonbase/dialog-mapgenerator.h
+++ b/engines/scumm/he/moonbase/dialog-mapgenerator.h
@@ -43,7 +43,6 @@ private:
 	GUI::StaticTextWidget *_algorDesc;
 	GUI::RadiobuttonGroup *_algorGroup;
 	GUI::RadiobuttonWidget *_algorSpiff;
-	GUI::RadiobuttonWidget *_algorKatton;
 	GUI::CheckboxWidget *_algorRandom;
 
 	GUI::StaticTextWidget *_sizeDesc;


Commit: 0a034af1b28307f6dd4a54dbd51e57398b71d410
    https://github.com/scummvm/scummvm/commit/0a034af1b28307f6dd4a54dbd51e57398b71d410
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-18T14:00:17+02:00

Commit Message:
COMMON: Get rid of global constructor

Changed paths:
    common/base64.cpp


diff --git a/common/base64.cpp b/common/base64.cpp
index 0175e076431..c17a3c9e00d 100644
--- a/common/base64.cpp
+++ b/common/base64.cpp
@@ -28,7 +28,7 @@
 
 namespace Common {
 
-static const String encodingTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char *encodingTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 bool b64Validate(String &string) {
 	bool paddingStarted = false;
@@ -38,9 +38,11 @@ bool b64Validate(String &string) {
 	if ((strlen(string.c_str()) % 4) > 0)
 		return false;
 
+	String encodingStr(encodingTable);
+
 	// It must also use characters defined in the encoding table,
 	for (char c : string) {
-		if (!encodingTable.contains(c)) {
+		if (!encodingStr.contains(c)) {
 			// or the padding character (=).
 			if (c != '=')
 				return false;