PROJECT: Revision Reports

[Martin Gühmann]

Revision 685

Some cleanings, fixings and a new user profile option:

Cleaned files a little bit:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/gs/gameobj/GoodyHuts.cpp

Translated some string:
modified trunk/ctp2_data/german/gamedata/gl_str.txt

Made sure that you cannot get units from goody huts whose prerequisite advance is unresearchable:
modified trunk/ctp2_code/gs/gameobj/Advances.cpp

Made sure that the elephant warrior does not show up in the Great Library:
modified trunk/ctp2_data/default/gamedata/Units.txt

Added Upgrade user profile option so that I can test and compare my games without the interference of unit upgrading:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Added new text for the new user profile option:
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

[Fromafar]

Revision 686

Handled double surface locking problem and a possible mouse move crash. But there may be more problems left.

Modified: ctp2_code\gfx\tilesys\tiledraw.cpp

Other small corrections

Modified: ctp2_code\gfx\spritesys\Sprite.h
Modified: ctp2_code\gfx\spritesys\SpriteGroup.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h
Modified: ctp2_code\gfx\tilesys\TileHighlight.cpp
Modified: ctp2_code\gs\gameobj\unitevent.cpp
Modified: ctp2_code\gs\gameobj\Vision.cpp
Modified: ctp2_code\gs\utility\Globals.h

[Ekmek]

Revision 687

tiledmap.cpp & h
tiledraw.cpp & h
- Added IsReligion1
- Added BorderIcons
- Aligned Cityname and poprect


tileset.h
buildingutil.cpp & h
CityData.cpp & h
Unit.cpp & h
buiding cdb
UnSeenCell.cpp & h
- Added IsReligious flags and bools


graphics/pictures/
- added new MAPICONS for borders and religions


updated README

U trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
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/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/Unit.cpp
U trunk/ctp2_code/gs/gameobj/Unit.h
U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/UnitData.h
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/world/UnseenCell.cpp
U trunk/ctp2_code/gs/world/UnseenCell.h
U trunk/ctp2_data/default/graphics/pictures/upc053.TGA
U trunk/ctp2_data/default/graphics/pictures/upc054.TGA
U trunk/ctp2_data/default/graphics/pictures/upc055.TGA
U trunk/ctp2_data/default/graphics/pictures/upc056.TGA
A trunk/ctp2_data/default/graphics/pictures/upc057.tga
A trunk/ctp2_data/default/graphics/pictures/upc058.tga
A trunk/ctp2_data/default/graphics/pictures/upc059.tga
A trunk/ctp2_data/default/graphics/pictures/upc060.tga
A trunk/ctp2_data/default/graphics/pictures/upc061.tga
A trunk/ctp2_data/default/graphics/pictures/upc062.tga
A trunk/ctp2_data/default/graphics/pictures/upc063.tga
A trunk/ctp2_data/default/graphics/pictures/upc064.tga
A trunk/ctp2_data/default/graphics/pictures/upc065.tga
A trunk/ctp2_data/default/graphics/pictures/upc066.tga
U trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 688

Some cleanings, fixings and a new GetContinentSize slic function.

Added some experimental but unused stuff:
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/world/MapPoint.cpp
modified trunk/ctp2_code/gs/world/MapPoint.h

Fixed the white space usage so that all the stuff is again neatly aligned:
modified trunk/ctp2_data/default/aidata/personalities.txt

Some BOOL to bool replacements and added IsOnSameContinent method:
modified trunk/ctp2_code/gs/world/wldgen.cpp
modified trunk/ctp2_code/gs/world/World.h
modified trunk/ctp2_code/gs/world/WrldCont.cpp
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/gfx/spritesys/director.cpp
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified trunk/ctp2_code/ai/strategy/agents/ctpagent.cpp
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp

Fixed UnseenCell since a uint16 just contains 16 bits and so you cannot use more. Therefore you have to find another way to store the icons about the religious nonsense on the map:
modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
modified trunk/ctp2_code/gs/world/UnseenCell.cpp
modified trunk/ctp2_code/gs/world/UnseenCell.h

