diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c
index ab17af82a..ce28dcf85 100644
--- a/src/common/gamecode/monster.c
+++ b/src/common/gamecode/monster.c
@@ -1096,8 +1096,10 @@ spawn_dragons(void)
set_level(u, SK_OBSERVATION, 1+rng_int()%3);
set_level(u, SK_STEALTH, 1);
set_level(u, SK_AUSDAUER, 1);
- log_printf("%d %s in %s.\n", u->number,
- LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
+ if (!quiet) {
+ log_printf("%d %s in %s.\n", u->number,
+ LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
+ }
name_unit(u);
@@ -1170,8 +1172,10 @@ spawn_undead(void)
deathcounts(r, -undead);
name_unit(u);
- log_printf("%d %s in %s.\n", u->number,
- LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
+ if (!quiet) {
+ log_printf("%d %s in %s.\n", u->number,
+ LOC(default_locale, rc_name(u->race, u->number!=1)), regionname(r, NULL));
+ }
{
message * msg = msg_message("undeadrise", "region", r);
diff --git a/src/common/spells/shipcurse.c b/src/common/spells/shipcurse.c
index cdc985260..f5a1276e4 100644
--- a/src/common/spells/shipcurse.c
+++ b/src/common/spells/shipcurse.c
@@ -58,22 +58,15 @@ cinfo_ship(const void * obj, typ_t typ, const curse *c, int self)
static message *
cinfo_shipnodrift(const void * obj, typ_t typ, const curse *c, int self)
{
- ship * sh;
+ ship * sh = (ship *)obj;
+
unused(typ);
-
assert(typ == TYP_SHIP);
- sh = (ship*)obj;
- if (self != 0){
- sprintf(buf, "%s ist mit guten Wind gesegnet", sh->name);
- if (c->duration <= 2){
- scat(", doch der Zauber beginnt sich bereits aufzulösen");
- }
- scat(".");
- } else {
- sprintf(buf, "Ein silberner Schimmer umgibt das Schiff");
+ if (self != 0) {
+ return msg_message("curseinfo::shipnodrift_1", "ship duration id", sh, c->duration, c->no);
}
- return msg_message("curseinfo::info_str", "text id", buf, c->no);
+ return msg_message("curseinfo::shipnodrift_0", "ship duration id", sh, c->duration, c->no);
}
static struct curse_type ct_stormwind = { "stormwind",
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 4ef60eea6..99a8e7699 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -5849,16 +5849,12 @@ sp_pullastral(castorder *co)
if (u->region!=r) {
/* Report this as unit not found */
- char * uid;
-
- if (spobj->typ==SPP_UNIT) {
- uid = strdup(itoa36(spobj->data.i));
+ if (spobj->typ == SPP_UNIT) {
+ spobj->data.i = u->no;
} else {
- char tbuf[20];
- sprintf(tbuf, "%s %s", LOC(mage->faction->locale,
- parameters[P_TEMP]), itoa36(spobj->data.i));
- uid = strdup(tbuf);
+ spobj->data.i = ualias(u);
}
+ spobj->flag = TARGET_NOTFOUND;
ADDMSG(&mage->faction->msgs, msg_unitnotfound(mage, co->order, spobj));
return false;
}
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 5b9794039..4744b0a34 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -6879,6 +6879,25 @@
"$unit($unit) in $region($region): $int($amount) $resource($item,$amount) turn to dust."
+
+
+
+
+
+
+ "Die $ship($ship) ist mit gutem Wind gesegnet$if($lt($duration,3),", doch der Zauber beginnt sich bereits aufzulösen",""). ($int36($id))"
+ "The $ship($ship) is blessed with favourable winds$if($lt($duration,3),", but the spell is starting to wear thin",""). ($int36($id))"
+
+
+
+
+
+
+
+ "Ein silberner Schimmer umgibt die $ship($ship). ($int36($id))"
+ "A silvery shimmer surrounds the $ship($ship). ($int36($id))"
+
+