PROJECT: Altered source files

[Fromafar]

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.

ctp2_code\ctp\anet2.dll
ctp2_code\ctp\anet2.map
ctp2_code\ctp\anet2d.dll
ctp2_code\ctp\anet2d.map
ctp2_code\ctp\dll\net\winets2.dll
ctp2_code\ctp\dll\net\winets2.map
ctp2_code\ctp\dll\net\winets2d.dll
ctp2_code\ctp\dll\net\winets2d.map
ctp2_code\ctp\dll\net\wipx2.dll
ctp2_code\ctp\dll\net\wipx2d.dll
ctp2_code\ctp\dll\net\wudplan.dll
ctp2_code\ctp\dll\net\wudplan.map
ctp2_code\ctp\dll\net\wudpland.dll
ctp2_code\ctp\dll\net\wudpland.map
ctp2_code\libs\anet\h\*.h (34 files)
ctp2_code\libs\anet\win\dll\anet2.dll
ctp2_code\libs\anet\win\dll\anet2.map
ctp2_code\libs\anet\win\dll\anet2d.dll
ctp2_code\libs\anet\win\dll\anet2d.map
ctp2_code\libs\anet\win\dll\winets2.dll
ctp2_code\libs\anet\win\dll\winets2.map
ctp2_code\libs\anet\win\dll\winets2d.dll
ctp2_code\libs\anet\win\dll\winets2d.map
ctp2_code\libs\anet\win\dll\wipx2.dll
ctp2_code\libs\anet\win\dll\wipx2d.dll
ctp2_code\libs\anet\win\dll\wloop2.dll
ctp2_code\libs\anet\win\dll\wloop2d.dll
ctp2_code\libs\anet\win\dll\wmodem2.dll
ctp2_code\libs\anet\win\dll\wmodem2d.dll
ctp2_code\libs\anet\win\dll\wserial2.dll
ctp2_code\libs\anet\win\dll\wserial2d.dll
ctp2_code\libs\anet\win\dll\wudplan.dll
ctp2_code\libs\anet\win\dll\wudplan.map
ctp2_code\libs\anet\win\dll\wudpland.dll
ctp2_code\libs\anet\win\dll\wudpland.map
ctp2_code\libs\anet\win\lib\anet2.lib
ctp2_code\libs\anet\win\lib\anet2d.lib
ctp2_code\libs\anet\win\lib\dp2.lib
ctp2_code\libs\anet\win\lib\dp2d.lib

Added '&' operator bugfixes - previous code was untested. Note that this is implemented simply using the C++ '&' operator.

We should make it a rule that you are not allowed to commit changes that do not compile without errors. And it would be even better if you give your design some thought first. It strikes me as odd to define a bitwise-and operator all by itself. If you think you need the bitwise-and, you will probably need the bitwise-or and bitwise-complement as well.

[tombom]

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.

[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.

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

[Maquiladora]

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.

[J Bytheway]

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.

[J Bytheway]

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)

[J Bytheway]

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

[J Bytheway]

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

[tombom]

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

[Fromafar]

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

[tombom]

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

[J Bytheway]

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

[Martin Gühmann]

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

[tombom]

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?)

[Martin Gühmann]

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