aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/sherlock
diff options
context:
space:
mode:
authorThierry Crozat2015-06-02 00:04:06 +0100
committerThierry Crozat2015-06-02 00:04:06 +0100
commitdf665e5907735fd5d40dcacd040f2e33b5125220 (patch)
treedd4589b0ba3af12010e525aae1ce9ab59461c6ce /engines/tsage/sherlock
parentd0a0f85fc524fc6e744c2a73c5c2413d411b4041 (diff)
downloadscummvm-rg350-df665e5907735fd5d40dcacd040f2e33b5125220.tar.gz
scummvm-rg350-df665e5907735fd5d40dcacd040f2e33b5125220.tar.bz2
scummvm-rg350-df665e5907735fd5d40dcacd040f2e33b5125220.zip
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).
Diffstat (limited to 'engines/tsage/sherlock')
-rw-r--r--engines/tsage/sherlock/sherlock_logo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index 437fdc6d94..2922a9938b 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);