Hans Joachim Desserud has proposed merging lp:~hjd/widelands/capital-Random
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #722757 in widelands: "Play as a random tribe"
https://bugs.launchpad.net/widelands/+bug/722757
Bug #771379 in widelands: "Play against a random AI strength (defensive,
aggressive, normal)"
https://bugs.launchpad.net/widelands/+bug/771379
For more details, see:
https://code.launchpad.net/~hjd/widelands/capital-Random/+merge/77825
Use capital letters in "Random" to make it more consistent with the other tribe
names and AI types, since they all start with capital letters.
--
https://code.launchpad.net/~hjd/widelands/capital-Random/+merge/77825
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/capital-Random into lp:widelands.
=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc 2011-09-19 17:48:27 +0000
+++ src/wui/multiplayersetupgroup.cc 2011-10-02 14:40:05 +0000
@@ -294,7 +294,7 @@
} else {
title = _("AI: ");
if (player.random_ai) {
- title += _("random");
+ title += _("Random");
pic += "ai_Random.png";
} else {
title += _(player.ai);
@@ -308,7 +308,7 @@
type->set_tooltip(title.c_str());
type->set_pic(g_gr->get_picture(PicMod_UI, pic));
if (player.random_tribe) {
- std::string random = _("random");
+ std::string random = _("Random");
if (!m_tribenames["random"].size())
m_tribepics[random] = g_gr->get_picture(PicMod_UI, "pics/random.png");
tribe->set_tooltip(random.c_str());
=== modified file 'src/wui/playerdescrgroup.cc'
--- src/wui/playerdescrgroup.cc 2011-09-19 17:48:27 +0000
+++ src/wui/playerdescrgroup.cc 2011-10-02 14:40:05 +0000
@@ -171,7 +171,7 @@
else {
title = _("AI: ");
if (player.random_ai) {
- title += _("random");
+ title += _("Random");
} else {
title += _(player.ai);
}
@@ -189,7 +189,7 @@
m_tribenames[player.tribe] = global.get_safe_string("name");
}
if (player.random_tribe) {
- d->btnPlayerTribe->set_title(_("random"));
+ d->btnPlayerTribe->set_title(_("Random"));
} else {
d->btnPlayerTribe->set_title(m_tribenames[player.tribe]);
}
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
