From ad9ecbf35e0d986d704deba6f8f20ad72a94a99e Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 26 Dec 2005 13:39:26 +0000 Subject: Removed an obsolete check, suggested by r0nny. --- ChangeLog | 6 ++++++ src/main.cpp | 12 +++++++++--- src/storage.cpp | 5 ----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d41ff0e6..ff895084 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-26 Bjørn Lindeijer + + * src/storage.cpp: Removed manual throwing of std::bad_alloc, which + should happen by default unless new(nothrow) is used. Suggested by + r0nny. + 2005-12-20 Yohann Ferreira * src/Makefile.am: Adding the MapManager to files list. diff --git a/src/main.cpp b/src/main.cpp index e53089c0..052f86c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -80,9 +80,15 @@ bool running = true; /**< Determines if server keeps running */ Skill skillTree("base"); /**< Skill tree */ Configuration config; /**< XML config reader */ -AccountHandler *accountHandler = new AccountHandler(); /**< Account message handler */ -ChatHandler *chatHandler = new ChatHandler(); /**< Communications (chat) messaqge handler */ -GameHandler *gameHandler = new GameHandler(); /**< Core game message handler */ + +/** Account message handler */ +AccountHandler *accountHandler = new AccountHandler(); + +/** Communications (chat) message handler */ +ChatHandler *chatHandler = new ChatHandler(); + +/** Core game message handler */ +GameHandler *gameHandler = new GameHandler(); ConnectionHandler connectionHandler; /**< Primary connection handler */ diff --git a/src/storage.cpp b/src/storage.cpp index adea90e6..d2a875b1 100644 --- a/src/storage.cpp +++ b/src/storage.cpp @@ -71,11 +71,6 @@ Storage::instance(const std::string& name) mName = name; } - // check that the instance has been created. - if (mInstance == 0) { - throw std::bad_alloc(); - } - return (*mInstance); } -- cgit v1.2.3-60-g2f50