PROJECT: Revision Reports 2

[Martin Gühmann]

Revision 1070: The scenario editor now genartes goods even if only a preexisting savegame was loaded, and no new game was created during the session.

Some cleanings:
modified trunk/ctp2_code/gs/world/wldgen.cpp

Reduce the memory need for the AI element objects, this should speed up the game a little bit:
modified trunk/ctp2_code/ai/strategy/agents/agent.cpp
modified trunk/ctp2_code/ai/strategy/agents/agent.h
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.h
modified trunk/ctp2_code/ai/strategy/scheduler/Plan.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Plan.h
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h

Fixed some 64 bit porting problems:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp
modified trunk/ctp2_code/ui/netshell/ns_accessor.h

Good richness is now saved in the profile.txt so that the Scenario editor regenerates goods when a game was freshly loaded:
modified trunk/ctp2_code/gs/database/profileDB.cpp

[Martin Gühmann]

Revision 1071:

Reduced the size of the Squad_Strength class so that the AI elements need less memory:
ctp2_code/ai/ctpai.cpp
ctp2_code/ai/mapanalysis/mapanalysis.cpp
ctp2_code/ai/strategy/agents/agent.cpp
ctp2_code/ai/strategy/goals/Goal.cpp
ctp2_code/ai/strategy/scheduler/scheduler.cpp
ctp2_code/ai/strategy/squads/squad_Strength.cpp
ctp2_code/ai/strategy/squads/squad_Strength.h
ctp2_code/gs/world/cellunitlist.cpp
ctp2_code/gs/world/cellunitlist.h

Fixed 64 bit portability problems:
ctp2_code/robot/pathing/AVLHeap.cpp
ctp2_code/ui/interface/GovernmentTab.cpp

[ctplinuxfan]

Revision 1072, branch port-trunk
- added keyboard and wm constants
ctp2_code/os/nowin32/windows.h

- further linux compilation fixes
ctp2_code/os/nowin32/windows.h
ctp2_code/ui/aui_common/aui_mouse.h
ctp2_code/ui/aui_common/aui_movie.cpp
ctp2_code/ui/aui_common/aui_music.cpp
ctp2_code/ui/aui_common/aui_music.h
ctp2_code/ui/aui_common/aui_ldl.cpp
ctp2_code/ui/aui_common/aui_movie.h
ctp2_code/ui/aui_common/aui_textfield.cpp
ctp2_code/ui/aui_common/aui_mouse.cpp
ctp2_code/ui/aui_common/aui_textfield.h
ctp2_code/ui/aui_ctp2/ctp2_TabButton.h
ctp2_code/ui/aui_ctp2/ctp2_Tab.h
ctp2_code/ui/aui_ctp2/linegraph.h

[ctplinuxfan]

Revision 1073, branch port-trunk
Merged /trunk:r1070-1071 into branch port-trunk
Merged changes by Martin Guehmann:
- Some cleanings:
- Reduce the memory need for the AI element objects, this should speed up the game a little bit:
- Fixed some 64 bit porting problems:
- Good richness is now saved in the profile.txt so that the Scenario editor regenerates goods when a game was freshly loaded:
modified trunk/ctp2_code/gs/database/profileDB.cpp
- Reduced the size of the Squad_Strength class so that the AI elements need less memory:
- Fixed 64 bit portability problems:

[ctplinuxfan]

Revision 1074
Merged /branches/port-trunk:r1070-1073
- added keyboard and wm constants
ctp2_code/os/nowin32/windows.h

- further linux compilation fixes
ctp2_code/os/nowin32/windows.h
ctp2_code/ui/aui_common/aui_mouse.h
ctp2_code/ui/aui_common/aui_movie.cpp
ctp2_code/ui/aui_common/aui_music.cpp
ctp2_code/ui/aui_common/aui_music.h
ctp2_code/ui/aui_common/aui_ldl.cpp
ctp2_code/ui/aui_common/aui_movie.h
ctp2_code/ui/aui_common/aui_textfield.cpp
ctp2_code/ui/aui_common/aui_mouse.cpp
ctp2_code/ui/aui_common/aui_textfield.h
ctp2_code/ui/aui_ctp2/ctp2_TabButton.h
ctp2_code/ui/aui_ctp2/ctp2_Tab.h
ctp2_code/ui/aui_ctp2/linegraph.h

[ctplinuxfan]

Revision 1075, branch port-trunk
- linux compile fixes:

ctp2_code/ui/aui_common/aui_region.cpp
ctp2_code/ui/aui_common/aui_pixel.cpp
ctp2_code/ui/aui_common/aui_textbase.cpp

[ctplinuxfan]

Revision 1076
Merged /branches/port-trunk:r1075
- linux compile fixes:

