PROJECT: Altered source files

[Martin Gühmann]

Well I found two things:

I corrected the spelling for Neptune in the English version. Well actual not much with that I wouldn'd bother you extra. But I found an error in the ..\ctp2_code\gs\utility\stringutils.cpp for the Japanese edition, some code for the non Japanese version was not correct, unfortunatly MS VC++ is to stupid to recompile every file that I change outside of the MS VC++. So I ended with a debug version without a bug concerning slic values in strings and a final version with that bug. So if you already downloaded the file above then you can download this attachment here, if not just download the file above. By the way I didn't changed the name that saved me some post editing again.

-Martin

[Fromafar]

Bug fixes on earlier bug fixes:

exclusions.cpp: missed a spot (cut & paste error memory leak).
advances.cpp: corrected the computation of the advance level.

[Edit: link removed. Included in the 2004.02.21 source.]

[Fromafar]

Bug fix: prevent double production when loading a saved game.
[Edit: link removed, replaced with newer version.]

[ctplinuxfan]

Hi,

this patch substitutes miless sound with sdl sound.
I'm just having trouble with mixer volume of cd; sdl doesn't handle this, so there needs to be a system specific implementation of SoundManager::SetVolume(SOUNDTYPE_MUSIC, ...);...

Quick-Installation:
- unzip
- download sdl and sdl-mixer
- unpack both
- extend include and lib path to hold dirs where you unzipped to
(tools->options->directories)
- add
SDL.lib SDL_mixer.lib
to the library list in linker section of project ctp2
- copy SDL.dll and SDL_mixer.dll from lib dirs to the directory, where the civctp2 executable is located

Ciao
Holger

PS: If links don't work, go to www.libsdl.org and download the corresponding VC6 devel packages from there.

Use either the diff (perhaps you need to run dos2unix on the sources before) ( verify: patch -l --dry-run < 2004-02-01-2-incr_sdlsound.diff,
apply: patch -l -b < 2004-02-01-2-incr_sdlsound.diff) after unpacking the binary replacement (see previous post)
2004-02-01-2-incr_sdlsound.diff
ctp2_bin.zip

Or this zip file containing the files changed as a whole.
2004-02-01-2-incr_sdlsound.zip


SDL 1.2.6
SDL Mixer 1.2.5a

[Fromafar]

This is an increment on the previous post by ctplinuxfan, and contains just a few small corrections to make the Miles version compile again.

civ3_main.cpp: Added some USE_SDL guards where !ACTIVISION_ORIGINAL was not enough.
civsound.cpp: Added a USE_SDL guard on SetChannel, and corrected a misplaced #endif in SetVolume.
civsound.h: Removed the USE_SDL define. I think this should not be set directly in the code, but rather in the project (make?) file.

[Edit: link removed. Included in the 2004.02.21 source.]

[MrBaggins]

GovernmentModified record implementation. See yonder thread

On its own, it does nothing, but it does allow use of two overloaded accessor functions for the CTPDatabase templated classes, Get and Access, with an additional parameter, govIndex (index of the government). These functions will return the modified record, if one exists.

Coding is based on the original source plus all changes to 31/01/04. I kept out of areas people were working though, I believe.

You need to generate ctpdb again, as well as a debug/final build, ensuring the custom builds of the objectrecords take place.

I tested, and this worked without any issues.

[EDIT] Nearly forgot. This structure is intended for...

• Units
• Tile improvements
• Buildings
• Goods (named resources in the code)
• Wonders
• Feats

[Fromafar]

Merged the 2004.02.03 update of civapp.cpp (prevent double production in the first turn after loading a game) with the modifications of MrBaggins.

[Edit: link removed. Included in the 2004.02.21 source.]

[MrBaggins]

Thanks Fromafar

[MrBaggins]

Incremental package (for GovMod 02-06 files)

Didn't include the terrain.cdb file, which included a GovernmentsModifed reference.

Just right click Compile the cdb file, and then right click compile resourcerecord.cpp, before building ctp2_dbg or ctp2 (or just rebuild, if you wish.)

[MrBaggins]

Bugfix: Remove annoying unreferenced variable warning during regular compiling, by placing definitions inside #ifndefs, where they are used.

[Fromafar]

Bug fix: improved wrap behaviour.
See this thread for the way it used to look.

