PROJECT: Revision Reports 2

[ctplinuxfan]

Revision 977

modified gfx/gfx_utils/Queue.h:
- added missing #include

modified gs/newdb
modified gs/newdb/Makefile.am:
- updated svn:ignore and Makefile.am with current cdbs

modified os/nowin32/nowin32.cpp
modified os/nowin32/windows.h:
- changed struct RECT to typedef struct tagRECT {} RECT;

[ctplinuxfan]

Revision 978

modified ctp2_code/gfx/spritesys/FacedSprite.h
modified ctp2_code/gfx/spritesys/Sprite.cpp
modified ctp2_code/gfx/spritesys/spritefile.cpp
modified ctp2_code/gfx/spritesys/director.cpp
modified ctp2_code/gfx/spritesys/FacedSpriteWshadow.cpp
modified ctp2_code/gfx/spritesys/FacedSprite.cpp
modified ctp2_code/gfx/spritesys/SpriteFile.h
modified ctp2_code/gfx/spritesys/Sprite.h
modified ctp2_code/gfx/spritesys/FacedSpriteWshadow.h
modified ctp2_code/gfx/tilesys/tiledmap.cpp
modified ctp2_code/gfx/tilesys/resourcemap.cpp

- Added Get*Size() methods to increase portability (_msize=windows api)
- Added size argument to Set*Data methods for increasing portability
- Changed position type to long for SetFilePos and GetFilePos
(fpos_t may be a complex data type on non-windows systems)

modified Makefile
- Added missing source directories

[ctplinuxfan]

Revision 979
modified ctp/ctp2_utils/c3files.h
modified ctp/ctp2_utils/c3files.cpp
modified ctp/ctp2_utils/tracklen.h
modified ctp/ctp2_utils/tracklen.cpp
modified ctp/ctp2_utils/netconsole.cpp
modified gfx/spritesys/spritefile.cpp
modified gfx/tilesys/tileset.cpp
modified gfx/tilesys/tiledraw.cpp
modified gfx/tilesys/workmap.cpp
modified sound/soundevent.h
modified sound/civsound.h
modified sound/soundmanager.cpp
modified sound/soundmanager.h
modified libs/anet/demo/utils/avgstat.c
modified libs/anet/src/dp/dictset.c
modified libs/anet/src/dp/dpprivy.c
modified libs/anet/h/dpunpack.h
modified libs/anet/h/dppackn.h
modified libs/anet/h/dppack1.h
- added valid cd check for SDL again (please don't remove it again, a
ctp2 executable without the check would be against the eula)
- readded linux specific code in c3files
- fixed a warning in spritefile.cpp
- linux compile fixes in gfx/tilesys
- compilation fixes in libs/anet
- StupidPlaySound needs linux implementation

modified ui/aui_directx/aui_directsurface.cpp
modified ui/aui_directx/aui_directsurface.h
modified ui/aui_sdl/aui_sdlsurface.h
modified ui/aui_sdl/aui_sdlsurface.cpp
modified ui/aui_common/aui_surface.cpp
API changes:
- added aui_NativeSurface typedef (either aui_DirectSurface or aui_SDLSurface)
- aui_NativeSurface->Blank and BlankRGB will fill a surface with the color
given; i.e. all pixels will be overwritten. TODO: bpp check

[Martin Gühmann]

Revision 980: The AI can now free slaves on city conquest and it will build again caravans:

Some cleanings:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Removed some assert messages so that debugging is possible again:
modified trunk/ctp2_code/gfx/spritesys/FacedSprite.cpp
modified trunk/ctp2_code/gfx/spritesys/Sprite.cpp

Slic event debug messages are off by default:
modified trunk/ctp2_code/gs/database/profileDB.cpp

If you continue an old game and your profile hasn't been updated for the SP ending age, then the SP ending age is the last age in the database:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_code/gs/gameobj/Advances.cpp

The AI will free the slaves of a city if it neither owns slaves nor it has any slavers:
modified trunk/ctp2_code/gs/gameobj/CityEvent.cpp

The AI builds caravans again:
modified trunk/ctp2_data/default/aidata/buildlistsequences.txt

[Martin Gühmann]

Revision 981

The map does not center on a pirating army anymore if AutoCenter is disabled
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Trenches are not generated anymore since we do not have the correct tile graphics:
modified trunk/ctp2_data/default/gamedata/Const.txt

