PROJECT: Revision Reports 2

[Martin Gühmann]

Revision 1055: Some fixes for the next version of the Apolyton Edition

Some cleanings:
modified trunk/ctp2_code/ctp/civapp.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directui.cpp

Separated _DEBUG and PLAYTEST directives from each other:
modified trunk/ctp2_code/ctp/ctp2_utils/netconsole.cpp
modified trunk/ctp2_code/gfx/spritesys/director.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/slic/slicobject.cpp
modified trunk/ctp2_code/net/general/network.cpp
modified trunk/ctp2_code/ui/aui_ctp2/statuswindow.cpp
modified trunk/ctp2_data/english/gamedata/tips_str.txt
modified trunk/ctp2_data/french/gamedata/tips_str.txt
modified trunk/ctp2_data/german/gamedata/tips_str.txt
modified trunk/ctp2_data/italian/gamedata/tips_str.txt
modified trunk/ctp2_data/spanish/gamedata/tips_str.txt

Correct *.map file is now used for the final with logging version:
modified trunk/ctp2_code/ctp/debugtools/debugcallstack.cpp

Made the compile with Visual C++ 6 again:
modified trunk/ctp2_code/ui/interface/armymanagerwindow.cpp
modified trunk/ctp2_code/ui/interface/armymanagerwindow.h

Added translations for the German version:
modified trunk/ctp2_data/german/gamedata/ldl_str.txt

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

In the final version, the memory is cleaned up like in the debug version when the game is existing. This prevents a crash on game exit:
modified trunk/ctp2_code/ctp/civ3_main.cpp

[Martin Gühmann]

Revision 1056: Disabled the CD-check so that the game can be played with the retail version from gog.com

Some cleanings:
modified trunk/ctp2_code/ai/diplomacy/nproposalevent.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

If the AI runs into a foreigner and it wants war with him it goes to battle:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h
modified trunk/ctp2_code/robot/pathing/unitastar.cpp

The honor pollution agreement does not set an embargo:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

The AI now considers humans and robots equally when it is desiring war:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

The AI unloads cargo from helis when it tries to group them into attack stack:
modified trunk/ctp2_code/ai/strategy/agents/agent.cpp
modified trunk/ctp2_code/ai/strategy/agents/agent.h
modified trunk/ctp2_code/gs/gameobj/armyevent.cpp

The AI does not try to group land units into sea transporters anymore:
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

Disabled the CD-check so that the gog.com retail version of Call to Power 2 can be used with the Apolyton Edition:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h

[Fromafar]

Revision 1057 Scenario and compilation fixes:

Conditional compilation guards for map coloring added/corrected
ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
ctp2_code/gfx/tilesys/tiledmap.cpp
ctp2_code/gs/world/World.h

Syntax corrected
ctp2_code/ctp/debugtools/debugmemory.h

Added check for invalid/unassigned player index in ComputePlayerColor
ctp2_code/gfx/gfx_utils/ColorSet.cpp

Added missing dependencies
ctp2_code/gfx/gfx_utils/Queue.h
ctp2_code/gs/database/dbtypes.h
ctp2_code/gs/outcom/IC3Rand.h

Corrected array delete operator use in destructor
ctp2_code/gs/events/GameEvent.cpp

Comments added
ctp2_code/gs/events/GameEventTypes.h

Corrected handling of "no data" when reading from file
ctp2_code/robot/aibackdoor/bit_table.h

Ensure agesscreen::s_numAges is set when selecting a scenario directly.
ctp2_code/ui/interface/spnewgamewindow.cpp


To prevent the Alexander scenario from crashing at startup, you have to copy some files from the original Activision release:

From (original) Scenarios\AlexanderTheGreat\scen0000\default\aidat a
to (Apolyton) Scenarios\AlexanderTheGreat\scen0000\default\aidat a

personalities.txt
strategies.txt

From (original) ctp2_data\default\aidata
to (Apolyton) Scenarios\AlexanderTheGreat\scen0000\default\aidat a

goals.txt
unitbuildlists.txt

From (original) ctp2_data\default\gamedata
to (Apolyton) Scenarios\AlexanderTheGreat\scen0000\default\gamed ata

