PROJECT: Revision Reports

[ctplinuxfan]

Revision 516
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/Makefile.am
M /branches/linux/ctp2_code/gs/gameobj/TerrImprovePool.cpp
M /branches/linux/ctp2_code/ui/interface/SpecialAttackWindow.cpp
M /branches/linux/ctp2_code/ui/interface/SpecialAttackWindow.h
M /branches/linux/ctp2_code/ui/interface/controlpanelwindow.cpp

r522@linux3: holger | 2006-01-05 09:59:07 +0100
- compile fixes for merge to linux branch

[ctplinuxfan]

Revision 517
Changed paths:
M /branches/linux/ctp2_code/ui/aui_common/aui_resource.h

bugfix: infinite loop in aui_Resource::AddSearchPath

Revision 518
Changed paths:
M /trunk/ctp2_code/ui/aui_common/aui_resource.h

bugfix: infinite loop in aui_Resource::AddSearchPath

[ctplinuxfan]

Revision 519
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ui/aui_common/aui_resource.h

- bugfix: size_t result by strlen()

[ctplinuxfan]

Revision 520
Changed paths:
M /branches/linux

Merged -r442 from /trunk to /branches/linux:
r442@ctp2.kaan.dk: Martin G??hmann | 2005-08-28 20:05:04 +0200
Replaced old civilisation database by new one.
Made the progress bar more fluently.
Fixed MP databse sync check.
Made it so that civilisation.txts in old layout can still be loaded.

Updated dbgen:
-Added new aka token to the cdb files so that the civilisation.txt can be conv
erted to the new layout, but a civilisation.txt in the old layout can still be l
oaded.
-Added the possibility to assign the value of a flag of another flag as defaul
t value, for female leader pic support of CivilisationDB.
-Modified the files so that the generated output files only use spaces as inde
ntion and correct indention.
-Added serailize method generation for datachecks, note that the government mo
dified serialization has still to be done. Note only serialization is tested as
it is needed for MP database sync check, deserialisation is untested.
modified ctp2_code/gs/dbgen/ctpdb.cpp
modified ctp2_code/gs/dbgen/ctpdb.h
modified ctp2_code/gs/dbgen/ctpdb.l
modified ctp2_code/gs/dbgen/ctpdb.y
modified ctp2_code/gs/dbgen/Datum.cpp
modified ctp2_code/gs/dbgen/Datum.h
modified ctp2_code/gs/dbgen/dbgen.dsp
modified ctp2_code/gs/dbgen/MemberClass.cpp
modified ctp2_code/gs/dbgen/MemberClass.h
modified ctp2_code/gs/dbgen/RecordDescription.cpp
modified ctp2_code/gs/dbgen/RecordDescription.h

Added Serialization methods, fix the alpha-num sorter, so it works now like in
the old databases, used in the Civilisation selection screen.
modified ctp2_code/gs/newdb/CTPDatabase.cpp
modified ctp2_code/gs/newdb/CTPDatabase.h

Added comments, casts, modified wide space, removed unneeded includes, mainly
of CivilisationDB.h:
modified ctp2_code/gs/newdb/CTPRecord.cpp
modified ctp2_code/gs/newdb/CTPRecord.h
modified ctp2_code/ctp/civ3_main.cpp
modified ctp2_code/gfx/spritesys/UnitActor.cpp
modified ctp2_code/gs/database/DB.cpp
modified ctp2_code/gs/database/StrDB.cpp
modified ctp2_code/gs/fileio/Token.cpp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/PlayerAI.cpp
modified ctp2_code/gs/gameobj/terrainutil.cpp
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/utility/gameinit.cpp
modified ctp2_code/gs/utility/stringutils.cpp
modified ctp2_code/gs/utility/stringutils.h
modified ctp2_code/net/general/net_feat.cpp
modified ctp2_code/net/general/net_packet.h
modified ctp2_code/ui/aui_ctp2/c3dropdown.cpp
modified ctp2_code/ui/interface/battleview.cpp
modified ctp2_code/ui/interface/chatbox.cpp
modified ctp2_code/ui/interface/infowin.cpp
modified ctp2_code/ui/interface/initialplaywindow.cpp
modified ctp2_code/ui/interface/loadsavewindow.cpp
modified ctp2_code/ui/interface/optionswindow.cpp
modified ctp2_code/ui/interface/progresswindow.cpp
modified ctp2_code/ui/interface/progresswindow.h
modified ctp2_code/ui/interface/scenariowindow.cpp
modified ctp2_code/ui/interface/spnewgamescreen.cpp
modified ctp2_code/ui/interface/spwindow.cpp
modified ctp2_code/ui/interface/victorywin.cpp

