PROJECT: Revision Reports

[Ekmek]

civ3_main.obj : error LNK2001: unresolved external symbol "unsigned int __cdecl Os::GetTicks(void)" (?GetTicks@Os@@YAIXZ)

OK, next thing to try: go to civapp.cpp and remove the inline from the Os::GetTicks definition.

ok that worked

[Ekmek]

Revision 714

civapp.cpp
- removed the inline - restored compatibility
UnitActor.cpp
- removed armyname outcomment
- switched if lines in showcityicon

tiledraw.cpp
- switched if lines in religionicon

ArmyData.cpp
- outcommented sink slic message
- outcommented barbarian spawn slic message
- outcomented hostileterrain slic message

barbarians.cpp
- replace -1 in add barbarians with the player p value which may have been a defect left over
when the game didn't correctly spawn barbarians.cpp

risks.txt
- changed spontaneous values from standard 2 to increase with difficulty level
(this appears to be a defect leftover from not having a correct spawn code)

AE_Mod/scen0000/default/aidata/UnitBuildLists.txt AE_Mod/scen0000/default/gamedata/Units.txt
- fixed load scenario errors


layouts/gameplayoptions.ldl
layouts/graphics.ldl
- added non-versioned files


U trunk/Scenarios/AE_Mod/scen0000/default/aidata/UnitBuildLists.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Units.txt
U trunk/ctp2_code/ctp/civapp.cpp
U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/gameobj/barbarians.cpp
U trunk/ctp2_data/default/gamedata/risks.txt
A trunk/ctp2_data/english/uidata/layouts/gameplayoptions.ldl
A trunk/ctp2_data/english/uidata/layouts/graphics.ldl
A trunk/ctp2_data/french/uidata/layouts/gameplayoptions.ldl

[Fromafar]

Revision 715
Crash corrections.
Improved dbgen (handling on first run, layout of generated file).
Restored C3Button layout (text had become white/12 pt arial font).

Modified: ctp2_code\ai\CityManagement\governor.h
Modified: ctp2_code\ai\strategy\squads\Squad.cpp
Modified: ctp2_code\ai\strategy\squads\Squad.h
Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gs\database\profileDB.cpp
Modified: ctp2_code\gs\database\profileDB.h
Modified: ctp2_code\gs\dbgen\Datum.h
Modified: ctp2_code\gs\dbgen\MemberClass.cpp
Modified: ctp2_code\gs\dbgen\MemberClass.h
Modified: ctp2_code\gs\dbgen\RecordDescription.cpp
Modified: ctp2_code\gs\dbgen\RecordDescription.h
Modified: ctp2_code\gs\dbgen\ctpdb.cpp
Modified: ctp2_code\gs\gameobj\ArmyData.cpp
Modified: ctp2_code\gs\gameobj\Player.cpp
Modified: ctp2_code\gs\gameobj\Unit.cpp
Modified: ctp2_code\gs\gameobj\Unit.h
Modified: ctp2_code\gs\gameobj\UnitData.cpp
Modified: ctp2_code\gs\gameobj\UnitData.h
Modified: ctp2_code\gs\gameobj\barbarians.cpp
Modified: ctp2_code\gs\gameobj\player.h
Modified: ctp2_code\gs\gameobj\terrainutil.cpp
Modified: ctp2_code\gs\gameobj\terrainutil.h
Modified: ctp2_code\gs\newdb\Map.cdb
Modified: ctp2_code\gs\slic\SlicContext.cpp
Modified: ctp2_code\gs\slic\SlicContext.h
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicObject.h
Modified: ctp2_code\gs\slic\slicobject.cpp
Modified: ctp2_code\gs\utility\QuadTree.h
Modified: ctp2_code\gs\world\World.h
Modified: ctp2_code\gs\world\WrlEnv.cpp
Modified: ctp2_code\gs\world\cellunitlist.cpp
Modified: ctp2_code\gs\world\cellunitlist.h
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\gs\world\worldutils.cpp
Modified: ctp2_code\net\general\network.cpp
Modified: ctp2_code\net\general\network.h
Modified: ctp2_code\robot\aibackdoor\dynarr.h
Modified: ctp2_code\ui\aui_ctp2\c3_button.cpp
Modified: ctp2_code\ui\aui_ctp2\c3blitter.cpp

