Fixing numerous warnings and errors in manaplus

closes #121
closes #108
closes #100
closes #93

16 files changed, 67 insertions, 81 deletions

diff --git a/graphics/sprites/monsters/accessories/bow-slimecovered.png b/graphics/sprites/monsters/accessories/bow-slimecovered.png
new file mode 100644
index 00000000..e3f17a41
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/bow-slimecovered.png
diff --git a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png
index 6a24aca4..88817f27 100644
--- a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png
+++ b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
index f37db88b..7d46f61f 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
@@ -25,8 +25,7 @@
     <animation direction="down">

       <frame index="0" delay="150" offsetY="-5" />

       <frame index="2" delay="75" offsetY="-10" />

-      <frame index="3" delay="75" offsetY="-5" />

-      <frame index="3" delay="75" offsetY="-5" />

+      <frame index="3" delay="150" offsetY="-5" />

     </animation>

     <animation direction="downleft">

       <frame index="10" delay="150" offsetX="2" offsetY="-5" />

@@ -66,7 +65,7 @@
     <animation direction="left">

       <frame index="19" />

     </animation>

-    <animation direction="29">

+    <animation direction="up">

       <frame index="30" />

     </animation>

     <animation direction="right">

@@ -76,21 +75,27 @@
   <action name="attack" imageset="base">

     <animation direction="down">

       <sequence start="5" end="8" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="downleft">

       <sequence start="15" end="18" delay="75" offsetX="2" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="downright">

       <sequence start="35" end="38" delay="75" offsetX="-2" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="left">

       <sequence start="15" end="18" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="up">

       <sequence start="25" end="28" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="right">

       <sequence start="35" end="38" delay="75" offsetY="-5" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
index 239961a0..a03d09d9 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
@@ -60,21 +60,25 @@
       <frame index="4" delay="75" offsetY="-19" />

       <frame index="4" delay="75" offsetY="-17" />

       <frame index="0" delay="150" offsetY="-20" />

+      <end/>

     </animation>

     <animation direction="left">

       <frame index="1" delay="75" offsetY="-19" />

       <frame index="1" delay="75" offsetY="-17" />

       <frame index="1" delay="150" offsetY="-20" />

+      <end/>

     </animation>

     <animation direction="up">

       <frame index="4" delay="75" offsetY="-19" />

       <frame index="4" delay="75" offsetY="-17" />

       <frame index="0" delay="150" offsetY="-20" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="1" delay="75" offsetY="-19" />

       <frame index="1" delay="75" offsetY="-17" />

       <frame index="1" delay="150" offsetY="-20" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
index 752e14ee..fd729bc3 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="left">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="up">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
index e4f22daa..f3af15c8 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="left">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="up">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="3" delay="75" offsetY="-12" />

       <frame index="3" delay="75" offsetY="-10" />

       <frame index="0" delay="150" offsetY="-12" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
index cffeb7ba..8f2ebbc5 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
@@ -30,8 +30,7 @@
     <animation direction="down">

       <frame index="0" delay="150" offsetY="-5" />

       <frame index="2" delay="75" offsetY="-10" />

-      <frame index="3" delay="75" offsetY="-5" />

-      <frame index="3" delay="75" offsetY="-5" />

+      <frame index="3" delay="150" offsetY="-5" />

     </animation>

     <animation direction="downleft">

       <frame index="18" delay="150" offsetY="-5" />

@@ -79,25 +78,31 @@
     <animation direction="down">

       <frame index="5" delay="150" offsetY="-5" />

       <frame index="4" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="downleft">

       <frame index="23" delay="150" offsetY="-5" />

       <frame index="22" delay="75" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="downright">

       <frame index="11" delay="150" offsetY="-5" />

       <frame index="10" delay="75" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="left">

       <frame index="29" delay="150" offsetY="-5" />

       <frame index="28" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="up">

-      <frame index="60" />

+      <frame index="30" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="17" delay="150" offsetY="-5" />

       <frame index="16" delay="75" offsetY="-5" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
index b78e8ade..e46975f6 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
@@ -30,8 +30,7 @@
     <animation direction="down">

       <frame index="0" delay="150" offsetY="-5" />

       <frame index="2" delay="75" offsetY="-10" />

-      <frame index="3" delay="75" offsetY="-5" />

-      <frame index="3" delay="75" offsetY="-5" />

+      <frame index="3" delay="150" offsetY="-5" />

     </animation>

     <animation direction="downleft">

       <frame index="18" delay="150" offsetY="-5" />

@@ -79,25 +78,31 @@
     <animation direction="down">

       <frame index="5" delay="150" offsetY="-5" />

       <frame index="4" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="downleft">

       <frame index="23" delay="150" offsetY="-5" />

       <frame index="22" delay="75" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="downright">

       <frame index="11" delay="150" offsetY="-5" />

       <frame index="10" delay="75" offsetY="-5" />

+      <end/>

     </animation>    

     <animation direction="left">

       <frame index="29" delay="150" offsetY="-5" />

       <frame index="28" delay="75" offsetY="-5" />

