summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-01 01:55:35 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-01 01:55:35 +0000
commit291142d689cdc66d8bd3a8980056adab2e4b8a5a (patch)
tree61f0d4c9561fefe58fc5e36d5bbd221231f878bc
parent743c2576cca728f2313aa20d7f9a2d2b97257ecc (diff)
downloadhercules-291142d689cdc66d8bd3a8980056adab2e4b8a5a.tar.gz
hercules-291142d689cdc66d8bd3a8980056adab2e4b8a5a.tar.bz2
hercules-291142d689cdc66d8bd3a8980056adab2e4b8a5a.tar.xz
hercules-291142d689cdc66d8bd3a8980056adab2e4b8a5a.zip
[Fixed]:
- Guys can't go across map-servers :( Thanks to Buuyo^ git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6905 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char/char.c1
-rw-r--r--src/char_sql/char.c1
-rw-r--r--src/map/chrif.c10
4 files changed, 9 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 31b1f4851..14b8678b2 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ 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
where these lost?). Thanks to Buuyo for pointing it out. [Skotlex]
diff --git a/src/char/char.c b/src/char/char.c
index 6b25561a1..78ad37146 100644
--- a/src/char/char.c
+++ b/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);
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 72280cf87..66846fa7d 100644
--- a/src/char_sql/char.c
+++ b/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);
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 17e47b4f5..7f4c0be92 100644
--- a/src/map/chrif.c
+++ b/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;