26-03-2005 04:24									#451
	Support Apolyton, buy Civilization: The Boardgame

Revision 300

Anet library update, containing:

• The Anet 0.10 header files, with the comments and copyright notices that were stripped in the source code release.
• The (VC6) recompiled DLLs, with the fix for the MP game hosting problem with Windows XP.
  

	26-03-2005 11:58									#452
	Support Apolyton, buy Civilization 2

Sorry, I went a bit over-the-top. I'll do better next time. I'll hopefully add the other bitwise operators tomorrow as this machine doesn't have the code.

	27-03-2005 00:17									#453
	Put an end to popups!

What should we do about new bugs? I keep finding bugs that I'm pretty sure are not due to the current changes I'm making to the code.

PS: Welcome to the project, young tombom. (Have you seen how old he is? )

	27-03-2005 00:23									#454
	Help yourself to an AD-FREE life

Young Skywalker indeed.

Peter, I sent you a PM, did you get it? Busy or Ignoring it? No rush though, just making sure Apolyton didnt eat it.

	27-03-2005 06:06									#455
	Tired of ads?

quote: Originally posted by Peter Triggs What should we do about new bugs? I keep finding bugs that I'm pretty sure are not due to the current changes I'm making to the code.

You should certainly mention them somewhere, or at the very least keep a record of them locally so you can see if they still exist when you've stabilised your current work. With luck we may get a bug reporting server to help us manage this sort of thing.

	27-03-2005 18:18									#456
	Support Apolyton, buy Civilization: The Boardgame

Revision 301
Changed paths:
D /trunk/ctp2_code/doc
A /trunk/doc (from /trunk/ctp2_code/doc:300)

Moved documentation directory to root directory, where it is more appropriate
and obvious.

Revision 302
Changed paths:
D /trunk/1_1readme.txt
D /trunk/1_1readme_french.txt
D /trunk/1_1readme_german.txt
D /trunk/1_1readme_italian.txt
D /trunk/1_1readme_spanish.txt
D /trunk/ctp2_program/ctp/userkeymap.txt
A /trunk/doc/README.txt
A /trunk/doc/user/activision
A /trunk/doc/user/activision/1_1readme.txt (from /trunk/1_1readme.txt:300)
A /trunk/doc/user/activision/1_1readme_french.txt (from /trunk/1_1readme_french.txt:300)
A /trunk/doc/user/activision/1_1readme_german.txt (from /trunk/1_1readme_german.txt:300)
A /trunk/doc/user/activision/1_1readme_italian.txt (from /trunk/1_1readme_italian.txt:300)
A /trunk/doc/user/activision/1_1readme_spanish.txt (from /trunk/1_1readme_spanish.txt:300)

ctp2_program/ctp/userkeymap.txt
- Removed - this shouldn't be here (generated by CTP2)

1_1readme*
- Moved into doc to unclutter main directory

doc/README.txt
- Created readme describing documentation structure

Revision 303
Changed paths:
(Far far far too many)

Purging of ACTIVISION_ORIGINAL
- Stage 1, all preprocessor directives in .cpp and .h files cleared of references to ACTIVISION_ORIGINAL

(The next stage will be to remove references from the comments)

Last edited by J Bytheway on 31-03-2005 at 19:37

	31-03-2005 19:20									#457
	Support Apolyton buy from Amazon

Revision 304 (by tombom)
Changed paths:
M /trunk/ctp2_code/gs/slic/slic.y

My previous update reveresed due to the fact it didn't work and suddenly started causing big problems.

Revision 305
Changed paths:
M /trunk
A /trunk/Makefile
A /trunk/bin/copy_to_local.sh
A /trunk/doc/Makefile
A /trunk/doc/user/Makefile
A /trunk/etc

- Added a script and some Makefiles to help developers

Last edited by J Bytheway on 31-03-2005 at 19:39

	01-04-2005 04:41									#458
	Support Apolyton, buy Civilization III: Complete

Revision 306
Changed paths:
A /trunk/bin/activ_orig_remove.awk
M many files

