summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-31 18:59:30 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-31 18:59:30 +0000
commitdfbd9a3b2e2ba9d87e4bbad431106a1a97b45baa (patch)
treef087dac580d59b61be99c86798cd3b048aa6c94a
parentd825efaf6f0debd2532d815d9083ec034677c8ee (diff)
downloadhercules-dfbd9a3b2e2ba9d87e4bbad431106a1a97b45baa.tar.gz
hercules-dfbd9a3b2e2ba9d87e4bbad431106a1a97b45baa.tar.bz2
hercules-dfbd9a3b2e2ba9d87e4bbad431106a1a97b45baa.tar.xz
hercules-dfbd9a3b2e2ba9d87e4bbad431106a1a97b45baa.zip
Wiped out the old night code
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9755 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c28
2 files changed, 2 insertions, 28 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4aafa79db..4504f74b4 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/01/31
+ * Wiped out the old night code (use svn if you want it) [ultramage]
2007/01/30
* 'Long Range Attacked' mob skill conditions will no longer trigger on
magic attacks.
diff --git a/src/map/clif.c b/src/map/clif.c
index f10f1a043..32a0843d2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8088,20 +8088,6 @@ void clif_parse_WantToConnection(int fd, TBL_PC* sd)
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 クライアント側マップ読み込み完了
* map侵入時に必要なデータを全て送りつける
@@ -8255,15 +8241,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
merc_hom_init_timers(sd->hd);
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;
clif_status_load(&sd->bl, SI_NIGHT, 1);
}
-#endif
// Notify everyone that this char logged in [Skotlex].
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]
if (night_flag && map[sd->bl.m].flag.nightenabled)
{ //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) {
sd->state.night = 1;
clif_status_load(&sd->bl, SI_NIGHT, 1);
}
-#endif
} else if (sd->state.night) { //Clear night display.
sd->state.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_clearchar_delay_sub, "clif_clearchar_delay_sub");
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");
return 0;
}