diff options
author | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
---|---|---|
committer | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
commit | 98d3cc01d58d9bbdd8b02f1f64bb3432649aa2c2 (patch) | |
tree | 93b7235de06ffbd4f18ccf58ec62f7e079d7d7f5 /src/server/worldserver/Main.cpp | |
parent | 7b7327acdcbeadc5ec509da4520190205d640f52 (diff) | |
parent | df334f194c7b0da49fd1c1a4f821df78a0e25fb8 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rwxr-xr-x | src/server/worldserver/Main.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index bc861e6b039..10b7e00aa99 100755 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -72,8 +72,6 @@ void usage(const char *prog) /// Launch the Trinity server extern int main(int argc, char **argv) { - ACE::init(); - ///- Command line parsing to get the configuration file name char const* cfg_file = _TRINITY_CORE_CONFIG; int c=1; @@ -151,8 +149,6 @@ extern int main(int argc, char **argv) // 1 - shutdown at error // 2 - restart command used, this code can be used by restarter for restart Trinityd - ACE::fini(); - return ret; } |