The settle cell value can now also be displayed in a non-debug version:
modified trunk/ctp2_code/ai/mapanalysis/settlemap.cpp

Added is on same continent slic function
modified trunk/ctp2_code/gs/slic/SlicEngine.cpp
modified trunk/ctp2_code/gs/slic/slicfunc.cpp
modified trunk/ctp2_code/gs/slic/SlicFunc.h

[Martin Gühmann]

Revision 689

Some cleanings and additions, especially made the war over message appear and fixed the progress bars of the various progress bar buttons on the GUI.

Some cleanings:
modified trunk/ctp2_code/ui/aui_ctp2/SelItem.cpp


Added a way to get the fraction of advance completeness:
modified trunk/ctp2_code/gs/gameobj/Advances.cpp
modified trunk/ctp2_code/gs/gameobj/Advances.h

Added a way to disable ForceSelect:
modified trunk/ctp2_code/ui/aui_ctp2/ctp2_dropdown.cpp
modified trunk/ctp2_code/ui/aui_ctp2/ctp2_dropdown.h

On player change the city list of the city control panel is now updated:
modified trunk/ctp2_code/ui/interface/scenarioeditor.cpp

Fixed an assert that had been fixed before, moved the city icons right so that they don't overlap the "turns to next pop box", and added an option so that you can decide between the smooth borders and the squre borders. (Actually E, you should use the computer to draw the borders instead of using icons. This way they would look much better and would be more flexible)
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp

Added suare/smooth borders option:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

Made war over message used:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

Added or made work or cleaned the progress bars of all the advance and build item select buttons work:
modified trunk/ctp2_code/ui/interface/CityControlPanel.cpp
modified trunk/ctp2_code/ui/interface/CityControlPanel.h
modified trunk/ctp2_code/ui/interface/citywindow.cpp
modified trunk/ctp2_code/ui/interface/DomesticControlPanel.cpp
modified trunk/ctp2_code/ui/interface/DomesticControlPanel.h
modified trunk/ctp2_code/ui/interface/ScienceManagementDialog.cpp
modified trunk/ctp2_code/ui/interface/ScienceManagementDialog.h

[Fromafar]

Revision 690

Repaired memory leaks
Modified: ctp2_code\gs\newdb\CTPRecord.cpp

Removed non-standard qualifications and added todo remark for E.
Modified: ctp2_code\gs\gameobj\citydata.h

Various cleanups
Modified: ctp2_code\gs\gameobj\GSLogs.cpp
Modified: ctp2_code\gs\gameobj\ID.h
Modified: ctp2_code\gs\gameobj\Player.cpp
Modified: ctp2_code\gs\gameobj\Unit.cpp
Modified: ctp2_code\gs\gameobj\Unit.h
Modified: ctp2_code\gs\gameobj\UnitData.cpp
Modified: ctp2_code\gs\gameobj\UnitData.h
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\mapgen\PlasmaGen2.cpp
Modified: ctp2_code\net\general\net_action.cpp
Modified: ctp2_code\robot\aibackdoor\dynarr.h
Modified: ctp2_code\robot\pathing\Astar.h
Modified: ctp2_code\robot\pathing\AstarPnt.cpp
Modified: ctp2_code\robot\pathing\Path.cpp
Modified: ctp2_code\robot\pathing\astar.cpp
Modified: ctp2_code\robot\pathing\astarpnt.h

[Fromafar]

Revision 691 Compiler complaints handled

Modified: ctp2_code\ui\interface\DiplomacyDetails.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.h
Modified: ctp2_code\ui\interface\greatlibrary.h
Modified: ctp2_code\ui\interface\intelligencewindow.cpp
Modified: ctp2_code\ui\interface\trademanager.cpp
Modified: ctp2_code\ui\netshell\allinonewindow.cpp
Modified: ctp2_code\ui\netshell\gameselectwindow.cpp

[Ekmek]

Revision 692

gameobj\Unit.cpp & h
- Added IsHiddenNationality method
spritesys\UnitActor.cpp
- Implemented HiddenNationality
- Added Civilization Flag

tilesys/tiledmap.cpp
- added outmment about vanish and visible goods

tilesys/tileset.h
- Added 70 MAPICONs for civflags

aui_ctp2/InfoBar.cpp
- added hiddennationality Check

layouts/science.ldl
- moved goal text to be in line with new bigger size

ctp2_data/default/graphics/pictures/
- added 70 civflag tgas
- modified the old heralds to just be numbers

UPDATED README

[Ekmek]

Revision 693

gfx/spritesys/director.cpp
- added note where crash was, no changes
gfx/spritesys/UnitActor.cpp
- added profile option for civflags
- added unit.isvalid check to prevent scenario crash
gs/database/profileDB.cpp & h
gamedata/ldl_str.txt
- added new profile options
- implemented only civflag and energy profile options

gs/dbgen/dbgen.dsp
- added my religion.cdb but it didn't compile or make record.cpps

gs/gameobj/ArmyData.cpp
- added slic messages for sinkingships, guerrilla spawn, hostile terrain
- added risk dependency for hostile terrain
gs/gameobj/CityData.cpp
- added slic msg for insurgent spawn
- added energy code (profile enabled) a modifier for production and gold also two methods that calculate how much a city is produces or consuming
gs/gameobj/buildingutil.cpp & h
- added energy building methods to go with flags
gs/gameobj/Player.cpp & h
- added energy
gs/gameobj/terrainutil.cpp
- added note for possible obsolete tileimp defect
gs/gameobj/UnitData.cpp
- added spawnbarbarian code from armydata
gs/gameobj/wonderutil.cpp&h
- added energy methods

gs/newdb/building.cdb
gs/newdb/terrain.cdb
gs/newdb/TerrainImprovement.cdb
gs/newdb/unit.cdb
gs/newdb/wonder.cdb
- added energy flags
- only to buildings did i add an IsReligion int flag to be done later

ui/interface/controlpanelwindow.cpp & h
uidata/layouts/controlpanel.ldl
- restored fifth button on the tileimp panel so modders can use 60 of the 64 possible tileimps, currently limited to 48 of 60.

gamedata/info_str.txt
- added new slic messages (all languages)

graphics/pictures/upc.tgas
- restored original flags because Fromafar felt the colors were too hard to spot
- modified civ flags to be below the colored heralds (visible only when enabled in userprofile.txt)

default/gamedata/script.slc
- added three more slic messages

Scenarios/AE_Mod/scen0000/english/gamedata/gl_str.txt
Scenarios/AE_Mod/scen0000/english/gamedata/Great_Library.txt
- moved these files were in the wrong spot

Scenarios/AE_Mod/scen0000/english/gamedata/unit.txt
- fixed cruisemissile bug

doc/user/playtest/Apolyton_README.txt
- UPDATED README


