浏览代码

* Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14468 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 年之前
父节点
当前提交
c038d41ecc
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/char/char.c
  3. 1 1
      src/char_sql/char.c

+ 1 - 0
Changelog-Trunk.txt

@@ -8,6 +8,7 @@ Date	Added
 	- Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245).
 	- Fixed functions in db.c not being returned as pointer, causing warnings on VC6.
 	* Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei]
+	* Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei]
 2010/11/16
 	* Added a missing argument to a warning containing a format specifier. [Paradox924X]
 2010/11/15

+ 1 - 1
src/char/char.c

@@ -3893,7 +3893,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data)
 	memcpy(WFIFOP(login_fd,26), passwd, 24);
 	WFIFOL(login_fd,50) = 0;
 	WFIFOL(login_fd,54) = htonl(char_ip);
-	WFIFOL(login_fd,58) = htons(char_port);
+	WFIFOW(login_fd,58) = htons(char_port);
 	memcpy(WFIFOP(login_fd,60), server_name, 20);
 	WFIFOW(login_fd,80) = 0;
 	WFIFOW(login_fd,82) = char_maintenance;

+ 1 - 1
src/char_sql/char.c

@@ -3624,7 +3624,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data)
 	memcpy(WFIFOP(login_fd,26), passwd, 24);
 	WFIFOL(login_fd,50) = 0;
 	WFIFOL(login_fd,54) = htonl(char_ip);
-	WFIFOL(login_fd,58) = htons(char_port);
+	WFIFOW(login_fd,58) = htons(char_port);
 	memcpy(WFIFOP(login_fd,60), server_name, 20);
 	WFIFOW(login_fd,80) = 0;
 	WFIFOW(login_fd,82) = char_maintenance;