forked from github/server
Bug 2631: Kein Konvoi mit Sonnensegel.
This commit is contained in:
parent
06f00cae53
commit
e02c1e9d00
|
@ -12,6 +12,7 @@
|
|||
|
||||
/* attributes includes */
|
||||
#include <attributes/racename.h>
|
||||
#include <attributes/movement.h>
|
||||
|
||||
/* kernel includes */
|
||||
#include <kernel/attrib.h>
|
||||
|
@ -318,7 +319,7 @@ static void transfer_units(ship *s1, ship *s2)
|
|||
}
|
||||
|
||||
static bool ship_cursed(const ship *sh) {
|
||||
return a_find(sh->attribs, &at_curse) != NULL;
|
||||
return a_find(sh->attribs, &at_curse) != NULL || a_find(sh->attribs, &at_speedup) != NULL;
|
||||
}
|
||||
|
||||
message * give_ship(unit *u1, unit *u2, int n, order *ord)
|
||||
|
|
|
@ -31,7 +31,7 @@ struct order *ord)
|
|||
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_realworld_only", ""));
|
||||
}
|
||||
else {
|
||||
if (u->ship) {
|
||||
if (u->ship && u->ship->number == 1) {
|
||||
attrib *a = a_find(u->ship->attribs, &at_speedup);
|
||||
if (a == NULL) {
|
||||
a = a_add(&u->ship->attribs, a_new(&at_speedup));
|
||||
|
|
Loading…
Reference in New Issue