persistente befehle nur noch mit @

src/common/kernel/save.c

@@ -610,12 +610,8 @@ is_persistent(const char *s, const struct locale *lang)
 	if(*s == '@') return true;
 #endif      /* Nur kurze Befehle! */
 	switch(igetkeyword(s, lang)) {
-		case K_BUY:
-		case K_SELL:
-		case K_CAST:
 		case K_KOMMENTAR:
 		case K_LIEFERE:
-		case K_RESERVE:
 			return true;
 			break;
 	}

src/eressea/korrektur.c

@@ -83,6 +83,44 @@
 
 extern void reorder_owners(struct region * r);
 
+static int
+convert_orders(void)
+{
+	region * r;
+	for (r=regions;r;r=r->next) {
+		unit * u;
+		for (u=r->units;u;u=u->next) {
+			strlist * o;
+			for (o=u->orders;o;o=o->next) {
+				int c = igetkeyword(o->s, u->faction->locale);
+				switch (c) {
+				case K_RESERVE:
+				case K_BUY:
+				case K_SELL:
+				case K_CAST:
+					sprintf(buf, "@%s", LOC(u->faction->locale, keywords[c]));
+					for (;;) {
+						const char * c = getstrtoken();
+						if (c && *c) {
+							if (strchr(c, ' ')) {
+								strcat(buf, " \"");
+								strcat(buf, c);
+								strcat(buf, "\"");
+							} else {
+								strcat(buf, " ");
+								strcat(buf, c);
+							}
+						} else break;
+					}
+					set_string(&o->s, buf);
+					break;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
 static void
 verify_owners(boolean bOnce)
 {
@@ -2828,6 +2866,7 @@ korrektur(void)
 	update_gmquests(); /* test gm quests */
 	/* fix_unitrefs(); */
 	stats();
+	do_once("pers", convert_orders());
 	do_once("sql2", dump_sql());
 	do_once("fw02", fix_watchers());
 	do_once("fxh3", fix_plainherbs());