PROJECT: Revision Reports

[J Bytheway]

Revision 415 (branches/linux)
Changed paths:
M /branches/linux/ctp2_code/Makefile.am
M /branches/linux/ctp2_code/gs/dbgen/Makefile.am
M /branches/linux/ctp2_code/gs/dbgen/ctpdb.l
M /branches/linux/ctp2_code/gs/events/GameEventArgument.cpp
M /branches/linux/ctp2_code/gs/events/GameEventArgument.h
M /branches/linux/ctp2_code/gs/gameobj/terrainutil.cpp
M /branches/linux/ctp2_code/gs/slic/Makefile.am
M /branches/linux/ctp2_code/gs/slic/SlicConditional.cpp
D /branches/linux/ctp2_code/gs/slic/scyaccdefs.h
M /branches/linux/ctp2_code/gs/slic/slic.l
M /branches/linux/ctp2_code/gs/slic/slic.y
M /branches/linux/ctp2_code/gs/slic/sliccmd.cpp
M /branches/linux/ctp2_code/gs/slic/sliccmd.h
M /branches/linux/ctp2_code/gs/slic/sliccmd.l
M /branches/linux/ctp2_code/gs/slic/sliccmd.y
M /branches/linux/ctp2_code/gs/slic/slicif.cpp
M /branches/linux/ctp2_code/gs/utility/gameinit.cpp
M /branches/linux/ctp2_code/gs/utility/stringutils.cpp
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
D /branches/linux/ctp2_code/ui/interface/spscreen.cpp
D /branches/linux/ctp2_code/ui/interface/spwindow.cpp
D /branches/linux/ctp2_code/ui/interface/spwindow.h
M /branches/linux/ctp2_code/ui/slic_debug/watchlist.cpp

- Fixed linking errors arising from the changes I made in the previous revision
- Made all the lexer/parser sections of the code have unique prefixes (both as files and as functions), and changed the other code and Makefile.ams appropriately (NB: the compile commands for the MS projects will have to be changed to make this compile under Windows again).
- Removed duplicate definitions of g_theGovernmentDB and g_theWonderMovieDB from gameinit.cpp
- Removed scyaccdefs.h, spscreen.cpp, spwindow.cpp and spwindow.h since none of them are needed any more

[Fromafar]

Revision 416 (trunk) Slic improvements

Repaired memory leaks
Modified: ctp2_code\gs\slic\SlicContext.cpp

Prevented crashes with invalid strings
Modified: ctp2_code\gs\slic\SlicNamedSymbol.cpp
Modified: ctp2_code\gs\slic\SlicSymbol.cpp
Modified: ctp2_code\gs\slic\SlicSymbol.h

Added missing include
Modified: ctp2_code\gs\slic\sliccmd.y

Added arguments to some diplomatic proposals (Activision 1.1 patch reimplementation?)
Modified: CTP2\ctp2_code\gs\slic\slicfuncai.cpp

[ctplinuxfan]

Revision 417
M /branches/linux/configure.in
M /branches/linux/ctp2_code/Makefile.am
M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.cpp
M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.h
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/spriteutils.cpp
M /branches/linux/ctp2_code/gfx/spritesys/spriteutils.h
M /branches/linux/ctp2_code/gs/dbgen/Makefile.am
M /branches/linux/ctp2_code/gs/gameobj/terrainutil.cpp
M /branches/linux/ctp2_code/gs/gameobj/terrainutil.h
M /branches/linux/ctp2_code/gs/slic/Makefile.am
M /branches/linux/ctp2_code/gs/slic/SlicEngine.cpp
M /branches/linux/ctp2_code/libs/Makefile.am
M /branches/linux/ctp2_code/ui/aui_common/aui_surface.h
M /branches/linux/ctp2_code/ui/aui_common/aui_ui.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/keyboardhandler.h
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.h
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.h
M /branches/linux/ctp2_code/ui/slic_debug/segmentlist.cpp
M /branches/linux/ctp2_code/ui/slic_debug/segmentlist.h
M /branches/linux/ctp2_code/ui/slic_debug/sourcelist.cpp
M /branches/linux/ctp2_code/ui/slic_debug/sourcelist.h
M /branches/linux/ctp2_code/ui/slic_debug/watchlist.cpp
M /branches/linux/ctp2_code/ui/slic_debug/watchlist.h

r2292@linux3: holger | 2005-07-14 21:41:20 +0200
- Guarded slic_debug code
- added size_t return parameter (to remove _msize calls)
- corrected flex --prefix argument to -P argument
- added missing sprite code relating _msize() workaround

Changes by Johannes Sixt
- further aui_sdl code


Further comment: #define CTP2_ENABLE_DEBUGSLIC 1 is needed to compile ui/slicdebug (which doesn't link on linux). It will be added to config_win32.h when i merge the windows changes back to the linux branch.

