[Freeciv-Dev] [PATCH] Corecleanup_06 has been put in incoming
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
I have dropped a consistent set of patches to the Aug-15 CVS snapshot into
the incoming directory along with a ReadMe attached below.
Please consider the AutoGame patch (independent of the rest) as a
submission for CVS update.
The corecleanup6a should also be applied to CVS to fix a number of
outstanding fault consitions in the current code base. The collection of
updates are largely independent applications of standardizing code
techniques across a wide range of routines. This patch however depend on
Jason's Aug-15 update (included for completeness) and should be applied
after his.
The remaining patches update the corecleanup source tree to Aug-15, and
should probably be used for parallel development until there is concensus
that this needs to be in the mainline CVS source.
Cheers,
RossW
=====
corecleanup_06.ReadMe:
The following patches were produced as follows:
1) Changes to CVS Aug-15 were merged to rev the corecleanup source.
2) The result ran autogames for 48 hours on at 7-8 games/hr w/o fail.
3) Jason's patch to CVS Aug-15 was merged and tested.
4) A diff was made against Aug-15-JS, and the master diff file split
into a number of smaller patches.
5) The patches were applied in order to a fresh Aug-15-CVS.
6) After the patch, each source was updated with any minor changes,
rebuilt from scratch, and a sanity autogame run to verify integrity.
This source tree was then diffed against the previous version to
produce the final patch included below.
7) The final patches were tested by applying them in sequence to an
Aug-15 snapshot, with build and sanity test run at each step.
-rw-r--r-- 1 rww users 3536 Aug 19 04:39 corecleanup_06.ReadMe
-r--r--r-- 1 rww users 1602 Aug 18 21:26 corecleanup_06autogame
-r--r--r-- 1 rww users 4578 Aug 19 01:05 corecleanup_06_JS.txt
-r--r--r-- 1 rww users 15867 Aug 18 11:41 corecleanup_06_JS
-r--r--r-- 1 rww users 75684 Aug 19 01:39 corecleanup_06a
-r--r--r-- 1 rww users 36777 Aug 19 03:53 corecleanup_06b
-r--r--r-- 1 rww users 82756 Aug 19 00:40 corecleanup_06c
-rw-r--r-- 1 rww wheel 9339 Aug 19 13:30 corecleanup_06civworld
-r--r--r-- 1 rww users 135924 Aug 19 00:40 corecleanup_06mapgen
-r--r--r-- 1 rww users 1426 Aug 18 21:30 corecleanup_06rivers
They should be applied in order to an AUg-15 CVS snapshot. The txt
file is included to show changes made in reformatting Jason's patch.
Cheers,
RossW
=====
Subject: [Patch4cvs] Autogame patch
Date: Aug 18, 2001
Author: Ross Wetmore
Status: Tested
State: Submitted to CVS
Description
This adds changes to allow autogames to run at full speed, make a final
auto savegame and exits when done. The GAME_MIN_TIMEOUT value is adjusted
in DEBUG mode to allow setting a value of -1 to trigger autogame mode.
Dependencies
none
Files Changed:
corecleanup_06autogame: freeciv/common/game.h
corecleanup_06autogame: freeciv/server/sernet.c
corecleanup_06autogame: freeciv/server/srv_main.c
=====
Subject: [Patch4cvs] Corecleanup_06_JS (Jason's DIR_REVERSE cleanup patch)
Date: Aug 18, 2001
Author: Jason Dorje Short
Status: Tested
State: Required component (must be applied as part of 6a if not in CVS)
Description
This adds basic DIR_DX and DIR_REVERSE fixes to replace hardwired code.
Dependencies
none
Files Changed:
corecleanup_06_JS: .freeciv-Aug-15JS/client/goto.c
corecleanup_06_JS: .freeciv-Aug-15JS/client/gui-gtk/mapview.c
corecleanup_06_JS: .freeciv-Aug-15JS/client/gui-mui/mapclass.c
corecleanup_06_JS: .freeciv-Aug-15JS/client/gui-xaw/mapview.c
corecleanup_06_JS: .freeciv-Aug-15JS/common/map.c
corecleanup_06_JS: .freeciv-Aug-15JS/common/map.h
corecleanup_06_JS: .freeciv-Aug-15JS/server/gotohand.c
=====
Subject: [Patch4cvs] Corecleanup_06a collected bugfix patch
Date: Aug 18, 2001
Author: Ross Wetmore
Status: Tested
State: Submit
Description
This adds bugfixes and map addressing changes necessary for subsequent
corecleanup patches which are compatible (and useful) to the current code.
Dependencies
none
Files Changed:
corecleanup_06a: freeciv/ai/advdomestic.c
corecleanup_06a: freeciv/ai/aiunit.c
corecleanup_06a: freeciv/client/climisc.c
corecleanup_06a: freeciv/client/control.c
corecleanup_06a: freeciv/client/goto.c
corecleanup_06a: freeciv/client/gui-gtk/mapview.c
corecleanup_06a: freeciv/client/gui-xaw/mapview.c
corecleanup_06a: freeciv/client/packhand.c
corecleanup_06a: freeciv/client/tilespec.c
corecleanup_06a: freeciv/common/city.h
corecleanup_06a: freeciv/common/map.h
corecleanup_06a: freeciv/server/cityturn.c
corecleanup_06a: freeciv/server/gotohand.c
corecleanup_06a: freeciv/server/sanitycheck.c
corecleanup_06a: freeciv/server/settlers.c
=====
Subject: Corecleanup_06b updated patch
Date: Aug 18, 2001
Author: Ross Wetmore
Status: Tested
State: For general review
Description
This adds changes to the core map addressing in map.h and city.h with all
consistent use of *_iterate macros and coordinate checks. It includes the
change to all console setting of maptype for the 4 main rectangular map
topologies with wrapping in x or y, on or off.
Dependencies
corecleanup_06a, corecleanup_6c (must be run with this)
Files Changed:
corecleanup_06civworld: freeciv15/civworld/control.c
corecleanup_06civworld: freeciv15/civworld/dummy.c
corecleanup_06civworld: freeciv15/civworld/mapview.c
corecleanup_06civworld: freeciv15/civworld/tilespec.c
=====
Subject: Corecleanup_06c updated patch
Date: Aug 18, 2001
Author: Ross Wetmore
Status: Tested
State: For general review
Description
This adds extensive changes to the core map routine.
Dependencies
corecleanup_06a, corecleanup_6b
Files Changed:
corecleanup_06c: freeciv/common/map.c
corecleanup_06c: freeciv/common/map.h
=====
Subject: Corecleanup_06civworld updated patch
Date: Aug 18, 2001
Author: Ross Wetmore
State: For general review
Description
This overhauls map generation for more realistic maps including
extensive inland rivers and waterways. It is essentially a rewrite of
most implementation details without impacting external interfaces.
Dependencies
corecleanup_06b,c
Files Changed:
corecleanup_06b: freeciv/ai/aicity.c
corecleanup_06b: freeciv/client/goto.c
corecleanup_06b: freeciv/client/gui-gtk/mapview.c
corecleanup_06b: freeciv/client/gui-mui/mapclass.c
corecleanup_06b: freeciv/client/gui-xaw/mapview.c
corecleanup_06b: freeciv/client/tilespec.c
corecleanup_06b: freeciv/client/tilespec.h
corecleanup_06b: freeciv/common/city.c
corecleanup_06b: freeciv/common/city.h
corecleanup_06b: freeciv/server/citytools.c
corecleanup_06b: freeciv/server/gotohand.c
corecleanup_06b: freeciv/server/mapgen.c
corecleanup_06b: freeciv/server/settlers.c
corecleanup_06b: freeciv/server/stdinhand.c
corecleanup_06b: freeciv/server/unittools.c
=====
Subject: Corecleanup_06mapgen updated patch
Date: Aug 18, 2001
Author: Ross Wetmore
State: For general review
Description
This provides bugfixes to civworld corresponding to the client
changes needed to be compatible with the corecleanup source.
Dependencies
corecleanup_06b,c
Files Changed:
corecleanup_06mapgen: freeciv/server/mapgen.c
corecleanup_06mapgen: freeciv/server/mapgen.h
=====
Subject: Corecleanup_06rivers updated patch
Date: Aug 18, 2001
Author: Ross Wetmore
State: For general review
Description
This adds a change to allow ships to move into river estuaries, but
not move along rivers. Waterbodies connected by single tile rivers and
extensions of this by judicious placement of cities with their auto
road/river updates permits signifcantly enhanced sea accessibility.
Dependencies
none
Files Changed:
corecleanup_06rivers: freeciv/common/unit.c
=====
- [Freeciv-Dev] [PATCH] Corecleanup_06 has been put in incoming,
Ross W. Wetmore <=
|
|