PROJECT: Revision Reports

[Martin Gühmann]

Revision 661

Restored compilation on VS C++ 6.0:
modified ctp2_code/gs/gameobj/Vision.cpp

For some reasion this was left after the renaming - corrected the problem:
deleted Scenarios/AE Mod

[Ekmek]

Revision 662
Barbarian.cpp
- Added but not implemented AddInsurgent Code it maynot be necessary
- Added but outcommented Barbarian Special Forces difficulty code

CityData.cpp
- Moved RevoltCasualties code to BeginTUrn because it wasn't working otherwise

CityEvent.cpp
- added comments for optional civil war code

New Game Rules - not implemented yet but my code which doesn't work is here in the hope I get some help.

spnewgamerulesscreen.cpp
- added citycapture options
- added new game options outcommented

profileDB
- add citycaptureoptions bools to enable rule change
- outcomments for new rules options

Note:ctp2_code\robot\pathing\CityAstar.cpp(195) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
I changed the false to FALSE I know changing the bool to BOOL (or vice versa) was prefered but I wasn't sure what that would do through out the code)


added some new strings

trunk/ctp2_code/ctp/civctp.dsp
U trunk/ctp2_code/ctp/ctp2_rsrc/civ3.rc
U trunk/ctp2_code/ctp/ctp2_rsrc/resource.h
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/CityEvent.cpp
U trunk/ctp2_code/gs/gameobj/GameSettings.cpp
U trunk/ctp2_code/gs/gameobj/GameSettings.h
U trunk/ctp2_code/gs/gameobj/Player.cpp
U trunk/ctp2_code/gs/gameobj/armyevent.cpp
U trunk/ctp2_code/gs/gameobj/barbarians.cpp
U trunk/ctp2_code/robot/pathing/CityAstar.cpp
U trunk/ctp2_code/ui/aui_common/aui_window.h
U trunk/ctp2_code/ui/interface/dipwizard.cpp
U trunk/ctp2_code/ui/interface/dipwizard.h
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.h
U trunk/ctp2_code/ui/netshell/ns_gamesetup.cpp
U trunk/ctp2_data/english/gamedata/gl_str.txt
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/dipwizard.ldl
U trunk/ctp2_data/french/gamedata/gl_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/german/gamedata/gl_str.txt
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/gamedata/gl_str.txt
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/gamedata/gl_str.txt
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt

[Martin Gühmann]

Revision 663

Fixed some stuff that could have been found with testing the stuff:

Made the project compile again:
modified ctp2_code/ctp/civctp.dsp
modified ctp2_code/ctp/ctp2_rsrc/civ3.rc
modified ctp2_code/ctp/ctp2_rsrc/resource.h

Made the game load again:
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

E, next time I want that you test your stuff before you commit it. Then you notice that your workspace doesn't compile anymore and that you have forgotten a quotation mark and finally you would also notice that you cannot load save games anymore.

Originally posted by E
Revision 662
profileDB
- add citycaptureoptions bools to enable rule change
- outcomments for new rules options

You didn't do this to that file, because there is simply no file called profileDB and things don't change if you ignore case.

Originally posted by E
Note:ctp2_code\robot\pathing\CityAstar.cpp(195) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
I changed the false to FALSE I know changing the bool to BOOL (or vice versa) was prefered but I wasn't sure what that would do through out the code)

If you aren't so sure what it does than don't touch it next time, espeacilly if it doesn't help. So I did fix it now as it should be fixed and corrected also some more of these obsolete BOOLs but now the AI civs behave different and I don't know what it is it maybe my code or it maybe your upgrade stuff, obviously this will take some time to sort it out.

-Martin

[Ekmek]

revision 664

Removed my new game rules attempt

kept
Barbarian.cpp
- Added but not implemented AddInsurgent Code it maynot be necessary
- Added but outcommented Barbarian Special Forces difficulty code

CityData.cpp
- Moved RevoltCasualties code to BeginTurn because it wasn't working otherwise

CityEvent.cpp
- added comments for optional civil war code

