PROJECT: Altered source files

[J Bytheway]

Another new NationalManagementDialog - this one to fix the other rush buy bug that I didn't know about before (involving rush buying when it is not your turn).

This alteration prevents you from rush buying when it is not your turn. Tested in SP, but not in MP where it really matters.

[Edit - file removed, included in compilation below]

[J Bytheway]

Originally posted by J Bytheway
Winzip will ignore empty directories

Well... I thought it did, but it seems not to have in the file I just posted, so perhaps I was mistaken. I'm sure it has done so in the past... Or perhaps I'm just going mad...

[ctplinuxfan]

Description of added bin\*.* utils

sorry for the late response, was nearly drowning in work

The programs added are updated unix tools ported to windows and part of the cygwin distribution. Part of them were already within the source distribution. Cygwin has modularized the cygwin.dll; dlls: *iconv are for text encoding conversions, *intl for internationalization, *popt for command line parsing, *pcre for parsing perl compatible regexp.

bzip2*.exe:   Compression utilities capable of compressing a single file using the bzip2 algorithm
byacc.exe: an LALR parser generator (c output), e.g. used for bgen/slic
copy_libs.sh: copies the DirectX/DirectMedia libraries to your CTP2  source dir (adapt file paths to suit your needs)
cp.exe: copies files and directories
cygpath.exe: converts cygwin (unix like) path to windows path and vice versa
diff.exe: shows differences between text files and directories containing equally names text files
dos2unix.exe: converts dos formated text files to unix formated ones and vice versa
find.exe: find files/directories (possibly do something with each item found)
fix2unix.sh: run dos2unix on each source file starting from current directory, so unix compiler does not stumple over carriage returns (lasts quite long on windows)
fixrep: script by apolyton to honour cvs repository relocations
flex++.exe: lexical analyzer generator (generating c++ classes by default)
flex.exe: lexical analyzer generator (used by e.g. dbgen/slic)
grep.exe: search for strings/expressions within a file/multiple files
g*zip.exe: Compress or decompress a single file using the lz77 algorithm
make.exe: make utility for compiling programs by following rules specified within a Makefile
mkdir.exe: Create one or multiple directories
mv.exe: Move directories/files
rem_cvs_dirs.sh: Remove all CVS directories contained in the current directory or its subdirectory
rm.exe: remove a file or directories recursively
sed.exe: transforms text according to specified rules
sh.exe: The bash shell (command line interpreter used on *nix systems)

