Announcement

**Fromafar** · March 9, 2007, 17:33

Revision 704 Repaired memory leaks + minor cleanups

Modified: ctp2_code\gs\gameobj\Army.cpp
Modified: ctp2_code\gs\gameobj\ArmyData.cpp
Modified: ctp2_code\gs\gameobj\ArmyData.h
Modified: ctp2_code\gs\gameobj\Player.cpp
Modified: ctp2_code\gs\gameobj\TradeRouteData.cpp
Modified: ctp2_code\gs\gameobj\TradeRouteData.h
Modified: ctp2_code\gs\gameobj\Unit.cpp
Modified: ctp2_code\gs\gameobj\Unit.h

@E: see todo remarks in ArmyData.cpp and Player.cpp

**Fromafar** · March 12, 2007, 16:55

Revision 705 Repaired memory leaks + minor cleanups

Modified: ctp2_code\gfx\gfx_utils\gfx_options.cpp
Modified: ctp2_code\gfx\gfx_utils\gfx_options.h
Modified: ctp2_code\gfx\gfx_utils\pixelutils.cpp
Modified: ctp2_code\gfx\gfx_utils\targautils.cpp
Modified: ctp2_code\gfx\gfx_utils\targautils.h
Modified: ctp2_code\gfx\gfx_utils\tiffutils.cpp
Modified: ctp2_code\gfx\spritesys\spritefile.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.cpp
Modified: ctp2_code\gfx\tilesys\tiledmap.h
Modified: ctp2_code\gfx\tilesys\tileutils.cpp
Modified: ctp2_code\gs\fileio\prjfile.cpp
Modified: ctp2_code\gs\fileio\prjfile.h
Modified: ctp2_code\gs\gameobj\Unit.cpp

**Ekmek** · March 12, 2007, 18:22

Fromafar,

I still get this char error

Code:

\ctp2_code\gs\gameobj\ArmyData.cpp(10560) : error C2556: 'const char *__thiscall ArmyData::GetName(void) const' : overloaded function differs only by return type from 'char *__thiscall A
rmyData::GetName(void) const'
        \ctp2_code\gs\gameobj\ArmyData.h(567) : see declaration of 'GetName'
\ctp2_code\gs\gameobj\ArmyData.cpp(10560) : error C2373: 'GetName' : redefinition; different type modifiers
        \ctp2_code\gs\gameobj\Ar

**Ekmek** · March 12, 2007, 18:50

never moind I fixed it there was a missing const befor MBCHAR in armydata.h

**Ekmek** · March 13, 2007, 22:40

Revision 706

building.cdb
wonder.cdb
- Added IsReligionIcon
- Added ShowCityIcon

government.cdb
- Added GovtIcon (not implemented)

UnitActor.cpp
tiledmap.cpp & h
- Added Show Army Name option
- Moved CivFlags to right of herald
- change stack number to a string instead of icons

profileDB.cpp & h
- Added Show Army Names

graphics.ldl (all languages)
graphicsscreen.cpp
ldl_str.txt (all languages)
- added Show army Name Option
- added Show Civ Flags Option

CityData.cpp
Unit.cpp
UnitData.cpp
- Removed IsReligion Bools

CityData.cpp
- Removed SectarianHappiness Crash with m_founder

