PROJECT: Revision Reports

[ctplinuxfan]

Revision 432
r432 | ctplinuxfan | 2005-07-24 23:19:34 +0200 (Sun, 24 Jul 2005) | 3 lines
Changed paths:
M /branches/linux/ctp2_code/os/include/config_win32.h

r2449@linux3: holger | 2005-07-24 23:19:36 +0200
- Added CTP2_ENABLE_DEBUGSLIC to config_win32.h (compileflag: ui/slic_debug)

[ctplinuxfan]

Revision 433
Changed paths:
M /branches/linux/configure.in
M /branches/linux/ctp2_code/ctp/c3.h
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/appstrings.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3debug.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3errors.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3mem.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/pointerlist.h
M /branches/linux/ctp2_code/gs/dbgen/Datum.cpp
M /branches/linux/ctp2_code/gs/events/GameEventHook.h
M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
M /branches/linux/ctp2_code/gs/fileio/CivPaths.h
M /branches/linux/ctp2_code/gs/gameobj/Diplomacy_Log.cpp
M /branches/linux/ctp2_code/gs/gameobj/armyevent.cpp
M /branches/linux/ctp2_code/gs/slic/slic.l
M /branches/linux/ctp2_code/gs/utility/QuadTree.h
M /branches/linux/ctp2_code/libs/anet/INSTALL
M /branches/linux/ctp2_code/libs/anet/src/mac/main/MW2TransportMain.cpp
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/robot/aibackdoor/avl.h
M /branches/linux/ctp2_code/robot/pathing/AstarPnt.cpp
M /branches/linux/ctp2_code/robot/pathing/AstarPnt.cpp
M /branches/linux/ctp2_code/robotcom/backdoor/c3mem.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.cpp
M /branches/linux/ctp2_code/ui/interface/NationalManagementDialog.cpp
M /branches/linux/ctp2_code/ui/interface/battleevent.cpp
M /branches/linux/ctp2_code/ui/ldl/ldl.l
M /branches/linux/ctp2_code/ui/ldl/ldl_attr.hpp
M /branches/linux/ctp2_code/ui/ldl/ldl_data.cpp
M /branches/linux/ctp2_code/ui/ldl/ldl_data.hpp
M /branches/linux/ctp2_code/ui/ldl/ldl_list.h
M /branches/linux/ctp2_code/ui/ldl/ldlif.cpp
M /branches/linux/ctp2_code/ui/ldl/ldlif.h

r2451@linux3: holger | 2005-07-31 15:46:19 +0200
- activated YYDEBUG flag again
- added PACKAGE_DATADIR and PACKAGE_SYSCONFDIR for compiled in
additional *nix searchpaths
- further const arguments and return values
- some portability include fixes
- added cdrom related c3files_* functions
- start on ~/.civctp2 for user related game data on *nix

Bugfixes
- added forgotten atexit(AtExitProc);
- hopefully fixed cd drive mount path resolution (cd not mounted case)
- strip out crs in appstr.txt
- added missing destructor for class Datum
- prevent segfault when civpaths.txt is missing
- fixed file seperator for diplomacy_log.txt
- fixed unexpected crashes due to BattleEvent classname dupplicate
(armyevent.cpp: BattleEvent -> BattleEventHook)

[J Bytheway]

Revision 434 (branches/linux)
Changed paths:
Many

Changes to get compilation with debugging symbols defined (--enable-debug
argument to configure):
- Support --enable-debug=full (treated as --enable-debug)
- Define _PLAYTEST as well as _DEBUG
- Add includes
- Guarded Win32 code
- Clarified arguments to DPRINTF
- Sorted initializations
- Fixed casts
- Fixed case of includes
- Changed NULL to 0 when used in arithmetic
- Commented additional tokens after #endif
- Added SDL alternatives to Win32 code
- Added return statement for non-void function SDLMessageHandler
- Replaced multi-character constants
- Added signing casts

[Martin Gühmann]

Revision 435 (trunk)

Added prepartions for redesigning how the resources are computed. Fixed a bug about adding the gold income twice in CityData and removed unecessary and unfinished methods in CityData and renamed members in CityData for clearity:
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h
modified ctp2_code/gs/gameobj/unitutil.cpp
modified ctp2_code/gs/gameobj/unitutil.h

Modified to match with the methods removal in CityData:
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/outcom/C3Player.cpp

