PROJECT: Revision Reports

[J Bytheway]

Revision 470
Changed paths:
M /branches/linux/BUGS
A /branches/linux/configure.ac (from /branches/linux/configure.in:461)
D /branches/linux/configure.in
M /branches/linux/ctp2_code/Makefile.am
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/gfx/Makefile.am
M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.cpp
M /branches/linux/ctp2_code/gfx/spritesys/Makefile.am
M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.cpp
M /branches/linux/ctp2_code/gfx/tilesys/Makefile.am
M /branches/linux/ctp2_code/gs/Makefile.am
M /branches/linux/ctp2_code/gs/events
A /branches/linux/ctp2_code/gs/events/Makefile.am
M /branches/linux/ctp2_code/gs/fileio
M /branches/linux/ctp2_code/gs/fileio/GameFile.cpp
A /branches/linux/ctp2_code/gs/fileio/Makefile.am
M /branches/linux/ctp2_code/gs/newdb/Makefile.am
M /branches/linux/ctp2_code/gs/outcom
A /branches/linux/ctp2_code/gs/outcom/Makefile.am
M /branches/linux/ctp2_code/gs/utility
A /branches/linux/ctp2_code/gs/utility/Makefile.am
M /branches/linux/ctp2_code/gs/world
A /branches/linux/ctp2_code/gs/world/Makefile.am
M /branches/linux/ctp2_code/libs/anet/demo/gtest/gtest.c
M /branches/linux/ctp2_code/libs/anet/h/dpio.h
M /branches/linux/ctp2_code/libs/anet/src/dp/dp2.c
M /branches/linux/ctp2_code/libs/anet/src/dp/dpio.c
M /branches/linux/ctp2_code/libs/anet/src/dp/enumsrv2.c
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/ui/interface/controlpanelwindow.cpp
M /branches/linux/ctp2_code/ui/interface/sci_advancescreen.cpp

- Moved configure.in to configure.ac
- Updated BUGS
- Changed some 0s to NULLs when being assigned to pointers for clarity
- Corrected some errors in FacedSprite.cpp
- Removed some superfluous casts
- Added delete commands to free allocated memory in spriteutils.cpp
- Arranged for more helper libraries, and switched one away from libtool
management
- Added support for parsing the command line in Linux
- Added some variable initializations in anet
- Reverted some earlier changes to anet
- Corrected some errors in GameFile.cpp
- Reverted erroneous changes to casts in sci_advancescreen.cpp and
controlpanelwindow.

[Fromafar]

Revision 471 (trunk) AI strategy cleanups

Merged some Linux branch modifications

Modified: ctp2_code\ai\ctpai.cpp
Modified: ctp2_code\ai\ctpaidebug.cpp
Modified: ctp2_code\ai\profileai.h
Modified: ctp2_code\ai\strategy\agents\agent.cpp
Modified: ctp2_code\ai\strategy\agents\agent.h
Modified: ctp2_code\ai\strategy\agents\ctpagent.cpp
Modified: ctp2_code\ai\strategy\agents\ctpagent.h
Modified: ctp2_code\ai\strategy\goals\ctpgoal.h
Modified: ctp2_code\ai\strategy\scheduler\scheduler_types.h
Modified: ctp2_code\ai\strategy\squads\Squad.cpp

Minor code cleanups

Modified: ctp2_code\ai\ctpai.h
Modified: ctp2_code\ai\diplomacy\diplomat.cpp
Modified: ctp2_code\ai\mapanalysis\mapanalysis.cpp
Modified: ctp2_code\ai\mapanalysis\mapanalysis.h
Modified: ctp2_code\ai\strategy\goals\Goal.cpp
Modified: ctp2_code\ai\strategy\goals\Goal.h
Modified: ctp2_code\ai\strategy\goals\ctpgoal.cpp
Modified: ctp2_code\ai\strategy\scheduler\scheduler.cpp
Modified: ctp2_code\ai\strategy\squads\squad_Strength.cpp
Modified: ctp2_code\ai\strategy\squads\squad_Strength.h