If you search for the filename (w/o .exe extension) and man using a search engine (e.g.: http://www.google.com Search: bzip2 +man), you will get a man page of the command which provides more detailed information and how it is used.

Ciao,
Holger

[Fromafar]

User interface improvement: enabled mousewheel support.

ui\aui_directx\aui_directinput.cpp (enabled mousewheel)
ui\aui_ctp2\ctp2_listbox.cpp (prevent possible CtD when deleting the list box that has the mouse focus)

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

[Martin Gühmann]

2004.04.10
..\ctp2_code\gs\gameobj\CityData.cpp
..\ctp2_code\ctp2_code\ui\interface\NationalManage mentDialog.cpp
..\ctp2_code\ctp2_code\ui\interface\EditQueue.cpp
..\ctp2_code\ctp2_code\ui\interface\CityControlPan el.cpp
..\ctp2_code\ctp2_code\ui\interface\citywindow.cpp

Bug fixes and alterations by Martin Gühmann:

CityData.cpp fixed a typo that prevented Peter's rush buy prevention for capitalization and infrastructure to work.
For the interface files, all the rush buy buttons are now disabled when infrastructure or capitalization are at the front of the build queue. In that case also no rush buy costs are shown and no turns to completion are shown anymore. In addition rush buy buttons are now disabled in addition in the build manager and in the city manager when it is not the player's turn. On the control panel it doesn't work as intended the button is not disabled on the end turn event, obviously the according function isn't called at that time.
In the city manager the turn button under the image button shows now the turn number of the selected item and no rush buy costs are shown if the selected item is not the first item in the build queue.

-Martin

[Martin Gühmann]

2004.04.10
..\ctp2_code\gs\Slic\slicif.cpp
..\ctp2_code\gs\Slic\SlicBuiltin.cpp
..\ctp2_code\gs\Slic\SlicEngine.cpp
..\ctp2_code\gs\Slic\slicfuncai.h
..\ctp2_code\gs\Slic\SlicFunc.h
..\ctp2_code\gs\Slic\slicfuncai.cpp
..\ctp2_code\gs\Slic\slicfunc.cpp

slicif.cpp: Made sure that the database access code throws only slic erors at run time when DebugSlic=Yes, by Martin Gühmann.
SlicBuiltin.cpp: Added an additional variable to the player builtin to add a way to figure out the current government of an player, by Peter Triggs and renamed it to player.government.
slicfuncai.h: Moved slic func makers from slicfunc.h for AI related slic functions to slicfuncai.h, modified a functions signature to allign it with a function's implemention by Peter Trigs in Slicfuncai.cpp.
slicfunc.cpp: Removed the ai related slic functions, overloaded HasAdvance function so that it can be used with integers.
SlicEngine.cpp: Added database access to all databses in the new database format even if it does not make sense, fixed CompareString function.
slicfuncai.cpp: Added the version by Peter Triggs lieing around here in the forum somewhere even if it is not finished, but what we have, have we.

Added the neccessary stuff to support PlantSpecificGood and RemoveGood lieing around somewhere in the forum, by MrBaggins. Added the necessary stuff to SlicEngine.cpp and slicfuncai.h to support Peter Triggs' DeclareWar function in slicfuncai.cpp.

Finally addapted all code in the slic files to the ACTIVISION_ORIGINAL standart.

The implementation of the following slic functions is still missing and maybe Peter want to improve the other functions as well:

GetLastNewProposalArg
GetLastNewProposalTone
GetLastCounterResponseArg
GetLastThreatResponseArg
GetPollutionLevelPromisedTo
GetProjectedScience
GetStopResearchingAdvance
FindCityToExtortFrom
GetMostAtRiskCity

-Martin

[Peter Triggs]

Of those functions that aren't done yet, I think only 'GetMostAtRiskCity' was implemented. IIRC, I could never get any of the other ones to work. Since they've (AFAIK) never been used, I think we can make them a pretty low priority for the moment.

[J Bytheway]

Martin: I noticed that you're violating the GPL by distributing those cygwin tools without including a copy of the GPL and a location to obtain the source code from... You might want to at least include a copy of the GPL (http://www.gnu.org/licenses/gpl.html) and a pointer to the cygwin site for the source code (http://www.cygwin.com/).

(Of course Activision did the same thing, but that's not a reason for us to follow suit...)

[Martin Gühmann]

..\bin\Readme.txt
..\bin\GNUGeneralPublicLicence2.txt

Readme.txt contains the licence of cycwin you can find there on the cygwin site, and GNUGeneralPublicLicence2.txt contains as it is named the GNU General Public Licence (GPL) version 2.

I hope this is enough, so that I can include it into the next file pack.

-Martin

[Fromafar]

User interface improvement: update the status of the rush buy button at the city control panel when receiving gold from a goody hut.

gs\gameobj\GoodyHuts.cpp
ui\interface\CityControlPanel.cpp

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

[Solver]

Just a question - how about putting together a new source archive at this point with all the modified source files? I'd love to do a clean install of the source, and unzip all the changes over it.

[The Big Mc]

me too

[Solver]

So, anyone feels like zipping their changed files and giving that up for download?

[Maquiladora]

The latest playtest that did include source files is 2004.03.28.CTP2.All.zip.

[Martin Gühmann]

Originally posted by Maquiladora
The latest playtest that did include source files is 2004.03.28.CTP2.All.zip.

That file does not contain a playtest it just contains the sources without any compiled program files.

As I like to try to compile the source code at university with .NET I should update the source files pack.

-Martin