PROJECT: Revision Reports

[Martin Gühmann]

Revision 800: Simplified code and made the source code compile again under all configurations

Simplified code:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/diplomacy/diplomattypes.h
modified trunk/ctp2_code/ai/mapanalysis/mapanalysis.cpp
modified trunk/ctp2_code/ai/diplomacy/nproposalevent.cpp
modified trunk/ctp2_code/ai/diplomacy/proposalresponseevent.cpp
modified trunk/ctp2_code/ai/diplomacy/ReactEvent.cpp
modified trunk/ctp2_code/gfx/spritesys/director.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
modified trunk/ctp2_code/gs/gameobj/Advances.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/bldque.cpp
modified trunk/ctp2_code/gs/gameobj/CityEvent.cpp
modified trunk/ctp2_code/gs/gameobj/CTP2Combat.cpp
modified trunk/ctp2_code/gs/gameobj/Happy.cpp
modified trunk/ctp2_code/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_code/gs/gameobj/PlayHap.cpp
modified trunk/ctp2_code/gs/gameobj/Readiness.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/slic/slicfunc.cpp
modified trunk/ctp2_code/gs/utility/gameinit.cpp
modified trunk/ctp2_code/gs/world/WrldPoll.cpp
modified trunk/ctp2_code/gs/world/WrlUnit.cpp
modified trunk/ctp2_code/net/general/net_chat.cpp
modified trunk/ctp2_code/net/general/net_info.cpp
modified trunk/ctp2_code/net/general/network.cpp
modified trunk/ctp2_code/net/general/networkevent.cpp
modified trunk/ctp2_code/ui/aui_ctp2/keypress.cpp
modified trunk/ctp2_code/ui/aui_ctp2/SelItem.cpp
modified trunk/ctp2_code/ui/interface/loadsavescreen.cpp
modified trunk/ctp2_code/ui/interface/spnewgametribescreen.cpp
modified trunk/ctp2_code/ui/interface/victorywin.cpp

Made sure that the game builds the database files under all configurations:
modified trunk/ctp2_code/ctp/civctp.dsp

[Martin Gühmann]

Revision 801: Made the game load again:

Cleaned file:
modified trunk/ctp2_data/default/gamedata/civilisation.txt

Made the game load again without database errors:
modified trunk/ctp2_data/default/gamedata/concepticon.txt
modified trunk/ctp2_data/default/gamedata/Wonder.txt

Made the game to load again and resynchronized files:
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/spanish/gamedata/civ_str.txt

Added missing Polonian city name, this would not have been necessary if the files were been in sync:
modified trunk/ctp2_data/spanish/gamedata/civ_str.txt

[Martin Gühmann]

Revision 802: Fixed some bugs:

Added some comments:
modified trunk/ctp2_code/ui/interface/chatbox.cpp

Fixed some bugs:
modified trunk/ctp2_code/gfx/tilesys/tiledmap.h
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
modified trunk/ctp2_code/gs/world/UnseenCell.h

[Martin Gühmann]

Revision 803: Some code simplification and fixing a bug:

Simplified code:
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

If you try to access a unit record of an invalid type the debug version now prints the invalid type to the log file:
modified trunk/ctp2_code/gs/newdb/CTPDatabase.cpp

Provided an default tone if the is no tone provided to diplomacy slic functions with and optional tone argument:
modified trunk/ctp2_code/gs/slic/slicfuncai.cpp

Fixed one of E's bugs, better you do not mistake the unit's ID for its type:
modified trunk/ctp2_code/gs/gameobj/bldque.cpp

[Martin Gühmann]

Revision 804

And fixing one of my own bugs, savegames can be loaded again:
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

[Martin Gühmann]

Revision 808: Some cleanings:

Cleaned file:
modified trunk/ctp2_code/ai/diplomacy/diplomattypes.h

Simplified code:
modified trunk/ctp2_code/gs/utility/newturncount.cpp
modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
modified trunk/ctp2_code/gs/utility/TurnCnt.h

