[Scummvm-git-logs] scummvm master -> 20bc3b9ac5a27a2efde2935fb41ce610e010b7a5

[mgerhardy]

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:
20bc3b9ac5 TWINE: attempt to fix compilation on older gcc versions


Commit: 20bc3b9ac5a27a2efde2935fb41ce610e010b7a5
    https://github.com/scummvm/scummvm/commit/20bc3b9ac5a27a2efde2935fb41ce610e010b7a5
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2020-10-24T17:34:25+02:00

Commit Message:
TWINE: attempt to fix compilation on older gcc versions

Changed paths:
    engines/twine/menuoptions.h
    engines/twine/text.h


diff --git a/engines/twine/menuoptions.h b/engines/twine/menuoptions.h
index 0b7bce18cc..8ca57ef180 100644
--- a/engines/twine/menuoptions.h
+++ b/engines/twine/menuoptions.h
@@ -44,7 +44,7 @@ public:
 
 	int32 canShowCredits = 0;
 
-	char playerName[32] = "";
+	char playerName[32] {'\0'};
 
 	/** Main menu new game options */
 	void newGameMenu();
diff --git a/engines/twine/text.h b/engines/twine/text.h
index 24ccd15a21..eac358c0a6 100644
--- a/engines/twine/text.h
+++ b/engines/twine/text.h
@@ -70,7 +70,7 @@ private:
 
 	// RECHECK THIS LATER
 	int32 currentBankIdx = -1; // textVar1
-	char textVar2[256] = "";
+	char textVar2[256] {'\0'};
 
 	/** Dialogue text pointer */
 	char *dialTextPtr = nullptr; // bufText
@@ -82,8 +82,8 @@ private:
 	const int16 spaceChar = 0x20;
 
 	// TODO: refactor all this variables and related functions
-	char buf1[256] = "";
-	char buf2[256] = "";
+	char buf1[256] {'\0'};
+	char buf2[256] {'\0'};
 	char *printText8Ptr1 = nullptr;
 	char *printText8Ptr2 = nullptr;
 	int32 printText8Var1 = 0;
@@ -96,7 +96,7 @@ private:
 	char *printText8Var8 = nullptr;
 	int32 printText10Var1 = 0;
 	int32 addLineBreakX = 0;
-	int16 pt8s4[96];
+	int16 pt8s4[96] {0};
 	int32 printText8PrepareBufferVar2 = 0;
 	// ---
 public: