aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2013-07-30 21:18:01 +0100
committerD G Turner2013-07-30 21:18:01 +0100
commitd81f6450c981d4738df1627611d4b5428e3422c8 (patch)
tree45c08903497c158f907fbc178d2ada830c2835b7 /engines
parent3a4507bf5a3fd29fe097b2c65a2b47992219fc43 (diff)
downloadscummvm-rg350-d81f6450c981d4738df1627611d4b5428e3422c8.tar.gz
scummvm-rg350-d81f6450c981d4738df1627611d4b5428e3422c8.tar.bz2
scummvm-rg350-d81f6450c981d4738df1627611d4b5428e3422c8.zip
NEVERHOOD: Silence noisy compiler warning.
This is due to NULL being used. Switching to nullptr which is equivalent i.e. 0 should silence this.
Diffstat (limited to 'engines')
-rw-r--r--engines/neverhood/entity.cpp2
-rw-r--r--engines/neverhood/entity.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/neverhood/entity.cpp b/engines/neverhood/entity.cpp
index af65cfd025..1ebf1dcf6c 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 0d5cf3fd50..5c29bf8a4f 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);