PROJECT: Altered source files

[Flinx]

I took it to mean that it improves 100% worked rings before the partial worked outer ring - but you are right Maq it is not clear what the change does.

[Fromafar]

When generating a list of candidate tile improvements, each candidate is assigned a value (utility) based on the terrain, improvement, and city properties.

I have now multiplied this utility value with the worker utilisation percentage applied to the tile when determining the city production.

So when you have a size 7 city: the 8 inner ring tiles have unmodified utility values (100% utilisation - for some reason the game requires only 6 workers to make the first ring being 100% ), while the second ring has a reduced utility value (IIRC it is (7 - 6) / (18 - 6) = 1/12 = 8.3%), which will go up when the city grows.

After generating the list, it will be ordered on descending utillity value, and PW spending will start from the beginning of the list. So, there is no fixed % where you don't work a tile. But it will prevent spending PW on improvements that are not really contributing.

So, Flinx was correct.

I think this is a forgotten issue from the CTP1 to CTP2 conversion. In CTP1, a placed worker meant 100% utilisation, regardless of the distance of the tile to the city or the number of available workers.

[Maquiladora]

for some reason the game requires only 6 workers to make the first ring being 100%

Isnt that because of the city size 1-6 for inner ring, 7-18 (12) for second ring etc. but i thought that could be changed in citysize*.txt so why is it hardcoded?

[Flinx]

Fromafar you did use the variables loaded from citysize*.txt didn't you?
I made a mod which changes these files and I would like it if your improvement worked correctly with the mod.

[Martin Gühmann]

2004.04.27
..\ctp2_code\gs\gameobj\gaiacontroller.cpp

Bug Fix by Martin Gühmann: Neutral pillage tile improvement bug, the game doesn't crash anymore when a tile improvement is pillaged that noone owns.

-Martin

[Martin Gühmann]

2004.04.30
..\ctp2_code\gs\slic\SlicFrame.cpp
..\ctp2_code\gs\slic\slicif.cpp

Games that uses slic database access can now be reloaded without the need to /reloadslic to prevent a crash, unfortunatly this applies only to games that are saved with this version of the slic database access, games saved with Activision's patch v.1.1 and with slic code that uses database access may not be continued without a /reloadslic.

-Martin

[Martin Gühmann]

2004.04.30
..\ctp2_code\ctp\civapp.cpp

Bug fix by Martin Gühmann: A memory leak that occured in the Great Libary when a saved game was loaded, only regular saves with the ranking and world map *.rim, not the quicksave.

-Martin

[Fromafar]

User profile option + repaired memory leaks.

ui\interface\GreatLibrary.cpp
Repaired more memory leaks that were caused by reloading the great library data.

gs\database\ProfileDB.cpp
gs\database\ProfileDB.h
ctp\civapp.cpp
Added a "ColorSet" option to userprofile.txt, to make variation between the colors##.txt files easier.

Note: I undid some previous changes by Martin in civapp.cpp. Those were no longer needed now that the great library memory leaks have been repaired at the root.

OT/late reply: the tile improvement placement change has no impact on how many workers are in a ring. The citysize#.txt values are being used - nothing is hardcoded.

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

[Fromafar]

Bug fix: tile improvements without Freight cost modification no longer have 0 Freight cost for the trade route computation. This should prevent funny paths from being computed.

gs\newdb\terrimprove.cdb
gs\world\cell.cpp
[Edit: link removed. Included in the 2004.06.05 source collection.]

[Fromafar]

Bug fixes

gs\newdb\CTPDatabase.cpp
gs\newdb\CTPDatabase.h
Repaired memory leaks and cleaned up the government modification code somewhat.

ui\interface\sci_advancescreen.cpp
(Activision patch 1.1 reimplementation) Start the "change research" screen with the current research selected.

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

[Fromafar]

Bug fix:

gs\gamedata\ArmyData.cpp
(Activision patch 1.1 reimplementation) Corrected a check that prevented sueing of franchises.

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

[Martin Gühmann]

Well Fromafar, with the use of the STL for the government stuff I get now these warnings, is there a way to disable them?

c:\programme\microsoft visual studio\vc98\include\vector(39) : warning C4786: 'std::reverse_iterator >::iterator const *,std::list >::iterator,std::list >::iterator const &,std::list >::iterator const *,int>' : Bezeichner wurde auf '255' Zeichen in den Debug-Informationen reduziert
c:\programme\microsoft visual studio\vc98\include\vector(39) : Bei der Kompilierung der Member-Funktion '__thiscall std::vector >::iterator,dbgallocator >::iterator> >::std::vector >::iterator,dbgallocator >::iterator> >(const dbgallocator >::iterator> &)' der Klassenvorlage
c:\programme\microsoft visual studio\vc98\include\vector(39) : warning C4786: 'std::reverse_iterator >::iterator *,std::list >::iterator,std::list >::iterator &,std::list >::iterator *,int>' : Bezeichner wurde auf '255' Zeichen in den Debug-Informationen reduziert
c:\programme\microsoft visual studio\vc98\include\vector(39) : Bei der Kompilierung der Member-Funktion '__thiscall std::vector >::iterator,dbgallocator >::iterator> >::std::vector >::iterator,dbgallocator >::iterator> >(const dbgallocator >::iterator> &)' der Klassenvorlage
c:\programme\microsoft visual studio\vc98\include\vector(39) : warning C4786: 'std::vector >::iterator,dbgallocator >::iterator> >::vector >::iterator,dbgallocator >::iterator> >' : Bezeichner wurde auf '255' Zeichen in den Debug-Informationen verkürzt
c:\programme\microsoft visual studio\vc98\include\vector(60) : warning C4786: 'std::vector >::iterator,dbgallocator >::iterator> >::~vector >::iterator,dbgallocator >::iterator> >' : Bezeichner wurde auf '255' Zeichen in den Debug-Informationen verkürzt
c:\programme\microsoft visual studio\vc98\include\vector(52) : warning C4786: 'std::vector >::iterator,dbgallocator >::iterator> >::vector >::iterator,dbgallocator >::iterator> >' : Bezeichner wurde auf '255' Zeichen in den Debug-Informationen verkürzt

-Martin

[Fromafar]

To suppress this warning, you may add a

#pragma warning(disable: 4786)

preprocessor directive in the file, as in e.g. ai\diplomacy\Diplomat.h.

Maybe there is a project setting, but I don't know it.

[child of Thor]

Not that i understand much of what is happening here - but whatever it is it's appriciated

[J Bytheway]

Is there a good reason why those warnings can't be eliminated by altering the code?