PROJECT: Revision Reports

[Martin Gühmann]

Originally posted by E
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?

I don't get any slic errors. And I checked the English files in respect of my changes they are identical. So the needed strings are all there.

So what kind of slic error do you get.

And by the way this thread is about revision reports and not about bug descussions. And actually in that thread there is a post by me that would have been a good point to continue.

-Martin

[kaan]

Re: PROJECT: Revision Reports

Originally posted by Martin Gühmann

1. Checking out the repository

First before you can check out the repository you need to ask Klaus for an account on the server, he needs a username and a password from you and you have to state that you agree to comply with the Activision license. You can use PM or email: klaus (the_odd_a_with_the_cycle_around) kaan (the_dot) dk
...

I. The URL of the repository, which in our case is:
svn://ctp2.kaan.dk/ctp2/trunk

...

-Martin

Hi all

I thought you might want to update these

I just got an email requesting access to the source and that is really a shame for the poor guy.

Have fun
-klaus

[Ekmek]

Revision 731

Added all English ldl Layouts

A trunk/ctp2_data/english/uidata/layouts/ChatWindow.ldl
A trunk/ctp2_data/english/uidata/layouts/Copy of scenarioeditor.ldl
A trunk/ctp2_data/english/uidata/layouts/DiplomacyDetails.ldl
A trunk/ctp2_data/english/uidata/layouts/SpriteEditor.ldl
A trunk/ctp2_data/english/uidata/layouts/advancespad.ldl
A trunk/ctp2_data/english/uidata/layouts/aipad.ldl
A trunk/ctp2_data/english/uidata/layouts/ancient.ldl
A trunk/ctp2_data/english/uidata/layouts/attract.ldl
A trunk/ctp2_data/english/uidata/layouts/buttonbank.ldl
A trunk/ctp2_data/english/uidata/layouts/c3utilitydialog.ldl
A trunk/ctp2_data/english/uidata/layouts/ce_screen.ldl
A trunk/ctp2_data/english/uidata/layouts/cityespionage.ldl
A trunk/ctp2_data/english/uidata/layouts/citymanager.ldl
A trunk/ctp2_data/english/uidata/layouts/citypad.ldl
A trunk/ctp2_data/english/uidata/layouts/cityview.ldl
A trunk/ctp2_data/english/uidata/layouts/creditsscreen.ldl
A trunk/ctp2_data/english/uidata/layouts/custommap.ldl
A trunk/ctp2_data/english/uidata/layouts/cutnpastepad.ldl
A trunk/ctp2_data/english/uidata/layouts/cvscreen.ldl
A trunk/ctp2_data/english/uidata/layouts/diplomacy.ldl
A trunk/ctp2_data/english/uidata/layouts/endgame.ldl
A trunk/ctp2_data/english/uidata/layouts/fancy.ldl
A trunk/ctp2_data/english/uidata/layouts/fliwindow.ldl
A trunk/ctp2_data/english/uidata/layouts/font1.ldl
A trunk/ctp2_data/english/uidata/layouts/font2.ldl
A trunk/ctp2_data/english/uidata/layouts/font3.ldl
A trunk/ctp2_data/english/uidata/layouts/font4.ldl
A trunk/ctp2_data/english/uidata/layouts/font5.ldl
A trunk/ctp2_data/english/uidata/layouts/font6.ldl
A trunk/ctp2_data/english/uidata/layouts/greatlibrary.ldl
A trunk/ctp2_data/english/uidata/layouts/happystatus.ldl
A trunk/ctp2_data/english/uidata/layouts/helppopup.ldl
A trunk/ctp2_data/english/uidata/layouts/helptile.ldl
A trunk/ctp2_data/english/uidata/layouts/hotseatlist.ldl
A trunk/ctp2_data/english/uidata/layouts/infoscreen.ldl
A trunk/ctp2_data/english/uidata/layouts/intromovie.ldl
A trunk/ctp2_data/english/uidata/layouts/loadsave.ldl
A trunk/ctp2_data/english/uidata/layouts/messagebox.ldl
A trunk/ctp2_data/english/uidata/layouts/musicscreen.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_chglobby.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_editplyr.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_joingame.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_launch.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_lobby.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_selcnct.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_selplyr.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_selserv.ldl
A trunk/ctp2_data/english/uidata/layouts/ns_template.ldl
A trunk/ctp2_data/english/uidata/layouts/objectpad.ldl
A trunk/ctp2_data/english/uidata/layouts/options.ldl
A trunk/ctp2_data/english/uidata/layouts/playerpad.ldl
A trunk/ctp2_data/english/uidata/layouts/pointspad.ldl
A trunk/ctp2_data/english/uidata/layouts/pollutionpad.ldl
A trunk/ctp2_data/english/uidata/layouts/profileedit.ldl
A trunk/ctp2_data/english/uidata/layouts/queuewin.ldl
A trunk/ctp2_data/english/uidata/layouts/scenario.ldl
A trunk/ctp2_data/english/uidata/layouts/sciencevictory.ldl
A trunk/ctp2_data/english/uidata/layouts/segmentlist.ldl
A trunk/ctp2_data/english/uidata/layouts/sound.ldl
A trunk/ctp2_data/english/uidata/layouts/sourcelist.ldl
A trunk/ctp2_data/english/uidata/layouts/statswindow.ldl
A trunk/ctp2_data/english/uidata/layouts/throneroom.ldl
A trunk/ctp2_data/english/uidata/layouts/tilepad.ldl
A trunk/ctp2_data/english/uidata/layouts/toolbar.ldl
A trunk/ctp2_data/english/uidata/layouts/trademanager.ldl
A trunk/ctp2_data/english/uidata/layouts/tradescreen.ldl
A trunk/ctp2_data/english/uidata/layouts/tutorialwin.ldl
A trunk/ctp2_data/english/uidata/layouts/unitmanager.ldl
A trunk/ctp2_data/english/uidata/layouts/unitpad.ldl
A trunk/ctp2_data/english/uidata/layouts/unitstatus.ldl
A trunk/ctp2_data/english/uidata/layouts/victorymovie.ldl
A trunk/ctp2_data/english/uidata/layouts/victoryscreen.ldl
A trunk/ctp2_data/english/uidata/layouts/watchlist.ldl
A trunk/ctp2_data/english/uidata/layouts/wondermovie.ldl