ctp2_code/ui/aui_common/aui_region.cpp
ctp2_code/ui/aui_common/aui_pixel.cpp
ctp2_code/ui/aui_common/aui_textbase.cpp

[Fromafar]

Revision 1077, trunk

bootserv.txt
- updated to current Battlezone servers

etc/svn-config
- added some CTP2 specific file types (.cdb, .ldl, .slc, etc.)

ai/strategy/goals/Goal.cpp
- repaired memory leak
gs/dbgen/ctpdb.cpp
- reported failure to create a (writable) destination file in copy_file
gs/events/GameEvent.h
- added IsTypeValid function
gs/fileio/GameFile.cpp
- handled compiler complaints
gs/fileio/Token.h + .cpp
- Improved handling of unexpected EOF for incorrect input files.
gs/gameobj/pollution.h
- corrected structure
ui/aui_common/aui_textfield.cpp
- corrected compiler complaints from Linux merge
ui/interface/musicscreen.h + .cpp
- corrected includes, corrected non-standard stuff (missing return, function both extern and static)

[ctplinuxfan]

Revision 1078, branch port-trunk
Merged /trunk:r1077
- Merged in changes by Fromafar:

bootserv.txt
- updated to current Battlezone servers

etc/svn-config
- added some CTP2 specific file types (.cdb, .ldl, .slc, etc.)

ai/strategy/goals/Goal.cpp
- repaired memory leak
gs/dbgen/ctpdb.cpp
- reported failure to create a (writable) destination file in copy_file
gs/events/GameEvent.h
- added IsTypeValid function
gs/fileio/GameFile.cpp
- handled compiler complaints
gs/fileio/Token.h + .cpp
- Improved handling of unexpected EOF for incorrect input files.
gs/gameobj/pollution.h
- corrected structure
ui/aui_common/aui_textfield.cpp
- corrected compiler complaints from Linux merge
ui/interface/musicscreen.h + .cpp
- corrected includes, corrected non-standard stuff (missing return, function both extern and static)

[ctplinuxfan]

Revision 1079, branch port-trunk
- merged in changes from linux port
modified ctp2_code/ui/aui_common/aui_window.h
modified ctp2_code/ui/aui_common/aui_textfield.cpp

[ctplinuxfan]

Revision 1080, trunk
Merged /branches/port-trunk:r1079
- Merged in code from linux port
modified ctp2_code/ui/aui_common/aui_window.h
modified ctp2_code/ui/aui_common/aui_textfield.cpp

[ctplinuxfan]

Revision 1081, branch port-trunk
- linux compile fixes
- merged in code from linux branch

modified ctp2_code/ai/strategy/agents/agent.h
modified ctp2_code/ui/aui_directx/aui_directblitter.cpp
modified ctp2_code/ui/aui_sdl/aui_sdlkeyboard.cpp
modified ctp2_code/ui/aui_sdl/aui_sdlkeyboard.h
modified ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp
modified ctp2_code/ui/aui_common/aui_Factory.cpp
modified ctp2_code/ui/aui_common/auitypes.h
modified ctp2_code/ui/aui_common/aui_win.cpp
modified ctp2_code/ui/aui_common/aui_window.cpp
modified ctp2_code/ui/aui_ctp2/SelItem.cpp
modified ctp2_code/ui/aui_ctp2/battleorderboxactions.cpp
modified ctp2_code/ui/aui_ctp2/linegraph.cpp
modified ctp2_code/ui/aui_ctp2/c3blitter.cpp
modified ctp2_code/ui/aui_ctp2/directvideo.cpp
modified ctp2_code/ui/aui_ctp2/keypress.cpp
modified ctp2_code/ui/aui_ctp2/InfoBar.cpp
modified ctp2_code/ui/aui_ctp2/radarmap.cpp
modified ctp2_code/ui/aui_ctp2/c3_utilitydialogbox.cpp
modified ctp2_code/ui/aui_ctp2/c3_button.cpp
modified ctp2_code/ui/aui_ctp2/c3imageformats.cpp
modified ctp2_code/ui/aui_ctp2/picture.cpp
modified ctp2_code/ui/aui_ctp2/keymap.cpp
modified ctp2_code/ui/aui_ctp2/cityinventorylistbox.cpp
modified ctp2_code/ui/aui_ctp2/c3_hypertextbox.cpp
modified ctp2_code/ui/aui_ctp2/thronecontrol.cpp
modified ctp2_code/ui/aui_ctp2/thumbnailmap.cpp
modified ctp2_code/ui/aui_ctp2/videowindow.cpp
modified ctp2_code/ui/aui_ctp2/c3_popupwindow.cpp
modified ctp2_code/ui/aui_utils/textutils.cpp
modified ctp2_code/ui/aui_utils/primitives.cpp

[ctplinuxfan]

