aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2019-11-17 13:54:25 -0800
committerPaul Gilbert2019-11-17 14:06:14 -0800
commit1c287148a31ff61ba5933ee15ac0eb0d455a68a8 (patch)
treec16e115977f918f51fcdc72903787213dba2ebf1
parentaf01515bd8fe39f5c8ad557414ddaaf504a1c728 (diff)
downloadscummvm-rg350-1c287148a31ff61ba5933ee15ac0eb0d455a68a8.tar.gz
scummvm-rg350-1c287148a31ff61ba5933ee15ac0eb0d455a68a8.tar.bz2
scummvm-rg350-1c287148a31ff61ba5933ee15ac0eb0d455a68a8.zip
GLK: GLULXE: Fix alignment is sensitive to packing warnings in VS
-rw-r--r--engines/glk/glulxe/glulxe.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 6bb8372e5b..22076e2be2 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -20,6 +20,8 @@
*
*/
+/* Based on Glulxe intrepreter version 0.5.4 */
+
#ifndef GLK_GLULXE
#define GLK_GLULXE
@@ -44,15 +46,16 @@ 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;
+ UnicharHandler glkio_unichar_han_ptr;
char *init_err, *init_err2;
+ CharHandler stream_char_handler;
byte *memmap;
byte *stack;
+ UnicharHandler stream_unichar_handler;
uint ramstart;
uint endgamefile;