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 /engines/tony | |
| 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 'engines/tony')
| -rw-r--r-- | engines/tony/mpal/mpal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 5e6d44f0a3..7010c238b5 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -409,7 +409,7 @@ static uint32 *getSelectList(uint32 i) { sl[k++] = dialog->_choice[i]._select[j]._dwData; } - sl[k] = (uint32)NULL; + sl[k] = 0; return sl; } @@ -436,7 +436,7 @@ static uint32 *GetItemList(uint32 nLoc) { } } - il[j] = (uint32)NULL; + il[j] = 0; return il; } @@ -832,7 +832,7 @@ void LocationPollThread(CORO_PARAM, const void *param) { if (_ctx->k == 0) // We can remove this item from the list - _ctx->il[_ctx->i] = (uint32)NULL; + _ctx->il[_ctx->i] = 0; else _ctx->nRealItems++; } |