[Ekmek]

Revision 732

barbarians.cpp
- add out comment for possible use of random feats to be used as disasters or events


profileDB.cpp
Happy.cpp
spnewgamepopups.ldl
spnewgamerulesscreen.cpp
ldl_str.txt
- added NoCityLimit


added NoAICityLimit
Player
wonder.cdb
- Added ProhibitSlavers check - splitting the FreeSlaves flag


Player.cpp
FeatTracker.cpp
wonderutil.cpp
- Addned PlayerHasFeat method


Added check NeedsAnyPlayerFeatToBuild (add more checks later)
CityData.cpp
- disabled wonder and building max

There is some problem I'm not understanding about variables being initialized

U trunk/ctp2_code/gs/database/ConstDB.cpp
U trunk/ctp2_code/gs/database/profileDB.cpp
U trunk/ctp2_code/gs/database/profileDB.h
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/FeatTracker.cpp
U trunk/ctp2_code/gs/gameobj/FeatTracker.h
U trunk/ctp2_code/gs/gameobj/Happy.cpp
U trunk/ctp2_code/gs/gameobj/Player.cpp
U trunk/ctp2_code/gs/gameobj/barbarians.cpp
U trunk/ctp2_code/gs/gameobj/wonderutil.cpp
U trunk/ctp2_code/gs/gameobj/wonderutil.h
U trunk/ctp2_code/gs/newdb/building.cdb
U trunk/ctp2_code/gs/newdb/unit.cdb
U trunk/ctp2_code/gs/newdb/wonder.cdb
U trunk/ctp2_code/gs/outcom/C3Wonder.cpp
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 733 The upgrade option now selects the best unit type and updates the army move type.

Some white space cleaning:
modified trunk/ctp2_code/ui/interface/UnitControlPanel.cpp

Made the upgrade option in the debug version from the advanced options menu available again. ToDo: Move this to the scenario editor:
modified trunk/ctp2_code/gs/database/profileDB.cpp

Made some of E's work like removing outcommented code and fixing the indentiation. And the Upgrade method now updates the army move type after unit upgrading. This now allows now tranporters upgraded from shallow sea ships to enter deep water without regrouping it:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h

Added some ToDo comments for E:
modified trunk/ctp2_code/gs/gameobj/armyevent.cpp

Prevented some endless loops from execution and added some ToDo comments for E:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Modified the upgrade unit type selection so that now the best unit type for upgrade is selected base on unit cargo capacity or unit statistics like attack, defense and range attack, and of course based on whether the unit is available:
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/gameobj/unitutil.cpp
modified trunk/ctp2_code/gs/gameobj/unitutil.h

