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

Sometimes the first hitpoints left percentage and the unscathed...

Browse source 
...had a difference of 0.1%, this has been fixed (bug #9122).

Added a new static function so both display routines use the same
algorithm.
This commit is contained in:
Mark de Wever 2008-01-11 14:15:58 +00:00
parent 6cd4215e50
commit 3d5bb81885
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -10,6 +10,8 @@ Version 1.3.13+svn:
* mountains no longer have a hill as base
* when a leader dies the villages, which are no longer are owned, are
properly redrawn (bug #9136)
* sometimes the first hitpoints left percentage and the unscatched had a
difference of 0.1%, this has been fixed (bug #9122)
* language and i18n:
* updated translations: Chinese, Danish, Finnish, French, German, Italian,
Lithuanian, Slovak, Spanish

25
src/mouse_events.cpp
View file

@ -58,6 +58,19 @@ static bool command_active()
#endif
}
// Conversion routine for both unscatched and damage change percentage.
static void format_prob(char str_buf[10], const float prob)
{
const char *prob_str_format = NULL;
if(prob > 0.9995) prob_str_format = "100 %%";
else if(prob >= 0.1) prob_str_format = "%4.1f %%";
else prob_str_format = " %3.1f %%";
snprintf(str_buf, 10, prob_str_format, static_cast<float>(100.0 * (prob + 0.0005)));
str_buf[9] = '\0'; //prevents _snprintf error
}
namespace{
//minimum dragging distance to fire the drag&drop
const double drag_threshold = 14.0;
@ -357,8 +370,7 @@ namespace{
// Unscathed probability.
left_strings.push_back(_("Chance of being unscathed"));
snprintf(str_buf, 10, "%.1f%%", static_cast<float>(u_unscathed * 100.0));
str_buf[9] = '\0'; //prevents _snprintf error
format_prob(str_buf, u_unscathed);
right_strings.push_back(str_buf);
#if 0 // might not be en English!
@ -613,14 +625,7 @@ namespace{
SDL_FillRect(surf, &bar_rect_4, blend_rgb(surf, row_color.r, row_color.g, row_color.b, 0));
// Draw probability percentage, aligned right.
const char *prob_str_format = NULL;
if(prob > 0.9995) prob_str_format = "100 %%";
else if(prob >= 0.1) prob_str_format = "%4.1f %%";
else prob_str_format = " %3.1f %%";
snprintf(str_buf, 10, prob_str_format, static_cast<float>(100.0 * (prob + 0.0005)));
str_buf[9] = '\0'; //prevents _snprintf error
format_prob(str_buf, prob);
int prob_width = font::line_width(str_buf, fs);
font::draw_text_line(surf, clip_rect, fs, font::NORMAL_COLOUR, str_buf,
width - prob_width - 4, 2 + (fs + 2) * i, 0, TTF_STYLE_NORMAL);