Merge pull request #188 from badgerman/develop

fixes to Solthar's commit

res/core/de/strings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <strings>
   <!--
-    _d: dativ (wir erklären allen /Trollen/ den Krieg)
-    _p: plural (13 /Trolle/)
-    _x: preposition (15 /Troll/schwerter)
-    _a: including article (ein Troll, a troll)
+    _d: dativ (wir erklären allen /Schlümpfen/ den Krieg)
+    _p: plural (13 /Schlümpfe/)
+    _x: preposition (15 /Schlumpf/schwerter)
+    _a: including article (ein Schlumpf, a smurf)
    -->
   <string name="vortex">
     <text locale="de">Wirbel</text>

s/setup

@@ -91,6 +91,7 @@ ini_add lua install $SOURCE
 ini_add lua paths $SOURCE/scripts:$SOURCE/lunit
 ini_add lua rules $rules
 
+echo 0 > turn
 touch newfactions
 ln -sf $SOURCE/bin/eressea
 ln -sf $SOURCE/scripts/run-turn.lua

src/kernel/curse.c

@@ -255,6 +255,9 @@ void curse_write(const attrib * a, const void *owner, struct storage *store)
     if (global.data_version < EXPLICIT_CURSE_ISNEW_VERSION) {
         flags = (c->flags & ~CURSE_ISNEW) | (c->type->flags & CURSE_ISNEW);
     }
+    else {
+        flags = c->flags | c->type->flags;
+    }
 
     WRITE_INT(store, c->no);
     WRITE_TOK(store, ct->cname);
@@ -322,7 +325,7 @@ const curse_type *ct_find(const char *c)
     return NULL;
 }
 
-void ct_checknames() {
+void ct_checknames(void) {
     int i, qi;
     quicklist *ctl;
 

src/kernel/unit.c

@@ -1282,7 +1282,7 @@ static int update_gbdream(const unit * u, int bonus, curse *c, const curse_type
         if (sign * effect > sign * bonus) {
             if (mage == NULL || mage->number == 0
                 || sign>0?alliedunit(mage, u->faction, HELP_GUARD):!alliedunit(mage, u->faction, HELP_GUARD)) {
-                bonus = effect;
+                bonus = (int)effect;
             }
         }
     }
@@ -1322,7 +1322,7 @@ int att_modification(const unit * u, skill_t sk)
      * jeweils erste vom Typ C_GBDREAM zurueckgegen wird, wir aber alle
      * durchsuchen und aufaddieren muessen */
     if (u->region) {
-        double bonus = 0, malus = 0;
+        int bonus = 0, malus = 0;
         attrib *a = a_find(u->region->attribs, &at_curse);
         while (a && a->type == &at_curse) {
             curse *c = (curse *)a->data.v;

src/spells.c

@@ -4697,7 +4697,7 @@ static int sp_gbdreams(castorder * co, const char *curse_name, int effect)
     duration = 2 + rng_int() % duration;
 
     /* Nichts machen als ein entsprechendes Attribut in die Region legen. */
-    c = create_curse(mage, &r->attribs, ct_find(curse_name), power, duration, effect, 0);
+    c = create_curse(mage, &r->attribs, ct_find(curse_name), power, duration, (float)effect, 0);
 
     /* Erfolg melden */
     ADDMSG(&mage->faction->msgs, msg_message("regionmagic_effect",