Some fixings:
modified trunk/ctp2_data/german/gamedata/dip2_str.txt

[Martin Gühmann]

Revision 809: Added PBEM (untested) and HotSeat (tested) human-human diplomacy support

Separated the NewProposal and the Response event so that the NewProposal event can be called from slic without any problems and added HotSeat human-human diplomacy. This should also work in PBEM but this is untested.
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp
modified trunk/ctp2_code/ai/diplomacy/Diplomat.h
modified trunk/ctp2_code/ai/diplomacy/foreigner.cpp
modified trunk/ctp2_code/ai/diplomacy/Foreigner.h
modified trunk/ctp2_code/ai/diplomacy/nproposalevent.cpp
modified trunk/ctp2_code/ai/diplomacy/proposalresponseevent.cpp
modified trunk/ctp2_code/ai/diplomacy/ResponseEvent.cpp
modified trunk/ctp2_code/gs/events/GameEventDescription.h
modified trunk/ctp2_code/gs/utility/TurnCntEvent.cpp
modified trunk/ctp2_code/ui/interface/dipwizard.cpp

[Martin Gühmann]

Revision 810: Some cleanings and a crash fix:

Some cleaning:
modified trunk/ctp2_code/gs/newdb/wonder.cdb

Removed that extra wonder E has introduced from the build list and the Great Library:
modified trunk/ctp2_data/default/gamedata/Wonder.txt

Updated the readme.txt and improved its readability:
modified trunk/doc/user/playtest/Apolyton_README.txt

Fixed a defect in the code that made the debug version crash and may have made crash the game in the final version in the long run as well:
modified trunk/ctp2_code/gfx/spritesys/spritefile.cpp

[Martin Gühmann]

Revision 812 Miscellaneous fixings:

No longer needed:
deleted trunk/ctp2_code/gs/database/ConstDB.cpp
deleted trunk/ctp2_code/gs/database/ConstDB.h

Some cleaning:
modified trunk/ctp2_code/ui/aui_ctp2/keymap.h

Improved debugging:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp

Improved error handling:
modified trunk/ctp2_code/gfx/spritesys/effectspritegroup.cpp

Restored mod compatibility:
modified trunk/ctp2_code/gs/newdb/Const.cdb

Prevented a crash:
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp

Restored construction year display of wonders in the wonder tab of the info window and restored the message date display of messages from the message box:
modified trunk/ctp2_code/gs/gameobj/Diffcly.cpp
modified trunk/ctp2_code/ui/interface/messagewindow.cpp
modified trunk/ctp2_code/ui/interface/TurnYearStatus.cpp
modified trunk/ctp2_code/ui/interface/TurnYearStatus.h

If a modal window like the diplomacy window is the top window all keypresses are ignored so that other windows don not open and do not close the diplomacy window while negotiations are done:
modified trunk/ctp2_code/ui/aui_ctp2/keypress.cpp

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

[Martin Gühmann]

Revision 813: Fixed the GetPersonalityType slic function

Cleaned files and added some comments:
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/player.h

Fixed the GetPersonalityType slic function and made it compatible with DiploMod:
modified trunk/ctp2_code/gs/slic/slicfuncai.cpp

[Ekmek]

Revision 814:

added flags for Lycia, Kurdistan, Armenia, Yamamto, and Sumeria
U trunk/ctp2_data/default/gamedata/concepticon.txt
U trunk/ctp2_data/default/graphics/pictures/upc138.tga
U trunk/ctp2_data/default/graphics/pictures/upc140.tga
U trunk/ctp2_data/default/graphics/pictures/upc141.tga
U trunk/ctp2_data/default/graphics/pictures/upc142.tga
U trunk/ctp2_data/english/gamedata/civ_str.txt



@Martin...does the revision 813 include the latest exe uyou posted for PBEM?

[Martin Gühmann]

Originally posted by E
@Martin...does the revision 813 include the latest exe uyou posted for PBEM?

Does the revision report say anything about PBEM? If not, then there is a reason.

