[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
This commit is contained in:
Seline
2008-10-14 11:57:03 -05:00
parent 222cbfd464
commit 2265aef916
463 changed files with 10750 additions and 7723 deletions

View File

@@ -1,5 +1,7 @@
/*
* Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
* Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
*
* Thanks to the original authors: MaNGOS <http://www.mangosproject.org/>
*
* 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<Log>::Instance().outString(buf);
Trinity::Singleton<Log>::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<Log>::Instance().outDetail(buf);
Trinity::Singleton<Log>::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<Log>::Instance().outDebug(buf);
Trinity::Singleton<Log>::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<Log>::Instance().outError(buf);
Trinity::Singleton<Log>::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<Log>::Instance().outErrorDb(buf);
Trinity::Singleton<Log>::Instance().outErrorDb(buf);
}