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

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

Angriffe von Schiffen aus nur verbieten, wenn die Region bewacht wird.
This commit is contained in:
Enno Rehling 2005-06-24 19:27:35 +00:00
parent 050092015e
commit ab4eaabc09
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/kernel/battle.c
View File

@ -3598,17 +3598,19 @@ init_battle(region * r, battle **bp)
continue; continue;
} }
/* Fehler: "Das Schiff muß erst verlassen werden" */
if (u->ship != NULL && rterrain(r) != T_OCEAN) {
cmistake(u, ord, 19, MSG_BATTLE);
continue;
}
if (leftship(u)) { if (is_guarded(r, u, GUARD_TRAVELTHRU)) {
cmistake(u, ord, 234, MSG_BATTLE); /* Fehler: "Das Schiff muß erst verlassen werden" */
continue; if (u->ship != NULL && rterrain(r) != T_OCEAN) {
} cmistake(u, ord, 19, MSG_BATTLE);
continue;
}
if (leftship(u)) {
cmistake(u, ord, 234, MSG_BATTLE);
continue;
}
}
/* Ende Fehlerbehandlung Angreifer */ /* Ende Fehlerbehandlung Angreifer */