PROJECT: Altered source files

[kaan]

Originally posted by Martin Gühmann
According to the bug description they did not really fixed the bug, it sounds like they did something in the hope that it might make the problem less annoying. That's like shooting into the dark in the hope to hit the mark.

I agree on that, but im still confident that this is the change that hides behind that description.
My goal with this is to reimplement the changes made by activision and i think that this change satisfies bug #4 on the todo list.

[Martin Gühmann]

Originally posted by kaan
I agree on that, but im still confident that this is the change that hides behind that description.
My goal with this is to reimplement the changes made by activision and i think that this change satisfies bug #4 on the todo list.

I don't doupt that it is bug number 4, but the question still remains whether this does anytthing.

-Martin

[Fromafar]

Bug fixes:

gs\gameobj\Pollution.cpp: repaired memory leak + corrected message recipients
gs\gameobj\FeatTracker.cpp: repaired memory leak

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

[Fromafar]

Bug fixes: more corrections on the Gaia controller messages, for the case that MaxPlayers is smaller than the actual number of players.

gs\gameobj\CityEvent.cpp
gs\gameobj\PlayerEvent.cpp

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

[Fromafar]

Restore compatibility update. Based on the changes by kaan to prevent cities revolting twice in the same turn.

gs\database\ConstDB.cpp
gs\database\ConstDB.h
Modified to accept const.txt files using the original Activision format, the format of the current playtest, and the new format. This should save us from having to answer "missing keword" questions for the next release.

gs\gameobj\CityData.cpp
gs\gameobj\CityData.h
gs\gameobj\Player.cpp
Merged with the changes by Lui2. The lack of a proper version control system is starting to show.

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

[Fromafar]

Corrections for hotseat play:

ctp\civapp.cpp: Blank the interface when loading a saved hotseat game.
gs\slic\SlicEngine.cpp: Enable the end turn button when unblanking the screen.
gs\gameobj\Vision.cpp: Prevented strange tile visibility patterns that occurred sometimes.
gs\gameobj\CivilisationData.cpp: Redetermine the city style when setting the civilisation.
ui\interface\loadsavescreen.cpp + spnewgamescreen.cpp: Repaired memory leaks.

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

[calvitix]

French update

Hi,

i'm quite new here, and I finally have my copy of VS6 et get the source to compile.

my first contribution is an update of the french version with all the modifications.

so, here is a list of changes :



ctp2_data\french\gamedata\Great_library.txt

fixed incorrect links :
1. Char à fusion -> plage
2. Porte-avion -> transporter
3. Coracle -> transporter
4. Contre-torpilleur -> Defense anti-aérienne
5. Ecoterroriste -> perpetrer attentat
6. Infantrie aéroportée -> plage
7. Rubis -> volcan
8. Diamant -> volcan
9. Crabe -> plage
10. port -> plage
11. carburant -> base aérienne

I don't know how far is Flinx with the translation af that file, perhaps we can share the works to do...

ctp2_data\french\gamedata\add_str.txt
ctp2_data\french\gamedata\exp_str.txt
ctp2_data\french\gamedata\ldl_str.txt
ctp2_data\french\gamedata\tips_str.txt
ctp2_data\french\gamedata\infos_str.txt

several translations. I also update the structure of those files so that they correspond to the english version
(ie the same strings at the same lines) to make further update easier.



ctp2_data\french\uidata\city_status.ldl
ctp2_data\french\uidata\km_screen.ldl
ctp2_data\french\uidata\ns_strings.ldl

copy of previous patchs (OK for the french version)

[Martin Gühmann]

2004.07.24
..\ctp2_code\gfx\spritesys\Actor.h

Fixed a type in Actor.h:

It should be:

#if defined (ACTIVISION_ORIGINAL)
#define k_MAX_ACTION_QUEUE_SIZE		10
[b]#[/b]else
//fix bug #4 by kaan
#define k_MAX_ACTION_QUEUE_SIZE		12
#endif

Instead of:

#if defined (ACTIVISION_ORIGINAL)
#define k_MAX_ACTION_QUEUE_SIZE		10
else
//fix bug #4 by kaan
#define k_MAX_ACTION_QUEUE_SIZE		12
#endif

-Martin

[Martin Gühmann]

OK, I just loaded the game with all the modified files here, after the problem with Actor.h, I encountered another problem concerning Const.txt. I got a message that POWER_POINTS_TO_MATERIALS could not be found, I clicked on OK and the game hang. Afterwards I moved MIN_TURNS_BETWEEN_REVOLT to the end of const.txt no problem.

-Martin

[Martin Gühmann]

2004.07.24
..\ctp2_data\ui\interface\StatusBar.zip

Memory leak fix by Martin Gühmann

[Martin Gühmann]

2004.06.05
..\ctp2_data\XXXXXX\uidata\layouts\ns_strings.ldl

Where XXXXXX stands for english, french, german, italian, japanese or spanish.

Bug fix by Lui2: The selection boxes for StartingAge and EndingAge in the multiplayer setup window have show now the correct ending and starting ages, however this only works for the unmodded game with just 5 ages.


2004.06.08
..\ctp2_data\gs\fileio\GameFile.cpp

Activision patch reimplementation by Fromafar: Use 6 (was 5) characters of the leader name when generating a scenario autosave directory name.


2004.06.10
..\ctp2_code\ui\aui_ctp2\SelItem.cpp
..\ctp2_code\ui\interface\CityControlPanel.cpp
..\ctp2_code\ui\interface\Citywindow.cpp
..\ctp2_code\ui\interface\EditQueue.cpp

Standardization of the behaviour for selecting and focus on a city by Lui2.

Added the missing focus behaviour when selecting a city for the following cases:

1) CityControlPanel: next & prev button and the dropdown selection
2) CityWindow: dropdown selection
3) BuildManager: next & prev button and the dropdown selection

Also took care, that the user option "focus on the active unit or city" works as expected.

The focus handling from the national manager, to select and focus a city with a double mouse click, was not changed. Because considering here, the user option not to focus, makes no sense.


2004.06.10
..\ctp2_code\ui\interface\interfaceevent.cpp
..\ctp2_code\ui\interface\screenutils.cpp

Bug fix by Fromafar: Prevent incorrect city production when pressing F3 after end of turn. Reported by Lui2 for MP. Only tested for SP, where it was reproducible as well.


2004.06.13
..\ctp2_code\ctp\ctp2_utils\c3math.h
..\ctp2_code\gs\gameobj\GSLogs.cpp
..\ctp2_code\ui\interface\CauseAndEffectTab.cpp
..\ctp2_code\ui\interface\DomesticControlPanel.cpp
..\ctp2_code\ui\interface\knowledgewin.cpp
..\ctp2_code\ui\interface\sciencewin.cpp

Possible Activision patch reimplementation by Fromafar:
Use the same code - round by adding 0.5 before converting from double to int - for all science percentage display occurrences.


2004.06.14
..\ctp2_code\ui\aui_ctp2\keymap.h
..\ctp2_code\ui\aui_ctp2\keymap.cpp
..\ctp2_code\ui\interface\km_screen.cpp

..\ctp2_data\XXXXXX\gamedata\ldl_str.txt
..\ctp2_data\XXXXXX\uidata\layouts\km_screen.ldl

Where XXXXXX stands for english, french, german, italien, japanese and spanish ldl_str.txt file.

Key mapping fix and extension by Lui2:

This changes fix the currently wrong displayed key mapping of the map and option section.

I also added all usefull commands, that where not supported before for the keymapping dialog.

Because I only have the german km_screen.ldl file, I only added this version. I think the versions for the other languages must be identical. If someone can please check this and add the changes to the files for the other languages.

The following commands are now also supported for the keymapping dialog:
EXECUTE_EYEPOINT
MOVE_ORDER
YES
NO
END_UNIT_TURN
EXECUTE_ORDERS
PROCESS_UNIT_ORDERS
GROUP_ARMY
UNGROUP_ARMY
DECEND
PARADROP

