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

Merge with develop

Browse source
This commit is contained in:
kervala 2016-02-10 18:48:09 +01:00
commit 4a77ebcd44
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/misc/log.cpp
View file

@ -260,7 +260,7 @@ void CLog::displayString (const char *str)
TempArgs.FileName = _FileName; TempArgs.FileName = _FileName;
TempArgs.Line = _Line; TempArgs.Line = _Line;
TempArgs.FuncName = _FuncName; TempArgs.FuncName = _FuncName;
TempArgs.CallstackAndLog = ""; TempArgs.CallstackAndLog.clear();
TempString = str; TempString = str;
} }
@ -281,7 +281,7 @@ void CLog::displayString (const char *str)
localargs.FileName = _FileName; localargs.FileName = _FileName;
localargs.Line = _Line; localargs.Line = _Line;
localargs.FuncName = _FuncName; localargs.FuncName = _FuncName;
localargs.CallstackAndLog = ""; localargs.CallstackAndLog.clear();
disp = str; disp = str;
args = &localargs; args = &localargs;
@ -314,7 +314,7 @@ void CLog::displayString (const char *str)
(*idi)->display( *args, disp ); (*idi)->display( *args, disp );
} }
} }
TempString = ""; TempString.clear();
unsetPosition(); unsetPosition();
} }

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

@ -555,7 +555,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
} }
else else
{ {
return NLMISC::toString( "<Sheet %d not found in sheet_id.bin>", _Id.Id ); return NLMISC::toString( "<Sheet %u not found in sheet_id.bin>", _Id.Id );
} }
} }