Updated to match with the renamed members in CityData:
modified ctp2_code/net/general/net_city.cpp

Cleaned a little bit the syntax:
modified ctp2_code/gs/gameobj/PlayerTurn.cpp

Updated documentation and cleaned white space:
modified ctp2_code/ai/ctpai.cpp
modified ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
modified ctp2_code/gs/gameobj/TradeRouteData.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/slic/slicfunc.cpp

[Martin Gühmann]

Revision 436

Domestic control panel shows now the city limit.
modified trunk/ctp2_data/ui/interface/DomesticControlPanel.cpp

The information window (wonder tab, score tab and ranking tab) stays open and is updated on begin turn of the visible player.
modified trunk/ctp2_data/ui/interface/infowindow.cpp
modified trunk/ctp2_data/ui/interface/infowindow.h
modified trunk/ctp2_data/ui/interface/interfaceevent.cpp
modified trunk/ctp2_data/ui/interface/screenutils.cpp
modified trunk/ctp2_data/ui/interface/screenutils.h

Did more resource calculation replacement preparations:
modified trunk/ctp2_data/gs/gameobj/CityData.cpp
modified trunk/ctp2_data/gs/gameobj/citydata.h

The above and removed unused BeginTurnAllCities method:
modified trunk/ctp2_data/gs/gameobj/Player.cpp
modified trunk/ctp2_data/gs/gameobj/player.h

Opening the score tab of the info window doesn't close other windows anymore like the other tabs:
modified trunk/ctp2_data/ui/aui_ctp2/keypress.cpp

Cleaned files a little bit. Modified comments, white space, added casts.
modified trunk/ctp2_data/ai/diplomacy/Diplomat.h
modified trunk/ctp2_data/ai/diplomacy/sstateevent.cpp
modified trunk/ctp2_data/ctp/civ3_main.cpp
modified trunk/ctp2_data/ctp/civapp.cpp
modified trunk/ctp2_data/ctp/ctp2_utils/c3files.cpp
modified trunk/ctp2_data/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_data/gs/gameobj/CityEvent.cpp
modified trunk/ctp2_data/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_data/gs/gameobj/PlayerTurn.cpp
modified trunk/ctp2_data/gs/gameobj/UnitData.cpp
modified trunk/ctp2_data/ui/aui_common/aui_control.cpp
modified trunk/ctp2_data/ui/interface/controlpanelwindow.cpp
modified trunk/ctp2_data/ui/interface/DomesticControlPanel.h

[Martin Gühmann]

Revision 437 (trunk)

Added more code for the new resource calculation, everything is now at place to start testing, maybe some new GUI elements first for testing purposes and some MP updates. Now the new system is just one precompiler derective away.
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/CityManagement/governor.h
modified ctp2_code/ui/interface/CauseAndEffectTab.cpp
modified ctp2_code/ui/interface/citywindow.cpp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h

Cleaned files modification of white space, removed unused methods, added some comments (minor).
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/UnseenCell.h
modified ctp2_code/ctp/ctp2_utils/c3cmdline.cpp

[Martin Gühmann]

Revision 438 (trunk)

Added gold loss due to conversion and production loss due to franchising to the national manager resource tab. Now you can see how much you lose to other empires, the amount you loose is displayed in the color of the receiver.
modified ctp2_code/ui/interface/NationalManagementDialog.cpp

Added aditional strings for the new feature, added some tooltips for the third tab of the national manager, synchronized files.
modified ctp2_data/english/gamedata/tips_str.txt
modified ctp2_data/french/gamedata/tips_str.txt
modified ctp2_data/german/gamedata/tips_str.txt
modified ctp2_data/italian/gamedata/tips_str.txt
modified ctp2_data/spanish/gamedata/tips_str.txt

Moved some strings to tips_str.txt.
modified ctp2_data/english/gamedata/add_str.txt
modified ctp2_data/french/gamedata/add_str.txt
modified ctp2_data/italian/gamedata/add_str.txt
modified ctp2_data/spanish/gamedata/add_str.txt

Replaced some strings in English by French equevalents, fixed a typo in the English version at that occasion.
modified ctp2_data/english/gamedata/info_str.txt
modified ctp2_data/french/gamedata/Info_str.txt

