Fix duplicate archetype definition for "troll".

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@10936 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-12-12 18:34:31 +00:00 · 2008-12-12 18:34:31 +00:00 · 4bb7ae5166
parent dee1207892
commit 4bb7ae5166
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 Changes for SVN top of tree:

+monster/troll/Troll/troll.arc
+Fix duplicate archetype definition for "troll".
+Andreas Kirschbaum 2008-12-12
+
 gods/items/valkyrie_amulet_lifesave.arc
 Changes to the amulet so that the item appears as
 "Valkyrie's Amulet of Lifesaving" instead of
--- a/monster/troll/Troll/troll.arc
+++ b/monster/troll/Troll/troll.arc
@ -32,7 +32,7 @@ body_skill 1
 body_arm 2
 end
 More
-Object troll
+Object troll_2
 name troll
 face troll.x11
 animation troll