gfx\tilesys\maputils.cpp
gfx\tilesys\resourcemap.h
gfx\tilesys\tiledmap.cpp
gfx\tilesys\tiledmap.h
gs\gameobj\CityInfluenceIterator.cpp
gs\gameobj\CityInfluenceIterator.h
gs\gameobj\CityRadius.cpp
gs\gameobj\CityRadius.h
gs\gameobj\Vision.cpp
gs\gameobj\Vision.h
gs\world\MapPoint.cpp
gs\world\MapPoint.h
ui\interface\MapCopyBuffer.cpp
ui\interface\scenarioeditor.cpp

[Edit: link removed. Included in the 2004.02.21 source.]

[Fromafar]

Bug fix: repaired some memory leaks for the hotseat screen.

ui\interface\spnewgamescreen.cpp
ui\interface\hotseatlist.h
ui\interface\hotseatlist.cpp

[Edit: link removed. Included in the 2004.02.21 source.]

[Fromafar]

Bug fix for the game freeze problem reported in the playtest thread.

gfx\spritesys\director.cpp

[Edit: link removed. Included in the 2004.02.21 source.]

[Martin Gühmann]

2004.02.01
..\ctp2_code\gs\gameobj\Advances.cpp
..\ctp2_code\gs\gameobj\Exclusions.cpp

Bug fixes on earlier bug fixes by Fromafar:

exclusions.cpp: Missed a spot (cut & paste error memory leak).
advances.cpp: Corrected the computation of the advance level.


2004.02.03
..\bin\bzip2.exe
..\bin\bzip2recover.exe
..\bin\copy_libs.sh
..\bin\cp.exe
..\bin\cygiconv-2.dll
..\bin\cygintl-1.dll
..\bin\cygintl-2.dll
..\bin\cygintl.dll
..\bin\cygpath.exe
..\bin\cygpcre.dll
..\bin\cygpopt-0.dll
..\bin\cygwin1.dll
..\bin\diff.exe
..\bin\dos2unix.exe
..\bin\find.exe
..\bin\fixrep
..\bin\flex++.exe
..\bin\flex.exe
..\bin\grep.exe
..\bin\gunzip.exe
..\bin\gzip.exe
..\bin\make.exe
..\bin\mkdir.exe
..\bin\mv.exe
..\bin\patch.exe
..\bin\rm.exe
..\bin\sed.exe
..\bin\sh.exe
..\bin\fix2unix.sh
..\bin\rem_cvs_dirs.sh

Some useful tools by ctplinuxfan aka Holger.

Well Holger could you provide a small description for all the tools so that we know what they do.


2004.02.03
..\ctp2_code\ctp\c3.h
..\ctp2_code\ctp\c3types.h
..\ctp2_code\ctp\civ3_main.cpp
..\ctp2_code\ctp\civ3_main.h
..\ctp2_code\ctp\ctp2_utils\c3files.cpp
..\ctp2_code\sound\civsound.cpp
..\ctp2_code\sound\civsound.h
..\ctp2_code\sound\gamesounds.cpp
..\ctp2_code\sound\gamesounds.h
..\ctp2_code\sound\soundevent.cpp
..\ctp2_code\sound\soundevent.h
..\ctp2_code\sound\soundmanager.cpp
..\ctp2_code\sound\soundmanager.h

Adds optional sdl sound use by ctplinuxfan aka Holger.


2004.02.04
..\ctp2_code\ctp\civ3_main.cpp
..\ctp2_code\sound\civsound.h
..\ctp2_code\sound\civsound.cpp

This is an increment on the previous post by ctplinuxfan, and contains just a few small corrections to make the Miles version compile again.

civ3_main.cpp: Added some USE_SDL guards where !ACTIVISION_ORIGINAL was not enough.
civsound.cpp: Added a USE_SDL guard on SetChannel, and corrected a misplaced #endif in SetVolume.
civsound.h: Removed the USE_SDL define. I think this should not be set directly in the code, but rather in the project (make?) file.


2004.02.06
..\ctp2_code\ctp\civapp.cpp
..\ctp2_code\gs\newdb\wonder.cdb
..\ctp2_code\gs\newdb\building.cdb
..\ctp2_code\gs\newdb\CTPDatabase.cpp
..\ctp2_code\gs\newdb\CTPDatabase.h
..\ctp2_code\gs\newdb\DBLexer.h
..\ctp2_code\gs\newdb\DBLexer.l
..\ctp2_code\gs\newdb\DBTokens.h
..\ctp2_code\gs\newdb\feat.cdb
..\ctp2_code\gs\newdb\pop.cdb
..\ctp2_code\gs\newdb\terrian.cdb
..\ctp2_code\gs\newdb\terrimprove.cdb
..\ctp2_code\gs\newdb\unit.cdb
..\ctp2_code\gs\newdb\advance.cdb
..\ctp2_code\gs\dbgen\RecordDescription.h
..\ctp2_code\gs\dbgen\RecordDescription.cpp
..\ctp2_code\gs\dbgen\ctpdb.y

