Merge pull request #23 from daftfad/bugfixes

fixed toolless constructions
CleverRaven · Jan 29, 2013 · 5898a2a · 5898a2a
2 parents ee33c1e + e6478ef
commit 5898a2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/construction.cpp b/construction.cpp
@@ -477,8 +477,10 @@ bool game::player_can_build(player &p, inventory inv, constructable* con,
   }  // j in [0,2]
   can_build_any = (has_component || !components_required) && 
     (has_tool || !tools_required);
-  if (exact_level && (i == level) && (!has_component || !has_tool))
-    return false;
+  if (exact_level && (i == level)) {
+      return ((has_component || !components_required) && 
+	      (has_tool || !tools_required));
+  }
  }  // stage[i]
  return can_build_any;
 }

diff --git a/npcmove.cpp b/npcmove.cpp
@@ -922,7 +922,8 @@ void npc::move_to(game *g, int x, int y)
 void npc::move_to_next(game *g)
 {
  if (path.empty()) {
-  debugmsg("npc::move_to_next() called with an empty path!");
+ if (g->debugmon)
+   debugmsg("npc::move_to_next() called with an empty path!");
   move_pause();
   return;
  }