[Scummvm-git-logs] scummvm master -> 7c15d0d232292ea7a87a8ecf78fda3ba1045794f

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7d4cbcd422 GLK: Remove unused _vm field of Debugger
7c15d0d232 GLK: GLULXE: Fix VS packing warnings


Commit: 7d4cbcd4223a5e21a2d8fdfe3fba0b0fb148a65b
    https://github.com/scummvm/scummvm/commit/7d4cbcd4223a5e21a2d8fdfe3fba0b0fb148a65b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-02T19:03:11-07:00

Commit Message:
GLK: Remove unused _vm field of Debugger

Changed paths:
    engines/glk/debugger.cpp
    engines/glk/debugger.h
    engines/glk/glk.h


diff --git a/engines/glk/debugger.cpp b/engines/glk/debugger.cpp
index 5978ddb..b59b6c1 100644
--- a/engines/glk/debugger.cpp
+++ b/engines/glk/debugger.cpp
@@ -29,7 +29,7 @@
 
 namespace Glk {
 
-Debugger::Debugger(GlkEngine *vm) : GUI::Debugger(), _vm(vm) {
+Debugger::Debugger() : GUI::Debugger() {
 	registerCmd("dumppic", WRAP_METHOD(Debugger, cmdDumpPic));
 }
 
diff --git a/engines/glk/debugger.h b/engines/glk/debugger.h
index 0555829..23584ee 100644
--- a/engines/glk/debugger.h
+++ b/engines/glk/debugger.h
@@ -34,8 +34,6 @@ class GlkEngine;
 
 class Debugger : public GUI::Debugger {
 private:
-	GlkEngine *_vm;
-
 	/**
 	 * Saves a decoded raw image to a PNG file
 	 */
@@ -51,7 +49,7 @@ protected:
 	 */
 	int strToInt(const char *s);
 public:
-	Debugger(GlkEngine *vm);
+	Debugger();
 };
 
 } // End of namespace Glk
diff --git a/engines/glk/glk.h b/engines/glk/glk.h
index e6516f1..79e5425 100644
--- a/engines/glk/glk.h
+++ b/engines/glk/glk.h
@@ -103,7 +103,7 @@ protected:
 	 * Creates a debugger instance
 	 */
 	virtual Debugger *createDebugger() {
-		return new Debugger(this);
+		return new Debugger();
 	}
 
 	/**


Commit: 7c15d0d232292ea7a87a8ecf78fda3ba1045794f
    https://github.com/scummvm/scummvm/commit/7c15d0d232292ea7a87a8ecf78fda3ba1045794f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-02T19:04:10-07:00

Commit Message:
GLK: GLULXE: Fix VS packing warnings

Changed paths:
    engines/glk/glulxe/glulxe.h


diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index ab7a3d3..6bb8372 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -44,10 +44,12 @@ private:
 	 * \defgroup vm fields
 	 * @{
 	 */
+	CharHandler stream_char_handler;
+	UnicharHandler stream_unichar_handler, glkio_unichar_han_ptr;
+
 	bool vm_exited_cleanly;
 	uint gamefile_start, gamefile_len;
 	char *init_err, *init_err2;
-	CharHandler stream_char_handler;
 
 	byte *memmap;
 	byte *stack;
@@ -143,8 +145,6 @@ private:
 
 	/**@}*/
 
-	UnicharHandler stream_unichar_handler, glkio_unichar_han_ptr;
-
 	/**
 	 * \defgroup serial fields
 	 * @{