Announcement

**Fromafar** · July 13, 2006, 18:06

Revision 613

Relaxed the restriction to 74 colours.
Modified: ctp2_code\gfx\gfx_utils\ColorSet.cpp

Action.cpp: prevented asserts and a crash with missing animations (AOM support).
Modified: ctp2_code\gfx\gfx_utils\pixelutils.h

And another batch of MSVS2005 updates.
Modified: ctp2_code\gfx\spritesys
Modified: ctp2_code\gfx\tilesys

**Fromafar** · July 15, 2006, 16:54

Revision 614

Used the userprofile setting for agreement duration (for backwards compatibility/AOM testing).
Modified: ctp2_code\ai\diplomacy\Diplomat.cpp

If you want the behaviour of the recent playtest versions by E, you have to set the AutoExpireTreatyBase value in userprofile.txt to 20. The default value restores the behaviour of the original game: no automatic expiry of treaties.

Fixed some invalid unit crashes, and lots of MSVS2005 updates - about 100 files in total.

**Martin Gühmann** · July 15, 2006, 19:49

Revision 615

Shrinked the executable file size and replaced old pollution and global warming databases by new ones

Removed a lot of unused tokens so that the executable is about one megabyte smaller:
modified ctp2_code/gs/fileio/Token.cpp
modified ctp2_code/gs/fileio/Token.h

Replaced old pollution and global warming databses by new ones:
modified ctp2_code/ctp/civapp.cpp
modified ctp2_code/ctp/civctp.dsp
modified ctp2_code/gs/database/DB.cpp
modified ctp2_code/gs/fileio/GameFile.cpp
modified ctp2_code/gs/gameobj/Pollution.cpp
modified ctp2_code/gs/newdb/CTPDatabase.cpp
modified ctp2_code/gs/utility/DataCheck.cpp
modified ctp2_code/gs/utility/gameinit.cpp
modified ctp2_code/gs/world/World.h
modified ctp2_code/gs/world/WrldPoll.cpp
modified ctp2_code/gs/world/WrlUnit.cpp
modified ctp2_code/net/general/net_crc.cpp

Added slic database access to DifficultyDB, PollutionDB and GlobalWarmingDB:
modified ctp2_code/gs/slic/SlicEngine.cpp

Converted gw.txt to the new database format:
modified ctp2_data/default/gamedata/gw.txt

Allow parsing of the old pollution.txt
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/MemberClass.cpp
modified ctp2_code/gs/dbgen/MemberClass.h
modified ctp2_code/gs/dbgen/RecordDescription.cpp
modified ctp2_code/gs/dbgen/RecordDescription.h

Made those files compiable again:
modified ctp2_code/ui/interface/citywindow.h
modified ctp2_code/ui/netshell/netfunc.cpp

Put a little more of the readme in a comprehensible state, needed for a optimized playtest release:
modified doc/user/playtest/Apolyton_README.txt

Added a civilisaton database template file:
added templates/cdb

Deleted unnedded files:
deleted ctp2_code/gs/database/CivilisationDB.cpp
deleted ctp2_code/gs/database/CivilisationDB.h
deleted ctp2_code/gs/database/CivilisationRec.cpp
deleted ctp2_code/gs/database/CivilisationRec.h
deleted ctp2_code/gs/database/DiffDB.cpp
deleted ctp2_code/gs/database/DiffDB.h
deleted ctp2_code/gs/database/gwdb.cpp
deleted ctp2_code/gs/database/gwdb.h
deleted ctp2_code/gs/database/GWRecord.cpp
deleted ctp2_code/gs/database/GWRecord.h
deleted ctp2_code/gs/database/GWToken.h
deleted ctp2_code/gs/database/InstDB.cpp
deleted ctp2_code/gs/database/InstDB.h
deleted ctp2_code/gs/database/InstRec.cpp
deleted ctp2_code/gs/database/InstRec.h
deleted ctp2_code/gs/database/orderdb.cpp
deleted ctp2_code/gs/database/orderdb.h
deleted ctp2_code/gs/database/pollutiondb.cpp
deleted ctp2_code/gs/database/PollutionDB.h
deleted ctp2_code/gs/database/PollutionRecord.cpp
deleted ctp2_code/gs/database/pollutionrecord.h
deleted ctp2_code/gs/database/pollutiontoken.h
deleted ctp2_code/gs/database/RiskDB.cpp
deleted ctp2_code/gs/database/RiskDB.h
deleted ctp2_code/gs/database/RiskRecordOld.h

