Wad Map Converter: Throw de::Error exceptions in LoadBlockmap()

skyjake · Jul 26, 2012 · 627f0e8 · 627f0e8
1 parent 732d6d8
commit 627f0e8
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/doomsday/plugins/wadmapconverter/src/id1map_loadblockmap.cpp b/doomsday/plugins/wadmapconverter/src/id1map_loadblockmap.cpp
@@ -123,13 +123,12 @@ bool LoadBlockmap(MapLumpInfo* lumpInfo)
 #if _DEBUG
             if(SHORT(blockmapLump[offset]) != 0)
             {
-                de::LegacyCore::instance().handleUncaughtException(
-                    QString("WadMapConverter::"loadBlockmap: Offset (%1) for block %2 [%3, %4] "
-                            "does not index the beginning of a line list!")
-                            .arg(offset)
-                            .arg(blockIdx)
-                            .arg(x)
-                            .arg(y)));
+                throw de::Error("WadMapConverter::"loadBlockmap",
+                                QString("Offset (%1) for block %2 [%3, %4] does not index the beginning of a line list!")
+                                    .arg(offset)
+                                    .arg(blockIdx)
+                                    .arg(x)
+                                    .arg(y)));
             }
 #endif
 
@@ -155,9 +154,8 @@ bool LoadBlockmap(MapLumpInfo* lumpInfo)
 #if _DEBUG
                     if(idx < 0 || idx >= (long) map->numLines)
                     {
-                        de::LegacyCore::instance().handleUncaughtException(
-                            QString("WadMapConverter::loadBlockmap: Invalid linedef index #%1.")
-                                    .arg(idx)));
+                        throw de::Error("WadMapConverter::"loadBlockmap",
+                                        QString("Invalid linedef index #%1.").arg(idx)));
                     }
 #endif
                     *ptr++ = &map->lines[idx];