also the following commands for _PLAYTEST flag mode:
TOGGLE_SPACE (that only seems to remove the fog of war)
GAMESTATE_DEBUG
RAND_TEST
ENTER_COMMAND
ENTER_COMMAND_ALTERNATE


2004.06.19
..\ctp2_code\ui\interface\NationalDialog.h
..\ctp2_code\ui\interface\NationalDialog.cpp

..\ctp2_data\XXXXXX\gamedata\ldl_str.txt
..\ctp2_data\XXXXXX\gamedata\tips_str.txt
..\ctp2_data\XXXXXX\uidata\layouts/citystatus.ldl

Where XXXXXX stands for the german and english directories. I will post the strings that must be translated, in the specific TranslationCenter Thread.


Addion of a third tab to the NationalManager window by Lui2.
This tab shows the number of slaves, the different experts and the number of combat units in each city. I was tired of switching through all the cities to see how many experts in each city are set up.


2004.06.19
..\ctp2_data\gs\fileio\civscenarios.cpp

Bug fix by Martin Gühmann: Fixed a memory leak in CivScenarios::LoadScenarioPackData, now if you leave the game from the first screen after you started the debug program, you just find in the first line of the CTP_LEAKS_99999 the word: "None." Well there are still a lot of memory leaks to fix.


2004.06.19
..\ctp2_code\ui\interface\scenarioeditor.cpp

Bug fix by Martin Gühmann: Avoids a crash if you select a city change the civ via the Scenario Editor and the previous selected city gets destroyed by anything else then the erase function of the Scenario Editor, like slic, conquest or stavation. At least when I will tough the enslave feature of my city capture option again, it will save me a lot of crashes.

2004.06.21
..\ctp2_code\gs\gameobj\CityEvent.cpp
..\ctp2_code\gs\gameobj\PlayerEvent.cpp

Bug fixes by Fromafar: Memory leaks repaired and some Gaia Controller messages were corrected.


2004.06.23
..\ctp2_code\gs\fileio\GameFile.cpp

Bug fix by Peter Triggs: The savegave bug in scenarios, unfortunatly this doesn't work for the autosave.


2004.06.26
..\ctp2_code\ui\aui_ctp2\radarmap.h
..\ctp2_code\ui\aui_ctp2\radarmap.cpp

Addition by Lui2:
Added a shifting possibility for the radar map (minimap).
With a right click on the radar map, you can now center the point you clicked , on the radar map.

It's nice to see your own empire in the center of the world!

The change takes care if the world has x and / or y wrap and does only allow shifing in the axis that has also wrap.


2004.06.26
..\ctp2_code\ui\freetype\freetype.h
..\ctp2_code\ui\freetype\freetype.lib
..\ctp2_code\ui\freetype\fterrid.h
..\ctp2_code\ui\freetype\ftnameid.h

..\ctp2_code\ui\freetype\announce
..\ctp2_code\ui\freetype\license.txt
..\ctp2_code\ui\freetype\patents
..\ctp2_code\ui\freetype\readme.1st

Newer version (1.3.1) of the Freetype Library, compiled with the same compiler (MSVS 6.0 SP6) as the playtest releases.
This is an attempt to fix a problem on XP.

(Legal) notes:

* The code to generate the Freetype Library has not been included. You have to go to http://www.freetype.org if you are interested.
* There are some patents issues that may apply to distribution outside Europe. But the same issues should have applied to the original game.
* The Freetype Library has not been created by Activision. Stripping the comments (with copyrights!) from the source files may have been in violation of the license . Well, at least these are back in now. And I think Activision should have mentioned these guys in the credits somewhere.


2004.06.27
..\ctp2_code\gs\gameobj\ArmyData.cpp

Bug fix by Lui2: Prevents to inform the supposed defending AI from a bombard order that was illegal (e.g. giving a canon the order to bombard a ship on the sea).


