[Scummvm-git-logs] scummvm master -> 6f1fb146b9e42857583b78f424a7fd074633f565

[bluegr]

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:
6f1fb146b9 GLK: Remove unused private members and one define


Commit: 6f1fb146b9e42857583b78f424a7fd074633f565
    https://github.com/scummvm/scummvm/commit/6f1fb146b9e42857583b78f424a7fd074633f565
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T13:21:58+02:00

Commit Message:
GLK: Remove unused private members and one define

Detected by Clang.

Changed paths:
    engines/glk/comprehend/comprehend.h
    engines/glk/comprehend/game_oo.cpp
    engines/glk/comprehend/game_oo.h
    engines/glk/quest/geas_util.cpp
    engines/glk/quest/geas_util.h


diff --git a/engines/glk/comprehend/comprehend.h b/engines/glk/comprehend/comprehend.h
index 4e51906195..e0d7c609a1 100644
--- a/engines/glk/comprehend/comprehend.h
+++ b/engines/glk/comprehend/comprehend.h
@@ -33,8 +33,6 @@
 namespace Glk {
 namespace Comprehend {
 
-#define PATH_MAX 256
-
 class DrawSurface;
 class Pics;
 
diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index e8e08dab89..83e68fe19d 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -62,7 +62,7 @@ static const GameStrings OO_STRINGS = {
 };
 
 OOToposGame::OOToposGame() : ComprehendGameV2(), _restartMode(RESTART_IMMEDIATE),
-		_noFloodfill(UNSET), _lightOn(UNSET), _stringVal1(0), _stringVal2(0),
+		_noFloodfill(UNSET), _stringVal1(0), _stringVal2(0),
 		_printComputerMsg(true), _shipNotWorking(false) {
 	_gameDataFile = "g0";
 
diff --git a/engines/glk/comprehend/game_oo.h b/engines/glk/comprehend/game_oo.h
index 788762d9c1..ef91a10b65 100644
--- a/engines/glk/comprehend/game_oo.h
+++ b/engines/glk/comprehend/game_oo.h
@@ -35,7 +35,7 @@ enum YesNo { NO, YES, UNSET };
 class OOToposGame : public ComprehendGameV2 {
 private:
 	RestartMode _restartMode;
-	YesNo _noFloodfill, _lightOn;
+	YesNo _noFloodfill;
 	int _stringVal1, _stringVal2;
 	bool _printComputerMsg, _shipNotWorking;
 
diff --git a/engines/glk/quest/geas_util.cpp b/engines/glk/quest/geas_util.cpp
index c503495fed..6e7c8003e7 100644
--- a/engines/glk/quest/geas_util.cpp
+++ b/engines/glk/quest/geas_util.cpp
@@ -208,7 +208,7 @@ void show_split(String s) {
 
 Logger::Nullstreambuf Logger::cnull;
 
-Logger::Logger() : logfilestr_(NULL) { //, cerrbuf_(NULL) {
+Logger::Logger() { // : logfilestr_(NULL), cerrbuf_(NULL) {
 /*
 	cerr.flush();
 
diff --git a/engines/glk/quest/geas_util.h b/engines/glk/quest/geas_util.h
index 75cd39857f..8ff59a986a 100644
--- a/engines/glk/quest/geas_util.h
+++ b/engines/glk/quest/geas_util.h
@@ -86,7 +86,7 @@ private:
 		int32 pos() const override { return 0; }
 	};
 
-	Common::WriteStream *logfilestr_;
+//	Common::WriteStream *logfilestr_;
 //	std::streambuf *cerrbuf_;
 	static Nullstreambuf cnull;
 };