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

https://bugs.eressea.de/view.php?id=2164

Browse source 
ships no longer receive damage from drifting. eliminating the code for this, instead of just the configuration parameters, since all active games now agree on this rule.
This commit is contained in:
Enno Rehling 2015-11-23 18:41:11 +01:00
parent 1ed0eaf473
commit d45f16982d
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/move.c
View file

@ -690,15 +690,6 @@ static void set_coast(ship * sh, region * r, region * rnext)
}
}
static float damage_drift(void)
{
static float value = -1.0F;
if (value < 0) {
value = (float)get_param_flt(global.parameters, "rules.ship.damage_drift", 0.02F);
}
return value;
}
static void drifting_ships(region * r)
{
direction_t d;
@ -789,11 +780,6 @@ static void drifting_ships(region * r)
if (sh != NULL) {
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)
@ -1889,11 +1875,6 @@ sail(unit * u, order * ord, bool move_on_land, region_list ** routep)
ADDMSG(&f->msgs, msg_message("storm", "ship region sink",
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;
/* these values need to be updated if next_point changes (due to storms): */
tnext = next_point->terrain;