04-04-2004 00:50									#151
	Help yourself to an AD-FREE life

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]

Last edited by J Bytheway on 19-05-2004 at 19:28

	04-04-2004 01:02									#152
	Support Apolyton buy from Amazon

quote: 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...

	04-04-2004 01:33									#153
	Description of added bin\*.* utils Increase Your PM Length

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.

code:

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)

	08-04-2004 00:58									#154
	Avatar Enlargement: We've got the solution

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

Last edited by Fromafar on 09-05-2004 at 00:30

	10-04-2004 04:11									#155
	Support Apolyton, buy Civilization 2

2004.04.10
..\ctp2_code\gs\gameobj\CityData.cpp
.. \ctp2_code\ctp2_code\ui\interface\NationalManageme
ntDialog.cpp
..\ctp2_code\ctp2_code\ui\interface\EditQueue.cpp
.. \ctp2_code\ctp2_code\ui\interface\CityControlPanel
.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

Attachment: 2004.04.10.rusbuy.incr.zip
This has been downloaded 7 time(s).

	11-04-2004 22:37									#156
	Tired of ads?

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

Attachment: 2004.04.11.slic.incr.zip
This has been downloaded 9 time(s).

	11-04-2004 23:29									#157
	Remove this text

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.

	12-04-2004 05:07									#158
	Support Apolyton, pre-order Civilization IV

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

	12-04-2004 22:05									#159
	Support Apolyton, buy GURPS/ Alpha Centauri

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

Attachment: 2004.04.11.cygwin.licence.zip
This has been downloaded 4 time(s).

	15-04-2004 00:45									#160
	Support Apolyton, buy Civilization III: Complete

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

Last edited by Fromafar on 09-05-2004 at 00:46

	15-04-2004 00:59									#161
	Support Apolyton, buy Civilization 2

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.

	15-04-2004 01:07									#162
	Suffering from ads?

me too

	16-04-2004 18:47									#163
	Support Apolyton or Terrorists Win

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

	16-04-2004 19:11									#164
	Increase Your PM Length

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

	16-04-2004 22:18									#165
	Support Apolyton

quote: 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

	17-04-2004 02:38									#166
	Avatar Enlargement: We've got the solution

Bug fixes:

• Empty(ing) build queue crashes
  
  gs\gameobj\CityData.cpp
  ui\interface\CityControlPanel.cpp
  ui\interface\CityWindow.cpp
  ui\interface\EditQueue.cpp
  ui\interface\NationalManager.cpp
  
  
• Invalid memory access when loading from a file with a different table size
  
  gs\slic\StringHash.h
  

Last edited by Fromafar on 09-05-2004 at 00:46

	17-04-2004 17:06									#167
	Lose 30 kilos (of popups)

What do you use, BTW, when compiling the game, Win32-Final, or Win32-Release configuration?

	17-04-2004 17:33									#168
	Support Apolyton, buy GURPS/ Alpha Centauri

This fixes a bug in slicfuncai and does some tidying up.

Martin and John,

Could whoever puts the next playtest together, PM me first in case I find some more.

Attachment: slicfuncai.zip
This has been downloaded 7 time(s).

	17-04-2004 17:47									#169
	Increase the size of your Attachments

As I'm frantically trying to compile, I keep getting errors in Database files, caused by the incompatibility of the modified database files with the source files that dbgen generates.

	17-04-2004 19:47									#170
	Support Apolyton

quote: Originally posted by Solver As I'm frantically trying to compile, I keep getting errors in Database files, caused by the incompatibility of the modified database files with the source files that dbgen generates.

I think this is related to your last question, first you need to compile a debug version, because dbgen is only used in this setup. For your first question, I only compiled the playtest versions with if I remember correctly with final, however in the end it is the setup that produces an *.exe with the name ctp2.exe, the other one produces a ctp2r.exe.

-Martin

	17-04-2004 20:45									#171
	Inflate your Upload Space

It's Win32 - Final that we use for Playtest builds (as Martin says, it's the one which produces a ctp2.exe).

However, if you're having trouble with compiling due to dbgen stuff, the following should work:

- Clean all configurations that you've tried to build under
- Build Win32 - Degub
- Build Win32 - Final

	17-04-2004 20:50									#172
	Support Apolyton, buy Civilization: The Boardgame

Thanks Martin and John - I just did a reinstall of source this morning, and am trying to compile with the latest files. Currently building the debug version...

	17-04-2004 21:29									#173
	Support Apolyton buy from Amazon

OK thanks - that got me to compile a ctp2.exe with the current codebase and run it.

	18-04-2004 05:18									#174
	Support Apolyton or Terrorists Win

ctp\civ3_main.cpp
ctp\civapp.cpp
ui\interface\custommapscreen.cpp
ui\interface\initialplayscreen.cpp
ui\interface\initialplayscreen.cpp
ui\interface\initialplayscreen.h
ui\interface\optionsscreen.cpp
ui\interface\scenarioscreen.cpp
ui\interface\spnewgamescreen.cpp
..\ctp2_data\default\graphics\pictures\upsg001.tga
..\ctp2_data\[language]\gamedata\ldl_str.txt
..\ctp2_data\[language]\uidata\layouts\spnewgame.ldl