U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Units.txt
D trunk/Scenarios/AE_Mod/scen0000/english/Great_Library.txt
A trunk/Scenarios/AE_Mod/scen0000/english/gamedata/
A trunk/Scenarios/AE_Mod/scen0000/english/gamedata/Great_Library.txt
A trunk/Scenarios/AE_Mod/scen0000/english/gamedata/gl_str.txt
D trunk/Scenarios/AE_Mod/scen0000/english/gl_str.txt
U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gfx/spritesys/director.cpp
U trunk/ctp2_code/gs/database/profileDB.cpp
U trunk/ctp2_code/gs/database/profileDB.h
U trunk/ctp2_code/gs/dbgen/dbgen.dsp
U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/Player.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/gameobj/player.h
U trunk/ctp2_code/gs/gameobj/terrainutil.cpp
U trunk/ctp2_code/gs/gameobj/wonderutil.cpp
U trunk/ctp2_code/gs/gameobj/wonderutil.h
U trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb
U trunk/ctp2_code/gs/newdb/building.cdb
U trunk/ctp2_code/gs/newdb/terrain.cdb
U trunk/ctp2_code/gs/newdb/unit.cdb
U trunk/ctp2_code/gs/newdb/wonder.cdb
U trunk/ctp2_code/mapgen/Crater.dsp
U trunk/ctp2_code/ui/interface/controlpanelwindow.cpp
U trunk/ctp2_code/ui/interface/controlpanelwindow.h
U trunk/ctp2_data/default/gamedata/script.slc
U trunk/ctp2_data/default/graphics/pictures/upc006.tga
U trunk/ctp2_data/default/graphics/pictures/upc012.tga
U trunk/ctp2_data/default/graphics/pictures/upc013.tga
U trunk/ctp2_data/default/graphics/pictures/upc014.tga
U trunk/ctp2_data/default/graphics/pictures/upc015.tga
U trunk/ctp2_data/default/graphics/pictures/upc016.tga
U trunk/ctp2_data/default/graphics/pictures/upc017.tga
U trunk/ctp2_data/default/graphics/pictures/upc018.tga
U trunk/ctp2_data/default/graphics/pictures/upc019.tga
U trunk/ctp2_data/default/graphics/pictures/upc049.tga
U trunk/ctp2_data/default/graphics/pictures/upc050.tga
U trunk/ctp2_data/default/graphics/pictures/upc051.tga
U trunk/ctp2_data/default/graphics/pictures/upc067.tga
U trunk/ctp2_data/default/graphics/pictures/upc068.tga
U trunk/ctp2_data/default/graphics/pictures/upc069.tga
U trunk/ctp2_data/default/graphics/pictures/upc070.tga
U trunk/ctp2_data/default/graphics/pictures/upc071.tga
U trunk/ctp2_data/default/graphics/pictures/upc072.tga
U trunk/ctp2_data/default/graphics/pictures/upc073.tga
U trunk/ctp2_data/default/graphics/pictures/upc074.tga
U trunk/ctp2_data/default/graphics/pictures/upc075.tga
U trunk/ctp2_data/default/graphics/pictures/upc076.tga
U trunk/ctp2_data/default/graphics/pictures/upc077.tga
U trunk/ctp2_data/default/graphics/pictures/upc078.tga
U trunk/ctp2_data/default/graphics/pictures/upc079.tga
U trunk/ctp2_data/default/graphics/pictures/upc080.tga
U trunk/ctp2_data/default/graphics/pictures/upc081.tga
U trunk/ctp2_data/default/graphics/pictures/upc082.tga
U trunk/ctp2_data/default/graphics/pictures/upc083.tga
U trunk/ctp2_data/default/graphics/pictures/upc084.tga
U trunk/ctp2_data/default/graphics/pictures/upc085.tga
U trunk/ctp2_data/default/graphics/pictures/upc086.tga
U trunk/ctp2_data/default/graphics/pictures/upc087.tga
U trunk/ctp2_data/default/graphics/pictures/upc088.tga
U trunk/ctp2_data/default/graphics/pictures/upc089.tga
U trunk/ctp2_data/default/graphics/pictures/upc090.tga
U trunk/ctp2_data/default/graphics/pictures/upc091.tga
U trunk/ctp2_data/default/graphics/pictures/upc092.tga
U trunk/ctp2_data/default/graphics/pictures/upc093.tga
U trunk/ctp2_data/default/graphics/pictures/upc094.tga
U trunk/ctp2_data/default/graphics/pictures/upc095.tga
U trunk/ctp2_data/default/graphics/pictures/upc096.tga
U trunk/ctp2_data/default/graphics/pictures/upc097.tga
U trunk/ctp2_data/default/graphics/pictures/upc098.tga
U trunk/ctp2_data/default/graphics/pictures/upc099.tga
U trunk/ctp2_data/default/graphics/pictures/upc100.tga
U trunk/ctp2_data/default/graphics/pictures/upc101.tga
U trunk/ctp2_data/default/graphics/pictures/upc102.tga
U trunk/ctp2_data/default/graphics/pictures/upc103.tga
U trunk/ctp2_data/default/graphics/pictures/upc104.tga
U trunk/ctp2_data/default/graphics/pictures/upc105.tga
U trunk/ctp2_data/default/graphics/pictures/upc106.tga
U trunk/ctp2_data/default/graphics/pictures/upc107.tga
U trunk/ctp2_data/default/graphics/pictures/upc108.tga
U trunk/ctp2_data/default/graphics/pictures/upc109.tga
U trunk/ctp2_data/default/graphics/pictures/upc110.tga
U trunk/ctp2_data/default/graphics/pictures/upc111.tga
U trunk/ctp2_data/default/graphics/pictures/upc112.tga
U trunk/ctp2_data/default/graphics/pictures/upc113.tga
U trunk/ctp2_data/default/graphics/pictures/upc114.tga
U trunk/ctp2_data/default/graphics/pictures/upc115.tga
U trunk/ctp2_data/default/graphics/pictures/upc116.tga
U trunk/ctp2_data/default/graphics/pictures/upc117.tga
U trunk/ctp2_data/default/graphics/pictures/upc118.tga
U trunk/ctp2_data/default/graphics/pictures/upc119.tga
U trunk/ctp2_data/default/graphics/pictures/upc120.tga
U trunk/ctp2_data/default/graphics/pictures/upc121.tga
U trunk/ctp2_data/default/graphics/pictures/upc122.tga
U trunk/ctp2_data/default/graphics/pictures/upc123.tga
U trunk/ctp2_data/default/graphics/pictures/upc124.tga
U trunk/ctp2_data/default/graphics/pictures/upc125.tga
U trunk/ctp2_data/default/graphics/pictures/upc126.tga
U trunk/ctp2_data/default/graphics/pictures/upc127.tga
U trunk/ctp2_data/default/graphics/pictures/upc128.tga
U trunk/ctp2_data/default/graphics/pictures/upc129.tga
U trunk/ctp2_data/default/graphics/pictures/upc130.tga
U trunk/ctp2_data/default/graphics/pictures/upc131.tga
U trunk/ctp2_data/default/graphics/pictures/upc132.tga
U trunk/ctp2_data/default/graphics/pictures/upc133.tga
U trunk/ctp2_data/default/graphics/pictures/upc134.tga
U trunk/ctp2_data/default/graphics/pictures/upc135.tga
U trunk/ctp2_data/default/graphics/pictures/upc136.tga
U trunk/ctp2_data/default/graphics/pictures/upc137.tga
U trunk/ctp2_data/english/gamedata/info_str.txt
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/controlpanel.ldl
U trunk/ctp2_data/french/gamedata/Info_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/french/uidata/layouts/controlpanel.ldl
U trunk/ctp2_data/german/gamedata/info_str.txt
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/controlpanel.ldl
U trunk/ctp2_data/italian/gamedata/info_str.txt
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/controlpanel.ldl
U trunk/ctp2_data/japanese/gamedata/ldl_str.txt
U trunk/ctp2_data/japanese/uidata/layouts/controlpanel.ldl
U trunk/ctp2_data/spanish/gamedata/info_str.txt
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/controlpanel.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