Revision 1082, trunk
Merged /branches/port-trunk:r1081

- linux compile fixes
- merged in code from linux branch
modified ctp2_code/ai/strategy/agents/agent.h
modified ctp2_code/ui/aui_directx/aui_directblitter.cpp
modified ctp2_code/ui/aui_sdl/aui_sdlkeyboard.cpp
modified ctp2_code/ui/aui_sdl/aui_sdlkeyboard.h
modified ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp
modified ctp2_code/ui/aui_common/aui_Factory.cpp
modified ctp2_code/ui/aui_common/auitypes.h
modified ctp2_code/ui/aui_common/aui_win.cpp
modified ctp2_code/ui/aui_common/aui_window.cpp
modified ctp2_code/ui/aui_ctp2/SelItem.cpp
modified ctp2_code/ui/aui_ctp2/battleorderboxactions.cpp
modified ctp2_code/ui/aui_ctp2/linegraph.cpp
modified ctp2_code/ui/aui_ctp2/c3blitter.cpp
modified ctp2_code/ui/aui_ctp2/directvideo.cpp
modified ctp2_code/ui/aui_ctp2/keypress.cpp
modified ctp2_code/ui/aui_ctp2/InfoBar.cpp
modified ctp2_code/ui/aui_ctp2/radarmap.cpp
modified ctp2_code/ui/aui_ctp2/c3_utilitydialogbox.cpp
modified ctp2_code/ui/aui_ctp2/c3_button.cpp
modified ctp2_code/ui/aui_ctp2/c3imageformats.cpp
modified ctp2_code/ui/aui_ctp2/picture.cpp
modified ctp2_code/ui/aui_ctp2/keymap.cpp
modified ctp2_code/ui/aui_ctp2/cityinventorylistbox.cpp
modified ctp2_code/ui/aui_ctp2/c3_hypertextbox.cpp
modified ctp2_code/ui/aui_ctp2/thronecontrol.cpp
modified ctp2_code/ui/aui_ctp2/thumbnailmap.cpp
modified ctp2_code/ui/aui_ctp2/videowindow.cpp
modified ctp2_code/ui/aui_ctp2/c3_popupwindow.cpp
modified ctp2_code/ui/aui_utils/textutils.cpp
modified ctp2_code/ui/aui_utils/primitives.cpp

[ctplinuxfan]

Revision 1083, branch port-trunk
- added missing scancode constants
modified ctp2_code/os/nowin32/windows.h

- corrected case of include headers
- added include of ctp2_listitem.h
modified ctp2_code/ui/interface/DomesticControlPanel.cpp
modified ctp2_code/ui/interface/agesscreen.cpp
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/armymanagerwindow.cpp
modified ctp2_code/ui/interface/CityControlPanel.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_listbox.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_hypertextbox.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_dropdown.cpp

- disabled directvideo code for linux
modified ctp2_code/ui/aui_ctp2/videowindow.cpp

[ctplinuxfan]

Revision 1084, trunk
Merged /branches/port-trunk:r1083

- added missing scancode constants
modified ctp2_code/os/nowin32/windows.h

- corrected case of include headers
- added include of ctp2_listitem.h
modified ctp2_code/ui/interface/DomesticControlPanel.cpp
modified ctp2_code/ui/interface/agesscreen.cpp
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/armymanagerwindow.cpp
modified ctp2_code/ui/interface/CityControlPanel.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_listbox.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_hypertextbox.cpp
modified ctp2_code/ui/aui_ctp2/ctp2_dropdown.cpp

- disabled directvideo code for linux
modified ctp2_code/ui/aui_ctp2/videowindow.cpp

[ctplinuxfan]

Revision 1085, branch linux

- possible return value fix for linux mint helena:
/branches/linux/ctp2_code/libs/anet/src/aeh/aehmap.c

[ctplinuxfan]

Revision 1086, branch linux
Merged /trunk:r1065-1067
- display gtk-dialog messageboxes:
modified ctp2_code/ctp/civ3_main.cpp
modified ctp2_code/os/autoconf/Makefile.common
modified ctp2_code/os/nowin32/nowin32.cpp

- set processname under linux
modified ctp2_code/ctp/debugtools/debug.c
modified ctp2_code/ctp/debugtools/debug.h

- fixed svn-properties
modified ctp2_code/ctp
modified ctp2_code/mapgen
modified ctp2_code/gs/dbgen
modified ctp2_code/gs/events
modified ctp2_code/gs/outcom
modified ctp2_code/gs/fileio
modified ctp2_code/gs/world
modified ctp2_code/gs/slic
modified ctp2_code/ui/aui_sdl/aui_sdlui.h
modified ctp2_code/ui/aui_common/aui_Factory.cpp

furthermore:
- compile fix for linux mint helena
modified ctp2_code/libs/anet/demo/utils/logpkt.c