Purging of ACTIVISION_ORIGINAL
- Stage 2, most references to ACTIVISION_ORIGINAL in comments in .cpp and .h
files removed
- Provided awk script bin/activ_orig_remove.awk which was used for this

Revision 307
Changed paths:
M /trunk/Scenarios/AlexanderTheGreat/scen0000/default/gamedata/AG_msg.slc
M /trunk/Scenarios/AlexanderTheGreat/scen0000/default/gamedata/scenario.slc
M /trunk/ctp2_code/ai/ctpai.cpp
M /trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
M /trunk/ctp2_code/ctp/c3.h
M /trunk/ctp2_code/ctp/civ3_main.cpp
M /trunk/ctp2_code/ctp/civ3_main.h
M /trunk/ctp2_code/ctp/debugtools/debugcallstack.cpp
M /trunk/ctp2_code/gs/dbgen/ctpdb.y
M /trunk/ctp2_code/gs/newdb/DBLexer.h
M /trunk/ctp2_code/gs/slic/slic.l
M /trunk/ctp2_code/gs/slic/slic.y
M /trunk/ctp2_code/gs/slic/sliccmd.y
M /trunk/ctp2_code/gs/slic/slicif.h
M /trunk/ctp2_code/gs/utility/stringutils.cpp
M /trunk/ctp2_code/sound/civsound.cpp
M /trunk/ctp2_code/sound/civsound.h
M /trunk/ctp2_code/sound/gamesounds.cpp
M /trunk/ctp2_code/sound/gamesounds.h
M /trunk/ctp2_code/sound/soundmanager.cpp
M /trunk/ctp2_code/sound/soundmanager.h
M /trunk/ctp2_code/ui/aui_ctp2/directvideo.cpp
M /trunk/ctp2_code/ui/aui_ctp2/keypress.cpp
M /trunk/ctp2_code/ui/aui_directx/aui_directmovie.cpp
M /trunk/ctp2_code/ui/interface/greatlibrary.cpp
M /trunk/ctp2_code/ui/interface/hotseatlist.h
M /trunk/ctp2_data/default/gamedata/buildings.txt
M /trunk/ctp2_data/english/uidata/layouts/science.ldl
M /trunk/doc/dev/include/a_defines.tex

Purging ACTIVISION_ORIGINAL
- Stage 3 (the last stage), removed most of the remaining references in
assorted files

	01-04-2005 23:29									#459
	Help yourself to an AD-FREE life

r308
-Fixed the problem resulting from deleting the typedef in statement in slic.y. Incidentally, my log message was a lot less descriptive, which I'm sorry for.

M /trunk/ctp2_code/gs/slic/slic.y

	02-04-2005 00:03									#460
	Support Apolyton, buy Civilization 2

309 Added Leader name support for AOM
modified ctp2_code/gs/gameobj/Unit.cpp
modified ctp2_code/gs/gameobj/Unit.h
modified ctp2_code/gs/newdb/unit.cdb
modified ctp2_code/ui/aui_ctp2/battleorderbox.cpp
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/UnitControlPanel.cpp

310 Crashes, memory leaks, code improvements
modified ctp2_code/ai/diplomacy/diplomat.cpp - relaxed Assert
modified ctp2_code/gfx/spritesys/Anim.h - made destructor virtual
modified ctp2_code/gfx/tilesys/tiledmap.cpp - improved destructor
modified ctp2_code/gfx/tilesys/tiledmap.h - made destructor virtual
modified ctp2_code/gs/database/CivilisationDB.h - corrected Asserts
modified ctp2_code/gs/fileio/Token.cpp - prevented crash on missing input file
modified ctp2_code/gs/gameobj/Player.cpp - prevented memory leak reports
modified ctp2_code/gs/newdb/DBLexer.cpp - prevented memory leaks
modified ctp2_code/gs/slic/slic.y - priority of ** increased
modified ctp2_code/gs/slic/SlicEngine.cpp - crash with missing file prevented, memory leaks repaired
modified ctp2_code/gs/slic/SlicFunc.h - AllUnitsCanBeExpelled return type corrected
modified ctp2_code/gs/slic/SlicSegment.cpp - prevented memory leaks
modified ctp2_code/gs/world/WrlEnv.cpp - prevented memory leak report
modified ctp2_code/ui/aui_common/aui_imagebase.h - prevented crash (debug) or missing credit fires (release)
modified ctp2_code/ui/aui_common/aui_textbase.h - prevented crash (debug) or missing credit fires (release)
modified ctp2_code/ui/aui_ctp2/background.cpp - prevented crash
modified ctp2_code/ui/aui_directx/aui_directui.cpp - prevented crash
modified ctp2_code/ui/aui_utils/vidplay.cpp - changed string handling to avoid deprecated functions
modified ctp2_code/ui/aui_utils/vidplay.h - changed string handling to avoid deprecated functions
modified ctp2_code/ui/interface/TurnYearStatus.cpp - prevented crash
modified ctp2_code/ui/netshell/lobbywindow.cpp - prevented memory leak report
modified ctp2_code/ui/netshell/netshell.cpp - prevented memory leaks and debug exit popups.

