diff options
Diffstat (limited to 'engines/neverhood/entity.h')
| -rw-r--r-- | engines/neverhood/entity.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/neverhood/entity.h b/engines/neverhood/entity.h index 582e93f77f..924a7a778b 100644 --- a/engines/neverhood/entity.h +++ b/engines/neverhood/entity.h @@ -103,16 +103,16 @@ public: // NOTE: These were overloaded before for the various message parameter types // it caused some problems so each type gets its own sendMessage variant now uint32 sendMessage(Entity *receiver, int messageNum, const MessageParam ¶m) { - return receiver->receiveMessage(messageNum, param, this); + return receiver ? receiver->receiveMessage(messageNum, param, this) : 0; } uint32 sendMessage(Entity *receiver, int messageNum, uint32 param) { - return receiver->receiveMessage(messageNum, MessageParam(param), this); + return sendMessage(receiver, messageNum, MessageParam(param)); } uint32 sendPointMessage(Entity *receiver, int messageNum, const NPoint ¶m) { - return receiver->receiveMessage(messageNum, MessageParam(param), this); + return sendMessage(receiver, messageNum, MessageParam(param)); } uint32 sendEntityMessage(Entity *receiver, int messageNum, Entity *param) { - return receiver->receiveMessage(messageNum, MessageParam((Entity*)param), this); + return sendMessage(receiver, messageNum, MessageParam((Entity*)param)); } int getPriority() const { return _priority; } // Shortcuts for game variable access |