[ctplinuxfan]

Revision 1087, branch linux

- changed warnings from -Werror to -Wall
modified ctp2_code/libs/anet/macros/anet_internal.m4

[ctplinuxfan]

Revision 1088, branch port-trunk

- fixed case of inclusions
- linux specific compile fixes
modified ctp2_code/ui/interface/DiplomacyDetails.cpp
modified ctp2_code/ui/interface/loadsavemapscreen.cpp
modified ctp2_code/ui/interface/km_screen.cpp
modified ctp2_code/ui/interface/chatbox.cpp
modified ctp2_code/ui/interface/EditQueue.cpp
modified ctp2_code/ui/interface/greatlibrary.h
modified ctp2_code/ui/interface/loadsavescreen.cpp
modified ctp2_code/ui/interface/initialplayscreen.cpp
modified ctp2_code/ui/interface/creditsscreen.cpp
modified ctp2_code/ui/interface/messageactions.cpp
modified ctp2_code/ui/interface/hotseatlist.h
modified ctp2_code/ui/interface/greatlibrarywindow.cpp
modified ctp2_code/ui/interface/dipwizard.cpp
modified ctp2_code/ui/interface/text_hasher.h
modified ctp2_code/ui/interface/loadsavemapwindow.cpp
modified ctp2_code/ui/interface/intelligencewindow.cpp
modified ctp2_code/ui/interface/FileDialog.cpp
modified ctp2_code/ui/interface/loadsavewindow.cpp
modified ctp2_code/ui/interface/greatlibrary.cpp
modified ctp2_code/ui/interface/diplomacywindow.cpp
modified ctp2_code/ui/interface/CityEspionage.cpp

[ctplinuxfan]

Revision 1089, trunk
Merged /branches/port-trunk:r1085-1088

- fixed case of inclusions
- linux specific compile fixes
modified ctp2_code/ui/interface/DiplomacyDetails.cpp
modified ctp2_code/ui/interface/loadsavemapscreen.cpp
modified ctp2_code/ui/interface/km_screen.cpp
modified ctp2_code/ui/interface/chatbox.cpp
modified ctp2_code/ui/interface/EditQueue.cpp
modified ctp2_code/ui/interface/greatlibrary.h
modified ctp2_code/ui/interface/loadsavescreen.cpp
modified ctp2_code/ui/interface/initialplayscreen.cpp
modified ctp2_code/ui/interface/creditsscreen.cpp
modified ctp2_code/ui/interface/messageactions.cpp
modified ctp2_code/ui/interface/hotseatlist.h
modified ctp2_code/ui/interface/greatlibrarywindow.cpp
modified ctp2_code/ui/interface/dipwizard.cpp
modified ctp2_code/ui/interface/text_hasher.h
modified ctp2_code/ui/interface/loadsavemapwindow.cpp
modified ctp2_code/ui/interface/intelligencewindow.cpp
modified ctp2_code/ui/interface/FileDialog.cpp
modified ctp2_code/ui/interface/loadsavewindow.cpp
modified ctp2_code/ui/interface/greatlibrary.cpp
modified ctp2_code/ui/interface/diplomacywindow.cpp
modified ctp2_code/ui/interface/CityEspionage.cpp

[Martin Gühmann]

Revision 1090: Wonder movies play again:

Some cleanings and compiler warning fixes:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/diplomacy/proposalresponseevent.cpp
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/ui/aui_common/aui_moviebutton.cpp

Compiling fixes:
modified trunk/ctp2_code/ui/aui_common/aui_music.cpp
modified trunk/ctp2_code/ui/aui_common/aui_textfield.cpp

Manual double buffering is now done with DirectX components only, and fixed the wonder movies:
modified trunk/ctp2_code/ui/aui_common/aui_blitter.cpp
modified trunk/ctp2_code/ui/aui_common/aui_mouse.cpp
modified trunk/ctp2_code/ui/aui_common/aui_ui.cpp
modified trunk/ctp2_code/ui/aui_common/aui_ui.h
modified trunk/ctp2_code/ui/aui_ctp2/c3ui.cpp
modified trunk/ctp2_code/ui/aui_ctp2/directvideo.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directblitter.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directmouse.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directmovie.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directsurface.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directui.cpp

[Martin Gühmann]

Revision 1091: The AI sieges cities from an overall list, instead of sieging those that are closest to most of its units:

Removed a useless assertion failure:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Fixed a crash:
modified trunk/ctp2_code/ai/diplomacy/foreigner.cpp

Discovery diplomatic and discovery economic personalities do not protect empires with only one city empires if their regard is too good:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

Increased the likelihood that the AI settles in cities:
modified trunk/ctp2_data/default/aidata/strategies.txt