Updated layout files for additional columns in the national manager resource tab.
modified ctp2_data/english/uidata/layouts/citystatus.ldl
modified ctp2_data/french/uidata/layouts/citystatus.ldl
modified ctp2_data/german/uidata/layouts/citystatus.ldl
modified ctp2_data/italian/uidata/layouts/citystatus.ldl
modified ctp2_data/japanese/uidata/layouts/citystatus.ldl
modified ctp2_data/spanish/uidata/layouts/citystatus.ldl

Added pics for the new two columns.
added ctp2_data/default/graphics/pictures/upic26.tga
added ctp2_data/default/graphics/pictures/upic27.tga

Did some cleaning, white space, comments cast, while I was touching these files in order to make some other modifications that I haven't done yet.
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/intelligencewindow.cpp

[Martin Gühmann]

Revision 439 (trunk)

Added a new special attack window, to display the costs of a special attack on the map:
added ctp2_code/ui/interface/SpecialAttackWindow.cpp
added ctp2_code/ui/interface/SpecialAttackWindow.h

Added the two files above to the project:
modified ctp2_code/ctp/civctp.dsp

Added the new special attack window, and removed three unused functions:
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/controlpanelwindow.h

Added left, center and right to textblttype:
modified ctp2_code/ui/aui_common/aui_textbase.cpp
modified ctp2_code/ui/aui_common/aui_textbase.h

Added the construction time display to the tileimp tracker window.
modified ctp2_code/ui/interface/tileimptracker.cpp

Added the construction time display to the tileimp trcaker window and made the special attack window work:
added ctp2_data/english/uidata/layouts/controlpanel.ldl
added ctp2_data/french/uidata/layouts/controlpanel.ldl
modified ctp2_data/german/uidata/layouts/controlpanel.ldl
modified ctp2_data/italian/uidata/layouts/controlpanel.ldl
added ctp2_data/japanese/uidata/layouts/controlpanel.ldl
modified ctp2_data/spanish/uidata/layouts/controlpanel.ldl

Added a cast:
modified ctp2_code/ui/interface/diplomacywindow.cpp

[Martin Gühmann]

Revision 440 (trunk)

Special attack window only appears if the order in questions costs gold:
modified ctp2_code/ui/interface/SpecialAttackWindow.cpp

Fixed two asserts due to copy and paste errors:
modified ctp2_code/ui/interface/tileimptracker.cpp

Shortend term Population to Pop. for the national manager, except for the German version.
modified ctp2_data/english/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/ldl_str.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/italian/gamedata/ldl_str.txt
modified ctp2_data/spanish/gamedata/ldl_str.txt

[Fromafar]

Revision 441 (trunk) Crash fixes + server test

Repaired crashes when deleting tile improvements.
Modified: ctp2_code\gs\gameobj\TerrImproveData.cpp
Modified: ctp2_code\gs\gameobj\TerrImprovePool.cpp
Modified: ctp2_code\gs\world\Cell.cpp
Modified: ctp2_code\gs\world\WrlEnv.cpp

Restored mod compatibility.
Modified: ctp2_code\ui\interface\NationalManagementDialog.cp p

[Martin Gühmann]

Revision 442 (trunk)

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 converted to the new layout, but a civilisation.txt in the old layout can still be loaded.
-Added the possibility to assign the value of a flag of another flag as default value, for female leader pic support of CivilisationDB.
-Modified the files so that the generated output files only use spaces as indention and correct indention.
-Added serailize method generation for datachecks, note that the government modified 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 database:
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 the 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 summary:
modified ctp2_code/ui/netshell/allinonewindow.cpp

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

Used the values of ApolytonPack-GoodMod for RoadUtilityBonus, ImproveProductionBonus 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

[Martin Gühmann]

Revision 443 (trunk)

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 now 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 requires less thinking )
modified ctp2_code/ctp/civapp.cpp

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

Cleaned files removed unnecessary include files, in most files only files removed 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 good'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

[Martin Gühmann]

Revision 444
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 CityMod2:
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

[Martin Gühmann]

Revision 445 (trunk)

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

[Fromafar]

Revision 446 (trunk) Repaired incorrect data

Corrected wrong address-of in SendGood event
Modified: ctp2_code\ai\CityManagement\governor.cpp

Corrected hyperlink text generation when the lexicographic order of a database differs from its creation order.
Modified: ctp2_code\ui\aui_ctp2\ctp2_hypertextbox.cpp
Modified: ctp2_code\ui\interface\greatlibrary.cpp
Modified: ctp2_code\ui\interface\greatlibrary.h