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

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2015-11-23 20:35:51 +01:00
parent 410fab2d84 2a9dee4134
commit a1b6befa7d
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/move.c
View File

@ -698,11 +698,6 @@ static void set_coast(ship * sh, region * r, region * rnext)
} }
} }
static float damage_drift(void)
{
return (float)config_get_flt("rules.ship.damage_drift", 0.02);
}
static void drifting_ships(region * r) static void drifting_ships(region * r)
{ {
direction_t d; direction_t d;
@ -793,11 +788,6 @@ static void drifting_ships(region * r)
if (sh != NULL) { if (sh != NULL) {
fset(sh, SF_DRIFTED); fset(sh, SF_DRIFTED);
damage_ship(sh, damage_drift());
if (sh->damage >= sh->size * DAMAGE_SCALE) {
remove_ship(&sh->region->ships, sh);
}
} }
if (*shp == sh) if (*shp == sh)
@ -1834,11 +1824,6 @@ sail(unit * u, order * ord, bool move_on_land, region_list ** routep)
ADDMSG(&f->msgs, msg_message("storm", "ship region sink", ADDMSG(&f->msgs, msg_message("storm", "ship region sink",
sh, current_point, sh->damage >= sh->size * DAMAGE_SCALE)); sh, current_point, sh->damage >= sh->size * DAMAGE_SCALE));
/* damage the ship. we handle destruction in the end */
damage_ship(sh, damage_drift());
if (sh->damage >= sh->size * DAMAGE_SCALE)
break;
next_point = rnext; next_point = rnext;
/* these values need to be updated if next_point changes (due to storms): */ /* these values need to be updated if next_point changes (due to storms): */
tnext = next_point->terrain; tnext = next_point->terrain;