PROJECT: Revision Reports

[Ekmek]

Revision 567

gameobj/ArmyData.cpp
-fixed multipleattacks to re-allow aircraft to move after attack (but not attack again)
gameobj/buildingutil.cpp and h
-added buildingutil_GetIncreaseHP not implemented yet
gameobj/CityData.cpp and h
-added HappyIncrease and CanCollectGood functions
gameobj/UnitData.cpp
outcommented attemot at increasehp
newdb/
-new flags


U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/Happy.cpp
U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/buildingutil.cpp
U trunk/ctp2_code/gs/gameobj/buildingutil.h
U trunk/ctp2_code/gs/gameobj/citydata.h
U trunk/ctp2_code/gs/newdb/building.cdb
U trunk/ctp2_code/gs/newdb/terrain.cdb

[Martin Gühmann]

Revision 568

Replaced old Difficulty database by new one and did some fixes here and there

MS compiler warning 4804 is now treated as error so that E does not try unsave use of type bool in operations
modified ctp2_code/ctp/c3.h

Fixed sub-substruct generation so that the new difficulty database can be used:
modified ctp2_code/gs/dbgen/MemberClass.cpp

Fixed Barbarian unit generation: If there is no valid unit type found then no barbarians are genearted at all. Done for both land barbarians and prirates:
modified ctp2_code/gs/gameobj/barbarians.cpp

CityData::AddWonder is now called again and duplicate code was removed:
modified ctp2_code/gs/gameobj/CityEvent.cpp

Replaced old difficulty database by new one.
Fixed some bad indentation.
Made good requirements consistent with each other. Requirements are now that the city needs more goods that it buy and collects than it sells.
Made AI no gold deficit cheat difficulty dependent.
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/newdb/terrain.cdb

Replaced old difficulty database by new one.
Made unit over production AI cheat difficulty dependent.
Fixed save game format with addition gold support.
modified ctp2_code/gs/gameobj/Readiness.cpp
modified ctp2_code/gs/gameobj/Readiness.h

Added flags for the difficulty dependent AI gold deficit and units over production cheats.
Fixed some typos.
modified ctp2_code/gs/newdb/Difficulty.cdb

Replaced old difficulty database by new one:
modified ctp2_code/ctp/civapp.cpp
modified ctp2_code/gs/fileio/GameFile.cpp
modified ctp2_code/gs/gameobj/Advances.cpp
modified ctp2_code/gs/gameobj/bldque.cpp
modified ctp2_code/gs/gameobj/Diffcly.cpp
modified ctp2_code/gs/gameobj/Diffcly.h
modified ctp2_code/gs/utility/DataCheck.cpp
modified ctp2_code/gs/utility/gameinit.cpp
modified ctp2_code/gs/utility/newturncount.cpp
modified ctp2_code/gs/utility/TurnCnt.cpp
modified ctp2_code/net/general/net_crc.cpp
modified ctp2_code/ui/interface/infowin.cpp
modified ctp2_code/ui/interface/WonderTab.cpp

[ctplinuxfan]

Revision 569
Changed paths:
A /branches/linux-merge (from /branches/linux:568)

- merge branch

Added to keep a kind of "stable" linux branch, while this branch may
contain more up to date code merged from trunk with possibly more
bugs due to merging.

[Ekmek]

Revision 570

gs/gameobj/ArmyData.cpp
- fixed disband order
- added update code to sleep but still needs work
- added barbarian chek to verifyattack
gs/gameobj/CityData.cpp
- add cancollectgood to other addresource calls
gamedata/script.slc
- update for warning pop-up
playtest/Apolyton_README.txt
updated

[Ekmek]

Revision 571

gs/gameobj/ArmyData.cpp
- fixed bug in r570 with disband crash
- sleeping a unit in a city (with enough gold) allows unit upgrading
gs/gameobj/CityData.cpp
- just some out commented attempts
Apolyton_README.txt
- updated

[Ekmek]

Revision 572

gameobj/Advances.cpp
- added NeedsCityGoodAnyCity - now you can specify a good required to research an advance
gameobj/CityData.cpp
- added CivilisationOnly to Wonders and Buildings
- added NeedsFeatToBuild to Wonders and Buildings
- Added AddsASlave for goods, each turn you have the good adds a slave to the City
- Added new difficulty AICityDefenderBonus
gameobj/FeatTracker.cpp & h
- Added HasFeat function to check if player achieved a Feat
gameobj/Player.cpp
- added CivilisationOnly and NeedsFeatToBuild to CanBuildUnit
newdb/building.cdb
newdb/Difficulty.cdb
newdb/unit.cdb
newdb/wonder.cdb
newdb/terrain.cdb
- updated flags

gamedata/script.slc
- updated
Apolyton_README.txt
- updated

[Ekmek]

Revision 573

gameobj/ArmyData.cpp
- fixed bug preventing attacks on barbarians in VerifyAttack
- outcommented attempt at SetType in Sleep/UpgradeTo code

gameobj/CityData.cpp
- fixed Wonder buildque bug in CanBuildWonder

gameobj/Unit.cpp & h & UnitData.cpp & h
- added SetType functionality but didn't work

[Ekmek]

EDIT: COMMITTED


REvision 574

ai/mapanalysis/settlemap.cpp
- added a mountain check to GetSettleTargets, AI should settle better now

gameobj/ArmyData.cpp
- Added CanHarvest check to IsEntrenched. Adds the terrain's gold to the players treasury
- Added but outcommented settleimprovemnent (need to see why player.h doesnt allow access)
- Added GoldCost to capturetile

gameobj/CityData.cpp
- Added IsBuildingOperational check to allow for obsolete buildings
- Fixed OnePerCiv

gameobj/Player.cpp
- (finally) enabled colony code with BonusProductionExport, BonusGoldExport, ExportTileValue
- outcommented ExportTileGood, attempt to send the colony good to first city without the good, need to work on addresource

newdb/unit.cdb
- added CanHarvest, SetleImprovement

newdb/terrimprove.cdb
- added CanExportTileValue, CanExportGood
updated readme

[Martin Gühmann]

Revision 575

Standartized code for compilng on MSVS .NET 2005 and some modifications here and there

Standartized code:
modified ai/CityManagement/governor.cpp
modified ai/diplomacy/diplomat.cpp
modified ai/mapanalysis/mapanalysis.cpp
modified ui/aui_common/aui_bitmapfont.cpp
modified ui/aui_common/aui_blitter.cpp
modified ui/aui_common/aui_dirtylist.cpp
modified ui/aui_common/aui_listbox.cpp
modified ui/aui_common/aui_screen.cpp
modified ui/aui_common/aui_tabgroup.cpp
modified ui/aui_ctp2/c3blitter.cpp
modified ui/aui_ctp2/ctp2_TabGroup.cpp
modified ui/aui_ctp2/SelItemClick.cpp
modified ui/aui_utils/primitives.cpp
modified ui/interface/armymanagerwindow.cpp
modified ui/interface/citywindow.cpp
modified ui/interface/controlpanelwindow.cpp
modified ui/interface/hotseatlist.cpp
modified ui/interface/loadsavescreen.cpp
modified ui/interface/loadsavewindow.cpp
modified ui/interface/UnitControlPanel.cpp

Armies with a CanSettleOn only unit are now recognized as settle armies and standartized some code:
modified gs/gameobj/ArmyData.cpp

Removed not working user profile options from the advance options (CityClick, EndTurnWithEmptyBuildQueues and RunInBackground):
modified gs/database/profileDB.cpp

Fixed database record default name generation:
modified gs/dbgen/RecordDescription.cpp

Did some cleanings here, espeacilly fixed some wrong indentations:
modified gs/gameobj/CityData.cpp
modified gs/gameobj/citydata.h
modified gs/utility/gstypes.h

Fixed crash caused by and an invalid unit typed passed to Player::CanBuildUnit:
modified gs/gameobj/Player.cpp

[Ekmek]

Revision 576

ai/diplomacy/diplomat.cpp
- no changes (but merged spaces)
ai/diplomacy/regardevent.cpp
- removed war declaration from slave raid
gameobj/ArmyData.cpp
- implemented settleimprovement
- added settlebuilding to ConvertCity
- removed barbarian pop-up
- removed pillage pop-up
- added barbariancamps
- added hostileterrain & immunetohostileterrain
- added materials to CanHarvest
gamedata/script.slc
- add new barb alert tat just declares war
gameobj/CityData.cpp & h
- added IsXenophobia that kills foreign population
- added sectarianhappiness (not fully tested)
gameobj/Happy.cpp
- added sectarianhappiness (not fully tested)
gameobj/Player.cpp
- added export gold to colonies
- attempt to export the Good
gameobj/terrainutil.cpp
- removed visibility from specialbuildat
gameobj/UnitData.cpp
- fixed movebonus and air movement
newdb/cdbs (building, difficulty, terrain, unit, wonder)
-added new flags

