diff options
| author | D G Turner | 2013-09-28 01:37:15 +0100 |
|---|---|---|
| committer | D G Turner | 2013-09-28 01:37:15 +0100 |
| commit | 93c337524422cf93ea987abeb6fe44f088d9fe5b (patch) | |
| tree | 9afd251b44c58da13d366fdcf2b52e7e9994731e /engines/tony | |
| parent | e07723e1d1e2343ae5c4b288e1eada8c59c0e262 (diff) | |
| download | scummvm-rg350-93c337524422cf93ea987abeb6fe44f088d9fe5b.tar.gz scummvm-rg350-93c337524422cf93ea987abeb6fe44f088d9fe5b.tar.bz2 scummvm-rg350-93c337524422cf93ea987abeb6fe44f088d9fe5b.zip | |
TONY: Fix compilation on FreeBSD with C++-11 enabled.
This is part of bug #3615056 and is due to NULL being defined as
nullptr when C++-11 is enabled, which is not valid being assigned
to a integer value.
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++; } |