[FIX] Typechart now works

[FIX] Matrix fixed up
[FIX] Pokemod map widget fixed up
[FIX] FractionWidget sets stuff on ctor
[FIX] Assertion used in pokemod rather than returning NULL
[FIX] Fixed a bad compare in Type

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@180 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 3 insertions, 6 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 8b679960..d6b5f1e0 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -187,15 +187,13 @@ int MapTrainer::leadTeamMember() const
 
 const MapTrainerTeamMember* MapTrainer::teamMember(const int index) const
 {
-    if (teamMemberCount() <= index)
-        return NULL;
+    Q_ASSERT(index < teamMemberCount());
     return m_teamMember.at(index);
 }
 
 MapTrainerTeamMember* MapTrainer::teamMember(const int index)
 {
-    if (teamMemberCount() <= index)
-        return NULL;
+    Q_ASSERT(index < teamMemberCount());
     return m_teamMember[index];
 }
 
@@ -247,8 +245,7 @@ MapTrainerTeamMember* MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember
 
 void MapTrainer::deleteTeamMember(const int index)
 {
-    if (teamMemberCount() <= index)
-        return;
+    Q_ASSERT(index < teamMemberCount());
     delete m_teamMember[index];
     m_teamMember.removeAt(index);
 }