Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 2631: Kein Konvoi mit Sonnensegel.

This commit is contained in:
Enno Rehling 2020-01-13 22:24:48 +01:00
parent 06f00cae53
commit e02c1e9d00
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/give.c
View File

@ -12,6 +12,7 @@
/* attributes includes */ /* attributes includes */
#include <attributes/racename.h> #include <attributes/racename.h>
#include <attributes/movement.h>
/* kernel includes */ /* kernel includes */
#include <kernel/attrib.h> #include <kernel/attrib.h>
@ -318,7 +319,7 @@ static void transfer_units(ship *s1, ship *s2)
} }
static bool ship_cursed(const ship *sh) { 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) message * give_ship(unit *u1, unit *u2, int n, order *ord)

2
src/items/speedsail.c
View File

@ -31,7 +31,7 @@ struct order *ord)
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_realworld_only", "")); ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "use_realworld_only", ""));
} }
else { else {
if (u->ship) { if (u->ship && u->ship->number == 1) {
attrib *a = a_find(u->ship->attribs, &at_speedup); attrib *a = a_find(u->ship->attribs, &at_speedup);
if (a == NULL) { if (a == NULL) {
a = a_add(&u->ship->attribs, a_new(&at_speedup)); a = a_add(&u->ship->attribs, a_new(&at_speedup));