浏览代码

fixing

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1390 54d463be-8e91-2dee-dedb-b68131a5f0ec
shinomori 20 年之前
父节点
当前提交
9cfffd0ac8
共有 2 个文件被更改,包括 16 次插入2 次删除
  1. 8 1
      src/char/char.c
  2. 8 1
      src/char_sql/char.c

+ 8 - 1
src/char/char.c

@@ -1731,7 +1731,6 @@ int parse_tologin(int fd) {
 		case 0x2718:
 		case 0x2718:
 			if (RFIFOREST(fd) < 2)
 			if (RFIFOREST(fd) < 2)
 				return 0;
 				return 0;
-			// do whatever it's supposed to do here?
 			RFIFOSKIP(fd,2);
 			RFIFOSKIP(fd,2);
 			break;
 			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));
 //		printf("parse_frommap: connection #%d, packet: 0x%x (with being read: %d bytes).\n", fd, RFIFOW(fd,0), RFIFOREST(fd));
 
 
 		switch(RFIFOW(fd,0)) {
 		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)
 		// request from map-server to reload GM accounts. Transmission to login-server (by Yor)
 		case 0x2af7:
 		case 0x2af7:
 			if (login_fd > 0) { // don't send request if no login-server
 			if (login_fd > 0) { // don't send request if no login-server

+ 8 - 1
src/char_sql/char.c

@@ -1559,7 +1559,6 @@ int parse_tologin(int fd) {
 		case 0x2718:
 		case 0x2718:
 			if (RFIFOREST(fd) < 2)
 			if (RFIFOREST(fd) < 2)
 				return 0;
 				return 0;
-			// do whatever it's supposed to do here?
 			RFIFOSKIP(fd,2);
 			RFIFOSKIP(fd,2);
 			break;
 			break;
 
 
@@ -1858,6 +1857,14 @@ int parse_frommap(int fd) {
 //		printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
 //		printf("parse_frommap : %d %d %x\n", fd, RFIFOREST(fd), RFIFOW(fd,0));
 
 
 		switch(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:
 		case 0x2af7:
 			RFIFOSKIP(fd,2);
 			RFIFOSKIP(fd,2);
 			read_gm_account();
 			read_gm_account();