aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/avalanche/graph.h17
-rw-r--r--engines/avalanche/trip6.h8
2 files changed, 21 insertions, 4 deletions
diff --git a/engines/avalanche/graph.h b/engines/avalanche/graph.h
index d602864e0f..c79179c70e 100644
--- a/engines/avalanche/graph.h
+++ b/engines/avalanche/graph.h
@@ -37,6 +37,23 @@
namespace Avalanche {
class AvalancheEngine;
+typedef byte manitype[2049]; // manitype = array[5..2053] of byte;
+// Be aware!!!
+
+typedef byte siltype[51][11]; /* 35, 4 */
+
+class SpriteInfo {
+public:
+ byte xw; /* x-width in bytes */
+ byte xl, yl; /* x & y lengths of pictures */
+
+ manitype *mani[24];
+ siltype *sil[24];
+
+ uint16 size; /* the size of one picture */
+};
+
+
class Graph {
public:
static const int16 _screenWidth = 640;
diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h
index bbb47852bc..2c3f963e03 100644
--- a/engines/avalanche/trip6.h
+++ b/engines/avalanche/trip6.h
@@ -31,6 +31,8 @@
#ifndef TRIP6_H
#define TRIP6_H
+#include "avalanche/graph.h"
+
#include "common/scummsys.h"
#include "common/str.h"
@@ -47,9 +49,7 @@ struct adxtype { /* Second revision of ADX type */
Common::String name/*[13]*/; /* name of character */ // uruk: Note to self: TRAILING /0 !!! Real size: 12
Common::String comment/*[17]*/; /* comment */ // uruk: Same here, but 16.
byte num; /* number of pictures */
- byte xl, yl; /* x & y lengths of pictures */
byte seq; /* how many in one stride */
- uint16 size; /* the size of one picture */
byte fgc, bgc; /* foreground & background bubble colours */
byte accinum; /* the number according to Acci (1=Avvy, etc.) */
};
@@ -80,13 +80,13 @@ class Trip;
class triptype {
public:
+ SpriteInfo _info;
+
adxtype a; /* vital statistics */
byte face, step;
int16 x, y; /* current xy coords */
int16 ox[2], oy[2]; /* last xy coords */
int8 ix, iy; /* amount to move sprite by, each step */
- manitype *mani[24];
- siltype *sil[24];
byte whichsprite;
bool quick, visible, homing, check_me;
int16 hx, hy; /* homing x & y coords */