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

Merge

Browse source
This commit is contained in:
botanic 2014-03-24 10:45:54 -07:00
commit 6c345bf6b7
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,10 +31,10 @@
#include "nel/misc/mutex.h"
#include "nel/misc/report.h"
#include "nel/misc/system_utils.h"
#include "nel/misc/variable.h"
#include "nel/misc/debug.h"
#ifdef NL_OS_WINDOWS
// these defines is for IsDebuggerPresent(). it'll not compile on windows 95
// just comment this and the IsDebuggerPresent to compile on windows 95
@ -57,6 +57,8 @@ using namespace std;
namespace NLMISC
{
CVariable<bool> StdDisplayerColor("nel", "StdDisplayerColor", "Enable colors in std displayer", true, 0, true);
static const char *LogTypeToString[][8] = {
{ "", "ERR", "WRN", "INF", "DBG", "STT", "AST", "UKN" },
{ "", "Error", "Warning", "Information", "Debug", "Statistic", "Assert", "Unknown" },
@ -139,9 +141,20 @@ void CStdDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mess
bool needSpace = false;
//stringstream ss;
string str;
#ifdef NL_OS_UNIX
bool colorSet = false;
#endif
if (args.LogType != CLog::LOG_NO)
{
#ifdef NL_OS_UNIX
if (StdDisplayerColor.get())
{
if (args.LogType == CLog::LOG_ERROR || args.LogType == CLog::LOG_ASSERT) { str += "\e[0;30m\e[41m"; colorSet = true; } // black text, red background
else if (args.LogType == CLog::LOG_WARNING) { str += "\e[0;91m"; colorSet = true; } // bright red text
else if (args.LogType == CLog::LOG_DEBUG) { str += "\e[0;34m"; colorSet = true; } // blue text
}
#endif
//ss << logTypeToString(args.LogType);
str += logTypeToString(args.LogType);
needSpace = true;
@ -218,6 +231,13 @@ void CStdDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *mess
}
#endif // NL_OS_WINDOWS
#ifdef NL_OS_UNIX
if (colorSet)
{
str += "\e[0m";
}
#endif
// Printf ?
if (consoleMode)
{

22
code/nel/tools/build_gamedata/0_setup.py
View file

@ -86,31 +86,31 @@ if not args.noconf:
try:
ExportBuildDirectory
except NameError:
ExportBuildDirectory = "W:/export"
ExportBuildDirectory = "T:/export"
try:
InstallDirectory
except NameError:
InstallDirectory = "W:/install"
InstallDirectory = "T:/install"
try:
ClientDevDirectory
except NameError:
ClientDevDirectory = "W:/client_dev"
ClientDevDirectory = "T:/client_dev"
try:
ClientPatchDirectory
except NameError:
ClientPatchDirectory = "W:/client_patch"
ClientPatchDirectory = "T:/client_patch"
try:
ClientInstallDirectory
except NameError:
ClientInstallDirectory = "W:/client_install"
ClientInstallDirectory = "T:/client_install"
try:
ShardInstallDirectory
except NameError:
ShardInstallDirectory = "W:/shard"
ShardInstallDirectory = "T:/shard"
try:
WorldEditInstallDirectory
except NameError:
WorldEditInstallDirectory = "W:/worldedit"
WorldEditInstallDirectory = "T:/worldedit"
try:
LeveldesignDirectory
except NameError:
@ -178,7 +178,7 @@ if not args.noconf:
try:
PatchmanBridgeServerDirectory
except NameError:
PatchmanBridgeServerDirectory = "W:/bridge_server"
PatchmanBridgeServerDirectory = "T:/bridge_server"
try:
MaxAvailable
except NameError:
@ -191,7 +191,11 @@ if not args.noconf:
MaxUserDirectory
except NameError:
import os
MaxUserDirectory = os.path.normpath(os.environ["LOCALAPPDATA"] + "/Autodesk/3dsMax/2010 - 32bit/enu")
try:
MaxUserDirectory = os.path.normpath(os.environ["LOCALAPPDATA"] + "/Autodesk/3dsMax/2010 - 32bit/enu")
except KeyError:
MaxAvailable = 0
MaxUserDirectory = "C:/Users/Kaetemi/AppData/Local/Autodesk/3dsMax/2010 - 32bit/enu"
try:
MaxExecutable
except NameError: