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

digitall dgturner at iee.org
Tue Jul 30 22:17:40 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 .

Summary:
d81f6450c9 NEVERHOOD: Silence noisy compiler warning.


Commit: d81f6450c981d4738df1627611d4b5428e3422c8
    https://github.com/scummvm/scummvm/commit/d81f6450c981d4738df1627611d4b5428e3422c8
Author: D G Turner (digitall at scummvm.org)
Date: 2013-07-30T13:18:01-07:00

Commit Message:
NEVERHOOD: Silence noisy compiler warning.

This is due to NULL being used. Switching to nullptr which is equivalent
i.e. 0 should silence this.

Changed paths:
    engines/neverhood/entity.cpp
    engines/neverhood/entity.h



diff --git a/engines/neverhood/entity.cpp b/engines/neverhood/entity.cpp
index af65cfd..1ebf1dc 100644
--- a/engines/neverhood/entity.cpp
+++ b/engines/neverhood/entity.cpp
@@ -47,7 +47,7 @@ Entity *MessageParam::asEntity() const {
 }
 
 Entity::Entity(NeverhoodEngine *vm, int priority)
-	: _vm(vm), _updateHandlerCb(NULL), _messageHandlerCb(NULL), _priority(priority), _soundResources(NULL) {
+	: _vm(vm), _updateHandlerCb(NULL), _messageHandlerCb(nullptr), _priority(priority), _soundResources(NULL) {
 }
 
 Entity::~Entity() {
diff --git a/engines/neverhood/entity.h b/engines/neverhood/entity.h
index 0d5cf3f..5c29bf8 100644
--- a/engines/neverhood/entity.h
+++ b/engines/neverhood/entity.h
@@ -98,7 +98,7 @@ public:
 	void incGlobalVar(uint32 nameHash, int incrValue);
 	void incSubVar(uint32 nameHash, uint32 subNameHash, int incrValue);
 	int getPriority() const { return _priority; }
-	bool hasMessageHandler() const { return _messageHandlerCb != NULL; }
+	bool hasMessageHandler() const { return _messageHandlerCb != nullptr; }
 protected:
 	void (Entity::*_updateHandlerCb)();
 	uint32 (Entity::*_messageHandlerCb)(int messageNum, const MessageParam &param, Entity *sender);






More information about the Scummvm-git-logs mailing list