diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-22 18:19:11 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-22 18:19:11 +0000 |
| commit | 86419b56c3c04ee10b6c58906124a471b9853d8b (patch) | |
| tree | 4c5e26d179d09370318bcf4ac0cad45e4927008b /src/map/clif.c | |
| parent | 93344af48f44a7a3e535831318fe9c991a015ed4 (diff) | |
| download | hercules-86419b56c3c04ee10b6c58906124a471b9853d8b.tar.gz hercules-86419b56c3c04ee10b6c58906124a471b9853d8b.tar.bz2 hercules-86419b56c3c04ee10b6c58906124a471b9853d8b.tar.xz hercules-86419b56c3c04ee10b6c58906124a471b9853d8b.zip | |
* Removed code in socket.c that tries to avoid send buffer overloading, as there is a scenario (many players and charserver disconnect) where mass char saving produces huge ammounts of data to send (see r11503)
* Cleaned up player respawning code (bugreport:1022)
* Increased the max amount of different autocast skills from 5 to 10
* Added a missing function declaration, for real this time (followup to r12229)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12232 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index a2dfe6b35..a71cc132e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -642,8 +642,8 @@ int clif_clearflooritem(struct flooritem_data *fitem, int fd) * id : the id of the unit * type: 0 - moved out of sight * 1 - died - * 2 - logged out - * 3 - teleported / winged away + * 2 - respawned + * 3 - teleported / logged out * fd : the target client *------------------------------------------*/ int clif_clearunit_single(int id, uint8 type, int fd) @@ -661,8 +661,8 @@ int clif_clearunit_single(int id, uint8 type, int fd) * make a unit (char, npc, mob, homun) disappear to all clients in area * type: 0 - moved out of sight * 1 - died - * 2 - logged out - * 3 - teleported / winged away + * 2 - respawned + * 3 - teleported / logged out *------------------------------------------*/ int clif_clearunit_area(struct block_list* bl, uint8 type) { @@ -7187,8 +7187,7 @@ int clif_charnameack (int fd, struct block_list *bl) if (battle_config.show_mob_info&1) str_p += sprintf(str_p, "HP: %u/%u | ", md->status.hp, md->status.max_hp); if (battle_config.show_mob_info&2) - str_p += sprintf(str_p, "HP: %d%% | ", - status_calc_life(md->status.hp, md->status.max_hp)); + str_p += sprintf(str_p, "HP: %d%% | ", status_calc_life(md->status.hp, md->status.max_hp)); //Even thought mobhp ain't a name, we send it as one so the client //can parse it. [Skotlex] if (str_p != mobhp) { @@ -8362,12 +8361,7 @@ void clif_parse_Restart(int fd, struct map_session_data *sd) { switch(RFIFOB(fd,2)) { case 0x00: - if (!pc_isdead(sd)) - break; - pc_setstand(sd); - pc_setrestartvalue(sd, 3); - if (pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, 2)) - clif_resurrection(&sd->bl, 1); //If warping fails, send a normal stand up packet. + pc_respawn(sd,2); break; case 0x01: /* Rovert's Prevent logout option - Fixed [Valaris] */ |