From 4c26b418cd5eb0681366bb88ef5c601a13fc3401 Mon Sep 17 00:00:00 2001 From: Joseph-Eugene Winzer Date: Tue, 18 Jul 2017 18:30:50 +0200 Subject: SUPERNOVA: Makes Inventory::get() return nullObject --- engines/supernova/state.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/supernova') diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index cc06c511b9..37ff15f808 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -57,7 +57,7 @@ Object *Inventory::get(int index) const { if (index < _numObjects) return _inventory[index]; - return NULL; + return const_cast(&Object::nullObject); } Object *Inventory::get(ObjectID id) const { @@ -66,7 +66,7 @@ Object *Inventory::get(ObjectID id) const { return _inventory[i]; } - return NULL; + return const_cast(&Object::nullObject); } GuiElement::GuiElement() -- cgit v1.2.3