diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-03 12:46:55 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-03 12:46:55 +0000 |
| commit | d0e954f07780ee06071e874c6a21fd951a5d6fda (patch) | |
| tree | a87399e2e7832889cdc66e03bba4534d75f22d74 /src/map | |
| parent | f21ecb9bfff371fb5db70fd3423673391e610ee9 (diff) | |
| download | hercules-d0e954f07780ee06071e874c6a21fd951a5d6fda.tar.gz hercules-d0e954f07780ee06071e874c6a21fd951a5d6fda.tar.bz2 hercules-d0e954f07780ee06071e874c6a21fd951a5d6fda.tar.xz hercules-d0e954f07780ee06071e874c6a21fd951a5d6fda.zip | |
Renamed 'connect_until_time' to 'expiration_time'.
Renamed 'ban_until_time' to 'unban_time'.
this also applies to login table columns (see upgrade_svn12464.sql).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12464 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/chrif.c | 4 | ||||
| -rw-r--r-- | src/map/chrif.h | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index e56ae5a56..583c22ad6 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -523,7 +523,7 @@ void chrif_authreq(struct map_session_data *sd) node->char_id == sd->status.char_id && node->login_id1 == sd->login_id1) { //auth ok - if (!pc_authok(sd, node->login_id2, node->connect_until_time, node->char_dat)) + if (!pc_authok(sd, node->login_id2, node->expiration_time, node->char_dat)) chrif_auth_delete(node->account_id, node->char_id, ST_LOGIN); else { //char_dat no longer needed, but player auth is not completed yet. @@ -594,7 +594,7 @@ void chrif_authok(int fd) node->account_id=account_id; node->char_id=char_id; node->login_id1=RFIFOL(fd, 8); - node->connect_until_time=RFIFOL(fd, 12); + node->expiration_time=RFIFOL(fd, 12); node->login_id2=RFIFOL(fd, 16); memcpy(node->char_dat,status,sizeof(struct mmo_charstatus)); node->node_created=gettick(); diff --git a/src/map/chrif.h b/src/map/chrif.h index 05c6a334a..57282dcdb 100644 --- a/src/map/chrif.h +++ b/src/map/chrif.h @@ -11,7 +11,7 @@ enum sd_state { ST_LOGIN, ST_LOGOUT, ST_MAPCHANGE }; struct auth_node { int account_id, char_id; int login_id1, login_id2, sex, fd; - time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) + time_t expiration_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) struct map_session_data *sd; //Data from logged on char. struct mmo_charstatus *char_dat; //Data from char server. unsigned int node_created; //timestamp for node timeouts diff --git a/src/map/pc.c b/src/map/pc.c index e9dde09de..acc8af40c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -724,7 +724,7 @@ int pc_isequip(struct map_session_data *sd,int n) * session idに問題無し * char鯖から送られてきたステ?タスを設定 *------------------------------------------*/ -bool pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_time, struct mmo_charstatus *st) +bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, struct mmo_charstatus *st) { int i; unsigned long tick = gettick(); @@ -849,9 +849,9 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_ } // message of the limited time of the account - if (connect_until_time != 0) { // don't display if it's unlimited or unknow value + 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(&connect_until_time)); // "Your account time limit is: %d-%m-%Y %H:%M:%S." + 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); } |