Announcement

**ctplinuxfan** · January 16, 2006, 16:43

Revision 532
Changed paths:
M /branches/linux

Merged r452 from /trunk to /branches/linux
r452@ctp2.kaan.dk: Martin G??hmann | 2005-09-11 00:25:50 +0200
Initialized local variables, removed some unused code, outcommented some unuse
d code, removed some unused local variables:
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/ctpai.cpp
modified ctp2_code/ai/diplomacy/diplomat.cpp
modified ctp2_code/ai/diplomacy/foreigner.cpp
modified ctp2_code/ai/diplomacy/nproposalevent.cpp
modified ctp2_code/ai/diplomacy/proposalresponseevent.cpp
modified ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified ctp2_code/ctp/civ3_main.cpp
modified ctp2_code/ctp/ctp2_utils/c3files.cpp
modified ctp2_code/ctp/debugtools/debugcallstack.cpp
modified ctp2_code/gfx/gfx_utils/ColorSet.cpp
modified ctp2_code/gfx/gfx_utils/targautils.cpp
modified ctp2_code/gfx/gfx_utils/tiffutils.cpp
modified ctp2_code/gfx/layers/citylayer.cpp
modified ctp2_code/gfx/spritesys/director.cpp
modified ctp2_code/gfx/spritesys/directorevent.cpp
modified ctp2_code/gfx/spritesys/EffectActor.cpp
modified ctp2_code/gfx/spritesys/FacedSpriteWshadow.cpp
modified ctp2_code/gfx/spritesys/goodactor.cpp
modified ctp2_code/gfx/spritesys/spritefile.cpp
modified ctp2_code/gfx/spritesys/SpriteHitTest.cpp
modified ctp2_code/gfx/spritesys/SpriteLow555.cpp
modified ctp2_code/gfx/spritesys/SpriteLow565.cpp
modified ctp2_code/gfx/spritesys/spriteutils.cpp
modified ctp2_code/gfx/spritesys/UnitActor.cpp
modified ctp2_code/gfx/tilesys/tiledmap.cpp
modified ctp2_code/gfx/tilesys/tiledraw.cpp
modified ctp2_code/gfx/tilesys/tileset.cpp
modified ctp2_code/gfx/tilesys/tileutils.cpp
modified ctp2_code/robot/aibackdoor/bset.cpp
modified ctp2_code/robot/aibackdoor/civarchive.cpp
modified ctp2_code/robot/aibackdoor/civarchive.h

**ctplinuxfan** · January 16, 2006, 16:43

Revision 533
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.cpp
M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.h
M /branches/linux/ctp2_code/gfx/spritesys/FacedSpriteWshadow.cpp
M /branches/linux/ctp2_code/gfx/spritesys/FacedSpriteWshadow.h
M /branches/linux/ctp2_code/gfx/spritesys/Sprite.cpp
M /branches/linux/ctp2_code/gfx/spritesys/Sprite.h
M /branches/linux/ctp2_code/gfx/spritesys/SpriteFile.h
M /branches/linux/ctp2_code/gfx/spritesys/spritefile.cpp
M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.cpp
M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.h

Merged r453 from /trunk to /branches/linux
r453@ctp2.kaan.dk: Fromafar | 2005-09-12 21:42:20 +0200
Prevented destructor and zoom-out crashes.

**ctplinuxfan** · January 16, 2006, 16:44

Revision 534
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gfx/spritesys/FacedSpriteWshadow.cpp
M /branches/linux/ctp2_code/gfx/spritesys/Sprite.cpp

- fixed compilation errors

**ctplinuxfan** · January 16, 2006, 16:45

Revision 535
Changed paths:
M /branches/linux

Merged r454 from /trunk to /branches/linux
r454@ctp2.kaan.dk: Martin G??hmann | 2005-09-13 23:48:17 +0200
Topics in alphabetical order now show the right topic:
modified ctp2_code/ui/interface/greatlibrary.cpp
modified ctp2_code/ui/interface/greatlibrary.h
modified ctp2_code/ui/interface/greatlibrarywindow.cpp
modified ctp2_code/ui/interface/greatlibrarywindow.h

Fixed memory leaks:
modified ctp2_code/ctp/civapp.cpp
modified ctp2_code/ui/aui_common/aui_ldl.cpp
modified ctp2_code/ui/aui_common/aui_ldl.h
modified ctp2_code/ui/interface/infowindow.cpp
modified ctp2_code/ui/interface/infowindow.h

Cleaned files since I edited them anyway, no fnctional change:
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/slic/SlicSegment.cpp
modified ctp2_code/ui/aui_common/aui_imagebase.cpp
modified ctp2_code/ui/aui_common/aui_region.cpp

Fixed hypelinks (typos):
modified ctp2_data/english/gamedata/Great_Library.txt
modified ctp2_data/german/gamedata/Great_Library.txt

**ctplinuxfan** · January 16, 2006, 16:46

