From 712579f4afde04fe734e064621c35db36b04f6ff Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Mon, 20 Jun 2011 17:23:30 +0200 Subject: [PATCH] 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. --- engines/tinsel/coroutine.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/engines/tinsel/coroutine.h b/engines/tinsel/coroutine.h index b14030c708d4..45205314ee46 100644 --- a/engines/tinsel/coroutine.h +++ b/engines/tinsel/coroutine.h @@ -181,10 +181,15 @@ class CoroContextHolder { #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) /** @@ -196,8 +201,12 @@ class CoroContextHolder { /** * 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