diff options
author | Alyssa Milburn | 2011-06-20 17:23:30 +0200 |
---|---|---|
committer | Alyssa Milburn | 2011-06-20 17:23:30 +0200 |
commit | 0269a8d9008f51cca63ad215bbb2aa23ad75d574 (patch) | |
tree | 4b5d70e1070cbe250b79bd9ec547148ed138cdeb /engines/tinsel | |
parent | 2cc721760ff29c78bea6373ed8628b1bc3aedc6b (diff) | |
download | scummvm-rg350-0269a8d9008f51cca63ad215bbb2aa23ad75d574.tar.gz scummvm-rg350-0269a8d9008f51cca63ad215bbb2aa23ad75d574.tar.bz2 scummvm-rg350-0269a8d9008f51cca63ad215bbb2aa23ad75d574.zip |
TINSEL: Fix/comment CORO_KILL_SELF macro.
This reverts 9573b1d2f54818f9bdac4a91e0a90b306ade7810, which changed
the behaviour of (among other things) NewScene, which made Discworld
uncompletable. Thanks to digitall for bisection/reproduction.
Diffstat (limited to 'engines/tinsel')
-rw-r--r-- | engines/tinsel/coroutine.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/engines/tinsel/coroutine.h b/engines/tinsel/coroutine.h index b62c40b4e5..5bcf1149d9 100644 --- a/engines/tinsel/coroutine.h +++ b/engines/tinsel/coroutine.h @@ -178,10 +178,15 @@ public: #define CORO_RESCHEDULE do { g_scheduler->reschedule(); CORO_SLEEP(1); } while (0) /** - * Stop the currently running coroutine. + * Stop the currently running coroutine and all calling coroutines. + * + * This sets _sleep to -1 rather than 0 so that the context doesn't get + * deleted by CoroContextHolder, since we want CORO_INVOKE_ARGS to + * propogate the _sleep value and return immediately (the scheduler will + * then delete the entire coroutine's state, including all subcontexts). */ #define CORO_KILL_SELF() \ - do { if (&coroParam != &nullContext) { coroParam->_sleep = 0; } return; } while (0) + do { if (&coroParam != &nullContext) { coroParam->_sleep = -1; } return; } while (0) /** @@ -193,8 +198,12 @@ public: /** * Invoke another coroutine. * - * What makes this tricky is that the coroutine we called my yield/sleep, - * and we need to deal with this adequately. + * If the subcontext still exists after the coroutine is invoked, it has + * either yielded/slept or killed itself, and so we copy the _sleep value + * to our own context and return (execution will continue at the case + * statement below, where we loop and call the coroutine again). + * If the subcontext is null, the coroutine ended normally, and we can + * simply break out of the loop and continue execution. * * @param subCoro name of the coroutine-enabled function to invoke * @param ARGS list of arguments to pass to subCoro |