[ctp2-commit] Revision 849 committed by Martin G?\195?\188hmann

ctp2-commit at darkdust.net ctp2-commit at darkdust.net
Sun Feb 10 23:41:54 CET 2008


A bunch of fixes

Some cleanings:
modified trunk/ctp2_code/ui/interface/citywindow.cpp
modified trunk/ctp2_code/ui/interface/controlpanelwindow.cpp

The message that two civilizations are not at war anymore is only shown, if those two civilizations were not at war before:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

Added messages for failed slave raids with and without killed slavers:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_data/default/gamedata/script.slc
modified trunk/ctp2_data/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

Removed a superfluous message that one of your cities was taken: 
modified trunk/ctp2_code/gs/gameobj/armyevent.cpp

The city tab is now updated when you modify the city specialists distribution:
modified trunk/ctp2_code/ui/interface/CityControlPanel.cpp

Replaced the wonder list of the domestic tab of the intellegence window by a city list. If you do not have an embassy only those cities are displayed whose position on the map you know, or you know because the city has a wonder. Also the capital is displayed only if you know its position. If you have an embassy the capital is displayed and all the cities:
modified trunk/ctp2_code/ui/interface/DiplomacyDetails.cpp
modified trunk/ctp2_data/english/uidata/layouts/DiplomacyDetails.ldl
added trunk/ctp2_data/french/uidata/layouts/DiplomacyDetails.ldl
modified trunk/ctp2_data/german/uidata/layouts/DiplomacyDetails.ldl
modified trunk/ctp2_data/italian/uidata/layouts/DiplomacyDetails.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/DiplomacyDetails.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/DiplomacyDetails.ldl

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

U   trunk/ctp2_code/ai/diplomacy/diplomat.cpp
U   trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U   trunk/ctp2_code/gs/gameobj/armyevent.cpp
U   trunk/ctp2_code/ui/interface/CityControlPanel.cpp
U   trunk/ctp2_code/ui/interface/DiplomacyDetails.cpp
U   trunk/ctp2_code/ui/interface/citywindow.cpp
U   trunk/ctp2_code/ui/interface/controlpanelwindow.cpp
U   trunk/ctp2_data/default/gamedata/script.slc
U   trunk/ctp2_data/english/gamedata/info_str.txt
U   trunk/ctp2_data/english/uidata/layouts/DiplomacyDetails.ldl
U   trunk/ctp2_data/french/gamedata/Info_str.txt
A   trunk/ctp2_data/french/uidata/layouts/DiplomacyDetails.ldl
U   trunk/ctp2_data/german/gamedata/info_str.txt
U   trunk/ctp2_data/german/uidata/layouts/DiplomacyDetails.ldl
U   trunk/ctp2_data/italian/gamedata/info_str.txt
U   trunk/ctp2_data/italian/uidata/layouts/DiplomacyDetails.ldl
U   trunk/ctp2_data/japanese/uidata/layouts/DiplomacyDetails.ldl
U   trunk/ctp2_data/spanish/gamedata/info_str.txt
U   trunk/ctp2_data/spanish/uidata/layouts/DiplomacyDetails.ldl
U   trunk/doc/user/playtest/Apolyton_README.txt



More information about the ctp2-commit mailing list