[Wesnoth-cvs-commits] wesnoth ./changelog data/help.cfg images/help/h...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/08/17 20:10:08

Modified files:
        .              : changelog 
        data           : help.cfg 
        images/help    : hpxp.png 
Added files:
        images/help    : hp-bars.png 

Log message:
        fix 14075

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.859&tr2=1.860&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/help.cfg.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/help/hp-bars.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/images/help/hpxp.png.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.859 wesnoth/changelog:1.860
--- wesnoth/changelog:1.859     Wed Aug 17 13:25:58 2005
+++ wesnoth/changelog   Wed Aug 17 20:10:07 2005
@@ -6,6 +6,7 @@
        Swedish, Turkish
    * updated man pages: English, Swedish
    * fixed some translated strings not being used (#14094)
+   * improve layout of some parts of help (#14075)
  * campaigns
    * Eastern Invasion: further revisions for Weldyn Under Attack
  * new unit portraits for Ghoul, Mermaid Initiate, Merman Fighter,
@@ -20,7 +21,7 @@
  * various bug fixes and code cleanups
  * new observer icon
  * changed Merman hoplite to bring it up to date with changes to steadfast
- * fixed Dark Adept female version glitches (#14073,#14122)
+ * fixed Dark Adept female version glitches (#14073,#14122,#13986)
  * fixed wrong ice missile image used by Elvish High Lord (#14132)
  * removed tooltip picture (#14134): with #14084 present this cannot be fixed
  * fixed Lich using wrong image (#14139)
Index: wesnoth/data/help.cfg
diff -u wesnoth/data/help.cfg:1.44 wesnoth/data/help.cfg:1.45
--- wesnoth/data/help.cfg:1.44  Wed Aug 17 11:13:23 2005
+++ wesnoth/data/help.cfg       Wed Aug 17 20:10:08 2005
@@ -118,9 +118,9 @@
 [topic]
 id=hitpoints
 title= _ "Hitpoints and Experience"
-text= _"Each unit has a certain number of hitpoints (HP). If the hitpoints of 
a unit drop below 1, the unit dies. Each unit also has a certain number of 
experience points (XP). A freshly recruited unit starts with no experience 
points, and gains experience by fighting enemies." + "
-<img>src=help/hpxp.png align=left float=yes</img>" + _"The hitpoints and 
experience points are both indicated in the status pane using two numbers (the 
current value and the maximum value the unit can have)." + "
-<img>src=help/hp-green.png align=here</img><img>src=help/hp-yellow.png 
align=here</img><img>src=help/hp-red.png align=here</img>" + _"The hitpoints 
are also indicated by an energy bar next to each unit, which is green, yellow 
or red. A unit with at least 1 experience point has a blue experience bar, 
which turns white as the unit is about to <ref>dst=experience_and_advancement 
text=advance</ref>."
+text= "<img>src=help/hpxp.png align=right float=yes</img>" + _"Each unit has a 
certain number of hitpoints (HP). If the hitpoints of a unit drop below 1, the 
unit dies. Each unit also has a certain number of experience points (XP). A 
freshly recruited unit starts with no experience points, and gains experience 
by fighting enemies." +
+_"The hitpoints and experience points are both indicated in the status pane 
using two numbers (the current value and the maximum value the unit can have)." 
+ "
+<img>src=help/hp-bars.png align=left float=yes</img>" + _"The hitpoints are 
also indicated by an energy bar next to each unit, which is green, yellow or 
red. A unit with at least 1 experience point has a blue experience bar, which 
turns white as the unit is about to <ref>dst=experience_and_advancement 
text=advance</ref>."
 [/topic]
 
 [topic]
Index: wesnoth/images/help/hpxp.png