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

Fix unsigned warning (g++ 4.0): num_xxx should always be unsigned.

Browse Source
This commit is contained in:
Rusty Russell 2006-05-10 07:37:51 +00:00
parent fbaee78fa7
commit d2e62235c1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/race.cpp
View File

@ -144,6 +144,6 @@ const config::child_list& unit_race::additional_traits() const
return *traits_;
}
int unit_race::num_traits() const { return ntraits_; }
unsigned int unit_race::num_traits() const { return ntraits_; }
bool unit_race::not_living() const { return not_living_; }

4
src/race.hpp
View File

@ -38,13 +38,13 @@ public:
bool uses_global_traits() const;
const config::child_list& additional_traits() const;
int num_traits() const;
unsigned int num_traits() const;
bool not_living() const;
private:
t_string name_;
int ntraits_;
unsigned int ntraits_;
std::vector<std::string> names_[NUM_GENDERS];
markov_prefix_map next_[NUM_GENDERS];
int chain_size_;

4
src/unit_types.cpp
View File

@ -861,7 +861,7 @@ const unit_type& unit_type::get_variation(const std::string& name) const
}
}
int unit_type::num_traits() const {
unsigned int unit_type::num_traits() const {
return (cfg_["num_traits"].size() ? atoi(cfg_["num_traits"].c_str()) : race_->num_traits());
}
@ -1104,7 +1104,7 @@ const std::vector<config*>& unit_type::possible_traits() const
bool unit_type::has_random_traits() const
{
const int n = num_traits();
const unsigned int n = num_traits();
return (n > 0 && n < possibleTraits_.size());
}

2
src/unit_types.hpp
View File

@ -173,7 +173,7 @@ public:
//info on the type of unit that the unit reanimates as
const std::string& undead_variation() const;
int num_traits() const;
unsigned int num_traits() const;
std::string generate_description() const;