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

delete unused define and code for insects.

This commit is contained in:
Enno Rehling 2017-12-17 14:33:18 +01:00
parent ed75f4d21a
commit 404691c5db
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/move.c
View File

@ -1837,10 +1837,7 @@ static void sail(unit * u, order * ord, region_list ** routep, bool drifting)
reason = check_ship_allowed(sh, next_point); reason = check_ship_allowed(sh, next_point);
if (reason < 0) { if (reason < 0) {
/* for some reason or another, we aren't allowed in there.. */ /* for some reason or another, we aren't allowed in there.. */
if (reason == SA_NO_INSECT) { if (check_leuchtturm(current_point, NULL)) {
ADDMSG(&f->msgs, msg_message("detectforbidden", "unit region", u, sh->region));
}
else if (check_leuchtturm(current_point, NULL)) {
ADDMSG(&f->msgs, msg_message("sailnolandingstorm", "ship region", sh, next_point)); ADDMSG(&f->msgs, msg_message("sailnolandingstorm", "ship region", sh, next_point));
} }
else { else {

3
src/move.h
View File

@ -90,8 +90,7 @@ extern "C" {
#define SA_HARBOUR 1 #define SA_HARBOUR 1
#define SA_COAST 0 #define SA_COAST 0
#define SA_NO_INSECT -1 #define SA_NO_COAST -1
#define SA_NO_COAST -2
int check_ship_allowed(struct ship *sh, const struct region * r); int check_ship_allowed(struct ship *sh, const struct region * r);
direction_t drift_target(struct ship *sh); direction_t drift_target(struct ship *sh);