311 Added support for multiple "ctp2_data" directories
modified ctp2_code/gs/fileio/CivPaths.cpp
modified ctp2_code/gs/fileio/CivPaths.h

	02-04-2005 00:27									#461
	Support Apolyton, buy Civilization 2

r312
Added NoBarbarian code, to exclude units from being barbarians.

M /trunk/ctp2_code/gs/gameobj/barbarians.cpp
M /trunk/ctp2_code/gs/newdb/unit.cdb

	03-04-2005 17:46									#462
	Increase the size of your Attachments

Revision 313
Changed paths:
M /trunk/ctp2_code/gs/newdb
M /trunk/ctp2_code/gs/slic/SlicFrame.cpp
M /trunk/ctp2_code/gs/slic/slic.y
M /trunk/ctp2_code/gs/slic/slicif.cpp
M /trunk/ctp2_code/gs/slic/slicif.h

ctp2_code/gs/newdb
- Set to ignore .old files

ctp2_code/gs/slic
- Added bitwise or, xor and not

	04-04-2005 01:07									#463
	Remove this text

Revision 314
modified ctp2_data/english/gamedata/gl_str.txt
modified ctp2_data/french/gamedata/gl_str.txt
modified ctp2_data/german/gamedata/gl_str.txt
modified ctp2_data/italian/gamedata/gl_str.txt

Exanged the names of arabian city style and asian city style, so that right name is shown in the cheat editor.

Added the new age and city style name strings to the French gl_str.txt where they were missing.

Revision 315
Missed to add the final modification to ctp2_data/english/gamedata/gl_str.txt

-Martin

	05-04-2005 00:20									#464
	Support Apolyton, buy Civilization III: Complete

r316
Changed a few bits of docs and added a new doc to store info about files. If anybody could do that command I've asked for in the new file I would be grateful.
M /doc/dev/ctp2_dev.tex
M /doc/dev/include/a_deadcode.tex
M /doc/dev/include/a_defines.tex
A /doc/dev/include/a_file_describe.tex

Can somebody check that we didn't lose code from Solver's changes in r27(8?)

Last edited by tombom on 05-04-2005 at 00:33

	05-04-2005 22:38									#465
	Help yourself to an AD-FREE life

quote: Originally posted by tombom Can somebody check that we didn't lose code from Solver's changes in r27(8?)

What be with this revision? Solver used an outdated version of the files. And I didn't add these files into my private version before I merged them per hand. And after that I posted an updated version of these files. However here is:

Revision 317

Updated AssignSpecialist function:
- AI can now assign farmers if needed to prevent its cities from starving and allow it to make its city grow even in area like the tundra.
- Entertainer allocation corrected, so that the AI assigns the correct amount of entertainers once all specialists are assigned so that there are no problems with unhappiness.
- Replaced ComputeMnimumFoodWorkers function by ComputeMinimumWorkers function to get the right amount of workers for the other resources as well.
- However there is still some work that has to be done.
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/CityManagement/governor.h

Splitted a lot of functions to make the code inside available for outside estimations. updated NeedMoreFood function.
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/citydata.h

