PROJECT: Altered source files

[Martin Gühmann]

2004.10.15
Tile Info Update by Martin Gühmann
..\ctp2_code\ui\interface\controlpanelwindow.cpp
Fix of another Crossed Sword Bug caused by the previous bug fix that caused the crossed sword to appear even if the player didn't discovered the city yet.
..\ctp2_code\ui\aui_ctp2\InfoBar.cpp
The infobar no longer displays cities that the player did not discovered - yet. Unfortunatly it still reveals the tile improvements around the city.

-Martin

[Fromafar]

Bug fixes/moddability improvement:

ctp2_code\ui\aui_ctp2\ctp2_hypertextbox.cpp
ctp2_code\ui\aui_ctp2\ctp2_hypertextbox.h
ctp2_code\ui\interface\GreatLibrary.cpp
ctp2_code\ui\interface\GreatLibrary.h
ctp2_code\ui\interface\ScienceManagementDialog.cpp
cpt2_data\english\uidata\layouts\science.ldl

Improved the robustness of the hyperlink string handling - to prevent crashes when accessing data past the end of a string.
Also added a feature to perform automatic text lookup for database links: when encountering something like <LATABASE_UNITS,UNIT_STEALTH_BOMBER><e>, with the the <e> immediately following the <L>, the text from gl_str.txt ("Stealth Bomber" for the English version) will be displayed.
These changes should enable you to use the science manager with the WAW mod.

ctp2_data\english\gamedata\WAW_Great_Library.txt
Fixed a typo. Note: this one does not really belong in the source code collection, but should go to the WAW mod.

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

[Martin Gühmann]

2004.10.16
Terrain improvement vision update by Martin Gühmann:
..\ctp2_code\gs\gameobj\TerrImproveData.cpp
When a turn is added to a tile improvement under construction then the vision on that tile is updated so that the progression of the completeness of the tile improvement is visualized.

-Martin

[kaan]

Multiplayer update by Klaus Kaan:

..\ctp2_code\gs\gameobj\Player.cpp
fix for bug #21

..\ctp2_code\net\general\net_action.cpp
fix for bug #26

..\ctp2_code\net\general\network.cpp
fix for bug #30


NOTE: while this update doesnt break anything in singleplayer it has not been testet in multiplayer yet.

[kaan]

Multiplayer update by Klaus Kaan:

..\ctp2_code\gs\utility\TurnCnt.cpp
..\ctp2_code\gs\gameobj\Player.cpp
..\ctp2_code\gs\gameobj\PlayerEvent.cpp
..\ctp2_code\net\general\net_info.cpp
..\ctp2_code\net\general\net_info.h

This is an attempt at fixing the problem with PW not being propagated. It is inspired by the way gold is propagated.



NOTE: while this update doesnt break anything in singleplayer it has not been testet in multiplayer yet.

[kaan]

Ooops

I forgot the file

[EPW]

Originally posted by kaan
Multiplayer update by Klaus Kaan:

..\ctp2_code\gs\utility\TurnCnt.cpp
..\ctp2_code\gs\gameobj\Player.cpp
..\ctp2_code\gs\gameobj\PlayerEvent.cpp
..\ctp2_code\net\general\net_info.cpp
..\ctp2_code\net\general\net_info.h

This is an attempt at fixing the problem with PW not being propagated. It is inspired by the way gold is propagated.

[J Bytheway]

I've been trying to make a new playtest version (although kaan has now beaten me to it), but I was getting the following errors on a debug build:

F:\Games\CTP2Src\ctp2_code\gs\gameobj\CityData.cpp (263) : error C2614: 'CityData' : illegal member initialization: 'm_unknown_from_patch' is not a base or member
F:\Games\CTP2Src\ctp2_code\gs\gameobj\CityData.cpp (462) : error C2065: 'm_unknown_from_patch' : undeclared identifier
F:\Games\CTP2Src\ctp2_code\gs\gameobj\CityData.cpp (462) : error C2593: 'operator <<' is ambiguous
F:\Games\CTP2Src\ctp2_code\gs\gameobj\CityData.cpp (1543) : error C2782: 'const T &__cdecl std::min(const T &,const T &)' : template parameter 'T' is ambiguous
could be 'int'
or 'long'
F:\Games\CTP2Src\ctp2_code\gs\gameobj\CityData.cpp (1556) : error C2782: 'const T &__cdecl std::min(const T &,const T &)' : template parameter 'T' is ambiguous
could be 'int'
or 'long'
Error executing cl.exe.

I thought this might be due to a problem in Martin's changes to CityData.cpp in:

2004.09.29
DB Generator Update 2 by Martin Gühmann:

..\ctp2_code\gs\newdb\*Record.stamp
..\ctp2_code\gs\newdb\StrategyRecord.h
..\ctp2_code\gs\dbgen\Datum.cpp
..\ctp2_code\gs\gameobj\CityData.cpp

I think I can probably figure it out, but I thought I'd mention it.

[Martin Gühmann]

Originally posted by J Bytheway
I thought this might be due to a problem in Martin's changes to CityData.cpp in:

No, it rather looks like you try to compile the wrong version of CityData.cpp. m_unknown_from_patch should be gone since the reimplementation of the revolt-of-a-city-twice-in-a-turn prevention.

-Martin

[J Bytheway]

Originally posted by Martin Gühmann
No, it rather looks like you try to compile the wrong version of CityData.cpp. m_unknown_from_patch should be gone since the reimplementation of the revolt-of-a-city-twice-in-a-turn prevention.

You're right - it isn't in your CityData.cpp, which is strange. I wonder where it appeared from...

Anyway, as I said, I'm sure I can figure it out...

[Fromafar]

Bug fixes:

gs\slic\slicfunc.h: Corrected return type of IsVeteran.
ai\diplomacy\diplomat.cpp: Prevented some crashes on incorrect input.

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

[kaan]

Multiplayer update by Klaus Kaan:

..\ctp2_code\gs\utility\TurnCnt.cpp
..\ctp2_code\gs\gameobj\Player.cpp
..\ctp2_code\gs\gameobj\PlayerEvent.cpp
..\ctp2_code\net\general\net_info.cpp
..\ctp2_code\net\general\net_info.h

This is an attempt at fixing the problem with PW not being propagated. It is inspired by the way gold is propagated.
Updates as suggested by Fromafar.

..\ctp2_code\gs\gameobj\CityData.cpp

Fixed bug #14 "Fixed movement point propagation for settlers from disbanded cities in network games with 3+ players".

[kaan]

and heres is the file

[Flinx]

I got this error on a debug build:

Compiling...
Scheduler.cpp
C:\CTP2code\ctp2_code\ai\strategy\Scheduler\Scheduler.cpp(367) : error C2065: 'm_AllIsExplored' : undeclared identifier
Error executing cl.exe.

CivCTP_dbg.exe - 1 error(s), 0 warning(s)

any suggestions? Where should 'm_AllIsExplored' be declared?

[calvitix]

Originally posted by Flinx
I got this error on a debug build:

Compiling...
Scheduler.cpp
C:\CTP2code\ctp2_code\ai\strategy\Scheduler\Scheduler.cpp(367) : error C2065: 'm_AllIsExplored' : undeclared identifier
Error executing cl.exe.

CivCTP_dbg.exe - 1 error(s), 0 warning(s)

any suggestions? Where should 'm_AllIsExplored' be declared?

It's a variable I used for a test that didn't worked. I forgot to delete the line in the constructor. You can delete all that refers to 'm_AllIsExplored'