[Martin Gühmann]

Revision 716: Restored MSVC6 compilability and replaced the old concept database by new one

Fixed a typo:
modified trunk/ctp2_data/german/gamedata/Great_Library.txt

Cleaned files:
modified trunk/templates/c
modified trunk/templates/cpp
modified trunk/templates/h
modified trunk/ctp2_code/ui/aui_ctp2/ctp2_hypertextbox.cpp


Moved minmax functionality to its own file, so that we don't have to include c3.h and all the stuff it includes. Maybe there is a better place to move the code to,but for now this must be enough:
modified trunk/ctp2_code/ctp/c3.h
modified trunk/ctp2_code/ctp/ctp2_utils/minmax.h

Restored MSVC6 compilability:
modified trunk/ctp2_code/gs/dbgen/RecordDescription.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Replaced old concept database by new one. This now sorts the concepts in the Great Library alphabetically:
modified trunk/ctp2_code/ctp/civapp.cpp
modified trunk/ctp2_code/ctp/civctp.dsp
modified trunk/ctp2_code/gs/fileio/GameFile.cpp
modified trunk/ctp2_code/gs/newdb/Concept.cdb
modified trunk/ctp2_code/gs/newdb/CTPDatabase.cpp
modified trunk/ctp2_code/gs/slic/SlicEngine.cpp
modified trunk/ctp2_code/gs/utility/gameinit.cpp
modified trunk/ctp2_code/ui/interface/greatlibrary.cpp
modified trunk/ctp2_code/ui/interface/greatlibrary.h
modified trunk/ctp2_code/ui/interface/greatlibrarywindow.cpp
deleted trunk/ctp2_code/gs/database/conceptdb.cpp
deleted trunk/ctp2_code/gs/database/conceptdb.h

[Fromafar]

Revision 717
Repaired crash when disbanding armies at the main screen while the unit manager was shown.
Modified: ctp2_code\ui\interface\unitmanager.cpp
Modified: ctp2_code\ui\interface\unitmanager.h

Corrected ranking tab to open more than once.
Modified: ctp2_code\ui\interface\infowindow.cpp
Modified: ctp2_code\ui\interface\infowindow.h

Corrected NULL derefencing and invalid object crashes.
Modified: ctp2_code\ai\mapanalysis\mapanalysis.cpp
Modified: ctp2_code\gs\gameobj\GameObj.cpp

Added executable version to crash.txt.
Modified: ctp2_code\ctp\civ3_main.cpp

Small cleanups
Modified: ctp2_code\ui\interface\armymanagerwindow.cpp
Modified: ctp2_code\ui\interface\armymanagerwindow.h
Modified: ctp2_code\ui\interface\initialplayscreen.cpp

Note: the first crash repair is not for the crash in the gift code when disbanding in neutral territory - I will leave that one for E.

[Martin Gühmann]

Originally posted by E
am I the only one that gets a lot of assert errors when trying to run civctp_dbg.exe? at start up it hits me with setnew.h ln 52 and then a game i get diplomat.cpp ln870
then it may throw up other diplomat errors in line 206,207,208 or 543

Well, I get at least the assert at setnew.h ln 52. But I shouldn't wonder since I haven't tested the gameplay since that occured. But definately this should be removed. Anyway, here is something new:

Revision 718

Restored scenario loadability and modified the German translation