age.txt
orders.txt

After doing this, you should expect a Slic error and a strange looking welcome message (click the message in the Msgs box twice to make it look better), but you will be able to run the Alexander scenario.

[ctplinuxfan]

Revision 1058

Makefile
ctp2_code/GameWatch/gamewatch/DLLTypes.h
ctp2_code/ai/CityManagement/governor.h
ctp2_code/ctp/civ3_main.cpp
ctp2_code/ctp/debugtools/debugcallstack.cpp
ctp2_code/gs/world/cellunitlist.cpp
ctp2_code/robot/pathing/UnitAstar.h
ctp2_code/ui/aui_common/aui_Factory.cpp
ctp2_code/ui/aui_common/aui_Factory.h
ctp2_code/ui/aui_common/aui_control.h
ctp2_code/ui/aui_common/aui_item.h
ctp2_code/ui/aui_ctp2/ctp2_button.h
ctp2_code/ui/aui_directx/aui_directaudiomanager.h
ctp2_code/ui/aui_directx/aui_directblitter.h
ctp2_code/ui/aui_directx/aui_directinput.h
ctp2_code/ui/aui_directx/aui_directjoystick.h
ctp2_code/ui/aui_directx/aui_directkeyboard.h
ctp2_code/ui/aui_directx/aui_directmouse.h
ctp2_code/ui/aui_directx/aui_directmovie.h
ctp2_code/ui/aui_directx/aui_directmoviemanager.h
ctp2_code/ui/aui_directx/aui_directsound.h
ctp2_code/ui/aui_directx/aui_directui.h
ctp2_code/ui/aui_directx/aui_directx.h
ctp2_code/ui/aui_sdl/aui_sdlkeyboard.h
ctp2_code/ui/aui_sdl/aui_sdlmouse.h
ctp2_code/ui/aui_sdl/aui_sdlui.cpp
ctp2_code/ui/aui_sdl/aui_sdlui.h
ctp2_code/ui/ldl/ldl_attr.hpp

- fixed case of include headers
- fixed initialization order of some classes

[ctplinuxfan]

Revision 1059

ctp2_code/ctp/civ3_main.cpp
- ported half of file to linux

ctp2_code/gs/utility/TurnCnt.cpp
ctp2_code/gs/utility/gameinit.cpp
ctp2_code/gs/gameobj/Player.cpp
ctp2_code/gs/gameobj/TradeRoute.cpp
ctp2_code/gs/slic/SlicEyePoint.cpp
- added missing #include of colorset.h

[Martin Gühmann]

Revision 1060: The AI avoids danger on the way of its units

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

The incursion permissions for the AIs are restored save game loading instead on BeginTurn:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

Fixed 64 bit incompatibilities:
modified trunk/ctp2_code/ctp/ctp2_utils/tracklen.cpp

Corrected strength calculation for civilizations for the current turn:
modified trunk/ctp2_code/gs/gameobj/Strengths.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp

If the visible player is a robot than the displayed unit path is the one that the AI would use. This is useful for checking if the AI indeeds avoids danger on the units paths:
modified trunk/ctp2_code/ui/aui_ctp2/SelItem.cpp

Now the intelegence windows distinguishes between strong and very strong opponents:
modified trunk/ctp2_code/ui/interface/intelligencewindow.cpp

Added desire war display in the embassy slot for the debug version:
modified trunk/ctp2_code/ui/interface/intelligencewindow.cpp
modified trunk/ctp2_data/english/uidata/layouts/intelligence.ldl
modified trunk/ctp2_data/french/uidata/layouts/intelligence.ldl
modified trunk/ctp2_data/german/uidata/layouts/intelligence.ldl
modified trunk/ctp2_data/italian/uidata/layouts/intelligence.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/intelligence.ldl

The AI avoids danger on the way of its units:
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h
modified trunk/ctp2_code/gs/world/cellunitlist.cpp
modified trunk/ctp2_code/gs/world/cellunitlist.h
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/robot/pathing/UnitAstar.h

[ctplinuxfan]

Revision 1061