[Martin Gühmann]

Revision 734Only the active tab of the information window is redrawn:

Some white space cleanings:
modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gs/gameobj/Army.cpp
modified trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb

Moved the WonderTab to the InformationDialog folder:
modified trunk/ctp2_code/ctp/civctp.dsp

Added some comments for E:
modified trunk/doc/user/playtest/Apolyton_README.txt

Only the active tab of the information window is redrawn:
modified trunk/ctp2_code/ui/interface/rankingtab.cpp
modified trunk/ctp2_code/ui/interface/WonderTab.cpp

[Ekmek]

Revision 735


spritesys/UnitActor.cpp
- outcommented drawCityimprovements due to crash


gameobj/CityData.cpp
- outcommented Barbarians not building wonders
- fixed MaxCityWonders
- fixed MaxCityBuildings
- Outcommented SectarianHappiness

gameobj/Happy.cpp
- outcommented SectarianHappiness

gameobj/terrainutil.cpp
- outcommented barbarians not building tileimps

newdb/wonder.cdb
gamedata/Wonder.txt
- add ProhibitSlavers to database
- added ProhibitSlavers to EmancipationAct to maintain functionality

layouts/spnewgamepopups.ldl
- fixed empty button

interface/UnitControlPanel.cpp
- outcomments for future listbox for order buttons


Scenarios/AE_Mod/
- added Maquiladora's changes to the AE_Mod
more changes may be posted n the forums

updated readme

A trunk/Scenarios/AE_Mod/ae_mod_readme.txt
U trunk/Scenarios/AE_Mod/packlist.txt
A trunk/Scenarios/AE_Mod/scen0000/default/aidata/AdvanceLists.txt
U trunk/Scenarios/AE_Mod/scen0000/default/aidata/UnitBuildLists.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Advance.txt
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Const.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Units.txt
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/Wonder.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/buildings.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/newsprite.txt
A trunk/Scenarios/AE_Mod/scen0000/default/gamedata/risks.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/terrain.txt
U trunk/Scenarios/AE_Mod/scen0000/default/gamedata/uniticon.txt
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/CM2_Upap001l.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058A.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058B.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP058L.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115A.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115B.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP115L.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119A.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119B.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP119L.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70A.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70B.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/UPUP70L.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/infantrytactics.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/pictures/plasmaengineering.tga
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/sprites/GU119.spr
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/sprites/GU70.SPR
A trunk/Scenarios/AE_Mod/scen0000/default/graphics/sprites/Gu115.spr
U trunk/Scenarios/AE_Mod/scen0000/english/gamedata/Great_Library.txt
U trunk/Scenarios/AE_Mod/scen0000/english/gamedata/gl_str.txt
U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/Happy.cpp
U trunk/ctp2_code/gs/gameobj/terrainutil.cpp
U trunk/ctp2_code/gs/newdb/wonder.cdb
U trunk/ctp2_code/ui/interface/UnitControlPanel.cpp
U trunk/ctp2_data/default/gamedata/Wonder.txt
U trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 738 Some little things and a lot of annotations of the readme

Fixed some whitespace and unnecessary comments:
ctp2_code/gfx/spritesys/UnitActor.cpp
ctp2_code/gs/gameobj/buildingutil.h
ctp2_code/gs/gameobj/terrainutil.cpp

Added a comment about that copied flag:
ctp2_code/gs/newdb/wonder.cdb

Outcommented some unfinished code and added some todos about it.
ctp2_code/gs/gameobj/CityData.cpp

Added a lot of anotations for E:
doc/user/playtest/Apolyton_README.txt

[Martin Gühmann]

Revision 739 Some cleanings and some BOOL to bool replacement

Some cleanings:
modified trunk/ctp2_code/gs/slic/SlicStruct.h
modified trunk/ctp2_code/gs/utility/stringutils.h
modified trunk/ctp2_data/default/gamedata/script.slc

