From e07723e1d1e2343ae5c4b288e1eada8c59c0e262 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Sat, 28 Sep 2013 01:33:43 +0100 Subject: 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. --- engines/tinsel/scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') 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) { -- cgit v1.2.3