gcc-450-compile-fixes.patch
| b/code/ryzom/client/src/client_sheets/animation_set_list_sheet.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 493 | 493 |
// update statics maps |
| 494 | 494 |
if (f.isReading()) |
| 495 | 495 |
{
|
| 496 |
_StringToAnimStateId.insert(pair<string, TAnimStateSheetId>::pair(sStateName, (TAnimStateSheetId)State));
|
|
| 496 |
_StringToAnimStateId.insert(pair<string, TAnimStateSheetId>(sStateName, (TAnimStateSheetId)State)); |
|
| 497 | 497 |
if (_AnimStateIdToString.size() <= State) |
| 498 | 498 |
_AnimStateIdToString.resize(State+1); |
| 499 | 499 |
_AnimStateIdToString[State] = sStateName; |
| b/code/ryzom/client/src/connection.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 2118 | 2118 |
{
|
| 2119 | 2119 |
vector< pair < string, string > > params; |
| 2120 | 2120 |
params.clear(); |
| 2121 |
params.push_back(pair<string,string>::pair("id", toString(Mainlands[i].Id)));
|
|
| 2121 |
params.push_back(pair<string,string>("id", toString(Mainlands[i].Id)));
|
|
| 2122 | 2122 |
if (i>0) |
| 2123 |
params.push_back(pair<string,string>::pair("posref", "BL TL"));
|
|
| 2123 |
params.push_back(pair<string,string>("posref", "BL TL"));
|
|
| 2124 | 2124 |
|
| 2125 | 2125 |
CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_mainland", GROUP_LIST_MAINLAND, params);
|
| 2126 | 2126 |
if (pNewLine != NULL) |
| ... | ... | |
| 2240 | 2240 |
{
|
| 2241 | 2241 |
vector< pair < string, string > > params; |
| 2242 | 2242 |
params.clear(); |
| 2243 |
params.push_back(pair<string,string>::pair("id", id));
|
|
| 2243 |
params.push_back(pair<string,string>("id", id));
|
|
| 2244 | 2244 |
if (!First) |
| 2245 | 2245 |
{
|
| 2246 |
params.push_back(pair<string,string>::pair("posref", "BL TL"));
|
|
| 2246 |
params.push_back(pair<string,string>("posref", "BL TL"));
|
|
| 2247 | 2247 |
} |
| 2248 | 2248 |
First = false; |
| 2249 | 2249 |
CInterfaceManager *pIM = CInterfaceManager::getInstance(); |
| ... | ... | |
| 2712 | 2712 |
{
|
| 2713 | 2713 |
vector< pair < string, string > > params; |
| 2714 | 2714 |
params.clear(); |
| 2715 |
params.push_back(pair<string,string>::pair("id", toString(Mainlands[i].Id)));
|
|
| 2716 |
params.push_back(pair<string,string>::pair("w", "1024"));
|
|
| 2717 |
params.push_back(pair<string,string>::pair("tooltip", "uiRingFilterShard"));
|
|
| 2715 |
params.push_back(pair<string,string>("id", toString(Mainlands[i].Id)));
|
|
| 2716 |
params.push_back(pair<string,string>("w", "1024"));
|
|
| 2717 |
params.push_back(pair<string,string>("tooltip", "uiRingFilterShard"));
|
|
| 2718 | 2718 |
CInterfaceGroup *toggleGr =pIM->createGroupInstance("label_toggle_button", shardList->getId(), params);
|
| 2719 | 2719 |
shardList->addChild(toggleGr); |
| 2720 | 2720 |
// set unicode name |
| b/code/ryzom/client/src/entity_animation_manager.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 207 | 207 |
string sTmp = strlwr(pASLS->AnimSetList[i].Name); |
| 208 | 208 |
sTmp = sTmp.substr(0,sTmp.rfind('.'));
|
| 209 | 209 |
pair<map<string,CAnimationSet>::iterator, bool> it; |
| 210 |
it = _AnimSet.insert(pair<string,CAnimationSet>::pair(sTmp,as));
|
|
| 210 |
it = _AnimSet.insert(pair<string,CAnimationSet>(sTmp,as)); |
|
| 211 | 211 |
it.first->second.init (&pASLS->AnimSetList[i], _AnimationSet); |
| 212 | 212 |
} |
| 213 | 213 |
|
| b/code/ryzom/client/src/interface_v3/interface_ddx.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 961 | 961 |
// *************************************************************************** |
| 962 | 962 |
void CDDXManager::add(CInterfaceDDX *pDDX) |
| 963 | 963 |
{
|
| 964 |
_DDXes.insert(pair<string,CInterfaceDDX*>::pair(pDDX->getId(),pDDX));
|
|
| 964 |
_DDXes.insert(pair<string,CInterfaceDDX*>(pDDX->getId(),pDDX)); |
|
| 965 | 965 |
} |
| 966 | 966 |
|
| 967 | 967 |
// *************************************************************************** |
| b/code/ryzom/client/src/interface_v3/interface_parser.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 248 | 248 |
{
|
| 249 | 249 |
string sTmp = child->getId(); |
| 250 | 250 |
sTmp = sTmp.substr(_Id.size()+1,sTmp.size()); |
| 251 |
_Accel.insert(pair<string,CInterfaceGroup*>::pair(sTmp, child));
|
|
| 251 |
_Accel.insert(pair<string,CInterfaceGroup*>(sTmp, child)); |
|
| 252 | 252 |
CInterfaceGroup::addGroup(child,eltOrder); |
| 253 | 253 |
} |
| 254 | 254 |
|
| b/code/ryzom/client/src/interface_v3/inventory_manager.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 2795 | 2795 |
|
| 2796 | 2796 |
// Try to put all items in the DB order in all the bags of the player : (bag, pa0-3, steed) |
| 2797 | 2797 |
vector <pair <double, double> > BagsBulk; |
| 2798 |
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(0), pInv->getMaxBagBulk(0)));
|
|
| 2798 |
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(0), pInv->getMaxBagBulk(0))); |
|
| 2799 | 2799 |
|
| 2800 | 2800 |
nlctassert(MAX_INVENTORY_ANIMAL==4); |
| 2801 | 2801 |
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal1)) |
| 2802 |
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(2), pInv->getMaxBagBulk(2)));
|
|
| 2802 |
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(2), pInv->getMaxBagBulk(2))); |
|
| 2803 | 2803 |
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal2)) |
| 2804 |
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(3), pInv->getMaxBagBulk(3)));
|
|
| 2804 |
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(3), pInv->getMaxBagBulk(3))); |
|
| 2805 | 2805 |
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal3)) |
| 2806 |
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
|
|
| 2806 |
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); |
|
| 2807 | 2807 |
if (pInv->isInventoryAvailable(INVENTORIES::pet_animal4)) |
| 2808 |
BagsBulk.push_back(pair <double, double>::pair(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
|
|
| 2808 |
BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4))); |
|
| 2809 | 2809 |
|
| 2810 | 2810 |
bool bPlaceFound = true; |
| 2811 | 2811 |
|
| b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 417 | 417 |
pIM->getDbProp(DbComboDisp2P); |
| 418 | 418 |
|
| 419 | 419 |
vector< pair<string,string> > vArgs; |
| 420 |
vArgs.push_back(pair<string,string>::pair("id",name));
|
|
| 421 |
vArgs.push_back(pair<string,string>::pair("db_sel_cat",DbComboSelCat));
|
|
| 422 |
vArgs.push_back(pair<string,string>::pair("db_sel_act",DbComboSelAct));
|
|
| 423 |
vArgs.push_back(pair<string,string>::pair("db_sel_1p",DbComboSel1P));
|
|
| 424 |
vArgs.push_back(pair<string,string>::pair("db_sel_2p",DbComboSel2P));
|
|
| 425 |
vArgs.push_back(pair<string,string>::pair("db_disp_1p",DbComboDisp1P));
|
|
| 426 |
vArgs.push_back(pair<string,string>::pair("db_disp_2p",DbComboDisp2P));
|
|
| 420 |
vArgs.push_back(pair<string,string>("id",name));
|
|
| 421 |
vArgs.push_back(pair<string,string>("db_sel_cat",DbComboSelCat));
|
|
| 422 |
vArgs.push_back(pair<string,string>("db_sel_act",DbComboSelAct));
|
|
| 423 |
vArgs.push_back(pair<string,string>("db_sel_1p",DbComboSel1P));
|
|
| 424 |
vArgs.push_back(pair<string,string>("db_sel_2p",DbComboSel2P));
|
|
| 425 |
vArgs.push_back(pair<string,string>("db_disp_1p",DbComboDisp1P));
|
|
| 426 |
vArgs.push_back(pair<string,string>("db_disp_2p",DbComboDisp2P));
|
|
| 427 | 427 |
|
| 428 | 428 |
Win = dynamic_cast<CGroupContainer*>(pIM->createGroupInstance(TEMPLATE_EDITCMD, "ui:interface", vArgs)); |
| 429 | 429 |
if (Win == NULL) |
| b/code/ryzom/client/src/interface_v3/people_list.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 73 | 73 |
|
| 74 | 74 |
// create the base container |
| 75 | 75 |
vector< pair<string, string> > baseContainerParams; |
| 76 |
baseContainerParams.push_back(pair<string, string>::pair("id", desc.Id));
|
|
| 76 |
baseContainerParams.push_back(pair<string, string>("id", desc.Id));
|
|
| 77 | 77 |
std::string baseId; |
| 78 | 78 |
if (fatherContainer == NULL) |
| 79 | 79 |
{
|
| 80 |
baseContainerParams.push_back(pair<string, string>::pair("movable","true"));
|
|
| 81 |
baseContainerParams.push_back(pair<string, string>::pair("active","false"));
|
|
| 82 |
baseContainerParams.push_back(pair<string, string>::pair("opened","true"));
|
|
| 80 |
baseContainerParams.push_back(pair<string, string>("movable","true"));
|
|
| 81 |
baseContainerParams.push_back(pair<string, string>("active","false"));
|
|
| 82 |
baseContainerParams.push_back(pair<string, string>("opened","true"));
|
|
| 83 | 83 |
baseId = "ui:interface"; |
| 84 | 84 |
} |
| 85 | 85 |
else |
| b/code/ryzom/client/src/login.cpp Sat May 08 23:27:35 2010 +0200 | ||
|---|---|---|
| 177 | 177 |
{
|
| 178 | 178 |
vector< pair < string, string > > params; |
| 179 | 179 |
params.clear(); |
| 180 |
params.push_back(pair<string,string>::pair("id", "c"+toString(i)));
|
|
| 180 |
params.push_back(pair<string,string>("id", "c"+toString(i)));
|
|
| 181 | 181 |
if (i>0) |
| 182 |
params.push_back(pair<string,string>::pair("posref", "BL TL"));
|
|
| 182 |
params.push_back(pair<string,string>("posref", "BL TL"));
|
|
| 183 | 183 |
|
| 184 | 184 |
CInterfaceGroup *pNewLine = pIM->createGroupInstance("t_cat", GROUP_LIST_CAT, params);
|
| 185 | 185 |
if (pNewLine != NULL) |
| ... | ... | |
| 1103 | 1103 |
{
|
| 1104 | 1104 |
vector< pair < string, string > > params; |
| 1105 | 1105 |
params.clear(); |
| 1106 |
params.push_back(pair<string,string>::pair("id", "s"+toString(i)));
|
|
| 1106 |
params.push_back(pair<string,string>("id", "s"+toString(i)));
|
|
| 1107 | 1107 |
if (i>0) |
| 1108 |
params.push_back(pair<string,string>::pair("posref", "BL TL"));
|
|
| 1108 |
params.push_back(pair<string,string>("posref", "BL TL"));
|
|
| 1109 | 1109 |
|
| 1110 | 1110 |
CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_shard", GROUP_LIST_SHARD, params);
|
| 1111 | 1111 |
if (pNewLine != NULL) |
| ... | ... | |
| 1229 | 1229 |
// {
|
| 1230 | 1230 |
// vector< pair < string, string > > params; |
| 1231 | 1231 |
// params.clear(); |
| 1232 |
// params.push_back(pair<string,string>::pair("id", "s"+toString(i)));
|
|
| 1232 |
// params.push_back(pair<string,string>("id", "s"+toString(i)));
|
|
| 1233 | 1233 |
// if (i>0) |
| 1234 |
// params.push_back(pair<string,string>::pair("posref", "BL TL"));
|
|
| 1234 |
// params.push_back(pair<string,string>("posref", "BL TL"));
|
|
| 1235 | 1235 |
// |
| 1236 | 1236 |
// CInterfaceGroup *pNewLine =pIM->createGroupInstance("t_shard", GROUP_LIST_SHARD, params);
|
| 1237 | 1237 |
// if (pNewLine != NULL) |
| ... | ... | |
| 2033 | 2033 |
// first indicates the preset-able cfg-variable |
| 2034 | 2034 |
// second indicates if its a double variable (else it's an int) |
| 2035 | 2035 |
CfgPresetList.clear(); |
| 2036 |
CfgPresetList.push_back(pair<string,bool>::pair("LandscapeTileNear", true));
|
|
| 2037 |
CfgPresetList.push_back(pair<string,bool>::pair("LandscapeThreshold", true));
|
|
| 2038 |
CfgPresetList.push_back(pair<string,bool>::pair("Vision", true));
|
|
| 2039 |
CfgPresetList.push_back(pair<string,bool>::pair("MicroVeget", false));
|
|
| 2040 |
CfgPresetList.push_back(pair<string,bool>::pair("MicroVegetDensity", true));
|
|
| 2041 |
CfgPresetList.push_back(pair<string,bool>::pair("FxNbMaxPoly", false));
|
|
| 2042 |
CfgPresetList.push_back(pair<string,bool>::pair("Cloud", false));
|
|
| 2043 |
CfgPresetList.push_back(pair<string,bool>::pair("CloudQuality", true));
|
|
| 2044 |
CfgPresetList.push_back(pair<string,bool>::pair("CloudUpdate", false));
|
|
| 2045 |
CfgPresetList.push_back(pair<string,bool>::pair("Shadows", false));
|
|
| 2046 |
CfgPresetList.push_back(pair<string,bool>::pair("SkinNbMaxPoly", false));
|
|
| 2047 |
CfgPresetList.push_back(pair<string,bool>::pair("NbMaxSkeletonNotCLod", false));
|
|
| 2048 |
CfgPresetList.push_back(pair<string,bool>::pair("CharacterFarClip", true));
|
|
| 2049 |
|
|
| 2050 |
CfgPresetList.push_back(pair<string,bool>::pair("Bloom", false));
|
|
| 2051 |
CfgPresetList.push_back(pair<string,bool>::pair("SquareBloom", false));
|
|
| 2052 |
CfgPresetList.push_back(pair<string,bool>::pair("DensityBloom", true));
|
|
| 2036 |
CfgPresetList.push_back(pair<string,bool>("LandscapeTileNear", true));
|
|
| 2037 |
CfgPresetList.push_back(pair<string,bool>("LandscapeThreshold", true));
|
|
| 2038 |
CfgPresetList.push_back(pair<string,bool>("Vision", true));
|
|
| 2039 |
CfgPresetList.push_back(pair<string,bool>("MicroVeget", false));
|
|
| 2040 |
CfgPresetList.push_back(pair<string,bool>("MicroVegetDensity", true));
|
|
| 2041 |
CfgPresetList.push_back(pair<string,bool>("FxNbMaxPoly", false));
|
|
| 2042 |
CfgPresetList.push_back(pair<string,bool>("Cloud", false));
|
|
| 2043 |
CfgPresetList.push_back(pair<string,bool>("CloudQuality", true));
|
|
| 2044 |
CfgPresetList.push_back(pair<string,bool>("CloudUpdate", false));
|
|
| 2045 |
CfgPresetList.push_back(pair<string,bool>("Shadows", false));
|
|
| 2046 |
CfgPresetList.push_back(pair<string,bool>("SkinNbMaxPoly", false));
|
|
| 2047 |
CfgPresetList.push_back(pair<string,bool>("NbMaxSkeletonNotCLod", false));
|
|
| 2048 |
CfgPresetList.push_back(pair<string,bool>("CharacterFarClip", true));
|
|
| 2049 |
|
|
| 2050 |
CfgPresetList.push_back(pair<string,bool>("Bloom", false));
|
|
| 2051 |
CfgPresetList.push_back(pair<string,bool>("SquareBloom", false));
|
|
| 2052 |
CfgPresetList.push_back(pair<string,bool>("DensityBloom", true));
|
|
| 2053 | 2053 |
|
| 2054 | 2054 |
// Check if all the preset-able cfg-variable are in a preset mode |
| 2055 | 2055 |
sint nPreset = -1; |