summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-03 17:08:16 +0000
committershinomori <shinomori@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-03 17:08:16 +0000
commit6c436842f8e6ce0d6ca52eda9b302a74831f479a (patch)
tree86a07bcb4540c34cf7a28d6515b7ad3bfb8db79d
parent74362c7e51463fdc5008ea0ba9ebfb56b2e0994a (diff)
downloadhercules-6c436842f8e6ce0d6ca52eda9b302a74831f479a.tar.gz
hercules-6c436842f8e6ce0d6ca52eda9b302a74831f479a.tar.bz2
hercules-6c436842f8e6ce0d6ca52eda9b302a74831f479a.tar.xz
hercules-6c436842f8e6ce0d6ca52eda9b302a74831f479a.zip
fixing
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1390 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/char/char.c9
-rw-r--r--src/char_sql/char.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 85f97e154..0e3c4579f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1731,7 +1731,6 @@ int parse_tologin(int fd) {
case 0x2718:
if (RFIFOREST(fd) < 2)
return 0;
- // do whatever it's supposed to do here?
RFIFOSKIP(fd,2);
break;
@@ -2142,6 +2141,14 @@ int parse_frommap(int fd) {
// printf("parse_frommap: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd));
switch(RFIFOW(fd,0)) {
+
+ // map-server alive packet
+ case 0x2718:
+ if (RFIFOREST(fd) < 2)
+ return 0;
+ RFIFOSKIP(fd,2);
+ break;
+
// request from map-server to reload GM accounts. Transmission to login-server (by Yor)
case 0x2af7:
if (login_fd > 0) { // don't send request if no login-server
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 673065fe5..2cac7de08 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1559,7 +1559,6 @@ int parse_tologin(int fd) {
case 0x2718:
if (RFIFOREST(fd) < 2)
return 0;
- // do whatever it's supposed to do here?
RFIFOSKIP(fd,2);
break;
@@ -1858,6 +1857,14 @@ int parse_frommap(int fd) {
// printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
switch(RFIFOW(fd, 0)) {
+
+ // map-server alive packet
+ case 0x2718:
+ if (RFIFOREST(fd) < 2)
+ return 0;
+ RFIFOSKIP(fd,2);
+ break;
+
case 0x2af7:
RFIFOSKIP(fd,2);
read_gm_account();