Fixed typo in city name: "Mexico Stadt" --> "Mexiko Stadt"
modified trunk/ctp2_data/german/gamedata/civ_str.txt

-Martin

	05-04-2005 23:42									#466
	Increase Your PM Length

quote: Originally posted by Martin Gühmann What be with this revision? Solver used an outdated version of the files. And I didn't add these files into my private version before I merged them per hand. And after that I posted an updated version of these files.

That was all I wanted to know. I just got confused by the fact Solver's out-of-date patch had been applied.

	06-04-2005 22:01									#467
	Inflate your Upload Space

Implemented Martin's/Nordicus's extra trade goods.

1) CityData: Add in the food and shields from any trade good in the city's radius.
2) InfoBar : Show the trade good data from the selected tile.
3) helptile: ditto.

Added some comments. This is the first time I've used SVN and I ran up against some conflicts with Martin's last revision. Hope I sorted everything out OK.

	06-04-2005 22:56									#468
	Full PM-box? Change here!

319 Some minor fixes

modified ctp2_code/ctp/anet.inf - Activision 1.1 patch
modified ctp2_code/ctp/bootserv.txt - only server left
deleted ctp2_code/ctp/eventcb.txt - generated by exe
deleted ctp2_code/ctp/ldlparselog.txt - generated by exe
deleted ctp2_code/ctp/slicdbg.txt - generated by exe
modified ctp2_code/gs/fileio/CivPaths.cpp - memory leak/crash fix, included patterns/pictures
modified ctp2_code/gs/slic/StringHash.h - memory leak
modified ctp2_data/default/gamedata/tut2_main.slc - repaired type conflict

	09-04-2005 11:45									#469
	Full PM-box? Change here!

r321
Fixed my error in the docs saying that sliccmd.y/l aren't used anymore (Thanks Fromafar!). A few more changes here and there.
modified dev/ctp2_dev.tex
modified dev/include/a_deadcode.tex
modified dev/include/a_file_describe.tex
modified dev/Makefile

	10-04-2005 21:35									#470
	Got spare money?

Revision 322

- Added a new button to cause-and-effect-tab of the Domestic-Manager: Optimize Slider. This button allows you to "optimize" your sliders like the AI would do. Currently it is only usefull for debugging, as the AI can't optimize its sliders.
- Added a new button to the specialists tab of the City Manage: Optimize Specialists. Thhis one is more useful for the avarage player as the AI can use farmers to prevent the city from starving and can use entertainers to make the city happy.
-Modified National Manager and Specialists tab of the City Manager so that it now shows net food and net production instead of gross food and gross production. The player can now see how much production is left for build projects and how much food is left for city growth.
modified ctp2_code/ui/interface/CauseAndEffectTab.cpp
modified ctp2_code/ui/interface/CauseAndEffectTab.h
modified ctp2_code/ui/interface/citywindow.cpp
modified ctp2_code/ui/interface/citywindow.h
modified ctp2_code/ui/interface/NationalManagementDialog.cpp

