diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-12 18:29:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-13 04:41:55 +0300 |
| commit | 6bd4fff31e0b44b8b71876250c626fe8c15b4105 (patch) | |
| tree | cdd7f984a0850864316ae23c33120b6d282b70ba /src/event.cpp | |
| parent | f457675ecfd704c99e84fe14f0a1dd49a69a9c76 (diff) | |
| download | manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.gz manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.bz2 manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.tar.xz manaplus-6bd4fff31e0b44b8b71876250c626fe8c15b4105.zip | |
Add missing checks to some files and style fixes.
Diffstat (limited to 'src/event.cpp')
| -rw-r--r-- | src/event.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event.cpp b/src/event.cpp index 5a1d673b2..6913e8660 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -56,7 +56,7 @@ int Event::getInt(const std::string &key) const throw (BadEvent) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_INT) + if (!it->second || it->second->getType() != VariableData::DATA_INT) throw BAD_VALUE; return static_cast<IntData *>(it->second)->getData(); @@ -78,7 +78,7 @@ const std::string &Event::getString(const std::string &key) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_STRING) + if (!! it->second || it->second->getType() != VariableData::DATA_STRING) throw BAD_VALUE; return static_cast<StringData *>(it->second)->getData(); @@ -99,7 +99,7 @@ double Event::getFloat(const std::string &key) const throw (BadEvent) if (it == mData.end()) throw BAD_KEY; - if (it->second->getType() != VariableData::DATA_FLOAT) + if (!it->second || it->second->getType() != VariableData::DATA_FLOAT) throw BAD_VALUE; return static_cast<FloatData *>(it->second)->getData(); |