GLK: ALAN2: astyle formatting

1 files changed, 145 insertions, 145 deletions

diff --git a/engines/glk/alan2/types.h b/engines/glk/alan2/types.h
index 34c5dda87f..7c8a414af3 100644
--- a/engines/glk/alan2/types.h
+++ b/engines/glk/alan2/types.h
@@ -75,218 +75,218 @@ namespace Alan2 {
 
 /* TYPES */
 
-typedef int Boolean;		/* Boolean values within interpreter */
+typedef int Boolean;        /* Boolean values within interpreter */
 
 /* Amachine variables */
 struct CurVars {
-  int
-    vrb,
-    obj,
-    loc,
-    act,
-    tick,
-    score,
-    visits;
+	int
+	vrb,
+	obj,
+	loc,
+	act,
+	tick,
+	score,
+	visits;
 
 	/**
 	 * Read or write data to/from a save file
 	 */
-  void synchronize(Common::Serializer &s);
+	void synchronize(Common::Serializer &s);
 };
 
-#include "common/pack-start.h"	// START STRUCT PACKING
+#include "common/pack-start.h"  // START STRUCT PACKING
 
 /* The various tables */
-struct WrdElem {	/* Dictionary */
-  Aaddr wrd;			/* ACODE address to string */
-  Aword _class;			/* Word class */
-  Aword code;
-  Aaddr adjrefs;		/* Address to reference list */
-  Aaddr nounrefs;		/* Address to reference list */
+struct WrdElem {    /* Dictionary */
+	Aaddr wrd;            /* ACODE address to string */
+	Aword _class;         /* Word class */
+	Aword code;
+	Aaddr adjrefs;        /* Address to reference list */
+	Aaddr nounrefs;       /* Address to reference list */
 } PACKED_STRUCT;
 
-struct ActElem {	/* ACTOR TABLE */
-  Aword loc;			/* Location */
-  Abool describe;		/* Description flag */
-  Aaddr nam;			/* Address to name printing code */
-  Aaddr atrs;			/* Address to attribute list */
-  Aword cont;			/* Code for the container props if any */
-  Aword script;			/* Which script is he using */
-  Aaddr scradr;			/* Address to script table */
-  Aword step;
-  Aword count;
-  Aaddr vrbs;
-  Aaddr dscr;			/* Address of description code */
+struct ActElem {    /* ACTOR TABLE */
+	Aword loc;            /* Location */
+	Abool describe;       /* Description flag */
+	Aaddr nam;            /* Address to name printing code */
+	Aaddr atrs;           /* Address to attribute list */
+	Aword cont;           /* Code for the container props if any */
+	Aword script;         /* Which script is he using */
+	Aaddr scradr;         /* Address to script table */
+	Aword step;
+	Aword count;
+	Aaddr vrbs;
+	Aaddr dscr;           /* Address of description code */
 } PACKED_STRUCT;
 
-struct ScrElem {	/* SCRIPT TABLE */
-  Aword code;			/* Script number */
-  Aaddr dscr;			/* Optional description statements */
-  Aaddr steps;			/* Address to steps */
+struct ScrElem {    /* SCRIPT TABLE */
+	Aword code;           /* Script number */
+	Aaddr dscr;           /* Optional description statements */
+	Aaddr steps;          /* Address to steps */
 } PACKED_STRUCT;
 
-struct StepElem {	/* STEP TABLE */
-  Aword after;			/* After how many ticks? */
-  Aaddr exp;			/* Address to expression saying when */
-  Aaddr stm;			/* Address to the actual code */
+struct StepElem {   /* STEP TABLE */
+	Aword after;          /* After how many ticks? */
+	Aaddr exp;            /* Address to expression saying when */
+	Aaddr stm;            /* Address to the actual code */
 } PACKED_STRUCT;
 
-struct LocElem {	/* LOCATION TABLE */
-  Aaddr nams;			/* Address of name printing code */
-  Aaddr dscr;			/* Address of description code */
-  Aaddr does;			/* Address of does code */
-  Aword describe;		/* Description flag & counter */
-  Aaddr atrs;			/* Address of attribute list */
-  Aaddr exts;			/* Address of exit list */
-  Aaddr vrbs;			/* Address of local verb list */
+struct LocElem {    /* LOCATION TABLE */
+	Aaddr nams;           /* Address of name printing code */
+	Aaddr dscr;           /* Address of description code */
+	Aaddr does;           /* Address of does code */
+	Aword describe;       /* Description flag & counter */
+	Aaddr atrs;           /* Address of attribute list */
+	Aaddr exts;           /* Address of exit list */
+	Aaddr vrbs;           /* Address of local verb list */
 } PACKED_STRUCT;
 
-struct ExtElem {	/* EXIT TABLE structure */
-  Abool done;			/* Flag for reverse/convert process */
-  Aword code;			/* Direction code */
-  Aaddr checks;			/* Address of check table */
-  Aaddr action;			/* Address of action code */
-  Aword next;			/* Number of next location */
+struct ExtElem {    /* EXIT TABLE structure */
+	Abool done;           /* Flag for reverse/convert process */
+	Aword code;           /* Direction code */
+	Aaddr checks;         /* Address of check table */
+	Aaddr action;         /* Address of action code */
+	Aword next;           /* Number of next location */
 } PACKED_STRUCT;
 
-struct ChkElem {	/* CHECK TABLE */
-  Aaddr exp;			/* ACODE address to expression code */
-  Aaddr stms;			/* ACODE address to statement code */
+struct ChkElem {    /* CHECK TABLE */
+	Aaddr exp;            /* ACODE address to expression code */
+	Aaddr stms;           /* ACODE address to statement code */
 } PACKED_STRUCT;
 
-struct VrbElem {	/* VERB TABLE */
-  Aword code;			/* Code for the verb */
-  Aaddr alts;			/* Address to alternatives */
+struct VrbElem {    /* VERB TABLE */
+	Aword code;           /* Code for the verb */
+	Aaddr alts;           /* Address to alternatives */
 } PACKED_STRUCT;
 
-struct StxElem {	/* SYNTAX TABLE */
-  Aword code;			/* Code for verb word */
-  Aaddr elms;			/* Address to element tables */
+struct StxElem {    /* SYNTAX TABLE */
+	Aword code;           /* Code for verb word */
+	Aaddr elms;           /* Address to element tables */
 } PACKED_STRUCT;
 
-struct ElmElem26 {	/* ELEMENT TABLES */
-  Aword code;			/* Code for this element, 0 -> parameter */
-  Abool multiple;		/* May be multiple (if parameter) */
-  Aaddr next;			/* Address to next element table ... */
-				/* ... or class check if EOS */
+struct ElmElem26 {  /* ELEMENT TABLES */
+	Aword code;           /* Code for this element, 0 -> parameter */
+	Abool multiple;       /* May be multiple (if parameter) */
+	Aaddr next;           /* Address to next element table ... */
+	/* ... or class check if EOS */
 } PACKED_STRUCT;
 
-struct ElmElem {	/* ELEMENT TABLES */
-  Aword code;			/* Code for this element, 0 -> parameter */
-  Aword flags;			/* Flags for multiple/omni (if parameter) */
-				/* CHANGED: v2.7 from Abool for multiple */
-  Aaddr next;			/* Address to next element table ... */
-				/* ... or class check if EOS */
+struct ElmElem {    /* ELEMENT TABLES */
+	Aword code;           /* Code for this element, 0 -> parameter */
+	Aword flags;          /* Flags for multiple/omni (if parameter) */
+	/* CHANGED: v2.7 from Abool for multiple */
+	Aaddr next;           /* Address to next element table ... */
+	/* ... or class check if EOS */
 } PACKED_STRUCT;
 
-struct ClaElem {	/* CLASS DEFINITION TABLE */
-  Aword code;			/* Parameter number */
-  Aword classes;		/* Parameter classes */
-  Aaddr stms;			/* Exception statements */
+struct ClaElem {    /* CLASS DEFINITION TABLE */
+	Aword code;           /* Parameter number */
+	Aword classes;        /* Parameter classes */
+	Aaddr stms;           /* Exception statements */
 } PACKED_STRUCT;
 
-struct AltElem {	/* VERB ALTERNATIVE TABLE */
-  Abool done;			/* Flag for patching (reverse/convert) process */
-  Aword param;			/* Parameter number */
-  Aword qual;			/* Verb execution qualifier */
-  Aaddr checks;			/* Address of the check table */
-  Aaddr action;			/* Address of the action code */
+struct AltElem {    /* VERB ALTERNATIVE TABLE */
+	Abool done;           /* Flag for patching (reverse/convert) process */
+	Aword param;          /* Parameter number */
+	Aword qual;           /* Verb execution qualifier */
+	Aaddr checks;         /* Address of the check table */
+	Aaddr action;         /* Address of the action code */
 } PACKED_STRUCT;
 
-struct AtrElem {	/* ATTRIBUTE LIST */
-  Aword val;			/* Its value */
-  Aaddr stradr;			/* Address to the name */
+struct AtrElem {    /* ATTRIBUTE LIST */
+	Aword val;            /* Its value */
+	Aaddr stradr;         /* Address to the name */
 } PACKED_STRUCT;
 
-struct ObjElem25 {	/* OBJECT TABLE of 2.5 format*/
-  Aword loc;			/* Current location */
-  Abool describe;		/* Describe flag */
-  Aaddr atrs;			/* Address of attribute list */
-  Aword cont;			/* Index to container properties if any */
-  Aaddr vrbs;			/* Address to local verb table */
-  Aaddr dscr1;			/* Address to Aword description code */
-  Aaddr dscr2;			/* Address to short description code */
+struct ObjElem25 {  /* OBJECT TABLE of 2.5 format*/
+	Aword loc;            /* Current location */
+	Abool describe;       /* Describe flag */
+	Aaddr atrs;           /* Address of attribute list */
+	Aword cont;           /* Index to container properties if any */
+	Aaddr vrbs;           /* Address to local verb table */
+	Aaddr dscr1;          /* Address to Aword description code */
+	Aaddr dscr2;          /* Address to short description code */
 } PACKED_STRUCT;
 
-struct ObjElem {	/* OBJECT TABLE */
-  Aword loc;			/* Current location */
-  Abool describe;		/* Describe flag */
-  Aaddr atrs;			/* Address of attribute list */
-  Aword cont;			/* Index to container properties if any */
-  Aaddr vrbs;			/* Address to local verb table */
-  Aaddr dscr1;			/* Address to Aword description code */
-  Aaddr art;			/* Article printing code? Else use default */
-				/* INTRODUCED: v2.6 */
-  Aaddr dscr2;			/* Address to short description code */
+struct ObjElem {    /* OBJECT TABLE */
+	Aword loc;            /* Current location */
+	Abool describe;       /* Describe flag */
+	Aaddr atrs;           /* Address of attribute list */
+	Aword cont;           /* Index to container properties if any */
+	Aaddr vrbs;           /* Address to local verb table */
+	Aaddr dscr1;          /* Address to Aword description code */
+	Aaddr art;            /* Article printing code? Else use default */
+	/* INTRODUCED: v2.6 */
+	Aaddr dscr2;          /* Address to short description code */
 } PACKED_STRUCT;
 
-struct CntElem {	/* CONTAINER TABLE */
-  Aaddr lims;			/* Address to limit check code */
-  Aaddr header;			/* Address to header code */
-  Aaddr empty;			/* Address to empty code */
-  Aword parent;			/* Object or actor index */
-  Aaddr nam;			/* Address to statement printing name */
+struct CntElem {    /* CONTAINER TABLE */
+	Aaddr lims;           /* Address to limit check code */
+	Aaddr header;         /* Address to header code */
+	Aaddr empty;          /* Address to empty code */
+	Aword parent;         /* Object or actor index */
+	Aaddr nam;            /* Address to statement printing name */
 } PACKED_STRUCT;
 
-struct LimElem {	/* LIMIT Type */
-  Aword atr;			/* Attribute that limits */
-  Aword val;			/* And the limiting value */
-  Aaddr stms;			/* Statements if fail */
+struct LimElem {    /* LIMIT Type */
+	Aword atr;            /* Attribute that limits */
+	Aword val;            /* And the limiting value */
+	Aaddr stms;           /* Statements if fail */
 } PACKED_STRUCT;
 
-struct RulElem {	/* RULE TABLE */
-  Abool run;			/* Is rule already run? */
-  Aaddr exp;			/* Address to expression code */
-  Aaddr stms;			/* Address to run */
+struct RulElem {    /* RULE TABLE */
+	Abool run;            /* Is rule already run? */
+	Aaddr exp;            /* Address to expression code */
+	Aaddr stms;           /* Address to run */
 } PACKED_STRUCT;
 
-struct EvtElem {	/* EVENT TABLE */
-  Aaddr stradr;			/* Address to name string */
-  Aaddr code;			/* Address of code to run */
+struct EvtElem {    /* EVENT TABLE */
+	Aaddr stradr;         /* Address to name string */
+	Aaddr code;           /* Address of code to run */
 } PACKED_STRUCT;
 
-struct EvtqElem {	/* EVENT QUEUE ELEMENT */
-  int time;
-  int event;
-  int where;
+struct EvtqElem {   /* EVENT QUEUE ELEMENT */
+	int time;
+	int event;
+	int where;
 
-  /**
-   * Read or write data to/from a save file
-   */
-  void synchronize(Common::Serializer &s);
+	/**
+	 * Read or write data to/from a save file
+	 */
+	void synchronize(Common::Serializer &s);
 } PACKED_STRUCT;
 
-struct IniElem {	/* STRING INITIALISATION TABLE */
-  Aword fpos;			/* File position */
-  Aword len;			/* Length */
-  Aword adr;			/* Where to store the string */
+struct IniElem {    /* STRING INITIALISATION TABLE */
+	Aword fpos;           /* File position */
+	Aword len;            /* Length */
+	Aword adr;            /* Where to store the string */
 } PACKED_STRUCT;
 
-struct MsgElem26 {	/* MESSAGE TABLE */
-  Aword fpos;			/* File position */
-  Aword len;			/* Length of message */
+struct MsgElem26 {  /* MESSAGE TABLE */
+	Aword fpos;           /* File position */
+	Aword len;            /* Length of message */
 } PACKED_STRUCT;
 
-struct MsgElem {	/* MESSAGE TABLE */
-  Aaddr stms;			/* Address to statements*/
-				/* Changed v2.7 from fpos+len in .dat */
+struct MsgElem {    /* MESSAGE TABLE */
+	Aaddr stms;           /* Address to statements*/
+	/* Changed v2.7 from fpos+len in .dat */
 } PACKED_STRUCT;
 
 
-struct ParamElem {	/* PARAMETER */
-  Aword code;			/* Code for this parameter (0=multiple) */
-  Aword firstWord;		/* Index to first word used by player */
-  Aword lastWord;			/* d:o to last */
+struct ParamElem {  /* PARAMETER */
+	Aword code;           /* Code for this parameter (0=multiple) */
+	Aword firstWord;      /* Index to first word used by player */
+	Aword lastWord;           /* d:o to last */
 } PACKED_STRUCT;
 
 typedef enum Type {TYPNUM, TYPSTR} Type;
 
-struct LitElem {	/* LITERAL */
-  Type type;
-  Aptr value;
+struct LitElem {    /* LITERAL */
+	Type type;
+	Aptr value;
 } PACKED_STRUCT;
 
-#include "common/pack-end.h"	// END STRUCT PACKING
+#include "common/pack-end.h"    // END STRUCT PACKING
 
 #define MAXPARAMS 9
 #define MAXENTITY (header->actmax)