Crash prevention attempts

Modified: ctp2_code\ai\strategy\scheduler\Plan.cpp

Note: the crash prevention attempts are based on code inspection only. I am not sure whether these are really solving any problem, because I have never been able to reproduce the reported crashes myself.

[Martin Gühmann]

Revision 472 (trunk)

Debug tools are now initialized as the first thing in the game within a global static object, and are cleanedup at least. This has the advantage that the leak reporter doesn't report any leaks, just because some static objects on the stack call there destructors after the leak report has been written.
modified ctp2_code/ctp/c3.cpp
modified ctp2_code/ctp/c3.h
modified ctp2_code/ctp/civ3_main.cpp

Fixed memory leaks.
modified ctp2_code/ctp/civapp.cpp

[Fromafar]

Revision 473 (trunk)

Redesigned ColorSet to prevent a crash during start-up.

Modified: ctp2_code\ctp\civ3_main.cpp
Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\gfx\gfx_utils\ColorSet.cpp
Modified: ctp2_code\gfx\gfx_utils\colorset.h

Corrected turn box computation for ship paths through cities.

Modified: ctp2_code\gfx\tilesys\TileHighlight.cpp

[Martin Gühmann]

Revision 474 (trunk)

Added to Civilisation and CityStyle databases happiness increasement flags:
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h
modified ctp2_code/gs/gameobj/Happy.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/player.h
modified ctp2_code/gs/newdb/citystyle.cdb
modified ctp2_code/gs/newdb/Civilisation.cdb

[Fromafar]

Revision 475 (trunk)

1.1 patch savegame compatibility fix:
Modified: ctp2_code\gfx\gfx_utils\colorset.h

This one should have been in revision 473: sorry for that.
Modified: ctp2_code\ui\aui_common\aui_keyboard.h

[Martin Gühmann]

Revision 476 (trunk)

Message boxes are now non-modal, left click on a message in the message list, the message is opened if it is not open, otherwise it is closed, right click removes the message from list, if it is open it is closed in addition. Left clicking on another message opens that and closes the first message. Alert boxes are left as they are modal.
modified ctp2_code/gs/gameobj/MessageData.h
modified ctp2_code/ui/interface/messageactions.cpp
modified ctp2_code/ui/interface/messagewindow.cpp

Added option to select a city first instead of an active army.
Added DebugSlic and GoodAnim to the advanced options.
modified ctp2_code/gs/database/profileDB.cpp
modified ctp2_code/gs/database/profileDB.h

Used option to select a city first instead of an active army. Unfortunately this doesn't quite work. But for now this should be enough.
modified ctp2_code/ui/aui_ctp2/SelItem.cpp
modified ctp2_code/ui/aui_ctp2/SelItemClick.cpp

Made the autoDebug object more conform to the standart, maybe I move its struct to seperate header and source files:
modified ctp2_code/ctp/c3.cpp
modified ctp2_code/ctp/c3.h

Added new strings for the new options, added the French strings from Tamerlin.
modified ctp2_data/english/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/tips_str.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/italian/gamedata/ldl_str.txt
modified ctp2_data/japanese/gamedata/ldl_str.txt
modified ctp2_data/spanish/gamedata/ldl_str.txt

[Martin Gühmann]

Revision 477 (trunk)

Fixed player color above player 16 and allow loading of the original color set again. Now there are only two valid number of colors for a ColorsXX.txt 58 and 74 - original and source code version respectively. For the 58 color version the missing player colors are copied from the terrain colors so that the result is like in the original game:
modified ctp2_code/gfx/gfx_utils/ColorSet.cpp
modified ctp2_code/gfx/gfx_utils/colorset.h
A color set based on Nordicus' color set for CTP1 for 32 civs:
added ctp2_data/default/gamedata/Colors04.txt
The original color set:
added ctp2_data/default/gamedata/Colors05.txt

