PROJECT: Revision Reports

[Fromafar]

Revision 653
Repaired crashes and asserts.

Modified: ctp2_code\ai\CityManagement\governor.cpp
Modified: ctp2_code\gfx\tilesys\tiledraw.cpp
Modified: ctp2_code\gs\gameobj\CityData.cpp
Modified: ctp2_code\gs\newdb\CTPDatabase.cpp

[Ekmek]

Fromafar did you see these compile problems:

http://www.apolyton.net/forums/showthread.php?postid=4646845#post4646845

I got around it but uploading an earlier version but I think it might have undid your sounds fix

[Fromafar]

Yes, I did see it, and have made some changes for it.

Can you give civ3_main.zip a try? I have tried committing these files, but did not succeed. I will try again later, but it looks like a problem requiring a server restart.

[Ekmek]

THat worked except I got these warnings:

C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(299) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(300) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(301) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(302) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(303) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C:\trunk\ctp2_code\gfx\tilesys\tiledraw.cpp(304) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
C

How are you with the interface? I'm having some trouble changing dipwizard's tabs to threat-like list boxes (although tabs are list boxes )

[Fromafar]

Revision 654
MSVC6 compatibility rewrite

Modified: ctp2_code\ctp\civ3_main.cpp
Modified: ctp2_code\ctp\civ3_main.h

Commit working again . Don't worry about the performance warnings (for bool to BOOL and v.v. conversions).

Not sure about the interface - I would have to look into that in more detail myself. I think it is best to keep reporting what you are trying to do and what specific troubles you are encountering. It could take a while, but eventually we should get something working.

[Ekmek]

Revision 655

CityData.cpp
Added PopCountBuildLimit Limits a building to cities of a certain size
Added RevoltInsurgents diffDB to beginturn. If a city is rioting then there is a chance that the riot will spawn barbarians. this also increases if the city was founded by someone else and/or if the city has a different citystyle.

Armydata
Added risk number to diffdb's barbariancities. to make barb cities less frequent.

English\UI
enlarged diplomacy start window - didn't need to be small anymore
science.ldl enlarged science window so you can read the gl text

French/gamedata
Added Tamerlin's flags

Default\Gamedata
Unit
UnitIcon
newsprite
Added Tamerlin and Maq's "Tamerlin rule" approved improvements to standard game
Includes upgrade paths and new Longbowman unit
Added Elephant Warrior unit but not available for play (subneural ads), modding option


Did not add any of my dipwizard stuff. EditQueue.cpp no changes just comments. cdbs just have additional, not implemented flags

[Fromafar]

CityData.cpp is missing a semi-colon, so it does not compile with MSVC8. Does MSVC6 accept this?

And I think we'd better refrain from adding the upgrade path functionality to the text files of the standard game for now. Adding it will make MP impossible.

[Fromafar]

Revision 656 Server test

Corrected compile error, converted BOOL to bool, and other minor clean-ups.

Modified: ctp2_code\gfx\tilesys\TileInfo.cpp
Modified: ctp2_code\gfx\tilesys\TileInfo.h
Modified: ctp2_code\gs\gameobj\CityData.cpp
Modified: ctp2_code\gs\gameobj\TerrImprove.cpp
Modified: ctp2_code\gs\gameobj\Vision.cpp
Modified: ctp2_code\gs\gameobj\Vision.h
Modified: ctp2_code\gs\world\UnseenCell.cpp
Modified: ctp2_code\gs\world\UnseenCell.h

[Martin Gühmann]

Revision 657

Renamed trunk/Scenarios/AE Mod to trunk/Scenarios/AE_Mod, this way the diff viewer of a Windows 98 compatible TortoiseSVN can also handle the diff-request. The lastest version for Windows XP seems to be able to do it but anyway the conclusion is:

Never ever use spaces in file names!

[Fromafar]

Revision 658

Repaired crash with missing city style.
Modified ctp2_code/gs/gameobj/CityData.cpp

Prevented asserts with barbarian movement.
Modified ctp2_code/gs/gameobj/ArmyData.cpp

Preparations for later changes.
Modified ctp2_code/ctp/ctp2_utils/c3debug.cpp
Modified ctp2_code/ctp/ctp2_utils/c3debug.h
Modified ctp2_code/gs/gameobj/Strengths.cpp
Modified ctp2_code/gs/gameobj/Strengths.h
Modified ctp2_code/gs/utility/Globals.h

[Ekmek]

Fromafar I get this compile error

...trunk\ctp2_code\gs\gameobj\Strengths.cpp(158) : error C2678: binary '[' : no operator defined which takes a left-hand operand of type 'const class SimpleDynamicArray' (or there is no acc
eptable conversion)

