aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-24 09:58:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More of that VS2015 magic

Browse source
This commit is contained in:
kaetemi 2016-01-15 16:17:23 +01:00
parent c4f5b5d521
commit 8b95360709
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/client/src/login.cpp
View file

@ -208,7 +208,7 @@ void createOptionalCatUI()
CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT)); CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT));
if (pList == NULL) if (pList == NULL)
{ {
nlwarning("element "GROUP_LIST_CAT" not found probably bad login_main.xml"); nlwarning("element " GROUP_LIST_CAT " not found probably bad login_main.xml");
return; return;
} }
@ -1085,7 +1085,7 @@ void initShardDisplay()
CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_SHARD)); CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_SHARD));
if (pList == NULL) if (pList == NULL)
{ {
nlwarning("element "GROUP_LIST_SHARD" not found probably bad login_main.xml"); nlwarning("element " GROUP_LIST_SHARD " not found probably bad login_main.xml");
return; return;
} }
/* // To test more servers /* // To test more servers
@ -1303,7 +1303,7 @@ class CAHOnLogin : public IActionHandler
CGroupEditBox *pGEBPwd = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_PASSWORD)); CGroupEditBox *pGEBPwd = dynamic_cast<CGroupEditBox*>(CWidgetManager::getInstance()->getElementFromId(CTRL_EDITBOX_PASSWORD));
if ((pGEBLog == NULL) || (pGEBPwd == NULL)) if ((pGEBLog == NULL) || (pGEBPwd == NULL))
{ {
nlwarning("element "CTRL_EDITBOX_LOGIN" or "CTRL_EDITBOX_PASSWORD" not found probably bad login_main.xml"); nlwarning("element " CTRL_EDITBOX_LOGIN " or " CTRL_EDITBOX_PASSWORD " not found probably bad login_main.xml");
return; return;
} }
@ -1587,7 +1587,7 @@ void initPatch()
CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT)); CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_CAT));
if (pList == NULL) if (pList == NULL)
{ {
nlwarning("element "GROUP_LIST_CAT" not found probably bad login_main.xml"); nlwarning("element " GROUP_LIST_CAT " not found probably bad login_main.xml");
return; return;
} }

2
code/ryzom/client/src/r2/displayer_visual_entity.cpp
View file

@ -1108,7 +1108,7 @@ std::string CDisplayerVisualEntity::getVisualProperties() const
uint64 uVPB = leafB->getValue64(); uint64 uVPB = leafB->getValue64();
uint64 uVPC = leafC->getValue64(); uint64 uVPC = leafC->getValue64();
const std::string strVPABC = NLMISC::toString( "VPA:%016.16"NL_I64"x\nVPB:%016.16"NL_I64"x\nVPC:%016.16"NL_I64"x", uVPA, uVPB, uVPC ); const std::string strVPABC = NLMISC::toString( "VPA:%016.16" NL_I64 "x\nVPB:%016.16" NL_I64 "x\nVPC:%016.16" NL_I64 "x", uVPA, uVPB, uVPC );
return strVPABC; return strVPABC;
} }

6
code/ryzom/client/src/r2/editor.cpp
View file

@ -806,7 +806,7 @@ int CEditor::luaGetVisualPropertiesFromInstanceId(CLuaState &ls)
uint64 uVPB = vB.get(); uint64 uVPB = vB.get();
uint64 uVPC = vC.get(); uint64 uVPC = vC.get();
std::string strVPABC = NLMISC::toString( "VPA:%016.16"NL_I64"x\nVPB:%016.16"NL_I64"x\nVPC:%016.16"NL_I64"x", uVPA, uVPB, uVPC ); std::string strVPABC = NLMISC::toString( "VPA:%016.16" NL_I64 "x\nVPB:%016.16" NL_I64 "x\nVPC:%016.16" NL_I64 "x", uVPA, uVPB, uVPC );
ls.push(strVPABC); ls.push(strVPABC);
@ -1957,12 +1957,12 @@ int CEditor::luaRemoveInstanceObserver(CLuaState &ls)
IInstanceObserver *observer = getEditor().getInstanceObserver((TInstanceObserverHandle) ls.toInteger(2)); IInstanceObserver *observer = getEditor().getInstanceObserver((TInstanceObserverHandle) ls.toInteger(2));
if (observer == NULL) if (observer == NULL)
{ {
CLuaIHM::fails(ls, "Instance observer not found for handle = %d"NL_I64, ls.toInteger(2)); CLuaIHM::fails(ls, "Instance observer not found for handle = %" NL_I64 "d", ls.toInteger(2));
} }
CInstanceObserverLua *luaObserver = dynamic_cast<CInstanceObserverLua *>(observer); CInstanceObserverLua *luaObserver = dynamic_cast<CInstanceObserverLua *>(observer);
if (luaObserver == NULL) if (luaObserver == NULL)
{ {
CLuaIHM::fails(ls, "Instance observer found for handle %d"NL_I64", but has bad type, it wasn't registered from lua.", ls.toInteger(2)); CLuaIHM::fails(ls, "Instance observer found for handle %" NL_I64 "d, but has bad type, it wasn't registered from lua.", ls.toInteger(2));
} }
getEditor().removeInstanceObserver((TInstanceObserverHandle) ls.toInteger(2)); getEditor().removeInstanceObserver((TInstanceObserverHandle) ls.toInteger(2));
CLuaObject receiver = luaObserver->getReceiver(); CLuaObject receiver = luaObserver->getReceiver();