[J Bytheway]

Here's the new version of the playtest readme, and also some changes I made to the user manual ages ago and forgot about.

Revision 478 (trunk)
Changed paths:
M /trunk/ctp2_code/gs/newdb
M /trunk/doc/user/manual/Makefile
A /trunk/doc/user/manual/include/app_advances.tex
A /trunk/doc/user/manual/include/app_cityimprovements.tex
A /trunk/doc/user/manual/include/app_civilizations.tex
A /trunk/doc/user/manual/include/app_glossary.tex
A /trunk/doc/user/manual/include/app_governments.tex
A /trunk/doc/user/manual/include/app_terraintypes.tex
A /trunk/doc/user/manual/include/app_tileimprovements.tex
A /trunk/doc/user/manual/include/app_tradegoods.tex
A /trunk/doc/user/manual/include/app_units.tex
A /trunk/doc/user/manual/include/app_wonders.tex
D /trunk/doc/user/manual/include/appendicies.tex
M /trunk/doc/user/manual/include/gettingstarted.tex
M /trunk/doc/user/manual/include/introduction.tex
M /trunk/doc/user/manual/include/units.tex
M /trunk/doc/user/manual/user_manual.tex
M /trunk/doc/user/playtest/Apolyton_README.txt
M /trunk/doc/user/playtest/Makefile

- Updated svn:ignore property on gs/newdb to reflect Martin's changes
- Included new playtest readme
- On the user manual:
- Split the appendicies into seperate files
- Wrote a few paragraphs of introduction
- Tweaked some of the typography
- Added a few more details to the already written portions
- Added a glossary
- Tweaked the headers and footers
- Changed \include commands to \input commands to avoid all the superfluous
\clearpages
- Put the index into the table of contents
- Changed the Makefile to use nonstopmode and not choke on errors while
cleaning

[Fromafar]

Revision 479 (trunk)

Display very slow or non-growth as ---

Modified: ctp2_code\gfx\tilesys\tiledraw.cpp

Decreased MSVC dependency, cleaned up.

Modified: ctp2_code\gfx\tilesys\resourcemap.cpp
Modified: ctp2_code\gfx\tilesys\resourcemap.h
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tileset.cpp
Modified: ctp2_code\gfx\tilesys\tileset.h
Modified: ctp2_code\gfx\tilesys\tileutils.cpp
Modified: ctp2_code\gfx\tilesys\workmap.cpp
Modified: ctp2_code\gfx\tilesys\workmap.h

[Fromafar]

Revision 480 (trunk) Improved CtP2 disk detection

Modified: ctp2_code\ctp\ctp2_utils\c3files.cpp
Modified: ctp2_code\ctp\ctp2_utils\c3files.h

Cleanups/linux branch

Modified: ctp2_code\ctp\ctp2_utils\AvlTree.h
Modified: ctp2_code\ctp\ctp2_utils\appstrings.cpp
Modified: ctp2_code\ctp\ctp2_utils\c3cmdline.cpp
Modified: ctp2_code\ctp\ctp2_utils\c3cmdline.h
Modified: ctp2_code\ctp\ctp2_utils\c3debug.cpp
Modified: ctp2_code\ctp\ctp2_utils\c3debug.h
Modified: ctp2_code\ctp\ctp2_utils\c3debugstl.h
Modified: ctp2_code\ctp\ctp2_utils\c3errors.cpp
Modified: ctp2_code\ctp\ctp2_utils\tracklen.cpp

[Fromafar]

Revision 481 (trunk) Filenames as const char * and other linux branch changes.

