From ff94ab60316390e1863feae411adad765ae3fb98 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Sun, 1 May 2011 01:31:03 +0200
Subject: Changed the server to look for the skills.xml file.

This, instead of the mana-skills.xml file, to follow latest
client changes.
---
 example/clientdata/mana-skills.xml | 22 ----------------------
 example/clientdata/skills.xml      | 22 ++++++++++++++++++++++
 src/game-server/main-game.cpp      |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 example/clientdata/mana-skills.xml
 create mode 100644 example/clientdata/skills.xml

diff --git a/example/clientdata/mana-skills.xml b/example/clientdata/mana-skills.xml
deleted file mode 100644
index ace8b44..0000000
--- a/example/clientdata/mana-skills.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<skills>
-    <set name="Weapons">
-        <skill id="100" name="Unarmed" icon="graphics/skills/unarmed.png" />
-        <skill id="101" name="Knife" icon="graphics/skills/knife.png" />
-        <skill id="102" name="Sword" icon="graphics/skills/sword.png" />
-        <skill id="103" name="Polearm" icon="graphics/skills/polearm.png" />
-        <skill id="104" name="Staff" icon="graphics/skills/staff.png" />
-        <skill id="105" name="Whip" icon="graphics/skills/whip.png" />
-        <skill id="106" name="Bow" icon="graphics/skills/bow.png" />
-        <skill id="107" name="Shooting" icon="graphics/skills/shooting.png" />
-        <skill id="108" name="Mace" icon="graphics/skills/mace.png" />
-        <skill id="109" name="Axe" icon="graphics/skills/axe.png" />
-        <skill id="110" name="Thrown" icon="graphics/skills/thrown.png" />
-    </set>
-    <set name="Magic">
-        <skill id="200" name="Magic Example" />
-    </set>
-    <set name="Crafts">
-        <skill id="300" name="Craft Example" />
-    </set>
-</skills>
diff --git a/example/clientdata/skills.xml b/example/clientdata/skills.xml
new file mode 100644
index 0000000..ace8b44
--- /dev/null
+++ b/example/clientdata/skills.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<skills>
+    <set name="Weapons">
+        <skill id="100" name="Unarmed" icon="graphics/skills/unarmed.png" />
+        <skill id="101" name="Knife" icon="graphics/skills/knife.png" />
+        <skill id="102" name="Sword" icon="graphics/skills/sword.png" />
+        <skill id="103" name="Polearm" icon="graphics/skills/polearm.png" />
+        <skill id="104" name="Staff" icon="graphics/skills/staff.png" />
+        <skill id="105" name="Whip" icon="graphics/skills/whip.png" />
+        <skill id="106" name="Bow" icon="graphics/skills/bow.png" />
+        <skill id="107" name="Shooting" icon="graphics/skills/shooting.png" />
+        <skill id="108" name="Mace" icon="graphics/skills/mace.png" />
+        <skill id="109" name="Axe" icon="graphics/skills/axe.png" />
+        <skill id="110" name="Thrown" icon="graphics/skills/thrown.png" />
+    </set>
+    <set name="Magic">
+        <skill id="200" name="Magic Example" />
+    </set>
+    <set name="Crafts">
+        <skill id="300" name="Craft Example" />
+    </set>
+</skills>
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 63ea004..95590f5 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -66,7 +66,7 @@ using utils::Logger;
 #define DEFAULT_CONFIG_FILE                 "manaserv.xml"
 #define DEFAULT_ITEMSDB_FILE                "items.xml"
 #define DEFAULT_EQUIPDB_FILE                "equip.xml"
-#define DEFAULT_SKILLSDB_FILE               "mana-skills.xml"
+#define DEFAULT_SKILLSDB_FILE               "skills.xml"
 #define DEFAULT_ATTRIBUTEDB_FILE            "attributes.xml"
 #define DEFAULT_MAPSDB_FILE                 "maps.xml"
 #define DEFAULT_MONSTERSDB_FILE             "monsters.xml"
-- 
cgit