The AI sieges hostile cities based on a global strategy instead of sieging those that have the most units nearby, which may change when the units come closer:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/gs/newdb/goal.cdb
modified trunk/ctp2_data/default/aidata/Goals.txt

[Martin Gühmann]

Revision 1092: Upgraded units gets now room for cargo if they should have and the original unit had no cargo.

Some cleanings:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

The game does not crash if the AI tries to move cargo to a cargo helicopter if the cargo and helicopter are on the same tile:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

If a unit without room for cargo is upgraded and the new unit type has cargo, then the upgraded unit gets room for cargo:
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

[Martin Gühmann]

Revision 1093: Added Chinese text files

[Martin Gühmann]

Revision 1094

Updated Chinese *.ldl files so that they match the latest Apolyton ones:
modified trunk/ctp2_data/chinese/uidata/layouts/armymanager.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/battleview.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/citystatus.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/citywindow.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/civ3.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/civstatus.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/controlpanel.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/ctp_template.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/custommap.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/DiplomacyDetails.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/editqueue.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/intelligence.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/km_screen.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/ns_strings.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/science.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/spnewgame.ldl
modified trunk/ctp2_data/chinese/uidata/layouts/spnewgamepopups.ldl

[Martin Gühmann]

Revision 1095: Improved AI conquering

Some cleanings:
modified trunk/ctp2_code/gs/world/MapPoint.h
modified trunk/ctp2_code/robot/pathing/TradeAstar.cpp
modified trunk/ctp2_code/robot/pathing/astar.cpp
modified trunk/ctp2_code/robot/pathing/Astar.h

64 bit preparation fixes:
modified trunk/ctp2_code/ui/aui_utils/primitives.cpp

The final with logging version compiles again:
modified trunk/ctp2_code/gs/fileio/GameFile.cpp

Fixed AI avoid danger pathing and fixed an AI rollover ZOC problem:
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h
modified trunk/ctp2_code/robot/pathing/robotastar2.cpp
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/robot/pathing/UnitAstar.h

The AI now uses transporters for targets on the same continent that cannot be reached by land travel.
The AI now conquers cities if it has a big stack adjacent to a city, even if it has only two third of its units.
The AI now considers cities to conquer that are land connected to its empire with higher priority.
The AI now considers cities to conquer of empires with less than three cities with higher priority.
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.h
modified trunk/ctp2_data/default/aidata/Goals.txt
modified trunk/ctp2_code/gs/newdb/goal.cdb
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/robot/pathing/CityAstar.cpp
modified trunk/ctp2_code/robot/pathing/CityAstar.h
modified trunk/ctp2_code/robot/pathing/Path.cpp
modified trunk/ctp2_code/robot/pathing/Path.h

[Martin Gühmann]

Revision 1096: The AI now goes for its weakest enemy with higher priority:

Some cleanings:
modified trunk/ctp2_code/ai/ctpaidebug.cpp
modified trunk/ctp2_code/ai/mapanalysis/settlemap.cpp
modified trunk/ctp2_code/robot/pathing/Astar.h

Made MapPoint::IsValid useful:
modified trunk/ctp2_code/gs/world/MapPoint.cpp

The minimap shows the diplomatic stance correctly even if you recenter the map:
modified trunk/ctp2_code/ui/aui_ctp2/radarmap.cpp

Prepared game for new empire center calculation:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.h
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/gs/utility/gameinit.cpp
modified trunk/ctp2_code/gs/world/cellunitlist.cpp
modified trunk/ctp2_code/robot/pathing/CityAstar.cpp
modified trunk/ctp2_code/robot/pathing/CityAstar.h

The AI now prioritizes its weakest enemy for conquest higher:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp
modified trunk/ctp2_code/ai/diplomacy/Diplomat.h
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/gs/newdb/goal.cdb
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_data/default/aidata/Goals.txt

Updated Chinese text files with additional strings, so far only in English:
modified trunk/ctp2_data/chinese/gamedata/add_str.txt
modified trunk/ctp2_data/chinese/gamedata/cht_str.txt
modified trunk/ctp2_data/chinese/gamedata/civ_str.txt
modified trunk/ctp2_data/chinese/gamedata/cut_str.txt
modified trunk/ctp2_data/chinese/gamedata/dip2_str.txt
modified trunk/ctp2_data/chinese/gamedata/dip_str.txt
modified trunk/ctp2_data/chinese/gamedata/exp_str.txt
modified trunk/ctp2_data/chinese/gamedata/feat_str.txt
modified trunk/ctp2_data/chinese/gamedata/gl_str.txt
modified trunk/ctp2_data/chinese/gamedata/Great_Library.txt
modified trunk/ctp2_data/chinese/gamedata/info_str.txt
modified trunk/ctp2_data/chinese/gamedata/junk_str.txt
modified trunk/ctp2_data/chinese/gamedata/ldl_str.txt
modified trunk/ctp2_data/chinese/gamedata/Strings.txt
modified trunk/ctp2_data/chinese/gamedata/strings_to_add.txt
modified trunk/ctp2_data/chinese/gamedata/tips_str.txt
modified trunk/ctp2_data/chinese/gamedata/tut2_str.txt
modified trunk/ctp2_data/chinese/gamedata/tut_str.txt