sint32 Strengths::GetTurnStrength(STRENGTH_CAT category, sint32 turn) const
{
	if (!m_strengthRecords[category].Num()) return 0;
		
	if (turn >= m_strengthRecords[category].Num()) return 0;

	return m_strengthRecords[category][turn];
}

but the Strengths::GetTurnStrength code is the same since atleats 632 (I checked an old copy).


EDIT: I see you made it a const where it wasn't before. I'll try to get something that compiles.

[Fromafar]

Revision 659

Corrected typo (causing a crash when generating crash.txt).
Modified: ctp2_code\ctp\ctp2_utils\c3debug.cpp

Reduced number of compiler complaints and (double) asserts.
Modified: ctp2_code\gfx\spritesys\SpriteGroupList.cpp
Modified: ctp2_code\gfx\spritesys\SpriteGroupList.h
Modified: ctp2_code\gs\gameobj\armyevent.cpp
Modified: ctp2_code\gs\utility\SimpleDynArr.h
Modified: ctp2_code\net\general\net_city.cpp
Modified: ctp2_code\robot\pathing\RobotAstar.cpp

Repaired memory leaks.
Modified: ctp2_code\gfx\spritesys\CitySpriteGroup.cpp
Modified: ctp2_code\gfx\spritesys\CitySpriteGroup.h
Modified: ctp2_code\gfx\spritesys\EffectSpriteGroup.h
Modified: ctp2_code\gfx\spritesys\GoodSpriteGroup.h
Deleting: ctp2_code\gfx\spritesys\ProjectileActor.cpp
Deleting: ctp2_code\gfx\spritesys\ProjectileActor.h
Deleting: ctp2_code\gfx\spritesys\ProjectileSpriteGroup.cpp
Deleting: ctp2_code\gfx\spritesys\ProjectileSpriteGroup.h
Modified: ctp2_code\gfx\spritesys\SpriteGroup.cpp
Modified: ctp2_code\gfx\spritesys\SpriteGroup.h
Modified: ctp2_code\gfx\spritesys\UnitSpriteGroup.cpp
Modified: ctp2_code\gfx\spritesys\UnitSpriteGroup.h
Modified: ctp2_code\gfx\spritesys\effectspritegroup.cpp
Modified: ctp2_code\gfx\spritesys\goodspritegroup.cpp
Modified: ctp2_code\ui\interface\battleview.cpp
Modified: ctp2_code\ui\interface\battleview.h
Modified: ctp2_code\ui\interface\battleviewwindow.cpp

This will hopefully correct the compilation problem with the missing const version of the []-operator (added in SimpleDynArr.h).

[Ekmek]

Fromafar, hopefully I catch you while your online. I got these with 659

...trunk\ctp2_code\gfx\spritesys\BattleViewActor.cpp(430) : error C2027: use of undefined type 'aui_Surface'
        ..\ui\aui_common\aui_mouse.h(40) : see declaration of 'aui_Surface'
...trunk\ctp2_code\gfx\spritesys\BattleViewActor.cpp(430) : error C2227: left of '->Width' must point to class/struct/union
...trunk\ctp2_code\gfx\spritesys\BattleViewActor.cpp(431) : error C2027: use of undefined type 'aui_Surface'
        ..\ui\aui_common\aui_mouse.h(40) : see declaration of 'aui_Surface'
...trunk\ctp2_code\gfx\spritesys\BattleViewActor.cpp(431) : error C2227: left of '->Height' must point to class/struct/union

...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1704) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1707) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1794) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1797) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1890) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1893) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1936) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(1939) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(2027) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(2030) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(2076) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)
...trunk\ctp2_code\gfx\spritesys\SpriteFile.cpp(2079) : warning C4800: 'unsigned short' : forcing value to bool 'true' or 'false' (performance warning)

[Fromafar]

Revision 660

Converted BOOL to bool, added const, corrected includes, and other minor clean-ups.
Modified: ctp2_code\gfx\gfx_utils\Queue.h
Modified: ctp2_code\gfx\spritesys\Actor.cpp
Modified: ctp2_code\gfx\spritesys\Actor.h
Modified: ctp2_code\gfx\spritesys\EffectActor.cpp
Modified: ctp2_code\gfx\spritesys\GoodActor.h
Modified: ctp2_code\gfx\spritesys\SpriteFile.h
Modified: ctp2_code\gfx\spritesys\UnitActor.cpp
Modified: ctp2_code\gfx\spritesys\battleviewactor.cpp
Modified: ctp2_code\gfx\spritesys\battleviewactor.h
Modified: ctp2_code\gfx\spritesys\goodactor.cpp
Modified: ctp2_code\gfx\spritesys\spritefile.cpp
Modified: ctp2_code\gfx\spritesys\workeractor.cpp
Modified: ctp2_code\gfx\spritesys\workeractor.h
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h

Please try again and let me know if there are more problems.

[Ekmek]

good to go