UTF-8 orders

http://eressea.upb.de/mantis/view.php?id=1315
BOTSCHAFT funktioniert nicht

http://eressea.upb.de/mantis/view.php?id=1314
Schiffsbeschleunigung mit Sturmelementar schlägt fehl

umlauts in summary

src/common/gamecode/laws.c

@@ -1736,9 +1736,8 @@ mail_cmd(unit * u, struct order * ord)
         break;
       } else {
         ADDMSG(&r->msgs, msg_message("mail_result", "unit message", u, s));
-        break;
+        return 0;
       }
-      break;
 
     case P_FACTION:
       {
@@ -1764,8 +1763,8 @@ mail_cmd(unit * u, struct order * ord)
           break;
         }
         mailfaction(u, n, ord, s);
+        return 0;
       }
-      break;
 
     case P_UNIT:
       {
@@ -1781,7 +1780,7 @@ mail_cmd(unit * u, struct order * ord)
 
         if (see == false) {
           ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "feedback_unit_not_found", ""));
-          break;
+          return 0;
         }
 
         s = getstrtoken();
@@ -1802,8 +1801,8 @@ mail_cmd(unit * u, struct order * ord)
 
           mailunit(r, u, n, ord, s);
         }
+        return 0;
       }
-      break;
 
     case P_BUILDING:
     case P_GEBAEUDE:
@@ -1831,8 +1830,8 @@ mail_cmd(unit * u, struct order * ord)
               fset(u2->faction, FFL_SELECT);
             }
         }
+        return 0;
       }
-      break;
 
     case P_SHIP:
       {
@@ -1853,14 +1852,13 @@ mail_cmd(unit * u, struct order * ord)
         for (u2 = r->units; u2; u2 = u2->next) freset(u2->faction, FFL_SELECT);
 
         for(u2=r->units; u2; u2=u2->next) {
-          if(u2->ship == sh && !fval(u2->faction, FFL_SELECT)
-            && cansee(u->faction, r, u2, 0)) {
-              mailunit(r, u, u2->no, ord, s);
-              fset(u2->faction, FFL_SELECT);
-            }
+          if(u2->ship == sh && !fval(u2->faction, FFL_SELECT) && cansee(u->faction, r, u2, 0)) {
+            mailunit(r, u, u2->no, ord, s);
+            fset(u2->faction, FFL_SELECT);
+          }
         }
+        return 0;
       }
-      break;
 
     default:
       /* possibly filler token? */

src/common/gamecode/summary.c

@@ -181,7 +181,7 @@ report_summary(summary * s, summary * o, boolean full)
     const race * rc = new_race[i];
     if (s->factionrace[i] && rc && playerrace(rc)
       && i != RC_TEMPLATE && i != RC_CLONE) {
-        fprintf(F, "%14svölker: %s\n", LOC(default_locale, rc_name(rc, 3)),
+        fprintf(F, "%13svoelker: %s\n", LOC(default_locale, rc_name(rc, 3)),
           pcomp(s->factionrace[i], o->factionrace[i]));
     }
   }
@@ -224,13 +224,13 @@ report_summary(summary * s, summary * o, boolean full)
 
   if (full) {
     fprintf(F, "\nWaffen:               %s\n", pcomp(s->waffen,o->waffen));
-    fprintf(F, "Rüstungen:            %s\n",
+    fprintf(F, "Ruestungen:           %s\n",
       pcomp(s->ruestungen,o->ruestungen));
-    fprintf(F, "ungezähmte Pferde:    %s\n", pcomp(s->pferde, o->pferde));
-    fprintf(F, "gezähmte Pferde:      %s\n",
+    fprintf(F, "ungezaehmte Pferde:   %s\n", pcomp(s->pferde, o->pferde));
+    fprintf(F, "gezaehmte Pferde:     %s\n",
       pcomp(s->spielerpferde,o->spielerpferde));
     fprintf(F, "Schiffe:              %s\n", pcomp(s->schiffe, o->schiffe));
-    fprintf(F, "Gebäude:              %s\n", pcomp(s->gebaeude, o->gebaeude));
+    fprintf(F, "Gebaeude:             %s\n", pcomp(s->gebaeude, o->gebaeude));
 
     fprintf(F, "\nBauernpopulation:     %s\n", pcomp(s->peasants,o->peasants));
 

src/common/kernel/magic.c

@@ -1337,7 +1337,7 @@ do_fumble(castorder *co)
     /* temporärer Stufenverlust */
     duration = max(rng_int()%level/2, 2);
     effect.i = -(level/2);
-    c = create_curse(u, &u->attribs, ct_find("skil"), level, duration,
+    c = create_curse(u, &u->attribs, ct_find("skill"), level, duration,
       effect, 1);
     c->data.i = SK_MAGIC;
     ADDMSG(&u->faction->msgs, msg_message("patzer2", "unit region", u, r));

src/common/spells/spells.c

@@ -6335,11 +6335,6 @@ sp_flying_ship(castorder *co)
     return 0;
   }
 
-  if (sh->type->cargo>50000) {
-    ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_flying_ship_too_big", "ship", sh));
-    return 0;
-  }
-
   /* Duration = 1, nur diese Runde */
   c = shipcurse_flyingship(sh, mage, power, 1);
   if (c==NULL) {