GovernmentModified record implementation by MrBaggins. See yonder thread

On its own, it does nothing, but it does allow use of two overloaded accessor functions for the CTPDatabase templated classes, Get and Access, with an additional parameter, govIndex (index of the government). These functions will return the modified record, if one exists.

Coding is based on the original source plus all changes to 31/01/04. I kept out of areas people were working though, I believe.

You need to generate ctpdb again, as well as a debug/final build, ensuring the custom builds of the objectrecords take place.

I tested, and this worked without any issues.

This structure is intended for...


* Units
* Tile improvements
* Buildings
* Goods (named resources in the code)
* Wonders
* Feats


2004.02.06
..\ctp2_code\ctp\civapp.cpp

Bug fix by Fromafar: Prevent double production when loading a saved game.


2004.02.08
..\ctp2_code\ctp\debugtools\

Bug fix by MrBaggins: Remove annoying unreferenced variable warning during regular compiling, by placing definitions inside #ifndefs, where they are used.
Modified by Martin Gühmann to add some documentation for the compiler flags.


2004.02.10
..\ctp2_code\gfx\tilesys\maputils.cpp
..\ctp2_code\gfx\tilesys\resourcemap.h
..\ctp2_code\gfx\tilesys\tiledmap.cpp
..\ctp2_code\gfx\tilesys\tiledmap.h
..\ctp2_code\gs\gameobj\CityInfluenceIterator.cpp
..\ctp2_code\gs\gameobj\CityInfluenceIterator.h
..\ctp2_code\gs\gameobj\CityRadius.cpp
..\ctp2_code\gs\gameobj\CityRadius.h
..\ctp2_code\gs\gameobj\Vision.cpp
..\ctp2_code\gs\gameobj\Vision.h
..\ctp2_code\gs\world\MapPoint.cpp
..\ctp2_code\gs\world\MapPoint.h
..\ctp2_code\ui\interface\MapCopyBuffer.cpp
..\ctp2_code\ui\interface\scenarioeditor.cpp

Bug fix by Fromafar: Improved wrap behaviour. For more details see this thread.


2004.02.10
..\ctp2_code\ui\interface\spnewgamescreen.cpp
..\ctp2_code\ui\interface\hotseatlist.h
..\ctp2_code\ui\interface\hotseatlist.cpp

Bug fix by Fromafar: Repaired some memory leaks for the hotseat screen.


2004.02.17
..\ctp2_code\gfx\spritesys\director.cpp

Bug fix by Fromafar for the game freeze problem reported in the playtest thread.


2004.02.20
..\ctp2_data\XXXXXX\gamedata\add_str.txt

Where XXXXXX stands for english, french and german.
Text update for a better description of the Max Player option, so far only English, French and German versions of the new strings are available if you want to have strings for other version then you have to check translation center thread.

French version by Tamerlin, German version by Martin Gühmann and English version by Martin Gühmann and a little bit of help by J Bytheway. If you are not confident with the English version of these strings or any other language version then check out this thread.


2002.09.07 / 2004.02.21
..\ctp2_data\default\gamedata\script.slc
..\ctp2_data\default\gamedata\messageicon.txt
..\ctp2_data\default\graphics\pictures\MGMIXXX.tga

Where XXX ranges from 000 to 057.

New message icons by Martin Gühmann.

script.slc: Removed a doupled message box so that one of the messages just appears once instead of twice. In addition to all message boxes message classes were added to make sure they use the right icon. Additional eyepoint buttons were added to allow moving to a city when necessary.
messageicon.txt: Altered to allow the use of the new message icons.
MGMIXXX.tga: The new message icons themselves.

For more pieces of information see this thread.


2004.02.21
..\ctp2_data\default\gamedata\Colors00.txt

Replaced the Barbarian black color by another color.

[Edit: Link removed see first post of that thread to get the latest file pack.]

-Martin

[Fromafar]

Bug fixes:

gs\gameobj\ArmyData.cpp: do not center on invisible pirates.
ai\strategy\scheduler\Scheduler.cpp: do not consider goals that have become invalid (e.g. threatened cities that have been destroyed).

[Edit: link removed. Included in the 2004.03.28 source.]