summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 08:18:12 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 08:18:12 +0000
commit5d74a6eb814877732086b98df293b513d5a91e96 (patch)
tree88970c5cdf65209eef6384b9e904be58c3c953f0
parent69b055ee5b2ce7ff629f8e2c395b7e069bb7fd9a (diff)
downloadhercules-5d74a6eb814877732086b98df293b513d5a91e96.tar.gz
hercules-5d74a6eb814877732086b98df293b513d5a91e96.tar.bz2
hercules-5d74a6eb814877732086b98df293b513d5a91e96.tar.xz
hercules-5d74a6eb814877732086b98df293b513d5a91e96.zip
Added expire messages and night flag to the list of things not-to-be-REdisplayed if you change map-servers (on multi-map-server setups)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15446 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/pc.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 8701bbb13..d5b6b688e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1032,6 +1032,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
clif_friendslist_send(sd);
if( !changing_mapservers ) {
+
if (battle_config.display_version == 1){
char buf[256];
sprintf(buf, "SVN version: %s", get_svn_revision());
@@ -1045,32 +1046,31 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
else
clif_displaymessage(sd->fd, motd_text[i]);
}
- }
- // message of the limited time of the account
- if (expiration_time != 0) { // don't display if it's unlimited or unknow value
- char tmpstr[1024];
- strftime(tmpstr, sizeof(tmpstr) - 1, msg_txt(501), localtime(&expiration_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S."
- clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1);
- }
+ // message of the limited time of the account
+ if (expiration_time != 0) { // don't display if it's unlimited or unknow value
+ char tmpstr[1024];
+ strftime(tmpstr, sizeof(tmpstr) - 1, msg_txt(501), localtime(&expiration_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S."
+ 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);
+ //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)
+ **/
+ clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);
}
+
/**
* Check if player have any cool downs on
**/
skill_cooldown_load(sd);
-
- /**
- * Fixes login-without-aura glitch (the screen won't blink at this point, don't worry :P)
- **/
- if( !changing_mapservers )
- clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);
// Request all registries (auth is considered completed whence they arrive)
intif_request_registry(sd,7);