-Added strings for new buttons and moved some other strings from add_str.txt to their final intended positions.
-Updated the *ldl files for the new buttons as well.
-Renamed in the German version "Lexikothek" to "Große Bibliothek" that creates more atmospere and is more consistent with the other languages.
modified ctp2_data/english/gamedata/add_str.txt
modified ctp2_data/english/gamedata/civ_str.txt
modified ctp2_data/english/gamedata/gl_str.txt
modified ctp2_data/english/gamedata/ldl_str.txt
modified ctp2_data/english/gamedata/tips_str.txt
added ctp2_data/english/uidata/layouts/citywindow.ldl
added ctp2_data/english/uidata/layouts/civstatus.ldl
added ctp2_data/english/uidata/layouts/ctp_template.ldl
modified ctp2_data/french/gamedata/add_str.txt
modified ctp2_data/french/gamedata/civ_str.txt
modified ctp2_data/french/gamedata/gl_str.txt
modified ctp2_data/french/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/tips_str.txt
modified ctp2_data/french/uidata/layouts/civstatus.ldl
modified ctp2_data/german/gamedata/add_str.txt
modified ctp2_data/german/gamedata/civ_str.txt
modified ctp2_data/german/gamedata/gl_str.txt
modified ctp2_data/german/gamedata/Great_Library.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/german/gamedata/tips_str.txt
modified ctp2_data/german/gamedata/tut2_str.txt
added ctp2_data/german/uidata/layouts/citywindow.ldl
modified ctp2_data/german/uidata/layouts/civstatus.ldl
added ctp2_data/german/uidata/layouts/ctp_template.ldl
modified ctp2_data/italian/gamedata/add_str.txt
modified ctp2_data/italian/gamedata/civ_str.txt
modified ctp2_data/italian/gamedata/gl_str.txt
modified ctp2_data/italian/gamedata/ldl_str.txt
modified ctp2_data/italian/gamedata/tips_str.txt
modified ctp2_data/italian/uidata/layouts/citywindow.ldl
modified ctp2_data/italian/uidata/layouts/civstatus.ldl
modified ctp2_data/italian/uidata/layouts/ctp_template.ldl
added ctp2_data/japanese/uidata/layouts/citywindow.ldl
added ctp2_data/japanese/uidata/layouts/civstatus.ldl
added ctp2_data/japanese/uidata/layouts/ctp_template.ldl
modified ctp2_data/spanish/gamedata/add_str.txt
modified ctp2_data/spanish/gamedata/ldl_str.txt
modified ctp2_data/spanish/gamedata/tips_str.txt
added ctp2_data/spanish/uidata/layouts/citywindow.ldl
modified ctp2_data/spanish/uidata/layouts/civstatus.ldl
added ctp2_data/spanish/uidata/layouts/ctp_template.ldl

	10-04-2005 23:06									#471
	Support Apolyton buy from Amazon

Revision 323

Updated gl_str.txt's to match with Peter's latest addition.
Added all the original text files so that we can see any at least in these text any modifications from future revisions.
Added missing sound files and sprites from GoodMod.
However The game won't work together with Peter's version of terrain.txt, since a modified goods.txt is missing and also the Great Library needs an update.
However this is not the last problem with adding GoodMod, since old saves would be incompatible.

-Martin

	11-04-2005 08:49									#472
	Support Apolyton

After several attempts, I think I've committed modified versions of goods.txt and goodsID.txt to the project. I thought I'd added the other files earlier.

	11-04-2005 22:24									#473
	Remove this text

Revision 327 Memory leaks repaired

modified ctp2_code/gfx/tilesys/TileInfo.cpp
modified ctp2_code/gs/events/GameEventHook.cpp
modified ctp2_code/gs/gameobj/ArmyData.cpp
modified ctp2_code/gs/slic/SlicArray.cpp
modified ctp2_code/gs/slic/SlicContext.cpp
modified ctp2_code/gs/slic/SlicEngine.cpp
modified ctp2_code/gs/slic/SlicFrame.cpp
modified ctp2_code/gs/slic/SlicFrame.h
modified ctp2_code/gs/slic/StringHash.h
modified ctp2_code/gs/world/UnseenCell.cpp
modified ctp2_code/gs/world/wldgen.cpp
modified ctp2_code/robot/aibackdoor/bit_table.h

	11-04-2005 22:37									#474
	Support Apolyton buy from Amazon

Revision 328 Mod support

modified ctp2_code/gfx/tilesys/tiledraw.cpp - added (DisplayLevel) option to draw on top of roads
modified ctp2_code/gs/newdb/terrimprove.cdb - added (DisplayLevel) option to draw on top of roads
modified ctp2_code/gs/slic/slicfunc.cpp - improved argument checking
modified ctp2_code/ui/interface/controlpanelwindow.cpp - relaxed Assert for Mod debugging

	11-04-2005 23:26									#475
	Support Apolyton or Terrorists Win

Revision 329 Project management

deleted anet.inf - unused
deleted ctp2_code/ctp/usercritmsgs.txt - generated by the executable
deleted Scenarios/AlexanderTheGreat/scen0000/default/gamedata/Const.txt - the original is accepted
deleted Scenarios/MagnificentSamurai/scen0000/default/gamedata/Const.txt - the original is accepted

