diff options
| author | Paul Gilbert | 2019-07-01 20:56:55 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-07-06 15:27:09 -0700 |
| commit | 5dea66231397c52afc7d2cdeae5989fd5edd0604 (patch) | |
| tree | 6cd65d939d4051f0d0bade793f4598485547ad47 /engines/glk/alan3/actor.cpp | |
| parent | 18566feefcb9f4fa4d7395ffa6e6f2a6f0247d0e (diff) | |
| download | scummvm-rg350-5dea66231397c52afc7d2cdeae5989fd5edd0604.tar.gz scummvm-rg350-5dea66231397c52afc7d2cdeae5989fd5edd0604.tar.bz2 scummvm-rg350-5dea66231397c52afc7d2cdeae5989fd5edd0604.zip | |
GLK: ALAN3: Wrapping method calls in longjmp replacement macros
Diffstat (limited to 'engines/glk/alan3/actor.cpp')
| -rw-r--r-- | engines/glk/alan3/actor.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/glk/alan3/actor.cpp b/engines/glk/alan3/actor.cpp index ff4d89f9a1..337034fcd3 100644 --- a/engines/glk/alan3/actor.cpp +++ b/engines/glk/alan3/actor.cpp @@ -61,18 +61,19 @@ StepEntry *stepOf(int actor) { /*======================================================================*/ -void describeActor(int actor) { +void describeActor(CONTEXT, int actor) { ScriptEntry *script = scriptOf(actor); - if (script != NULL && script->description != 0) - interpret(script->description); - else if (hasDescription(actor)) - describeAnything(actor); - else { + if (script != NULL && script->description != 0) { + CALL1(interpret, script->description) + } else if (hasDescription(actor)) { + CALL1(describeAnything, actor) + } else { printMessageWithInstanceParameter(M_SEE_START, actor); printMessage(M_SEE_END); + if (instances[actor].container != 0) - describeContainer(actor); + CALL1(describeContainer, actor) } admin[actor].alreadyDescribed = TRUE; } |