From 18305b7c040b54efd169d5887e169a7b7fe862ea Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Tue, 1 Jul 2014 13:50:19 -0500
Subject: Fixing numerous warnings and errors in manaplus closes #121 closes
 #108 closes #100 closes #93

---
 graphics/sprites/hairstyles/hairstyle01-female.xml |  26 ++++++++----------
 graphics/sprites/hairstyles/hairstyle01-male.xml   |  24 +++++++----------
 graphics/sprites/hairstyles/hairstyle13-female.xml |  29 +++++++++------------
 graphics/sprites/hairstyles/hairstyle13-male.xml   |  24 +++++++----------
 graphics/sprites/hairstyles/hairstyle14.png        | Bin 5214 -> 5195 bytes
 5 files changed, 43 insertions(+), 60 deletions(-)

(limited to 'graphics/sprites/hairstyles')

diff --git a/graphics/sprites/hairstyles/hairstyle01-female.xml b/graphics/sprites/hairstyles/hairstyle01-female.xml
index 14fc296e..8556ec36 100644
--- a/graphics/sprites/hairstyles/hairstyle01-female.xml
+++ b/graphics/sprites/hairstyles/hairstyle01-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="0" offsetX="0" offsetY="-28"/>
       <frame delay="150" index="0" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="1" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="1" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
       <frame delay="75" index="2" offsetX="-1" offsetY="-25"/>
       <frame delay="150" index="2" offsetX="-1" offsetY="-26"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="3" offsetX="0" offsetY="-29"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-28"/>
       <frame delay="75" index="3" offsetX="0" offsetY="-29"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-24" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="-2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="-2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="-2" offsetY="-30" delay="140"/>
       <frame index="0" offsetX="-2" offsetY="-24" delay="140"/>
       <end/>
@@ -206,30 +206,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-26" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-26" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-28" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="3" offsetY="-30" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
-      <frame index="1" offsetX="3" offsetY="-31" delay="140"/>
+      <frame index="1" offsetX="3" offsetY="-31" delay="280"/>
       <frame index="1" offsetX="-2" offsetY="-27" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-3" offsetY="-24" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-3" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-3" offsetY="-23" delay="280"/>
       <frame index="2" offsetX="-3" offsetY="-22" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="-3" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-31" delay="140"/>
+      <frame index="3" offsetX="-2" offsetY="-31" delay="280"/>
       <frame index="3" offsetX="3" offsetY="-27" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/hairstyles/hairstyle01-male.xml b/graphics/sprites/hairstyles/hairstyle01-male.xml
index 2ba68ce0..23613a95 100644
--- a/graphics/sprites/hairstyles/hairstyle01-male.xml
+++ b/graphics/sprites/hairstyles/hairstyle01-male.xml
@@ -21,6 +21,7 @@
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="0" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="0" offsetX="0" offsetY="-29" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="1" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="1" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="1" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
       <frame index="2" offsetX="-1" offsetY="-25" delay="75"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="3" offsetX="0" offsetY="-29" delay="150"/>
       <frame index="3" offsetX="0" offsetY="-28" delay="75"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-26" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-23" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-30" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-30" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-24" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-28" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-25" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-23" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-25" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-23" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/hairstyles/hairstyle13-female.xml b/graphics/sprites/hairstyles/hairstyle13-female.xml
index 44c09174..b1bd2b96 100644
--- a/graphics/sprites/hairstyles/hairstyle13-female.xml
+++ b/graphics/sprites/hairstyles/hairstyle13-female.xml
@@ -21,6 +21,7 @@
       <frame delay="150" index="1" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="0" offsetX="3" offsetY="-32"/>
       <frame delay="150" index="2" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame delay="75" index="3" offsetX="3" offsetY="-33"/>
@@ -28,12 +29,14 @@
       <frame delay="150" index="4" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="5" offsetX="3" offsetY="-32"/>
       <frame delay="75" index="5" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
       <frame delay="150" index="7" offsetX="3" offsetY="-34"/>
       <frame delay="75" index="6" offsetX="3" offsetY="-33"/>
       <frame delay="150" index="8" offsetX="3" offsetY="-34"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame delay="75" index="9" offsetX="3" offsetY="-33"/>
@@ -41,6 +44,7 @@
       <frame delay="150" index="10" offsetX="3" offsetY="-33"/>
       <frame delay="75" index="11" offsetX="3" offsetY="-32"/>
       <frame delay="75" index="11" offsetX="3" offsetY="-33"/>
+      <end/>
     </animation>
   </action>
   <action imageset="base" name="attack">
