diff options
Diffstat (limited to 'sigmod/MapWildList.cpp')
-rw-r--r-- | sigmod/MapWildList.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sigmod/MapWildList.cpp b/sigmod/MapWildList.cpp index 1f8b9c17..1a385632 100644 --- a/sigmod/MapWildList.cpp +++ b/sigmod/MapWildList.cpp @@ -97,14 +97,16 @@ QString Sigmod::MapWildList::name() const const Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounter(const int index) const { - Q_ASSERT(index < encounterCount()); - return m_encounters.at(index); + if (index < encounterCount()) + return m_encounters.at(index); + return NULL; } Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounter(const int index) { - Q_ASSERT(index < encounterCount()); - return m_encounters[index]; + if (index < encounterCount()) + return m_encounters[index]; + return NULL; } const Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounterById(const int id) const @@ -155,9 +157,11 @@ Sigmod::MapWildListEncounter* Sigmod::MapWildList::newEncounter(MapWildListEncou void Sigmod::MapWildList::deleteEncounter(const int index) { - Q_ASSERT(index < encounterCount()); - delete m_encounters[index]; - m_encounters.removeAt(index); + if (index < encounterCount()) + { + delete m_encounters[index]; + m_encounters.removeAt(index); + } } void Sigmod::MapWildList::deleteEncounterById(const int id) |