Added new civilisation database generator file for the new civilisation databa
se:
added ctp2_code/gs/newdb/Civilisation.cdb
Replaced old civilisation database by new one:
modified ctp2_code/ai/diplomacy/diplomat.cpp
modified ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
modified ctp2_code/gs/database/profileDB.cpp
modified ctp2_code/gs/gameobj/Civilisation.cpp
modified ctp2_code/gs/gameobj/CivilisationData.cpp
modified ctp2_code/gs/gameobj/CivilisationData.h
modified ctp2_code/gs/gameobj/civilisationpool.cpp
modified ctp2_code/gs/slic/SlicBuiltin.cpp
modified ctp2_code/gs/slic/slicfunc.cpp
modified ctp2_code/net/general/net_civ.cpp
modified ctp2_code/ui/interface/hotseatlist.cpp
modified ctp2_code/ui/interface/loadsavescreen.cpp
modified ctp2_code/ui/interface/scenarioeditor.cpp
modified ctp2_code/ui/interface/spnewgametribescreen.cpp
modified ctp2_code/ui/interface/spnewgamewindow.cpp
modified ctp2_code/ui/netshell/ns_tribes.cpp

Replaced old civilisation database by new one, fixed the progress bar:
modified ctp2_code/ctp/civapp.cpp
modified ctp2_code/gs/fileio/GameFile.cpp

Removed old civilisation database files, added new civilisation database files
and added some more dependencies to other database files:
modified ctp2_code/ctp/civctp.dsp

Replaced the OK button on the db error dialog by a Yes and a No button with th
e possibility to end the game:
modified ctp2_code/ctp/ctp2_utils/c3errors.cpp

Added slic access to the civilsation database:
modified ctp2_code/gs/slic/SlicEngine.cpp

Fixed the datacheck utility (needs database serialization):
modified ctp2_code/gs/utility/DataCheck.cpp
modified ctp2_code/gs/utility/DataCheck.h

Replaced old civilisation databse by new one, fixed the MP database sync check
(needs databse serialisation):
modified ctp2_code/net/general/net_crc.cpp
modified ctp2_code/net/general/net_crc.h
modified ctp2_code/net/general/network.cpp

Added << and >> operators for char pointers:
modified ctp2_code/robot/aibackdoor/civarchive.h

Replaced old civilisation database by new one, added female leader pics:
modified ctp2_code/ui/interface/dipwizard.cpp

Replaced old civilisation database by new one, fixed age display in the MP sum
mary:
modified ctp2_code/ui/netshell/allinonewindow.cpp

Updated civilisation.txt to the new databse layout added female leader picture
s.
modified ctp2_data/default/gamedata/civilisation.txt

Used the values of ApolytonPack-GoodMod for RoadUtilityBonus, ImproveProductio
nBonus and ImproveGrowthBonus:
modified ctp2_data/default/aidata/strategies.txt

Made the mywindow block loadable, actual that was just playing around.
modified ctp2_data/english/uidata/layouts/civ3.ldl
modified ctp2_data/french/uidata/layouts/civ3.ldl
modified ctp2_data/german/uidata/layouts/civ3.ldl
modified ctp2_data/italian/uidata/layouts/civ3.ldl
modified ctp2_data/italian/uidata/layouts/ns_strings.ldl
modified ctp2_data/japanese/uidata/layouts/civ3.ldl
modified ctp2_data/spanish/uidata/layouts/civ3.ldl