[Martin Gühmann]

Revision 418 (trunk)

Redesigned CityData::Copy method so that it does not use the Serialize method anymore to copy data from A to C first and then to copy data from C to B instead of copying the data from A to B directly. This also replaces a fix by Fromafar for a memory leak, that actual made the game crash.
modified ctp2_code/gs/gameobj/bldque.cpp
modified ctp2_code/gs/gameobj/BldQue.h
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h
modified ctp2_code/gs/gameobj/Happy.cpp
modified ctp2_code/gs/gameobj/Happy.h

RadiusIterator constructor restored to match behaviour of original game. This defect reduces the aggressivity of the AI severely. Expanson was slowed down. City spacing was disturbed as well
modified ctp2_code/gs/world/MapPoint.cpp

[J Bytheway]

Revision 419 (branches/linux)
Changed paths:
M /branches/linux/ctp2_code/ai/mapanalysis/mapgrid.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3debug.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/netconsole.cpp
M /branches/linux/ctp2_code/ctp/debugtools/debugmemory.h
M /branches/linux/ctp2_code/gfx/spritesys/SpriteFile.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/slic/SlicContext.cpp
M /branches/linux/ctp2_code/gs/slic/SlicStack.cpp
M /branches/linux/ctp2_code/gs/slic/SlicStruct.cpp
M /branches/linux/ctp2_code/gs/slic/slic.y
M /branches/linux/ctp2_code/gs/utility/MapFile.cpp
M /branches/linux/ctp2_code/os/autoconf/Makefile.common
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/os/nowin32/nowin32.cpp
M /branches/linux/ctp2_code/robot/aibackdoor/civarchive.h
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp

General fixes:
- Made bare linux versions of _fullpath and MessageBox for minimal
functionality and debugging.
- Added -lltdl to CTP2_LDFLAGS
- Replaced multi-character constants with their hex equivalents
- Corrected check of SDL_Init return value
- Sorted initializers of aui_sdlmouse

Fixes needed when debugging symbols defined:
- Corrected some #includes
- Wrote alternatives to Windows networking and file management code
- Removed '#' flags from '%d' formats
- Changed '#else if' to '#elif'
- Added (un)signing casts
- Wrote code to change windows file seperators in civpaths.txt into localized
file seperators
- Clarified some printf arguments

[Martin Gühmann]

Revision 420 (trunk/)

Updated AI sliders optimization
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/CityManagement/governor.h
modified ctp2_code/ai/ctpai.cpp

Added some casts
modified ctp2_code/mapgen/PlasmaGen2.cpp

If the sliders on the national management dialog cause and effect tab are modified all the values of food, production and gold are updated, as happiness modifes crime and crime modifies the amount of food, production and gold left and production modifies pollution and pollution modifies happiness and so on.
modified ctp2_code/ui/interface/CauseAndEffectTab.cpp

Fixed typos, white space, etc.
modified bin/Readme.txt
modified ctp2_code/gs/slic/SlicFrame.cpp
modified ctp2_code/mapgen/PlasmaGen2.h

[Martin Gühmann]

DP

[ctplinuxfan]

Revision 421
Changed paths:
M /branches/linux/configure.in
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/ctp/civapp.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/display.cpp
M /branches/linux/ctp2_code/gfx/gfx_utils/targautils.cpp
M /branches/linux/ctp2_code/gfx/gfx_utils/targautils.h
M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.cpp
M /branches/linux/ctp2_code/gfx/gfx_utils/tiffutils.h
M /branches/linux/ctp2_code/gfx/spritesys/FacedSprite.cpp
M /branches/linux/ctp2_code/gfx/spritesys/Sprite.cpp
M /branches/linux/ctp2_code/gs/database/PlayListDB.cpp
M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
M /branches/linux/ctp2_code/os/autoconf/os_defs.m4
M /branches/linux/ctp2_code/os/nowin32/nowin32.cpp
M /branches/linux/ctp2_code/os/nowin32/windows.h
M /branches/linux/ctp2_code/ui/aui_common/aui_cursor.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_image.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_image.h
M /branches/linux/ctp2_code/ui/aui_common/aui_mouse.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_textbase.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/c3_popupwindow.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.h
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.cpp
M /branches/linux/ctp2_code/ui/ldl/ldl_file.cpp
M /branches/linux/ctp2_code/ui/ldl/ldlif.cpp

r2407@linux3: holger | 2005-07-18 16:37:59 +0200
- further const fixes
- ported further native win32 path algorithms
- initialization fixes
bugfixes:
- possible memory leak in civapp.cpp
- no displaymode: default to 800x600 (display.cpp)
- better recognition of invalid playlist.txt

[Martin Gühmann]

Revision 422

