upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 02:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wassert -> assert

Browse Source
This commit is contained in:
Mark de Wever 2007-12-12 22:06:32 +00:00
parent 2d19b80d2d
commit a734e496ae
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/unit_abilities.cpp
View File

@ -22,7 +22,8 @@
#include "pathutils.hpp" #include "pathutils.hpp"
#include "terrain_filter.hpp" #include "terrain_filter.hpp"
#include "variable.hpp" #include "variable.hpp"
#include "wassert.hpp"
#include <cassert>
/* /*
* *
@ -128,7 +129,7 @@ bool unit::get_ability_bool(const std::string& ability, const gamemap::location&
if(units_== NULL) std::cout<<"ability:"<<ability<<"\n"; if(units_== NULL) std::cout<<"ability:"<<ability<<"\n";
wassert(units_ && teams_); assert(units_ && teams_);
gamemap::location adjacent[6]; gamemap::location adjacent[6];
get_adjacent_tiles(loc,adjacent); get_adjacent_tiles(loc,adjacent);
for(int i = 0; i != 6; ++i) { for(int i = 0; i != 6; ++i) {
@ -167,7 +168,7 @@ unit_ability_list unit::get_abilities(const std::string& ability, const gamemap:
} }
} }
wassert(units_ != NULL); assert(units_ != NULL);
gamemap::location adjacent[6]; gamemap::location adjacent[6];
get_adjacent_tiles(loc,adjacent); get_adjacent_tiles(loc,adjacent);
for(int i = 0; i != 6; ++i) { for(int i = 0; i != 6; ++i) {
@ -241,7 +242,7 @@ std::vector<std::string> unit::ability_tooltips(const gamemap::location& loc) co
} }
} }
/* /*
wassert(units_ != NULL); assert(units_ != NULL);
gamemap::location adjacent[6]; gamemap::location adjacent[6];
get_adjacent_tiles(loc,adjacent); get_adjacent_tiles(loc,adjacent);
for(int i = 0; i != 6; ++i) { for(int i = 0; i != 6; ++i) {
@ -312,7 +313,7 @@ bool unit::ability_active(const std::string& ability,const config& cfg,const gam
if (!matches_filter(filter, loc, cache_illuminates(illuminates, ability))) if (!matches_filter(filter, loc, cache_illuminates(illuminates, ability)))
return false; return false;
} }
wassert(units_ && map_ && gamestatus_); assert(units_ && map_ && gamestatus_);
gamemap::location adjacent[6]; gamemap::location adjacent[6];
get_adjacent_tiles(loc,adjacent); get_adjacent_tiles(loc,adjacent);
config::child_list::const_iterator i, i_end; config::child_list::const_iterator i, i_end;
@ -360,7 +361,7 @@ bool unit::ability_active(const std::string& ability,const config& cfg,const gam
*/ */
bool unit::ability_affects_adjacent(const std::string& ability,const config& cfg,int dir,const gamemap::location& loc) const bool unit::ability_affects_adjacent(const std::string& ability,const config& cfg,int dir,const gamemap::location& loc) const
{ {
wassert(dir >=0 && dir <= 5); assert(dir >=0 && dir <= 5);
static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"}; static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"};
const config::child_list& affect_adj = cfg.get_children("affect_adjacent"); const config::child_list& affect_adj = cfg.get_children("affect_adjacent");
int illuminates = -1; int illuminates = -1;
@ -614,7 +615,7 @@ std::string attack_type::weapon_specials(bool force) const
bool attack_type::special_active(const config& cfg,bool self,bool report) const bool attack_type::special_active(const config& cfg,bool self,bool report) const
{ {
// log_scope("special_active"); // log_scope("special_active");
wassert(unitmap_ != NULL); assert(unitmap_ != NULL);
unit_map::const_iterator att = unitmap_->find(aloc_); unit_map::const_iterator att = unitmap_->find(aloc_);
unit_map::const_iterator def = unitmap_->find(dloc_); unit_map::const_iterator def = unitmap_->find(dloc_);
@ -731,7 +732,7 @@ bool attack_type::special_active(const config& cfg,bool self,bool report) const
return false; return false;
} }
} }
wassert(map_ && game_status_); assert(map_ && game_status_);
const config::child_list& adj_filt_loc = cfg.get_children("filter_adjacent_location"); const config::child_list& adj_filt_loc = cfg.get_children("filter_adjacent_location");
for (i = adj_filt_loc.begin(), i_end = adj_filt_loc.end(); i != i_end; ++i) { for (i = adj_filt_loc.begin(), i_end = adj_filt_loc.end(); i != i_end; ++i) {
std::vector<std::string> dirs = utils::split((**i)["adjacent"]); std::vector<std::string> dirs = utils::split((**i)["adjacent"]);