2004.07.02
..\ctp2_code\gs\database\ProfileDB.cpp
..\ctp2_code\gs\database\ProfileDB.h
..\ctp2_code\gs\gameobj\ArmyData.cpp
..\ctp2_code\gs\gameobj\ArmyData.h
..\ctp2_code\ui\interface\UnitControlPanel.cpp
..\ctp2_data\english\gamedata\ldl_str.txt
..\ctp2_data\german\gamedata\ldl_str.txt

Added user interface option by Fromafar: Offer a choice between showing the intersection (default/original game) or the union of the possible orders of the units in an army, to make e.g. bombarding easier.

You may toggle this choice in-game through the Advanced options menu (Show All Army Orders), or edit the ShowOrderUnion line in your userprofile.txt.

2004.07.04
..\ctp2_code\gs\gameobj\Player.cpp

Bug fix of missing recalculation of military support cost after changing the government type by Lui2.

After changing the government, the military support costs were not recalculated. The only point where they were recalculated, was in the unitmanager advisor, when changing the percentual display of the military support costs to a absolute value.

This bug has a big influence of the production and therefore also a big influence of the whole game and can easily be used for abusing.


04.07.2004
..\ctp2_code\gs\gameobj\UnitData.cpp

..\ctp2_data\default\gamedata\unit.txt
..\ctp2_data\default\gamedata\script.slc

..\ctp2_data\german\gamedata\info_str.txt
..\ctp2_data\english\gamedata\info_str.txt

Modifications by Lui2:
Added two new messages to distinct message text after investigating a city depending if the unit was caught or not. I didn't like that the message was telling me that my spy was caught, but he wasn't.
Two strings are added to the info_str.txt and a call added to script.slc files.
INVESTIGATE_CITY_FAILED_ESC_VICTIM
INVESTIGATE_CITY_FAILED_ESC_AGRESSOR

Also changed the EliteChance in Units.txt to an absolute value, like it's used in the program.
Look here for exact background.

Also did one additional minor fix to the units.txt by changing the size of the UNIT_TANK from small to medium.

I add information about the new strings to the TranslationCenter thread.


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

Bug fix by Lui2: Sometimes not correct filled m_shields_this_turn variable, that leads to wrong sorting sequence for number of "turns until production is finished" in NationalManager status window (maybe also to other wrong behaviours).


2004.07.06
..\ctp2_code\ui\aui_ctp2\ctp2_listbox.cpp
Improvement by Lui2: Optimized sorting logic of list entries (only the half number of iterations (+ numer of entries) than before).


2004.07.06
..\ctp2_code\ui\interface\NationalManagementDialog .cpp
Fixed sorting sequence for governor type in status tab for blank entries by Lui2.


2004.07.07
..\ctp2_code\gs\database\StrDB.cpp
..\ctp2_code\ui\aui_common\aui_imagelist.cpp
..\ctp2_code\ui\aui_common\aui_resource.h
..\ctp2_code\ui\aui_common\textbase.cpp

Some crash prevention changes for missing strings and pictures by Fromafar.
Note this does not prevent the pop-up (every time) when you try to access a missing file.


2004.07.07
..\Scenarios\AlexanderTheGreat\scen0000\default\ga medata\AG_msg.slc
..\Scenarios\AlexanderTheGreat\scen0000\default\ga medata\scenario.slc

Text file repairs for the Alexander scenario by Fromafar:
- added Corinthian League defeat message (as suggested by Immortal Wombat)
- repaired Babylon coronation event typo (as suggested by Immortal Wombat)
- repaired an invalid assignment in the Sidon event


2004.07.08
..\ctp2_code\gs\database\ConstDB.cpp
..\ctp2_code\gs\database\ConstDB.h
..\ctp2_code\gs\gameobj\CityData.cpp
..\ctp2_code\gs\gameobj\CityData.h
..\ctp2_code\gs\gameobj\Player.cpp
..\ctp2_data\default\gamedata\Const.txt
..\Scenarios\AlexanderTheGreat\scen0000\default\ga medata\Const.txt

