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

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2015-12-26 17:49:54 +01:00
parent 148e10f839
commit f4225dddf1
3 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -536,7 +536,7 @@ PFNGLXFREEMEMORYNVPROC nglXFreeMemoryNV;
// Swap control extensions // Swap control extensions
PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT; PFNGLXSWAPINTERVALEXTPROC nglXSwapIntervalEXT;
PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI; PFNGLXSWAPINTERVALSGIPROC nglXSwapIntervalSGI;
PFNGLXSWAPINTERVALMESAPROC nglXSwapIntervalMESA; PFNGLXSWAPINTERVALMESAPROC nglXSwapIntervalMESA;
PFNGLXGETSWAPINTERVALMESAPROC nglXGetSwapIntervalMESA; PFNGLXGETSWAPINTERVALMESAPROC nglXGetSwapIntervalMESA;

18
code/nel/src/misc/common.cpp
View file

@ -687,24 +687,6 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
si.cb = sizeof(si); si.cb = sizeof(si);
/* SECURITY_ATTRIBUTES sa;
sa.nLength = sizeof (sa);
sa.lpSecurityDescriptor = NULL;
sa.bInheritHandle = FALSE;
STARTUPINFO si;
si.cb = sizeof (si);
si.lpReserved = NULL;
si.lpDesktop = NULL;
si.lpTitle = NULL;
si.dwFlags = STARTF_USESHOWWINDOW;
si.cbReserved2 = 0;
si.wShowWindow = SW_MINIMIZE;
si.lpReserved2 = NULL;
PROCESS_INFORMATION pi;
*/
// Enable nlassert/nlstop to display the error reason & callstack // Enable nlassert/nlstop to display the error reason & callstack
const TCHAR *SE_TRANSLATOR_IN_MAIN_MODULE = _T("NEL_SE_TRANS"); const TCHAR *SE_TRANSLATOR_IN_MAIN_MODULE = _T("NEL_SE_TRANS");
TCHAR envBuf [2]; TCHAR envBuf [2];

11
code/nel/src/misc/displayer.cpp
View file

@ -520,10 +520,7 @@ void CFileDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mes
// in release "<Msg>" // in release "<Msg>"
void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message) void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *message)
{ {
//#ifdef NL_OS_WINDOWS
bool needSpace = false; bool needSpace = false;
// stringstream ss;
string str; string str;
// create the string for the clipboard // create the string for the clipboard
@ -536,7 +533,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
if (args.LogType != CLog::LOG_NO) if (args.LogType != CLog::LOG_NO)
{ {
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; }
str += logTypeToString(args.LogType); str += logTypeToString(args.LogType);
needSpace = true; needSpace = true;
@ -544,7 +540,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
if (!args.ProcessName.empty()) if (!args.ProcessName.empty())
{ {
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; }
str += args.ProcessName; str += args.ProcessName;
needSpace = true; needSpace = true;
@ -552,7 +547,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
if (args.FileName != NULL) if (args.FileName != NULL)
{ {
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; }
str += CFile::getFilename(args.FileName); str += CFile::getFilename(args.FileName);
needSpace = true; needSpace = true;
@ -560,7 +554,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
if (args.Line != -1) if (args.Line != -1)
{ {
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; }
str += NLMISC::toString(args.Line); str += NLMISC::toString(args.Line);
needSpace = true; needSpace = true;
@ -568,7 +561,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
if (args.FuncName != NULL) if (args.FuncName != NULL)
{ {
//if (needSpace) { ss << " "; needSpace = false; }
if (needSpace) { str += " "; needSpace = false; } if (needSpace) { str += " "; needSpace = false; }
str += args.FuncName; str += args.FuncName;
needSpace = true; needSpace = true;
@ -582,7 +574,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
// create the string on the screen // create the string on the screen
needSpace = false; needSpace = false;
// stringstream ss2;
string str2; string str2;
#ifdef NL_DEBUG #ifdef NL_DEBUG
@ -709,8 +700,6 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
setCrashAlreadyReported(true); setCrashAlreadyReported(true);
} }
} }
//#endif
} }