Fixed the world shape string order for MP:
modified ctp2_data/english/uidata/layouts/ns_strings.ldl
modified ctp2_data/french/uidata/layouts/ns_strings.ldl
modified ctp2_data/german/uidata/layouts/ns_strings.ldl
modified ctp2_data/japanese/uidata/layouts/ns_strings.ldl
modified ctp2_data/spanish/uidata/layouts/ns_strings.ldl

[ctplinuxfan]

Revision 521
r521 | ctplinuxfan | 2006-01-16 22:17:40 +0100 (Mon, 16 Jan 2006) | 4 lines
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ai/diplomacy/diplomat.cpp
M /branches/linux/ctp2_code/ctp/civapp.cpp
M /branches/linux/ctp2_code/gs/newdb/CTPDatabase.cpp
M /branches/linux/ctp2_code/gs/newdb/Makefile.am
M /branches/linux/ctp2_code/os/nowin32/nowin32.cpp
M /branches/linux/ctp2_code/os/nowin32/windows.h

- compilation fixes
- added _stricoll implementation for linux

[ctplinuxfan]

Revision 522
Changed paths:
M /branches/linux

Merged r443 from /trunk to /branches/linux
r443@ctp2.kaan.dk: Martin G??hmann | 2005-08-30 00:13:44 +0200
Replaced old risk database by new one.
The good sprite index is now taken from the ressource database instead of the
good's sprite database
Removed some unused old databases
Fixed the single player game player selection scrren: The right color set is n
ow used.

Remoded refferences to old sprite state and risk databases
modified ctp2_code/ctp/civ3_main.cpp
modified ctp2_code/gs/fileio/GameFile.cpp
modified ctp2_code/gs/utility/gameinit.cpp

Removed the old sprite state, endgame and risk databases.
Added new risk database.
Fixed the single player new game player select window, now the right color set
is used. (Well next time I restore the order of the ColorXX.txts That's requ
ires less thinking )
modified ctp2_code/ctp/civapp.cpp

Removed files of old order, sprite state, endgame, installation and risk datab
ases.
Added files of new risk database.
modified ctp2_code/ctp/civctp.dsp

Cleaned files removed unnecessary include files, in most files only files remo
ved of old removed databases, some comments added:
modified ctp2_code/gfx/spritesys/battleviewactor.cpp
modified ctp2_code/gfx/spritesys/UnitActor.cpp
modified ctp2_code/gs/gameobj/ArmyData.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/net/general/net_endgame.cpp
modified ctp2_code/ui/interface/battle.cpp
modified ctp2_code/ui/interface/battleview.cpp

Good sprite index is now retrieved from the resource database instead of the g
ood's sprite state database, fixed comments.
modified ctp2_code/gfx/spritesys/TradeActor.cpp
modified ctp2_code/gfx/tilesys/tiledmap.cpp
modified ctp2_code/gs/gameobj/Wormhole.cpp
modified ctp2_code/gs/newdb/Civilisation.cdb

Removed old endgame, installation and risk database.
modified ctp2_code/gs/database/DB.cpp

File renamed so that it doesn't interfere with the new risk database.
deleted ctp2_code/gs/database/RiskRecord.h
added ctp2_code/gs/database/RiskRecordOld.h

Replaced old risk database by new one:
modified ctp2_code/gs/gameobj/barbarians.cpp
modified ctp2_code/gs/gameobj/GoodyHuts.cpp
modified ctp2_code/gs/gameobj/GoodyHuts.h
modified ctp2_code/ui/interface/scenarioeditor.cpp

Outcommented refferences to old endgame database:
modified ctp2_code/gs/gameobj/bldque.cpp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/slic/slicfunc.cpp
modified ctp2_code/ui/interface/infowin.cpp

Added new risk database
modified ctp2_code/gs/newdb/CTPDatabase.cpp
modified ctp2_code/gs/utility/DataCheck.cpp
modified ctp2_code/gs/utility/DataCheck.h
modified ctp2_code/net/general/net_crc.cpp
modified ctp2_code/net/general/net_crc.h

New risk database description:
added ctp2_code/gs/newdb/Risk.cdb

Updated risk.txt to the new database layout:
modified ctp2_data/default/gamedata/risks.txt

[ctplinuxfan]

Revision 523
Changed paths:
M /branches/linux

Merged r444 from /trunk to /branches/linux
r444@ctp2.kaan.dk: Martin G??hmann | 2005-08-31 19:27:52 +0200
Updated string text files:

Added the new cities and civilisation in English translation is still missing:
modified trunk/ctp2_data/spanish/gamedata/civ_str.txt

Moved risk strings to info_str.txt:
modified trunk/ctp2_data/english/gamedata/junk_str.txt
modified trunk/ctp2_data/french/gamedata/junk_str.txt
modified trunk/ctp2_data/german/gamedata/junk_str.txt
modified trunk/ctp2_data/italian/gamedata/junk_str.txt
modified trunk/ctp2_data/spanish/gamedata/junk_str.txt

Moved trust loss strings to info_str.txt:
modified trunk/ctp2_data/english/gamedata/add_str.txt
modified trunk/ctp2_data/french/gamedata/add_str.txt
modified trunk/ctp2_data/german/gamedata/add_str.txt
modified trunk/ctp2_data/italian/gamedata/add_str.txt

In addition moved leader pictures to civ_str.txt and moved build list sequence
string to gl_str.txt:
modified trunk/ctp2_data/spanish/gamedata/add_str.txt

Moved risk strings from junk_str.txt, merged in trust loss strings from add_str.txt, synchronized files:
modified trunk/ctp2_data/english/gamedata/gl_str.txt
modified trunk/ctp2_data/french/gamedata/gl_str.txt
modified trunk/ctp2_data/german/gamedata/gl_str.txt
modified trunk/ctp2_data/italian/gamedata/gl_str.txt

In addition moved in build list sequence strings from add_str.txt and ldl_str.
txt and added new city style, new age strings and new concept strings from CityM
od2:
modified trunk/ctp2_data/spanish/gamedata/gl_str.txt

Merged in trust loss strings from add_str.txt and synchronized files:
modified english/gamedata/info_str.txt
modified trunk/ctp2_data/french/gamedata/Info_str.txt
modified trunk/ctp2_data/german/gamedata/info_str.txt
modified trunk/ctp2_data/italian/gamedata/info_str.txt
modified trunk/ctp2_data/spanish/gamedata/info_str.txt

Some cosmetical changes:
modified trunk/ctp2_data/english/gamedata/civ_str.txt
modified trunk/ctp2_data/french/gamedata/civ_str.txt
modified trunk/ctp2_data/german/gamedata/civ_str.txt
modified trunk/ctp2_data/italian/gamedata/civ_str.txt
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

Moved the build list seuqnce strings to gl_str.txt:
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

[ctplinuxfan]

Revision 524
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/Makefile.am
M /branches/linux/ctp2_code/gfx/spritesys/Makefile.am
M /branches/linux/ctp2_code/gfx/spritesys/battleviewactor.cpp
M /branches/linux/ctp2_code/gs/database/Makefile.am
D /branches/linux/ctp2_code/gs/database/RiskRecord.h
M /branches/linux/ctp2_code/gs/gameobj/Makefile.am
M /branches/linux/ctp2_code/gs/newdb/Makefile.am

- updated linux Makefiles

[ctplinuxfan]

Revision 525
Changed paths:
M /branches/linux

Merged r445 from /trunk to /branches/linux
r445@ctp2.kaan.dk: Martin G??hmann | 2005-09-03 18:31:12 +0200
Database arrays can now be parsed sequentially:

Instead of this:
ConstructionTiles 6
ConstructionTiles 7
ConstructionTiles 7

They can be now put into the database file like this as alternative:
ConstructionTiles 6 7 7

This is useful for the redesign of the DifficuilDB in the new CTP2 database format.
modified ctp2_code/gs/newdb/CTPRecord.cpp
modified ctp2_code/gs/newdb/DBLexer.cpp

Removed some unsused include files:
modified ctp2_code/ctp/civctp.dsp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h

[ctplinuxfan]

Revision 526
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ai/CityManagement/governor.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/ctp2_hypertextbox.cpp
M /branches/linux/ctp2_code/ui/interface/greatlibrary.cpp
M /branches/linux/ctp2_code/ui/interface/greatlibrary.h

Merged r446 from /trunk to /branches/linux
r446@ctp2.kaan.dk: Fromafar | 2005-09-06 23:21:32 +0200
Repaired incorrect data with SendGood event and hyperlink text generation.

[ctplinuxfan]

Revision 527
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gs/gameobj/ArmyData.cpp

Merged r447 from /trunk to /branches/linux

r447@ctp2.kaan.dk: Martin G??hmann | 2005-09-10 23:00:06 +0200
Positions of units on the world map are now updated as well if they are transp
orted.
Initialized some local variables.
modified ctp2_code/gs/gameobj/ArmyData.cpp

[ctplinuxfan]

Revision 528
Changed paths:
M /branches/linux

Merged r448 from /trunk to /branches/linux
r448@ctp2.kaan.dk: Martin G??hmann | 2005-09-10 23:30:43 +0200
Initialized local variables:
modified ctp2_code/ui/ldl/ldl_attr.cpp
modified ctp2_code/ui/netshell/allinonewindow.cpp
modified ctp2_code/ui/netshell/connectionselectwindow.cpp
modified ctp2_code/ui/netshell/dialogboxwindow.cpp
modified ctp2_code/ui/netshell/gameselectwindow.cpp
modified ctp2_code/ui/netshell/lobbychangewindow.cpp
modified ctp2_code/ui/netshell/lobbywindow.cpp
modified ctp2_code/ui/netshell/netshell.cpp
modified ctp2_code/ui/netshell/ns_chatbox.cpp
modified ctp2_code/ui/netshell/ns_customlistbox.cpp
modified ctp2_code/ui/netshell/ns_header.cpp
modified ctp2_code/ui/netshell/ns_header.h
modified ctp2_code/ui/netshell/ns_improvements.cpp
modified ctp2_code/ui/netshell/ns_listbox.h
modified ctp2_code/ui/netshell/ns_tribes.cpp
modified ctp2_code/ui/netshell/ns_units.cpp
modified ctp2_code/ui/netshell/ns_wonders.cpp
modified ctp2_code/ui/netshell/passwordscreen.cpp
modified ctp2_code/ui/netshell/playereditwindow.cpp
modified ctp2_code/ui/netshell/playerselectwindow.cpp
modified ctp2_code/ui/netshell/serverselectwindow.cpp

[ctplinuxfan]

Revision 529
Changed paths:
M /branches/linux

