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

Slowed units are now tinted to be recognizable at a glance

Browse source
This commit is contained in:
Derek Hoagland 2011-11-01 14:47:32 +00:00
parent bdfc1307ba
commit 7022a771a8
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -62,6 +62,7 @@ Version 1.9.9+svn:
* Chanaged: Disable pango markup in unit names (bug #17788)
* It is now possible to remove multiple installed add-ons at the same
time
* Slowed units are now tinted to be recognizable at a glance
* WML engine:
* Readded the liminal alignment
* Added four-difficulty versions of certain macros: QUANTITY4,

1
players_changelog
View file

@ -48,6 +48,7 @@ Version 1.9.9+svn:
* Added option in advanced preferences that allows the twelve-hour clock
format to be used.
* Reenabled "delay shroud updates".
* Slowed units are now tinted to be recognizable at a glance.
* Miscellaneous and bug fixes:
* Reintroduced the "Liminal" alignment. Liminal units fight best during

23
src/unit.cpp
View file

@ -1863,10 +1863,27 @@ void unit::redraw_unit()
}
params.y -= height_adjust;
params.halo_y -= height_adjust;
if (get_state(STATE_POISONED)){
params.blend_with = disp.rgb(0,255,0);
params.blend_ratio = 0.25;
int red = 0,green = 0,blue = 0,tints = 0;
double blend_ratio = 0;
// Add future colored states here
if(get_state(STATE_POISONED)) {
green += 255;
blend_ratio += 0.25;
tints += 1;
}
if(get_state(STATE_SLOWED)) {
red += 191;
green += 191;
blue += 255;
blend_ratio += 0.25;
tints += 1;
}
if(tints > 0) {
params.blend_with = disp.rgb((red/tints),(green/tints),(blue/tints));
params.blend_ratio = ((blend_ratio/tints));
}
//hackish : see unit_frame::merge_parameters
// we use image_mod on the primary image
// and halo_mod on secondary images and all haloes