[Fromafar]

Revision 694, 695, 696, 697, 698 Actor redesign

Modified: ctp2_code\gfx\spritesys\Actor.cpp
Modified: ctp2_code\gfx\spritesys\Actor.h
Modified: ctp2_code\gfx\spritesys\EffectActor.cpp
Modified: ctp2_code\gfx\spritesys\EffectActor.h
Modified: ctp2_code\gfx\spritesys\GoodActor.h
Modified: ctp2_code\gfx\spritesys\UnitActor.h
Modified: ctp2_code\gfx\spritesys\battleviewactor.cpp
Modified: ctp2_code\gfx\spritesys\director.cpp
Modified: ctp2_code\gfx\spritesys\goodactor.cpp
Modified: ctp2_code\gfx\spritesys\DirectorActions.cpp
Modified: ctp2_code\gfx\spritesys\directoractions.h
Modified: ctp2_code\gfx\spritesys\UnitActor.cpp
Modified: ctp2_code\gfx\spritesys\action.cpp
Modified: ctp2_code\gfx\spritesys\Action.h
Modified: ctp2_code\gfx\tilesys\TileInfo.cpp

Commit seems to work for me only when not including too many files at once, so this may take a while.

@E: When you add .cdb-files, you should do this in the main (ctp2) project, and not in the other (dbgen, Crater) projects.

