[Scummvm-cvs-logs] scummvm master -> e07723e1d1e2343ae5c4b288e1eada8c59c0e262

digitall dgturner at iee.org
Sat Sep 28 02:33:36 CEST 2013

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

e07723e1d1 TINSEL: Fix compilation on FreeBSD with C++-11 enabled.

Commit: e07723e1d1e2343ae5c4b288e1eada8c59c0e262
Author: D G Turner (digitall at scummvm.org)
Date: 2013-09-27T17:33:43-07:00

Commit Message:
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.

Changed paths:

diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index 43654fc..043b18b 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) {
-	if (g_SceneHandle != (SCNHANDLE)NULL) {
+	if (g_SceneHandle != 0) {
 		ss = (SCENE_STRUC *) FindChunk(g_SceneHandle, CHUNK_SCENE);
 		if (ss->hSceneScript) {

More information about the Scummvm-git-logs mailing list