aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 23:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

And more VS2015 fixes

Browse source 
--HG--
branch : develop
This commit is contained in:
kaetemi 2016-01-15 12:33:27 +01:00
parent e4b72e63a1
commit 5c6edf6cee
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/connection.cpp
View file

@ -2122,7 +2122,7 @@ public:
CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND)); CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
if (pList == NULL) if (pList == NULL)
{ {
nlwarning("element "GROUP_LIST_MAINLAND" not found probably bad outgame.xml"); nlwarning("element " GROUP_LIST_MAINLAND " not found probably bad outgame.xml");
return; return;
} }
@ -2315,7 +2315,7 @@ public:
List = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET)); List = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET));
if (List == NULL) if (List == NULL)
{ {
nlwarning("element "GROUP_LIST_KEYSET" not found probably bad outgame.xml"); nlwarning("element " GROUP_LIST_KEYSET " not found probably bad outgame.xml");
return; return;
} }

4
code/ryzom/common/src/game_share/object.cpp
View file

@ -894,7 +894,7 @@ void CObjectInteger::inPlaceCopy(const CObjectInteger &src)
} }
std::string CObjectInteger::doToString() const { return NLMISC::toString("%d"NL_I64, _Value); } std::string CObjectInteger::doToString() const { return NLMISC::toString("%" NL_I64 "d", _Value); }
void CObjectInteger::doSerialize(std::string& out, CSerializeContext& /* context */) const void CObjectInteger::doSerialize(std::string& out, CSerializeContext& /* context */) const
{ {
@ -1977,7 +1977,7 @@ void CObjectInteger::dump(const std::string prefix, uint depth) const
{ {
//H_AUTO(R2_CObjectInteger_dump) //H_AUTO(R2_CObjectInteger_dump)
std::string result(depth * 4, ' '); std::string result(depth * 4, ' ');
result += NLMISC::toString("%sInteger, ptr = 0x%p, value = %d"NL_I64", ghost = %s", prefix.c_str(), this, _Value, _Ghost ? "true" : "false"); result += NLMISC::toString("%sInteger, ptr = 0x%p, value = %" NL_I64 "d, ghost = %s", prefix.c_str(), this, _Value, _Ghost ? "true" : "false");
nlwarning(result.c_str()); nlwarning(result.c_str());
} }

2
code/ryzom/tools/leveldesign/csv_transform/sadge_lib/include/text_output.h
View file

@ -236,7 +236,7 @@ private:
break; break;
default: default:
fprintf(stderr,"\n"__FILE__":%d: BUG: invlid special code in CTextOutput object: %d\n",__LINE__,(int)code); fprintf(stderr,"\n" __FILE__ ":%d: BUG: invlid special code in CTextOutput object: %d\n",__LINE__,(int)code);
} }
} }