Updates for the new interface. I've removed all reference to the SP screen, so the files spwindow.h, spwindow.cpp and spscreen.cpp could be safely removed from the project if we wished.

One string (str_ldl_MULTIPLAYER, which needs to be changed from saying "Multiplayer" to "Network Game") remains untranslated in all languages except English, but I was able to manage the other translations myself (since they only involved case changes).

[Edit: File removed, included in compilation below]

Last edited by J Bytheway on 19-05-2004 at 19:29

	18-04-2004 14:52									#175
	Get a bigger avatar today!

ui\interface\spscreen.cpp
ui\interface\spwindow.cpp
ui\interface\spwindow.h
ctp\civapp.cpp

Removed the content of the SP screen files as they are no longer needed (in the sense that I put them inside #if defined(ACTIVISION_ORIGINAL) ... #endif).

Also removed a last reference to the SP screen I had previously missed in civapp.cpp.

[Edit: File removed, included in compilation below]

Last edited by J Bytheway on 19-05-2004 at 19:29

	18-04-2004 22:09									#176
	Support Apolyton or Terrorists Win

2004.04.17
..\ctp2_code\gs\slic\SlicBuiltin.cpp

Bug fix by Martin Gühmann: player[0].government works now as advertised.
Three new slic globals added by Martin Gühmann:
- g.num_of_players: Gets the number of players in the current game
- g.last_player: Gets the last player, the player with the highest index in the game
- g.max_player: Gets the maximum number of players that is in a game possible, currently it is 32 including the Barbarians.

..\ctp2_code\ui\interface\scenarioeditor.h
..\ctp2_code\ui\interface\scenarioeditor.cpp

Bug Fix by Martin Gühmann: After a player was removed from the game and it was not the player with the highest index, the last player can be still accessed through the scebario editor. Unfortunatly there seems to be another problem, after some selecting of different players I got assertions when I selected the players around the dead player.


2004.04.18
..\ctp2_code\gs\slic\slicfunc.cpp
..\ctp2_code\gs\slic\slicfunc.h
..\ctp2_code\gs\slic\slicengine.cpp

New slic functions added by Martin Gühmann:
- CargoCapacity Gets number of additional units a unit can carry.
- MaxCargoSize Gets the maximum number of units a unit can carry.
- CargoSize Gets the current number of units a unit is carrying.
- GetUnitFromCargo Gets the i'th unit a unit is carrying.
- GetContinent Gets the continent ID of an location.
- IsWater Gets whether a location is water.


2004.04.18
..\ctp2_data\german\gamedata\ldl_str.txt

Replaced
str_ldl_MULTIPLAYER "Mehrspieler"
by
str_ldl_MULTIPLAYER "Netzwerkspiel"

-Martin

Attachment: 2004.04.18.slicmisc.incr.zip
This has been downloaded 7 time(s).

	18-04-2004 22:31									#177
	Get a bigger avatar today!

Here is the whole pack and the changes from the last release:


2004.04.01
..\ctp2_data\gs\gameobj\TerrImproveData.cpp

Bug fix for the problem that terraformed tiles can not be improved any more.

Reactivated the Kill of completed terraforming objects. Some temporary test code slipped through in the 2004.02.26 update for the invalid memory access. The actual repair was in ImprovementEvent.cpp.


2004.04.01
..\ctp2_code\ctp\civapp.cpp
..\ctp2_code\ui\aui_ctp2\SelItem.cpp

Bug fix by Martin Gühmann: Removed some needless code in civapp.cpp and make sure in SelItem.cpp that games started with a different player than player 1 can be continued after reload.


2004.04.03
..\ctp2_code\ui\interface\NationalManagementDialog.cpp

Bug Fix by 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.

2004.04.07
..\ctp2_code\ui\aui_directx\aui_directinput.cpp
..\ctp2_code\ui\aui_ctp2\ctp2_listbox.cpp

User interface improvement by Fromafar: Enabled mousewheel support.

aui_directinput.cpp: Enabled mousewheel support
ctp2_listbox.cpp: Prevent possible CtD when deleting the list box that has the mouse focus

2004.04.10
..\ctp2_code\gs\gameobj\CityData.cpp
.. \ctp2_code\ctp2_code\ui\interface\NationalManageme
ntDialog.cpp
..\ctp2_code\ctp2_code\ui\interface\EditQueue.cpp
.. \ctp2_code\ctp2_code\ui\interface\CityControlPanel
.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.

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


2004.04.12
..\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.

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

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

2004.04.16
..\ctp2_code\gs\gameobj\CityData.cpp
..\ctp2_code\ui\interface\CityControlPanel.cpp
..\ctp2_code\ui\interface\CityWindow.cpp
..\ctp2_code\ui\interface\EditQueue.cpp
..\ctp2_code\ui\interface\NationalManager.cpp

Bug fix by Frmafar: Emptying buld queue crashes caused by last rush buy prevention for capitalization and infrastructure.


2004.04.16
..\ctp2_code\gs\slic\StringHash.h

Bug fix by Fromafar: Invalid memory access when loading from a file with a different table size


2004.04.17
..\ctp2_code\gs\slic\slicfuncai.cpp

Bug fix by Peter Triggs: Diplomacy proposals by the AI to the human player aren't accepped or rejected automaticly anymore.


2004.04.17
..\ctp2_code\gs\slic\SlicBuiltin.cpp

Bug fix by Martin Gühmann: player[0].government works now as advertised.
Three new slic globals added by Martin Gühmann:
- g.num_of_players: Gets the number of players in the current game
- g.last_player: Gets the last player, the player with the highest index in the game
- g.max_player: Gets the maximum number of players that is in a game possible, currently it is 32 including the Barbarians.

..\ctp2_code\ui\interface\scenarioeditor.h
..\ctp2_code\ui\interface\scenarioeditor.cpp

Bug Fix by Martin Gühmann: After a player was removed from the game and it was not the player with the highest index, the last player can be still accessed through the scebario editor. Unfortunatly there seems to be another problem, after some selecting of different players I got assertions when I selected the players around the dead player.


2004.04.18
..\ctp2_code\ctp\civ3_main.cpp
..\ctp2_code\ctp\civapp.cpp
..\ctp2_code\ui\interface\custommapscreen.cpp
..\ctp2_code\ui\interface\initialplayscreen.cpp
..\ctp2_code\ui\interface\initialplayscreen.cpp
..\ctp2_code\ui\interface\initialplayscreen.h
..\ctp2_code\ui\interface\optionsscreen.cpp
..\ctp2_code\ui\interface\scenarioscreen.cpp
..\ctp2_code\ui\interface\spnewgamescreen.cpp
..\ctp2_data\default\graphics\pictures\upsg001.tga
..\ctp2_data\[language]\gamedata\ldl_str.txt
..\ctp2_data\[language]\uidata\layouts\spnewgame.ldl

Updates for the new interface by J Bytheway: Removed all reference to the SP screen, so the files spwindow.h, spwindow.cpp and spscreen.cpp could be safely removed from the project if we wished.

One string (str_ldl_MULTIPLAYER, which needs to be changed from saying "Multiplayer" to "Network Game") remains untranslated in all languages except English, but I was able to manage the other translations myself (since they only involved case changes).

upsg001.tga: New art by OnePresent, to update for the new start screen.

2004.04.18
..\ctp2_code\ui\interface\spscreen.cpp
..\ctp2_code\ui\interface\spwindow.cpp
..\ctp2_code\ui\interface\spwindow.h
..\ctp2_code\ctp\civapp.cpp

More updates by J Bytheway: Removed the content of the SP screen files as they are no longer needed (in the sense that I put them inside #if defined(ACTIVISION_ORIGINAL) ... #endif).


2004.04.18
..\ctp2_code\gs\slic\slicfunc.cpp
..\ctp2_code\gs\slic\slicfunc.h
..\ctp2_code\gs\slic\slicengine.cpp

New slic functions added by Martin Gühmann:
- CargoCapacity Gets number of additional units a unit can carry.
- MaxCargoSize Gets the maximum number of units a unit can carry.
- CargoSize Gets the current number of units a unit is carrying.
- GetUnitFromCargo Gets the i'th unit a unit is carrying.
- GetContinent Gets the continent ID of an location.
- IsWater Gets whether a location is water.


2004.04.18
..\ctp2_data\german\gamedata\ldl_str.txt

Replaced
str_ldl_MULTIPLAYER "Mehrspieler"
by
str_ldl_MULTIPLAYER "Netzwerkspiel"


2004.04.18.CTP2.ALL.zip

-Martin

	22-04-2004 03:08									#178
	Support Apolyton, buy Call to Power 2

AI improvement: make the governor take the CTP2 style partial worker utilisation into account when placing tile improvements around a city.

gs\gameobj\CityData.h
gs\gameobj\CityData.cpp
ai\CityManagement\Governor.cpp

[Edit: link removed. Included in the 2004.06.05 source collection.]

Last edited by Fromafar on 13-06-2004 at 19:30

	23-04-2004 01:33									#179
	Enter the AD-FREE zone

Bug fixes:

gs\slic\SlicFrame.cpp: changed reporting of modulo 0 errors to match division by 0 error reporting.
gs\gameobj\UnitData.cpp: (Activision 1.1 patch reimplementation) corrected active defense movement type check.

[Edit: link removed. Included in the 2004.06.05 source collection.]

Last edited by Fromafar on 13-06-2004 at 19:31

	23-04-2004 01:47									#180
	Support Apolyton buy from Amazon

quote: make the governor take the CTP2 style partial worker utilisation into account when placing tile improvements around a city.

What does this mean exactly Fromafar? Does it mean it doesnt place tile imps on a tile until certain % worked? and if so, what is that %?