PROJECT: Revision Reports

[J Bytheway]

Some more work on linux keyboard support:

Revision 502 (branches/linux)

Changed paths:
M /branches/linux/BUGS
M /branches/linux/ctp2_code/ctp/civ3_main.cpp
M /branches/linux/ctp2_code/os/linux/civctp2.kdevelop
M /branches/linux/ctp2_code/ui/aui_ctp2/keypress.cpp
M /branches/linux/ctp2_code/ui/aui_ctp2/keypress.h
M /branches/linux/ctp2_code/ui/interface/km_screen.cpp
M /branches/linux/ctp2_code/ui/interface/km_screen.h

- Got keyboard input working for game controls (e.g. settling), but not
interface controls (e.g. typing a name into a text box)
- There are probably still some problems with input on a non-British keyboard
- Changed some cryptic 8s to clearer '\b's

[Fromafar]

Revision 503 (trunk)
Updated zlib (1.2.3) and tiff (3.7.3) libraries.

Modified: Makefile
Added: ctp2_code/ctp/jpeg62.dll
Added: ctp2_code/ctp/libtiff3.dll
Added: ctp2_code/ctp/zlib1.dll
Modified: ctp2_code/libs/tiff
Modified: ctp2_code/libs/zlib

[Fromafar]

Revision 504 (trunk)

CityData: Corrected building maintenance deficit spending handling.
BldQue: Improved handling of multiple build queue actions in a turn.
Rest: casts, type corrections, and scope corrections (no functional changes).

E: can you have a look at the TODO remarks in CityData.cpp? I am not sure that your modifications really do what you want.

[Ekmek]

Not sure if Kaan has cut off the server so I'm posting a zip (if it comes back on I'll do the commit). Also

1) I notice that since I added sneakbombard the screen flickers, whats with that?

2) Thanks Fromafar, I'll go through the citdata part of the code next.



Revision 505 (trunk)



\ctp2_code\ai\diplomacy\regardevent.cpp - added sneakattack, but it doesnt work for defender
\ctp2_code\gs\gameobj\ArmyData.cpp - added sneakbombard so you can bombard without war declared
\ctp2_code\gs\gameobj\citydata.cpp (CONFLICTED) not updated
\ctp2_code\gs\gameobj\cityevent.cpp - added notes for visible wonder (just stick to slic for now)
\ctp2_code\gs\gameobj\player.cpp - In ::SETTLE left outcomments where I attempted to have a settler add to a city, the adding pop worked but wouldnt remove the settler
\ctp2_code\gs\gameobj\terrainutil.cpp - outcomment my Colony attempt, will work later
\ctp2_code\gs\gameobj\unitdata.cpp - added new combat modifiers based on mounted and woodship bonus (see unit.cdb for flags)
ctp2_code\gs\newdb\civilisation.cdb - I dont see any changes but the log said it was (it does compile)
ctp2_code\gs\newdb\terrain.cdb - says modified but i dont see any changes (must of saved)
ctp2_code\gs\newdb\terrimprove.cdb - colony was added
ctp2_code\gs\newdb\unit.cdb - added new combat modifier flags used by unitdata.cpp
IsFoot,Is
BonusAgainstFoot, BonusAgainstSiege, BonusAgainstWheeled, BonusAgainstMechanized, BonusAgainstHelicopter,
BonusAgainstGuerrilla, BonusAgainstSpecialForces,
BonusAgainstSubmarine, AttackFootBonus,
AttackMountedBonus, AttackSiegeBonus,
AttackWheeledBonus, AttackMechanizedBonus,
AttackHelicopterBonus, AttackSpecialForcesBonus,
AttackCivilianBonus, AttackGuerrillaBonus, and SneakBombard
ctp2_code\gs\newdb\religion.cdb - added but not part of the newdb yet

[Martin Gühmann]

Originally posted by E
\ctp2_code\gs\gameobj\citydata.cpp (CONFLICTED) not updated

And you didn't use the conflict editor of TortoiseSVN to resolve the conflict?

-Martin

[ctplinuxfan]

Revision 506
- merge of r435 from /trunk to /branches/linux

r509@linux3: holger | 2006-01-03 00:08:02 +0100
r435@ctp2.kaan.dk: Martin G??hmann | 2005-08-06 20:56:05 +0200
Added prepartions for redesigning how the resources are computed. Fixed a bug
about adding the gold income twice in CityData and removed unecessary and unfini
shed methods in CityData and renamed members in CityData for clearity:
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h
modified ctp2_code/gs/gameobj/unitutil.cpp
modified ctp2_code/gs/gameobj/unitutil.h

