diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-31 05:42:46 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-31 05:42:46 +0000 |
| commit | a3b417d70f387726b2b88071324aff788bd9ab83 (patch) | |
| tree | 567d2342d1165217745912a1c5f07b44de9b4a95 | |
| parent | 217c2be1cd48fba3b327931526a8d1a070583cf0 (diff) | |
| download | hercules-a3b417d70f387726b2b88071324aff788bd9ab83.tar.gz hercules-a3b417d70f387726b2b88071324aff788bd9ab83.tar.bz2 hercules-a3b417d70f387726b2b88071324aff788bd9ab83.tar.xz hercules-a3b417d70f387726b2b88071324aff788bd9ab83.zip | |
* Merged changes up to eAthena 15113.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16177 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | conf/msg_athena.conf | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index 2e4fe62ff..645416702 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -418,7 +418,7 @@ // Messages of others (not for GM commands) // ---------------------------------------- -500: Night Mode is already active +//500: FREE 501: Your account time limit is: %d-%m-%Y %H:%M:%S. 502: Day Mode is activated 503: Night Mode is activated diff --git a/src/map/pc.c b/src/map/pc.c index a9597b11e..bc3ee1acd 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1075,13 +1075,6 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1); } - //Night message - 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); - } - /** * Fixes login-without-aura glitch (the screen won't blink at this point, don't worry :P) **/ |