Couple of Fixes

.editorconfig

@@ -0,0 +1,20 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[*.{c,h,cpp,hpp}]
+indent_size = 4
+indent_style = space
+cpp_indent_case_contents_when_block = true
+cpp_new_line_before_open_brace_namespace = same_line
+cpp_indent_namespace_contents = true

src/common/CLog.cpp

@@ -6,7 +6,7 @@
 #include "CLog.h"
 
 
-int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept
+int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args, ConsoleTextColor iColor) noexcept
 {
     if (pszFormat == nullptr || pszFormat[0] == '\0')
         return 0;
@@ -21,7 +21,7 @@ int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept
     // if ( ( pFix = strchr( pszText, 0x0C ) ) )
     //	*pFix = ' ';
 
-    return EventStr(dwMask, pszTemp);
+    return EventStr(dwMask, pszTemp, iColor);
 }
 
 int CEventLog::Event(dword dwMask, lpctstr pszFormat, ...) noexcept
@@ -60,6 +60,15 @@ int CEventLog::EventWarn(lpctstr pszFormat, ...) noexcept
     return iret;
 }
 
+int CEventLog::EventCustom(ConsoleTextColor iColor, dword dwMask, lpctstr pszFormat, ...) noexcept
+{
+    va_list vargs;
+    va_start(vargs, pszFormat);
+    int iret = VEvent(dwMask, pszFormat, vargs, iColor);
+    va_end(vargs);
+    return iret;
+}
+
 #ifdef _DEBUG
 int CEventLog::EventEvent(lpctstr pszFormat, ...) noexcept
 {
@@ -204,7 +213,7 @@ bool CLog::OpenLog(lpctstr pszBaseDirName)	// name set previously.
 	THREAD_UNIQUE_LOCK_RETURN(CLog::_OpenLog(pszBaseDirName));
 }
 
-int CLog::EventStr( dword dwMask, lpctstr pszMsg ) noexcept
+int CLog::EventStr( dword dwMask, lpctstr pszMsg, ConsoleTextColor iLogColor) noexcept
 {
     ADDTOCALLSTACK("CLog::EventStr");
 	// NOTE: This could be called in odd interrupt context so don't use dynamic stuff
@@ -217,7 +226,7 @@ int CLog::EventStr( dword dwMask, lpctstr pszMsg ) noexcept
 
 	try
 	{
-        ConsoleTextColor iLogTextColor = CTCOL_DEFAULT;
+        ConsoleTextColor iLogTextColor = iLogColor;
         ConsoleTextColor iLogTypeColor = CTCOL_DEFAULT;
 
 		// Put up the date/time.

src/common/CLog.h

@@ -44,7 +44,8 @@ enum LOG_TYPE
 	LOGM_KILLS			= 0x010000,	// Log player combat results.
 	LOGM_HTTP			= 0x020000,
 	LOGM_NOCONTEXT		= 0x040000,	// do not include context information
-	LOGM_DEBUG			= 0x080000	// debug kind of message with "DEBUG:" prefix
+	LOGM_DEBUG			= 0x080000,	// debug kind of message with "DEBUG:" prefix
+    LOGM_QTY            = 0x0FFF00  // All masks.
 };
 
 class CSError;
@@ -58,15 +59,16 @@ class CEventLog
 	// May include __LINE__ or __FILE__ macro as well ?
 
 protected:
-	virtual int EventStr(dword dwMask, lpctstr pszMsg) noexcept = 0;
+	virtual int EventStr(dword dwMask, lpctstr pszMsg, ConsoleTextColor iColor = CTCOL_DEFAULT) noexcept = 0;
 
-    int VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept;
+    int VEvent(dword dwMask, lpctstr pszFormat, va_list args, ConsoleTextColor iColor = CTCOL_DEFAULT) noexcept;
 
 public:
 	int _cdecl Event( dword dwMask, lpctstr pszFormat, ... ) noexcept __printfargs(3,4);
 	int _cdecl EventDebug(lpctstr pszFormat, ...) noexcept  __printfargs(2,3);
 	int _cdecl EventError(lpctstr pszFormat, ...) noexcept __printfargs(2,3);
 	int _cdecl EventWarn(lpctstr pszFormat, ...) noexcept __printfargs(2,3);
+    int _cdecl EventCustom(ConsoleTextColor iColor, dword dwMask, lpctstr pszFormat, ...) noexcept __printfargs(4,5);
 #ifdef _DEBUG
 	int _cdecl EventEvent( lpctstr pszFormat, ... ) noexcept __printfargs(2,3);
 #endif //_DEBUG
@@ -117,7 +119,7 @@ public:		bool OpenLog(lpctstr pszName = nullptr);
 	bool IsLoggedLevel( LOG_TYPE level ) const;
 	bool IsLogged( dword dwMask ) const;
 
-	virtual int EventStr( dword dwMask, lpctstr pszMsg ) noexcept final;	// final: for now, it doesn't have any other virtual methods
+	virtual int EventStr( dword dwMask, lpctstr pszMsg, ConsoleTextColor iLogColor = CTCOL_DEFAULT ) noexcept final;	// final: for now, it doesn't have any other virtual methods
 	void _cdecl CatchEvent( const CSError * pErr, lpctstr pszCatchContext, ...  ) __printfargs(3,4);
     void _cdecl CatchStdException( const std::exception * pExc, lpctstr pszCatchContext, ...  ) __printfargs(3,4);
 

src/common/CScriptObj.cpp

@@ -2454,7 +2454,7 @@ TRIGRET_TYPE CScriptObj::OnTriggerLoopGeneric(CScript& s, int iType, CTextConsol
 		if (s.HasArgs())
 			iDist = s.GetArgVal();
 		else
-			iDist = UO_MAP_VIEW_SIZE_DEFAULT;
+			iDist = g_Cfg.m_iMapViewSize;
 
 		CObjBaseTemplate* pObj = dynamic_cast <CObjBaseTemplate*>(this);
 		if (pObj == nullptr)