aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/mads_views.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-05-26 08:32:32 +0000
committerPaul Gilbert2010-05-26 08:32:32 +0000
commiteca8c35cfc6b183800abb1d34c06e787c1b18477 (patch)
tree753f6b18bdeeb536aa8a02eef3b14924026e08fd /engines/m4/mads_views.h
parent1c0bbb10cbb20b8dd0bdc1cb748bb5ec9e538b42 (diff)
downloadscummvm-rg350-eca8c35cfc6b183800abb1d34c06e787c1b18477.tar.gz
scummvm-rg350-eca8c35cfc6b183800abb1d34c06e787c1b18477.tar.bz2
scummvm-rg350-eca8c35cfc6b183800abb1d34c06e787c1b18477.zip
Gave proper names to each flag in the message flag set
svn-id: r49229
Diffstat (limited to 'engines/m4/mads_views.h')
-rw-r--r--engines/m4/mads_views.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index 52388a99e0..ba7504f343 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -139,8 +139,8 @@ public:
#define TIMED_TEXT_SIZE 10
#define TEXT_4A_SIZE 30
-enum KernelMessageFlags {KMSG_1 = 1, KMSG_2 = 2, KMSG_4 = 4, KMSG_8 = 8, KMSG_20 = 0x20, KMSG_30 = 0x30,
- KMSG_40 = 0x40, KMSG_ACTIVE = 0x80};
+enum KernelMessageFlags {KMSG_QUOTED = 1, KMSG_OWNER_TIMEOUT = 2, KMSG_SEQ_ENTRY = 4, KMSG_SCROLL = 8, KMSG_RIGHT_ALIGN = 0x10,
+ KMSG_CENTER_ALIGN = 0x20, KMSG_EXPIRE = 0x40, KMSG_ACTIVE = 0x80};
class MadsKernelMessageEntry {
public:
@@ -157,7 +157,7 @@ public:
uint32 frameTimer2;
uint32 frameTimer;
uint32 timeout;
- bool field_1C;
+ int abortTimers;
AbortTimerMode abortMode;
uint16 actionNouns[3];
char msg[100];
@@ -174,9 +174,9 @@ public:
MadsKernelMessageList(MadsView &owner);
void clear();
- int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 v2, uint32 timeout, const char *msg);
- int addQuote(int quoteId, int v2, uint32 timeout);
- void unk1(int msgIndex, int v1, int v2);
+ int add(const Common::Point &pt, uint fontColour, uint8 flags, uint8 abortTimers, uint32 timeout, const char *msg);
+ int addQuote(int quoteId, int abortTimers, uint32 timeout);
+ void scrollMessage(int msgIndex, int numTicks, bool quoted);
void setSeqIndex(int msgIndex, int seqIndex);
void remove(int msgIndex);
void reset();
@@ -313,7 +313,7 @@ struct MadsSequenceEntry {
int scale;
int dynamicHotspotIndex;
- int field_12;
+ bool nonFixed;
int field_13;
Common::Point msgPos;
@@ -341,7 +341,7 @@ public:
void clear();
bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal);
int add(int spriteListIndex, int v0, int v1, int triggerCountdown, int delayTicks, int extraTicks, int numTicks,
- int msgX, int msgY, char field_12, char scale, uint8 depth, int frameInc, SpriteAnimType animType,
+ int msgX, int msgY, bool nonFixed, char scale, uint8 depth, int frameInc, SpriteAnimType animType,
int numSprites, int frameStart);
void remove(int timerIndex);
void setSpriteSlot(int timerIndex, MadsSpriteSlot &spriteSlot);