updated readme

[Ekmek]

Revision 577

ai/mapanalysis/settlemap.cpp
- removed settle core to zero
gameobj/ArmyData.cpp
- added to reformcity a building is destroyed if the reforming unit has a settlebuilding flag
- Added ParliamentaryVote to VerifyAttack but only makes this govt not attack will add more later

gameob/CityEvent.cpp
gameobj/bldque.cpp & h
- outcommented attempt at popcosts to build

buildingutil.cpp & h
- increase HP updated

gameobj/CityData.cpp
- added ExcludedbyBuilding to units and buildings
- updated SectarianHappiness
- changed IsXenophobia to IsXenophobic
- added new flags HasGulags, IsCapitalist, IsTechnocracy , IsAgrarian, and HasMindlessTelevision
- Implemented IncreaseHP for buildings

gameobj/Player.cpp
- Added GoldPerBuildingAnywhere

gameobj/wonderutil.cpp & h
Add GoldPerBuildingAnywhere wonderutil

cdbs - new flags

updated readme

[Martin Gühmann]

Revision 578

Standardized more code for compilation on VC8, cleaned code (wrong indentation, etc.) and some bug fixes (untested like the original code there)

Standardized more code:
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/diplomacy/diplomat.cpp

Standardized and cleaned up code (replaced counter variable names by more readable standart names):
modified ctp2_code/gs/gameobj/ArmyData.cpp

Cleaned up code (fixed wrong indentation, added missing header comments, made comments more readable, counter variables)
modified ctp2_code/ai/diplomacy/regardevent.cpp
modified ctp2_code/gs/gameobj/bldque.cpp
modified ctp2_code/gs/gameobj/buildingutil.cpp
modified ctp2_code/gs/gameobj/buildingutil.h
modified ctp2_code/gs/gameobj/CityEvent.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/gameobj/wonderutil.cpp
modified ctp2_code/gs/gameobj/wonderutil.h
modified ctp2_code/gs/slic/SlicFrame.cpp
modified ctp2_code/gs/slic/SlicStruct.h
modified ctp2_code/ui/aui_common/aui_blitter.cpp
modified ctp2_code/ui/aui_common/aui_listbox.cpp
modified ctp2_code/ui/aui_common/aui_screen.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_TabGroup.cpp
modified ctp2_code/ui/aui_ctp2/SelItemClick.cpp
modified ctp2_code/ui/aui_utils/primitives.cpp
modified ctp2_code/ui/interface/armymanagerwindow.cpp
modified ctp2_code/ui/interface/creditsscreen.cpp
modified ctp2_code/ui/interface/loadsavescreen.cpp
modified ctp2_code/ui/interface/sciencevictorydialog.cpp
modified ctp2_code/ui/netshell/allinonewindow.cpp

Fixed code, cleaned up code (wrong indentiation, counter variables, line wrapping in comments)
modified ctp2_code/gs/gameobj/CityData.cpp

Removed unnecessary default values for bits, removed the bit marker from flags that are not bits according to the source code and assigned to them a default value if necessary. Fixed indentation, made comments more readable:
modified ctp2_code/gs/newdb/building.cdb
modified ctp2_code/gs/newdb/citystyle.cdb
modified ctp2_code/gs/newdb/Difficulty.cdb
modified ctp2_code/gs/newdb/government.cdb
modified ctp2_code/gs/newdb/terrain.cdb
modified ctp2_code/gs/newdb/terrimprove.cdb
modified ctp2_code/gs/newdb/unit.cdb

Standardized code and reverted to pre revision 575 state. This was not intended to be submitted but somehow it sipt through:
modified ctp2_code/ui/interface/spnewgamediffscreen.cpp

[Martin Gühmann]

Revision 579

