diff options
| author | Joseph-Eugene Winzer | 2017-07-18 18:30:50 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 00:00:11 +0000 |
| commit | 4c26b418cd5eb0681366bb88ef5c601a13fc3401 (patch) | |
| tree | 0569d2c768b3f6533ad1f0c64f9defab24e01adb /engines | |
| parent | 5224c4d313713cd9c3f87ae628a62fa976c6ce41 (diff) | |
| download | scummvm-rg350-4c26b418cd5eb0681366bb88ef5c601a13fc3401.tar.gz scummvm-rg350-4c26b418cd5eb0681366bb88ef5c601a13fc3401.tar.bz2 scummvm-rg350-4c26b418cd5eb0681366bb88ef5c601a13fc3401.zip | |
SUPERNOVA: Makes Inventory::get() return nullObject
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/supernova/state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 *>(&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 *>(&Object::nullObject); } GuiElement::GuiElement() |