Updated readme:
modified trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 982: The game does not crash when a civilization is wiped out, diplomacy on the first turn of contact is more difficult for the human player, and more stuff of the government modified for wonders and buildings has been implemented.

The game recomputes regard, when contact between two players is made. This fixes an exploit where the player could get map exchanges and piece treaties on the first turn, although this is not possible so easily on subsequent turns:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

The game does not crash, when a civilization is wiped out:
modified trunk/ctp2_code/ai/ctpai.cpp

The game does not hang if it cannot find enough transporters for a goal:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

The game does not crash when a civilization is wiped out, and more of the government modified stuff for buildings and wonders was implemented:
modified trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/bldque.cpp
modified trunk/ctp2_code/gs/gameobj/buildingutil.cpp
modified trunk/ctp2_code/gs/gameobj/buildingutil.h
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/Strengths.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/gameobj/unitutil.cpp
modified trunk/ctp2_code/gs/gameobj/wonderutil.cpp
modified trunk/ctp2_code/gs/gameobj/wonderutil.h
modified trunk/ctp2_code/gs/slic/SlicBuiltin.cpp
modified trunk/ctp2_code/gs/slic/slicfunc.cpp
modified trunk/ctp2_code/gs/utility/newturncount.cpp
modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
modified trunk/ctp2_code/ui/aui_ctp2/cityinventorylistbox.cpp
modified trunk/ctp2_code/ui/interface/citywindow.cpp
modified trunk/ctp2_code/ui/interface/EditQueue.cpp
modified trunk/ctp2_code/ui/interface/infowin.cpp
modified trunk/ctp2_code/ui/interface/sci_advancescreen.cpp
modified trunk/ctp2_code/ui/interface/sci_advancescreen.h
modified trunk/ctp2_code/ui/interface/ScienceManagementDialog.cpp
modified trunk/ctp2_code/ui/interface/WonderTab.cpp

[Maquiladora]

Revision 983, 984, 985 and 986: (yes, I made a bit of a mess of that )

Updated AE Mod to v0.2.

U trunk/Scenarios/AE_Mod/packlist.txt
U trunk/Scenarios/AE_Mod/scen0000/default/aidata/AdvanceLists.txt
U trunk/Scenarios/AE_Mod/scen0000/default/aidata/UnitBuildLists.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Advance.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Const.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/DiffDB.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Units.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Wonder.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/buildings.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/newsprite.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/risks.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/terrain.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/uniticon.txt
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPGP200A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPGP200B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPGP200L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP124A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP124B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP124L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70A.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70B.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70L.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/infantrytactics.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/plasmaengineering.tga
D trunk/Scenarios/AE_Mod/scen0000/default/graphics/sprites/
U trunk/Scenarios/AE_Mod/scen0000/english/gamedata/Great_Library.txt
U trunk/Scenarios/AE_Mod/scen0000/english/gamedata/gl_str.txt
U trunk/Scenarios/AE_Mod/scen0000/scenario.txt
D trunk/Scenarios/AE_Mod/ae_mod_readme.txt
A trunk/Scenarios/AE_Mod/scen0000/ae_mod_readme.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/BuildListSequences.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/BuildingBuildLists.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/ImprovementLists.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/diplomacy.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/strategies.txt
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/AEM_1stRingForAIs.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/AEM_AIAIdiplo.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/AEM_ComImpSForAIs.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/AEM_MiscAIFixes.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/AEM_pwcheat.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/scenario.slc
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/tileimp.txt
A trunk/Scenarios/AE_Mod/scen0000/english/gamedata/scen_str.txt

[EPW]

Revision 987

My first one, lets see how it goes

Adds two new unit flags:
"UpgradeAnywhere" allows units to upgrade out side of cities and forts
"UpgradeDoesNotHeal" prevents units from regaining full HP, fuel, and movement points when they are upgraded.

U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/unitevent.cpp
U trunk/ctp2_code/gs/newdb/unit.cdb
U trunk/ctp2_code/gs/newdb/unitpromotion.cdb

[EPW]

Revision 988

Fixed divide by 0 error in previous revision

U trunk/ctp2_code/gs/gameobj/UnitData.cpp

[EPW]

Revision 989

Upgraded units with 0 movement points can no longer move.
The game will now update the displayed unit information and picture when a unit is upgraded.
modified trunk\ctp2_code\gs\gameobj\UnitData.cpp

U trunk/ctp2_code/gs/gameobj/UnitData.cpp

[Martin Gühmann]

