Browse Source

- Oops, should have fixed the crash in intif gm message.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7626 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
b69c506ca7
3 changed files with 2 additions and 2 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 0 1
      src/login_sql/login.c
  3. 1 1
      src/map/intif.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/07/11
+	* Should have fixed the crash in intif gm message... [Skotlex]
 	* Fixed GTB card only working while you had a status-change active.
 	  [Skotlex]
 	* Fixed being unable to compound cards in armor. [Skotlex]

+ 0 - 1
src/login_sql/login.c

@@ -1514,7 +1514,6 @@ int parse_login(int fd) {
 	sprintf(ip, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
 
 	memset(&account, 0, sizeof(account));
-	i = RFIFOREST(fd)>=2?RFIFOW(fd,0):0;
 
 	if (session[fd]->eof) {
 		for(i = 0; i < MAX_SERVERS; i++)

+ 1 - 1
src/map/intif.c

@@ -837,10 +837,10 @@ static int mapif_parse_WisToGM_sub(struct map_session_data* sd,va_list va) {
 	char *message;
 	int len;
 	if (pc_isGM(sd) < min_gm_level) return 0;
-	clif_wis_message(sd->fd, wisp_name, message, len);
 	wisp_name = va_arg(va, char*);
 	message = va_arg(va, char*);
 	len = va_arg(va, int);
+	clif_wis_message(sd->fd, wisp_name, message, len);
 	return 1;
 }