**Martin Gühmann** · July 15, 2006, 19:56

Revision 616

Fixed some stuff from previous revisions

Fixed a crash occuring if you start a game with more players than governments you have in your government database:
modified ctp2_code/gs/gameobj/UnitPool.cpp

Added missing stuff for the last revision:
added ctp2_code/gs/newdb/GlobalWarming.cdb
added ctp2_code/gs/newdb/Pollution.cdb

**Ekmek** · July 16, 2006, 01:00

I got all these list errors

Code:

TiledMap.cpp
F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TiledMap.cpp(483) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TiledMap.cpp(594) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TiledMap.cpp(609) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TiledMap.cpp(656) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gfx\tilesys\TiledMap.cpp(3135) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
CityData.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
Exclusions.cpp
installationdata.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
ObjPool.cpp
F:\SVN-Code\trunk\ctp2_code\gs\gameobj\ObjPool.cpp(45) : error C2039: 'fill' : is not a member of 'std'
F:\SVN-Code\trunk\ctp2_code\gs\gameobj\ObjPool.cpp(45) : error C2065: 'fill' : undeclared identifier
Player.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
TopTen.cpp
F:\SVN-Code\trunk\ctp2_code\gs\gameobj\TopTen.cpp(219) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
UnitData.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
MapFile.cpp
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
WrldPoll.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
WrlUnit.cpp
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
        ..\gs\utility\QuadTree.h(134) : while compiling class-template member function 'class QuadTreeNode *__thiscall QuadTreeNode::AddLeaf(enum QUADRANT,class DynamicArray &)'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
        ..\gs\utility\QuadTree.h(134) : while compiling class-template member function 'void __thiscall QuadTreeNode::AddList(class DynamicArray &)'