Revision 990

Updated readme:
modified trunk/doc/user/playtest/Apolyton_README.txt

[EPW]

Revision 991

Fixed Slic bug (by Martin) and updated uniticon.txt for MagnificentSamurai scenario.
Modified Scenarios/MognificentSamurai/scen0000/default/gamedata/SS_func.slc
Modified Scenarios/MagnificentSamurai/scen0000/default/gamedata/uniticon.txt

Updated Comments and changed function to refresh unit info after an upgrade.
Modified ctp2_code/gs/gameobj/UnitData.cpp

U trunk/Scenarios/MagnificentSamurai/scen0000/default/gamedata/SS_func.slc
U trunk/Scenarios/MagnificentSamurai/scen0000/default/gamedata/uniticon.txt
U trunk/ctp2_code/gs/gameobj/UnitData.cpp

[EPW]

Revision 992

The game no longer crashes when a civ is conquered (hopefully)
modified trunk/ctp2_code/ai/ctpai.cpp

U trunk/ctp2_code/ai/ctpai.cpp

[Maquiladora]

Revision 993

- Added option to see what a city is building under it's name on the main map. This can be enabled/disabled from the graphical options screen.

- City icons: Added a pollution city icon for cities at risk of causing dead tiles, and cleaned up transparency and outlines of many existing city icon graphics. Also removed the airport icon as it's useless right now.

- Changed the good sprites for coal, silver, gold, uranium, copper, bauxite and iron ore to look more like rocks and appear more visible.
- Changed modern city sprite colours so they look more like the original modern city sprites.

