summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-04-01 00:14:51 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-04-01 00:14:51 +0000
commit05f71c98af1bc9d9aabf3e8e3dc78cae75675e1c (patch)
tree921b18da0dc52e7562f0c6a02e5343f9b582cf64 /src/gui
parent78c72d1463735ad6e3a176f89d3c41a5ed71fc40 (diff)
downloadmana-05f71c98af1bc9d9aabf3e8e3dc78cae75675e1c.tar.gz
mana-05f71c98af1bc9d9aabf3e8e3dc78cae75675e1c.tar.bz2
mana-05f71c98af1bc9d9aabf3e8e3dc78cae75675e1c.tar.xz
mana-05f71c98af1bc9d9aabf3e8e3dc78cae75675e1c.zip
* The client will now only attempt to load .tmx or .tmx.gz files.
* When unable to connect to char server, report IP to which it can't connect. * Cleaned up logger a bit.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/char_select.cpp1
-rw-r--r--src/gui/char_server.cpp8
-rw-r--r--src/gui/skill.cpp1
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 41e27a89..d8071ac2 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -104,7 +104,6 @@ CharSelectDialog::CharSelectDialog():
selectButton->requestFocus();
setLocationRelativeTo(getParent());
-
}
CharSelectDialog::~CharSelectDialog()
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index e3835df7..057de3c7 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -152,12 +152,14 @@ void char_server() {
void server_char_server(int serverIndex) {
int ret;
state = LOGIN;
+ const char *ipstring = iptostring(server_info[serverIndex].address);
// Connect to char server
- ret = open_session(iptostring(server_info[serverIndex].address),
- server_info[serverIndex].port);
+ ret = open_session(ipstring, server_info[serverIndex].port);
if (ret == SOCKET_ERROR) {
- new OkDialog("Error", "Unable to connect to char server");
+ std::string str = std::string("Unable to connect to char server ") +
+ std::string(ipstring);
+ new OkDialog("Error", str);
return;
}
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index c5aaab45..c342582f 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -175,4 +175,3 @@ void SkillDialog::setSkill(int id, int lv, int sp)
}
}
}
-