diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-14 17:44:09 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-14 17:44:09 +0000 |
| commit | 5ebd70e99093121afbb725639800e2b3238e2a0a (patch) | |
| tree | fa69ba7fe4bafe7e5b5855f0b82250bdd87dcb6d | |
| parent | 1c50be4625cfde394039d2836b6d5cca6f2da5c0 (diff) | |
| download | hercules-5ebd70e99093121afbb725639800e2b3238e2a0a.tar.gz hercules-5ebd70e99093121afbb725639800e2b3238e2a0a.tar.bz2 hercules-5ebd70e99093121afbb725639800e2b3238e2a0a.tar.xz hercules-5ebd70e99093121afbb725639800e2b3238e2a0a.zip | |
Fixed charsrever crashes, caused by r11410
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11466 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e9c1a4298..626ce6511 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/10/14 + * Fixed charsrever crashes, caused by r11410 [ultramage] 2007/10/13 * Fixed up NPC_POWERUP and NPC_AGIUP [Playtester] - NPC_POWERUP: 3x ATK and 2x HIT for 10+5*level seconds diff --git a/src/char/char.c b/src/char/char.c index 5ecbc4f98..d56c79b28 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -3633,12 +3633,12 @@ int parse_char(int fd) WFIFOL(login_fd,2) = sd->account_id; memcpy(WFIFOP(login_fd, 6), email, 40); WFIFOSET(login_fd,46); + // change value to put new packet (char selection) RFIFOSKIP(fd,-3); //FIXME: Will this work? Messing with the received buffer is ugly anyway... RFIFOW(fd,0) = 0x66; RFIFOB(fd,2) = char_dat[sd->found_char[i]].status.char_num; // not send packet, it's modify of actual packet - break; } else { WFIFOHEAD(fd,3); WFIFOW(fd,0) = 0x70; diff --git a/src/char_sql/char.c b/src/char_sql/char.c index f3ecdfe43..f8729a39b 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1795,7 +1795,6 @@ int parse_fromlogin(int fd) WFIFOW(i,0) = 0x81; WFIFOB(i,2) = 2; WFIFOSET(i,3); - break; } else //Shouldn't happen, but just in case. set_char_offline(99, aid); |