summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/chrif.c4
-rw-r--r--src/map/chrif.h2
-rw-r--r--src/map/pc.c6
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);
}