upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 03:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initialize all members.

Browse Source
This commit is contained in:
Mark de Wever 2008-08-05 17:16:17 +00:00
parent 0495aa0ea3
commit 7c1f92e565
1 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/unit_map.cpp
View File

@ -28,7 +28,11 @@
typedef std::pair<std::string, std::pair<bool, std::pair<gamemap::location, unit>*> > umap_pair;
unit_map::unit_map(const gamemap::location &loc, const unit &u) : num_iters_(0), num_invalid_(0)
unit_map::unit_map(const gamemap::location &loc, const unit &u) :
num_iters_(0),
num_invalid_(0),
map_(),
lmap_()
{
add(new std::pair<gamemap::location,unit>(loc, u));
}
@ -145,8 +149,12 @@ unit_map::const_unit_iterator unit_map::const_unit_iterator::operator++(int){
return const_unit_iterator(iter, map_);
}
unit_map::unit_xy_iterator::unit_xy_iterator(const unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::unit_xy_iterator::unit_xy_iterator(const unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
@ -200,12 +208,20 @@ bool unit_map::unit_xy_iterator::valid() const {
return i_ != map_->map_.end() && i_->second.first && loc_ == i_->second.second->first;
}
unit_map::const_unit_xy_iterator::const_unit_xy_iterator(const unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_unit_xy_iterator::const_unit_xy_iterator(const unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
unit_map::const_unit_xy_iterator::const_unit_xy_iterator(const const_unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_unit_xy_iterator::const_unit_xy_iterator(const const_unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
const std::pair<gamemap::location,unit>* unit_map::const_unit_xy_iterator::operator->() const {
@ -258,12 +274,20 @@ bool unit_map::const_unit_xy_iterator::valid() const {
}
unit_map::xy_accessor::xy_accessor(const unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::xy_accessor::xy_accessor(const unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
unit_map::xy_accessor::xy_accessor(const unit_xy_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::xy_accessor::xy_accessor(const unit_xy_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
@ -294,20 +318,36 @@ bool unit_map::xy_accessor::valid() {
return false;
}
unit_map::const_xy_accessor::const_xy_accessor(const const_unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_xy_accessor::const_xy_accessor(const const_unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
unit_map::const_xy_accessor::const_xy_accessor(const unit_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_xy_accessor::const_xy_accessor(const unit_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
unit_map::const_xy_accessor::const_xy_accessor(const const_unit_xy_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_xy_accessor::const_xy_accessor(const const_unit_xy_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
unit_map::const_xy_accessor::const_xy_accessor(const unit_xy_iterator &i) : counter_(i.map_), i_(i.i_), map_(i.map_) {
if (i.valid()) loc_ = i->first;
unit_map::const_xy_accessor::const_xy_accessor(const unit_xy_iterator &i) :
counter_(i.map_),
i_(i.i_),
map_(i.map_),
loc_(i.valid() ? i->first : gamemap::location())
{
}
const std::pair<gamemap::location,unit>* unit_map::const_xy_accessor::operator->() {