widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~gunchleoc/widelands/bug-1299919 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1299919 in widelands: "AT: %1$u/%2$u in miltary sites"
  https://bugs.launchpad.net/widelands/+bug/1299919

For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/bug-1299919/+merge/214005

Small string fix (replaced snprintf with boost::format)
-- 
https://code.launchpad.net/~gunchleoc/widelands/bug-1299919/+merge/214005
Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/bug-1299919 into lp:widelands.

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2014-03-05 11:59:09 +0000
+++ src/wui/soldierlist.cc	2014-04-03 11:43:49 +0000
@@ -20,6 +20,7 @@
 #include "wui/soldierlist.h"
 
 #include <boost/bind.hpp>
+#include <boost/format.hpp>
 
 #include "container_iterate.h"
 #include "graphic/font.h"
@@ -473,22 +474,14 @@
 		return;
 	}
 
-	uint32_t const  hl = soldier->get_hp_level         ();
-	uint32_t const mhl = soldier->get_max_hp_level     ();
-	uint32_t const  al = soldier->get_attack_level     ();
-	uint32_t const mal = soldier->get_max_attack_level ();
-	uint32_t const  dl = soldier->get_defense_level    ();
-	uint32_t const mdl = soldier->get_max_defense_level();
-	uint32_t const  el = soldier->get_evade_level      ();
-	uint32_t const mel = soldier->get_max_evade_level  ();
-
-	char buffer[5 * 30];
-	snprintf
-		(buffer, sizeof(buffer),
-		 /** TRANSLATORS: Health, Attack, Defense, Evade */
-		 _("HP: %1$u/%2$u  AT: %3$u/%4$u  DE: %5$u/%6$u  EV: %7$u/%8$u"),
-		 hl, mhl, al, mal, dl, mdl, el, mel);
-	m_infotext.set_text(buffer);
+	m_infotext.set_text(
+		(boost::format(_("HP: %1$u/%2$u  AT: %3$u/%4$u  DE: %5$u/%6$u  EV: %7$u/%8$u"))
+			% soldier->get_hp_level() % soldier->get_max_hp_level()
+			% soldier->get_attack_level() % soldier->get_max_attack_level()
+			% soldier->get_defense_level() % soldier->get_max_defense_level()
+			% soldier->get_evade_level() % soldier->get_max_evade_level()
+		).str()
+	);
 }
 
 void SoldierList::eject(const Soldier * soldier)