Scenarios load the default string database now from the original files instead of the scenario files. Default string loading can now be disabled for scenarios separately by using the token: ScenarioDoNotImportDefaults
This allows without massive text file modification to load and play the original scenarios again. Looks like no one has tested those scenarios in a long time with the Apolyton Edition with its present text files or even not at all.
modified trunk/ctp2_code/ctp/ctp2_utils/c3files.cpp
modified trunk/ctp2_code/ctp/ctp2_utils/c3files.h
modified trunk/ctp2_code/gs/database/StrDB.cpp
modified trunk/ctp2_code/gs/fileio/CivPaths.cpp
modified trunk/ctp2_code/gs/fileio/CivPaths.h
modified trunk/ctp2_code/gs/fileio/Token.cpp
modified trunk/ctp2_code/gs/fileio/Token.h

Improved the translation and changed the addressing of a player from an ordinary stranger to a kings and queens style:
modified trunk/ctp2_data/german/gamedata/add_str.txt
modified trunk/ctp2_data/german/gamedata/dip2_str.txt
modified trunk/ctp2_data/german/gamedata/feat_str.txt
modified trunk/ctp2_data/german/gamedata/info_str.txt
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/str_loc.txt
modified trunk/ctp2_data/german/gamedata/tips_str.txt
modified trunk/ctp2_data/german/gamedata/tut2_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/german/gamedata/Great_Library.txt
modified trunk/Scenarios/MagnificentSamurai/scen0000/german/gamedata/Great_Library.txt
modified trunk/Scenarios/MagnificentSamurai/scen0000/german/gamedata/scen_str.txt
modified trunk/Scenarios/NuclearDetente/scen0000/german/gamedata/Great_Library.txt
modified trunk/Scenarios/NuclearDetente/scen0000/german/gamedata/scen_str.txt

The above plus removed some Christian propaganda about Babylon and synchronized the order of strings and the line numbers in those files. At that ocassion some superflous double strings were removed:
modified trunk/Scenarios/AlexanderTheGreat/scen0000/english/gamedata/scen_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/german/gamedata/scen_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/italian/gamedata/scen_str.txt

[Ekmek]

Revision 719

ctp/civctp.dsp
newdb/religion.cdb
- Added Religion DB


database/profileDB.cpp & h
- Added DebugAI profile options


Added Button Functionality for ShowEnemyHealth
Added Button Functionality for NonRandomCivs
tilesys/tiledmap.cpp
tilesys/tiledraw.cpp
- Added profile access for DebugAI


gameobj/ArmyData.cpp
- Fixed bug where you cant disband in Neutral Territory


Fixed BarbarianSpawnBarbarian excessive spawn bug
gameobj/barbarians.cpp
- outcomment Notes for barbarians


gameobj/CityData.cpp & h
- added m_culture (future use)
- added m_secthappy to create a variable that doesn't randomize with each Click
- added ProcessSectarianHappiness method but couldn't fix CityStyle bug
- changed SectarianHappiness to just call m_secthappy
gameobj/UnitData.cpp
- outcomment on UnitData::SetType code looks like code only changes Sprite not Type


interface/controlpanelwindow.cpp
interface/UnitControlPanel.cpp
- outcomments trying to add a listbox for orders and tileimps


interface/scenarioeditor.cpp
gamedata/ldl_str.txt
- tried to add buttons for DebugAI and ShowEnemyHealth but interface code
is too inconsistent and confusing. Can't even add checkboxes

interface/spnewgamerulesscreen.cpp
gamedata/ldl_str.txt
- added NonRandomCivs/RandomCivs option in Rules screen

gamedata/civilisation.txt
gamedata/civ_str.txt
pictures/*-diploflag.tga
- changed diplomat_photo to diplomat_flag to map to civ_str.txt

kept diplomat photo for reference incase people want to change back
pictures/upc052.TGA
- added Maqs new capitol Star


pictures/upc053-56.TGA
- flipped the smooth borders so it looks better


pictures/upc113.tga
- fixed extra flags (nazi, confederate, etc)


layouts/diplomacywindow.ldl
layouts/dipwizard.ldl
pictures/640Lborder.tga
pictures/640Rborder.tga
- resized dipwizard to fit on screen better
- added diplomat flags that match unit flags
- added new screen border graphic to clean up



U trunk/ctp2_code/ctp/civctp.dsp
U trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gs/database/profileDB.cpp
U trunk/ctp2_code/gs/database/profileDB.h
U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/barbarians.cpp
U trunk/ctp2_code/gs/gameobj/citydata.h
U trunk/ctp2_code/gs/newdb/religion.cdb
U trunk/ctp2_code/ui/interface/UnitControlPanel.cpp
U trunk/ctp2_code/ui/interface/controlpanelwindow.cpp
U trunk/ctp2_code/ui/interface/scenarioeditor.cpp
U trunk/ctp2_code/ui/interface/scenarioeditor.h
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U trunk/ctp2_data/default/gamedata/civilisation.txt
A trunk/ctp2_data/default/graphics/pictures/640Lborder.tga
A trunk/ctp2_data/default/graphics/pictures/640Rborder.tga
A trunk/ctp2_data/default/graphics/pictures/Assyria2-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/Rome-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/US-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/aborigine-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/arab-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/argentina-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/assyria-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/australia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/austria-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/aztec-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/babylon2-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/bantu-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/barbarian-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/brazil-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/byzantine-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/canada-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/carthage-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/celt-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/china-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/confederate-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/cuba-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/dutch-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/egypt-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/eithiopia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/england-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/etruscan-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/eu-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/frame1.tga
A trunk/ctp2_data/default/graphics/pictures/france-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/freecali2-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/german-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/greece-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/hittite-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/india-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/indonesia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/iran-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/iraq-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/ireland-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/israel-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/italy-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/jamaica-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/japan-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/khmer-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/korea-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/lebanon-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/macedonia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/mali-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/maya-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/mexico-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/minoan-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/mongol-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/nativeamerican-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/nicaragua-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/nigeria-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/norway-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/nubia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/peru-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/poland-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/polynesia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/portugal-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/romanov-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/russia-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/scottish-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/soviet-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/spain-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/sweden-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/taiwan-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/thai-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/turkey-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/uk-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/ukraine-diploflag.tga
U trunk/ctp2_data/default/graphics/pictures/upc052.TGA
U trunk/ctp2_data/default/graphics/pictures/upc053.TGA
U trunk/ctp2_data/default/graphics/pictures/upc054.TGA
U trunk/ctp2_data/default/graphics/pictures/upc055.TGA
U trunk/ctp2_data/default/graphics/pictures/upc056.TGA
U trunk/ctp2_data/default/graphics/pictures/upc092.tga
U trunk/ctp2_data/default/graphics/pictures/upc113.tga
U trunk/ctp2_data/default/graphics/pictures/upc128.tga
U trunk/ctp2_data/default/graphics/pictures/upc130.tga
U trunk/ctp2_data/default/graphics/pictures/upc135.tga
A trunk/ctp2_data/default/graphics/pictures/upc138.tga
A trunk/ctp2_data/default/graphics/pictures/upc139.tga
A trunk/ctp2_data/default/graphics/pictures/upc140.tga
A trunk/ctp2_data/default/graphics/pictures/upc141.tga
A trunk/ctp2_data/default/graphics/pictures/upc142.tga
A trunk/ctp2_data/default/graphics/pictures/upc143.tga
A trunk/ctp2_data/default/graphics/pictures/upc144.tga
A trunk/ctp2_data/default/graphics/pictures/upc145.tga
A trunk/ctp2_data/default/graphics/pictures/upc146.tga
A trunk/ctp2_data/default/graphics/pictures/upc147.tga
A trunk/ctp2_data/default/graphics/pictures/upc148.tga
A trunk/ctp2_data/default/graphics/pictures/upc149.tga
A trunk/ctp2_data/default/graphics/pictures/upc150.tga
A trunk/ctp2_data/default/graphics/pictures/welsh-diploflag.tga
A trunk/ctp2_data/default/graphics/pictures/zimbabwe-diploflag.tga
U trunk/ctp2_data/english/gamedata/civ_str.txt
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/diplomacywindow.ldl
U trunk/ctp2_data/english/uidata/layouts/dipwizard.ldl
U trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/french/gamedata/civ_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
A trunk/ctp2_data/french/uidata/layouts/diplomacywindow.ldl
U trunk/ctp2_data/french/uidata/layouts/dipwizard.ldl
U trunk/ctp2_data/german/gamedata/civ_str.txt
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/diplomacywindow.ldl
U trunk/ctp2_data/german/uidata/layouts/dipwizard.ldl
U trunk/ctp2_data/italian/gamedata/civ_str.txt
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/diplomacywindow.ldl
U trunk/ctp2_data/italian/uidata/layouts/dipwizard.ldl
U trunk/ctp2_data/spanish/gamedata/civ_str.txt
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/diplomacywindow.ldl
U trunk/ctp2_data/spanish/uidata/layouts/dipwizard.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

Received on Tue Apr 10 20:53:24 2007

[Fromafar]

revision 720

http://ctp2.darkdust.net/archives/ctp2-commit/0704/0710.html

lynux commit


Revision 721
Removed failing new standardisation (does not really work and causes Asserts with MSVC6).
Modified: ctp2_code\ctp\civ3_main.cpp

Corrected population decrease.
Modified: ctp2_code\gs\gameobj\CityData.cpp

Removed update option from advanced settings.
Modified: ctp2_code\gs\database\profileDB.cpp

Revisited the Disband code to prevent Asserts.
Modified: ctp2_code\gs\gameobj\ArmyData.cpp

BOOL/sint32 to bool conversions and other small cleanups.
Modified: ctp2_code\gs\gameobj\Civilisation.h
Modified: ctp2_code\gs\gameobj\CivilisationData.cpp
Modified: ctp2_code\gs\gameobj\CivilisationData.h
Modified: ctp2_code\gs\newdb\CTPDatabase.cpp
Modified: ctp2_code\gs\newdb\CTPDatabase.h
Modified: ctp2_code\gs\world\World.h
Modified: ctp2_code\gs\world\WrldCont.cpp
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\ui\aui_common\aui_surface.cpp
Modified: ctp2_code\ui\interface\greatlibrary.cpp
Modified: ctp2_code\ui\interface\greatlibrary.h
Modified: ctp2_code\ui\interface\scorewarn.cpp
Modified: ctp2_code\ui\netshell\allinonewindow.cpp
Modified: ctp2_code\ui\netshell\netfunc.cpp
Modified: ctp2_code\ui\netshell\netfunc.h
Modified: ctp2_code\ui\netshell\netshell.cpp
Modified: ctp2_code\ui\netshell\netshell.h

[Martin Gühmann]

Revision 722 Made the game compile again and standardized has war with check

Cleaned files:
modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/ui/netshell/ns_gamesetup.cpp

Made the game to compile again:
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/utility/MapFile.cpp
modified trunk/ctp2_code/gs/world/WrlEnv.cpp
modified trunk/ctp2_code/net/general/net_message.cpp
modified trunk/ctp2_code/net/general/net_message.h
modified trunk/ctp2_code/net/general/network.cpp
modified trunk/ctp2_code/net/general/network.h

Standardized has war check; as Barbarian leader you cannot declare war from the diplomanager anymore:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/ui/interface/diplomacywindow.cpp

[Martin Gühmann]

Revision 723 Partial string order synchronization and improved Alexander scenario compatibility

Partial string order (re)synchronization:
modified trunk/ctp2_data/english/gamedata/civ_str.txt
modified trunk/ctp2_data/english/gamedata/feat_str.txt
modified trunk/ctp2_data/english/gamedata/gl_str.txt
modified trunk/ctp2_data/english/gamedata/info_str.txt
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/civ_str.txt
modified trunk/ctp2_data/french/gamedata/feat_str.txt
modified trunk/ctp2_data/french/gamedata/gl_str.txt
modified trunk/ctp2_data/french/gamedata/Info_str.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/civ_str.txt
modified trunk/ctp2_data/german/gamedata/feat_str.txt
modified trunk/ctp2_data/german/gamedata/gl_str.txt
modified trunk/ctp2_data/german/gamedata/info_str.txt
modified trunk/ctp2_data/italian/gamedata/add_str.txt
modified trunk/ctp2_data/italian/gamedata/civ_str.txt
modified trunk/ctp2_data/italian/gamedata/feat_str.txt
modified trunk/ctp2_data/italian/gamedata/gl_str.txt
modified trunk/ctp2_data/italian/gamedata/info_str.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/civ_str.txt
modified trunk/ctp2_data/spanish/gamedata/feat_str.txt
modified trunk/ctp2_data/spanish/gamedata/gl_str.txt
modified trunk/ctp2_data/spanish/gamedata/info_str.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/english/gamedata/scen_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/german/gamedata/scen_str.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/italian/gamedata/scen_str.txt

Improved Alexander scenario compatibility. Now the Alexander scenario uses the improved default startegies.txt and the tileimps have a creation sound:
deleted trunk/Scenarios/AlexanderTheGreat/scen0000/default/aidata/Goals.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/default/aidata/personalities.txt
deleted trunk/Scenarios/AlexanderTheGreat/scen0000/default/aidata/strategies.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/default/aidata/UnitBuildLists.txt
deleted trunk/Scenarios/AlexanderTheGreat/scen0000/default/gamedata/goods.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/default/gamedata/tileimp.txt
modified trunk/Scenarios/AlexanderTheGreat/scen0000/default/gamedata/uniticon.txt

[Martin Gühmann]

Revision 725 Restored some scenario compatibility and added some fixes for the Great Library:

Some BOOL to bool conversion:
modified trunk/ctp2_code/ui/interface/greatlibrary.h
modified trunk/ctp2_code/ui/interface/screenutils.cpp
modified trunk/ctp2_code/ui/interface/screenutils.h
modified trunk/ctp2_code/ui/interface/ShortcutPad.cpp

Restored scenario loadabilities. The Seven Samurai scenario should be playable without any problems. However the Nuclear Entente scenario may have some problems, since it comes with a lot of assertion failures on startup:
modified trunk/ctp2_data/default/aidata/unitbuildlists.txt
modified trunk/Scenarios/MagnificentSamurai/scen0000/default/aidata/strategies.txt
added trunk/Scenarios/MagnificentSamurai/scen0000/default/gamedata/goods.txt
modified trunk/Scenarios/MagnificentSamurai/scen0000/default/gamedata/uniticon.txt
modified trunk/Scenarios/NuclearDetente/scen0000/default/aidata/strategies.txt
modified trunk/Scenarios/NuclearDetente/scen0000/default/gamedata/uniticon.txt

Clicking on the terrain database item list will lead you to the clicked item:
modified trunk/ctp2_code/ui/interface/greatlibrarywindow.cpp

Search does not find items anymore that are supposed to be hidden in the Great Library:
modified trunk/ctp2_code/ui/interface/greatlibrary.cpp

[Ekmek]

Revision 726
ConstDB
CityData
- Added MAX_CITY_WONDERS and check to limit how many you can Build
- Added MAX_CITY_BUILDINGS and check to limit how many you can Build

ProfileDB
CityEvent
CityData
- Added CityLeavesRuins option

ArmyData
- Added Kill-Create method to upgrade until settype works

terrainutil
TerrainImprovement.cdb
- (finally) implemented NeedsIrrigation
- added HasIrrigation /ISIrrigation
- added NextToCity Check
- added IsUrban check
- added IsWonder and functionality to build wonder once

Readiness
spnewgamerulesscreen.cpp
spnewgamepopups.ldl
- implemented rulesoption for NoProductionDeficit
- implemented rules for GoldHunger

wonder.cdb
Player.cpp
- added BuildingEffectEverywhere works like BuildingEverywhere

radarmap.cpp
- added note about making te map tiles change to a player color like civ3

scenarioeditor.cpp
scenarioeditor.ldl
- added DebugAI button

Graphics
- Updated flag graphics

GreatLibrary
- added longbow entry
- added upgrade entry
- other fixes by cap

spnewgamerulesscreen.cpp
spnewgamepopups.ldl
- implemented new options
- GoldPerUnitSupport
- GoldPerCity
- NoAIGoldDEficit
- NoAIProductionDeficit
- NoAIGoldHunger
- NoAIShieldHunger
- TODO upgrade as an option?

gamedata
- added tileimp ruins (only access with ruins profile option)
- added GoldHunger values (only in use with rules option)
- Changed BuildingEverywhere to ActualBuildingEverywhere since everyone thinks the original way is a bug.

AE_Mod
- added CTP1 sprites for future use

updated readme

[Ekmek]

Revision 727

language/gamedata/ldl_str.txt
- restored three messages that somehow went missing in r723


default/gamedata/Units.txt
- made cargo helicopters carry small
-changed tank to be size medium
-put outcommented notes that the catamaran should carry more and move farther

U trunk/ctp2_data/default/gamedata/Units.txt
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt

[Martin Gühmann]

Revision 730 Simplified code a little bit and removed E's last bug "fixing" attempts

Fixed some typos and added a missing path:
modified/trunk/Apolyton CTP2 Source Code_Readme.txt

Cleaned the files a little bit and simplified code:
modified/trunk/ctp2_code/ai/strategy/agents/ctpagent.cpp
modified/trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
modified/trunk/ctp2_code/gs/gameobj/CityData.cpp
modified/trunk/ctp2_code/gs/gameobj/player.h
modified/trunk/ctp2_code/gs/gameobj/terrainutil.cpp
modified/trunk/ctp2_code/gs/slic/slicfunc.cpp
modified/trunk/ctp2_code/gs/slic/slicobject.cpp

Fixed some typos introduced by its last revision:
modified/trunk/ctp2_data/english/gamedata/Great_Library.txt

Removed some duplicated string messages and E if you want to know were those strings are gone you can use TortouseMerge which opens if you double click on the file from the log file list in TortoiseSVN or you can use the search feature of windows:
modified/trunk/ctp2_data/english/gamedata/ldl_str.txt
modified/trunk/ctp2_data/french/gamedata/ldl_str.txt
modified/trunk/ctp2_data/german/gamedata/ldl_str.txt
modified/trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified/trunk/ctp2_data/spanish/gamedata/ldl_str.txt

Made sure that the upgrade code does not crash:
modified/trunk/ctp2_code/gs/gameobj/ArmyData.cpp

Actually E, if I remember correctly I told you that something like that does not work:

SomeClass::SomeMethod()
{
    this->Suicide();
    this->LetUsDoSomething();
}

This code will crash, do not use it. If you really have to fix a bug then do not make it crash and fix it or leave it alone.

-Martin

[Ekmek]

Originally posted by Martin Gühmann
Removed some duplicated string messages and E if you want to know were those strings are gone you can use TortouseMerge which opens if you double click on the file from the log file list in TortoiseSVN or you can use the search feature of windows:

Martin,

I don't think they are duplicated. I added those back because I would get a load error when they were absent. I have added your files back (the r730 ones) and I get the same slic star up error where it cant find these strings. You don't get these?