aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorJames Brown2004-01-16 10:45:56 +0000
committerJames Brown2004-01-16 10:45:56 +0000
commitac5b7036c28a4137d4b7af7385d97e6e485f0767 (patch)
treeb9453259912d5f2c462d8107280ef83303e5fd14 /scumm/scumm.h
parentbd3f51dfdfd563532a7cc228139dd60d8f6451a4 (diff)
downloadscummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.gz
scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.tar.bz2
scummvm-rg350-ac5b7036c28a4137d4b7af7385d97e6e485f0767.zip
Fix for bug #862263 - Maniac actors never stop talking. I know this could probably be neater :)
svn-id: r12430
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 1c4545b2d7..af0110d60a 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -771,14 +771,16 @@ protected:
public:
/* Actor talking stuff */
- byte _actorToPrintStrFor;
+ byte _actorToPrintStrFor, _V1_talkingActor;
int _sentenceNum;
SentenceTab _sentence[NUM_SENTENCE];
StringTab _string[6];
int16 _talkDelay;
void actorTalk();
void stopTalk();
-
+ int talkingActor(); // Wrapper around VAR_TALK_ACTOR for V1/V2 purposes
+ void talkingActor(int variable);
+
// Costume class
void cost_decodeData(Actor *a, int frame, uint usemask);
int cost_frameToAnim(Actor *a, int frame);