Merged r449 from /trunk to /branches/linux
r449@ctp2.kaan.dk: Martin G??hmann | 2005-09-10 23:38:24 +0200
Initialized local variables:
modified ctp2_code/ui/interface/agesscreen.cpp
modified ctp2_code/ui/interface/armymanagerwindow.cpp
modified ctp2_code/ui/interface/battle.cpp
modified ctp2_code/ui/interface/battleevent.cpp
modified ctp2_code/ui/interface/CityEspionage.cpp
modified ctp2_code/ui/interface/citywindow.cpp
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/creditsscreen.cpp
modified ctp2_code/ui/interface/custommapscreen.cpp
modified ctp2_code/ui/interface/DiplomacyDetails.cpp
modified ctp2_code/ui/interface/diplomacywindow.cpp
modified ctp2_code/ui/interface/dipwizard.cpp
modified ctp2_code/ui/interface/EditQueue.cpp
modified ctp2_code/ui/interface/gameplayoptions.cpp
modified ctp2_code/ui/interface/graphicsresscreen.cpp
modified ctp2_code/ui/interface/greatlibrary.cpp
modified ctp2_code/ui/interface/greatlibrary.h
modified ctp2_code/ui/interface/hotseatlist.cpp
modified ctp2_code/ui/interface/infowin.cpp
modified ctp2_code/ui/interface/intelligencewindow.cpp
modified ctp2_code/ui/interface/IntroMovieWin.cpp
modified ctp2_code/ui/interface/IntroMovieWindow.cpp
modified ctp2_code/ui/interface/km_screen.cpp
modified ctp2_code/ui/interface/loadsavemapscreen.cpp
modified ctp2_code/ui/interface/loadsavemapwindow.cpp
modified ctp2_code/ui/interface/loadsavescreen.cpp
modified ctp2_code/ui/interface/loadsavewindow.cpp
modified ctp2_code/ui/interface/musicscreen.cpp
modified ctp2_code/ui/interface/musictrackscreen.cpp
modified ctp2_code/ui/interface/optionsscreen.cpp
modified ctp2_code/ui/interface/optionwarningscreen.cpp
modified ctp2_code/ui/interface/ProfileEdit.cpp
modified ctp2_code/ui/interface/rankingtab.cpp
modified ctp2_code/ui/interface/scenarioeditor.cpp
modified ctp2_code/ui/interface/sci_advancescreen.cpp
modified ctp2_code/ui/interface/sciencewin.cpp
modified ctp2_code/ui/interface/scorewarn.cpp
modified ctp2_code/ui/interface/soundscreen.cpp
modified ctp2_code/ui/interface/spnewgamediffscreen.cpp
modified ctp2_code/ui/interface/spnewgamemapshapescreen.cpp
modified ctp2_code/ui/interface/spnewgamemapsizescreen.cpp
modified ctp2_code/ui/interface/spnewgameplayersscreen.cpp
modified ctp2_code/ui/interface/spnewgamerandomcustomscreen.cpp
modified ctp2_code/ui/interface/spnewgamerulesscreen.cpp
modified ctp2_code/ui/interface/spnewgamescreen.cpp
modified ctp2_code/ui/interface/spnewgametribescreen.cpp
modified ctp2_code/ui/interface/spriteeditor.cpp
modified ctp2_code/ui/interface/statswindow.cpp
modified ctp2_code/ui/interface/tileimptracker.cpp
modified ctp2_code/ui/interface/trademanager.cpp
modified ctp2_code/ui/interface/tutorialwin.cpp
modified ctp2_code/ui/interface/unitmanager.cpp
modified ctp2_code/ui/interface/victorymoviewin.cpp
modified ctp2_code/ui/interface/victorymoviewindow.cpp
modified ctp2_code/ui/interface/victorywin.cpp
modified ctp2_code/ui/interface/wondermoviewin.cpp
modified ctp2_code/ui/interface/wondermoviewindow.cpp
modified ctp2_code/ui/interface/workwin.cpp

[ctplinuxfan]

Revision 530
Changed paths:
M /branches/linux

Merged r450 from /trunk to /branches/linux
r450@ctp2.kaan.dk: Martin G??hmann | 2005-09-11 00:02:40 +0200
Initialized local variables:
modified aui_common/aui_bitmapfont.cpp
modified aui_common/aui_cursor.cpp
modified aui_common/aui_dropdown.cpp
modified aui_common/aui_header.cpp
modified aui_common/aui_hypertextbase.cpp
modified aui_common/aui_image.cpp
modified aui_common/aui_listbox.cpp
modified aui_common/aui_mouse.cpp
modified aui_common/aui_movie.cpp
modified aui_common/aui_region.cpp
modified aui_common/aui_resource.h
modified aui_common/aui_tab.cpp
modified aui_common/aui_ui.cpp
modified aui_common/aui_window.cpp
modified aui_common/tech_memory.h
modified aui_ctp2/battleorderbox.cpp
modified aui_ctp2/buttonbank.cpp
modified aui_ctp2/c3_button.cpp
modified aui_ctp2/c3_dropdown.cpp
modified aui_ctp2/c3_header.cpp
modified aui_ctp2/c3_hypertextbox.cpp
modified aui_ctp2/c3_popupwindow.cpp
modified aui_ctp2/c3_ranger.cpp
modified aui_ctp2/c3_slidometer.cpp
modified aui_ctp2/c3_utilitydialogbox.cpp
modified aui_ctp2/c3blitter.cpp
modified aui_ctp2/c3dropdown.cpp
modified aui_ctp2/c3fancywindow.cpp
modified aui_ctp2/C3slider.cpp
modified aui_ctp2/c3windows.cpp
modified aui_ctp2/ctp2_hypertextbox.cpp
modified aui_ctp2/linegraph.cpp
modified aui_ctp2/radarmap.cpp
modified aui_ctp2/thronecontrol.cpp
modified aui_utils/primitives.cpp
modified slic_debug/segmentlist.cpp
modified slic_debug/sourcelist.cpp
modified slic_debug/watchlist.cpp

