diff options
-rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
-rw-r--r-- | src/char/char.c | 10 | ||||
-rw-r--r-- | src/char_sql/char.c | 10 | ||||
-rw-r--r-- | src/map/status.c | 2 |
4 files changed, 23 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 98d18b808..443e31ddf 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/08/10 + * Added sending a dummy 0x08b9 packet (PIN auth system) in the char-server, required to support clients from this year. [Skotlex] * Updated unitwarp so that an id of "0" causes the script's rid to be warped. This allows OnTouchNPC scripts to warp the monster. [Skotlex] * Updated @warp/@jump commands so that when an invalid tile is specified, a nearby cell is chosen. 2011/08/06 diff --git a/src/char/char.c b/src/char/char.c index 4c9e1fb7d..6e7100403 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -2223,6 +2223,16 @@ int parse_fromlogin(int fd) { // send characters to player mmo_char_send006b(i, sd); +#if PACKETVER >= 20110309 + // PIN code system, disabled + WFIFOHEAD(i, 12); + WFIFOW(i, 0) = 0x08B9; + WFIFOW(i, 2) = 0; + WFIFOW(i, 4) = 0; + WFIFOL(i, 6) = sd->account_id; + WFIFOW(i, 10) = 0; + WFIFOSET(i, 12); +#endif } } RFIFOSKIP(fd,62); diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 1844295b8..535338177 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1942,6 +1942,16 @@ int parse_fromlogin(int fd) { // send characters to player mmo_char_send006b(i, sd); +#if PACKETVER >= 20110309 + // PIN code system, disabled + WFIFOHEAD(i, 12); + WFIFOW(i, 0) = 0x08B9; + WFIFOW(i, 2) = 0; + WFIFOW(i, 4) = 0; + WFIFOL(i, 6) = sd->account_id; + WFIFOW(i, 10) = 0; + WFIFOSET(i, 12); +#endif } } RFIFOSKIP(fd,62); diff --git a/src/map/status.c b/src/map/status.c index 69f6757d0..33ad82eb3 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -869,6 +869,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) sc = NULL; if (hp < 0) { + if (hp == INT_MIN) hp++; //-INT_MIN == INT_MIN in some architectures! status_damage(NULL, bl, -hp, 0, 0, 1); hp = 0; } @@ -882,6 +883,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) } if(sp < 0) { + if (sp==INT_MIN) sp++; status_damage(NULL, bl, 0, -sp, 0, 1); sp = 0; } |