PROJECT: Revision Reports

[Ekmek]

Revision 746

ArmyData.cpp
- some cleanups
- added probability to target civilians and precision strike
armyevent.cpp
- cleanups
UnitData.cpp
- cleanups

advance.cdb
- added television flag

citydata.h
CityData.cpp
- made it so cities that have trade routes passing through them (and the owner is neither the source or destination) receives a gold benefit (like pirating, but simulating the silk road and trade crossroads in history). I don't think it will be controversial but it could be an option too.

script.slc
- add eyepoints to messages that involve units (like sink and guerrila spawn)

pictures/byzantine-diploflag.tga
pictures/upc114.tga
- changed the Byzantine flag to the red one from the paleogos. Oriinally I used the yellow Greek Orthodox flag. This is more historical (and I like red better).

[Ekmek]

REvision 747

picture/'religionname'CI.tga
pictures/upc057-64.tga
concepticon.txt
- changed religion icon file names to reiligion names

pictures/elitemedal.tga
pictures/upc057.tga
- changed elitemedal name to the upc057.tga that is hardcoded

ConstDB.cpp
ConstDB.h
Const.txt
- added CITY_ON_TRADE_ROUTE_BONUS so trade passing through the city uses a different value than Piracy
- added CAPTURED_CITY_KILL_POP so it can be mod adjusted on how many are lost in a turn, but it seems that is called in two places so need to test further
- Fxed const.txt it appears that the '#' outcommented the the elite and leader stuff

armyevent.cpp
- added constDB dependence for city capture (further testing needed)
- fixed elite and leader code - had to resequence it since it would do all three, must be leader-elite-then veteran

Player.cpp
- fixed line in CreateLeader had ! for CanBuildLeader that shouldn't be there

UnseenCell.cpp
UnseenCell.h
tiledraw.cpp
- added religion for unseen cell (using one of the unused)
- fixed drawcityspecialicons so religion icons work using the citydata mathods

tradeutil.cpp
trademanager.cpp
- some outcomments

CityData
- future removecapitol code outcomment may need to differentiate depending where i put civilwar code

tiledmap.h
- added elite mapicon

gamedata/script.slc
- removed eyepoint on leader spawn caused an error

pictures/
- removed unneeded files

[Ekmek]

Revision 748

tilesys/tiledraw.cpp
- updated religion display code to work for wonders

CityData.cpp
- added wonder check to bool for religion icons

wonderutil.cpp
- added religion icon bool

pictures/HinduismCI.tga
pictures/IslamCI.tga
- cleaned up pictures/EgyptianCI.tga

pictures/GreekCI.tga
pictures/EgyptianCI.tga
pictures/ZorastrianismCI.tga
- additional religion icons

gamedata/info_str.txt
- fixed slic message

pictures/upc006-upc051.tga
- changed to a block based on maquiladora's design

...never let work get in the way of ctp2...

Revision 749

Player.cpp
- Change SetCapitol to access the RemoveCapitol method


Unit.cpp & h
UnitData.cpp & h
- added RemoveCapitol to reference the DestroyCapitol method in CityData
note: destroy capitol may be FU to have civil war optional code

UnitActor.cpp
- changed handling of stackingindicator it appears doing negative values causes the trasitiontile crash


U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gs/gameobj/Player.cpp
U trunk/ctp2_code/gs/gameobj/Unit.cpp
U trunk/ctp2_code/gs/gameobj/Unit.h
U trunk/ctp2_code/gs/gameobj/UnitData.cpp
U trunk/ctp2_code/gs/gameobj/UnitData.h

[Martin Gühmann]

Originally posted by E
pictures/upc006-upc051.tga
- changed to a block based on maquiladora's design

Well the original stuff looked much better, can't you use the CTP1 shield if you want to change anything at all?

Anyway, let's go back on-topic:

Revision 751 Fixed usage of unowned memory:

Some cleanups:
modified trunk/ctp2_code/gfx/tilesys/BaseTile.cpp
modified trunk/ctp2_code/gfx/tilesys/BaseTile.h
modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledmap.h

Fixed usage of unowned memory:
modified trunk/ctp2_code/gfx/tilesys/tileset.cpp
modified trunk/ctp2_code/gfx/tilesys/tileset.h

[Martin Gühmann]

Revision 753 Some BOOL to bool replacements:

