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

http://eressea.upb.de/mantis/view.php?id=1314

Browse source
This commit is contained in:
Enno Rehling 2007-12-09 16:30:45 +00:00
parent 305942414c
commit 42356cd919
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/spells/spells.c
View file

@ -2271,10 +2271,6 @@ sp_stormwinds(castorder *co)
sh = pa->param[n]->data.sh; sh = pa->param[n]->data.sh;
if (sh->type->cargo>50000) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_flying_ship_too_big", "ship", sh))
continue;
}
/* mit C_SHIP_NODRIFT haben wir kein Problem */ /* mit C_SHIP_NODRIFT haben wir kein Problem */
if (is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) { if (is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_spell_on_flying_ship", "ship", sh)) ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_spell_on_flying_ship", "ship", sh))
@ -6335,7 +6331,12 @@ sp_flying_ship(castorder *co)
if (pa->param[0]->flag == TARGET_NOTFOUND) return 0; if (pa->param[0]->flag == TARGET_NOTFOUND) return 0;
sh = pa->param[0]->data.sh; sh = pa->param[0]->data.sh;
if (sh->type->construction->maxsize>50) { if (sh->type->construction->maxsize>50) {
/* TODO: error message */ ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "error_flying_ship_too_big", "ship", sh));
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; return 0;
} }