Source code now matches my 663b build

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/CityEvent.cpp
U trunk/ctp2_code/gs/gameobj/GameSettings.cpp
U trunk/ctp2_code/gs/gameobj/GameSettings.h
U trunk/ctp2_code/robot/pathing/CityAstar.cpp
U trunk/ctp2_code/ui/aui_common/aui_window.h
U trunk/ctp2_code/ui/interface/dipwizard.cpp
U trunk/ctp2_code/ui/interface/dipwizard.h
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U trunk/ctp2_code/ui/netshell/ns_gamesetup.cpp

[Martin Gühmann]

Revision 665

Added AI army debug text to the army manager and improved AI government usage

Minor cleanings:
modified trunk/ctp2_code/robot/pathing/A_Star_Heuristic_Cost.cpp
modified trunk/ctp2_code/robot/pathing/A_Star_Heuristic_Cost.h

Removed unused files:
deleted trunk/ctp2_code/robot/pathing/RobotAstar.cpp
deleted trunk/ctp2_code/robot/pathing/RobotAstar.h

Added CanUpgrade Bit for future use in terrain dependent upgrade:
modified trunk/ctp2_code/gs/newdb/terrain.cdb
modified trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb

Updated readme file so that its content is a little bit more understandable. Unfortunately I had to drop two items, because they didn't make any sense to me.
modified trunk/doc/user/playtest/Apolyton_README.txt

Added debug army text to the army manager window if enabled, because sometimes is pretty hard to read it on the map:
modified trunk/ctp2_code/ui/interface/armymanagerwindow.cpp
added trunk/ctp2_data/english/uidata/layouts/armymanager.ldl
modified trunk/ctp2_data/german/uidata/layouts/armymanager.ldl
modified trunk/ctp2_data/italian/uidata/layouts/armymanager.ldl
added trunk/ctp2_data/japanese/uidata/layouts/armymanager.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/armymanager.ldl

Made sure AIs can use better governments even if those aren't their prefered ones:
modified trunk/ctp2_data/default/aidata/strategies.txt

[Martin Gühmann]

Revision 666

Some cleanings, improved AI army debug text, fixed Barbarians from rioting cities and rewrote the upgrade code.

Some cleanings:
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.h
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler_types.h
modified trunk/ctp2_code/ai/strategy/squads/Squad.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/gs/gameobj/Gold.h
modified trunk/ctp2_code/gs/newdb/building.cdb
modified trunk/ctp2_code/gs/newdb/Difficulty.cdb
modified trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb
modified trunk/ctp2_code/gs/world/wldgen.cpp

Marked a place where a origin of a memory could be:
modified trunk/ctp2_code/gs/gameobj/Vision.cpp

Removed an unneeded debug message:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp

A file missing from the last revision
added trunk/ctp2_data/french/uidata/layouts/armymanager.ldl

Made sure you can only instantiate derived class CTPGoal:
modified trunk/ctp2_code/ai/strategy/goals/Goal.h

Improved AI goals debug army texts:
modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp

Broke the upgrade code into more units and made sure that it does not crash. However there is still some work needed so that it can be released as official playtest function:
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h
modified trunk/ctp2_code/gs/gameobj/Player.cpp
modified trunk/ctp2_code/gs/gameobj/player.h
modified trunk/ctp2_code/gs/gameobj/Unit.cpp
modified trunk/ctp2_code/gs/gameobj/Unit.h
modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
modified trunk/ctp2_code/gs/gameobj/UnitData.h
modified trunk/ctp2_code/gs/world/Cell.cpp
modified trunk/ctp2_code/gs/world/Cell.h

Rioting cities now produce - if the requirements are met - Barbarians:
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

E, you should take a look on the way how double to integer implicit type cast work:

double d = 0.999999;
int i = d;

The value of i is zero!

-Martin

[Martin Gühmann]

Revision 667

A little fix and the scenario editor can change the civilization's city style

Fixed the German name of the Egyptian city Thebes:
modified trunk/ctp2_data/german/gamedata/civ_str.txt

Added a way to the scenario editor to change the city style of a civilization:
modified trunk/ctp2_code/ui/aui_ctp2/ctp2_spinner.cpp
modified trunk/ctp2_code/ui/aui_ctp2/ctp2_spinner.h
modified trunk/ctp2_code/ui/interface/scenarioeditor.cpp
modified trunk/ctp2_code/ui/interface/scenarioeditor.h
modified trunk/ctp2_data/english/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/french/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/german/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/italian/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/scenarioeditor.ldl

[Martin Gühmann]