Activision patch reimplementation by kaan:
Bug #12 "Prevented cities from revolting twice in a row".

The amount of turns minimum between revolts was exposed to const.txt.


2004.07.10
..\ctp2_code\gfx\spritesys\Actor.h

Activision patch reimplementation by kaan:
Bug #4 "Increased animation queue to 12, making unit-in-wrong-place bug less likely".


2004.07.12
..\ctp2_data\gs\gameobj\Pollution.cpp
..\ctp2_data\gs\gameobj\FeatTracker.cpp

Bug fixes by Fromafar:

Pollution.cpp: Repaired memory leak + corrected message recipients
FeatTracker.cpp: Repaired memory leak


2004.07.13
..\ctp2_data\gs\gameobj\CityEvent.cpp
..\ctp2_data\gs\gameobj\PlayerEvent.cpp

Bug fixes by Fromafar: More corrections on the Gaia controller messages, for the case that MaxPlayers is smaller than the actual number of players.

Restore compatibility update. Based on the changes by kaan to prevent cities revolting twice in the same turn.


2004.07.14
..\ctp2_data\gs\database\ConstDB.cpp
..\ctp2_data\gs\database\ConstDB.h

Modification by Fromafar to make const.txt files to use the original Activision format, the format of the current playtest, and the new format. This should save us from having to answer "missing keword" questions for the next release.


2004.07.14
..\ctp2_data\gs\gameobj\CityData.cpp
..\ctp2_data\gs\gameobj\CityData.h
..\ctp2_data\gs\gameobj\Player.cpp

Merged with the changes by Lui2 by Fromafar. The lack of a proper version control system is starting to show.


2004.07.15
..\ctp2_data\ctp\civapp.cpp
..\ctp2_data\gs\slic\SlicEngine.cpp
..\ctp2_data\gs\gameobj\Vision.cpp
..\ctp2_data\gs\gameobj\CivilisationData.cpp
..\ctp2_data\ui\interface\loadsavescreen.cpp
..\ctp2_data\ui\interface\spnewgamescreen.cpp

Corrections for hotseat play by Fromafar:

civapp.cpp: Blank the interface when loading a saved hotseat game.
SlicEngine.cpp: Enable the end turn button when unblanking the screen.
Vision.cpp: Prevented strange tile visibility patterns that occurred sometimes.
CivilisationData.cpp: Redetermine the city style when setting the civilisation.
loadsavescreen.cpp + spnewgamescreen.cpp: Repaired memory leaks.


2004.07.17
French update by calvitix:

..\ctp2_data\french\gamedata\Great_library.txt

Incorrect links were fixed:
1. Char à fusion -> plage
2. Porte-avion -> transporter
3. Coracle -> transporter
4. Contre-torpilleur -> Defense anti-aérienne
5. Ecoterroriste -> perpetrer attentat
6. Infantrie aéroportée -> plage
7. Rubis -> volcan
8. Diamant -> volcan
9. Crabe -> plage
10. port -> plage
11. carburant -> base aérienne

..\ctp2_data\french\gamedata\add_str.txt
..\ctp2_data\french\gamedata\exp_str.txt
..\ctp2_data\french\gamedata\ldl_str.txt
..\ctp2_data\french\gamedata\tips_str.txt
..\ctp2_data\french\gamedata\infos_str.txt

These file were fully translated. And the internal structure now correspondent with the structure of the English version (ie the same strings at the same lines) to make further update easier.

..\ctp2_data\french\uidata\city_status.ldl
..\ctp2_data\french\uidata\km_screen.ldl
..\ctp2_data\french\uidata\ns_strings.ldl

Copy from previous patches to the French version.


2004.07.24
..\ctp2_data\ui\interface\StatusBar.zip

Memory leak fix by Martin Gühmann


2004.07.25
..\ctp2_data\english\gamedata\GreatLibary.txt
..\ctp2_data\german\gamedata\GreatLibary.txt
..\ctp2_data\english\gamedata\ldl_str.txt
..\ctp2_data\french\gamedata\ldl_str.txt
..\ctp2_data\german\gamedata\ldl_str.txt
..\ctp2_data\italian\gamedata\ldl_str.txt
..\ctp2_data\japanese\gamedata\ldl_str.txt
..\ctp2_data\spanish\gamedata\ldl_str.txt
..\ctp2_data\french\gamedata\tips_str.txt
..\ctp2_data\italian\gamedata\tips_str.txt
..\ctp2_data\spanish\gamedata\tips_str.txt
..\ctp2_data\spanish\gamedata\info_str.txt
..\ctp2_data\default\gamedate\const.txt

GreatLibary.txt: Chnaged entries from
<LATABASE_BUILDINGS,IMPROVE_CORNUCOPIC_VATS>Cornucop ic Vats<e>
to
<LATABASE_BUILDINGS,IMPROVE_CORNUCOPIC_VAT>Cornucopi c Vats<e>

Other language text files: Added missing strings at least in English that the creators of the new strings forgot to add to these files.

In addition to ldl_str.txt updated the version strings to match with the latest playtest version.

Const.txt: Moved the new flag MIN_TURNS_BETWEEN_REVOLT to the end of this file as the flag at its original position made the game hang.


Edit: Link removed, new all pack has been posted see further down this thread.

-Martin

[Fromafar]

Originally posted by Martin Gühmann
OK, I just loaded the game with all the modified files here, after the problem with Actor.h, I encountered another problem concerning Const.txt. I got a message that POWER_POINTS_TO_MATERIALS could not be found, I clicked on OK and the game hang. Afterwards I moved MIN_TURNS_BETWEEN_REVOLT to the end of const.txt no problem.

Sorry, I forgot to include this file. Adding the value at the end is OK. Alternatively, you can use an earlier version of const.txt without this line. The program will use a default value (in this particular case 1) when the definition is missing from the file.

The same holds for the MAX_MATCH_LIST_CYCLES definition that has been inserted in the past. The program will use a default value of 6 when the line is missing, so we may remove the const.txt files for the various scenarios from the installation. The original Activision files will be accepted now.

The only useful included const.txt file left is the main one, with a non-default value 10 for MAX_MATCH_LIST_CYCLES.

[Fromafar]

Miles Sound System include file update:

• Assigned debugger confirmed values to the enumeration constants.
• Added disclaimers.
• Replaced bool (not a type in C) with S32.
• Integrated stubbed and non-stubbed versions.

libs\miles\mss.h

Note: To make it complicated , I have reinstated the libs\miles path from the original source code project. This will make accessing this file from the File View tab work again. However, this forces you to delete sound\mss.h before rebuilding with the new file. If you don't, the wrong file will be included during compilation.

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

[Fromafar]

MSVC.NET compatibility update part 1.

Most of the following changes have already been reported by RalphTrickey in the COMPILE: Getting the source to compile on VS.NET thread.
This code has no functional changes, but has been verified to work on both MSVC 6.0 and .NET.

Replace list-fixed with list:
ai\diplomacy\diplomat.h
ai\diplomacy\foreigner.cpp
ai\mapanalysis\settlemap.h
ai\strategy\scheduler.plan.h
ai\strategy\scheduler.cpp
ai\strategy\scheduler_types.h
gs\gameobj\gaiacontroller.h

Workarounds for allocator problems:
ai\strategy\scheduler\scheduler.h
ctp\ctp2_utils\c3debugstl.h

Replace or remove references to a missing iostream.h:
ctp\ctp2_utils\AvlTree.h
ctp\ctp2_utils\c3cmdline.cpp

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

[Fromafar]

MSVC.NET compatibillity update part 2.

Resolved ambiguous function reference.
ui\netshell\ns_civlistbox.cpp

Corrected strange access of non-static members from static data.
ui\netshell\ns_... (27 files)

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