0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed compile errors

Browse source
This commit is contained in:
Dave White 2004-05-24 15:05:02 +00:00
parent 2a3d67dd86
commit f31c209d18
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ai.cpp
View file

@ -835,7 +835,7 @@ bool ai::get_villages(std::map<gamemap::location,paths>& possible_moves, const m
} }
} }
return moves_made > 0; return moves_made > 0 && village_moves.size() == max_village_moves;
} }
bool ai::get_healing(std::map<gamemap::location,paths>& possible_moves, const move_map& srcdst, const move_map& dstsrc, const move_map& enemy_srcdst, const move_map& enemy_dstsrc) bool ai::get_healing(std::map<gamemap::location,paths>& possible_moves, const move_map& srcdst, const move_map& dstsrc, const move_map& enemy_srcdst, const move_map& enemy_dstsrc)

4
src/display.cpp
View file

@ -1255,9 +1255,9 @@ void display::draw_bar(const std::string& image, int xpos, int ypos, size_t heig
blit_surface(xpos,ypos,surf,&top); blit_surface(xpos,ypos,surf,&top);
blit_surface(xpos,ypos+top.h,surf,&bot); blit_surface(xpos,ypos+top.h,surf,&bot);
const size_t unfilled = size_t(height*(1.0 - filled)); const size_t unfilled = height*(1.0 - filled);
if(unfilled < height) { if(unfilled < height && alpha >= 0.3) {
SDL_Rect filled_area = {xpos+bar_loc.x,ypos+bar_loc.y+unfilled,bar_loc.w,height-unfilled}; SDL_Rect filled_area = {xpos+bar_loc.x,ypos+bar_loc.y+unfilled,bar_loc.w,height-unfilled};
const Uint16 colour = SDL_MapRGB(video().getSurface()->format,col.r,col.g,col.b); const Uint16 colour = SDL_MapRGB(video().getSurface()->format,col.r,col.g,col.b);
SDL_FillRect(video().getSurface(),&filled_area,colour); SDL_FillRect(video().getSurface(),&filled_area,colour);

4
src/team.hpp
View file

@ -142,8 +142,8 @@ public:
bool uses_shroud() const { return shroud_.enabled(); } bool uses_shroud() const { return shroud_.enabled(); }
bool uses_fog() const { return fog_.enabled(); } bool uses_fog() const { return fog_.enabled(); }
bool fog_or_shroud() const { return uses_shroud() || uses_fog(); } bool fog_or_shroud() const { return uses_shroud() || uses_fog(); }
bool clear_shroud(size_t x, size_t y) { shroud_.clear(x,y); } bool clear_shroud(size_t x, size_t y) { return shroud_.clear(x,y); }
bool clear_fog(size_t x, size_t y) { fog_.clear(x,y); } bool clear_fog(size_t x, size_t y) { return fog_.clear(x,y); }
void refog() { fog_.reset(); } void refog() { fog_.reset(); }
bool knows_about_team(size_t index) const; bool knows_about_team(size_t index) const;