The final batch of BOOL to bool replacement I had in stock. Why I never asked whether TortoiseMerge can compare case insensitive, this way I would have found such TRUE to false replacements much faster.
ctp2_code/robot/pathing/robotastar2.cpp
ctp2_code/robot/pathing/robotastar2.h
ctp2_code/robot/pathing/unitastar.cpp
ctp2_code/robot/pathing/UnitAstar.h

[RichardH]

Revisions 755 and 757
Tried posting this last night, but gave up...

I have started to merge parts of the Linux branch into trunk. In these two revisions I've focused on ctp2_code/ctp/ctp2_utils, which has a lot of important Linux-stuff, but also a fair amount of trivial cross-merging. I've synced up most of the latter, and reduced the diff from 96k in 4044 lines in 18 files (r752), to 54k in 1911 lines in 13 files (r757).

r755 compiled successfully on Windows (thanks to E; I don't have a Windows rig). r757 is slightly more convoluted, but shouldn't have any impact on the Windows build either. Would appreciate feedback.

Files changed in r755:
M /trunk/ctp2_code/ctp/ctp2_utils/AvlTree.h
M /trunk/ctp2_code/ctp/ctp2_utils/appstrings.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/appstrings.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3debug.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3debug.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3errors.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3files.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3math.h
M /trunk/ctp2_code/ctp/ctp2_utils/netconsole.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/pointerlist.h
M /trunk/ctp2_code/ctp/ctp2_utils/tracklen.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/tracklen.h

Files changed in r757:
M /trunk/ctp2_code/ctp/ctp2_utils/AvlTree.h
M /trunk/ctp2_code/ctp/ctp2_utils/appstrings.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3debug.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3debug.h
M /trunk/ctp2_code/ctp/ctp2_utils/c3errors.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3files.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/c3files.h
M /trunk/ctp2_code/ctp/ctp2_utils/netconsole.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/tracklen.cpp
M /trunk/ctp2_code/ctp/ctp2_utils/tracklen.h

[RichardH]

Revision 759:
Linux merging. Guard some #pragma's, whitespace, #ifdef USE_SDL, rearrange a few headers. Nothing here should affect the Windows build.

If someone would care to compile this on Windows and perhaps try starting a network game, I'd be grateful.

M ctp2_code/net/io/net_types.h
M ctp2_code/net/io/net_anet.h
M ctp2_code/net/io/net_thread.h
M ctp2_code/net/io/net_error.h
M ctp2_code/net/io/net_list.h
M ctp2_code/net/io/net_array.h
M ctp2_code/net/io/net_anet.cpp
M ctp2_code/net/io/net_thread.cpp
M ctp2_code/net/general/net_message.h
M ctp2_code/net/general/net_wonder.h
M ctp2_code/net/general/net_gameobj.h
M ctp2_code/net/general/net_agreement.h
M ctp2_code/net/general/net_research.h
M ctp2_code/net/general/net_ready.h
M ctp2_code/net/general/net_terrain.h
M ctp2_code/net/general/network.cpp
M ctp2_code/net/general/net_feat.h
M ctp2_code/net/general/net_unit.h
M ctp2_code/net/general/net_happy.h
M ctp2_code/net/general/net_hash.h
M ctp2_code/net/general/net_info.h
M ctp2_code/net/general/net_exclusions.h
M ctp2_code/net/general/net_installation.h
M ctp2_code/net/general/net_city.h
M ctp2_code/net/general/net_diff.h
M ctp2_code/net/general/net_feat.cpp
M ctp2_code/net/general/net_report.h
M ctp2_code/net/general/net_traderoute.h
M ctp2_code/net/general/net_chat.h
M ctp2_code/net/general/net_diplomacy.h
M ctp2_code/net/general/net_strengths.h
M ctp2_code/net/general/net_playerdata.h
M ctp2_code/net/general/net_guid.h
M ctp2_code/net/general/net_achievement.h
M ctp2_code/net/general/net_packet.h
M ctp2_code/net/general/net_crc.h
M ctp2_code/net/general/net_civ.cpp
M ctp2_code/net/general/net_cell.h
M ctp2_code/net/general/net_tradeoffer.h

[RichardH]

Revision 760:
r759 won't compile - missing #

M /trunk/ctp2_code/net/io/net_types.h

[RichardH]

Revision 761:
Argh. Another typo. Bad Richard. No cookie.

M net/io/net_thread.h

[RichardH]

Revision 762
Corrected a couple more typos from r359, more whitespace fixes, #pragma guarding. This one should compile on Windows now, assuming I haven't missed any typos...

M net/general/net_agreement.h
M net/general/network.h
M net/general/net_keys.h
M net/general/network.cpp
M net/general/net_unit.h
M net/general/net_cheat.cpp
M net/general/net_gamesettings.h
M net/general/net_crc.h

[RichardH]

Revision 764:
Add another #ifdef USE_SDL, more whitespace cleanup. I'm leaving ctp2_code/net alone for a while, until I have the chance to do netgame testing with someone.

Diff against linux branch r765 is 70k, down from 117k.

M net/io/net_thread.cpp
M net/general/network.cpp
M net/general/net_action.cpp
M net/general/net_unit.cpp
M net/general/net_message.cpp
M net/general/net_info.cpp
M net/general/net_diplomacy.cpp

[RichardH]

Revision 766:
Merging from Linux branch. Whitespace changes and #ifdef
HAVE_PRAGMA_ONCE guards.

Changed paths:
M /trunk/ctp2_code/mapgen/Crater.h
M /trunk/ctp2_code/mapgen/FaultGen.h
M /trunk/ctp2_code/mapgen/Geometric.cpp
M /trunk/ctp2_code/mapgen/Geometric.h
M /trunk/ctp2_code/mapgen/IMapGen.h
M /trunk/ctp2_code/mapgen/PlasmaGen1.h
M /trunk/ctp2_code/mapgen/PlasmaGen2.h

[Martin Gühmann]

Revision 767Made the debug version compile again and replaced the difficulty and risk level selection new game buttons by list boxes:

Some cleanings:
modified trunk/ctp2_code/ai/diplomacy/diplomat.cpp
modified trunk/ctp2_code/ctp/ctp2_utils/c3debug.h
modified trunk/ctp2_code/net/general/net_crc.h
modified trunk/ctp2_code/ui/interface/spnewgameplayersscreen.cpp

Added for the Japanese version all the mssing *.ldl files from the English version. Since the Japanese version put its files originally into the english folder I assume that those are identical anyway:
added trunk/ctp2_data/japanese/uidata/layouts/advancespad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/aipad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ancient.ldl
added trunk/ctp2_data/japanese/uidata/layouts/attract.ldl
added trunk/ctp2_data/japanese/uidata/layouts/buttonbank.ldl
added trunk/ctp2_data/japanese/uidata/layouts/c3utilitydialog.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ce_screen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ChatWindow.ldl
added trunk/ctp2_data/japanese/uidata/layouts/cityespionage.ldl
added trunk/ctp2_data/japanese/uidata/layouts/citymanager.ldl
added trunk/ctp2_data/japanese/uidata/layouts/citypad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/cityview.ldl
added trunk/ctp2_data/japanese/uidata/layouts/creditsscreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/custommap.ldl
added trunk/ctp2_data/japanese/uidata/layouts/cutnpastepad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/cvscreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/diplomacy.ldl
added trunk/ctp2_data/japanese/uidata/layouts/DiplomacyDetails.ldl
added trunk/ctp2_data/japanese/uidata/layouts/diplomacywindow.ldl
added trunk/ctp2_data/japanese/uidata/layouts/endgame.ldl
added trunk/ctp2_data/japanese/uidata/layouts/fancy.ldl
added trunk/ctp2_data/japanese/uidata/layouts/fliwindow.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font1.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font2.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font3.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font4.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font5.ldl
added trunk/ctp2_data/japanese/uidata/layouts/font6.ldl
added trunk/ctp2_data/japanese/uidata/layouts/gameplayoptions.ldl
added trunk/ctp2_data/japanese/uidata/layouts/greatlibrary.ldl
added trunk/ctp2_data/japanese/uidata/layouts/happystatus.ldl
added trunk/ctp2_data/japanese/uidata/layouts/helppopup.ldl
added trunk/ctp2_data/japanese/uidata/layouts/helptile.ldl
added trunk/ctp2_data/japanese/uidata/layouts/hotseatlist.ldl
added trunk/ctp2_data/japanese/uidata/layouts/infoscreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/intromovie.ldl
added trunk/ctp2_data/japanese/uidata/layouts/loadsave.ldl
added trunk/ctp2_data/japanese/uidata/layouts/messagebox.ldl
added trunk/ctp2_data/japanese/uidata/layouts/musicscreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_chglobby.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_editplyr.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_joingame.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_launch.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_lobby.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_selcnct.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_selplyr.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_selserv.ldl
added trunk/ctp2_data/japanese/uidata/layouts/ns_template.ldl
added trunk/ctp2_data/japanese/uidata/layouts/objectpad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/options.ldl
added trunk/ctp2_data/japanese/uidata/layouts/playerpad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/pointspad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/pollutionpad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/profileedit.ldl
added trunk/ctp2_data/japanese/uidata/layouts/queuewin.ldl
added trunk/ctp2_data/japanese/uidata/layouts/scenario.ldl
added trunk/ctp2_data/japanese/uidata/layouts/sciencevictory.ldl
added trunk/ctp2_data/japanese/uidata/layouts/segmentlist.ldl
added trunk/ctp2_data/japanese/uidata/layouts/sound.ldl
added trunk/ctp2_data/japanese/uidata/layouts/sourcelist.ldl
added trunk/ctp2_data/japanese/uidata/layouts/SpriteEditor.ldl
added trunk/ctp2_data/japanese/uidata/layouts/statswindow.ldl
added trunk/ctp2_data/japanese/uidata/layouts/throneroom.ldl
added trunk/ctp2_data/japanese/uidata/layouts/tilepad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/toolbar.ldl
added trunk/ctp2_data/japanese/uidata/layouts/trademanager.ldl
added trunk/ctp2_data/japanese/uidata/layouts/tradescreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/tutorialwin.ldl
added trunk/ctp2_data/japanese/uidata/layouts/unitmanager.ldl
added trunk/ctp2_data/japanese/uidata/layouts/unitpad.ldl
added trunk/ctp2_data/japanese/uidata/layouts/unitstatus.ldl
added trunk/ctp2_data/japanese/uidata/layouts/victorymovie.ldl
added trunk/ctp2_data/japanese/uidata/layouts/victoryscreen.ldl
added trunk/ctp2_data/japanese/uidata/layouts/watchlist.ldl
added trunk/ctp2_data/japanese/uidata/layouts/wondermovie.ldl

Removed some warnings:
modified trunk/ctp2_code/ctp/ctp2_utils/appstrings.cpp
modified trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
modified trunk/ctp2_code/robot/pathing/unitastar.cpp

Made debug version compile again:
modified trunk/ctp2_code/ctp/ctp2_utils/c3debug.cpp

The risk drop down listbox is now filled with strings from the database:
modified trunk/ctp2_code/ui/interface/scenarioeditor.cpp

Fixed the listbox: You cannot deselect all items anymore if the list is in force select mode:
modified trunk/ctp2_code/ui/aui_common/aui_listbox.cpp

Replaced the difficulty and risk level buttons by list boxes:
modified trunk/ctp2_code/ui/interface/spnewgamediffscreen.cpp
modified trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

[RichardH]

Revision 773:
Merge from Linux branch. This is all non-code and Linux-related stuff,
and should not affect the Windows build.

Does someone feel like testing it on Windows? E?

[RichardH]

Revision 774-775:
Move PACK from struct elements to end of structs. This is required by modern (and slightly saner) versions of gcc. Should be completely irrelevant to Windows build, as I think PACK is #defined as on that platform. Diff for anet now down to 86k.

Testing appreciated. Might be worth testing some of the network functions, just in case these changes have done something bizarre.

Changed paths:
M /trunk/ctp2_code/libs/anet/src/dp/deltas.c
M /trunk/ctp2_code/libs/anet/src/dp/dp2.c
M /trunk/ctp2_code/libs/anet/src/dp/dpio.c
M /trunk/ctp2_code/libs/anet/src/dp/dptab.c
M /trunk/ctp2_code/libs/anet/src/dp/enumsrv2.c
M /trunk/ctp2_code/libs/anet/src/tca/tca.h
M /trunk/ctp2_code/libs/anet/src/tca/tcapw.h
M /trunk/ctp2_code/libs/anet/src/tca/tserv.c
M /trunk/ctp2_code/libs/anet/src/tca/tserv.h
M /trunk/ctp2_code/libs/anet/h/anet.h
M /trunk/ctp2_code/libs/anet/h/dppkt.h
M /trunk/ctp2_code/libs/anet/h/dptab.h
M /trunk/ctp2_code/libs/anet/h/hkeytab.h