From b0e39dbb7950dffb3ec487ab48f6f154fc7c82bd Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 5 Apr 2006 14:16:47 +0000 Subject: - Some cleanup of clif_parseloadendack, fixed guild-member list being sent on all map-changes. - Removed the hardcoded removal of characters who spawn in a castle. All castle maps got the flag nosave now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5909 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 19 +++++++++++++------ src/map/pc.c | 7 ------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/map') diff --git a/src/map/clif.c b/src/map/clif.c index 417fd448b..e16610107 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7928,9 +7928,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->status.party_id) clif_party_hp(sd); - //[LuzZza] - clif_guild_send_onlineinfo(sd); - // pvp //if(sd->pvp_timer!=-1 && !battle_config.pk_mode) /PVP Client crash fix* Removed timer deletion // delete_timer(sd->pvp_timer,pc_calc_pvprank_timer); @@ -7966,8 +7963,14 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->state.connect_new) { sd->state.connect_new = 0; //Delayed night effect on log-on fix for the glow-issue. Thanks to Larry. - if (night_flag && map[sd->bl.m].flag.nightenabled) - add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0); + if (night_flag) { + char tmpstr[1024]; + strcpy(tmpstr, msg_txt(500)); // Actually, it's the night... + clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1); + + if (map[sd->bl.m].flag.nightenabled) + add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0); + } // if(sd->status.class_ != sd->vd.class_) // clif_refreshlook(&sd->bl,sd->bl.id,LOOK_BASE,sd->vd.class_,SELF); @@ -7979,13 +7982,17 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 900) clif_pet_emotion(sd->pd,(sd->pd->class_ - 100)*100 + 50 + pet_hungry_val(sd)); + //[LuzZza] + clif_guild_send_onlineinfo(sd); -/* Stop players from spawning inside castles [Valaris] */ +/* Unneccesary due to mapflag "nosave" [Skotlex] +// Stop players from spawning inside castles [Valaris] { struct guild_castle *gc=guild_mapname2gc(map[sd->bl.m].name); if (gc) pc_setpos(sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,2); } +*/ } else //New 'night' effect by dynamix [Skotlex] if (night_flag && map[sd->bl.m].flag.nightenabled) diff --git a/src/map/pc.c b/src/map/pc.c index 752917f61..9711727c0 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -761,13 +761,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t sd->state.event_disconnect = 1; sd->state.event_kill_mob = 1; - if (night_flag) { - char tmpstr[1024]; - strcpy(tmpstr, msg_txt(500)); // Actually, it's the night... - clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1); - //Night packet is sent when it finishes loading the map. [Skotlex] - } - // ステ?タス初期計算など status_calc_pc(sd,1); -- cgit v1.2.3-70-g09d2