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.
scummvm · Dec 28, 2018 · 080ab79 · 080ab79
1 parent 7c7cb6c
commit 080ab79
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -122,8 +122,8 @@ class Alan2 : public GlkAPI {
 	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
@@ -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
@@ -149,7 +149,7 @@ class Parser {
 	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