PROJECT: Altered source files

[Fromafar]

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

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

[Solver]

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

[Peter Triggs]

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.

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

[Martin Gühmann]

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

[J Bytheway]

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

[Solver]

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

[Solver]

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

[J Bytheway]

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]

[J Bytheway]

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]

[Martin Gühmann]

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

[Martin Gühmann]

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

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

[Fromafar]

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

[Fromafar]

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

[Maquiladora]

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