summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2007-12-24 14:16:15 +0000
committerDavid Athay <ko2fan@gmail.com>2007-12-24 14:16:15 +0000
commit1b19e8e0ad81cf2726fa27133aa342bbb91540dd (patch)
treec3e7f3281eca97f29619ae350bb2be1fe71e8d60 /src
parentad916910b34d91db78c5eb6dc966745117bd0d6f (diff)
downloadmana-client-1b19e8e0ad81cf2726fa27133aa342bbb91540dd.tar.gz
mana-client-1b19e8e0ad81cf2726fa27133aa342bbb91540dd.tar.bz2
mana-client-1b19e8e0ad81cf2726fa27133aa342bbb91540dd.tar.xz
mana-client-1b19e8e0ad81cf2726fa27133aa342bbb91540dd.zip
Minor update, fixed disconnection dialog
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp16
-rw-r--r--src/openglgraphics.cpp2
2 files changed, 10 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp
index de8a3ea2..b3fa6f07 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -60,6 +60,7 @@
#include "gui/ministatus.h"
#include "gui/npclistdialog.h"
#include "gui/npc_text.h"
+#include "gui/ok_dialog.h"
#include "gui/sell.h"
#include "gui/setup.h"
#include "gui/skill.h"
@@ -97,6 +98,7 @@ Joystick *joystick = NULL;
extern Window *weightNotice;
extern Window *deathNotice;
ConfirmDialog *exitConfirm = NULL;
+OkDialog *disconnectedDialog = NULL;
ChatWindow *chatWindow;
MenuWindow *menuWindow;
@@ -134,7 +136,7 @@ namespace {
{
void action(const gcn::ActionEvent &event)
{
- if (event.getId() == "yes") {
+ if (event.getId() == "yes" || event.getId() == "ok") {
done = true;
}
exitConfirm = NULL;
@@ -420,15 +422,15 @@ void Game::logic()
if (!mNetwork->isConnected())
{
- if (!exitConfirm)
+ if (!disconnectedDialog)
{
- exitConfirm = new
- ConfirmDialog("Network Error",
- "There was a network error, the program will now quit");
- exitConfirm->addActionListener(&exitListener);
+ disconnectedDialog = new
+ OkDialog("Network Error",
+ "The connection to the server was lost, the program will now quit");
+ disconnectedDialog->addActionListener(&exitListener);
}
- exitConfirm->requestMoveToTop();
+ disconnectedDialog->requestMoveToTop();
}
}
}
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 51e99fa0..76eff9f5 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -89,7 +89,7 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
(gotDoubleBuffer ? "with" : "without"));
char const *glExtensions = (char const *)glGetString(GL_EXTENSIONS);
- int texSize;
+ GLint texSize;
bool rectTex = strstr(glExtensions, "GL_ARB_texture_rectangle");
if (rectTex)
{