Modified to match with the methods removal in CityData:
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/outcom/C3Player.cpp

Updated to match with the renamed members in CityData:
modified ctp2_code/net/general/net_city.cpp

Cleaned a little bit the syntax:
modified ctp2_code/gs/gameobj/PlayerTurn.cpp

Updated documentation and cleaned white space:
modified ctp2_code/ai/ctpai.cpp
modified ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
modified ctp2_code/gs/gameobj/TradeRouteData.cpp
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/slic/slicfunc.cpp

[ctplinuxfan]

Revision 507
- merge of r436 from /trunk to /branches/linux

r510@linux3: holger | 2006-01-03 07:55:47 +0100
r436@ctp2.kaan.dk: Martin G??hmann | 2005-08-07 23:45:18 +0200
Domestic control panel shows now the city limit.
modified trunk/ctp2_data/ui/interface/DomesticControlPanel.cpp

The information window (wonder tab, score tab and ranking tab) stays open and
is updated on begin turn of the visible player.
modified trunk/ctp2_data/ui/interface/infowindow.cpp
modified trunk/ctp2_data/ui/interface/infowindow.h
modified trunk/ctp2_data/ui/interface/interfaceevent.cpp
modified trunk/ctp2_data/ui/interface/screenutils.cpp
modified trunk/ctp2_data/ui/interface/screenutils.h

Did more resource calculation replacement preparations:
modified trunk/ctp2_data/gs/gameobj/CityData.cpp
modified trunk/ctp2_data/gs/gameobj/citydata.h

The above and removed unused BeginTurnAllCities method:
modified trunk/ctp2_data/gs/gameobj/Player.cpp
modified trunk/ctp2_data/gs/gameobj/player.h

Opening the score tab of the info window doesn't close other windows anymore l
ike the other tabs:
modified trunk/ctp2_data/ui/aui_ctp2/keypress.cpp

Cleaned files a little bit. Modified comments, white space, added casts.
modified trunk/ctp2_data/ai/diplomacy/Diplomat.h
modified trunk/ctp2_data/ai/diplomacy/sstateevent.cpp
modified trunk/ctp2_data/ctp/civ3_main.cpp
modified trunk/ctp2_data/ctp/civapp.cpp
modified trunk/ctp2_data/ctp/ctp2_utils/c3files.cpp
modified trunk/ctp2_data/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_data/gs/gameobj/CityEvent.cpp
modified trunk/ctp2_data/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_data/gs/gameobj/PlayerTurn.cpp
modified trunk/ctp2_data/gs/gameobj/UnitData.cpp
modified trunk/ctp2_data/ui/aui_common/aui_control.cpp
modified trunk/ctp2_data/ui/interface/controlpanelwindow.cpp
modified trunk/ctp2_data/ui/interface/DomesticControlPanel.h

[ctplinuxfan]

Revision 508
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ui/aui_common/aui_control.cpp

r511@linux3: holger | 2006-01-03 08:41:13 +0100
- gcc compile fix

[Martin Gühmann]

Revision 509 (trunk)

Parsers generated by dbgen can now parse the old DiffDB.txt
modified ctp2_code/gs/dbgen/Datum.cpp
modified ctp2_code/gs/dbgen/dbgen.dsp
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/newdb/CTPDatabase.cpp
modified ctp2_code/gs/newdb/CTPDatabase.h
modified ctp2_code/gs/newdb/DBLexer.cpp
modified ctp2_code/gs/newdb/DBLexer.h

Added new DifficultyDB to the project however, the DifficultyDB must still be replaced.
modified ctp2_code/ctp/civapp.cpp
modified ctp2_code/ctp/civctp.dsp
added ctp2_code/gs/newdb/Difficulty.cdb

Added two new options to the profile database:
- One for allowing end turns while the game is running in the background
- One that is supposed to stop end turns if there is a city with empty build queue, doesn't work yet.
modified ctp2_code/gs/database/profileDB.cpp
modified ctp2_code/gs/database/profileDB.h
modified ctp2_code/ui/aui_ctp2/SelItem.cpp
modified ctp2_data/english/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/ldl_str.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/italian/gamedata/ldl_str.txt
modified ctp2_data/japanese/gamedata/ldl_str.txt
modified ctp2_data/spanish/gamedata/ldl_str.txt