[Edit: updated after successfully committing revisions 695-698]

[Fromafar]

Revision 699 Crash and memory leak handling for score and ranking tabs

Modified: ctp2_code/ui/interface/rankingtab.cpp
Modified: ctp2_code/ui/interface/scoretab.cpp
Modified: ctp2_code/ui/interface/scoretab.h

[Martin Gühmann]

Revision 700: Some cleanings and moved the hard encoded map icons into a new map icon database

Cleaned files a little bit:
modified trunk/ctp2_code/ai/diplomacy/sstateevent.cpp
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified trunk/ctp2_code/gfx/spritesys/director.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledmap.h

Made the code compile again in the Final version (I have no idea why it compiled in the debug version):
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Removed useless files:
deleted trunk/ctp2_data/default/graphics/pictures/upc006.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc012.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc013.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc014.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc015.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc016.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc017.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc018.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc019.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc049.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc050.tga
deleted trunk/ctp2_data/default/graphics/pictures/upc051.tga

Restored project files:
modified trunk/ctp2_code/gs/dbgen/dbgen.dsp
modified trunk/ctp2_code/mapgen/Crater.dsp

Since not all those new options are implemented, and E failed to provide a full list of working ones and actually most of them aren't profile options anyway but rather database flags, I removed them from the advanced options dialog. Only the show national unit flag option makes sense to me and therefore I left it and made it enabled by default:
modified trunk/ctp2_code/gs/database/profileDB.cpp

Moved some duplicated code into its own function:
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
modified trunk/ctp2_code/ui/aui_utils/primitives.cpp
modified trunk/ctp2_code/ui/aui_utils/primitives.h

Added a new map icon database and moved the hard encoded map icons to that database:
modified trunk/ctp2_code/ctp/civapp.cpp
modified trunk/ctp2_code/ctp/civctp.dsp
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gfx/tilesys/tileset.cpp
modified trunk/ctp2_code/gfx/tilesys/tileset.h
modified trunk/ctp2_code/gs/newdb/CTPDatabase.cpp
modified trunk/ctp2_code/gs/utility/gameinit.cpp
modified trunk/ctp2_code/gs/newdb/unit.cdb
modified trunk/ctp2_data/default/gamedata/concepticon.txt

Added to each civ the national unit flag:
modified trunk/ctp2_code/gs/newdb/Civilisation.cdb
modified trunk/ctp2_data/default/gamedata/civilisation.txt

[Fromafar]

Revision 701 Typo corrected

Modified: ctp2_code\gfx\spritesys\UnitActor.cpp
Modified: ctp2_code\gs\gameobj\Unit.cpp
Modified: ctp2_code\gs\gameobj\Unit.h

[Fromafar]

Revision 702 Compatibility fixes for the Alexander scenario

Modified: ctp2_code\gs\database\profileDB.cpp
Modified: ctp2_data\english\gamedata\gl_str.txt
Modified: ctp2_data\english\gamedata\ldl_str.txt

[Fromafar]

Revision 703 Compiler complaints handled

Modified: ctp2_code\gs\gameobj\citydata.h
Modified: ctp2_code\net\general\net_chat.cpp
Modified: ctp2_code\net\general\net_chat.h
Modified: ctp2_code\net\general\net_cheat.cpp
Modified: ctp2_code\net\general\net_city.cpp
Modified: ctp2_code\net\general\network.cpp
Modified: ctp2_code\net\io\net_anet.cpp
Modified: ctp2_code\net\io\net_anet.h
Modified: ctp2_code\net\io\net_util.h
Modified: ctp2_code\ui\netshell\netfunc.h