[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src unit.cpp unit_types.cpp
From: |
Philippe Plantier |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src unit.cpp unit_types.cpp |
Date: |
Thu, 21 Apr 2005 16:49:17 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 05/04/21 20:49:16
Modified files:
src : unit.cpp unit_types.cpp
Log message:
Added a few spaces, for clarity, in the traits tooltip.
Fixed some missing initialization.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
Patches:
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.140 wesnoth/src/unit.cpp:1.141
--- wesnoth/src/unit.cpp:1.140 Mon Apr 18 15:48:33 2005
+++ wesnoth/src/unit.cpp Thu Apr 21 20:49:16 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.140 2005/04/18 15:48:33 ott Exp $ */
+/* $Id: unit.cpp,v 1.141 2005/04/21 20:49:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -88,7 +88,7 @@
user_end_turn_(false), facingLeft_(side != 1),
maxMovement_(type_->movement()),
backupMaxMovement_(type_->movement()),
- recruit_(false), attacks_(type_->attacks()),
+ resting_(false), recruit_(false), attacks_(type_->attacks()),
backupAttacks_(type_->attacks()),
guardian_(false), upkeep_(UPKEEP_FULL_PRICE),
unrenamable_(false)
@@ -120,6 +120,7 @@
user_end_turn_(false), facingLeft_(u.facingLeft_),
maxMovement_(type_->movement()),
backupMaxMovement_(type_->movement()),
+ resting_(u.resting_),
underlying_description_(u.underlying_description_),
description_(u.description_), recruit_(u.recruit_),
role_(u.role_), statusFlags_(u.statusFlags_),
@@ -1043,7 +1044,7 @@
if(increase_total.empty() == false) {
description += (increase_total[0] != '-' ? "+"
: "") + increase_total +
- t_string(N_("HP"), "wesnoth");
+ " " + t_string(N_("HP"), "wesnoth");
//a percentage on the end means increase by
that many percent
if(increase_total[increase_total.size()-1] ==
'%') {
@@ -1080,7 +1081,7 @@
if(increase.empty() == false) {
description += (increase[0] != '-' ? "+" : "")
+ increase +
- t_string(N_("Moves"), "wesnoth");
+ " " + t_string(N_("Moves"), "wesnoth");
if(increase[increase.size()-1] == '%') {
const std::string
inc(increase.begin(),increase.end()-1);
@@ -1104,7 +1105,9 @@
if(increase.empty() == false) {
description += (increase[0] != '-' ? "+" : "") +
- increase + t_string(N_(" XP to
advance"), "wesnoth");
+ increase + /* " " + */
+ // FIXME: the space should not be there
+ t_string(N_(" XP to advance"),
"wesnoth");
if(increase[increase.size()-1] == '%') {
const std::string
inc(increase.begin(),increase.end()-1);
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.96 wesnoth/src/unit_types.cpp:1.97
--- wesnoth/src/unit_types.cpp:1.96 Tue Mar 29 17:41:09 2005
+++ wesnoth/src/unit_types.cpp Thu Apr 21 20:49:16 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.96 2005/03/29 17:41:09 darthfool Exp $ */
+/* $Id: unit_types.cpp,v 1.97 2005/04/21 20:49:16 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -309,7 +309,7 @@
}
if(description != NULL) {
- desc << (increase_damage[0] == '-' ? "" : "+") <<
increase_damage << _("Dmg");
+ desc << (increase_damage[0] == '-' ? "" : "+") <<
increase_damage << " " << _("Dmg");
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src unit.cpp unit_types.cpp,
Philippe Plantier <=