Added a few comments, corrected a return type:
modified ctp2_code/gs/gameobj/player.h
modified ctp2_code/ui/aui_directx/aui_directui.cpp

[Fromafar]

Revision 510 (trunk)

CityAstar.cpp: corrected endless path computation in an AOM game
Rest: added casts, added types, cleaned up (no functional changes)

Modified: ctp2_code\robot\aibackdoor\bit_table.h
Modified: ctp2_code\robot\aibackdoor\dynarr.h
Modified: ctp2_code\robot\aibackdoor\list_array.h
Modified: ctp2_code\robot\aibackdoor\pool.h
Modified: ctp2_code\robot\pathing\CityAstar.cpp
Modified: ctp2_code\robot\pathing\astar.cpp
Modified: ctp2_code\robot\pathing\robotastar2.cpp
Modified: ctp2_code\robot\utility\RandTest.cpp

[ctplinuxfan]

Continued merging from /trunk to /branches/linux

Revision 511
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ai/CityManagement/governor.cpp
M /branches/linux/ctp2_code/ai/CityManagement/governor.h
M /branches/linux/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
M /branches/linux/ctp2_code/gs/gameobj/CityData.cpp
M /branches/linux/ctp2_code/gs/gameobj/Unit.cpp
M /branches/linux/ctp2_code/gs/gameobj/Unit.h
M /branches/linux/ctp2_code/gs/gameobj/UnitData.cpp
M /branches/linux/ctp2_code/gs/gameobj/UnitData.h
M /branches/linux/ctp2_code/gs/gameobj/citydata.h
M /branches/linux/ctp2_code/gs/world/UnseenCell.h
M /branches/linux/ctp2_code/ui/interface/CauseAndEffectTab.cpp
M /branches/linux/ctp2_code/ui/interface/citywindow.cpp

Merge from /trunk to /branches/linux:

r437@ctp2.kaan.dk: Martin G??hmann | 2005-08-13 22:43:52 +0200
Added more code for the new resource calculation, everything is now at place t
o start testing, maybe some new GUI elements first for testing purposes and some
MP updates. Now the new system is just one precompiler derective away.
modified ctp2_code/ai/CityManagement/governor.cpp
modified ctp2_code/ai/CityManagement/governor.h
modified ctp2_code/ui/interface/CauseAndEffectTab.cpp
modified ctp2_code/ui/interface/citywindow.cpp
modified ctp2_code/gs/gameobj/CityData.cpp
modified ctp2_code/gs/gameobj/citydata.h

Cleaned files modification of white space, removed unused methods, added some
comments (minor).
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/world/UnseenCell.h
modified ctp2_code/ctp/ctp2_utils/c3cmdline.cpp

[ctplinuxfan]

Revision 512
Changed paths:
M /branches/linux

Merge from /trunk to /branches/linux
r438@ctp2.kaan.dk: Martin G??hmann | 2005-08-15 18:41:33 +0200
Added gold loss due to conversion and production loss due to franchising to th
e national manager resource tab. Now you can see how much you lose to other empi
res, the amount you loose is displayed in the color of the receiver.
modified ctp2_code/ui/interface/NationalManagementDialog.cpp

Added aditional strings for the new feature, added some tooltips for the third
tab of the national manager, synchronized files.
modified ctp2_data/english/gamedata/tips_str.txt
modified ctp2_data/french/gamedata/tips_str.txt
modified ctp2_data/german/gamedata/tips_str.txt
modified ctp2_data/italian/gamedata/tips_str.txt
modified ctp2_data/spanish/gamedata/tips_str.txt

Moved some strings to tips_str.txt.
modified ctp2_data/english/gamedata/add_str.txt
modified ctp2_data/french/gamedata/add_str.txt
modified ctp2_data/italian/gamedata/add_str.txt
modified ctp2_data/spanish/gamedata/add_str.txt
Replaced some strings in English by French equevalents, fixed a typo in the En
glish version at that occasion.
modified ctp2_data/english/gamedata/info_str.txt
modified ctp2_data/french/gamedata/Info_str.txt