U trunk/ctp2_code/gfx/tilesys/tiledmap.h
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gfx/tilesys/tileset.h
U trunk/ctp2_code/gs/database/profileDB.cpp
U trunk/ctp2_code/gs/database/profileDB.h
U trunk/ctp2_code/gs/world/UnseenCell.cpp
U trunk/ctp2_code/gs/world/UnseenCell.h
U trunk/ctp2_code/ui/interface/graphicsscreen.cpp
U trunk/ctp2_data/default/gamedata/concepticon.txt
A trunk/ctp2_data/default/graphics/pictures/upc002.tga
A trunk/ctp2_data/default/graphics/pictures/upc003.tga
A trunk/ctp2_data/default/graphics/pictures/upc004.tga
A trunk/ctp2_data/default/graphics/pictures/upc005.tga
A trunk/ctp2_data/default/graphics/pictures/upc007.tga
U trunk/ctp2_data/default/graphics/pictures/upc039a.tga
A trunk/ctp2_data/default/graphics/pictures/upc040.tga
A trunk/ctp2_data/default/graphics/pictures/upc041.tga
A trunk/ctp2_data/default/graphics/pictures/upc044.tga
U trunk/ctp2_data/default/graphics/pictures/upc052.TGA
A trunk/ctp2_data/default/graphics/pictures/upc154.tga
A trunk/ctp2_data/default/graphics/pictures/upc155.tga
U trunk/ctp2_data/default/graphics/sprites/GC000.SPR
U trunk/ctp2_data/default/graphics/sprites/GC001.SPR
U trunk/ctp2_data/default/graphics/sprites/GC002.SPR
U trunk/ctp2_data/default/graphics/sprites/GC003.SPR
U trunk/ctp2_data/default/graphics/sprites/GC004.SPR
U trunk/ctp2_data/default/graphics/sprites/GC005.SPR
U trunk/ctp2_data/default/graphics/sprites/GC006.SPR
U trunk/ctp2_data/default/graphics/sprites/GC007.SPR
U trunk/ctp2_data/default/graphics/sprites/GC008.SPR
U trunk/ctp2_data/default/graphics/sprites/GC009.SPR
U trunk/ctp2_data/default/graphics/sprites/GC010.SPR
U trunk/ctp2_data/default/graphics/sprites/GC011.SPR
U trunk/ctp2_data/default/graphics/sprites/GC012.SPR
U trunk/ctp2_data/default/graphics/sprites/GC013.SPR
U trunk/ctp2_data/default/graphics/sprites/GC014.SPR
U trunk/ctp2_data/default/graphics/sprites/GC015.SPR
U trunk/ctp2_data/default/graphics/sprites/GC016.SPR
U trunk/ctp2_data/default/graphics/sprites/GC017.SPR
U trunk/ctp2_data/default/graphics/sprites/GC018.SPR
U trunk/ctp2_data/default/graphics/sprites/GC019.SPR
U trunk/ctp2_data/default/graphics/sprites/GC020.SPR
U trunk/ctp2_data/default/graphics/sprites/Gc142.spr
U trunk/ctp2_data/default/graphics/sprites/Gc143.spr
U trunk/ctp2_data/default/graphics/sprites/Gc144.spr
U trunk/ctp2_data/default/graphics/sprites/Gc145.spr
U trunk/ctp2_data/default/graphics/sprites/Gc146.spr
U trunk/ctp2_data/default/graphics/sprites/Gc147.spr
U trunk/ctp2_data/default/graphics/sprites/Gc148.spr
U trunk/ctp2_data/default/graphics/sprites/Gc149.spr
U trunk/ctp2_data/default/graphics/sprites/Gc150.spr
U trunk/ctp2_data/default/graphics/sprites/Gc151.spr
U trunk/ctp2_data/default/graphics/sprites/Gc152.spr
U trunk/ctp2_data/default/graphics/sprites/Gc153.spr
U trunk/ctp2_data/default/graphics/sprites/Gc154.spr
U trunk/ctp2_data/default/graphics/sprites/Gc155.spr
U trunk/ctp2_data/default/graphics/sprites/Gc156.spr
U trunk/ctp2_data/default/graphics/sprites/Gc157.spr
U trunk/ctp2_data/default/graphics/sprites/Gc158.spr
U trunk/ctp2_data/default/graphics/sprites/Gc159.spr
U trunk/ctp2_data/default/graphics/sprites/Gc160.spr
U trunk/ctp2_data/default/graphics/sprites/Gc161.spr
U trunk/ctp2_data/default/graphics/sprites/Gc162.spr
U trunk/ctp2_data/default/graphics/sprites/Gc163.spr
U trunk/ctp2_data/default/graphics/sprites/Gc164.spr
U trunk/ctp2_data/default/graphics/sprites/Gc165.spr
U trunk/ctp2_data/default/graphics/sprites/Gc166.spr
U trunk/ctp2_data/default/graphics/sprites/Gc167.spr
U trunk/ctp2_data/default/graphics/sprites/Gc168.spr
U trunk/ctp2_data/default/graphics/sprites/Gc169.spr
U trunk/ctp2_data/default/graphics/sprites/Gc170.spr
U trunk/ctp2_data/default/graphics/sprites/Gc171.spr
U trunk/ctp2_data/default/graphics/sprites/Gc183.spr
U trunk/ctp2_data/default/graphics/sprites/Gc184.spr
U trunk/ctp2_data/default/graphics/sprites/Gc185.spr
U trunk/ctp2_data/default/graphics/sprites/Gc186.spr
U trunk/ctp2_data/default/graphics/sprites/Gc187.spr
U trunk/ctp2_data/default/graphics/sprites/Gg026.spr
U trunk/ctp2_data/default/graphics/sprites/Gg027.spr
U trunk/ctp2_data/default/graphics/sprites/Gg030.spr
U trunk/ctp2_data/default/graphics/sprites/Gg031.spr
U trunk/ctp2_data/default/graphics/sprites/Gg032.spr
U trunk/ctp2_data/default/graphics/sprites/Gg033.spr
U trunk/ctp2_data/default/graphics/sprites/Gg041.spr
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/graphics.ldl
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/french/uidata/layouts/graphics.ldl
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/graphics.ldl
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/graphics.ldl
U trunk/ctp2_data/japanese/gamedata/ldl_str.txt
U trunk/ctp2_data/japanese/uidata/layouts/graphics.ldl
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/graphics.ldl

[Maquiladora]

Revision 994

tiledraw.cpp - Re-enabled drawing religion icons under the city name, but this still needs more testing. Icons above the city name ("drawspecialicons") have been left disabled because they will cause problems now the city name is higher with the city production stuff, and this is not used anywhere at the moment at least anyway.

citydata.cpp, gaiacontroller.h, terrainutil.cpp - Fixed a bug where players could start building the science victory buildings and tile imp (defined in EndGameObjects.txt) before the science victory race had started (in vanilla this is when someone builds the Solaris Project wonder).

settlemap.cpp - modified settle score calculation so it doesn't add the score from a tile that's already being collected by a city.

U trunk/ctp2_code/ai/mapanalysis/settlemap.cpp
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/gaiacontroller.h
U trunk/ctp2_code/gs/gameobj/terrainutil.cpp