1 files changed, 7 insertions, 7 deletions
diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp
index 7b577e14..5f1a0fd0 100644
--- a/pokemod/Map.cpp
+++ b/pokemod/Map.cpp
@@ -218,14 +218,14 @@ void Map::setName(const QString& name)
 void Map::setFlyWarp(const int warp) throw(BoundsException)
 {
     if ((warp != INT_MAX) && (warpIndex(warp) == INT_MAX))
-        throw(BoundsException(className(), "warp"));
+        error<BoundsException>("warp");
     m_flyWarp = warp;
 }
 
 void Map::setType(const int type) throw(BoundsException)
 {
     if (End <= type)
-        throw(BoundsException(className(), "type"));
+        error<BoundsException>("type");
     m_type = type;
 }
 
@@ -247,7 +247,7 @@ int Map::type() const
 void Map::setTile(int x, int y, int id) throw(BoundsException)
 {
     if (pokemod()->tileIndex(id) == INT_MAX)
-        throw(BoundsException(className(), "tile"));
+        error<BoundsException>("tile");
     m_tile(x, y) = id;
 }
 
@@ -309,7 +309,7 @@ int Map::height() const
 const MapEffect* Map::effect(const int index) const throw(IndexException)
 {
     if (effectCount() <= index)
-        error<IndexException>("effect");
+        warning<IndexException>("effect");
     return m_effects.at(index);
 }
 
@@ -387,7 +387,7 @@ int Map::newEffectId() const
 const MapTrainer* Map::trainer(const int index) const throw(IndexException)
 {
     if (trainerCount() <= index)
-        error<IndexException>("trainer");
+        warning<IndexException>("trainer");
     return m_trainers.at(index);
 }
 
@@ -465,7 +465,7 @@ int Map::newTrainerId() const
 const MapWarp* Map::warp(const int index) const throw(IndexException)
 {
     if (warpCount() <= index)
-        error<IndexException>("warp");
+        warning<IndexException>("warp");
     return m_warps.at(index);
 }
 
@@ -543,7 +543,7 @@ int Map::newWarpId() const
 const MapWildList* Map::wildList(const int index) const throw(IndexException)
 {
     if (wildListCount() <= index)
-        error<IndexException>("wild list");
+        warning<IndexException>("wild list");
     return m_wildLists.at(index);
 }