+      <end/>

     </animation>

     <animation direction="up">

-      <frame index="60" />

+      <frame index="30" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="17" delay="150" offsetY="-5" />

       <frame index="16" delay="75" offsetY="-5" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/mushroom-base1.xml b/graphics/sprites/monsters/accessories/mushroom-base1.xml
index 0c1b8e99..e6da5c4b 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1.xml
@@ -58,15 +58,19 @@
   <action name="attack" imageset="base">

     <animation direction="down">

       <frame index="4" />

+      <end/>

     </animation>

     <animation direction="left">

       <frame index="4" />

+      <end/>

     </animation>

     <animation direction="up">

       <frame index="4" />

+      <end/>

     </animation>

     <animation direction="right">

       <frame index="4" />

+      <end/>

     </animation>

   </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/nutcrackerhair.xml b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
index 06e403c8..d07bd9ca 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhair.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/hairstyles/hairstyle07.png|W" width="40" height="40"/>
-  <include file="hairstyles/hairstyle01.xml"/>
+  <include file="hairstyles/hairstyle01-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/nutcrackerhat.xml b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
index 94a55f5e..5979c83f 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhat.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
@@ -110,8 +110,8 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="4" offsetX="37" offsetY="-10"/>
+    <animation>
+      <frame index="3" offsetX="37" offsetY="-10"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/scythe-shadow.xml b/graphics/sprites/monsters/accessories/scythe-shadow.xml
index af986f62..dc14033b 100644
--- a/graphics/sprites/monsters/accessories/scythe-shadow.xml
+++ b/graphics/sprites/monsters/accessories/scythe-shadow.xml
@@ -22,6 +22,7 @@
   <action name="attack" imageset="base">
     <animation direction="default">
       <sequence start="0" end="7" delay="40" offsetY="35"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-bubble.xml b/graphics/sprites/monsters/accessories/slime-bubble.xml
index 50df3329..0754814c 100644
--- a/graphics/sprites/monsters/accessories/slime-bubble.xml
+++ b/graphics/sprites/monsters/accessories/slime-bubble.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0"?>

 <sprite>

-    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />

-    <action name="stand" imageset="base">

-        <animation>

-            <sequence start="0" end="2" offsetY="-7" delay="200"/>

-        </animation>

-    </action>

-    <action name="walk" imageset="base">

-        <animation>

-            <sequence start="0" end="2" offsetY="-7" delay="200"/>

-        </animation>

-    </action>

-    <action name="attack" imageset="base">

-        <animation>

-            <sequence start="0" end="2" offsetY="-7" delay="200"/>

-        </animation>

-    </action>

-    <action name="dead" imageset="base">

-        <animation>

-            <frame index="3" />

-        </animation>

-    </action>

+  <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />

+  <action name="stand" imageset="base">

+    <animation>

+      <sequence start="0" end="2" offsetY="-7" delay="200"/>

+    </animation>

+  </action>

+  <action name="walk" imageset="base">

+    <animation>

+      <sequence start="0" end="2" offsetY="-7" delay="200"/>

+    </animation>

+  </action>

+  <action name="attack" imageset="base">

+    <animation>

+      <sequence start="0" end="2" offsetY="-7" delay="200"/>

+      <end/>

+    </animation>

+  </action>

+  <action name="dead" imageset="base">

+    <animation>

+      <frame index="3" />

+      </animation>

+  </action>

 </sprite>

diff --git a/graphics/sprites/monsters/accessories/weapon-bow.xml b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
index 4959626c..43c16f31 100644
--- a/graphics/sprites/monsters/accessories/weapon-bow.xml
+++ b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
 <sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/weapon1.png" width="64" height="64"/>
+  <imageset name="bow" src="graphics/sprites/monsters/accessories/bow-slimecovered.png|B;R;W" width="64" height="64"/>
   <action name="default" imageset="bow"/>
   <action name="attack" imageset="bow">
     <animation direction="down">
diff --git a/graphics/sprites/monsters/accessories/weapon-dagger.xml b/graphics/sprites/monsters/accessories/weapon-dagger.xml
deleted file mode 100644
index 6426fc67..00000000
--- a/graphics/sprites/monsters/accessories/weapon-dagger.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="dagger" src="graphics/sprites/weapon0.png" width="64" height="64"/>
-  <action name="default" imageset="dagger"/>
-  <action name="attack" imageset="dagger">
-    <animation direction="down">
-      <sequence start="0" end="3" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="4" end="7" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="8" end="11" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="12" end="15" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml b/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
deleted file mode 100644
index a0c6d2f9..00000000
--- a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/weapon-slimecovered-forrestbow.png|W:#7e0000,ffffff" width="64" height="64"/>
-  <action name="default" imageset="bow"/>
-  <action name="attack" imageset="bow">
-    <animation direction="down">
-      <sequence start="0" end="4" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="5" end="9" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="10" end="14" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="15" end="19" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>