Revision 668

Some cleaning:

Some minor cleanings:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h

More cleaning so that you might overlook what I modifiy next time in this file:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp

[Martin Gühmann]

Revision 669

Some cleaning and fixed regarding the transport assignment.

Cleaned a little bit:
modified trunk/ctp2_code/ui/interface/rankingtab.cpp

Added a guard to the AI debug army text display:
modified trunk/ctp2_code/ui/interface/armymanagerwindow.cpp

Simplified some code to squeeze out some miliseconds, fixed the needed transport strength calculation for the governor and made sure that goals with transport requirements aren't rolled back if there are already transports assigned. However these fixes just seem to reduce the turn lack on sea-maps but doesn't eliminate it:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
modified trunk/ctp2_code/ai/strategy/scheduler/Scheduler.h
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.cpp
modified trunk/ctp2_code/ai/strategy/squads/squad_Strength.h

[Fromafar]

Revision 671 Corrected compiler complaints

Modified: ctp2_code\ui\netshell\allinonewindow.cpp
Modified: ctp2_code\ui\netshell\connectionselectwindow.cpp
Modified: ctp2_code\ui\netshell\gameselectwindow.cpp
Modified: ctp2_code\ui\netshell\netshell.h
Modified: ctp2_code\ui\netshell\playerselectwindow.cpp
Modified: ctp2_code\ui\netshell\serverselectwindow.cpp

[Fromafar]

Revision 672 Cleaned up code and corrected compiler complaints

Modified: ctp2_code\ui\aui_common\aui_bitmapfont.cpp
Modified: ctp2_code\ui\aui_common\aui_blitter.cpp
Modified: ctp2_code\ui\aui_common\aui_button.cpp
Modified: ctp2_code\ui\aui_common\aui_button.h
Modified: ctp2_code\ui\aui_common\aui_imagebase.cpp
Modified: ctp2_code\ui\aui_common\aui_imagebase.h
Modified: ctp2_code\ui\aui_common\aui_ldl.cpp
Modified: ctp2_code\ui\aui_common\aui_ldl.h
Modified: ctp2_code\ui\aui_common\aui_movie.cpp
Modified: ctp2_code\ui\aui_common\aui_ranger.cpp
Modified: ctp2_code\ui\aui_common\aui_textbase.cpp
Modified: ctp2_code\ui\aui_common\aui_window.cpp
Modified: ctp2_code\ui\aui_common\aui_window.h
Modified: ctp2_code\ui\aui_ctp2\c3_button.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_button.h
Modified: ctp2_code\ui\aui_ctp2\c3dropdown.h
Modified: ctp2_code\ui\aui_ctp2\c3scroller.cpp
Modified: ctp2_code\ui\aui_ctp2\c3scroller.h
Modified: ctp2_code\ui\aui_ctp2\ctp2_Menu.h
Modified: ctp2_code\ui\aui_ctp2\ctp2_MenuButton.cpp
Modified: ctp2_code\ui\ldl\ldl_data.cpp
Modified: ctp2_code\ui\ldl\ldl_data.hpp
Modified: ctp2_code\ui\ldl\ldl_data_info.cpp

[Ekmek]

Note:
[ctp2-commit] Revision 673 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 674 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 675 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 676 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 677 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 678 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 679 committed by richardh ctp2-commit_at_darkdust.net (13 Jan 2007)
[ctp2-commit] Revision 680 committed by richardh ctp2-commit_at_darkdust.net (14 Jan 2007)
[ctp2-commit] Revision 681 committed by richardh ctp2-commit_at_darkdust.net (14 Jan 2007)


Revision 682

tilemap.h
tiledraw.cpp
tileset.cpp
tileset.h
UnseenCell.cpp
UnseenCell.h
Added IsCapitol, implemented hasAirport, adjust cityname and pop boxes, and graphics

gamedata/Colors00.txt
added red as the second color in colors.txt like it is in just about every game

added TODO to ArmyData.cpp