Revision 536
Changed paths:
M /branches/linux

Merged r457 from /trunk to /branches/linux
r457@ctp2.kaan.dk: Martin G??hmann | 2005-09-15 23:44:27 +0200
Added an alternative leak report, I thought a fresh view might be hwlpfull:
modified ctp2_code/ctp/debugtools/debugcallstack.cpp
modified ctp2_code/ctp/debugtools/debugcallstack.h
modified ctp2_code/ctp/debugtools/debugmemory.cpp

Fixed memory leaks:
modified ctp2_code/gfx/spritesys/goodspritegroup.cpp
modified ctp2_code/gfx/spritesys/GoodSpriteGroup.h
modified ctp2_code/gfx/spritesys/SpriteGroup.cpp
modified ctp2_code/gfx/spritesys/SpriteGroup.h
modified ctp2_code/gfx/spritesys/SpriteGroupList.cpp
modified ctp2_code/gfx/spritesys/UnitSpriteGroup.cpp

Some cosmetical changes (comments and some code cleanup)
modified ctp2_code/gfx/spritesys/Sprite.cpp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/ui/interface/intelligencewindow.cpp

**ctplinuxfan** · January 16, 2006, 16:47

Revision 537
Changed paths:
M /branches/linux

Merged r458 from /trunk to /branches/linux
r458@ctp2.kaan.dk: Martin G??hmann | 2005-09-17 02:22:26 +0200
Added slic database array access:
modified ctp2_code/gs/slic/slic.y
modified ctp2_code/gs/slic/sliccmd.y
modified ctp2_code/gs/slic/SlicDBConduit.h
modified ctp2_code/gs/slic/SlicFrame.cpp
modified ctp2_code/gs/slic/slicif.cpp
modified ctp2_code/gs/slic/slicif.h

Custum structs can now include other structs from the same record class, fix f
or DifficuiltyDB implementation:
modified ctp2_code/gs/dbgen/MemberClass.cpp

Added int and float array accessors.
Fixed float arrays at that occasion. (DifficuiltyDB)
modified ctp2_code/gs/dbgen/RecordDescription.cpp

Added slic risk database access:
modified ctp2_code/gs/slic/SlicEngine.cpp

Added comments (no functional change)
modified ctp2_code/ai/diplomacy/agreementmatrix.cpp

**ctplinuxfan** · January 16, 2006, 16:49

Revision 538
r538 | ctplinuxfan | 2006-01-16 22:22:01 +0100 (Mon, 16 Jan 2006) | 3 lines
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ctp/debugtools/debugmemory.cpp
M /branches/linux/ctp2_code/gs/slic/slicif.cpp

- linux compile fix

**Ekmek** · January 18, 2006, 02:01

Rev539

ai/diplomacy/regardevent.cpp removed refernce to logviolationevent to make SneakAttack work
gs/gamedata/ArmyData.cpp added sneakattack and logviolation event as well as other notes
gs/gameobj/citydata.cpp productionpercent for goods now works (will fix the rest)
gs/gameobj/combatevent.cpp originally was going to remove aftermathevent call but did not (so No Change)
gs/gameobj/player.cpp no changes but added later notes
gs/gameobj/Readiness.cpp nochanges but added notes for HungerGold
gs/gameobj/UnitData.cpp added notes for future stuff, updated combat modifier flags to use XXbonus float
gs/newdb/wonder.cdb added new flag - EnablesPunativeAirstrikes to be implemented in Armydata later
gs/newdb/unit.cdb updated combat modifier flags

**Ekmek** · January 21, 2006, 01:19

Revision 540

gs/gameobj/player.cpp-Settlers can now add to a city!

gs/gameobj/armydata.cpp -CantPillage now works (finally)

-NonLethalBombard

implemented; now the NLB flag doesnt destroy units (but weakens them)
-CanBombardTiles

implemented; Tile Improvements can now be bombarded and destroyed
-CollateralTileDamage

implemeted; if unit has flag it will kill units and the the tile imps they are on
gs/gameobj/unitutil.cpp- no changes just notes
gs/gameobj/terrainutil.cpp-no change
gs/newdb/unit.cdb- NewFlags:
- NonLethalBombard //lessen bombard strengthen like old civ3
- CanBombardTiles //allows bombarding of tile improvements
- CollateralTileDamage //if a defender is ona tile then improvements cut too
- AllTerrainAsImprovement // NOT IMPLEMENTED - like AllTerrainRoads
- ObsoleteByUnit //NOT IMPLEMENTED instead of avdance for later upgrade
gs/newdb/building.cdb- some future use flags
gs/newdb/terrain.cdb- some future use flags
gs/newdb/terrimprove.cdb- cleaned up repeat of cantpillage

**Martin Gühmann** · January 30, 2006, 17:21

Revision 541

Load strings from default files if a mod misses them:
modified ctp2_code/gs/database/StrDB.cpp
modified ctp2_code/gs/database/StrDB.h
modified ctp2_code/gs/fileio/Token.cpp
modified ctp2_code/gs/fileio/Token.h

Added token so that the default strings aren't scanned for missing strings:
modified ctp2_data/english/gamedata/Strings.txt
modified ctp2_data/french/gamedata/Strings.txt
modified ctp2_data/german/gamedata/Strings.txt
modified ctp2_data/italian/gamedata/Strings.txt
modified ctp2_data/spanish/gamedata/Strings.txt

Fixed, added some strings and removed some duplicated strings:
modified ctp2_data/english/gamedata/gl_str.txt
modified ctp2_data/german/gamedata/add_str.txt
modified ctp2_data/german/gamedata/gl_str.txt
modified ctp2_data/german/gamedata/info_str.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/german/gamedata/str_loc.txt
modified ctp2_data/italian/gamedata/ldl_str.txt

And to E: Please put the modifciation description into a format that does not make me to extend the window of TortoiseSVN - Log Messages window so that I can read it without much trouble.

- Martin

**Ekmek** · January 31, 2006, 23:19

Revision 542

gameobj/ArmyData.cpp - updated sneakattack and cantpillage code
gameobj/Player.cpp - cleanup
newdb/terrimprove.cdb - FU flags added
newdb/unit.cdb - FU flags added

**Ekmek** · February 15, 2006, 23:23

Revision 543

Code:

[b]gfx\spritesys\UnitActor.cpp - [/b]less than zero now equals only zero (no longer necessary though)
[b]gfx\tilesys\tiledraw.cpp - [/b]only notes
[b]gs\gameobj\Armydata.cpp - [/b]removed nonlethal check and collateral can now happen for lethal and nonlethal :b:
[b]gs\gameobj\buildingutil.cpp - [/b]add GoldPerCity check (like GoldPerCitizen)
[b]gs\gameobj\buildingutil.h - [/b]added GoldPerCity check (like GoldPerCitizen)
[b]gs\gameobj\citydata.cpp - [/b]added GoldPerCity check (like GoldPerCitizen) :b:
-added OnePerCiv in CanBuildBuilding, now we can make Small Wonders! :b:
[b]gs\gameobj\UnitData.cpp - [/b]NonLethalBombard is now here (notes on AllTerrainAsImp there still trying)
[b]gs\newdb\building.cdb - [/b]updated flags
[b]gs\newdb\unit.cdb - [/b]updated flags
[b]gs\newdb\terrimprove.cdb - [/b]updated flags

I'm adding it as a zip because the server is down and Kaan said february was the end of it...

Attached Files

rev543.2006.02.15.zip (175.4 KB, 90 views)

**Ekmek** · February 25, 2006, 00:47

Revision544

Code:

[b]gs\gameobj\CityData.cpp[/b]
- [i]GoldPerUnit[/i] - like my previous GoldPerCity flag but its just the flag value times the number of units (like Civ3). I stuck it to the palace to represent unit costs. Value seen in City Management (not national)
- [i]GoldPerUnitReadiness[/i] - same as above but added the readiness impact. Value seen in City Management (not national)
- [i]Need Number of buildings to Build[/i] - like the feat it can now be a flag for building a building (especially with OnePerCiv) or a wonder.
[b]gs\gameobj\Player.cpp[/b]
-[i]TotalBuildingUpkeep[/i]: building upkeep also has a negative impact by being affected by your readiness and is deducted from the city gold (I can remove this if too much hate for it but it makes gold and readiness more significant)
[b]gs\gameobj\ArmyData.cpp[/b]
-Fixed Sneak bombard that was causing possible "fugi" crash (I hope)
-added [i]multipleattack[/i] flag but not fully implemented (you can move after attacking or bombarding but not attack again)
[b]gs\gameobj\Readiness.cpp[/b]
[b]gs\gameobj\Readiness.h[/b]
Added but not implemented GoldHunger (like Shieldhunger) to eventually have units with different costs.  I'm thinking to add it to total building upkeep because its in player. not sure what will happen.
[b]gs\gameobj\buildingutil.cpp[/b]
[b]gs\gameobj\buildingutil.h[/b]
- GoldPerUnit & GoldPerUnitReadiness checks added 
[b]gs\gameobj\Unit.cpp[/b]
[b]gs\gameobj\Unit.h[/b]
-GoldHunger Check
-AllTerrainAsImprovement (still trying)

[b]gs\newdb\building.cdb[/b]
GoldPerUnit
GoldPerUnitReadiness
Building Num struct
[b]gs\newdb\terrain.cdb[/b]
TradeGold.TradeProd,TradeFood (future use)
[b]gs\newdb\unit.cdb[/b]
MultipleAttacks
[b]gs\newdb\wonder.cdb[/b]
Building Num struct
[b]gs\newdb\terrimprove.cdb[/b]
TradeGold.TradeProd,TradeFood (future use)

Attached Files