Browse Source

[Fixed]:
- Guys can't go across map-servers :( Thanks to Buuyo^

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6905 54d463be-8e91-2dee-dedb-b68131a5f0ec

Lance 19 years ago
parent
commit
8686c24f90
4 changed files with 9 additions and 5 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 0
      src/char/char.c
  3. 1 0
      src/char_sql/char.c
  4. 5 5
      src/map/chrif.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ 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/05/31
+	* [Fixed]:
+	  - Guys can't go across map-servers :( [Lance]
 	* [Fixed]:
 	  - Restoration and saving of sd->npc_id must be done every time. [Lance]
 	* Added back the Freeze/Petrify adjustments of -50%def and +25%mdef (when

+ 1 - 0
src/char/char.c

@@ -2744,6 +2744,7 @@ int parse_frommap(int fd) {
 					char_data->last_point.map = RFIFOW(fd,18);
 					char_data->last_point.x = RFIFOW(fd,20);
 					char_data->last_point.y = RFIFOW(fd,22);
+					char_data->sex = RFIFOB(fd,30);  // Buuyo^
 
 					WFIFOW(map_fd,0) = 0x2afd;
 					WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus);

+ 1 - 0
src/char_sql/char.c

@@ -2620,6 +2620,7 @@ int parse_frommap(int fd) {
 					char_data->last_point.map = RFIFOW(fd,18);
 					char_data->last_point.x = RFIFOW(fd,20);
 					char_data->last_point.y = RFIFOW(fd,22);
+					char_data->sex = RFIFOB(fd,30); // Buuyo^
 
 					WFIFOW(map_fd,0) = 0x2afd;
 					WFIFOW(map_fd,2) = 20 + sizeof(struct mmo_charstatus);

+ 5 - 5
src/map/chrif.c

@@ -324,11 +324,11 @@ int chrif_changemapserver(struct map_session_data *sd, short map, int x, int y,
 	chrif_check(-1);
 
 	s_ip = 0;
-	for(i = 0; i < fd_max; i++)
-		if (session[i] && session[i]->session_data == sd) {
-			s_ip = session[i]->client_addr.sin_addr.s_addr;
-			break;
-		}
+	//for(i = 0; i < fd_max; i++)
+	//	if (session[i] && session[i]->session_data == sd) {
+	s_ip = session[sd->fd]->client_addr.sin_addr.s_addr; // For what you're looping it? [Lance]
+	//		break;
+	//	}
 
 	WFIFOHEAD(char_fd, 35);
 	WFIFOW(char_fd, 0) = 0x2b05;