[ctplinuxfan]

Revision 531
Changed paths:
M /branches/linux

Merged r451 from /trunk to /branches/linux
r451@ctp2.kaan.dk: Martin G??hmann | 2005-09-11 00:13:08 +0200
Initialized local variables:
modified ctp2_code/gs/database/PlayListDB.cpp
modified ctp2_code/gs/database/profileDB.cpp
modified ctp2_code/gs/gameobj/AgreementData.cpp
modified ctp2_code/gs/gameobj/barbarians.cpp
modified ctp2_code/gs/gameobj/bldque.cpp
modified ctp2_code/gs/gameobj/FeatTracker.cpp
modified ctp2_code/gs/gameobj/GoodyHuts.cpp
modified ctp2_code/gs/gameobj/GoodyHuts.h
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/gameobj/Wormhole.cpp
modified ctp2_code/gs/slic/SlicFrame.cpp
modified ctp2_code/gs/slic/slicif.cpp
modified ctp2_code/gs/world/cellunitlist.cpp
modified ctp2_code/gs/world/wldgen.cpp
modified ctp2_code/gs/world/WrldCont.cpp
modified ctp2_code/gs/world/WrldPoll.cpp
modified ctp2_code/net/general/net_crc.cpp
modified ctp2_code/net/general/net_endgame.cpp
modified ctp2_code/net/general/net_terrain.cpp
modified ctp2_code/net/general/net_vision.cpp
modified ctp2_code/net/io/net_thread.cpp
modified ctp2_code/sound/soundmanager.cpp

[ctplinuxfan]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]

Revision 543

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

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

[Ekmek]

Revision544

gs\gameobj\CityData.cpp
- GoldPerUnit - 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)
- GoldPerUnitReadiness - same as above but added the readiness impact. Value seen in City Management (not national)
- Need Number of buildings to Build - like the feat it can now be a flag for building a building (especially with OnePerCiv) or a wonder.
gs\gameobj\Player.cpp
-TotalBuildingUpkeep: 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)
gs\gameobj\ArmyData.cpp
-Fixed Sneak bombard that was causing possible "fugi" crash (I hope)
-added multipleattack flag but not fully implemented (you can move after attacking or bombarding but not attack again)
gs\gameobj\Readiness.cpp
gs\gameobj\Readiness.h
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.
gs\gameobj\buildingutil.cpp
gs\gameobj\buildingutil.h
- GoldPerUnit & GoldPerUnitReadiness checks added 
gs\gameobj\Unit.cpp
gs\gameobj\Unit.h
-GoldHunger Check
-AllTerrainAsImprovement (still trying)

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

[Ekmek]

Well since no one even downloaded the above, here is a better armydata.cpp (I wont put it as a rev then)

I'll add these revs if dark hosts

[Ekmek]

not sure how significant this thread will be darkDust has a running log here:

http://ctp2.darkdust.net/archives/ct...602/index.html

accessible from:

http://ctp2.darkdust.net/

He's up to rev550 and didnt include my 543 or 544 so I'll update once I'm approved for access