summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-22 19:09:37 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2006-01-22 19:09:37 +0000
commita3dc55aad06753799b59db132b0a6beb813ecc00 (patch)
tree6b4fe63dd7a5794f4a5c7dd8178b3224b1400114
parentbd56bf8afdab16383ed8ad08412a8c807f84af85 (diff)
downloadmana-a3dc55aad06753799b59db132b0a6beb813ecc00.tar.gz
mana-a3dc55aad06753799b59db132b0a6beb813ecc00.tar.bz2
mana-a3dc55aad06753799b59db132b0a6beb813ecc00.tar.xz
mana-a3dc55aad06753799b59db132b0a6beb813ecc00.zip
Use generic error method for sound failure.
-rw-r--r--ChangeLog1
-rw-r--r--src/main.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ca31abce..64d96638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2006-01-22 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/main.cpp: Use generic error method for sound failure.
* src/main.cpp, src/net/charserverhandler.cpp,
src/net/loginhandler.cpp, src/net/maploginhandler.cpp,
src/net/network.cpp: Unify some network stuff in the main loop and fix
diff --git a/src/main.cpp b/src/main.cpp
index c9320713..d6fe8910 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,6 @@
#include "gui/error.h"
#include "gui/gui.h"
#include "gui/login.h"
-#include "gui/ok_dialog.h"
#include "gui/register.h"
#include "gui/updatewindow.h"
#include "gui/textfield.h"
@@ -294,7 +293,7 @@ void init_engine()
}
catch (const char *err) {
state = ERROR_STATE;
- new OkDialog("Sound Engine", err, &initWarningListener);
+ errorMessage = err;
logger->log("Warning: %s", err);
}