[Freeciv-Dev] Re: [PATCH] map_adjust_* patch
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Raimar Falke wrote:
> On Fri, Aug 31, 2001 at 02:13:02AM -0400, Jason Dorje Short wrote:
> > Again in the spirit of small, focused patches:
> > This patch replaces a number of uses of map_adjust_x/map_adjust_y with
> > the corresponding normalize_map_pos/is_real_tile call. For the most
> > part it only covers the simple ones; there are some replacements that
> > will be much more tricky (and some that will be impossible). I've also
> > tried to stay away from the instances that should be replaced by a
> > different macro, for instance the adjc_iterate loops. This is only a
> > fraction of the total uses of map_adjust_*.
> > It applies to current CVS. It ran a collection of automated games
> > yesterday without trouble. Each instance of replacement (or, at a
> > minimum, each file) should be independent and can be applied separately
> > if there's any doubt. (In fact, rather than wait while we argue about
> > specific instances these instances might as well just be skipped. There
> > are plenty of other map_adjust_* instances for them to be lumped in with
> > later.)
> > + /* FIXME: this check will not work with an orthogonal map */
> > + cardinal_move = (x1 == x2) || (y1 == y2);
> Can you make make a is_cardinal_step please.
Makes sense, but it wouldn't fit into this patch. Just skip that one
and we can fix it later.
> What about this as a next step?
> $ grep -Ir "<.*0.*.>*.*map.*ysize" .