diff options
| author | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
| commit | ad586412425e66e0e678f0cfd7b8c78c58a8a855 (patch) | |
| tree | f2c5d918ee991e4caaf299bb3fcc147ef405d808 /engines/wintermute/base/base.cpp | |
| parent | 5653a89e81d600b2388831cfe05c36d3068813b5 (diff) | |
| download | scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.gz scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.bz2 scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.zip | |
WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues.
Diffstat (limited to 'engines/wintermute/base/base.cpp')
| -rw-r--r-- | engines/wintermute/base/base.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp index 91ca30db70..6a0666b36e 100644 --- a/engines/wintermute/base/base.cpp +++ b/engines/wintermute/base/base.cpp @@ -60,7 +60,7 @@ Common::String BaseClass::getEditorProp(const Common::String &propName, const Co if (_editorPropsIter != _editorProps.end()) { return _editorPropsIter->_value.c_str(); } else { - return initVal; + return initVal; // Used to be NULL } } |