UnitData.cpp
- Outcommented Sink crash (I think Fromafar #ifdef'd it)

terrainutil.cpp
- outcomment for other infrastructure flags

Player.cpp
- -outcomments for future modifiers

WrldCont.cpp
- aded comment that explains why i was getting that error and how to fix it

strategies.txt
- added new siege values

Civflag upc.tgas
- made them their original size again

Updated Readme

U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gfx/spritesys/UnitActor.h
U trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
U trunk/ctp2_code/gfx/tilesys/tiledmap.h
U trunk/ctp2_code/gfx/tilesys/tiledraw.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/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
U trunk/ctp2_code/gs/gameobj/citydata.h
U trunk/ctp2_code/gs/gameobj/terrainutil.cpp
U trunk/ctp2_code/gs/newdb/building.cdb
U trunk/ctp2_code/gs/newdb/government.cdb
U trunk/ctp2_code/gs/newdb/wonder.cdb
U trunk/ctp2_code/gs/world/WrldCont.cpp
U trunk/ctp2_code/ui/aui_ctp2/InfoBar.cpp
U trunk/ctp2_code/ui/aui_ctp2/keypress.cpp
U trunk/ctp2_code/ui/interface/controlpanelwindow.cpp
U trunk/ctp2_code/ui/interface/graphicsscreen.cpp
U trunk/ctp2_data/default/aidata/strategies.txt
U trunk/ctp2_data/default/graphics/pictures/upc067.tga
U trunk/ctp2_data/default/graphics/pictures/upc068.tga
U trunk/ctp2_data/default/graphics/pictures/upc070.tga
U trunk/ctp2_data/default/graphics/pictures/upc071.tga
U trunk/ctp2_data/default/graphics/pictures/upc072.tga
U trunk/ctp2_data/default/graphics/pictures/upc073.tga
U trunk/ctp2_data/default/graphics/pictures/upc074.tga
U trunk/ctp2_data/default/graphics/pictures/upc075.tga
U trunk/ctp2_data/default/graphics/pictures/upc076.tga
U trunk/ctp2_data/default/graphics/pictures/upc077.tga
U trunk/ctp2_data/default/graphics/pictures/upc078.tga
U trunk/ctp2_data/default/graphics/pictures/upc079.tga
U trunk/ctp2_data/default/graphics/pictures/upc080.tga
U trunk/ctp2_data/default/graphics/pictures/upc081.tga
U trunk/ctp2_data/default/graphics/pictures/upc082.tga
U trunk/ctp2_data/default/graphics/pictures/upc083.tga
U trunk/ctp2_data/default/graphics/pictures/upc084.tga
U trunk/ctp2_data/default/graphics/pictures/upc085.tga
U trunk/ctp2_data/default/graphics/pictures/upc086.tga
U trunk/ctp2_data/default/graphics/pictures/upc087.tga
U trunk/ctp2_data/default/graphics/pictures/upc088.tga
U trunk/ctp2_data/default/graphics/pictures/upc089.tga
U trunk/ctp2_data/default/graphics/pictures/upc090.tga
U trunk/ctp2_data/default/graphics/pictures/upc091.tga
U trunk/ctp2_data/default/graphics/pictures/upc092.tga
U trunk/ctp2_data/default/graphics/pictures/upc093.tga
U trunk/ctp2_data/default/graphics/pictures/upc094.tga
U trunk/ctp2_data/default/graphics/pictures/upc095.tga
U trunk/ctp2_data/default/graphics/pictures/upc096.tga
U trunk/ctp2_data/default/graphics/pictures/upc097.tga
U trunk/ctp2_data/default/graphics/pictures/upc098.tga
U trunk/ctp2_data/default/graphics/pictures/upc099.tga
U trunk/ctp2_data/default/graphics/pictures/upc100.tga
U trunk/ctp2_data/default/graphics/pictures/upc101.tga
U trunk/ctp2_data/default/graphics/pictures/upc102.tga
U trunk/ctp2_data/default/graphics/pictures/upc103.tga
U trunk/ctp2_data/default/graphics/pictures/upc104.tga
U trunk/ctp2_data/default/graphics/pictures/upc105.tga
U trunk/ctp2_data/default/graphics/pictures/upc106.tga
U trunk/ctp2_data/default/graphics/pictures/upc107.tga
U trunk/ctp2_data/default/graphics/pictures/upc108.tga
U trunk/ctp2_data/default/graphics/pictures/upc109.tga
U trunk/ctp2_data/default/graphics/pictures/upc110.tga
U trunk/ctp2_data/default/graphics/pictures/upc111.tga
U trunk/ctp2_data/default/graphics/pictures/upc112.tga
U trunk/ctp2_data/default/graphics/pictures/upc113.tga
U trunk/ctp2_data/default/graphics/pictures/upc114.tga
U trunk/ctp2_data/default/graphics/pictures/upc115.tga
U trunk/ctp2_data/default/graphics/pictures/upc116.tga
U trunk/ctp2_data/default/graphics/pictures/upc117.tga
U trunk/ctp2_data/default/graphics/pictures/upc118.tga
U trunk/ctp2_data/default/graphics/pictures/upc119.tga
U trunk/ctp2_data/default/graphics/pictures/upc120.tga
U trunk/ctp2_data/default/graphics/pictures/upc121.tga
U trunk/ctp2_data/default/graphics/pictures/upc122.tga
U trunk/ctp2_data/default/graphics/pictures/upc123.tga
U trunk/ctp2_data/default/graphics/pictures/upc124.tga
U trunk/ctp2_data/default/graphics/pictures/upc125.tga
U trunk/ctp2_data/default/graphics/pictures/upc126.tga
U trunk/ctp2_data/default/graphics/pictures/upc127.tga
U trunk/ctp2_data/default/graphics/pictures/upc128.tga
U trunk/ctp2_data/default/graphics/pictures/upc129.tga
U trunk/ctp2_data/default/graphics/pictures/upc131.tga
U trunk/ctp2_data/default/graphics/pictures/upc132.tga
U trunk/ctp2_data/default/graphics/pictures/upc133.tga
U trunk/ctp2_data/default/graphics/pictures/upc136.tga
U trunk/ctp2_data/default/graphics/pictures/upc137.tga
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
A trunk/ctp2_data/french/uidata/layouts/graphics.ldl
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/graphics.ldl
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/graphics.ldl
U trunk/ctp2_data/japanese/gamedata/ldl_str.txt
A trunk/ctp2_data/japanese/uidata/layouts/graphics.ldl
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/graphics.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

**Ekmek** · March 15, 2007, 18:30

Fromafar,

I keep getting a trabsition tile crash (called from tiledmap::Calculatewrap) and then in debug it took me to this code:

Code:

SPRITEFILEERR SpriteFile::ReadData(void *data, size_t bytes)
{
	size_t	countRead = c3files_fread(data, 1, bytes, m_file);
	Assert(countRead == bytes);

    return (countRead == bytes) ? SPRITEFILEERR_OK : SPRITEFILEERR_READERR;
}

Originally it looked something like this:

Code:

SPRITEFILEERR SpriteFile::ReadData(void *data, size_t bytes)
{
	size_t		countRead;

	countRead = c3files_fread(data, 1, bytes, m_file);
	Assert(countRead == bytes);

	if (countRead != bytes) return SPRITEFILEERR_READERR;

	return SPRITEFILEERR_OK;
}

Is it the difference between != and == ?

To replicate it I notice it happens hen I go to the cheat window and reveal the whole map or move a unit.

**Ekmek** · March 22, 2007, 18:59

revision 707
UnitActor.cpp
tiledmap.cpp
tiledraw.cpp
- Added DrawCitySpecialIcons for ReligionIcons
- Added DrawCityImprovements method
- fixed drawcityname so it doesn't cause crash with religion icons

profileDB.cpp
gameplayoptions.cpp
graphicsscreen.cpp
spnewgamerulesscreen.cpp
graphics.ldl
gameplayoptions.ldl
spnewgamepopups.ldl
ldl_str.txt
- added all bools for profile options
- added city capture gameplayoptions & rules
- added smooth borders graphic options
- added one citychallenge to rules
- added barbarianspawnbarbarian to rules
- added sectarianhappiness to rules
- added revoltinsurgents to rules
- added revoltcasualties to rules

Player.cpp
- added onecitychallenget o CanBuildUnit
- added BreadBasket bonusexportfood code
- added CommodityMarket bonusexportgold code

CityData.cpp
- fixed revoltinsurgent and revolt casualty code
- add breadbasket to ProcessFood

CityData.cpp
Difficulty.cdb
- fixed sectarianhappiness to be random instead of integer

TerrainImprovement.cdb
- moved export values to effects

happytracker.cpp
Happy.cpp
exp_str.txt
- added sectarian happiness so it displays in city window

trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
U trunk/ctp2_code/gfx/spritesys/UnitActor.h
U trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
U trunk/ctp2_code/gfx/tilesys/tiledmap.h
U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
U trunk/ctp2_code/gs/database/profileDB.cpp
U trunk/ctp2_code/gs/database/profileDB.h
U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
U trunk/ctp2_code/gs/gameobj/CityData.cpp
U trunk/ctp2_code/gs/gameobj/Happy.cpp
U trunk/ctp2_code/gs/gameobj/HappyTracker.h
U trunk/ctp2_code/gs/gameobj/Player.cpp
U trunk/ctp2_code/gs/gameobj/buildingutil.cpp
U trunk/ctp2_code/gs/gameobj/buildingutil.h
U trunk/ctp2_code/gs/gameobj/happytracker.cpp
U trunk/ctp2_code/gs/gameobj/player.h
U trunk/ctp2_code/gs/newdb/Difficulty.cdb
U trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb
U trunk/ctp2_code/gs/newdb/building.cdb
U trunk/ctp2_code/ui/interface/gameplayoptions.cpp
U trunk/ctp2_code/ui/interface/graphicsscreen.cpp
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
U trunk/ctp2_code/ui/interface/spnewgamerulesscreen.h
U trunk/ctp2_data/default/gamedata/concepticon.txt
U trunk/ctp2_data/english/gamedata/exp_str.txt
U trunk/ctp2_data/english/gamedata/ldl_str.txt
U trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/french/gamedata/exp_str.txt
U trunk/ctp2_data/french/gamedata/ldl_str.txt
U trunk/ctp2_data/french/uidata/layouts/graphics.ldl
U trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/german/gamedata/exp_str.txt
U trunk/ctp2_data/german/gamedata/ldl_str.txt
U trunk/ctp2_data/german/uidata/layouts/gameplayoptions.ldl
U trunk/ctp2_data/german/uidata/layouts/graphics.ldl
U trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/italian/gamedata/exp_str.txt
U trunk/ctp2_data/italian/gamedata/ldl_str.txt
U trunk/ctp2_data/italian/uidata/layouts/gameplayoptions.ldl
U trunk/ctp2_data/italian/uidata/layouts/graphics.ldl
U trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
U trunk/ctp2_data/spanish/gamedata/exp_str.txt
U trunk/ctp2_data/spanish/gamedata/ldl_str.txt
U trunk/ctp2_data/spanish/uidata/layouts/gameplayoptions.ldl
U trunk/ctp2_data/spanish/uidata/layouts/graphics.ldl
U trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl
U trunk/doc/user/playtest/Apolyton_README.txt

**Fromafar** · March 26, 2007, 13:27

Revision 708 Files and texts marked as const, and other small changes

Modified: ctp2_code\gs\fileio\Token.cpp
Modified: ctp2_code\gs\fileio\Token.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_listbox.cpp
Modified: ctp2_code\ui\aui_common\aui_memmap.cpp
Modified: ctp2_code\ui\aui_common\aui_memmap.h
Modified: ctp2_code\ui\aui_common\aui_textbase.cpp
Modified: ctp2_code\ui\aui_common\aui_textbase.h
Modified: ctp2_code\ui\aui_common\aui_textbox.cpp
Modified: ctp2_code\ui\aui_common\aui_textbox.h
Modified: ctp2_code\ui\aui_common\aui_ui.cpp
Modified: ctp2_code\ui\aui_common\aui_ui.h
Modified: ctp2_code\ui\aui_ctp2\c3_checkbox.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_coloredswitch.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_hypertextbox.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_switch.cpp
Modified: ctp2_code\ui\aui_ctp2\c3memmap.cpp
Modified: ctp2_code\ui\aui_ctp2\c3memmap.h
Modified: ctp2_code\ui\aui_ctp2\C3slider.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_button.h
Modified: ctp2_code\ui\aui_ctp2\ctp2_hypertextbox.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_Switch.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_Tab.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_TabButton.cpp
Modified: ctp2_code\ui\aui_ctp2\ctp2_TabGroup.cpp
Modified: ctp2_code\ui\aui_ctp2\patternbase.cpp
Modified: ctp2_code\ui\aui_ctp2\patternbase.h
Modified: ctp2_code\ui\aui_directx\aui_directmouse.cpp
Modified: ctp2_code\ui\aui_directx\aui_directsound.cpp
Modified: ctp2_code\ui\aui_directx\aui_directsurface.cpp
Modified: ctp2_code\ui\aui_directx\aui_directui.cpp
Modified: ctp2_code\ui\aui_directx\aui_directx.h
Modified: ctp2_code\ui\netshell\ns_header.cpp
Modified: ctp2_code\ui\netshell\ns_improvements.cpp
Modified: ctp2_code\ui\netshell\ns_units.cpp
Modified: ctp2_code\ui\netshell\ns_wonders.cpp

**Fromafar** · March 26, 2007, 15:09

Revision 709 Lots of const and other small changes

Modified: ctp2_code\ctp\c3.h
Modified: ctp2_code\ctp\civ3_main.cpp
Modified: ctp2_code\ctp\civ3_main.h
Modified: ctp2_code\ctp\civapp.cpp
Modified: ctp2_code\ctp\civapp.h
Modified: ctp2_code\gs\slic\SlicArray.cpp
Modified: ctp2_code\gs\slic\SlicBuiltinEnum.h
Modified: ctp2_code\gs\slic\SlicConst.cpp
Modified: ctp2_code\gs\slic\SlicEngine.cpp
Modified: ctp2_code\gs\slic\SlicEngine.h
Modified: ctp2_code\gs\slic\SlicNamedSymbol.cpp
Modified: ctp2_code\gs\slic\SlicSymbol.cpp
Modified: ctp2_code\gs\slic\SlicSymbol.h
Modified: ctp2_code\gs\slic\slicif.cpp
Modified: ctp2_code\gs\slic\slicif_sym.h
Modified: ctp2_code\gs\utility\MapFile.cpp
Modified: ctp2_code\gs\utility\MapFile.h
Modified: ctp2_code\gs\utility\TurnCnt.cpp
Modified: ctp2_code\ui\aui_common\aui_bitmapfont.cpp
Modified: ctp2_code\ui\aui_common\aui_bitmapfont.h
Modified: ctp2_code\ui\aui_common\aui_control.cpp
Modified: ctp2_code\ui\aui_common\aui_control.h
Modified: ctp2_code\ui\aui_common\aui_hypertextbase.cpp
Modified: ctp2_code\ui\aui_common\aui_image.cpp
Modified: ctp2_code\ui\aui_common\aui_image.h
Modified: ctp2_code\ui\aui_common\aui_mouse.cpp
Modified: ctp2_code\ui\aui_common\aui_movie.cpp
Modified: ctp2_code\ui\aui_common\aui_movie.h
Modified: ctp2_code\ui\aui_common\aui_moviemanager.cpp
Modified: ctp2_code\ui\aui_common\aui_moviemanager.h
Modified: ctp2_code\ui\aui_common\aui_resource.h
Modified: ctp2_code\ui\aui_common\aui_sound.cpp
Modified: ctp2_code\ui\aui_common\aui_sound.h
Modified: ctp2_code\ui\aui_common\aui_stringtable.cpp
Modified: ctp2_code\ui\aui_common\aui_stringtable.h
Modified: ctp2_code\ui\aui_common\aui_surface.cpp
Modified: ctp2_code\ui\aui_common\aui_window.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_utilitydialogbox.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_utilitydialogbox.h
Modified: ctp2_code\ui\aui_ctp2\c3imageformats.cpp
Modified: ctp2_code\ui\aui_ctp2\c3imageformats.h
Modified: ctp2_code\ui\aui_ctp2\linegraph.cpp
Modified: ctp2_code\ui\aui_ctp2\linegraph.h
Modified: ctp2_code\ui\aui_directx\aui_directmoviemanager.cp p
Modified: ctp2_code\ui\aui_directx\aui_directmoviemanager.h
Modified: ctp2_code\ui\interface\ControlTabPanel.cpp
Modified: ctp2_code\ui\interface\ScienceManagementDialog.cpp
Modified: ctp2_code\ui\interface\String_Search.cpp
Modified: ctp2_code\ui\interface\String_Search.h
Modified: ctp2_code\ui\interface\agesscreen.cpp
Modified: ctp2_code\ui\interface\agesscreen.h
Modified: ctp2_code\ui\interface\c3dialogs.cpp
Modified: ctp2_code\ui\interface\c3dialogs.h
Modified: ctp2_code\ui\interface\chatbox.cpp
Modified: ctp2_code\ui\interface\chatbox.h
Modified: ctp2_code\ui\interface\greatlibrary.cpp
Modified: ctp2_code\ui\interface\greatlibrary_util.cpp
Modified: ctp2_code\ui\interface\greatlibrarywindow.cpp
Modified: ctp2_code\ui\interface\greatlibrarywindow.h
Modified: ctp2_code\ui\interface\infowindow.cpp
Modified: ctp2_code\ui\interface\infowindow.h
Modified: ctp2_code\ui\interface\scenarioeditor.cpp
Modified: ctp2_code\ui\interface\splash.cpp
Modified: ctp2_code\ui\interface\splash.h
Modified: ctp2_code\ui\interface\spnewgamescreen.cpp
Modified: ctp2_code\ui\interface\spnewgametribescreen.cpp
Modified: ctp2_code\ui\interface\spnewgametribescreen.h
Modified: ctp2_code\ui\interface\text_hasher.h
Modified: ctp2_code\ui\netshell\allinonewindow.cpp

This includes a correction for the graphic problems reported by dividebyxero (in civapp.cpp).

**Ekmek** · March 26, 2007, 16:00

I'm getting a few compile errors. will post them in a few minutes

EDIT

ok here they are:

Code:

...ctp2_code\ctp\civ3_main.cpp(314) : error C2039: 'set_new_handler' : is not a member of 'std'
...ctp2_code\ctp\civ3_main.cpp(1605) : error C2248: 'CleanupApp' : cannot access private member declared in class 'CivApp'
        ...ctp2_code\ctp\civapp.h(138) : see declaration of 'CleanupApp'
civapp.cpp
...ctp2_code\ctp\civapp.cpp(2953) : error C2664: 'RestoreScenarioGame' : cannot convert parameter 1 from 'const char *' to 'char *'
        Conversion loses qualifiers
...ctp2_code\ctp\civapp.cpp(3034) : error C2065: 'SAVE_LEADER_NAME_SIZE' : undeclared identifier
...ctp2_code\ctp\civapp.cpp(3099) : error C2057: expected constant expression
...ctp2_code\ctp\civapp.cpp(3099) : error C2466: cannot allocate an array of constant size 0
...ctp2_code\ctp\civapp.cpp(3099) : error C2133: 'leaderName' : unknown size
patternbase.cpp
...ctp2_code\ui\aui_ctp2\patternbase.cpp(93) : error C2664: 'LoadPattern' : cannot convert parameter 1 from 'const char *' to 'char *'
        Conversion loses qualifiers
loadsavewindow.cpp
...ctp2_code\ui\interface\loadsavewindow.cpp(642) : error C2440: 'initializing' : cannot convert from 'class aui_Surface *' to 'class aui_DirectSurface *'
        Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
sourcelist.cpp
...ctp2_code\ui\slic_debug\sourcelist.cpp(610) : error C2664: '__thiscall c3_UtilityTextFieldPopup::c3_UtilityTextFieldPopup(void (__cdecl *)(const char *,int,void *),const char *,const ch
ar *,const char *,char *,void *,bool)' : cannot convert parameter 1 from 'void (char *,int,void *)' to 'void (__cdecl *)(const char *,int,void *)'
        None of the functions with this name in scope match the target type