Revision 815: Fixed PBEM BeginTurn event execution

Some cleanings:
modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
modified trunk/ctp2_code/gs/gameobj/Pollution.cpp
modified trunk/ctp2_code/gs/gameobj/pollution.h
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Cleaned text files a little bit:
modified trunk/ctp2_data/english/gamedata/add_str.txt
modified trunk/ctp2_data/english/gamedata/info_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
modified trunk/ctp2_data/italian/gamedata/info_str.txt
modified trunk/ctp2_data/spanish/gamedata/info_str.txt

Made sure that games starts again without any errors. E, you should make sure that you upload all the necessary files.
modified trunk/ctp2_data/default/gamedata/concepticon.txt

Fixed PBEM BeginTurn event execution, so that terrain improvements are built:
modified trunk/ctp2_code/ctp/civapp.cpp
modified trunk/ctp2_code/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_code/gs/utility/newturncount.cpp

[Martin Gühmann]

Revision 816 by E:
Added all the pictures E forgot last time
Added many new religion icons
trunk/ctp2_data/default/graphics/pictures

Revision 817: Removed wonders from the Barbarian build list and fixed value display of shadowed tiles

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

Reverted changes from my last revision since E has provided the missing images:
modified trunk/ctp2_data/default/gamedata/concepticon.txt

Revoved the wonders from the Barbarian build list:
modified trunk/ctp2_data/default/aidata/buildlistsequences.txt
modified trunk/ctp2_data/default/aidata/strategies.txt

Shadowed tiles do not show values as they would have rivers:
modified trunk/ctp2_code/gs/world/UnseenCell.cpp
modified trunk/ctp2_code/gs/world/UnseenCell.h

[Martin Gühmann]

Revision 818: Miscellaneous fixes

Some cleanings:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_data/default/aidata/Goals.txt

Moved pollution BeginTurn to player BeginTurn, so that global warming may kill a civilisation afterwards all the player events have been executed.
modified trunk/ctp2_code/ctp/civapp.cpp
modified trunk/ctp2_code/gs/gameobj/PlayerTurn.cpp
modified trunk/ctp2_code/gs/utility/newturncount.cpp

Moved OzoneDepletion and GlobalWarming to events so that they can added after all the BeginTurn player events and possibly kill that player:
modified trunk/ctp2_code/gs/events/GameEventDescription.h
modified trunk/ctp2_code/gs/world/World.h
modified trunk/ctp2_code/gs/world/worldevent.cpp
modified trunk/ctp2_code/gs/world/WrldPoll.cpp

Fixed world meridian calculation:
modified trunk/ctp2_code/gs/gameobj/tradeutil.cpp

Added const database slic access:
modified trunk/ctp2_code/gs/slic/SlicEngine.cpp

Made the world meridians symmetrical:
modified trunk/ctp2_data/default/gamedata/Const.txt

Global warming does not change dessert and the snow melts from white mountains and white hills:
modified trunk/ctp2_data/default/gamedata/gw.txt

Fixed the targets of the orders Sue and Injoin so that the AI targets the right stuff:
modified trunk/ctp2_data/default/gamedata/Orders.txt

The equatorial meridian now also suffers ozone depletion.
modified trunk/ctp2_data/default/gamedata/ozone.txt

Made UNIT_MOBILE_SAM a full bormbard unit, it throws missiles so you can also attack land units with it:
modified trunk/ctp2_data/default/gamedata/Units.txt

[Ekmek]

Revision 819

default/gamedata/civilisation.txt
[language]/gamedata/civ_str.txt
- Added Armenian Civilization
- Added Kurdish Civilization


U trunk/ctp2_data/default/gamedata/civilisation.txt
U trunk/ctp2_data/english/gamedata/civ_str.txt
U trunk/ctp2_data/french/gamedata/civ_str.txt
U trunk/ctp2_data/german/gamedata/civ_str.txt
U trunk/ctp2_data/italian/gamedata/civ_str.txt
U trunk/ctp2_data/spanish/gamedata/civ_str.txt