[Scummvm-git-logs] scummvm master -> 080ab79d7a71e45cece234c13957803e81828dee

[criezy]

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:
080ab79d7a GLK: Fix some compilation errors


Commit: 080ab79d7a71e45cece234c13957803e81828dee
    https://github.com/scummvm/scummvm/commit/080ab79d7a71e45cece234c13957803e81828dee
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-28T21:53:56+01:00

Commit Message:
GLK: Fix some compilation errors

In-class initialization of members is a c++11 features
but several ports use compilers that do not support it.

Changed paths:
    engines/glk/alan2/alan2.cpp
    engines/glk/alan2/alan2.h
    engines/glk/alan2/parse.cpp
    engines/glk/alan2/parse.h


diff --git a/engines/glk/alan2/alan2.cpp b/engines/glk/alan2/alan2.cpp
index f9e65fc..f9dcb52 100644
--- a/engines/glk/alan2/alan2.cpp
+++ b/engines/glk/alan2/alan2.cpp
@@ -41,6 +41,8 @@ Alan2 *_vm = nullptr;
 Alan2::Alan2(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gameDesc),
 		vm_exited_cleanly(false) {
 	_vm = this;
+	looking = false;
+	dscrstkp = 0;
 }
 
 void Alan2::runGame(Common::SeekableReadStream *gameFile) {
diff --git a/engines/glk/alan2/alan2.h b/engines/glk/alan2/alan2.h
index 716e198..e2fe6ae 100644
--- a/engines/glk/alan2/alan2.h
+++ b/engines/glk/alan2/alan2.h
@@ -122,8 +122,8 @@ public:
 	bool _needSpace;		// originally "needsp"
 
 	EvtElem *evts;					// Event table pointer
-	bool looking = false;			// LOOKING? flag
-	int dscrstkp = 0;               // Describe-stack pointer
+	bool looking;					// LOOKING? flag
+	int dscrstkp;   	            // Describe-stack pointer
 	Common::File *_txtFile;
 	bool _anyOutput;
 	winid_t _bottomWindow;
diff --git a/engines/glk/alan2/parse.cpp b/engines/glk/alan2/parse.cpp
index 45fac67..216f474 100644
--- a/engines/glk/alan2/parse.cpp
+++ b/engines/glk/alan2/parse.cpp
@@ -39,6 +39,7 @@ namespace Alan2 {
 
 Parser::Parser() {
 	wrds[0] = EOF;
+	plural = false;
 
 	// TODO
 }
diff --git a/engines/glk/alan2/parse.h b/engines/glk/alan2/parse.h
index 7198b2d..1f3a3fb 100644
--- a/engines/glk/alan2/parse.h
+++ b/engines/glk/alan2/parse.h
@@ -149,7 +149,7 @@ private:
 	int wrds[LISTLEN / 2];	// List of parsed words
 	int wrdidx;			// and an index into it
 
-	bool plural = false;
+	bool plural;
 
 	// Syntax Parameters
 	int paramidx;			// Index in params