From b71817538fbbcd687fed40bccbff1fe2cb5da1a2 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Mon, 10 Dec 2007 18:20:56 +0000 Subject: [PATCH] wassert -> assert --- src/cavegen.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cavegen.cpp b/src/cavegen.cpp index 23a75525307..25a1fdc4079 100644 --- a/src/cavegen.cpp +++ b/src/cavegen.cpp @@ -21,9 +21,10 @@ #include "log.hpp" #include "pathfind.hpp" #include "util.hpp" -#include "wassert.hpp" #include "serialization/string_utils.hpp" +#include + #define LOG_NG LOG_STREAM(info, engine) cave_map_generator::cave_map_generator(const config* cfg) : wall_(t_translation::CAVE_WALL), @@ -198,7 +199,7 @@ void cave_map_generator::generate_chambers() if(itor == chamber_ids_.end()) continue; - wassert(itor->second < chambers_.size()); + assert(itor->second < chambers_.size()); passages_.push_back(passage(new_chamber.center,chambers_[itor->second].center,**p)); } @@ -302,7 +303,7 @@ private: double passage_path_calculator::cost(const gamemap::location& /*src*/,const gamemap::location& loc, const double, const bool) const { - wassert(loc.x >= 0 && loc.y >= 0 && size_t(loc.x) < map_.size() && + assert(loc.x >= 0 && loc.y >= 0 && size_t(loc.x) < map_.size() && !map_.empty() && size_t(loc.y) < map_.front().size()); double res = 1.0;