**Fromafar** · March 26, 2007, 16:45

Revision 710

More const and other small changes
Modified: ctp2_code\gfx\spritesys\UnitActor.cpp
Modified: ctp2_code\gfx\tilesys\TileHighlight.cpp
Modified: ctp2_code\gfx\tilesys\TileInfo.cpp
Modified: ctp2_code\gfx\tilesys\tiledraw.cpp
Modified: ctp2_code\gs\fileio\GameFile.cpp
Modified: ctp2_code\gs\fileio\gamefile.h
Modified: ctp2_code\gs\gameobj\Army.cpp
Modified: ctp2_code\gs\gameobj\Army.h
Modified: ctp2_code\gs\gameobj\ArmyData.cpp
Modified: ctp2_code\gs\gameobj\ArmyData.h
Modified: ctp2_code\gs\gameobj\CityData.cpp
Modified: ctp2_code\gs\gameobj\Diffcly.cpp
Modified: ctp2_code\gs\gameobj\Happy.cpp
Modified: ctp2_code\gs\gameobj\HappyTracker.h
Modified: ctp2_code\gs\gameobj\UnitData.cpp
Modified: ctp2_code\gs\gameobj\armyevent.cpp
Modified: ctp2_code\gs\gameobj\buildingutil.cpp
Modified: ctp2_code\gs\gameobj\terrainutil.cpp
Modified: ctp2_code\gs\utility\gameinit.cpp
Modified: ctp2_code\gs\utility\gameinit.h
Modified: ctp2_code\gs\world\World.h
Modified: ctp2_code\gs\world\WrlUnit.cpp
Modified: ctp2_code\gs\world\WrldCont.cpp
Modified: ctp2_code\gs\world\cellunitlist.cpp
Modified: ctp2_code\gs\world\cellunitlist.h
Modified: ctp2_code\gs\world\wldgen.cpp
Modified: ctp2_code\net\general\net_cell.cpp
Modified: ctp2_code\net\general\net_happy.cpp
Modified: ctp2_code\net\general\net_unit.cpp
Modified: ctp2_code\ui\aui_common\aui_pixel.cpp
Modified: ctp2_code\ui\interface\MainControlPanel.cpp
Modified: ctp2_code\ui\interface\MainControlPanel.h
Modified: ctp2_code\ui\interface\loadsavescreen.cpp
Modified: ctp2_code\ui\interface\loadsavewindow.cpp
Modified: ctp2_code\ui\interface\loadsavewindow.h
Modified: ctp2_code\ui\interface\messagewin.cpp
Modified: ctp2_code\ui\interface\musictrackscreen.cpp
Modified: ctp2_code\ui\interface\musictrackscreen.h

Restored save file compatibility
Modified: ctp2_code\gs\gameobj\happytracker.cpp

Can you report whether MSVC6 has a set_new_handler (maybe not in std::, but in the global namespace) and - if so - which file has to be included?

**Fromafar** · March 26, 2007, 17:47

Revision 711

More const and other small changes
Modified: ctp2_code\ai\CityManagement\governor.cpp
Modified: ctp2_code\ai\ctpai.cpp
Modified: ctp2_code\ai\diplomacy\agreementmatrix.cpp
Modified: ctp2_code\ai\diplomacy\nproposalevent.cpp
Modified: ctp2_code\ai\diplomacy\proposalanalysis.cpp
Modified: ctp2_code\ai\mapanalysis\mapanalysis.cpp
Modified: ctp2_code\ai\strategy\scheduler\Plan.h
Modified: ctp2_code\ctp\civapp.h
Modified: ctp2_code\ctp\ctp2_utils\c3errors.cpp
Modified: ctp2_code\ctp\ctp2_utils\tracklen.cpp
Modified: ctp2_code\gfx\spritesys\FacedSprite.cpp
Modified: ctp2_code\gfx\spritesys\FacedSprite.h
Modified: ctp2_code\gfx\spritesys\Sprite.cpp
Modified: ctp2_code\gfx\spritesys\Sprite.h
Modified: ctp2_code\gs\slic\StringHash.h
Modified: ctp2_code\gs\slic\slicfunc.cpp
Modified: ctp2_code\ui\aui_common\aui_item.h
Modified: ctp2_code\ui\aui_common\aui_region.cpp
Modified: ctp2_code\ui\aui_common\aui_region.h
Modified: ctp2_code\ui\aui_ctp2\c3_listitem.cpp
Modified: ctp2_code\ui\aui_ctp2\c3_listitem.h
Modified: ctp2_code\ui\aui_ctp2\c3ui.h
Modified: ctp2_code\ui\aui_ctp2\keypress.cpp
Modified: ctp2_code\ui\aui_ctp2\radarmap.cpp
Modified: ctp2_code\ui\aui_ctp2\thumbnailmap.cpp
Modified: ctp2_code\ui\interface\messageeyepoint.cpp
Modified: ctp2_code\ui\interface\messageeyepoint.h
Modified: ctp2_code\ui\interface\messageresponse.cpp
Modified: ctp2_code\ui\interface\messageresponse.h

Reset setting defaults to original
Modified: ctp2_code\gs\database\profileDB.cpp

Restored mayor type strings
Modified: ctp2_data\english\gamedata\ldl_str.txt

**Fromafar** · March 27, 2007, 18:11

Revision 712

More const and other small changes
Modified: ctp2_code\robot\pathing\unitastar.cpp
Modified: ctp2_code\ui\slic_debug\sourcelist.cpp

Restored MSVC6 compilation
Modified: ctp2_code\ctp\civ3_main.cpp
Modified: ctp2_code\ai\ctpai.cpp

Added:Scenarios\AlexanderTheGreat\scen0000\english \gamedata\civ_str.txt
Added:Scenarios\AlexanderTheGreat\scen0000\english \gamedata\gl_str.txt
Added:Scenarios\AlexanderTheGreat\scen0000\english \gamedata\scen_str.txt

**Ekmek** · March 27, 2007, 18:17

the only problem i get is this:

Code:

civ3_main.obj : error LNK2001: unresolved external symbol "unsigned int __cdecl Os::GetTicks(void)" (?GetTicks@Os@@YAIXZ)

**Martin Gühmann** · March 27, 2007, 19:03

Originally posted by E
the only problem i get is this:

Code:

civ3_main.obj : error LNK2001: unresolved external symbol "unsigned int __cdecl Os::GetTicks(void)" (?GetTicks@Os@@YAIXZ)

Then recompile civ3_main.cpp and if this does not help recompile everything.

Anyway:

Revision 713: Replaced old map database by new one:

Some cleanings:
modified ../trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
modified ../trunk/ctp2_code/gs/world/World.h

Removed remainings of the old map database
deleted ../trunk/ctp2_code/gs/database/MapDB.cpp
deleted ../trunk/ctp2_code/gs/database/MapDB.h
deleted ../trunk/ctp2_code/gs/database/MapRecord.cpp
deleted ../trunk/ctp2_code/gs/database/MapRecord.h
deleted ../trunk/ctp2_code/gs/database/MapToken.h

Enabled dbgen to generate a parser for map.txt:
modified ../trunk/ctp2_code/gs/dbgen/ctpdb.cpp
modified ../trunk/ctp2_code/gs/dbgen/ctpdb.h
modified ../trunk/ctp2_code/gs/dbgen/ctpdb.l
modified ../trunk/ctp2_code/gs/dbgen/ctpdb.y
modified ../trunk/ctp2_code/gs/dbgen/Datum.h
modified ../trunk/ctp2_code/gs/dbgen/MemberClass.cpp
modified ../trunk/ctp2_code/gs/dbgen/RecordDescription.cpp
modified ../trunk/ctp2_code/gs/dbgen/RecordDescription.h

Replaced old map database by new one:
modified ../trunk/ctp2_code/ctp/civapp.cpp
modified ../trunk/ctp2_code/ctp/civctp.dsp
modified ../trunk/ctp2_code/gs/database/DB.cpp
modified ../trunk/ctp2_code/gs/newdb/CTPDatabase.cpp
added ../trunk/ctp2_code/gs/newdb/Map.cdb
modified ../trunk/ctp2_code/gs/slic/SlicEngine.cpp
modified ../trunk/ctp2_code/gs/utility/DataCheck.cpp
modified ../trunk/ctp2_code/gs/utility/DataCheck.h
modified ../trunk/ctp2_code/gs/world/wldgen.cpp
added ../trunk/ctp2_code/gs/world/worldutils.cpp
added ../trunk/ctp2_code/gs/world/worldutils.h

Announcement

PROJECT: Revision Reports

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment

Comment