upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 17:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Wsign-compare warning.

Browse Source
This commit is contained in:
gfgtdf 2016-06-18 02:25:02 +02:00
parent 58b5e9acc2
commit c792dbac55
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/editor/palette/editor_palettes.cpp
View File

@ -87,8 +87,8 @@ template void editor_palette<overlay>::expand_palette_groups_menu(std::vector<st
template<class Item>
bool editor_palette<Item>::scroll_up()
{
unsigned int decrement = item_width_;
if (items_start_ + nitems_ == num_items() && num_items() % item_width_ != 0) {
int decrement = item_width_;
if (items_start_ + num_visible_items() == num_items() && num_items() % item_width_ != 0) {
decrement = num_items() % item_width_;
}
if(items_start_ >= decrement) {
@ -132,7 +132,7 @@ template bool editor_palette<overlay>::can_scroll_up();
template<class Item>
bool editor_palette<Item>::can_scroll_down()
{
return (items_start_ + nitems_ + item_width_ <= size_t(num_items()));
return (items_start_ + nitems_ + item_width_ <= num_items());
}
template bool editor_palette<t_translation::t_terrain>::can_scroll_down();
template bool editor_palette<unit_type>::can_scroll_down();
@ -141,7 +141,7 @@ template bool editor_palette<overlay>::can_scroll_down();
template<class Item>
bool editor_palette<Item>::scroll_down()
{
bool end_reached = (!(items_start_ + nitems_ + item_width_ <= size_t(num_items())));
bool end_reached = (!(items_start_ + nitems_ + item_width_ <= num_items()));
bool scrolled = false;
// move downwards
@ -149,7 +149,7 @@ bool editor_palette<Item>::scroll_down()
items_start_ += item_width_;
scrolled = true;
}
else if (items_start_ + nitems_ + (num_items() % item_width_) <= size_t(num_items())) {
else if (items_start_ + nitems_ + (num_items() % item_width_) <= num_items()) {
items_start_ += num_items() % item_width_;
scrolled = true;
}
@ -221,12 +221,10 @@ void editor_palette<Item>::adjust_size(const SDL_Rect& target)
{
palette_x_ = target.x;
palette_y_ = target.y;
const size_t space_for_items = target.h;
const unsigned items_fitting =
static_cast<unsigned> (space_for_items / item_space_) *
item_width_;
nitems_ = std::min<int>(items_fitting, nmax_items_);
if (buttons_.size() != nitems_) {
const int space_for_items = target.h;
const int items_fitting = (space_for_items / item_space_) * item_width_;
nitems_ = std::min(items_fitting, nmax_items_);
if (num_visible_items() != nitems_) {
buttons_.resize(nitems_, gui::tristate_button(gui_.video(), this));
}
set_location(target);
@ -281,8 +279,7 @@ template void editor_palette<overlay>::swap();
template<class Item>
int editor_palette<Item>::num_items()
{
const size_t size = group_map_[active_group_].size();
return size;
return group_map_[active_group_].size();
}
template int editor_palette<t_translation::t_terrain>::num_items();
template int editor_palette<unit_type>::num_items();
@ -324,8 +321,8 @@ void editor_palette<Item>::draw_contents()
unsigned int y = palette_y_;
unsigned int x = palette_x_;
unsigned int starting = items_start_;
unsigned int ending = std::min<unsigned int>(starting + nitems_, num_items());
int starting = items_start_;
int ending = std::min<int>(starting + nitems_, num_items());
gui::button* upscroll_button = gui_.find_action_button("upscroll-button-editor");
if (upscroll_button)
@ -335,8 +332,8 @@ void editor_palette<Item>::draw_contents()
downscroll_button->enable(ending != num_items());
unsigned int counter = starting;
for (unsigned int i = 0 ; i < buttons_.size() ; i++) {
int counter = starting;
for (int i = 0, size = num_visible_items(); i < size ; ++i) {
//TODO check if the conditions still hold for the counter variable
//for (unsigned int counter = starting; counter < ending; counter++)

5
src/editor/palette/editor_palettes.hpp
View File

@ -125,6 +125,9 @@ private:
/** Return the number of items in the palette. */
int num_items();
/** Return the number of items in the palette. */
int num_visible_items() { return buttons_.size(); }
void hide(bool hidden) {
widget::hide(hidden);
if (!hidden)
@ -172,7 +175,7 @@ protected:
typedef std::map<std::string, Item> item_map;
item_map item_map_;
size_t nitems_, nmax_items_, items_start_;
int nitems_, nmax_items_, items_start_;
std::set<std::string> non_core_items_;
private:

2
src/editor/palette/item_palette.cpp
View File

@ -44,7 +44,7 @@ void item_palette::setup(const config& cfg)
if (!group["core"].to_bool(false))
non_core_items_.insert(item["id"]);
}
nmax_items_ = std::max(nmax_items_, group_map_[group["id"]].size());
nmax_items_ = std::max<int>(nmax_items_, group_map_[group["id"]].size());
}
select_fg_item("anvil");

10
src/editor/palette/location_palette.cpp
View File

@ -308,20 +308,21 @@ void location_palette::draw_contents()
if (button_delete_) {
button_delete_->set_dirty(true);
}
unsigned int counter = starting;
for (int i = 0, size = num_visible_items(); i < size; i++) {
location_palette_item & tile = buttons_[i];
tile.hide(true);
if (i >= ending) continue;
if (i >= ending) {
//We want to hide all follwing buttons to we cannot use break here.
continue;
}
const std::string item_id = items_[counter];
const std::string item_id = items_[starting + i];
std::stringstream tooltip_text;
const int counter_from_zero = counter - starting;
SDL_Rect dstrect;
dstrect.x = x;
dstrect.y = y;
@ -338,7 +339,6 @@ void location_palette::draw_contents()
// Adjust location
y += item_space_;
counter++;
}
update_rect(location());
}

4
src/editor/palette/terrain_palettes.cpp
View File

@ -120,7 +120,7 @@ void terrain_palette::setup(const config& cfg)
for (const std::string& k : keys) {
group_map_[k].push_back(get_id(t));
nmax_items_ = std::max(nmax_items_, group_map_[k].size());
nmax_items_ = std::max<int>(nmax_items_, group_map_[k].size());
std::map<std::string, item_group*>::iterator i = id_to_group.find(k);
if (i != id_to_group.end()) {
if (i->second->core) {
@ -134,7 +134,7 @@ void terrain_palette::setup(const config& cfg)
if (core) {
// Add the terrain to the default group
group_map_["all"].push_back(get_id(t));
nmax_items_ = std::max(nmax_items_, group_map_["all"].size());
nmax_items_ = std::max<int>(nmax_items_, group_map_["all"].size());
} else {
non_core_items_.insert(get_id(t));
}

4
src/editor/palette/unit_palette.cpp
View File

@ -38,13 +38,13 @@ void unit_palette::setup(const config& /*cfg*/)
continue;
item_map_.insert(std::pair<std::string, unit_type>(i.second.id(), i.second));
group_map_[i.second.race_id()].push_back(i.second.id());
nmax_items_ = std::max(nmax_items_, group_map_[i.second.race_id()].size());
nmax_items_ = std::max<int>(nmax_items_, group_map_[i.second.race_id()].size());
//TODO
bool core = true;
if (core) {
// Add the unit to the default group
group_map_["all"].push_back(i.second.id());
nmax_items_ = std::max(nmax_items_, group_map_["all"].size());
nmax_items_ = std::max<int>(nmax_items_, group_map_["all"].size());
} else {
non_core_items_.insert(i.second.id());
}