From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001 From: Seline Date: Tue, 14 Oct 2008 11:57:03 -0500 Subject: [svn] * Merge Temp dev SVN with Assembla. * Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk --- src/shared/Log.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/shared/Log.cpp') diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index b6283bc8437..2dda08c598a 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS + * Copyright (C) 2008 Trinity + * + * Thanks to the original authors: MaNGOS * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "Common.h" @@ -702,7 +704,7 @@ void outstring_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - MaNGOS::Singleton::Instance().outString(buf); + Trinity::Singleton::Instance().outString(buf); } void detail_log(const char * str, ...) @@ -716,7 +718,7 @@ void detail_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - MaNGOS::Singleton::Instance().outDetail(buf); + Trinity::Singleton::Instance().outDetail(buf); } void debug_log(const char * str, ...) @@ -730,7 +732,7 @@ void debug_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - MaNGOS::Singleton::Instance().outDebug(buf); + Trinity::Singleton::Instance().outDebug(buf); } void error_log(const char * str, ...) @@ -744,7 +746,7 @@ void error_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - MaNGOS::Singleton::Instance().outError(buf); + Trinity::Singleton::Instance().outError(buf); } void error_db_log(const char * str, ...) @@ -758,5 +760,5 @@ void error_db_log(const char * str, ...) vsnprintf(buf,256, str, ap); va_end(ap); - MaNGOS::Singleton::Instance().outErrorDb(buf); + Trinity::Singleton::Instance().outErrorDb(buf); } -- cgit v1.2.3