diff options
| author | D G Turner | 2013-09-28 01:33:43 +0100 |
|---|---|---|
| committer | D G Turner | 2013-09-28 01:33:43 +0100 |
| commit | e07723e1d1e2343ae5c4b288e1eada8c59c0e262 (patch) | |
| tree | 8394cb8328ec67e22dac100fa9793ba2d04fa991 /engines | |
| parent | 789c8bbfdbaf266dabfd480b6320414a4483eb0d (diff) | |
| download | scummvm-rg350-e07723e1d1e2343ae5c4b288e1eada8c59c0e262.tar.gz scummvm-rg350-e07723e1d1e2343ae5c4b288e1eada8c59c0e262.tar.bz2 scummvm-rg350-e07723e1d1e2343ae5c4b288e1eada8c59c0e262.zip | |
TINSEL: 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')
| -rw-r--r-- | engines/tinsel/scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 43654fc3af..043b18b8c5 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -186,7 +186,7 @@ static void SceneTinselProcess(CORO_PARAM, const void *param) { void SendSceneTinselProcess(TINSEL_EVENT event) { SCENE_STRUC *ss; - if (g_SceneHandle != (SCNHANDLE)NULL) { + if (g_SceneHandle != 0) { ss = (SCENE_STRUC *) FindChunk(g_SceneHandle, CHUNK_SCENE); if (ss->hSceneScript) { |