[Freeciv-Dev] [PATCH] Corecleanup_07Part2 has been put in incoming

["Ross W. Wetmore" <rwetmore@xxxxxxxxxxxx>]

Attached is the ReadMe for second Part of the corecleanup_07 update to 
cvs-Aug-25. 

Note, this is a request for inclusion of these changes into CVS, as opposed 
to just a RFC.

The tar gzip file has been put on ftp.freeciv.org in incoming and contains 
all the bite-sized subsets. Note, the size of 07f is misleading, most of it
is just moving code, or repetitive standardizing changes.
 
Cheers,
RossW
=====

This is the second part of (probably 4) corecleanup_07 updates.

This includes "controversial" changes, which generally means enhancements
rather than bugfixes, to the original product. None of these changes
yet incorporate or address the DIR_DX2 or MAP_WRAP issues/changes.

corecleanup_07f is an overhaul of map.c and map.h. 

In map.c, most of the map_get/set_<ters> are moved to the end of the file 
and rewritten to a consistent form which includes extensive asserts to 
trap non-real tile access. This will "destabilize" development builds, 
though most of the problem areas have been uncovered and fixed by 
corecleanup changes to date. In addition there are comment insertions and 
updates to areas like move costs to get rid of magic numbers. 

map.h is also rearranged by moving blocks of macro code to the end of the
file in an order that will make follow-on changes more localized. Some of 
the commentary to explain map macro/functions is added. 

map_wrap_* and map_trunc_* macros are also introduced as the start of 
unconfusing the overloaded nature of map_adjust_*. In many cases explicit 
wrap or truncate behaviour is being done by map_adjust.

The "cosmetic" nature of some of these changes improves the current 
documentation of problem areas and readability so there is immediate as 
opposed to long term justification as well. 

corecleanup_07g contains the changes to other files that use 07f.

corecleanup_07h is a similar overhaul of the city.c/city.h routines
to standardize the city_map_iterate macros. There are similar routine
upgrades and minor code improvements as well.

corecleanup_07i contains the changes to other files that use 07h and
any leftovers missed from earlier corecleanups.


The following patches were produced as follows:

1)  Corecleanup changes were merged into corecleanup.Part1 source.
2)  After the merge, each source was updated with any minor changes. 
3)  The result was built and autogame tested.
4)  Patches were made by diffing against the corecleanup_07Part1 source.
5)  These final patches were tested by applying them in sequence to an
    with build and sanity test run at each step.

-rw-r--r--  1 rww  users   4566 Aug 26 14:55 corecleanup_07-2.ReadMe
-rw-r--r--  1 rww  users  58374 Aug 26 14:23 corecleanup_07f
-rw-r--r--  1 rww  users   2770 Aug 26 14:20 corecleanup_07g
-rw-r--r--  1 rww  users  11039 Aug 26 14:20 corecleanup_07h
-rw-r--r--  1 rww  users  12246 Aug 26 14:21 corecleanup_07i

wc output:
    144     590    4566 corecleanup_07-2.ReadMe
   1545    6597   58374 corecleanup_07f
     62     236    2770 corecleanup_07g
    299    1572   11039 corecleanup_07h
    337    1529   12246 corecleanup_07i


Cheers,
RossW
=====


Subject:  [Patch4cvs] Corecleanup_07f patch
Date:     Aug 27, 2001
Author:   Ross Wetmore
Status:   Tested
State:    Submission for CVS

Description
  This patch contains an extensive overhaul of map.c and map.h, though
functionally it has minimal impact to execution apart from DEBUG 
asserts added to map_get/set_<ters>.

Dependencies
  corecleanup_07.Part1

Files Changed:
corecleanup_07f: freeciv/common/map.c
corecleanup_07f: freeciv/common/map.h
=====


Subject:  [Patch4cvs] Corecleanup_07g patch
Date:     Aug 27, 2001
Author:   Ross Wetmore
Status:   Tested
State:    Submission for CVS

Description
  This patch contains routines which use the previous map.c/map.h
changes.

Dependencies
  corecleanup_07f

Files Changed:
corecleanup_07g: freeciv/client/gui-gtk/mapview.c
corecleanup_07g: freeciv/client/gui-mui/mapclass.c
corecleanup_07g: freeciv/client/gui-xaw/mapview.c
=====


Subject:  [Patch4cvs] Corecleanup_07h patch
Date:     Aug 27, 2001
Author:   Ross Wetmore
Status:   Tested
State:    Submission for CVS

Description
  This patch contains an extensive overhaul of city.c and city.h for
city_map macros and consolidates the various flavours into a core and
interface set.

Dependencies
  corecleanup_07g

Files Changed:
corecleanup_07h: freeciv/common/city.c
corecleanup_07h: freeciv/common/city.h
=====


Subject:  [Patch4cvs] Corecleanup_07i patch
Date:     Aug 27, 2001
Author:   Ross Wetmore
Status:   Tested
State:    Submission for CVS

Description
  This patch contains routines which use the previous city.c/city.h
changes, plus leftovers missed in earlier patches.

Dependencies
  corecleanup_07h

Files Changed:
corecleanup_07i: freeciv/ai/aicity.c
corecleanup_07i: freeciv/client/control.c
corecleanup_07i: freeciv/server/citytools.c
corecleanup_07i: freeciv/server/settlers.c
corecleanup_07i: freeciv/server/unittools.c
=====