mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 04:51:52 +00:00
And more VS2015 fixes
--HG-- branch : develop
This commit is contained in:
parent
e4b72e63a1
commit
5c6edf6cee
3 changed files with 5 additions and 5 deletions
|
@ -2122,7 +2122,7 @@ public:
|
|||
CInterfaceGroup *pList = dynamic_cast<CInterfaceGroup*>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_MAINLAND));
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -2315,7 +2315,7 @@ public:
|
|||
List = dynamic_cast<CInterfaceGroup *>(CWidgetManager::getInstance()->getElementFromId(GROUP_LIST_KEYSET));
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
@ -1977,7 +1977,7 @@ void CObjectInteger::dump(const std::string prefix, uint depth) const
|
|||
{
|
||||
//H_AUTO(R2_CObjectInteger_dump)
|
||||
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());
|
||||
}
|
||||
|
||||
|
|
|
@ -236,7 +236,7 @@ private:
|
|||
break;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue