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

(cvs internal) fixed level-up fadings that were broken by a previous commit.

Browse source
This commit is contained in:
Philippe Plantier 2004-08-25 20:05:12 +00:00
parent abd8a7d89d
commit 7b92f0a024
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/display.cpp
View file

@ -90,7 +90,7 @@ display::display(unit_map& units, CVideo& video, const gamemap& map,
std::string::size_type pos;
while((pos = flag.find("%d")) != std::string::npos) {
std::ostringstream s;
s << int(i+1);
s << teams_[i].map_colour_to();
flag.replace(pos, 2, s.str());
}
} else {
@ -1194,12 +1194,14 @@ void display::draw_unit_on_tile(int x, int y, surface unit_image_override,
const int height_adjust = it->second.is_flying() ? 0 : int(map_.get_terrain_info(terrain).unit_height_adjust()*zoom());
const double submerge = it->second.is_flying() ? 0.0 : map_.get_terrain_info(terrain).unit_submerge();
double blend_ratio = 0.25;
if(loc == advancingUnit_ && it != units_.end()) {
//the unit is advancing - set the advancing colour to white if it's a
//non-chaotic unit, otherwise black
blend_with = it->second.type().alignment() == unit_type::CHAOTIC ?
rgb(16,16,16) : rgb(255,255,255);
highlight_ratio = advancingAmount_;
blend_ratio = 1 - advancingAmount_;
} else if(it->second.poisoned() /* && highlight_ratio == 1.0 */) {
//the unit is poisoned - draw with a green hue
blend_with = rgb(0,255,0);
@ -1220,7 +1222,7 @@ void display::draw_unit_on_tile(int x, int y, surface unit_image_override,
}
draw_unit(xpos,ypos - height_adjust,unit_image,false,
highlight_ratio,blend_with,submerge,ellipse_back,ellipse_front);
highlight_ratio,blend_with,blend_ratio,submerge,ellipse_back,ellipse_front);
}
const double bar_alpha = highlight_ratio < 1.0 && blend_with == 0 ? highlight_ratio : 1.0;
@ -1826,7 +1828,7 @@ void display::float_label(const gamemap::location& loc, const std::string& text,
}
void display::draw_unit(int x, int y, surface image,
bool upside_down, double alpha, Uint32 blendto, double submerged,
bool upside_down, double alpha, Uint32 blendto, double blend_ratio, double submerged,
surface ellipse_back, surface ellipse_front)
{
//calculate the y position of the ellipse. It should be the same as the y position of the image, unless
@ -1842,8 +1844,8 @@ void display::draw_unit(int x, int y, surface image,
surf.assign(flop_surface(surf));
}
if(blendto != 0) {
surf = blend_surface(surf, 0.25, blendto);
if(blend_ratio != 0) {
surf = blend_surface(surf, blend_ratio, blendto);
}
if(alpha > 1.0) {
surf = brighten_image(surf,alpha);

4
src/display.hpp
View file

@ -323,7 +323,9 @@ public:
//submerged: the amount of the unit out of 1.0 that is submerged
// (presumably under water) and thus shouldn't be drawn
void draw_unit(int x, int y, surface image,
bool upside_down=false,double alpha=1.0, Uint32 blendto=0, double submerged=0.0,
bool upside_down=false,double alpha=1.0,
Uint32 blendto=0, double blend_ratio=0,
double submerged=0.0,
surface ellipse_back=surface(NULL),
surface ellipse_front=surface(NULL));