diff options
| author | RichieSams | 2013-09-29 18:04:53 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-29 18:04:53 -0500 |
| commit | 49d67caa31583478b1b58df19b5739f42d5a4573 (patch) | |
| tree | faa9ee3e3e9346eedccaf44bbfeb054164223e0a /common/coroutines.h | |
| parent | 07c32312146bb7fe5adec41f03a2463893756361 (diff) | |
| parent | 1c3202794ad71e59e9496b94ac51f102f8210b54 (diff) | |
| download | scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.gz scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.tar.bz2 scummvm-rg350-49d67caa31583478b1b58df19b5739f42d5a4573.zip | |
Merge branch 'master' into zvision
Diffstat (limited to 'common/coroutines.h')
| -rw-r--r-- | common/coroutines.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/coroutines.h b/common/coroutines.h index 834c67f6e4..30b9bb6a99 100644 --- a/common/coroutines.h +++ b/common/coroutines.h @@ -128,7 +128,7 @@ public: */ #define CORO_BEGIN_CONTEXT \ struct CoroContextTag : Common::CoroBaseContext { \ - CoroContextTag() : CoroBaseContext(SCUMMVM_CURRENT_FUNCTION) {} \ + CoroContextTag() : CoroBaseContext(SCUMMVM_CURRENT_FUNCTION) { DUMMY = 0; } \ int DUMMY /** @@ -146,6 +146,7 @@ public: #define CORO_BEGIN_CODE(x) \ if (&coroParam == &Common::nullContext) assert(!Common::nullContext); \ if (!x) { coroParam = x = new CoroContextTag(); } \ + x->DUMMY = 0; \ Common::CoroContextHolder tmpHolder(coroParam); \ switch (coroParam->_line) { case 0:; |