Modified: ctp2_code\gfx\gfx_utils\pixelutils.cpp
Modified: ctp2_code\gfx\gfx_utils\pixelutils.h
Modified: ctp2_code\gfx\gfx_utils\rimutils.h
Modified: ctp2_code\gfx\gfx_utils\targautils.cpp
Modified: ctp2_code\gfx\gfx_utils\targautils.h
Modified: ctp2_code\gfx\gfx_utils\tiffutils.cpp
Modified: ctp2_code\gfx\gfx_utils\tiffutils.h
Modified: ctp2_code\gfx\gfx_utils\videoutils.h
Modified: ctp2_code\gs\fileio\CivPaths.cpp
Modified: ctp2_code\gs\fileio\CivPaths.h
Modified: ctp2_code\gs\fileio\GameFile.cpp
Modified: ctp2_code\gs\fileio\Token.cpp
Modified: ctp2_code\gs\fileio\Token.h
Modified: ctp2_code\gs\fileio\civscenarios.cpp

This should repair the "cannot convert from 'const char *' to 'char *'" compile errors.

[Fromafar]

Revision 482+483+484 (trunk)

Decreased MSVC dependency, filenames as const char *, and other linux branch changes.

ctp2_code\ui\aui_common+aui_ctp2+aui_sdl+aui_utils

[Ekmek]

Revision 485


- Not completely implemented but attempted to Display Army Names on Screen
trunk\ctp2_code\ctp\ctp2_utils\c3cmdline.cpp
trunk\ctp2_code\ctp\ctp2_utils\c3cmdline.h
trunk\ctp2_code\gfx\gfx_utils\gfx_options.cpp
trunk\ctp2_code\gfx\gfx_utils\gfx_options.h
trunk\ctp2_code\gs\dbgen\dbgen.dsp
trunk\ctp2_code\ui\interface\chatbox.cpp

- not implemented HiddenNationality. But Immobile and CantGroup dontwork
trunk\ctp2_code\gs\gameobj\ArmyData.cpp

- NeedsCityGood and NeedsCityGoodAll added to CanBuildUnit, CanBuildBuilding, and CanBuild Wonder
- Implemented EnablesGood for buildings, wonders and tile improvements now they give goods to a city
- To ProcessFood,ProcessProduction,ProcessGold, ProcessScience added a check that if a city has or is buying a good than you can get a bonus.

EfficiencyOrCrime flag affects all four.
- HasEitherGood and HasNeededGood added to check if a city has a good
trunk\ctp2_code\gs\gameobj\CityData.cpp
trunk\ctp2_code\gs\gameobj\citydata.h

- NeedsCityGoodAnyCity added to CanBuildUnit
trunk\ctp2_code\gs\gameobj\Player.cpp


trunk\ctp2_code\gs\gameobj\Unit.cpp
trunk\ctp2_code\gs\gameobj\Unit.h
trunk\ctp2_code\gs\gameobj\UnitData.cpp
trunk\ctp2_code\gs\gameobj\UnitData.h



Added FoodPercent, CommercePercent,ProductionPercent,science Percent and EfficiencyOrCrime
trunk\ctp2_code\gs\newdb\terrain.cdb

Added EnablesGood
trunk\ctp2_code\gs\newdb\terrimprove.cdb

NeedsCityGood, NeedsCityGoodAll, NeedsCityGoodCapitol, add NeedsCityGoodAnyCity
trunk\ctp2_code\gs\newdb\unit.cdb
trunk\ctp2_code\gs\newdb\wonder.cdb

NeedsCityGood, NeedsCityGoodAll, NeedsCityGoodCapitol, NeedsCityGoodAnyCity, and EnablesGood added
trunk\ctp2_code\gs\newdb\building.cdb

Updated Credits to adding me!
trunk\ctp2_data\default\uidata\credits.txt

[Ekmek]

Revision 486

Added my updates to the readme
\trunk\doc\user\playtest\Apolyton_Readme

Added a zip of the database cdbs so anyone that downloads the playtest and would like to see the possible flags they can look there
\trunk\doc\user\playtest\database flags.zip