[Martin Gühmann]

Revision 1097:

Updated readme:
modified trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 1098:

Fixed a problem with converting cities if the converting unit was killed during the last turn.
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

[ctplinuxfan]

Revision 1099, port-trunk
Merged /trunk: r1090-1098
- update from revisions 1090-1098

added Scenarios/AlexanderTheGreat/scen0000/chinese
added Scenarios/AlexanderTheGreat/scen0000/chinese/gamedata
added Scenarios/AlexanderTheGreat/scen0000/chinese/gamedata/Great_Library.txt
added Scenarios/AlexanderTheGreat/scen0000/chinese/gamedata/civ_str.txt
added Scenarios/AlexanderTheGreat/scen0000/chinese/gamedata/gl_str.txt
added Scenarios/AlexanderTheGreat/scen0000/chinese/gamedata/scen_str.txt
added Scenarios/AlexanderTheGreat/scen0000/chinese/uidata
added Scenarios/AlexanderTheGreat/scen0000/chinese/uidata/layouts
added Scenarios/AlexanderTheGreat/scen0000/chinese/uidata/layouts/scenarioeditor.ldl
added (bin) Scenarios/AlexanderTheGreat/scen0000/chinese/uidata/layouts/vssver.scc
added Scenarios/MagnificentSamurai/scen0000/chinese
added Scenarios/MagnificentSamurai/scen0000/chinese/gamedata
added Scenarios/MagnificentSamurai/scen0000/chinese/gamedata/Great_Library.txt
added Scenarios/MagnificentSamurai/scen0000/chinese/gamedata/civ_str.txt
added Scenarios/MagnificentSamurai/scen0000/chinese/gamedata/gl_str.txt
added Scenarios/MagnificentSamurai/scen0000/chinese/gamedata/scen_str.txt
added Scenarios/NuclearDetente/scen0000/chinese
added Scenarios/NuclearDetente/scen0000/chinese/gamedata
added Scenarios/NuclearDetente/scen0000/chinese/gamedata/Great_Library.txt
added Scenarios/NuclearDetente/scen0000/chinese/gamedata/civ_str.txt
added Scenarios/NuclearDetente/scen0000/chinese/gamedata/gl_str.txt
added Scenarios/NuclearDetente/scen0000/chinese/gamedata/scen_str.txt
modified ctp2_code/ai/ctpai.cpp
modified ctp2_code/ai/ctpaidebug.cpp
modified ctp2_code/ai/diplomacy/Diplomat.h
modified ctp2_code/ai/diplomacy/diplomat.cpp
modified ctp2_code/ai/diplomacy/foreigner.cpp
modified ctp2_code/ai/diplomacy/proposalresponseevent.cpp
modified ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified ctp2_code/ai/mapanalysis/mapanalysis.h
modified ctp2_code/ai/mapanalysis/settlemap.cpp
modified ctp2_code/ai/strategy/goals/Goal.cpp
modified ctp2_code/ai/strategy/goals/Goal.h
modified ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified ctp2_code/ai/strategy/squads/squad_Strength.h
modified ctp2_code/gs/fileio/GameFile.cpp
modified ctp2_code/gs/gameobj/ArmyData.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/gameobj/player.h
modified ctp2_code/gs/newdb/goal.cdb
modified ctp2_code/gs/utility/gameinit.cpp
modified ctp2_code/gs/world/MapPoint.cpp
modified ctp2_code/gs/world/MapPoint.h
modified ctp2_code/gs/world/cellunitlist.cpp
modified ctp2_code/robot/pathing/Astar.h
modified ctp2_code/robot/pathing/CityAstar.cpp
modified ctp2_code/robot/pathing/CityAstar.h
modified ctp2_code/robot/pathing/Path.cpp
modified ctp2_code/robot/pathing/Path.h
modified ctp2_code/robot/pathing/TradeAstar.cpp
modified ctp2_code/robot/pathing/UnitAstar.h
modified ctp2_code/robot/pathing/astar.cpp
modified ctp2_code/robot/pathing/robotastar2.cpp
modified ctp2_code/robot/pathing/unitastar.cpp
modified ctp2_code/ui/aui_common/aui_blitter.cpp
modified ctp2_code/ui/aui_common/aui_mouse.cpp
modified ctp2_code/ui/aui_common/aui_moviebutton.cpp
modified ctp2_code/ui/aui_common/aui_music.cpp
modified ctp2_code/ui/aui_common/aui_textfield.cpp
modified ctp2_code/ui/aui_common/aui_ui.cpp
modified ctp2_code/ui/aui_common/aui_ui.h
modified ctp2_code/ui/aui_ctp2/c3ui.cpp
modified ctp2_code/ui/aui_ctp2/directvideo.cpp
modified ctp2_code/ui/aui_ctp2/radarmap.cpp
modified ctp2_code/ui/aui_directx/aui_directblitter.cpp
modified ctp2_code/ui/aui_directx/aui_directmouse.cpp
modified ctp2_code/ui/aui_directx/aui_directmovie.cpp
modified ctp2_code/ui/aui_directx/aui_directsurface.cpp
modified ctp2_code/ui/aui_directx/aui_directui.cpp
modified ctp2_code/ui/aui_utils/primitives.cpp
added ctp2_data/chinese
added ctp2_data/chinese/gamedata
added ctp2_data/chinese/gamedata/Great_Library.txt
added ctp2_data/chinese/gamedata/Strings.txt
added ctp2_data/chinese/gamedata/add_str.txt
added ctp2_data/chinese/gamedata/cht_str.txt
added ctp2_data/chinese/gamedata/civ_str.txt
added ctp2_data/chinese/gamedata/cut_str.txt
added ctp2_data/chinese/gamedata/dip2_str.txt
added ctp2_data/chinese/gamedata/dip_str.txt
added ctp2_data/chinese/gamedata/err_str.txt
added ctp2_data/chinese/gamedata/exp_str.txt
added ctp2_data/chinese/gamedata/feat_str.txt
added ctp2_data/chinese/gamedata/gl_str.txt
added ctp2_data/chinese/gamedata/info_str.txt
added ctp2_data/chinese/gamedata/junk_str.txt
added ctp2_data/chinese/gamedata/ldl_str.txt
added ctp2_data/chinese/gamedata/scen_str.txt
added ctp2_data/chinese/gamedata/strings_to_add.txt
added ctp2_data/chinese/gamedata/tips_str.txt
added ctp2_data/chinese/gamedata/tut2_str.txt
added ctp2_data/chinese/gamedata/tut_str.txt
added ctp2_data/chinese/uidata
added ctp2_data/chinese/uidata/layouts
added ctp2_data/chinese/uidata/layouts/ChatWindow.ldl
added ctp2_data/chinese/uidata/layouts/DiplomacyDetails.ldl
added ctp2_data/chinese/uidata/layouts/SpriteEditor.ldl
added ctp2_data/chinese/uidata/layouts/advancespad.ldl
added ctp2_data/chinese/uidata/layouts/aipad.ldl
added ctp2_data/chinese/uidata/layouts/ancient.ldl
added ctp2_data/chinese/uidata/layouts/armymanager.ldl
added ctp2_data/chinese/uidata/layouts/attract.ldl
added ctp2_data/chinese/uidata/layouts/battleview.ldl
added ctp2_data/chinese/uidata/layouts/buttonbank.ldl
added ctp2_data/chinese/uidata/layouts/c3utilitydialog.ldl
added ctp2_data/chinese/uidata/layouts/ce_screen.ldl
added ctp2_data/chinese/uidata/layouts/cityespionage.ldl
added ctp2_data/chinese/uidata/layouts/citymanager.ldl
added ctp2_data/chinese/uidata/layouts/citypad.ldl
added ctp2_data/chinese/uidata/layouts/citystatus.ldl
added ctp2_data/chinese/uidata/layouts/cityview.ldl
added ctp2_data/chinese/uidata/layouts/citywindow.ldl
added ctp2_data/chinese/uidata/layouts/civ3.ldl
added ctp2_data/chinese/uidata/layouts/civstatus.ldl
added ctp2_data/chinese/uidata/layouts/controlpanel.ldl
added ctp2_data/chinese/uidata/layouts/creditsscreen.ldl
added ctp2_data/chinese/uidata/layouts/ctp_template.ldl
added ctp2_data/chinese/uidata/layouts/custommap.ldl
added ctp2_data/chinese/uidata/layouts/cutnpastepad.ldl
added ctp2_data/chinese/uidata/layouts/cvscreen.ldl
added ctp2_data/chinese/uidata/layouts/diplomacy.ldl
added ctp2_data/chinese/uidata/layouts/diplomacywindow.ldl
added ctp2_data/chinese/uidata/layouts/dipwizard.ldl
added ctp2_data/chinese/uidata/layouts/editqueue.ldl
added ctp2_data/chinese/uidata/layouts/endgame.ldl
added ctp2_data/chinese/uidata/layouts/fancy.ldl
added ctp2_data/chinese/uidata/layouts/fliwindow.ldl
added ctp2_data/chinese/uidata/layouts/font1.ldl
added ctp2_data/chinese/uidata/layouts/font2.ldl
added ctp2_data/chinese/uidata/layouts/font3.ldl
added ctp2_data/chinese/uidata/layouts/font4.ldl
added ctp2_data/chinese/uidata/layouts/font5.ldl
added ctp2_data/chinese/uidata/layouts/font6.ldl
added ctp2_data/chinese/uidata/layouts/gameplayoptions.ldl
added ctp2_data/chinese/uidata/layouts/graphics.ldl
added ctp2_data/chinese/uidata/layouts/greatlibrary.ldl
added ctp2_data/chinese/uidata/layouts/happystatus.ldl
added ctp2_data/chinese/uidata/layouts/helppopup.ldl
added ctp2_data/chinese/uidata/layouts/helptile.ldl
added ctp2_data/chinese/uidata/layouts/hotseatlist.ldl
added ctp2_data/chinese/uidata/layouts/infoscreen.ldl
added ctp2_data/chinese/uidata/layouts/intelligence.ldl
added ctp2_data/chinese/uidata/layouts/intromovie.ldl
added ctp2_data/chinese/uidata/layouts/km_screen.ldl
added ctp2_data/chinese/uidata/layouts/loadsave.ldl
added ctp2_data/chinese/uidata/layouts/messagebox.ldl
added ctp2_data/chinese/uidata/layouts/musicscreen.ldl
added ctp2_data/chinese/uidata/layouts/ns_chglobby.ldl
added ctp2_data/chinese/uidata/layouts/ns_editplyr.ldl
added ctp2_data/chinese/uidata/layouts/ns_joingame.ldl
added ctp2_data/chinese/uidata/layouts/ns_launch.ldl
added ctp2_data/chinese/uidata/layouts/ns_lobby.ldl
added ctp2_data/chinese/uidata/layouts/ns_selcnct.ldl
added ctp2_data/chinese/uidata/layouts/ns_selplyr.ldl
added ctp2_data/chinese/uidata/layouts/ns_selserv.ldl
added ctp2_data/chinese/uidata/layouts/ns_strings.ldl
added ctp2_data/chinese/uidata/layouts/ns_template.ldl
added ctp2_data/chinese/uidata/layouts/objectpad.ldl
added ctp2_data/chinese/uidata/layouts/options.ldl
added ctp2_data/chinese/uidata/layouts/playerpad.ldl
added ctp2_data/chinese/uidata/layouts/pointspad.ldl
added ctp2_data/chinese/uidata/layouts/pollutionpad.ldl
added ctp2_data/chinese/uidata/layouts/profileedit.ldl
added ctp2_data/chinese/uidata/layouts/queuewin.ldl
added ctp2_data/chinese/uidata/layouts/scenario.ldl
added ctp2_data/chinese/uidata/layouts/scenarioeditor.ldl
added ctp2_data/chinese/uidata/layouts/science.ldl
added ctp2_data/chinese/uidata/layouts/sciencevictory.ldl
added ctp2_data/chinese/uidata/layouts/segmentlist.ldl
added ctp2_data/chinese/uidata/layouts/sound.ldl
added ctp2_data/chinese/uidata/layouts/sourcelist.ldl
added ctp2_data/chinese/uidata/layouts/spnewgame.ldl
added ctp2_data/chinese/uidata/layouts/spnewgamepopups.ldl
added ctp2_data/chinese/uidata/layouts/statswindow.ldl
added ctp2_data/chinese/uidata/layouts/throneroom.ldl
added ctp2_data/chinese/uidata/layouts/tilepad.ldl
added ctp2_data/chinese/uidata/layouts/toolbar.ldl
added ctp2_data/chinese/uidata/layouts/trademanager.ldl
added ctp2_data/chinese/uidata/layouts/tradescreen.ldl
added ctp2_data/chinese/uidata/layouts/tutorialwin.ldl
added ctp2_data/chinese/uidata/layouts/unitmanager.ldl
added ctp2_data/chinese/uidata/layouts/unitpad.ldl
added ctp2_data/chinese/uidata/layouts/unitstatus.ldl
added ctp2_data/chinese/uidata/layouts/victorymovie.ldl
added ctp2_data/chinese/uidata/layouts/victoryscreen.ldl
added ctp2_data/chinese/uidata/layouts/watchlist.ldl
added ctp2_data/chinese/uidata/layouts/wondermovie.ldl
modified ctp2_data/default/aidata/Goals.txt
modified ctp2_data/default/aidata/strategies.txt
deleted ctp2_data/french/gamedata/controlpanel.ldl
deleted ctp2_data/french/gamedata/editqueue.ldl
modified doc/user/playtest/Apolyton_README.txt