Updated project files so that the game compiles without any problems and links against the files libs of DirectX 9.0 without any problems. Backwards compatibilty to older versions of DirectX was not tested.
modified trunk/ctp2_code/ctp/civctp.dsp
modified trunk/ctp2_code/mapgen/Crater.dsp
modified trunk/ctp2_code/mapgen/fault.dsp
modified trunk/ctp2_code/mapgen/geometric.dsp
modified trunk/ctp2_code/mapgen/Plasma2.dsp

New Apolyton specific source code edition readme based on the original readme to reflect the most important changes in comparision to the original to make the code compile.
added trunk/Apolyton CTP2 Source Code_Readme.txt

Made the code linkable under configuration Win32 Optimize Test
modified trunk/ctp2_code/robot/pathing/astar.cpp

Removed a problem with the Win32 Test configuration. However this configuration doesn't compile anyway and much more work has to be done to make it compile. So I decided it isn't worth the effort and I quiit the fising of this configuration, but this little modification is left.
modified trunk/ctp2_code/gs/database/profileDB.h

[J Bytheway]

Revision 423
Changed paths:
M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
M /branches/linux/ctp2_code/gs/newdb/DBLexer.l
M /branches/linux/ctp2_code/gs/slic/slic.l
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/ui/aui_common/aui_textbase.cpp
M /branches/linux/ctp2_code/ui/ldl/ldl.l

- Fixed lexers to cope with both forms of line endings
- Tweaked debugging output / assertions

[ctplinuxfan]

Revisions 424-425
Changed paths:
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/ctp/civapp.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3mem.cpp
M /branches/linux/ctp2_code/ctp/display.cpp
M /branches/linux/ctp2_code/gs/fileio/CivPaths.cpp
M /branches/linux/ctp2_code/gs/slic/slicobject.cpp
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/sound/soundmanager.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_image.cpp
M /branches/linux/ctp2_code/ui/aui_common/aui_image.h
M /branches/linux/ctp2_code/ui/aui_common/aui_ui.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/c3imageformats.cpp
M /branches/linux/ctp2_code/ui/aui_directx/aui_directui.cpp
M /branches/linux/ctp2_code/ui/aui_directx/aui_directui.h
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdl.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.cpp
M /branches/linux/ctp2_code/ui/aui_sdl/aui_sdlui.h

r2434@linux3: holger | 2005-07-21 09:45:27 +0200
bugfixes:
- rename to aui_*ui::CreateScreen revoked to ui_*ui::CreateNativeScreen
(unwanted overload of virtual aui_ui::CreateScreen)
- assure single SDL_Init() call (in civ3_main.cpp)
- sound-subsystem initialized seperately (theoretically playing with no
sound should be possible)

Changes by Johannes Sixt:
- Added further aui_SDL code (ui/aui_sdl/*)
- SDL-Implementation of TargaImageFormat::Load (c3imageformats.cpp)
- Added Method aui_image::AttachSurface(aui_Surface *) to provide
a surface containing the image within aui_ImageFormat::Load()

[Martin Gühmann]

Revision 426

Fixed bug that doesn't allow to rush buy an build item, if you inserted it before Capitalisation or Infrastructure and Capitalisation or Infrastructure was the first build item.
modified ctp2_code/gs/gameobj/CityData.cpp

Added some casts.
modified ctp2_code/ui/interface/EditQueue.cpp

[ctplinuxfan]

Revision 427
Changed paths:
M /branches/linux/ctp2_code/libs/anet
A /branches/linux/ctp2_code/libs/anet/GNUmakefile.am
A /branches/linux/ctp2_code/libs/anet/README.modifications
M /branches/linux/ctp2_code/libs/anet/demo/utils/dpcrc32.c
M /branches/linux/ctp2_code/libs/anet/demo/utils/dpcrc32.h
M /branches/linux/ctp2_code/libs/anet/h/anet.h
A /branches/linux/ctp2_code/libs/anet/h/anet_types.h
M /branches/linux/ctp2_code/libs/anet/src
M /branches/linux/ctp2_code/libs/anet/src/3rdparty
A /branches/linux/ctp2_code/libs/anet/src/3rdparty/GNUmakefile.am
A /branches/linux/ctp2_code/libs/anet/src/GNUmakefile.am
M /branches/linux/ctp2_code/libs/anet/src/linux/uudp/uudps.c

r2437@linux3: holger | 2005-07-24 13:05:40 +0200
anet changes:
- added standard int prototypes definitions
- added first GNUmakefile.am templates

bugfixes:
- fixed amd64 segfault in dpcrc32.c due to use of 64bit integers
- amd64 segfault in uudps.c due to use of invalid ipv4 address types

Revision 428
r2438@linux3: holger | 2005-07-24 13:55:58 +0200
- enabled _BFR_ for any build
- c3files.cpp now primarily uses cd drive numbers instead of names
- more const parameters and size_t arguments where appropiate

Bugfixes:
- fixed file seperators for linux
- added vdir creation of ui/ldl
- fixed incorrect vtable initialization for static MapGrid members for gcc
- always include compiled in X11 standard font paths in BitmapFontSearchPath
- use c3files_close after c3files_open in c3files.cpp
- always opened /dev/cdrom on linux instead of SDL_CDName()
- now trailing spaces of volumename get truncated on linux
- wrong cd may be determined if multiple cd drives exist and !_BFR_ build
- completed SDL-based legal cd check (+1 increment on tracklength needed)
- fixed cd path for linux
- fixed ZMS/ZFS support for linux in prjfile.cpp
- fixed geometric.la target for linux
- fixed mapplugin loader for linux
- fixed loading of TTF fonts
- added initialization of parent class in C3Blitter
- fixed method use of uninitiated templates for amd64 gcc

Changes merged by Johannes Sixt:
- added SDL_QUIT event
- optimized aui_BitmapFont a bit
- assertion in unimplemented aui_Font
- added black ChromaKey for mouse cursor
- bugfix: use native surfaces within aui_Mouse
- assertion in aui_Pixel for 8bit modes
- bugfix: mark aui_Win as registered
- no use of assembler blits in C3Blitter for SDL code
- added image loading code for targa file formats, assert for others
- assertions in aui_SDLUI::AltTab*()


Notes:
- copy Setup/data/Add/ctp2_program/ctp/texture.dat to the directory
where the executable you run is located

[Martin Gühmann]

Revision 429

Added a National Manager button to the City Manager.
modified ctp2_code/ui/interface/citywindow.cpp
modified ctp2_code/ui/interface/citywindow.h

Added a National Manager button to the Build Manager.
Made Build Manager window non-modal.
modified ctp2_code/ui/interface/EditQueue.cpp
modified ctp2_code/ui/interface/EditQueue.h

Added City Manager button to the National Manager.
National Manager window gets focus when open and another window is open.
modified ctp2_code/ui/interface/NationalManagementDialog.cpp
modified ctp2_code/ui/interface/NationalManagementDialog.h

Modified layout files for the new buttons:
modified ctp2_data/english/uidata/layouts/citystatus.ldl
modified ctp2_data/english/uidata/layouts/citywindow.ldl
added ctp2_data/english/uidata/layouts/editqueue.ldl
modified ctp2_data/french/uidata/layouts/citystatus.ldl
added ctp2_data/french/uidata/layouts/citywindow.ldl
added ctp2_data/french/uidata/layouts/editqueue.ldl
modified ctp2_data/german/uidata/layouts/citystatus.ldl
modified ctp2_data/german/uidata/layouts/citywindow.ldl
modified ctp2_data/german/uidata/layouts/editqueue.ldl
modified ctp2_data/italian/uidata/layouts/citystatus.ldl
modified ctp2_data/italian/uidata/layouts/citywindow.ldl
modified ctp2_data/italian/uidata/layouts/editqueue.ldl
modified ctp2_data/japanese/uidata/layouts/citystatus.ldl
modified ctp2_data/japanese/uidata/layouts/citywindow.ldl
added ctp2_data/japanese/uidata/layouts/editqueue.ldl
modified ctp2_data/spanish/uidata/layouts/citystatus.ldl
modified ctp2_data/spanish/uidata/layouts/citywindow.ldl
modified ctp2_data/spanish/uidata/layouts/editqueue.ldl

[ctplinuxfan]

Revision 430
Changed paths:
M /branches/linux

r2445@linux3: holger | 2005-07-24 21:30:45 +0200
Merged /trunk from Revision 408 to 429 to /branches/linux:
r408@ctp2.kaan.dk: Fromafar | 2005-07-01 18:10:02 +0200
r413@ctp2.kaan.dk: Fromafar | 2005-07-04 21:13:08 +0200
r416@ctp2.kaan.dk: Fromafar | 2005-07-13 22:52:53 +0200
r418@ctp2.kaan.dk: Martin Gühmann | 2005-07-16 20:40:05 +0200
r420@ctp2.kaan.dk: Martin Gühmann | 2005-07-18 19:40:16 +0200
r422@ctp2.kaan.dk: Martin Gühmann | 2005-07-19 23:19:03 +0200
r426@ctp2.kaan.dk: Martin Gühmann | 2005-07-23 16:56:52 +0200
r429@ctp2.kaan.dk: Martin Gühmann | 2005-07-24 19:46:26 +0200

Revision 431
Changed paths:
M /branches/linux/ctp2_code/gs/database/profileDB.h
M /branches/linux/ctp2_code/gs/gameobj/Strengths.h

r2446@linux3: holger | 2005-07-24 23:01:17 +0200
Small compile fix to the merge:
- Fixed include headers again

[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