diff options
| author | Thierry Crozat | 2018-12-28 21:53:56 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2018-12-28 21:53:56 +0100 |
| commit | 080ab79d7a71e45cece234c13957803e81828dee (patch) | |
| tree | bd57d5494aab31f2188532a8a06a379a33f5a50c | |
| parent | 7c7cb6c836ad901b31849782238cd9226dc651ec (diff) | |
| download | scummvm-rg350-080ab79d7a71e45cece234c13957803e81828dee.tar.gz scummvm-rg350-080ab79d7a71e45cece234c13957803e81828dee.tar.bz2 scummvm-rg350-080ab79d7a71e45cece234c13957803e81828dee.zip | |
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.
| -rw-r--r-- | engines/glk/alan2/alan2.cpp | 2 | ||||
| -rw-r--r-- | engines/glk/alan2/alan2.h | 4 | ||||
| -rw-r--r-- | engines/glk/alan2/parse.cpp | 1 | ||||
| -rw-r--r-- | engines/glk/alan2/parse.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/engines/glk/alan2/alan2.cpp b/engines/glk/alan2/alan2.cpp index f9e65fc43a..f9dcb52903 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 716e198c74..e2fe6ae9cd 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 45fac67f4f..216f4746c7 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 7198b2d555..1f3a3fb92f 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 |