Changeset 44 for trunk/src/trinitycore/Main.cpp

Timestamp:

11/19/08 13:27:40 (17 years ago)

Author:

yumileroy

Message:

[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.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Files:

• trunk/src/trinitycore/Main.cpp (modified) (7 diffs)

trunk/src/trinitycore/Main.cpp

@@ -1 +1 @@
 /* 
- * 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
@@ -9 +11 @@
  * 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
  */
 
-/// \addtogroup mangosd Mangos Daemon
+/// \addtogroup Trinityd Trinity Daemon
 /// @{
 /// \file
@@ -26 +28 @@
 #include "Log.h"
 #include "Master.h"
-#include "../game/IRCConf.h"
-#include "../game/IRCClient.h"
 
 #ifndef _TRINITY_CORE_CONFIG
@@ -41 +41 @@
 #ifdef WIN32
 #include "ServiceWin32.h"
-char serviceName[] = "mangosd";
-char serviceLongName[] = "MaNGOS world service";
+char serviceName[] = "Trinityd";
+char serviceLongName[] = "Trinity core service";
 char serviceDescription[] = "Massive Network Game Object Server";
 /*
@@ -73 +73 @@
 }
 
-/// Launch the mangos server
+/// Launch the Trinity server
 extern int main(int argc, char **argv)
 {
     ///- Command line parsing to get the configuration file name
     char const* cfg_file = _TRINITY_CORE_CONFIG;
-    char const* mc_cfg_file = _TRINITY_CORE_CONFIG;
     int c=1;
     while( c < argc )
@@ -140 +139 @@
     }
 
-    sIRC.SetCfg(mc_cfg_file);
     sLog.outString("Using configuration file %s.", cfg_file);
     
@@ -163 +161 @@
     // 0 - normal shutdown
     // 1 - shutdown at error
-    // 2 - restart command used, this code can be used by restarter for restart mangosd
+    // 2 - restart command used, this code can be used by restarter for restart Trinityd
 }