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

[Strangerke]

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

Summary:
cb889a9489 TSAGE: R2R - Fixed one more ambiguity with NULL parameters in R2R setDetails call


Commit: cb889a94892cf96528f11d90b24b2ab95421a59b
    https://github.com/scummvm/scummvm/commit/cb889a94892cf96528f11d90b24b2ab95421a59b
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-12-28T16:28:18-08:00

Commit Message:
TSAGE: R2R - Fixed one more ambiguity with NULL parameters in R2R setDetails call

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes3.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index c10a9f6..29356ef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1777,7 +1777,7 @@ void Scene3375::subFC696(int sceneMode) {
 		R2_GLOBALS._sceneItems.remove(&_item1);
 
 		_actor4.show();
-		_actor4.setDetails(3375, 9, 10, -1, 1, NULL);
+		_actor4.setDetails(3375, 9, 10, -1, 1, (SceneItem *)NULL);
 
 		for (int i = 0; i <= 12; i++)
 			_itemArray[i].setDetails(3375, 3, -1, -1);