diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/main.cpp | 12 | ||||
-rw-r--r-- | src/storage.cpp | 5 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2005-12-26 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * 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 <bertram@cegetel.net> * 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); } |