BOOL to bool replacement:
modified trunk/ctp2_code/robot/pathing/astar.cpp
modified trunk/ctp2_code/robot/pathing/Astar.h
modified trunk/ctp2_code/robot/pathing/AVLHeap.cpp
modified trunk/ctp2_code/robot/pathing/AVLHeap.h
modified trunk/ctp2_code/robot/pathing/CityAstar.h
modified trunk/ctp2_code/robot/pathing/Path.cpp
modified trunk/ctp2_code/robot/pathing/Path.h
modified trunk/ctp2_code/robot/pathing/robotastar2.h
modified trunk/ctp2_code/robot/pathing/TradeAstar.cpp
modified trunk/ctp2_code/robot/pathing/TradeAstar.h
modified trunk/ctp2_code/robot/pathing/unitastar.cpp
modified trunk/ctp2_code/robot/pathing/UnitAstar.h
modified trunk/ctp2_code/ui/aui_ctp2/SelItem.cpp
modified trunk/ctp2_code/ui/aui_ctp2/SelItem.h

[Martin Gühmann]

Revision 740

Fixed the Great Library item research message: The correct item is now reported when you select something you want to research:
modified trunk/ctp2_code/ui/interface/greatlibrary.cpp

[Ekmek]

Revision 741

mostly clean ups, still need to do the wonder max.

ArmyData.cpp
ArmyData.h
CityData.cpp
citydata.h
- Cleaned BeginTurn method by creating methods
- made SlicObjects Execute

Unit.cpp
Unit.h
UnitData.cpp
- moved harvest from ArmyData here
- executed SlicObjects

Player.cpp
player.h
Advances.cpp
- Changed City Maintenance and GoldHunger to separte methods
- moved them to CalcWonderGold because this is the only place where it works (for now)
- added outcomment to advances calculation until I figure out gold handling

[Ekmek]

Revision 742

CityData.cpp
- MaxCityWonders and MaxCityBuildings appears to be woking now (I outcommented how I tested it)

[Ekmek]

Revision 743

database/ConstDB.cpp
database/ConstDB.h
Const.txt
armyevent.cpp
- Added CombatEliteChance
- Added CombatLeaderChance

Unit.cpp
Unit.h
UnitData.cpp
UnitData.h
- Added Elite Flag
- Added Elite Unit modifiers
- Added Leader Unit Modifiers

CityData.cpp
citydata.h
- added DestroyOnePerCiv
- Added IsReligious
- Added HasReligionIcon

world/cellunitlist.cpp
- added outcoment for future impassable terrain Flag

government.cdb
wonder.cdb
- added FU flag to modify city riot level for govt

building.cdb
bldque.cpp
buildingutil.cpp
buildingutil.h
- added EnablesAllVeterans code
- added EnablesSeaVeterans code
- added EnablesAirVeterans code
- added EnablesLandVeterans code

unit.cdb
- added Army bonuses for future leader unit different bonuses

script.slc
info_str.txt
- added slic messages for riot casulaties, leader spawn, elite promotion

updated readme

[Ekmek]

Revision 744

UnitActor.cpp
UnitActor.h
- Added DrawIndicators method to draw civ flags and veteran and army icons
- moved stacking indicator (numbered flag) to be above the health bar

tileset.h
- added MAPICON_ELITE
Not sure why the game doesn't check concepticon.txt instead of tileset.h though (Martin?)

ArmyData.cpp
ArmyData.h
- added HasElite method to identify an elite in the stack

Player.cpp
player.h
- added CanBuildLeader method so leader units will have the cantbuild flag but still can appear

building.cdb
- some Cleanup

tiledraw.cpp
- my religion icons aren't appear so i did some changes but still working it

concepticon.txt
elitemedal.tga
- added MAPICON_ELITE

updated readme

[Martin Gühmann]

Revision 745 Some bug fixing, fixed unit messages and made the sink code save

Some Cleanings:
modified trunk/ctp2_data/default/gamedata/script.slc
modified trunk/ctp2_code/gs/newdb/building.cdb
modified trunk/ctp2_code/gs/gameobj/ArmyData.h

Added some todos for E:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Some cleanings, added some todos for E, fixed slic messages so that they now use unitrecords instead of units, units with launch pollution will now pollute the environment with their launch pollution amount instead of just one pollution point and BeginTurn will return when all units in an army are sunken.
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp

No unit related message now uses the unit builtin but insteat of it the unitrecord built in, plus some translations for the German version:
modified trunk/ctp2_data/english/gamedata/info_str.txt
modified trunk/ctp2_data/french/gamedata/Info_str.txt
modified trunk/ctp2_data/german/gamedata/info_str.txt
modified trunk/ctp2_data/italian/gamedata/info_str.txt
modified trunk/ctp2_data/spanish/gamedata/info_str.txt