upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation with -D_GLIBCXX_PARALLEL

Browse Source
This commit is contained in:
Pauli Nieminen 2009-03-24 12:58:14 +00:00
parent 171d175701
commit 7f6ac6ca77
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -6,6 +6,7 @@ Version 1.7.0-svn:
* General:
* The add-ons directory, <preferences>/data/campaigns, has been renamed
and it is now <preferences>/data/add-ons
* Fixed compilation with -D_GLIBCXX_PARALLEL
* Graphics:
* The ~RC() image functor does not accept the special palette switch
~RC(palette1=palette2) syntax anymore. ~PAL(palette1>palette2) should

10
src/gui/widgets/window_builder.cpp
View File

@ -73,20 +73,20 @@ unsigned get_h_align(const std::string& h_align)
unsigned get_border(const std::vector<std::string>& border)
{
if(std::find(border.begin(), border.end(), "all") != border.end()) {
if(std::find(border.begin(), border.end(), std::string("all")) != border.end()) {
return tgrid::BORDER_TOP
| tgrid::BORDER_BOTTOM | tgrid::BORDER_LEFT | tgrid::BORDER_RIGHT;
} else {
if(std::find(border.begin(), border.end(), "top") != border.end()) {
if(std::find(border.begin(), border.end(), std::string("top")) != border.end()) {
return tgrid::BORDER_TOP;
}
if(std::find(border.begin(), border.end(), "bottom") != border.end()) {
if(std::find(border.begin(), border.end(), std::string("bottom")) != border.end()) {
return tgrid::BORDER_BOTTOM;
}
if(std::find(border.begin(), border.end(), "left") != border.end()) {
if(std::find(border.begin(), border.end(), std::string("left")) != border.end()) {
return tgrid::BORDER_LEFT;
}
if(std::find(border.begin(), border.end(), "right") != border.end()) {
if(std::find(border.begin(), border.end(), std::string("right")) != border.end()) {
return tgrid::BORDER_RIGHT;
}
}

6
src/terrain_filter.cpp
View File

@ -223,15 +223,15 @@ bool terrain_filter::match_internal(const map_location& loc, const bool ignore_x
if(!tod_type.empty()) {
const std::vector<std::string>& vals = utils::split(tod_type);
if(tod.lawful_bonus<0) {
if(std::find(vals.begin(),vals.end(),"chaotic") == vals.end()) {
if(std::find(vals.begin(),vals.end(),std::string("chaotic")) == vals.end()) {
return false;
}
} else if(tod.lawful_bonus>0) {
if(std::find(vals.begin(),vals.end(),"lawful") == vals.end()) {
if(std::find(vals.begin(),vals.end(),std::string("lawful")) == vals.end()) {
return false;
}
} else {
if(std::find(vals.begin(),vals.end(),"neutral") == vals.end()) {
if(std::find(vals.begin(),vals.end(),std::string("neutral")) == vals.end()) {
return false;
}
}

2
src/unit_animation.cpp
View File

@ -303,7 +303,7 @@ void unit_animation::fill_initial_animations( std::vector<unit_animation> & anim
std::vector<unit_animation>::const_iterator itor;
add_anims(animations,cfg);
for(itor = animations.begin(); itor != animations.end() ; itor++) {
if (std::find(itor->event_.begin(),itor->event_.end(),"default")!= itor->event_.end()) {
if (std::find(itor->event_.begin(),itor->event_.end(),std::string("default"))!= itor->event_.end()) {
animation_base.push_back(*itor);
animation_base.back().base_score_ = unit_animation::DEFAULT_ANIM;
animation_base.back().event_.clear();