SlicFunc.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
PollutionRecord.cpp
net_info.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
network.cpp
F:\SVN-Code\trunk\ctp2_code\net\general\network.cpp(4027) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
controlpanelwindow.cpp
F:\SVN-Code\trunk\ctp2_code\ui\interface\controlpanelwindow.cpp(2981) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
editqueue.cpp
F:\SVN-Code\trunk\ctp2_code\ui\interface\editqueue.cpp(1113) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\ui\interface\editqueue.cpp(2255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
scenarioeditor.cpp
F:\SVN-Code\trunk\ctp2_code\ui\interface\scenarioeditor.cpp(1951) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'

**Fromafar** · July 16, 2006, 11:24

Revision 617 Compiler fixes (mainly).

Added algorithm includes, renamed list variables, and removed using namespace std occurrences.
Modified: ctp2_code\ai\ctpai.cpp
Modified: ctp2_code\ai\diplomacy\ReactEvent.cpp
Modified: ctp2_code\ai\mapanalysis\mapanalysis.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gs\gameobj\ObjPool.cpp
Modified: ctp2_code\gs\gameobj\gaiacontroller.cpp

Improved copy constructor.
Modified: ctp2_code\ai\strategy\agents\agent.cpp
Modified: ctp2_code\ai\strategy\agents\agent.h
Modified: ctp2_code\ai\strategy\agents\ctpagent.cpp
Modified: ctp2_code\ai\strategy\agents\ctpagent.h

Removed useless functionality.
Modified: ctp2_code\ctp\ctp2_utils\c3cmdline.cpp
Modified: ctp2_code\gfx\tilesys\maputils.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h

Corrected funny local variable redefinitions.
Modified: ctp2_code\gs\world\WrldPoll.cpp

**Ekmek** · July 16, 2006, 12:05

fromafar I still got these list errors:

Code:

F:\SVN-Code\trunk\ctp2_code\ui\interface\scenarioeditor.cpp(1951) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\ui\interface\editqueue.cpp(1113) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\ui\interface\editqueue.cpp(2255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\ui\interface\controlpanelwindow.cpp(2981) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\net\general\network.cpp(4027) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gs\gameobj\TopTen.cpp(219) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
UnitData.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
Generating Code...
Compiling...
UnitEvent.cpp
Vision.cpp
gameinit.cpp
MapFile.cpp
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
F:\SVN-Code\trunk\ctp2_code\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
NewTurnCount.cpp
TurnCnt.cpp
UnseenCell.cpp
worldevent.cpp
WrldPoll.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
WrlEnv.cpp
WrlUnit.cpp
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
        ..\gs\utility\QuadTree.h(134) : while compiling class-template member function 'class QuadTreeNode *__thiscall QuadTreeNode::AddLeaf(enum QUADRANT,class DynamicArray &)'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
        ..\gs\utility\QuadTree.h(134) : while compiling class-template member function 'void __thiscall QuadTreeNode::AddList(class DynamicArray &)'
SlicEngine.cpp
SlicEyePoint.cpp
SlicFunc.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'
net_action.cpp
net_cell.cpp
net_gamesettings.cpp
net_info.cpp
..\gs\utility\QuadTree.h(184) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(255) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'
..\gs\utility\QuadTree.h(284) : error C2955: 'list' : use of class template requires template argument list
        C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\List(415) : see declaration of 'list'

**Fromafar** · July 16, 2006, 13:01

Revision 618 Renamed variables called 'list', to prevent conflicts with std::list.

Modified: ctp2_code\gs\gameobj\TopTen.cpp
Modified: ctp2_code\gs\utility\QuadTree.h
Modified: ctp2_code\net\general\network.cpp
Modified: ctp2_code\ui\interface\EditQueue.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.cpp
Modified: ctp2_code\ui\interface\scenarioeditor.cpp

Not sure what you did E, because this has worked in the past, and I do not see the relation with my recent changes. Did you put a statement "using std::list", or "using namespace std" somewhere? If you get more problems like this, you have to rename variables to prevent conflicts, or remove the using-statement.

**Ekmek** · July 16, 2006, 13:17

Originally posted by Fromafar
Not sure what you did E, because this has worked in the past, and I do not see the relation with my recent changes. Did you put a statement "using std::list", or "using namespace std" somewhere? If you get more problems like this, you have to rename variables to prevent conflicts, or remove the using-statement.

nope I wouldn't dare ry something that advance

ok only 1 erreor

F:\SVN-Code\trunk\ctp2_code\ui\interface\controlpanelwind ow.cpp(2981) : error C2955: 'list' : use of class template requires template argument list
C:\Program Files\Microsoft Visual Studio\VC98\INCLUDE\list(415) : see declaration of 'list'

I'll try to fix it

EDIT: Ok, got it.

**Ekmek** · July 16, 2006, 14:03

Revision 619

gs/gameobj/Advances.cpp
- implemented EitherPrerequisite to allow for a fluid tech tree like civ4 (to be tested further)

gs/gameobj/buildingutil.cpp
gs/gameobj/buildingutil.h
gs/gameobj/CityData.cpp
gs/gameobj/CityEvent.cpp
gs/gameobj/GSLogs.cpp
ui/interface/CauseAndEffectTab.cpp
- added owner parameter for TotalUpkeep

ui/interface/controlpanelwindow.cpp
- fixed list error

gs/gameobj/CityData.cpp
- added advances give bonuses in production, food, science, GoldFromOnePop

gs/gameobj/CityData.cpp
gs/gameobj/Player.cpp
- added civilization bonuses

cdbs
-updated flags

updated readme

**Martin Gühmann** · July 21, 2006, 17:18

Revision 620

Some fixes and another part of BOOL -> bool replacements:

The AI builds tile improvements and terraforms again:
modified ctp2_code/ai/CityManagement/governor.cpp

Removed PlayerAI.cpp:
modified ctp2_code/ctp/civctp.dsp

Made the code compile again by outcommenting E's latest changes, because they wouldn't do the desired effect anyway:
modified ctp2_code/gs/gameobj/buildingutil.cpp

Fixed capitol handling, replaced c-style BOOL by c++ bool:
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h

Fixed capitol handling, removed unused stuff, replaced c-style BOOL by c++ bool:
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/player.h

Minor modifications to make these files to compile again:
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/world/WrlUnit.cpp

**Martin Gühmann** · July 21, 2006, 18:56

Revision 621

Some more mergings:

Replaced parameterless Get databse functions by their Has equivalents and replaced c-style BOOL by c++ builtin type bool:
modified ctp2_code/gs/gameobj/buildingutil.cpp
modified ctp2_code/gs/gameobj/buildingutil.h
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/Player.cpp

Obsolete file and therefore deleted:
deleted ctp2_code/gs/gameobj/PlayerAI.cpp

Made readme more comprehensible:
modified doc/user/playtest/Apolyton_README.txt

**Martin Gühmann** · July 22, 2006, 16:02

Revision 622

Implemented more government modified unit specific stuff, removed last database access get-functions and replaced c-style typedef BOOL by c++ builtin type bool.

Removed parameterless get-functions for database access:
modified ctp2_code/gs/dbgen/Datum.cpp

Replaced parameterless database access get-functions by fas-functions, cleaned files, replaced c-style BOOL typedef by c++ builtin type bool:
modified ctp2_code/gs/gameobj/Unit.cpp
modified ctp2_code/gs/gameobj/Unit.h

Implemented government modified for UnitDB here, replaced parameterless database access get-functions by fas-functions, cleaned files, replaced c-style BOOL typedef by c++ builtin type bool:
modified ctp2_code/gs/gameobj/UnitData.cpp
modified ctp2_code/gs/gameobj/UnitData.h

Small modifications:
modified ctp2_code/gs/gameobj/Player.cpp
modified Apolyton CTP2 Source Code_Readme.txt

**Fromafar** · July 24, 2006, 15:13

Revision 623

Modified: ctp2_code\gs\gameobj\GSLogs.cpp
Made it compile.

Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\ctp\civapp.h
Corrected Anet DLL path assignment.

Modified: ctp2_code\gs\fileio\CivPaths.cpp
Modified: ctp2_code\gs\fileio\CivPaths.h
Missing CD-path fix (for Release version).

Not sure when it happened, but the newdb parser is unable to parse the original gw.txt. When using the original file, line 6 generates an "unknown token" pop-up, followed by "missing open brace" pop-ups.

**Ekmek** · July 29, 2006, 00:28

I thought restoring this line

Code:

Assert(foreignerId < m_diplomacy.size() );

to

Code:

sint32 Diplomat::GetNewProposalPriority(const PLAYER_INDEX foreignerId, const PROPOSAL_TYPE proposalType ) const

would fix the new CTD

Code:

0x005c8cb1  [?GetProposal@ProposalElement@DiplomacyRecord@@QBEPBVDiplomacyProposalRecord@@XZ + 0xa]
  0x0085e4da  [?GetNewProposalPriority@Diplomat@@QBEHHW4PROPOSAL_TYPE@@@Z + 0x38]
  0x0084a085  [?GEVHookCallback@BegForGold_NewProposalEvent@@EAE?AW4GAME_EVENT_HOOK_DISPOSITION@@W4GAME_EVENT@@PAVGameEventArgList@@@Z + 0x1dc]
  0x005c1002  [?Activate@GameEventHook@@QBE?AW4GAME_EVENT_ERR@@PAVGameEventArgList@@HAAH@Z + 0x8e]
  0

but I tried.

EDIT: I tried again this time chaniging the code to match the accept code below it.

Code:

sint32 Diplomat::GetNewProposalPriority(const PLAYER_INDEX foreignerId, 
							  const PROPOSAL_TYPE proposalType ) const
{
	Assert(s_proposalTypeToElemIndex[proposalType] < m_diplomacy[foreignerId].GetNumProposalElement());

	
	const DiplomacyRecord::ProposalElement * elem =
		m_diplomacy[foreignerId].GetProposalElement(s_proposalTypeToElemIndex[proposalType]);

	
	///const DiplomacyProposalRecord * rec = elem->GetProposal();
	//if (InvalidNewProposal(foreignerId, rec))
	//	return -1;

	sint32 priority;
	elem->GetSendPriority(priority);
	return priority;
}

Then I got atleast one proposal from every civ (in one case the byzantines wanted me to cancel all deals with byznatines?) and then it crashed again.

Code:

  0x004b760a  [?GetNum@BuildingFeat@WonderRecord@@QBE_NAAH@Z + 0xa]
  0x0085e4de  [?GetNewProposalPriority@Diplomat@@QBEHHW4PROPOSAL_TYPE@@@Z + 0x3c]
  0x0084a085  [?GEVHookCallback@BegForGold_NewProposalEvent@@EAE?AW4GAME_EVENT_HOOK_DISPOSITION@@W4GAME_EVENT@@PAVGameEventArgList@@@Z + 0x1dc]
  0x005c1002  [?Activate@GameEventHook@@QBE?AW4GAME_EVENT_ERR@@PAVGameEventArgList@@HAAH@Z + 0x8e]
  0x005c1c10  [?ActivateHook@GameEventManager@@QAE?AW4GAME_EVENT_ERR@@W4GAME_EVENT@@PAVGameEventArgList@@HAAH@Z + 0x40]

I never had a problem with the wonder feat code but it looks like the diplomat one popped up again so I guess changing it didn't help.

atleast I tried again.

Announcement

PROJECT: Revision Reports

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment