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

criezy criezy at scummvm.org
Tue Jun 2 01:09:33 CEST 2015


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:
df665e5907 TSAGE: Add cast of nullptr to (const void *) in call to variadic functions


Commit: df665e5907735fd5d40dcacd040f2e33b5125220
    https://github.com/scummvm/scummvm/commit/df665e5907735fd5d40dcacd040f2e33b5125220
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-06-02T00:04:06+01:00

Commit Message:
TSAGE: Add cast of nullptr to (const void *) in call to variadic functions

This should not be necessary, but this is for (at least) two reasons:
 - Our C++11 compatibility code simply defines nullptr as 0 (and 0
may have a different size to (const void *)0).
 - Xcode compiler on OS X throw an error without that cast (cannot
pass object of non-POD type nullptr through variadic method).

Changed paths:
    engines/tsage/sherlock/sherlock_logo.cpp



diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index 437fdc6..2922a99 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -148,7 +148,7 @@ void SherlockLogoScene::Action1::signal() {
 		scene._object1.changeZoom(100);
 		scene._object1.setPosition(Common::Point(170, 142));
 		scene._object1._numFrames = 7;
-		scene._object1.animate(ANIM_MODE_5, nullptr);
+		scene._object1.animate(ANIM_MODE_5, (const void *)nullptr);
 		ADD_MOVER(scene._object1, 158, 71);
 		break;
 
@@ -164,7 +164,7 @@ void SherlockLogoScene::Action1::signal() {
 		scene._object2._frame = 1;
 		scene._object2.setPosition(Common::Point(152, 98));
 		scene._object2.changeZoom(100);
-		scene._object2.animate(ANIM_MODE_NONE, nullptr);
+		scene._object2.animate(ANIM_MODE_NONE, (const void *)nullptr);
 		setDelay(120);
 		break;
 
@@ -176,7 +176,7 @@ void SherlockLogoScene::Action1::signal() {
 		scene._object3._frame = 1;
 		scene._object3.setPosition(Common::Point(33, 91));
 		scene._object3.changeZoom(100);
-		scene._object3.animate(ANIM_MODE_NONE, nullptr);
+		scene._object3.animate(ANIM_MODE_NONE, (const void *)nullptr);
 		setDelay(5);
 		break;
 
@@ -341,7 +341,7 @@ void SherlockLogoScene::postInit(SceneObjectList *OwnerList) {
 	_object4._frame = 1;
 	_object4.setPosition(Common::Point(155, 94));
 	_object4.changeZoom(100);
-	_object4.animate(ANIM_MODE_NONE, nullptr);
+	_object4.animate(ANIM_MODE_NONE, (const void *)nullptr);
 	_object4.hide();
 
 	setAction(&_action1);






More information about the Scummvm-git-logs mailing list