[FIX] IndexException is more explicit

[FIX] Added SizeException for image validation
[FIX] QPixmaps are now verified
[FIX] Classes now use error and warning rather than throwing
[FIX] Deleted Object.cpp

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

1 files changed, 6 insertions, 4 deletions

diff --git a/pokemod/Trainer.cpp b/pokemod/Trainer.cpp
index a4a86578..94a989fd 100644
--- a/pokemod/Trainer.cpp
+++ b/pokemod/Trainer.cpp
@@ -33,7 +33,8 @@ Trainer::Trainer(const Trainer& trainer) :
 Trainer::Trainer(const Pokemod* pokemod, const int id) :
         Object("Trainer", pokemod, id),
         m_name(""),
-        m_moneyFactor(0)
+        m_moneyFactor(0),
+        m_skin(192, 128)
 {
 }
 
@@ -91,13 +92,14 @@ void Trainer::setName(const QString& name)
 void Trainer::setMoneyFactor(const int moneyFactor) throw(BoundsException)
 {
     if (moneyFactor < 0)
-        throw(BoundsException(className(), "moneyFactor"));
+        error<BoundsException>("moneyFactor");
     m_moneyFactor = moneyFactor;
 }
 
-void Trainer::setSkin(const QPixmap& skin) throw(Exception)
+void Trainer::setSkin(const QPixmap& skin) throw(SizeException)
 {
-    // TODO: check dimensions
+    if (skin.size() != QSize(192, 128))
+        error<SizeException>("skin");
     m_skin = skin;
 }