Updated layout files for additional columns in the national manager resource t
ab.
modified ctp2_data/english/uidata/layouts/citystatus.ldl
modified ctp2_data/french/uidata/layouts/citystatus.ldl
modified ctp2_data/german/uidata/layouts/citystatus.ldl
modified ctp2_data/italian/uidata/layouts/citystatus.ldl
modified ctp2_data/japanese/uidata/layouts/citystatus.ldl
modified ctp2_data/spanish/uidata/layouts/citystatus.ldl

Added pics for the new two columns.
added ctp2_data/default/graphics/pictures/upic26.tga
added ctp2_data/default/graphics/pictures/upic27.tga

Did some cleaning, white space, comments cast, while I was touching these file
s in order to make some other modifications that I haven't done yet.
modified ctp2_code/ui/interface/DiplomacyDetails.cpp
modified ctp2_code/ui/interface/diplomacywindow.cpp
modified ctp2_code/ui/interface/dipwizard.cpp
modified ctp2_code/ui/interface/intelligencewindow.cpp

[ctplinuxfan]

Revision 513
Changed paths:
M /branches/linux

Merge from /trunk to /branches/linux

r439@ctp2.kaan.dk: Martin G??hmann | 2005-08-17 00:02:01 +0200
Added a new special attack window, to display the costs of a special attack on
the map:
added ctp2_code/ui/interface/SpecialAttackWindow.cpp
added ctp2_code/ui/interface/SpecialAttackWindow.h

Added the two files above to the project:
modified ctp2_code/ctp/civctp.dsp

Added the new special attack window, and removed three unused functions:
modified ctp2_code/ui/interface/controlpanelwindow.cpp
modified ctp2_code/ui/interface/controlpanelwindow.h

Added left, center and right to textblttype:
modified ctp2_code/ui/aui_common/aui_textbase.cpp
modified ctp2_code/ui/aui_common/aui_textbase.h

Added the construction time display to the tileimp tracker window.
modified ctp2_code/ui/interface/tileimptracker.cpp

Added the construction time display to the tileimp trcaker window and made the
special attack window work:
added ctp2_data/english/uidata/layouts/controlpanel.ldl
added ctp2_data/french/uidata/layouts/controlpanel.ldl
modified ctp2_data/german/uidata/layouts/controlpanel.ldl
modified ctp2_data/italian/uidata/layouts/controlpanel.ldl
added ctp2_data/japanese/uidata/layouts/controlpanel.ldl
modified ctp2_data/spanish/uidata/layouts/controlpanel.ldl

Added a cast:
modified ctp2_code/ui/interface/diplomacywindow.cpp

[ctplinuxfan]

Revision 514
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/ui/interface/SpecialAttackWindow.cpp
M /branches/linux/ctp2_code/ui/interface/tileimptracker.cpp
M /branches/linux/ctp2_data/english/gamedata/ldl_str.txt
M /branches/linux/ctp2_data/french/gamedata/ldl_str.txt
M /branches/linux/ctp2_data/german/gamedata/ldl_str.txt
M /branches/linux/ctp2_data/italian/gamedata/ldl_str.txt
M /branches/linux/ctp2_data/spanish/gamedata/ldl_str.txt

Merge from /trunk to /branches/linux
r440@ctp2.kaan.dk: Martin G??hmann | 2005-08-18 19:30:30 +0200
Special attack window only appears if the order in questions costs gold:
modified ctp2_code/ui/interface/SpecialAttackWindow.cpp

Fixed two asserts due to copy and paste errors:
modified ctp2_code/ui/interface/tileimptracker.cpp

Shortend term Population to Pop. for the national manager, except for the Germ
an version.
modified ctp2_data/english/gamedata/ldl_str.txt
modified ctp2_data/french/gamedata/ldl_str.txt
modified ctp2_data/german/gamedata/ldl_str.txt
modified ctp2_data/italian/gamedata/ldl_str.txt
modified ctp2_data/spanish/gamedata/ldl_str.txt

[ctplinuxfan]

Revision 515
Changed paths:
M /branches/linux
M /branches/linux/ctp2_code/gs/gameobj/TerrImproveData.cpp
M /branches/linux/ctp2_code/gs/gameobj/TerrImprovePool.cpp
M /branches/linux/ctp2_code/gs/world/Cell.cpp
M /branches/linux/ctp2_code/gs/world/WrlEnv.cpp
M /branches/linux/ctp2_code/ui/interface/NationalManagementDialog.cpp

Merge from /trunk to /branches/linux
r441@ctp2.kaan.dk: Fromafar | 2005-08-26 19:15:38 +0200
Crash corrections