diff options
| author | Max Horn | 2002-12-26 21:50:13 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-26 21:50:13 +0000 |
| commit | ad7fefd34eb81ab473293c4072432b36608d93aa (patch) | |
| tree | e510c3c891268394cf1659241bf8e079be017c98 /scumm/intern.h | |
| parent | 966d435a19930ae357b333d731f6b70e91b5a351 (diff) | |
| download | scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.gz scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.bz2 scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.zip | |
map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
Diffstat (limited to 'scumm/intern.h')
| -rw-r--r-- | scumm/intern.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index c1659105d8..f26b1fd936 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -209,7 +209,7 @@ protected: int popRoomAndObj(int *room); - void decodeParseString(int a, int b); + virtual void decodeParseString(int a, int b); int getStackList(int *args, uint maxnum); /* Version 6 script opcodes */ @@ -332,8 +332,8 @@ protected: void o6_quitPauseRestart(); void o6_isActorInBox(); void o6_delay(); - void o6_delayLonger(); - void o6_delayVeryLong(); + void o6_delaySeconds(); + void o6_delayMinutes(); void o6_stopSentence(); void o6_print_0(); void o6_print_1(); @@ -404,7 +404,7 @@ protected: virtual int readVar(uint var); virtual void writeVar(uint var, int value); - void decodeParseString(int m, int n); + virtual void decodeParseString(int m, int n); /* Version 8 script opcodes */ void o8_mod(); @@ -419,9 +419,6 @@ protected: void o8_printSystem(); void o8_blastText(); - void o8_talkActor(); - void o8_talkActorSimple(); - void o8_cursorCommand(); void o8_resourceRoutines(); void o8_roomOps(); |