Dinkumware STL fixes for MSVC6

added ctp2_code/compiler
added ctp2_code/compiler/msvc6
added ctp2_code/compiler/msvc6/stlfixes
added ctp2_code/compiler/msvc6/stlfixes/algorithm
added ctp2_code/compiler/msvc6/stlfixes/DEQUE
added ctp2_code/compiler/msvc6/stlfixes/FSTREAM
added ctp2_code/compiler/msvc6/stlfixes/LIST
added ctp2_code/compiler/msvc6/stlfixes/MEMORY
added ctp2_code/compiler/msvc6/stlfixes/SSTREAM
added ctp2_code/compiler/msvc6/stlfixes/STRING
added ctp2_code/compiler/msvc6/stlfixes/VECTOR
added ctp2_code/compiler/msvc6/stlfixes/XMEMORY
added ctp2_code/compiler/msvc6/stlfixes/XSTRING
added ctp2_code/compiler/msvc6/stlfixes/xtree

The STL fixes are for MSVC6 users only. To use these, go to menu Tools|Options|Directories, select 'Include files', and insert
...\ctp2_code\compiler\msvc6\stlfixes just before the Visual Studio include directories (but after the DirectX/DirectMedia ones).

	12-04-2005 00:03									#476
	Browse Apolyton AD-FREE

Revision 330 Standardised list include

modified ai/diplomacy/Diplomat.h
modified ai/diplomacy/foreigner.cpp
deleted ai/list-fixed - moved to compiler/msvc6/stlfixes/list in revision 329
modified ai/mapanalysis/settlemap.h
modified ai/strategy/scheduler/Plan.h
modified ai/strategy/scheduler/scheduler.cpp
modified ai/strategy/scheduler/scheduler_types.h
modified ctp/ctp2_utils/c3debugstl.h
modified gs/gameobj/gaiacontroller.cpp
modified gs/gameobj/gaiacontroller.h

	12-04-2005 07:49									#477
	Got spare money?

quote: Originally posted by Fromafar Revision 329 Project management The STL fixes are for MSVC6 users only. To use these, go to menu Tools|Options|Directories, select 'Include files', and insert ...\ctp2_code\compiler\msvc6\stlfixes just before the Visual Studio include directories (but after the DirectX/DirectMedia ones).

Could someone remember to put this into the 'How to compile CTP2' PDF

	13-04-2005 01:18									#478
	Get a bigger avatar today!

quote: Originally posted by Flinx Could someone remember to put this into the 'How to compile CTP2' PDF

Done.

r331
Added information for r329 for building.
M doc/dev/include/setup_win32.tex

	13-04-2005 21:44									#479
	Support Apolyton, buy Civilization III: Complete

Revision 332

Moved Peter's good's fix to the GetFoodFromTerrain, GetProductionFromTerrain and GetGoldFromTerrain methods from Cell and UnseenCell. This way you don't have to add the good stuff if you use the these methods at other places of the projet, e.g. my governor alterations.
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/world/Cell.cpp
modified ctp2_code/gs/world/UnseenCell.cpp
modified ctp2_code/ui/aui_ctp2/InfoBar.cpp
modified ctp2_code/ui/interface/helptile.cpp

Prevented a crash when you switch between Mods and the first mod allowed more civs than the second mod, and the CivIndex was set higher then the total number of civs in the second mod.
modified ctp2_code/ctp/civapp.cpp

And by the way Peter, next time don't delete files if you are going to readd them anyway. The purpose was to be able to see the differences between the original files and your files.

-Martin

	15-04-2005 20:34									#480
	Support Apolyton buy from Amazon

Revision 333

Fixed bug with change government dialog when a new government is discovered so that the government name now appears again and there is no more white text.
modified ctp2_code/gs/slic/sliccmd.cpp

Modified > operator so that it is now antisymmetrical.
modified ctp2_code/ai/strategy/squads/squad_Strength.cpp

-Martin