Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merged default

Browse source 
--HG--
branch : client_config_qt
This commit is contained in:
dfighter1985 2013-05-04 21:56:21 +02:00
commit 301077c93d
4 changed files with 24138 additions and 24135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
View file

@ -128,7 +128,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMinValue(void) const
{ {
uint32 lhs = _Arg[0]->getMinValue(); uint32 lhs = _Arg[0]->getMinValue();
uint32 rhs = _Arg[1]->getMaxValue(); uint32 rhs = _Arg[1]->getMaxValue();
return rhs > rhs ? 0 : lhs - rhs; return lhs > rhs ? 0 : lhs - rhs;
} }
break; break;
default: default:
@ -153,7 +153,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMaxValue(void) const
{ {
uint32 lhs = _Arg[0]->getMaxValue(); uint32 lhs = _Arg[0]->getMaxValue();
uint32 rhs = _Arg[1]->getMinValue(); uint32 rhs = _Arg[1]->getMinValue();
return rhs > rhs ? 0 : lhs - rhs; return lhs > rhs ? 0 : lhs - rhs;
} }
break; break;
default: default:

3
code/nel/src/misc/sheet_id.cpp
View file

@ -168,12 +168,15 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
_Id.IdInfos.Type = typeId; _Id.IdInfos.Type = typeId;
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1; _Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
_DevSheetNameToId[unknownNewType] = _Id.Id; _DevSheetNameToId[unknownNewType] = _Id.Id;
if (sheetName == "unknown")
return true; // Return with the unknown sheet id of this type
} }
else else
{ {
typeId = tit->second; typeId = tit->second;
_Id.IdInfos.Type = typeId; _Id.IdInfos.Type = typeId;
} }
// Add a new sheet name to the type
_DevSheetIdToName[typeId].push_back(sheetNameLc); _DevSheetIdToName[typeId].push_back(sheetNameLc);
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1; _Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
// nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id); // nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id);

2
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widget_hierarchy.cpp
View file

@ -84,7 +84,7 @@ namespace GUIEditor
CInterfaceGroup *mg = CWidgetManager::getInstance()->getMasterGroupFromId( masterGroup ); CInterfaceGroup *mg = CWidgetManager::getInstance()->getMasterGroupFromId( masterGroup );
if( mg != NULL ) if( mg != NULL )
{ {
QTreeWidgetItem *item = new QTreeWidgetItem( NULL ); QTreeWidgetItem *item = new QTreeWidgetItem( static_cast<QTreeWidgetItem*>(NULL) );
item->setText( 0, "ui" ); item->setText( 0, "ui" );
widgetHT->addTopLevelItem( item ); widgetHT->addTopLevelItem( item );