|
@@ -8088,20 +8088,6 @@ void clif_parse_WantToConnection(int fd, TBL_PC* sd)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
-static int clif_nighttimer(int tid, unsigned int tick, int id, int data)
|
|
|
|
-{
|
|
|
|
- TBL_PC *sd;
|
|
|
|
- sd=map_id2sd(id);
|
|
|
|
- if (!sd) return 0;
|
|
|
|
-
|
|
|
|
- //Check if character didn't instant-warped after logging in.
|
|
|
|
- if (sd->bl.prev!=NULL) {
|
|
|
|
- sd->state.night = 1;
|
|
|
|
- clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
|
|
- }
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/*==========================================
|
|
/*==========================================
|
|
* 007d クライアント側マップ読み込み完了
|
|
* 007d クライアント側マップ読み込み完了
|
|
* map侵入時に必要なデータを全て送りつける
|
|
* map侵入時に必要なデータを全て送りつける
|
|
@@ -8255,15 +8241,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
|
|
merc_hom_init_timers(sd->hd);
|
|
merc_hom_init_timers(sd->hd);
|
|
|
|
|
|
if (night_flag && map[sd->bl.m].flag.nightenabled)
|
|
if (night_flag && map[sd->bl.m].flag.nightenabled)
|
|
-#if 0
|
|
|
|
- //Delayed night effect on log-on fix for the glow-issue. Thanks to Larry.
|
|
|
|
- add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0);
|
|
|
|
-#else
|
|
|
|
{
|
|
{
|
|
sd->state.night = 1;
|
|
sd->state.night = 1;
|
|
clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
// Notify everyone that this char logged in [Skotlex].
|
|
// Notify everyone that this char logged in [Skotlex].
|
|
clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);
|
|
clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 1);
|
|
|
|
|
|
@@ -8283,18 +8264,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
|
|
//New 'night' effect by dynamix [Skotlex]
|
|
//New 'night' effect by dynamix [Skotlex]
|
|
if (night_flag && map[sd->bl.m].flag.nightenabled)
|
|
if (night_flag && map[sd->bl.m].flag.nightenabled)
|
|
{ //Display night.
|
|
{ //Display night.
|
|
-#if 0
|
|
|
|
- if (sd->state.night) //It must be resent because otherwise players get this annoying aura...
|
|
|
|
- clif_status_load(&sd->bl, SI_NIGHT, 0);
|
|
|
|
- else
|
|
|
|
- sd->state.night = 1;
|
|
|
|
- clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
|
|
-#else
|
|
|
|
if (!sd->state.night) {
|
|
if (!sd->state.night) {
|
|
sd->state.night = 1;
|
|
sd->state.night = 1;
|
|
clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
clif_status_load(&sd->bl, SI_NIGHT, 1);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
} else if (sd->state.night) { //Clear night display.
|
|
} else if (sd->state.night) { //Clear night display.
|
|
sd->state.night = 0;
|
|
sd->state.night = 0;
|
|
clif_status_load(&sd->bl, SI_NIGHT, 0);
|
|
clif_status_load(&sd->bl, SI_NIGHT, 0);
|
|
@@ -12338,7 +12311,6 @@ int do_init_clif(void) {
|
|
add_timer_func_list(clif_waitclose, "clif_waitclose");
|
|
add_timer_func_list(clif_waitclose, "clif_waitclose");
|
|
add_timer_func_list(clif_clearchar_delay_sub, "clif_clearchar_delay_sub");
|
|
add_timer_func_list(clif_clearchar_delay_sub, "clif_clearchar_delay_sub");
|
|
add_timer_func_list(clif_delayquit, "clif_delayquit");
|
|
add_timer_func_list(clif_delayquit, "clif_delayquit");
|
|
- add_timer_func_list(clif_nighttimer, "clif_nighttimer");
|
|
|
|
add_timer_func_list(clif_walktoxy_timer, "clif_walktoxy_timer");
|
|
add_timer_func_list(clif_walktoxy_timer, "clif_walktoxy_timer");
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|