CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Pauli Manninen <[EMAIL PROTECTED]> 04/11/07 08:32:51
Modified files:
data/units : Mermaid_Diviner.cfg Mermaid_Enchantress.cfg
Mermaid_Initiate.cfg Mermaid_Siren.cfg
Log message:
Shortened Mermaid Siren tree.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Diviner.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Enchantress.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Initiate.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Mermaid_Siren.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Modified files:
src : Makefile.am
Log message:
s/scrollarea\.h/scrollarea\.hpp/
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
Patches:
Index: wesnoth/data/units/Mermaid_Diviner.cfg
diff -u wesnoth/data/units/Mermaid_Diviner.cfg:1.2
wesnoth/data/units/Mermaid_Diviner.cfg:1.3
--- wesnoth/data/units/Mermaid_Diviner.cfg:1.2 Wed Oct 20 08:53:21 2004
+++ wesnoth/data/units/Mermaid_Diviner.cfg Wed Oct 20 13:26:32 2004
@@ -1,6 +1,6 @@
[unit]
id=Mermaid Diviner
-name= _ "Mermaid Diviner"
+name= _ "female^Mermaid Diviner"
race=merman
gender=female
image=mermaid-diviner.png
Index: wesnoth/data/units/Mermaid_Enchantress.cfg
diff -u wesnoth/data/units/Mermaid_Enchantress.cfg:1.2
wesnoth/data/units/Mermaid_Enchantress.cfg:1.3
--- wesnoth/data/units/Mermaid_Enchantress.cfg:1.2 Wed Oct 20 08:53:21 2004
+++ wesnoth/data/units/Mermaid_Enchantress.cfg Wed Oct 20 13:26:32 2004
@@ -1,6 +1,6 @@
[unit]
id=Mermaid Enchantress
-name= _ "Mermaid Enchantress"
+name= _ "female^Mermaid Enchantress"
race=merman
gender=female
image=mermaid-enchantress.png
Index: wesnoth/data/units/Mermaid_Initiate.cfg
diff -u wesnoth/data/units/Mermaid_Initiate.cfg:1.3
wesnoth/data/units/Mermaid_Initiate.cfg:1.4
--- wesnoth/data/units/Mermaid_Initiate.cfg:1.3 Wed Oct 20 08:53:21 2004
+++ wesnoth/data/units/Mermaid_Initiate.cfg Wed Oct 20 13:26:32 2004
@@ -1,6 +1,6 @@
[unit]
id=Mermaid Initiate
-name= _ "Mermaid Initiate"
+name= _ "female^Mermaid Initiate"
race=merman
gender=female
image=mermaid-initiate.png
Index: wesnoth/data/units/Mermaid_Siren.cfg
diff -u wesnoth/data/units/Mermaid_Siren.cfg:1.3
wesnoth/data/units/Mermaid_Siren.cfg:1.4
--- wesnoth/data/units/Mermaid_Siren.cfg:1.3 Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/Mermaid_Siren.cfg Fri Oct 22 10:04:51 2004
@@ -1,6 +1,6 @@
[unit]
id=Mermaid Siren
-name= _ "female^Siren"
+name= _ "Siren"
race=merman
gender=female
image=mermaid-siren.png
@@ -20,7 +20,7 @@
unit_description= _ "Skilled creatures of the sea, Mermen are powerful and
quick in any watery environment, but struggle greatly to move on land."
get_hit_sound=mermen-hit.wav
[attack]
- name=naia touch
+ name=naiad touch
type=impact
range=short
special=magical
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.60 wesnoth/src/Makefile.am:1.61
--- wesnoth/src/Makefile.am:1.60 Sat Nov 6 21:53:38 2004
+++ wesnoth/src/Makefile.am Sun Nov 7 08:32:50 2004
@@ -327,7 +327,7 @@
widgets/menu.hpp \
widgets/progressbar.hpp \
widgets/textbox.hpp \
- widgets/scrollarea.h \
+ widgets/scrollarea.hpp \
widgets/scrollbar.hpp \
widgets/slider.hpp \
widgets/widget.hpp \
