unused variable, merge bug

This commit is contained in:
Enno Rehling 2017-12-09 09:40:17 +01:00
parent 0c1562c14f
commit d740380152

View file

@ -1751,7 +1751,6 @@ static void sail(unit * u, order * ord, region_list ** routep, bool drifting)
* befahrene Region. */ * befahrene Region. */
while (next_point && current_point != next_point && step < k) { while (next_point && current_point != next_point && step < k) {
int reason;
const terrain_type *tthis = current_point->terrain; const terrain_type *tthis = current_point->terrain;
/* 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): */
const terrain_type *tnext = next_point->terrain; const terrain_type *tnext = next_point->terrain;