U trunk/ctp2_code/gfx/tilesys/tiledmap.h
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gfx/tilesys/tileset.cpp
U trunk/ctp2_code/gfx/tilesys/tileset.h
U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/world/UnseenCell.cpp
U trunk/ctp2_code/gs/world/UnseenCell.h
U trunk/ctp2_data/default/gamedata/Colors00.txt
A trunk/ctp2_data/default/graphics/pictures/upc052.TGA
A trunk/ctp2_data/default/graphics/pictures/upc053.TGA
A trunk/ctp2_data/default/graphics/pictures/upc054.TGA
A trunk/ctp2_data/default/graphics/pictures/upc055.TGA
A trunk/ctp2_data/default/graphics/pictures/upc056.TGA

[Fromafar]

Revision 683
Memory leaks repaired, compiler complaints corrected, unused return values and g_e3Demo removed.

Modified: ctp2_code\gs\world\World.h
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\ui\interface\controlpanelwindow.cpp
Modified: ctp2_code\ui\interface\creditsscreen.cpp
Modified: ctp2_code\ui\interface\creditsscreen.h
Modified: ctp2_code\ui\interface\dipwizard.cpp
Modified: ctp2_code\ui\interface\greatlibrary.cpp
Modified: ctp2_code\ui\interface\greatlibrary.h
Modified: ctp2_code\ui\interface\greatlibrary_util.cpp
Modified: ctp2_code\ui\interface\greatlibrarywindow.cpp
Modified: ctp2_code\ui\interface\helptile.cpp
Modified: ctp2_code\ui\interface\infowin.cpp
Modified: ctp2_code\ui\interface\initialplayscreen.cpp
Modified: ctp2_code\ui\interface\initialplaywindow.cpp
Modified: ctp2_code\ui\interface\initialplaywindow.h
Modified: ctp2_code\ui\interface\loadsavescreen.cpp
Modified: ctp2_code\ui\interface\loadsavewindow.h
Modified: ctp2_code\ui\interface\messagemodal.cpp
Modified: ctp2_code\ui\interface\messagemodal.h
Modified: ctp2_code\ui\interface\optionsscreen.cpp
Modified: ctp2_code\ui\interface\optionswindow.h
Modified: ctp2_code\ui\interface\progresswindow.cpp
Modified: ctp2_code\ui\interface\scenarioeditor.cpp
Modified: ctp2_code\ui\interface\sci_advancescreen.cpp
Modified: ctp2_code\ui\interface\scorewarn.cpp
Modified: ctp2_code\ui\interface\scorewarn.h
Modified: ctp2_code\ui\interface\screenutils.cpp
Modified: ctp2_code\ui\interface\screenutils.h
Modified: ctp2_code\ui\interface\spriteeditor.cpp
Modified: ctp2_code\ui\interface\spriteeditor.h
Modified: ctp2_code\ui\interface\trademanager.cpp
Modified: ctp2_code\ui\interface\trademanager.h

[Ekmek]

ok here are the errors I'm getting

trunk\ctp2_code\ui\interface\initialplaywindow.cpp(87) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptabl
e conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(99) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptabl
e conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(108) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(117) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(124) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(131) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(138) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(143) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(148) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)
trunk\ctp2_code\ui\interface\initialplaywindow.cpp(153) : error C2679: binary '=' : no operator defined which takes a right-hand operand of type 'class ctp2_Button *' (or there is no acceptab
le conversion)

[Fromafar]

Revision 684

Cleaned up code and corrected compiler complaints

Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gs\database\profileDB.h
Modified: ctp2_code\sound\soundmanager.cpp
Modified: ctp2_code\ui\aui_common\aui_ldl.cpp
Modified: ctp2_code\ui\aui_common\aui_ldl.h
Modified: ctp2_code\ui\aui_common\aui_switch.cpp
Modified: ctp2_code\ui\aui_common\aui_tab.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_ranger.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_dropdown.cpp
Modified: ctp2_code\ui\interface\spnewgamescreen.cpp
Modified: ctp2_code\ui\interface\spnewgamewindow.cpp
Modified: ctp2_code\ui\interface\spnewgamewindow.h
Modified: ctp2_code\ui\ldl\ldl_data.cpp
Modified: ctp2_code\ui\ldl\ldl_data.hpp
Modified: ctp2_code\ui\netshell\lobbychangewindow.cpp

Attempt to restore MSVC6 compilation

Modified: ctp2_code\ui\interface\initialplaywindow.cpp
Modified: ctp2_code\ui\interface\initialplaywindow.h

Restored original player colors

Modified: ctp2_data\default\gamedata\Colors00.txt