New settle targets are only added if the AI has settle units with settle abilities at the settle target position:
modified ctp2_code/ai/ctpai.cpp
modified ctp2_code/ai/mapanalysis/settlemap.cpp
modified ctp2_code/ai/mapanalysis/settlemap.h

[Fromafar]

Revision 580

Crash repairs: civapp.cpp (Rulesets handling), priorityqueue.h, SlicFunc (handling proposals with more than 8 arguments).
Original behaviour compatibility preparation: added treaty ending setting to ProfileDB.
MP diplomacy agreement index correction.
Various minor corrections (types, unused variables etc.).

Modified: ctp2_code\ai\ctpai.cpp
Modified: ctp2_code\ai\ctpaidebug.cpp
Modified: ctp2_code\ai\diplomacy\AgreementMatrix.h
Modified: ctp2_code\ai\diplomacy\agreementmatrix.cpp
Modified: ctp2_code\ctp\civ3_main.cpp
Modified: ctp2_code\ctp\civ3_main.h
Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\ctp\ctp2_utils\AvlTree.h
Modified: ctp2_code\ctp\ctp2_utils\c3files.cpp
Modified: ctp2_code\ctp\ctp2_utils\pointerlist.h
Modified: ctp2_code\ctp\fingerprint\shroud.c
Modified: ctp2_code\ctp\fingerprint\shroud.h
Modified: ctp2_code\gs\database\StrDB.cpp
Modified: ctp2_code\gs\database\profileDB.cpp
Modified: ctp2_code\gs\database\profileDB.h
Modified: ctp2_code\gs\outcom\c3rand.cpp
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicEngine.h
Modified: ctp2_code\gs\slic\SlicFrame.cpp
Modified: ctp2_code\gs\slic\SlicFunc.h
Modified: ctp2_code\gs\slic\SlicSegment.cpp
Modified: ctp2_code\gs\slic\SlicStruct.cpp
Modified: ctp2_code\gs\slic\slicfunc.cpp
Modified: ctp2_code\gs\slic\slicfuncai.cpp
Modified: ctp2_code\gs\slic\slicif.cpp
Modified: ctp2_code\gs\slic\slicobject.cpp
Modified: ctp2_code\gs\utility\PQueue.h
Modified: ctp2_code\gs\utility\QuadTree.h
Modified: ctp2_code\gs\utility\TurnCnt.cpp
Modified: ctp2_code\gs\utility\TurnCntEvent.cpp
Modified: ctp2_code\gs\utility\gameinit.cpp
Modified: ctp2_code\net\general\net_action.cpp
Modified: ctp2_code\net\general\net_city.cpp
Modified: ctp2_code\net\general\net_diplomacy.cpp
Modified: ctp2_code\net\general\net_endgame.cpp
Modified: ctp2_code\net\general\net_info.cpp
Modified: ctp2_code\net\general\net_terrain.cpp
Modified: ctp2_code\net\general\net_vision.cpp
Modified: ctp2_code\net\general\network.cpp
Modified: ctp2_code\net\general\network.h
Modified: ctp2_code\net\general\networkevent.cpp
Modified: ctp2_code\net\io\net_anet.cpp
Modified: ctp2_code\net\io\net_anet.h
Modified: ctp2_code\net\io\net_thread.cpp
Modified: ctp2_code\robot\aibackdoor\priorityqueue.h
Modified: ctp2_code\robot\pathing\A_Star_Heuristic_Cost.h
Modified: ctp2_code\robot\pathing\CityAstar.h
Modified: ctp2_code\robot\pathing\Path.cpp
Modified: ctp2_code\robot\pathing\Path.h
Modified: ctp2_code\robot\pathing\RobotAstar.cpp
Modified: ctp2_code\robot\pathing\astar.cpp
Modified: ctp2_code\robot\pathing\robotastar2.cpp

[Ekmek]

Revision 581

gs/gameobj/ArmyData.cpp
- implemented Minefield; now terrain imps can deduct HP
gs/gameobj/CityData.cpp
- added 2 new diffDB functions RevoltInsurgents and Revolt Casualties (but need to test)
gs/gameobj/CityEvent.cpp
- another bad attempt at popcoststobuild outcommented
gs/gameobj/terrainutil.cpp & h
- added bools for colony, minefield upgrader
newdb
- added new flags
gs/slic/slicfunc.cpp
- fixed bugs where Has was checking the unitDB should have been gets