From d6c2a639d6a95fa4795451f621ce0b8d2e0749b6 Mon Sep 17 00:00:00 2001
From: Steffen Mecke <stm2@users.sf.net>
Date: Mon, 8 Aug 2022 16:05:29 +0200
Subject: [PATCH] orks should learn weapon skills with normal speed

---
 res/eressea/races.xml | 6 ++++++
 src/exparse.c         | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index e85f78e9d..48a6623ec 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -1193,6 +1193,12 @@ giveunit="yes" getitem="yes" recruitethereal="yes" equipment="yes">
     <skill name="cartmaking" modifier="-1"/>
     <skill name="taxation" modifier="1"/>
     <skill name="unarmed" modifier="-99"/>
+    <skill name="bow" speed="0"/>
+    <skill name="catapult" speed="0"/>
+    <skill name="crossbow" speed="0"/>
+    <skill name="melee" speed="0"/>
+    <skill name="polearm" speed="0"/>
+    <skill name="stamina" speed="0"/>
     <attack type="1" damage="1d5"/>
     <familiar race="goblin"/>
     <familiar race="ghost"/>
diff --git a/src/exparse.c b/src/exparse.c
index f787a78c3..c2c43ce9a 100644
--- a/src/exparse.c
+++ b/src/exparse.c
@@ -1070,7 +1070,8 @@ static void start_races(parseinfo *pi, const XML_Char *el, const XML_Char **attr
     else if (xml_strequal(el, "skill")) {
         const XML_Char *name = NULL;
         int i, speed = 0, mod = 0;
-
+        bool speed_is_set = false;
+        assert(rc);
         for (i = 0; attr[i]; i += 2) {
             const XML_Char *key = attr[i], *val = attr[i + 1];
             if (xml_strequal(key, "name")) {
@@ -1081,6 +1082,7 @@ static void start_races(parseinfo *pi, const XML_Char *el, const XML_Char **attr
             }
             else if (xml_strequal(key, "speed")) {
                 speed = xml_int(val);
+                speed_is_set = true;
             }
             else {
                 handle_bad_input(pi, el, key);
@@ -1090,7 +1092,7 @@ static void start_races(parseinfo *pi, const XML_Char *el, const XML_Char **attr
             skill_t sk = findskill(name);
             if (sk != NOSKILL) {
                 rc->bonus[sk] = (char)mod;
-                if (speed != 0) {
+                if (speed_is_set) {
                     set_study_speed(rc, sk, speed);
                 }
             }