Remove a few more redundant itype checks.

desrik · May 11, 2014 · 4fb57fa · 4fb57fa
1 parent b80b77c
commit 4fb57fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp
@@ -8,7 +8,6 @@
 #include "json.h"
 #include "path_info.h"
 #include "monstergenerator.h"
-#include "item_factory.h"
 #include <fstream>
 
 #include "SDL2/SDL_image.h"
@@ -657,11 +656,9 @@ bool cata_tiles::draw_from_id_string(const std::string &id, TILE_CATEGORY catego
                 col = t->color;
             }
         } else if (category == C_ITEM) {
-            if (item_controller->has_template(id)) {
-                const itype *i = item_controller->find_template(id);
-                sym = i->sym;
-                col = i->color;
-            }
+            const itype *i = item_controller->find_template(id);
+            sym = i->sym;
+            col = i->color;
         }
         // Special cases for walls
         switch(sym) {

diff --git a/src/mondeath.cpp b/src/mondeath.cpp
@@ -1,4 +1,3 @@
-#include "item_factory.h"
 #include "mondeath.h"
 #include "monster.h"
 #include "game.h"
@@ -433,11 +432,7 @@ void mdeath::broken(monster *z) {
     }
     // make "broken_manhack", or "broken_eyebot", ...
     item_id.insert(0, "broken_");
-    if (item_controller->has_template(item_id)) {
-        g->m.spawn_item(z->posx(), z->posy(), item_id, 1, 0, calendar::turn);
-    } else {
-        debugmsg("Tried to create a broken %s but %s does not exist.", z->type->name.c_str(), item_id.c_str());
-    }
+    g->m.spawn_item(z->posx(), z->posy(), item_id, 1, 0, calendar::turn);
 }
 
 void mdeath::ratking(monster *z) {