- added further code from linux branch
- added DBL_MAX constant
- added GTK+ to autoconf environment
- fixed case of headers
ctp2_code/os/nowin32/windows.h
ctp2_code/os/autoconf/Makefile.common
ctp2_code/robot/utility/roboinit.cpp
ctp2_code/ctp/civ3_main.cpp
ctp2_code/ui/interface/greatlibrarywindow.h
ctp2_code/ui/interface/spnewgametribescreen.h
ctp2_code/ui/aui_common/aui_mouse.h
configure.ac

[Martin Gühmann]

Revision 1062: The debug version can be used on Windows 7

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

Games that have a dead player in can be loaded again:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp

The game does compile again:
modified trunk/ctp2_code/ctp/civ3_main.cpp

The debug version can be used on Windows 7:
modified trunk/ctp2_code/ui/aui_directx/aui_directsurface.cpp
modified trunk/ctp2_code/ui/aui_directx/aui_directui.cpp

[ctplinuxfan]

Revision 1063

- Fixed case of includes:
ctp2_code/robot/pathing/robotastar2.cpp
ctp2_code/robot/pathing/CityAstar.cpp
ctp2_code/robot/pathing/astar.cpp
ctp2_code/robot/pathing/unitastar.cpp
ctp2_code/robot/pathing/TradeAstar.cpp

- removed robot/pathing/RobotAstar.cpp from:
ctp2_code/Makefile.am

[ctplinuxfan]

Revision 1064

Created tag for tracking changes since current trunk
tag: 2010-04-01

[ctplinuxfan]

Revision 1065

- branch for merging: trunk -> port, linux -> port and finally for backmerging port -> trunk


created branch: port-trunk

[ctplinuxfan]

Revision 1066

- Implemented Os::SetThreadName() for linux
ctp2_code/ctp/debugtools/debug.c
ctp2_code/ctp/debugtools/debug.h

- Added *.vcproj to svn:ignore
ctp2_code/ctp
ctp2_code/mapgen
ctp2_code/gs/dbgen

[ctplinuxfan]

Revision 1067
Mergetest (succeeded):
port-trunk: Merged /trunk:r1065-1066:

- Implemented Os::SetThreadName() for linux
ctp2_code/ctp/debugtools/debug.c
ctp2_code/ctp/debugtools/debug.h

- Added *.vcproj to svn:ignore
ctp2_code/ctp
ctp2_code/mapgen
ctp2_code/gs/dbgen

[ctplinuxfan]

Revision 1068, branch port-trunk:

- display gtk-dialog when calling MessageBox:
ctp2_code/os/nowin32/nowin32.cpp

- initialize m_queue_idx only when _DEBUG is defined
ctp2_code/robot/aibackdoor/avl.h

- only try setting thread name (~process name on linux) when *running* kernel is recent enough
ctp2_code/ctp/debugtools/debug.c

- linux compile fixes:
ctp2_code/robot/aibackdoor/bset.h
ctp2_code/robot/aibackdoor/civarchive.cpp
ctp2_code/gs/outcom/Ic3CivArchive.h
ctp2_code/ui/aui_common/aui_control.cpp
ctp2_code/ui/aui_common/aui_bitmapfont.cpp
ctp2_code/ui/aui_common/aui_image.cpp
ctp2_code/ui/aui_common/aui_cursor.cpp

[ctplinuxfan]

Revision 1069
Merged /branches/port-trunk:r1065-1068:
- display gtk-dialog when calling MessageBox:
ctp2_code/os/nowin32/nowin32.cpp

- initialize m_queue_idx only when _DEBUG is defined
ctp2_code/robot/aibackdoor/avl.h

- only try setting thread name (~process name on linux) when *running* kernel is
recent enough
ctp2_code/ctp/debugtools/debug.c

- linug compile fixes:
ctp2_code/robot/aibackdoor/bset.h
ctp2_code/robot/aibackdoor/civarchive.cpp
ctp2_code/gs/outcom/Ic3CivArchive.h
ctp2_code/ui/aui_common/aui_control.cpp
ctp2_code/ui/aui_common/aui_bitmapfont.cpp
ctp2_code/ui/aui_common/aui_image.cpp
ctp2_code/ui/aui_common/aui_cursor.cpp