@@ -124,14 +128,12 @@
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="2" offsetY="-30" delay="140"/>
-      <frame index="3" offsetX="5" offsetY="-33" delay="140"/>
-      <frame index="3" offsetX="7" offsetY="-33" delay="140"/>
+      <frame index="3" offsetX="5" offsetY="-33" delay="280"/>
       <frame index="3" offsetX="0" offsetY="-29" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="6" offsetX="1" offsetY="-32" delay="280"/>
       <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
       <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
       <end/>
@@ -160,9 +162,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="300"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +176,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="0" offsetX="1" offsetY="-32" delay="140"/>
+      <frame index="0" offsetX="1" offsetY="-32" delay="280"/>
       <frame index="0" offsetX="1" offsetY="-33" delay="140"/>
       <frame index="0" offsetX="1" offsetY="-27" delay="140"/>
       <end/>
@@ -206,30 +205,26 @@
   </action>
   <action name="attack_chop" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="2" offsetY="-29" delay="140"/>
-      <frame index="0" offsetX="2" offsetY="-29" delay="140"/>
+      <frame index="0" offsetX="2" offsetY="-29" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-31" delay="140"/>
       <frame index="0" offsetX="2" offsetY="-25" delay="140"/>
       <end/>
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="6" offsetY="-34" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-35" delay="140"/>
-      <frame index="3" offsetX="6" offsetY="-35" delay="140"/>
+      <frame index="3" offsetX="6" offsetY="-35" delay="280"/>
       <frame index="3" offsetX="1" offsetY="-31" delay="140"/>
       <end/>
     </animation>
     <animation direction="up">
       <frame index="6" offsetX="1" offsetY="-32" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-31" delay="140"/>
-      <frame index="6" offsetX="1" offsetY="-31" delay="140"/>
+      <frame index="6" offsetX="1" offsetY="-31" delay="280"/>
       <frame index="6" offsetX="1" offsetY="-30" delay="140"/>
       <end/>
     </animation>
     <animation direction="right">
       <frame index="9" offsetX="0" offsetY="-34" delay="140"/>
-      <frame index="9" offsetX="1" offsetY="-35" delay="140"/>
-      <frame index="9" offsetX="1" offsetY="-35" delay="140"/>
+      <frame index="9" offsetX="1" offsetY="-35" delay="280"/>
       <frame index="9" offsetX="6" offsetY="-31" delay="140"/>
       <end/>
     </animation>
diff --git a/graphics/sprites/hairstyles/hairstyle13-male.xml b/graphics/sprites/hairstyles/hairstyle13-male.xml
index 1fd2a257..ae768a86 100644
--- a/graphics/sprites/hairstyles/hairstyle13-male.xml
+++ b/graphics/sprites/hairstyles/hairstyle13-male.xml
@@ -21,6 +21,7 @@
       <frame index="1" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="0" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="2" offsetX="3" offsetY="-33" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" offsetX="3" offsetY="-33" delay="75"/>
@@ -28,12 +29,14 @@
       <frame index="4" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="5" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="5" offsetX="3" offsetY="-33" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
       <frame index="7" offsetX="3" offsetY="-34" delay="150"/>
       <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
       <frame index="8" offsetX="3" offsetY="-34" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="9" offsetX="3" offsetY="-33" delay="75"/>
@@ -41,6 +44,7 @@
       <frame index="10" offsetX="3" offsetY="-33" delay="150"/>
       <frame index="11" offsetX="3" offsetY="-32" delay="75"/>
       <frame index="11" offsetX="3" offsetY="-33" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="attack" imageset="base">
@@ -130,8 +134,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="280"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
       <frame index="6" offsetX="3" offsetY="-34" delay="140"/>
       <end/>
@@ -160,9 +163,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="100"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="300"/>
       <frame index="6" offsetX="2" offsetY="-31" delay="100"/>
       <end/>
     </animation>
@@ -176,8 +177,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="0" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="0" offsetX="2" offsetY="-33" delay="280"/>
       <frame index="0" offsetX="2" offsetY="-34" delay="140"/>
       <frame index="0" offsetX="2" offsetY="-27" delay="140"/>
       <end/>
@@ -190,9 +190,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="420"/>
       <frame index="6" offsetX="1" offsetY="-36" delay="140"/>
       <end/>
     </animation>
@@ -220,10 +218,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-33" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
-      <frame index="6" offsetX="2" offsetY="-31" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-33" delay="280"/>
+      <frame index="6" offsetX="2" offsetY="-31" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
diff --git a/graphics/sprites/hairstyles/hairstyle14.png b/graphics/sprites/hairstyles/hairstyle14.png
index 4c916bb2..5df35798 100644
Binary files a/graphics/sprites/hairstyles/hairstyle14.png and b/graphics/sprites/hairstyles/hairstyle14.png differ
-- 
cgit v1.2.3-60-g2f50